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.35 by root, Sun Nov 29 00:02:21 2015 UTC vs.
Revision 1.53 by root, Tue Dec 1 02:21:49 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
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
74 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
75 TOK_VEC 79 TOK_VEC
76}; 80};
77 81
78#define BACKQUOTE '`' 82#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
80 85
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
84#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
85#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86 91
87#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
88static scheme sc; 93static scheme sc;
89#endif 94#endif
90 95
98 } 103 }
99 104
100 char *p = s; 105 char *p = s;
101 106
102 do { 107 do {
103 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
104 n /= base; 109 n /= base;
105 } while (n); 110 } while (n);
106 111
107 *p-- = 0; 112 *p-- = 0;
108 113
118{ 123{
119 xbase (s, n, 10); 124 xbase (s, n, 10);
120} 125}
121 126
122static void 127static void
123xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
124{
125 write (1, s, strlen (s));
126}
127
128static void
129xwrnum (long n)
130{ 129{
131 char buf[64]; 130 char buf[64];
132 131
133 xnum (buf, n); 132 xnum (buf, n);
134 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
135} 134}
136 135
137static char 136static char
138xtoupper (char c) 137xtoupper (char c)
139{ 138{
189# define prompt "ts> " 188# define prompt "ts> "
190#endif 189#endif
191 190
192#ifndef InitFile 191#ifndef InitFile
193# define InitFile "init.scm" 192# define InitFile "init.scm"
194#endif
195
196#ifndef FIRST_CELLSEGS
197# define FIRST_CELLSEGS 3
198#endif 193#endif
199 194
200enum scheme_types 195enum scheme_types
201{ 196{
202 T_INTEGER, 197 T_INTEGER,
263static int is_zero_rvalue (RVALUE x); 258static int is_zero_rvalue (RVALUE x);
264 259
265static num num_zero; 260static num num_zero;
266static num num_one; 261static num num_one;
267 262
263/* convert "pointer" to cell* / cell* to pointer */
264#define CELL(p) ((struct cell *)(p) + 0)
265#define POINTER(c) ((void *)((c) - 0))
266
268/* macros for cell operations */ 267/* macros for cell operations */
269#define typeflag(p) ((p)->flag + 0) 268#define typeflag(p) (CELL(p)->flag + 0)
270#define set_typeflag(p,v) ((p)->flag = (v)) 269#define set_typeflag(p,v) (CELL(p)->flag = (v))
271#define type(p) (typeflag (p) & T_MASKTYPE) 270#define type(p) (typeflag (p) & T_MASKTYPE)
272 271
273INTERFACE int 272INTERFACE int
274is_string (pointer p) 273is_string (pointer p)
275{ 274{
276 return type (p) == T_STRING; 275 return type (p) == T_STRING;
277} 276}
278 277
279#define strvalue(p) ((p)->object.string.svalue) 278#define strvalue(p) (CELL(p)->object.string.svalue)
280#define strlength(p) ((p)->object.string.length) 279#define strlength(p) (CELL(p)->object.string.length)
281 280
282INTERFACE int 281INTERFACE int
283is_vector (pointer p) 282is_vector (pointer p)
284{ 283{
285 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
286} 285}
287 286
288#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 289INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293 292
294INTERFACE int 293INTERFACE int
320string_value (pointer p) 319string_value (pointer p)
321{ 320{
322 return strvalue (p); 321 return strvalue (p);
323} 322}
324 323
325#define ivalue_unchecked(p) (p)->object.ivalue 324#define ivalue_unchecked(p) CELL(p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v) 325#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327 326
328#if USE_REAL 327#if USE_REAL
329#define rvalue_unchecked(p) (p)->object.rvalue 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
330#define set_rvalue(p,v) (p)->object.rvalue = (v) 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331#else 330#else
332#define rvalue_unchecked(p) (p)->object.ivalue 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
333#define set_rvalue(p,v) (p)->object.ivalue = (v) 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334#endif 333#endif
335 334
336INTERFACE long 335INTERFACE long
337charvalue (pointer p) 336charvalue (pointer p)
338{ 337{
339 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
340} 339}
341 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
342INTERFACE int 343INTERFACE int
343is_port (pointer p) 344is_port (pointer p)
344{ 345{
345 return type (p) == T_PORT; 346 return type (p) == T_PORT;
346} 347}
347 348
348INTERFACE int 349INTERFACE int
349is_inport (pointer p) 350is_inport (pointer p)
350{ 351{
351 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
352} 353}
353 354
354INTERFACE int 355INTERFACE int
355is_outport (pointer p) 356is_outport (pointer p)
356{ 357{
357 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
358} 359}
359 360
360INTERFACE int 361INTERFACE int
361is_pair (pointer p) 362is_pair (pointer p)
362{ 363{
363 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
364} 365}
365 366
366#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
367#define cdr(p) ((p)->object.cons.cdr + 0) 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368 369
369static pointer caar (pointer p) { return car (car (p)); } 370static pointer caar (pointer p) { return car (car (p)); }
370static pointer cadr (pointer p) { return car (cdr (p)); } 371static pointer cadr (pointer p) { return car (cdr (p)); }
371static pointer cdar (pointer p) { return cdr (car (p)); } 372static pointer cdar (pointer p) { return cdr (car (p)); }
372static pointer cddr (pointer p) { return cdr (cdr (p)); } 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
376static pointer cdaar (pointer p) { return cdr (car (car (p))); } 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377 378
378INTERFACE void 379INTERFACE void
379set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
380{ 381{
381 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
382} 383}
383 384
384INTERFACE void 385INTERFACE void
385set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
386{ 387{
387 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
388} 389}
389 390
390INTERFACE pointer 391INTERFACE pointer
391pair_car (pointer p) 392pair_car (pointer p)
392{ 393{
406} 407}
407 408
408INTERFACE char * 409INTERFACE char *
409symname (pointer p) 410symname (pointer p)
410{ 411{
411 return strvalue (car (p)); 412 return strvalue (p);
412} 413}
413 414
414#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
415SCHEME_EXPORT int 418SCHEME_EXPORT int
416hasprop (pointer p) 419hasprop (pointer p)
417{ 420{
418 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
419} 422}
420
421# define symprop(p) cdr(p)
422#endif 423#endif
423 424
424INTERFACE int 425INTERFACE int
425is_syntax (pointer p) 426is_syntax (pointer p)
426{ 427{
440} 441}
441 442
442INTERFACE char * 443INTERFACE char *
443syntaxname (pointer p) 444syntaxname (pointer p)
444{ 445{
445 return strvalue (car (p)); 446 return strvalue (p);
446} 447}
447 448
448#define procnum(p) ivalue_unchecked (p) 449#define procnum(p) ivalue_unchecked (p)
449static const char *procname (pointer x); 450static const char *procname (pointer x);
450 451
667 668
668static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
669static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
670static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
671ecb_inline int is_one_of (const char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
672static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
675static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
911#endif 912#endif
912} 913}
913 914
914/* allocate new cell segment */ 915/* allocate new cell segment */
915static int 916static int
916alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
917{ 918{
918 pointer newp; 919 struct cell *newp;
919 pointer last; 920 struct cell *last;
920 pointer p; 921 struct cell *p;
921 char *cp; 922 char *cp;
922 long i; 923 long i;
923 int k; 924 int k;
924 925
925 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
926 segsize <<= 1; 927 segsize <<= 1;
927 928
928 for (k = 0; k < n; k++)
929 {
930 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931 return k;
932
933 cp = malloc (segsize * sizeof (struct cell)); 929 cp = malloc (segsize * sizeof (struct cell));
934 930
935 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
936 return k; 932 return k;
937 933
938 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
939 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
940 936
941 newp = (pointer)cp; 937 newp = (struct cell *)cp;
942 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
943 SCHEME_V->cell_segsize[i] = segsize; 939 SCHEME_V->cell_segsize[i] = segsize;
944 SCHEME_V->fcells += segsize; 940 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 941 last = newp + segsize - 1;
946 942
947 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
948 { 944 {
945 pointer cp = POINTER (p);
949 set_typeflag (p, T_PAIR); 946 set_typeflag (cp, T_PAIR);
950 set_car (p, NIL); 947 set_car (cp, NIL);
951 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
952 } 949 }
953 950
954 set_cdr (last, SCHEME_V->free_cell); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
955 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
956 }
957 953
958 return n; 954 return 1;
959} 955}
960 956
961/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
962ecb_inline pointer 958ecb_inline pointer
963get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 964 return S_SINK;
969 965
970 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
971 { 967 {
972 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 968 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
973 969
974 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
975 971
976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
977 { 973 {
978 /* if only a few recovered, get more to avoid fruitless gc's */ 974 /* if only a few recovered, get more to avoid fruitless gc's */
979 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980 { 976 {
981#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
982 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
983 return S_SINK; 979 return S_SINK;
984#endif 980#endif
996 } 992 }
997} 993}
998 994
999/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
1000 Tehom */ 996 Tehom */
1001
1002static void 997static void
1003push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004{ 999{
1005 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006 1001
1028} 1023}
1029 1024
1030static pointer 1025static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 1027{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
1035 1030
1036 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1032 return S_SINK;
1038 1033
1039 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
1040 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
1041 1036
1042 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1043 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1044 fill_vector (v, 0, init); 1039 fill_vector (v, 0, init);
1045 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1046 1041
1047 return v; 1042 return v;
1048} 1043}
1057static void 1052static void
1058check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1059{ 1054{
1060 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1055 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1061 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1062 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1063 1058
1064 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1065 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1066} 1061}
1067 1062
1068static void 1063static void
1069check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1070{ 1065{
1092 set_cdr (x, b); 1087 set_cdr (x, b);
1093 1088
1094 return x; 1089 return x;
1095} 1090}
1096 1091
1097/* ========== oblist implementation ========== */
1098
1099static pointer 1092static pointer
1100generate_symbol (SCHEME_P_ const char *name) 1093generate_symbol (SCHEME_P_ const char *name)
1101{ 1094{
1102 pointer x = mk_string (SCHEME_A_ name); 1095 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1096 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL); 1097 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1098 return x;
1107} 1099}
1100
1101/* ========== oblist implementation ========== */
1108 1102
1109#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1110 1104
1111static int 1105static int
1112hash_fn (const char *key, int table_size) 1106hash_fn (const char *key, int table_size)
1199 1193
1200/* returns the new symbol */ 1194/* returns the new symbol */
1201static pointer 1195static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1197{
1204 pointer x = mk_string (SCHEME_A_ name); 1198 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); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1200 return x;
1209} 1201}
1210 1202
1211static pointer 1203static pointer
1221mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1222{ 1214{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1216
1225 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1218 set_port (x, p);
1227 1219
1228 return x; 1220 return x;
1229} 1221}
1230#endif 1222#endif
1231 1223
1232pointer 1224pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1226{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1228
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1239 1231
1240 return x; 1232 return x;
1241} 1233}
1242 1234
1243INTERFACE pointer 1235INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1245{ 1237{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1239
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1241 set_ivalue (x, c & 0xff);
1250 1242
1251 return x; 1243 return x;
1252} 1244}
1253 1245
1254/* get number atom (integer) */ 1246/* get number atom (integer) */
1255INTERFACE pointer 1247INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1248mk_integer (SCHEME_P_ long n)
1257{ 1249{
1250 pointer p = 0;
1251 pointer *pp = &p;
1252
1253#if USE_INTCACHE
1254 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1255 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1256#endif
1257
1258 if (!*pp)
1259 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1261
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1264 set_ivalue (x, n);
1262 1265
1266 *pp = x;
1267 }
1268
1263 return x; 1269 return *pp;
1264} 1270}
1265 1271
1266INTERFACE pointer 1272INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1268{ 1274{
1269#if USE_REAL 1275#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1277
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1279 set_rvalue (x, n);
1274 1280
1275 return x; 1281 return x;
1276#else 1282#else
1277 return mk_integer (SCHEME_A_ n); 1283 return mk_integer (SCHEME_A_ n);
1354 1360
1355 for (i = start; i < veclength (vec); i++) 1361 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1357} 1363}
1358 1364
1365INTERFACE void
1366vector_resize (pointer vec, uint32_t newsize, pointer fill)
1367{
1368 uint32_t oldsize = veclength (vec);
1369 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1370 veclength (vec) = newsize;
1371 fill_vector (vec, oldsize, fill);
1372}
1373
1359INTERFACE pointer 1374INTERFACE pointer
1360vector_get (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1361{ 1376{
1362 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1363} 1378}
1384INTERFACE pointer 1399INTERFACE pointer
1385gensym (SCHEME_P) 1400gensym (SCHEME_P)
1386{ 1401{
1387 pointer x; 1402 pointer x;
1388 char name[40] = "gensym-"; 1403 char name[40] = "gensym-";
1389 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1390 1405
1391 return generate_symbol (SCHEME_A_ name); 1406 return generate_symbol (SCHEME_A_ name);
1407}
1408
1409static int
1410is_gensym (SCHEME_P_ pointer x)
1411{
1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1392} 1413}
1393 1414
1394/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1395static pointer 1416static pointer
1396mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
1605 1626
1606/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1607static void 1628static void
1608gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1609{ 1630{
1610 pointer p;
1611 int i; 1631 int i;
1612 1632
1613 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1614 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1615 1635
1631 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1632 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1633 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1634 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1635 1655
1656#if USE_INTCACHE
1657 /* mark intcache */
1658 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1659 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1660 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1661#endif
1662
1636 /* mark variables a, b */ 1663 /* mark variables a, b */
1637 mark (a); 1664 mark (a);
1638 mark (b); 1665 mark (b);
1639 1666
1640 /* garbage collect */ 1667 /* garbage collect */
1641 clrmark (NIL); 1668 clrmark (NIL);
1642 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1643 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1644 1671
1645 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1646 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1647 (which are also kept sorted by address) downwards to build the 1674
1648 free-list in sorted order. 1675 uint32_t total = 0;
1649 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1651 { 1679 {
1652 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1680 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1681 struct cell *p;
1682 total += SCHEME_V->cell_segsize [i];
1653 1683
1654 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1655 { 1685 {
1686 pointer c = POINTER (p);
1687
1656 if (is_mark (p)) 1688 if (is_mark (c))
1657 clrmark (p); 1689 clrmark (c);
1658 else 1690 else
1659 { 1691 {
1660 /* reclaim cell */ 1692 /* reclaim cell */
1661 if (typeflag (p) != T_PAIR) 1693 if (typeflag (c) != T_PAIR)
1662 { 1694 {
1663 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1664 set_typeflag (p, T_PAIR); 1696 set_typeflag (c, T_PAIR);
1665 set_car (p, NIL); 1697 set_car (c, NIL);
1666 } 1698 }
1667 1699
1668 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1669 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1670 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1671 } 1703 }
1672 } 1704 }
1673 } 1705 }
1674 1706
1675 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1676 { 1708 {
1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1709 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1678 } 1710 }
1679} 1711}
1680 1712
1681static void 1713static void
1682finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1683{ 1715{
1684 /* TODO, fast bitmap check? */ 1716 /* TODO, fast bitmap check? */
1685 if (is_string (a)) 1717 if (is_string (a) || is_symbol (a))
1686 free (strvalue (a)); 1718 free (strvalue (a));
1687 else if (is_vector (a)) 1719 else if (is_vector (a))
1688 free (vecvalue (a)); 1720 free (vecvalue (a));
1689#if USE_PORTS 1721#if USE_PORTS
1690 else if (is_port (a)) 1722 else if (is_port (a))
1691 { 1723 {
1692 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1724 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1693 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1694 1726
1695 free (a->object.port); 1727 free (port (a));
1696 } 1728 }
1697#endif 1729#endif
1698} 1730}
1699 1731
1700/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
1716 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1717 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1749 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1718 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1750 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1719 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1751 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1720 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1721 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1753 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1722 1754
1723#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1724 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1725 1757
1726 if (fname) 1758 if (fname)
1743 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1744#if USE_PORTS 1776#if USE_PORTS
1745 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1746#endif 1778#endif
1747 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1748 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1780 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1749 } 1781 }
1750} 1782}
1751 1783
1752static int 1784static int
1753file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1754{ 1786{
1755#if USE_PORTS 1787#if USE_PORTS
1756 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1757 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1758 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1759#else 1791#else
1760 return 0; 1792 return 0;
1761#endif 1793#endif
1762} 1794}
1763 1795
1897} 1929}
1898 1930
1899static void 1931static void
1900port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1901{ 1933{
1902 port *pt = p->object.port; 1934 port *pt = port (p);
1903 1935
1904 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1905 1937
1906 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1907 { 1939 {
1928/* get new character from input file */ 1960/* get new character from input file */
1929static int 1961static int
1930inchar (SCHEME_P) 1962inchar (SCHEME_P)
1931{ 1963{
1932 int c; 1964 int c;
1933 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1934
1935 pt = SCHEME_V->inport->object.port;
1936 1966
1937 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1938 return EOF; 1968 return EOF;
1939 1969
1940 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
2007 port *pt; 2037 port *pt;
2008 2038
2009 if (c == EOF) 2039 if (c == EOF)
2010 return; 2040 return;
2011 2041
2012 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
2013 pt->unget = c; 2043 pt->unget = c;
2014#else 2044#else
2015 if (c == EOF) 2045 if (c == EOF)
2016 return; 2046 return;
2017 2047
2045 2075
2046INTERFACE void 2076INTERFACE void
2047putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2048{ 2078{
2049#if USE_PORTS 2079#if USE_PORTS
2050 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2051 2081
2052 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2053 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2054 else 2084 else
2055 for (; *s; s++) 2085 for (; *s; s++)
2057 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2058 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2059 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2060 2090
2061#else 2091#else
2062 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2063#endif 2093#endif
2064} 2094}
2065 2095
2066static void 2096static void
2067putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2068{ 2098{
2069#if USE_PORTS 2099#if USE_PORTS
2070 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2071 2101
2072 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2073 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2074 else 2104 else
2075 { 2105 {
2089 2119
2090INTERFACE void 2120INTERFACE void
2091putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2092{ 2122{
2093#if USE_PORTS 2123#if USE_PORTS
2094 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2095 2125
2096 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2097 { 2127 {
2098 char cc = c; 2128 char cc = c;
2099 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
2256 2286
2257/* check c is in chars */ 2287/* check c is in chars */
2258ecb_inline int 2288ecb_inline int
2259is_one_of (const char *s, int c) 2289is_one_of (const char *s, int c)
2260{ 2290{
2261 if (c == EOF)
2262 return 1;
2263
2264 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2265} 2292}
2266 2293
2267/* skip white characters */ 2294/* skip white characters */
2268ecb_inline int 2295ecb_inline int
2269skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2271 int c, curr_line = 0; 2298 int c, curr_line = 0;
2272 2299
2273 do 2300 do
2274 { 2301 {
2275 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2276#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2277 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2278 curr_line++; 2306 curr_line++;
2279#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2280 } 2311 }
2281 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2282 2313
2283 /* record it */ 2314 /* record it */
2284#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2285 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2316 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2286 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2317 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2287#endif 2318#endif
2288 2319
2289 if (c != EOF)
2290 {
2291 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2292 return 1; 2321 return 1;
2293 }
2294 else
2295 return EOF;
2296} 2322}
2297 2323
2298/* get token */ 2324/* get token */
2299static int 2325static int
2300token (SCHEME_P) 2326token (SCHEME_P)
2316 return TOK_RPAREN; 2342 return TOK_RPAREN;
2317 2343
2318 case '.': 2344 case '.':
2319 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2320 2346
2321 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2322 return TOK_DOT; 2348 return TOK_DOT;
2323 else 2349 else
2324 { 2350 {
2325 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2326 return TOK_DOTATOM; 2352 return TOK_DOTATOM;
2467 } 2493 }
2468 2494
2469 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2470} 2496}
2471 2497
2472
2473/* print atoms */ 2498/* print atoms */
2474static void 2499static void
2475printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2476{ 2501{
2477 char *p; 2502 char *p;
2478 int len; 2503 int len;
2479 2504
2480 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2481 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2482} 2507}
2483
2484 2508
2485/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2486static void 2510static void
2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2488{ 2512{
2649#endif 2673#endif
2650 } 2674 }
2651 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2652 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2653 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2654 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2655 2686
2656 *pp = p; 2687 *pp = p;
2657 *plen = strlen (p); 2688 *plen = strlen (p);
2658} 2689}
2659 2690
2929#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2930 2961
2931ecb_inline void 2962ecb_inline void
2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2933{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2966 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2935} 2967}
2936 2968
2937ecb_inline void 2969ecb_inline void
2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3039{ 3071{
3040 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3041 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3042 3074
3043 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3044 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3045 { 3077 {
3046 SCHEME_V->dump_size += STACK_GROWTH; 3078 SCHEME_V->dump_size += STACK_GROWTH;
3047 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3079 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3048 } 3080 }
3049 3081
3230 3262
3231#endif 3263#endif
3232 3264
3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3234 3266
3267#if EXPERIMENT
3268static int
3269debug (SCHEME_P_ int indent, pointer x)
3270{
3271 int c;
3272
3273 if (is_syntax (x))
3274 {
3275 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3276 return 8 + 8;
3277 }
3278
3279 if (x == NIL)
3280 {
3281 printf ("%*sNIL\n", indent, "");
3282 return 3;
3283 }
3284
3285 switch (type (x))
3286 {
3287 case T_INTEGER:
3288 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3289 return 32+8;
3290
3291 case T_SYMBOL:
3292 printf ("%*sS<%s>\n", indent, "", symname (x));
3293 return 24+8;
3294
3295 case T_CLOSURE:
3296 printf ("%*sS<%s>\n", indent, "", "closure");
3297 debug (SCHEME_A_ indent + 3, cdr(x));
3298 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3299
3300 case T_PAIR:
3301 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3302 c = debug (SCHEME_A_ indent + 3, car (x));
3303 c += debug (SCHEME_A_ indent + 3, cdr (x));
3304 return c + 1;
3305
3306 case T_PORT:
3307 printf ("%*sS<%s>\n", indent, "", "port");
3308 return 24+8;
3309
3310 case T_VECTOR:
3311 printf ("%*sS<%s>\n", indent, "", "vector");
3312 return 24+8;
3313
3314 case T_ENVIRONMENT:
3315 printf ("%*sS<%s>\n", indent, "", "environment");
3316 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3317
3318 default:
3319 printf ("unhandled type %d\n", type (x));
3320 break;
3321 }
3322}
3323#endif
3324
3235static int 3325static int
3236opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3237{ 3327{
3238 pointer args = SCHEME_V->args; 3328 pointer args = SCHEME_V->args;
3239 pointer x, y; 3329 pointer x, y;
3240 3330
3241 switch (op) 3331 switch (op)
3242 { 3332 {
3333#if EXPERIMENT //D
3334 case OP_DEBUG:
3335 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3336 printf ("\n");
3337 s_return (S_T);
3338#endif
3243 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3244 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3245 { 3341 {
3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3342 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3247 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3343 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3248 } 3344 }
3249 3345
3250 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3251 Error_1 ("unable to open", car (args)); 3347 Error_1 ("unable to open", car (args));
3252 else 3348 else
3256 } 3352 }
3257 3353
3258 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3259 3355
3260 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3261 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3262 { 3358 {
3263 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3264 { 3360 {
3265 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3266 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
3344#endif 3440#endif
3345 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3346 { 3442 {
3347 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3443 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3348 3444
3349 if (x != NIL) 3445 if (x == NIL)
3350 s_return (slot_value_in_env (x));
3351 else
3352 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3446 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3447
3448 s_return (slot_value_in_env (x));
3353 } 3449 }
3354 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3355 { 3451 {
3356 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3357 3453
3370 } 3466 }
3371 else 3467 else
3372 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3373 3469
3374 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3375 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3376 { 3472 {
3377 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3378 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3379 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3380 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3435 else if (is_foreign (SCHEME_V->code)) 3531 else if (is_foreign (SCHEME_V->code))
3436 { 3532 {
3437 /* Keep nested calls from GC'ing the arglist */ 3533 /* Keep nested calls from GC'ing the arglist */
3438 push_recent_alloc (SCHEME_A_ args, NIL); 3534 push_recent_alloc (SCHEME_A_ args, NIL);
3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3535 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3440 3536
3441 s_return (x); 3537 s_return (x);
3442 } 3538 }
3443 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3539 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3444 { 3540 {
3481 3577
3482 case OP_DOMACRO: /* do macro */ 3578 case OP_DOMACRO: /* do macro */
3483 SCHEME_V->code = SCHEME_V->value; 3579 SCHEME_V->code = SCHEME_V->value;
3484 s_goto (OP_EVAL); 3580 s_goto (OP_EVAL);
3485 3581
3486#if 1
3487
3488 case OP_LAMBDA: /* lambda */ 3582 case OP_LAMBDA: /* lambda */
3489 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3583 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3490 set SCHEME_V->value fall thru */ 3584 set SCHEME_V->value fall thru */
3491 { 3585 {
3492 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3586 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3498 SCHEME_V->code = slot_value_in_env (f); 3592 SCHEME_V->code = slot_value_in_env (f);
3499 s_goto (OP_APPLY); 3593 s_goto (OP_APPLY);
3500 } 3594 }
3501 3595
3502 SCHEME_V->value = SCHEME_V->code; 3596 SCHEME_V->value = SCHEME_V->code;
3503 /* Fallthru */
3504 } 3597 }
3598 /* Fallthru */
3505 3599
3506 case OP_LAMBDA1: 3600 case OP_LAMBDA1:
3507 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3601 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3508
3509#else
3510
3511 case OP_LAMBDA: /* lambda */
3512 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3513
3514#endif
3515 3602
3516 case OP_MKCLOSURE: /* make-closure */ 3603 case OP_MKCLOSURE: /* make-closure */
3517 x = car (args); 3604 x = car (args);
3518 3605
3519 if (car (x) == SCHEME_V->LAMBDA) 3606 if (car (x) == SCHEME_V->LAMBDA)
4115 else 4202 else
4116 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4117 4204
4118 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4119 4206
4120 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4121 s_return (caar (args)); 4208 case OP_CAR: op_car: s_return (car (x));
4122 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4123 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4124 s_return (cdar (args)); 4211 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4212 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4213 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4214 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4215 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4216 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4217 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4218 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4219 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4220 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4221 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4222 case OP_CAAAAR: x = car (x); goto op_caaar;
4223 case OP_CAAADR: x = cdr (x); goto op_caaar;
4224 case OP_CAADAR: x = car (x); goto op_caadr;
4225 case OP_CAADDR: x = cdr (x); goto op_caadr;
4226 case OP_CADAAR: x = car (x); goto op_cadar;
4227 case OP_CADADR: x = cdr (x); goto op_cadar;
4228 case OP_CADDAR: x = car (x); goto op_caddr;
4229 case OP_CADDDR: x = cdr (x); goto op_caddr;
4230 case OP_CDAAAR: x = car (x); goto op_cdaar;
4231 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4232 case OP_CDADAR: x = car (x); goto op_cdadr;
4233 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4234 case OP_CDDAAR: x = car (x); goto op_cddar;
4235 case OP_CDDADR: x = cdr (x); goto op_cddar;
4236 case OP_CDDDAR: x = car (x); goto op_cdddr;
4237 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4125 4238
4126 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4127 set_cdr (args, cadr (args)); 4240 set_cdr (args, cadr (args));
4128 s_return (args); 4241 s_return (args);
4129 4242
4378 } 4491 }
4379 4492
4380 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4381 s_return (mk_integer (SCHEME_A_ veclength (x))); 4494 s_return (mk_integer (SCHEME_A_ veclength (x)));
4382 4495
4496 case OP_VECRESIZE:
4497 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4498 s_return (x);
4499
4383 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4384 { 4501 {
4385 int index = ivalue_unchecked (cadr (args)); 4502 int index = ivalue_unchecked (cadr (args));
4386 4503
4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4447 pointer d = cdr (args); 4564 pointer d = cdr (args);
4448 int r; 4565 int r;
4449 4566
4450 switch (op) 4567 switch (op)
4451 { 4568 {
4452 case OP_NOT: /* not */ r = is_false (a) ; break; 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4453 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4570 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break; 4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4573 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4574 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4578 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4462 4580
4463#if USE_CHAR_CLASSIFIERS 4581#if USE_CHAR_CLASSIFIERS
4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4516 } 4634 }
4517 else 4635 else
4518 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4519 4637
4520 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4521 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4522 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4523 4641
4524#if USE_PORTS 4642#if USE_PORTS
4525 4643
4526 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
4671 SCHEME_V->gc_verbose = (a != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4672 s_retbool (was); 4790 s_retbool (was);
4673 } 4791 }
4674 4792
4675 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4676 if (!is_pair (args) || !is_number (a)) 4795 if (!is_pair (args) || !is_number (a))
4677 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4678 4797#endif
4679 alloc_cellseg (SCHEME_A_ ivalue (a)); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4680
4681 s_return (S_T);
4682 4799
4683 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4684 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4685 4802
4686#if USE_PORTS 4803#if USE_PORTS
4756 s_return (p == NIL ? S_F : p); 4873 s_return (p == NIL ? S_F : p);
4757 } 4874 }
4758 4875
4759 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
4760 { 4877 {
4761 port *p; 4878 port *p = port (a);
4762 4879
4763 if ((p = a->object.port)->kind & port_string) 4880 if (p->kind & port_string)
4764 { 4881 {
4765 off_t size; 4882 off_t size;
4766 char *str; 4883 char *str;
4767 4884
4768 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
4873 int res; 4990 int res;
4874 4991
4875 if (is_pair (args)) 4992 if (is_pair (args))
4876 p = car (args); 4993 p = car (args);
4877 4994
4878 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
4879 4996
4880 s_retbool (res); 4997 s_retbool (res);
4881 } 4998 }
4882 4999
4883 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))); 5064 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948 5065
4949 case TOK_DOTATOM: 5066 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.'; 5067 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5068 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5069
5070 case TOK_STRATOM:
5071 x = readstrexp (SCHEME_A_ '|');
5072 //TODO: haven't checked whether the garbage collector could interfere
5073 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4952 5074
4953 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
4954 x = readstrexp (SCHEME_A_ '"'); 5076 x = readstrexp (SCHEME_A_ '"');
4955 5077
4956 if (x == S_F) 5078 if (x == S_F)
5203 5325
5204 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5205 /* 5327 /*
5206 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5207 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5208 */ 5331 */
5209 s_retbool (is_closure (a)); 5332 s_retbool (is_closure (a));
5210 5333
5211 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5212 s_retbool (is_macro (a)); 5335 s_retbool (is_macro (a));
5417 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5540 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5418 return; 5541 return;
5419 5542
5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5421 { 5544 {
5422 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5423 return; 5546 return;
5424 } 5547 }
5425 } 5548 }
5426} 5549}
5427 5550
5453 5576
5454/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5577/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5455static int 5578static int
5456syntaxnum (pointer p) 5579syntaxnum (pointer p)
5457{ 5580{
5458 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5459 5582
5460 switch (strlength (car (p))) 5583 switch (strlength (p))
5461 { 5584 {
5462 case 2: 5585 case 2:
5463 if (s[0] == 'i') 5586 if (s[0] == 'i')
5464 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5465 else 5588 else
5540ecb_cold int 5663ecb_cold int
5541scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5542{ 5665{
5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5544 pointer x; 5667 pointer x;
5668
5669 /* this memset is not strictly correct, as we assume (intcache)
5670 * that memset 0 will also set pointers to 0, but memset does
5671 * of course not guarantee that. screw such systems.
5672 */
5673 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5545 5674
5546 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5547 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5548 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5549 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
5561 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5562 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5563 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5564 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5565 5694
5566 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5567 { 5696 {
5568#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5569 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5570 return 0; 5699 return 0;
5571#endif 5700#endif
5901# endif 6030# endif
5902 int fin; 6031 int fin;
5903 char *file_name = InitFile; 6032 char *file_name = InitFile;
5904 int retcode; 6033 int retcode;
5905 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
5906 6036
5907 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5908 { 6038 {
5909 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5910 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5911 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
5912 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5913 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5914 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5915 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5916 return 1; 6046 return 1;
5917 } 6047 }
5918 6048
5919 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
5920 { 6050 {
5921 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
5922 return 2; 6052 return 2;
5923 } 6053 }
5924 6054
5925# if USE_PORTS 6055# if USE_PORTS
5926 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
5971 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
5972#endif 6102#endif
5973 6103
5974 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
5975 { 6105 {
5976 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6106 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5977 } 6107 }
5978 else 6108 else
5979 { 6109 {
5980 if (isfile) 6110 if (isfile)
5981 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
5985#if USE_PORTS 6115#if USE_PORTS
5986 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
5987 { 6117 {
5988 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
5989 { 6119 {
5990 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6120 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5991 } 6121 }
5992 6122
5993 if (isfile) 6123 if (isfile)
5994 close (fin); 6124 close (fin);
5995 } 6125 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines