ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.40 by root, Mon Nov 30 05:19:01 2015 UTC vs.
Revision 1.51 by root, Tue Dec 1 01:54:27 2015 UTC

16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 24#include "malloc.c"
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
77 79
78#define BACKQUOTE '`' 80#define BACKQUOTE '`'
79#define WHITESPACE " \t\r\n\v\f" 81#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE 82#define DELIMITERS "()\";" WHITESPACE
81 83
82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL POINTER (&SCHEME_V->xNIL)
83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T POINTER (&SCHEME_V->xT)
84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F POINTER (&SCHEME_V->xF)
85#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK POINTER (&SCHEME_V->xsink)
86#define S_EOF (&SCHEME_V->xEOF_OBJ) 88#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
87 89
88#if !USE_MULTIPLICITY 90#if !USE_MULTIPLICITY
89static scheme sc; 91static scheme sc;
90#endif 92#endif
91 93
190# define prompt "ts> " 192# define prompt "ts> "
191#endif 193#endif
192 194
193#ifndef InitFile 195#ifndef InitFile
194# define InitFile "init.scm" 196# define InitFile "init.scm"
195#endif
196
197#ifndef FIRST_CELLSEGS
198# define FIRST_CELLSEGS 3
199#endif 197#endif
200 198
201enum scheme_types 199enum scheme_types
202{ 200{
203 T_INTEGER, 201 T_INTEGER,
264static int is_zero_rvalue (RVALUE x); 262static int is_zero_rvalue (RVALUE x);
265 263
266static num num_zero; 264static num num_zero;
267static num num_one; 265static num num_one;
268 266
267/* convert "pointer" to cell* / cell* to pointer */
268#define CELL(p) ((struct cell *)(p) + 0)
269#define POINTER(c) ((void *)((c) - 0))
270
269/* macros for cell operations */ 271/* macros for cell operations */
270#define typeflag(p) ((p)->flag + 0) 272#define typeflag(p) (CELL(p)->flag + 0)
271#define set_typeflag(p,v) ((p)->flag = (v)) 273#define set_typeflag(p,v) (CELL(p)->flag = (v))
272#define type(p) (typeflag (p) & T_MASKTYPE) 274#define type(p) (typeflag (p) & T_MASKTYPE)
273 275
274INTERFACE int 276INTERFACE int
275is_string (pointer p) 277is_string (pointer p)
276{ 278{
277 return type (p) == T_STRING; 279 return type (p) == T_STRING;
278} 280}
279 281
280#define strvalue(p) ((p)->object.string.svalue) 282#define strvalue(p) (CELL(p)->object.string.svalue)
281#define strlength(p) ((p)->object.string.length) 283#define strlength(p) (CELL(p)->object.string.length)
282 284
283INTERFACE int 285INTERFACE int
284is_vector (pointer p) 286is_vector (pointer p)
285{ 287{
286 return type (p) == T_VECTOR; 288 return type (p) == T_VECTOR;
287} 289}
288 290
289#define vecvalue(p) ((p)->object.vector.vvalue) 291#define vecvalue(p) (CELL(p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length) 292#define veclength(p) (CELL(p)->object.vector.length)
291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
292INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 294INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
294 296
295INTERFACE int 297INTERFACE int
321string_value (pointer p) 323string_value (pointer p)
322{ 324{
323 return strvalue (p); 325 return strvalue (p);
324} 326}
325 327
326#define ivalue_unchecked(p) (p)->object.ivalue 328#define ivalue_unchecked(p) CELL(p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v) 329#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
328 330
329#if USE_REAL 331#if USE_REAL
330#define rvalue_unchecked(p) (p)->object.rvalue 332#define rvalue_unchecked(p) CELL(p)->object.rvalue
331#define set_rvalue(p,v) (p)->object.rvalue = (v) 333#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
332#else 334#else
333#define rvalue_unchecked(p) (p)->object.ivalue 335#define rvalue_unchecked(p) CELL(p)->object.ivalue
334#define set_rvalue(p,v) (p)->object.ivalue = (v) 336#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
335#endif 337#endif
336 338
337INTERFACE long 339INTERFACE long
338charvalue (pointer p) 340charvalue (pointer p)
339{ 341{
340 return ivalue_unchecked (p); 342 return ivalue_unchecked (p);
341} 343}
342 344
345#define port(p) CELL(p)->object.port
346#define set_port(p,v) port(p) = (v)
343INTERFACE int 347INTERFACE int
344is_port (pointer p) 348is_port (pointer p)
345{ 349{
346 return type (p) == T_PORT; 350 return type (p) == T_PORT;
347} 351}
348 352
349INTERFACE int 353INTERFACE int
350is_inport (pointer p) 354is_inport (pointer p)
351{ 355{
352 return is_port (p) && p->object.port->kind & port_input; 356 return is_port (p) && port (p)->kind & port_input;
353} 357}
354 358
355INTERFACE int 359INTERFACE int
356is_outport (pointer p) 360is_outport (pointer p)
357{ 361{
358 return is_port (p) && p->object.port->kind & port_output; 362 return is_port (p) && port (p)->kind & port_output;
359} 363}
360 364
361INTERFACE int 365INTERFACE int
362is_pair (pointer p) 366is_pair (pointer p)
363{ 367{
364 return type (p) == T_PAIR; 368 return type (p) == T_PAIR;
365} 369}
366 370
367#define car(p) ((p)->object.cons.car + 0) 371#define car(p) (POINTER (CELL(p)->object.cons.car))
368#define cdr(p) ((p)->object.cons.cdr + 0) 372#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
369 373
370static pointer caar (pointer p) { return car (car (p)); } 374static pointer caar (pointer p) { return car (car (p)); }
371static pointer cadr (pointer p) { return car (cdr (p)); } 375static pointer cadr (pointer p) { return car (cdr (p)); }
372static pointer cdar (pointer p) { return cdr (car (p)); } 376static pointer cdar (pointer p) { return cdr (car (p)); }
373static pointer cddr (pointer p) { return cdr (cdr (p)); } 377static pointer cddr (pointer p) { return cdr (cdr (p)); }
377static pointer cdaar (pointer p) { return cdr (car (car (p))); } 381static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378 382
379INTERFACE void 383INTERFACE void
380set_car (pointer p, pointer q) 384set_car (pointer p, pointer q)
381{ 385{
382 p->object.cons.car = q; 386 CELL(p)->object.cons.car = CELL (q);
383} 387}
384 388
385INTERFACE void 389INTERFACE void
386set_cdr (pointer p, pointer q) 390set_cdr (pointer p, pointer q)
387{ 391{
388 p->object.cons.cdr = q; 392 CELL(p)->object.cons.cdr = CELL (q);
389} 393}
390 394
391INTERFACE pointer 395INTERFACE pointer
392pair_car (pointer p) 396pair_car (pointer p)
393{ 397{
411{ 415{
412 return strvalue (p); 416 return strvalue (p);
413} 417}
414 418
415#if USE_PLIST 419#if USE_PLIST
420#error plists are broken because symbols are no longer pairs
421#define symprop(p) cdr(p)
416SCHEME_EXPORT int 422SCHEME_EXPORT int
417hasprop (pointer p) 423hasprop (pointer p)
418{ 424{
419 return typeflag (p) & T_SYMBOL; 425 return typeflag (p) & T_SYMBOL;
420} 426}
421
422# define symprop(p) cdr(p)
423#endif 427#endif
424 428
425INTERFACE int 429INTERFACE int
426is_syntax (pointer p) 430is_syntax (pointer p)
427{ 431{
668 672
669static int file_push (SCHEME_P_ const char *fname); 673static int file_push (SCHEME_P_ const char *fname);
670static void file_pop (SCHEME_P); 674static void file_pop (SCHEME_P);
671static int file_interactive (SCHEME_P); 675static int file_interactive (SCHEME_P);
672ecb_inline int is_one_of (const char *s, int c); 676ecb_inline int is_one_of (const char *s, int c);
673static int alloc_cellseg (SCHEME_P_ int n); 677static int alloc_cellseg (SCHEME_P);
674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 678ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675static void finalize_cell (SCHEME_P_ pointer a); 679static void finalize_cell (SCHEME_P_ pointer a);
676static int count_consecutive_cells (pointer x, int needed); 680static int count_consecutive_cells (pointer x, int needed);
677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 681static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static pointer mk_number (SCHEME_P_ const num n); 682static pointer mk_number (SCHEME_P_ const num n);
912#endif 916#endif
913} 917}
914 918
915/* allocate new cell segment */ 919/* allocate new cell segment */
916static int 920static int
917alloc_cellseg (SCHEME_P_ int n) 921alloc_cellseg (SCHEME_P)
918{ 922{
919 pointer newp; 923 struct cell *newp;
920 pointer last; 924 struct cell *last;
921 pointer p; 925 struct cell *p;
922 char *cp; 926 char *cp;
923 long i; 927 long i;
924 int k; 928 int k;
925 929
926 static int segsize = CELL_SEGSIZE >> 1; 930 static int segsize = CELL_SEGSIZE >> 1;
927 segsize <<= 1; 931 segsize <<= 1;
928 932
929 for (k = 0; k < n; k++)
930 {
931 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
932 return k;
933
934 cp = malloc (segsize * sizeof (struct cell)); 933 cp = malloc (segsize * sizeof (struct cell));
935 934
936 if (!cp && USE_ERROR_CHECKING) 935 if (!cp && USE_ERROR_CHECKING)
937 return k; 936 return k;
938 937
939 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
940 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
941 940
942 newp = (pointer)cp; 941 newp = (struct cell *)cp;
943 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
944 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
945 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
946 last = newp + segsize - 1; 945 last = newp + segsize - 1;
947 946
948 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
949 { 948 {
949 pointer cp = POINTER (p);
950 set_typeflag (p, T_PAIR); 950 set_typeflag (cp, T_PAIR);
951 set_car (p, NIL); 951 set_car (cp, NIL);
952 set_cdr (p, p + 1); 952 set_cdr (cp, POINTER (p + 1));
953 } 953 }
954 954
955 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = POINTER (newp);
957 }
958 957
959 return n; 958 return 1;
960} 959}
961 960
962/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
963ecb_inline pointer 962ecb_inline pointer
964get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
969 return S_SINK; 968 return S_SINK;
970 969
971 if (SCHEME_V->free_cell == NIL) 970 if (SCHEME_V->free_cell == NIL)
972 { 971 {
973 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 972 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
974 973
975 gc (SCHEME_A_ a, b); 974 gc (SCHEME_A_ a, b);
976 975
977 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
978 { 977 {
979 /* if only a few recovered, get more to avoid fruitless gc's */ 978 /* if only a few recovered, get more to avoid fruitless gc's */
980 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 979 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
981 { 980 {
982#if USE_ERROR_CHECKING 981#if USE_ERROR_CHECKING
983 SCHEME_V->no_memory = 1; 982 SCHEME_V->no_memory = 1;
984 return S_SINK; 983 return S_SINK;
985#endif 984#endif
997 } 996 }
998} 997}
999 998
1000/* To retain recent allocs before interpreter knows about them - 999/* To retain recent allocs before interpreter knows about them -
1001 Tehom */ 1000 Tehom */
1002
1003static void 1001static void
1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1002push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1005{ 1003{
1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1004 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1007 1005
1029} 1027}
1030 1028
1031static pointer 1029static pointer
1032get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1030get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1033{ 1031{
1034 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1032 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1035 pointer *e = malloc (len * sizeof (pointer)); 1033 pointer *e = malloc (len * sizeof (pointer));
1036 1034
1037 if (!e && USE_ERROR_CHECKING) 1035 if (!e && USE_ERROR_CHECKING)
1038 return S_SINK; 1036 return S_SINK;
1039 1037
1040 /* Record it as a vector so that gc understands it. */ 1038 /* Record it as a vector so that gc understands it. */
1041 set_typeflag (v, T_VECTOR | T_ATOM); 1039 set_typeflag (v, T_VECTOR | T_ATOM);
1042 1040
1043 v->object.vector.vvalue = e; 1041 CELL(v)->object.vector.vvalue = e;
1044 v->object.vector.length = len; 1042 CELL(v)->object.vector.length = len;
1045 fill_vector (v, 0, init); 1043 fill_vector (v, 0, init);
1046 push_recent_alloc (SCHEME_A_ v, NIL); 1044 push_recent_alloc (SCHEME_A_ v, NIL);
1047 1045
1048 return v; 1046 return v;
1049} 1047}
1092 set_car (x, a); 1090 set_car (x, a);
1093 set_cdr (x, b); 1091 set_cdr (x, b);
1094 1092
1095 return x; 1093 return x;
1096} 1094}
1097
1098/* ========== oblist implementation ========== */
1099 1095
1100static pointer 1096static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1097generate_symbol (SCHEME_P_ const char *name)
1102{ 1098{
1103 pointer x = mk_string (SCHEME_A_ name); 1099 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1100 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1101 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1102 return x;
1107} 1103}
1108 1104
1105/* ========== oblist implementation ========== */
1106
1109#ifndef USE_OBJECT_LIST 1107#ifndef USE_OBJECT_LIST
1110 1108
1111static int 1109static int
1112hash_fn (const char *key, int table_size) 1110hash_fn (const char *key, int table_size)
1113{ 1111{
1199 1197
1200/* returns the new symbol */ 1198/* returns the new symbol */
1201static pointer 1199static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1200oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1201{
1204 pointer x = mk_string (SCHEME_A_ name); 1202 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1203 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1204 return x;
1209} 1205}
1210 1206
1211static pointer 1207static pointer
1221mk_port (SCHEME_P_ port *p) 1217mk_port (SCHEME_P_ port *p)
1222{ 1218{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1219 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1220
1225 set_typeflag (x, T_PORT | T_ATOM); 1221 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1222 set_port (x, p);
1227 1223
1228 return x; 1224 return x;
1229} 1225}
1230#endif 1226#endif
1231 1227
1232pointer 1228pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1229mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1230{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1232
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1233 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1234 CELL(x)->object.ff = f;
1239 1235
1240 return x; 1236 return x;
1241} 1237}
1242 1238
1243INTERFACE pointer 1239INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1240mk_character (SCHEME_P_ int c)
1245{ 1241{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1243
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1244 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1245 set_ivalue (x, c & 0xff);
1250 1246
1251 return x; 1247 return x;
1252} 1248}
1253 1249
1254/* get number atom (integer) */ 1250/* get number atom (integer) */
1255INTERFACE pointer 1251INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1252mk_integer (SCHEME_P_ long n)
1257{ 1253{
1254 pointer p = 0;
1255 pointer *pp = &p;
1256
1257#if USE_INTCACHE
1258 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1259 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1260#endif
1261
1262 if (!*pp)
1263 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1264 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1265
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1266 set_typeflag (x, T_INTEGER | T_ATOM);
1267 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1268 set_ivalue (x, n);
1262 1269
1270 *pp = x;
1271 }
1272
1263 return x; 1273 return *pp;
1264} 1274}
1265 1275
1266INTERFACE pointer 1276INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1277mk_real (SCHEME_P_ RVALUE n)
1268{ 1278{
1269#if USE_REAL 1279#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1280 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1281
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1282 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1283 set_rvalue (x, n);
1274 1284
1275 return x; 1285 return x;
1276#else 1286#else
1277 return mk_integer (SCHEME_A_ n); 1287 return mk_integer (SCHEME_A_ n);
1393INTERFACE pointer 1403INTERFACE pointer
1394gensym (SCHEME_P) 1404gensym (SCHEME_P)
1395{ 1405{
1396 pointer x; 1406 pointer x;
1397 char name[40] = "gensym-"; 1407 char name[40] = "gensym-";
1398 xnum (name + 7, SCHEME_V->gensym_cnt); 1408 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1409
1400 return generate_symbol (SCHEME_A_ name); 1410 return generate_symbol (SCHEME_A_ name);
1411}
1412
1413static int
1414is_gensym (SCHEME_P_ pointer x)
1415{
1416 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1401} 1417}
1402 1418
1403/* make symbol or number atom from string */ 1419/* make symbol or number atom from string */
1404static pointer 1420static pointer
1405mk_atom (SCHEME_P_ char *q) 1421mk_atom (SCHEME_P_ char *q)
1614 1630
1615/* garbage collection. parameter a, b is marked. */ 1631/* garbage collection. parameter a, b is marked. */
1616static void 1632static void
1617gc (SCHEME_P_ pointer a, pointer b) 1633gc (SCHEME_P_ pointer a, pointer b)
1618{ 1634{
1619 pointer p;
1620 int i; 1635 int i;
1621 1636
1622 if (SCHEME_V->gc_verbose) 1637 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1638 putstr (SCHEME_A_ "gc...");
1624 1639
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1655 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1656 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1657 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1658 mark (SCHEME_V->c_nest);
1644 1659
1660#if USE_INTCACHE
1661 /* mark intcache */
1662 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1663 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1664 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1665#endif
1666
1645 /* mark variables a, b */ 1667 /* mark variables a, b */
1646 mark (a); 1668 mark (a);
1647 mark (b); 1669 mark (b);
1648 1670
1649 /* garbage collect */ 1671 /* garbage collect */
1650 clrmark (NIL); 1672 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1673 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1674 SCHEME_V->free_cell = NIL;
1653 1675
1654 /* free-list is kept sorted by address so as to maintain consecutive 1676 if (SCHEME_V->gc_verbose)
1655 ranges, if possible, for use with vectors. Here we scan the cells 1677 xwrstr ("freeing...");
1656 (which are also kept sorted by address) downwards to build the 1678
1657 free-list in sorted order. 1679 uint32_t total = 0;
1658 */ 1680
1681 /* Here we scan the cells to build the free-list. */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1682 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 { 1683 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1684 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1685 struct cell *p;
1686 total += SCHEME_V->cell_segsize [i];
1662 1687
1663 while (--p >= SCHEME_V->cell_seg[i]) 1688 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 { 1689 {
1690 pointer c = POINTER (p);
1691
1665 if (is_mark (p)) 1692 if (is_mark (c))
1666 clrmark (p); 1693 clrmark (c);
1667 else 1694 else
1668 { 1695 {
1669 /* reclaim cell */ 1696 /* reclaim cell */
1670 if (typeflag (p) != T_PAIR) 1697 if (typeflag (c) != T_PAIR)
1671 { 1698 {
1672 finalize_cell (SCHEME_A_ p); 1699 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (p, T_PAIR); 1700 set_typeflag (c, T_PAIR);
1674 set_car (p, NIL); 1701 set_car (c, NIL);
1675 } 1702 }
1676 1703
1677 ++SCHEME_V->fcells; 1704 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1705 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p; 1706 SCHEME_V->free_cell = c;
1680 } 1707 }
1681 } 1708 }
1682 } 1709 }
1683 1710
1684 if (SCHEME_V->gc_verbose) 1711 if (SCHEME_V->gc_verbose)
1685 { 1712 {
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1713 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1687 } 1714 }
1688} 1715}
1689 1716
1690static void 1717static void
1691finalize_cell (SCHEME_P_ pointer a) 1718finalize_cell (SCHEME_P_ pointer a)
1696 else if (is_vector (a)) 1723 else if (is_vector (a))
1697 free (vecvalue (a)); 1724 free (vecvalue (a));
1698#if USE_PORTS 1725#if USE_PORTS
1699 else if (is_port (a)) 1726 else if (is_port (a))
1700 { 1727 {
1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1728 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1702 port_close (SCHEME_A_ a, port_input | port_output); 1729 port_close (SCHEME_A_ a, port_input | port_output);
1703 1730
1704 free (a->object.port); 1731 free (port (a));
1705 } 1732 }
1706#endif 1733#endif
1707} 1734}
1708 1735
1709/* ========== Routines for Reading ========== */ 1736/* ========== Routines for Reading ========== */
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1752 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1753 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1754 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1755 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1756 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1757 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1758
1732#if SHOW_ERROR_LINE 1759#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1761
1735 if (fname) 1762 if (fname)
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1780#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1782#endif
1756 SCHEME_V->file_i--; 1783 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1784 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1785 }
1759} 1786}
1760 1787
1761static int 1788static int
1762file_interactive (SCHEME_P) 1789file_interactive (SCHEME_P)
1763{ 1790{
1764#if USE_PORTS 1791#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1792 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1794 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1795#else
1769 return 0; 1796 return 0;
1770#endif 1797#endif
1771} 1798}
1772 1799
1906} 1933}
1907 1934
1908static void 1935static void
1909port_close (SCHEME_P_ pointer p, int flag) 1936port_close (SCHEME_P_ pointer p, int flag)
1910{ 1937{
1911 port *pt = p->object.port; 1938 port *pt = port (p);
1912 1939
1913 pt->kind &= ~flag; 1940 pt->kind &= ~flag;
1914 1941
1915 if ((pt->kind & (port_input | port_output)) == 0) 1942 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1943 {
1937/* get new character from input file */ 1964/* get new character from input file */
1938static int 1965static int
1939inchar (SCHEME_P) 1966inchar (SCHEME_P)
1940{ 1967{
1941 int c; 1968 int c;
1942 port *pt; 1969 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1970
1946 if (pt->kind & port_saw_EOF) 1971 if (pt->kind & port_saw_EOF)
1947 return EOF; 1972 return EOF;
1948 1973
1949 c = basic_inchar (pt); 1974 c = basic_inchar (pt);
2016 port *pt; 2041 port *pt;
2017 2042
2018 if (c == EOF) 2043 if (c == EOF)
2019 return; 2044 return;
2020 2045
2021 pt = SCHEME_V->inport->object.port; 2046 pt = port (SCHEME_V->inport);
2022 pt->unget = c; 2047 pt->unget = c;
2023#else 2048#else
2024 if (c == EOF) 2049 if (c == EOF)
2025 return; 2050 return;
2026 2051
2054 2079
2055INTERFACE void 2080INTERFACE void
2056putstr (SCHEME_P_ const char *s) 2081putstr (SCHEME_P_ const char *s)
2057{ 2082{
2058#if USE_PORTS 2083#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port; 2084 port *pt = port (SCHEME_V->outport);
2060 2085
2061 if (pt->kind & port_file) 2086 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s)); 2087 write (pt->rep.stdio.file, s, strlen (s));
2063 else 2088 else
2064 for (; *s; s++) 2089 for (; *s; s++)
2074 2099
2075static void 2100static void
2076putchars (SCHEME_P_ const char *s, int len) 2101putchars (SCHEME_P_ const char *s, int len)
2077{ 2102{
2078#if USE_PORTS 2103#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port; 2104 port *pt = port (SCHEME_V->outport);
2080 2105
2081 if (pt->kind & port_file) 2106 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2107 write (pt->rep.stdio.file, s, len);
2083 else 2108 else
2084 { 2109 {
2098 2123
2099INTERFACE void 2124INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2125putcharacter (SCHEME_P_ int c)
2101{ 2126{
2102#if USE_PORTS 2127#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port; 2128 port *pt = port (SCHEME_V->outport);
2104 2129
2105 if (pt->kind & port_file) 2130 if (pt->kind & port_file)
2106 { 2131 {
2107 char cc = c; 2132 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1); 2133 write (pt->rep.stdio.file, &cc, 1);
2277 int c, curr_line = 0; 2302 int c, curr_line = 0;
2278 2303
2279 do 2304 do
2280 { 2305 {
2281 c = inchar (SCHEME_A); 2306 c = inchar (SCHEME_A);
2307
2282#if SHOW_ERROR_LINE 2308#if SHOW_ERROR_LINE
2283 if (c == '\n') 2309 if (ecb_expect_false (c == '\n'))
2284 curr_line++; 2310 curr_line++;
2285#endif 2311#endif
2312
2313 if (ecb_expect_false (c == EOF))
2314 return c;
2286 } 2315 }
2287 while (is_one_of (WHITESPACE, c)); 2316 while (is_one_of (WHITESPACE, c));
2288 2317
2289 /* record it */ 2318 /* record it */
2290#if SHOW_ERROR_LINE 2319#if SHOW_ERROR_LINE
2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2320 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2321 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2293#endif 2322#endif
2294 2323
2295 if (c != EOF)
2296 {
2297 backchar (SCHEME_A_ c); 2324 backchar (SCHEME_A_ c);
2298 return 1; 2325 return 1;
2299 }
2300 else
2301 return EOF;
2302} 2326}
2303 2327
2304/* get token */ 2328/* get token */
2305static int 2329static int
2306token (SCHEME_P) 2330token (SCHEME_P)
3051{ 3075{
3052 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3053 struct dump_stack_frame *next_frame; 3077 struct dump_stack_frame *next_frame;
3054 3078
3055 /* enough room for the next frame? */ 3079 /* enough room for the next frame? */
3056 if (nframes >= SCHEME_V->dump_size) 3080 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3057 { 3081 {
3058 SCHEME_V->dump_size += STACK_GROWTH; 3082 SCHEME_V->dump_size += STACK_GROWTH;
3059 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3083 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3060 } 3084 }
3061 3085
3242 3266
3243#endif 3267#endif
3244 3268
3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3269#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3246 3270
3247#if 1 3271#if EXPERIMENT
3248static int 3272static int
3249debug (SCHEME_P_ int indent, pointer x) 3273debug (SCHEME_P_ int indent, pointer x)
3250{ 3274{
3251 int c; 3275 int c;
3252 3276
3308 pointer args = SCHEME_V->args; 3332 pointer args = SCHEME_V->args;
3309 pointer x, y; 3333 pointer x, y;
3310 3334
3311 switch (op) 3335 switch (op)
3312 { 3336 {
3313#if 1 //D 3337#if EXPERIMENT //D
3314 case OP_DEBUG: 3338 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3339 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3316 printf ("\n"); 3340 printf ("\n");
3317 s_return (S_T); 3341 s_return (S_T);
3318#endif 3342#endif
3319 case OP_LOAD: /* load */ 3343 case OP_LOAD: /* load */
3320 if (file_interactive (SCHEME_A)) 3344 if (file_interactive (SCHEME_A))
3321 { 3345 {
3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3346 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3347 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3324 } 3348 }
3325 3349
3326 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3350 if (!file_push (SCHEME_A_ strvalue (car (args))))
3327 Error_1 ("unable to open", car (args)); 3351 Error_1 ("unable to open", car (args));
3328 else 3352 else
3332 } 3356 }
3333 3357
3334 case OP_T0LVL: /* top level */ 3358 case OP_T0LVL: /* top level */
3335 3359
3336 /* If we reached the end of file, this loop is done. */ 3360 /* If we reached the end of file, this loop is done. */
3337 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3361 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3338 { 3362 {
3339 if (SCHEME_V->file_i == 0) 3363 if (SCHEME_V->file_i == 0)
3340 { 3364 {
3341 SCHEME_V->args = NIL; 3365 SCHEME_V->args = NIL;
3342 s_goto (OP_QUIT); 3366 s_goto (OP_QUIT);
3420#endif 3444#endif
3421 if (is_symbol (SCHEME_V->code)) /* symbol */ 3445 if (is_symbol (SCHEME_V->code)) /* symbol */
3422 { 3446 {
3423 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3447 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3424 3448
3425 if (x != NIL) 3449 if (x == NIL)
3426 s_return (slot_value_in_env (x));
3427 else
3428 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3450 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3451
3452 s_return (slot_value_in_env (x));
3429 } 3453 }
3430 else if (is_pair (SCHEME_V->code)) 3454 else if (is_pair (SCHEME_V->code))
3431 { 3455 {
3432 x = car (SCHEME_V->code); 3456 x = car (SCHEME_V->code);
3433 3457
3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3534 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3511 else if (is_foreign (SCHEME_V->code)) 3535 else if (is_foreign (SCHEME_V->code))
3512 { 3536 {
3513 /* Keep nested calls from GC'ing the arglist */ 3537 /* Keep nested calls from GC'ing the arglist */
3514 push_recent_alloc (SCHEME_A_ args, NIL); 3538 push_recent_alloc (SCHEME_A_ args, NIL);
3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3539 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3516 3540
3517 s_return (x); 3541 s_return (x);
3518 } 3542 }
3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3543 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3520 { 3544 {
3557 3581
3558 case OP_DOMACRO: /* do macro */ 3582 case OP_DOMACRO: /* do macro */
3559 SCHEME_V->code = SCHEME_V->value; 3583 SCHEME_V->code = SCHEME_V->value;
3560 s_goto (OP_EVAL); 3584 s_goto (OP_EVAL);
3561 3585
3562#if 1
3563
3564 case OP_LAMBDA: /* lambda */ 3586 case OP_LAMBDA: /* lambda */
3565 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3587 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3566 set SCHEME_V->value fall thru */ 3588 set SCHEME_V->value fall thru */
3567 { 3589 {
3568 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3590 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3574 SCHEME_V->code = slot_value_in_env (f); 3596 SCHEME_V->code = slot_value_in_env (f);
3575 s_goto (OP_APPLY); 3597 s_goto (OP_APPLY);
3576 } 3598 }
3577 3599
3578 SCHEME_V->value = SCHEME_V->code; 3600 SCHEME_V->value = SCHEME_V->code;
3579 /* Fallthru */
3580 } 3601 }
3602 /* Fallthru */
3581 3603
3582 case OP_LAMBDA1: 3604 case OP_LAMBDA1:
3583 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3605 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3584
3585#else
3586
3587 case OP_LAMBDA: /* lambda */
3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3589
3590#endif
3591 3606
3592 case OP_MKCLOSURE: /* make-closure */ 3607 case OP_MKCLOSURE: /* make-closure */
3593 x = car (args); 3608 x = car (args);
3594 3609
3595 if (car (x) == SCHEME_V->LAMBDA) 3610 if (car (x) == SCHEME_V->LAMBDA)
4191 else 4206 else
4192 Error_0 ("modulo: division by zero"); 4207 Error_0 ("modulo: division by zero");
4193 4208
4194 s_return (mk_number (SCHEME_A_ v)); 4209 s_return (mk_number (SCHEME_A_ v));
4195 4210
4196 case OP_CAR: /* car */ 4211 /* the compiler will optimize this mess... */
4197 s_return (caar (args)); 4212 case OP_CAR: op_car: s_return (car (x));
4198 4213 case OP_CDR: op_cdr: s_return (cdr (x));
4199 case OP_CDR: /* cdr */ 4214 case OP_CAAR: op_caar: x = car (x); goto op_car;
4200 s_return (cdar (args)); 4215 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4216 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4217 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4218 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4219 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4220 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4221 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4222 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4223 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4224 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4225 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4226 case OP_CAAAAR: x = car (x); goto op_caaar;
4227 case OP_CAAADR: x = cdr (x); goto op_caaar;
4228 case OP_CAADAR: x = car (x); goto op_caadr;
4229 case OP_CAADDR: x = cdr (x); goto op_caadr;
4230 case OP_CADAAR: x = car (x); goto op_cadar;
4231 case OP_CADADR: x = cdr (x); goto op_cadar;
4232 case OP_CADDAR: x = car (x); goto op_caddr;
4233 case OP_CADDDR: x = cdr (x); goto op_caddr;
4234 case OP_CDAAAR: x = car (x); goto op_cdaar;
4235 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4236 case OP_CDADAR: x = car (x); goto op_cdadr;
4237 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4238 case OP_CDDAAR: x = car (x); goto op_cddar;
4239 case OP_CDDADR: x = cdr (x); goto op_cddar;
4240 case OP_CDDDAR: x = car (x); goto op_cdddr;
4241 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4201 4242
4202 case OP_CONS: /* cons */ 4243 case OP_CONS: /* cons */
4203 set_cdr (args, cadr (args)); 4244 set_cdr (args, cadr (args));
4204 s_return (args); 4245 s_return (args);
4205 4246
4527 pointer d = cdr (args); 4568 pointer d = cdr (args);
4528 int r; 4569 int r;
4529 4570
4530 switch (op) 4571 switch (op)
4531 { 4572 {
4532 case OP_NOT: /* not */ r = is_false (a) ; break; 4573 case OP_NOT: /* not */ r = is_false (a) ; break;
4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4574 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4575 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break; 4576 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4577 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4578 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4579 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4580 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4581 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4582 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4583 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4542 4584
4543#if USE_CHAR_CLASSIFIERS 4585#if USE_CHAR_CLASSIFIERS
4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4586 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4587 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4588 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4596 } 4638 }
4597 else 4639 else
4598 s_return (SCHEME_V->code); 4640 s_return (SCHEME_V->code);
4599 4641
4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4642 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4601 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4643 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4602 s_return (SCHEME_V->value); 4644 s_return (SCHEME_V->value);
4603 4645
4604#if USE_PORTS 4646#if USE_PORTS
4605 4647
4606 case OP_WRITE: /* write */ 4648 case OP_WRITE: /* write */
4751 SCHEME_V->gc_verbose = (a != S_F); 4793 SCHEME_V->gc_verbose = (a != S_F);
4752 s_retbool (was); 4794 s_retbool (was);
4753 } 4795 }
4754 4796
4755 case OP_NEWSEGMENT: /* new-segment */ 4797 case OP_NEWSEGMENT: /* new-segment */
4798#if 0
4756 if (!is_pair (args) || !is_number (a)) 4799 if (!is_pair (args) || !is_number (a))
4757 Error_0 ("new-segment: argument must be a number"); 4800 Error_0 ("new-segment: argument must be a number");
4758 4801#endif
4759 alloc_cellseg (SCHEME_A_ ivalue (a)); 4802 s_retbool (alloc_cellseg (SCHEME_A));
4760
4761 s_return (S_T);
4762 4803
4763 case OP_OBLIST: /* oblist */ 4804 case OP_OBLIST: /* oblist */
4764 s_return (oblist_all_symbols (SCHEME_A)); 4805 s_return (oblist_all_symbols (SCHEME_A));
4765 4806
4766#if USE_PORTS 4807#if USE_PORTS
4836 s_return (p == NIL ? S_F : p); 4877 s_return (p == NIL ? S_F : p);
4837 } 4878 }
4838 4879
4839 case OP_GET_OUTSTRING: /* get-output-string */ 4880 case OP_GET_OUTSTRING: /* get-output-string */
4840 { 4881 {
4841 port *p; 4882 port *p = port (a);
4842 4883
4843 if ((p = a->object.port)->kind & port_string) 4884 if (p->kind & port_string)
4844 { 4885 {
4845 off_t size; 4886 off_t size;
4846 char *str; 4887 char *str;
4847 4888
4848 size = p->rep.string.curr - p->rep.string.start + 1; 4889 size = p->rep.string.curr - p->rep.string.start + 1;
4953 int res; 4994 int res;
4954 4995
4955 if (is_pair (args)) 4996 if (is_pair (args))
4956 p = car (args); 4997 p = car (args);
4957 4998
4958 res = p->object.port->kind & port_string; 4999 res = port (p)->kind & port_string;
4959 5000
4960 s_retbool (res); 5001 s_retbool (res);
4961 } 5002 }
4962 5003
4963 case OP_SET_INPORT: /* set-input-port */ 5004 case OP_SET_INPORT: /* set-input-port */
5627scheme_init (SCHEME_P) 5668scheme_init (SCHEME_P)
5628{ 5669{
5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5670 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5630 pointer x; 5671 pointer x;
5631 5672
5673 /* this memset is not strictly correct, as we assume (intcache)
5674 * that memset 0 will also set pointers to 0, but memset does
5675 * of course not guarantee that. screw such systems.
5676 */
5677 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5678
5632 num_set_fixnum (num_zero, 1); 5679 num_set_fixnum (num_zero, 1);
5633 num_set_ivalue (num_zero, 0); 5680 num_set_ivalue (num_zero, 0);
5634 num_set_fixnum (num_one, 1); 5681 num_set_fixnum (num_one, 1);
5635 num_set_ivalue (num_one, 1); 5682 num_set_ivalue (num_one, 1);
5636 5683
5647 SCHEME_V->save_inport = NIL; 5694 SCHEME_V->save_inport = NIL;
5648 SCHEME_V->loadport = NIL; 5695 SCHEME_V->loadport = NIL;
5649 SCHEME_V->nesting = 0; 5696 SCHEME_V->nesting = 0;
5650 SCHEME_V->interactive_repl = 0; 5697 SCHEME_V->interactive_repl = 0;
5651 5698
5652 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5699 if (!alloc_cellseg (SCHEME_A))
5653 { 5700 {
5654#if USE_ERROR_CHECKING 5701#if USE_ERROR_CHECKING
5655 SCHEME_V->no_memory = 1; 5702 SCHEME_V->no_memory = 1;
5656 return 0; 5703 return 0;
5657#endif 5704#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines