[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core/libguile ChangeLog eval.c unif...
From: |
Dirk Herrmann |
Subject: |
guile/guile-core/libguile ChangeLog eval.c unif... |
Date: |
Tue, 26 Sep 2000 12:20:40 -0700 |
CVSROOT: /cvs
Module name: guile
Changes by: Dirk Herrmann <address@hidden> 00/09/26 12:20:40
Modified files:
guile-core/libguile: ChangeLog eval.c unif.h vectors.h
Log message:
* Removed some more references to SCM_CHARS.
* Provided SCM_U?VECTOR_BASE as replacements for SCM_VELTS.
CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1120&r2=1.1121
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/eval.c.diff?r1=1.173&r2=1.174
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/unif.h.diff?r1=1.24&r2=1.25
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/vectors.h.diff?r1=1.21&r2=1.22
Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1120
guile/guile-core/libguile/ChangeLog:1.1121
--- guile/guile-core/libguile/ChangeLog:1.1120 Tue Sep 26 11:37:26 2000
+++ guile/guile-core/libguile/ChangeLog Tue Sep 26 12:20:39 2000
@@ -1,5 +1,13 @@
2000-09-26 Dirk Herrmann <address@hidden>
+ * eval.c (scm_m_letrec1, SCM_CEVAL, SCM_APPLY): Use
+ SCM_STRING_U?CHARS or SCM_SYMBOL_U?CHARS instead of SCM_U?CHARS.
+
+ * unif.h (SCM_UVECTOR_BASE), vectors.h (SCM_VECTOR_BASE): Added
+ as replacements for SCM_CHARS and SCM_VELTS.
+
+2000-09-26 Dirk Herrmann <address@hidden>
+
* continuations.c (scm_make_cont, scm_dynthrow), print.c
(scm_iprin1), stacks.c (scm_make_stack, scm_stack_id,
scm_last_stack_frame): For continuations, use SCM_CONTREGS
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.173
guile/guile-core/libguile/eval.c:1.174
--- guile/guile-core/libguile/eval.c:1.173 Fri Sep 22 10:43:57 2000
+++ guile/guile-core/libguile/eval.c Tue Sep 26 12:20:39 2000
@@ -916,7 +916,7 @@
scm_m_letrec1 (SCM op, SCM imm, SCM xorig, SCM env)
{
SCM cdrx = SCM_CDR (xorig); /* locally mutable version of form */
- char *what = SCM_CHARS (SCM_CAR (xorig));
+ char *what = SCM_SYMBOL_CHARS (SCM_CAR (xorig));
SCM x = cdrx, proc, arg1; /* structure traversers */
SCM vars = SCM_EOL, inits = SCM_EOL, *initloc = &inits;
@@ -2761,15 +2761,15 @@
#endif
floerr:
SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), t.arg1,
- SCM_ARG1, SCM_CHARS (SCM_SNAME (proc)));
+ SCM_ARG1, SCM_SYMBOL_CHARS (SCM_SNAME
(proc)));
}
proc = SCM_SNAME (proc);
{
- char *chrs = SCM_CHARS (proc) + SCM_LENGTH (proc) - 1;
+ char *chrs = SCM_SYMBOL_CHARS (proc) + SCM_LENGTH (proc) - 1;
while ('c' != *--chrs)
{
SCM_ASSERT (SCM_CONSP (t.arg1),
- t.arg1, SCM_ARG1, SCM_CHARS (proc));
+ t.arg1, SCM_ARG1, SCM_SYMBOL_CHARS (proc));
t.arg1 = ('a' == *chrs) ? SCM_CAR (t.arg1) : SCM_CDR (t.arg1);
}
RETURN (t.arg1);
@@ -3392,15 +3392,15 @@
#endif
floerr:
SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1,
- SCM_ARG1, SCM_CHARS (SCM_SNAME (proc)));
+ SCM_ARG1, SCM_SYMBOL_CHARS (SCM_SNAME (proc)));
}
proc = SCM_SNAME (proc);
{
- char *chrs = SCM_CHARS (proc) + SCM_LENGTH (proc) - 1;
+ char *chrs = SCM_SYMBOL_CHARS (proc) + SCM_LENGTH (proc) - 1;
while ('c' != *--chrs)
{
SCM_ASSERT (SCM_CONSP (arg1),
- arg1, SCM_ARG1, SCM_CHARS (proc));
+ arg1, SCM_ARG1, SCM_SYMBOL_CHARS (proc));
arg1 = ('a' == *chrs) ? SCM_CAR (arg1) : SCM_CDR (arg1);
}
RETURN (arg1)
Index: guile/guile-core/libguile/unif.h
diff -u guile/guile-core/libguile/unif.h:1.24
guile/guile-core/libguile/unif.h:1.25
--- guile/guile-core/libguile/unif.h:1.24 Wed May 24 04:22:38 2000
+++ guile/guile-core/libguile/unif.h Tue Sep 26 12:20:39 2000
@@ -85,6 +85,8 @@
#define SCM_ARRAY_BASE(a) (((scm_array *) SCM_CELL_WORD_1 (a))->base)
#define SCM_ARRAY_DIMS(a) ((scm_array_dim *)(SCM_CHARS(a)+sizeof(scm_array)))
+#define SCM_UVECTOR_BASE(x) ((void *) (SCM_CELL_WORD_1 (x)))
+
/* apparently it's possible to have more than SCM_LENGTH_MAX elements
in an array: if the length is SCM_LENGTH_MAX then the SCM_VELTS
block begins with the true length (a long int). I wonder if it
Index: guile/guile-core/libguile/vectors.h
diff -u guile/guile-core/libguile/vectors.h:1.21
guile/guile-core/libguile/vectors.h:1.22
--- guile/guile-core/libguile/vectors.h:1.21 Mon Jun 12 05:28:24 2000
+++ guile/guile-core/libguile/vectors.h Tue Sep 26 12:20:39 2000
@@ -52,6 +52,7 @@
#define SCM_VECTORP(x) (SCM_NIMP (x) && (SCM_TYP7S (x) == scm_tc7_vector))
+#define SCM_VECTOR_BASE(x) ((scm_bits_t *) SCM_CELL_WORD_1 (x))
#define SCM_VELTS(x) ((SCM *) SCM_CELL_WORD_1 (x))
#define SCM_VELTS_AS_STACKITEMS(x) ((SCM_STACKITEM *) SCM_CELL_WORD_1 (x))
#define SCM_SETVELTS(x,v) (SCM_SET_CELL_WORD_1 ((x), (v)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- guile/guile-core/libguile ChangeLog eval.c unif...,
Dirk Herrmann <=