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.29 by root, Sat Nov 28 10:31:06 2015 UTC vs.
Revision 1.70 by root, Mon Dec 7 22:13:31 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 PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
46 68
47enum { 69enum {
48 TOK_EOF, 70 TOK_EOF,
49 TOK_LPAREN, 71 TOK_LPAREN,
50 TOK_RPAREN, 72 TOK_RPAREN,
51 TOK_DOT, 73 TOK_DOT,
52 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 77 TOK_QUOTE,
54 TOK_DQUOTE, 78 TOK_DQUOTE,
55 TOK_BQUOTE, 79 TOK_BQUOTE,
56 TOK_COMMA, 80 TOK_COMMA,
57 TOK_ATMARK, 81 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
60 TOK_VEC 84 TOK_VEC
61}; 85};
62 86
63#define BACKQUOTE '`' 87#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
65 90
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 96
72#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
73static scheme sc; 98static scheme sc;
74#endif 99#endif
75 100
76static void 101ecb_cold static void
77xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
78{ 103{
79 if (n < 0) 104 if (n < 0)
80 { 105 {
81 *s++ = '-'; 106 *s++ = '-';
… …
83 } 108 }
84 109
85 char *p = s; 110 char *p = s;
86 111
87 do { 112 do {
88 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 114 n /= base;
90 } while (n); 115 } while (n);
91 116
92 *p-- = 0; 117 *p-- = 0;
93 118
… …
96 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
97 --p; ++s; 122 --p; ++s;
98 } 123 }
99} 124}
100 125
101static void 126ecb_cold static void
102xnum (char *s, long n) 127xnum (char *s, long n)
103{ 128{
104 xbase (s, n, 10); 129 xbase (s, n, 10);
105} 130}
106 131
107static void 132ecb_cold static void
108xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 134{
116 char buf[64]; 135 char buf[64];
117 136
118 xnum (buf, n); 137 xnum (buf, n);
119 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
120} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
121 144
122static char 145static char
123xtoupper (char c) 146xtoupper (char c)
124{ 147{
125 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
145 168
146#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
149 172
173#endif
174
150#if USE_IGNORECASE 175#if USE_IGNORECASE
151static const char * 176ecb_cold static const char *
152xstrlwr (char *s) 177xstrlwr (char *s)
153{ 178{
154 const char *p = s; 179 const char *p = s;
155 180
156 while (*s) 181 while (*s)
… …
169# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
170# define strlwr(s) (s) 195# define strlwr(s) (s)
171#endif 196#endif
172 197
173#ifndef prompt 198#ifndef prompt
174# define prompt "ts> " 199# define prompt "ms> "
175#endif 200#endif
176 201
177#ifndef InitFile 202#ifndef InitFile
178# define InitFile "init.scm" 203# define InitFile "init.scm"
179#endif 204#endif
180 205
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 206enum scheme_types
186{ 207{
187 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
188 T_REAL, 210 T_REAL,
189 T_STRING, 211 T_STRING,
190 T_SYMBOL, 212 T_SYMBOL,
191 T_PROC, 213 T_PROC,
192 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
194 T_CONTINUATION, 218 T_CONTINUATION,
195 T_FOREIGN, 219 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 220 T_PORT,
198 T_VECTOR, 221 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 222 T_PROMISE,
201 T_ENVIRONMENT, 223 T_ENVIRONMENT,
202 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
203 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
204}; 227};
205 228
206#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
207#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
208#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
209#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
211 234
212/* num, for generic arithmetic */ 235/* num, for generic arithmetic */
213struct num 236struct num
214{ 237{
215 IVALUE ivalue; 238 IVALUE ivalue;
… …
240static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
241static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
242static num num_rem (num a, num b); 265static num num_rem (num a, num b);
243static num num_mod (num a, num b); 266static num num_mod (num a, num b);
244 267
245#if USE_MATH
246static double round_per_R5RS (double x);
247#endif
248static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
249 269
250static num num_zero; 270static num num_zero;
251static num num_one; 271static num num_one;
252 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
253/* macros for cell operations */ 277/* macros for cell operations */
254#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
255#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
256#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
257 281
258INTERFACE int 282INTERFACE int
259is_string (pointer p) 283is_string (pointer p)
260{ 284{
261 return type (p) == T_STRING; 285 return type (p) == T_STRING;
262} 286}
263 287
264#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
265#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
266 290
267INTERFACE int 291INTERFACE int
268is_vector (pointer p) 292is_vector (pointer p)
269{ 293{
270 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
271} 295}
272 296
273#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
274#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
278 302
279INTERFACE int 303INTERFACE int
… …
305string_value (pointer p) 329string_value (pointer p)
306{ 330{
307 return strvalue (p); 331 return strvalue (p);
308} 332}
309 333
310#define ivalue_unchecked(p) (p)->object.ivalue 334#define ivalue_unchecked(p) (CELL(p)->object.ivalue + 0)
311#define set_ivalue(p,v) (p)->object.ivalue = (v) 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
312 336
313#if USE_REAL 337#if USE_REAL
314#define rvalue_unchecked(p) (p)->object.rvalue 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
315#define set_rvalue(p,v) (p)->object.rvalue = (v) 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
316#else 340#else
317#define rvalue_unchecked(p) (p)->object.ivalue 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
318#define set_rvalue(p,v) (p)->object.ivalue = (v) 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
319#endif 343#endif
320 344
321INTERFACE long 345INTERFACE long
322charvalue (pointer p) 346charvalue (pointer p)
323{ 347{
324 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
325} 349}
326 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
327INTERFACE int 353INTERFACE int
328is_port (pointer p) 354is_port (pointer p)
329{ 355{
330 return type (p) == T_PORT; 356 return type (p) == T_PORT;
331} 357}
332 358
333INTERFACE int 359INTERFACE int
334is_inport (pointer p) 360is_inport (pointer p)
335{ 361{
336 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
337} 363}
338 364
339INTERFACE int 365INTERFACE int
340is_outport (pointer p) 366is_outport (pointer p)
341{ 367{
342 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
343} 369}
344 370
345INTERFACE int 371INTERFACE int
346is_pair (pointer p) 372is_pair (pointer p)
347{ 373{
348 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
349} 375}
350 376
351#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
352#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
353 379
354static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
355static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
356static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
357static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
358 384
359static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
360static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
361static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
363INTERFACE void 391INTERFACE void
364set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
365{ 393{
366 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
367} 395}
368 396
369INTERFACE void 397INTERFACE void
370set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
371{ 399{
372 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
373} 401}
374 402
375INTERFACE pointer 403INTERFACE pointer
376pair_car (pointer p) 404pair_car (pointer p)
377{ 405{
… …
391} 419}
392 420
393INTERFACE char * 421INTERFACE char *
394symname (pointer p) 422symname (pointer p)
395{ 423{
396 return strvalue (car (p)); 424 return strvalue (p);
397} 425}
398 426
399#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
400SCHEME_EXPORT int 430SCHEME_EXPORT int
401hasprop (pointer p) 431hasprop (pointer p)
402{ 432{
403 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
404} 434}
405
406# define symprop(p) cdr(p)
407#endif 435#endif
408 436
409INTERFACE int 437INTERFACE int
410is_syntax (pointer p) 438is_syntax (pointer p)
411{ 439{
… …
425} 453}
426 454
427INTERFACE char * 455INTERFACE char *
428syntaxname (pointer p) 456syntaxname (pointer p)
429{ 457{
430 return strvalue (car (p)); 458 return strvalue (p);
431} 459}
432 460
433#define procnum(p) ivalue_unchecked (p) 461#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 462static const char *procname (pointer x);
435 463
… …
483 511
484#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
485#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
486#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
487 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
488#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
489#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
490#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
491 525
492INTERFACE int 526INTERFACE int
493is_immutable (pointer p) 527is_immutable (pointer p)
494{ 528{
495 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
507 proper list: length 541 proper list: length
508 circular list: -1 542 circular list: -1
509 not even a pair: -2 543 not even a pair: -2
510 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
511*/ 545*/
512INTERFACE int 546ecb_hot INTERFACE int
513list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
514{ 548{
515 int i = 0; 549 int i = 0;
516 pointer slow, fast; 550 pointer slow, fast;
517 551
… …
556{ 590{
557 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
558} 592}
559 593
560#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
561ecb_inline int 596ecb_inline int
562Cisalpha (int c) 597Cisalpha (int c)
563{ 598{
564 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
565} 600}
… …
623 "gs", 658 "gs",
624 "rs", 659 "rs",
625 "us" 660 "us"
626}; 661};
627 662
628static int 663ecb_cold static int
629is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
630{ 665{
631 int i; 666 int i;
632 667
633 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
651#endif 686#endif
652 687
653static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
654static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
655static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
656ecb_inline int is_one_of (char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
657static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
660static int count_consecutive_cells (pointer x, int needed);
661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
662static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
664static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
665static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
666static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
667 701
702static pointer mk_port (SCHEME_P_ port *p);
703
668#if USE_PORTS 704#if USE_PORTS
669static pointer mk_port (SCHEME_P_ port *p);
670static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
671static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
672static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
673static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
674static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
675static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
676static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
677#endif 712#endif
713
678static void mark (pointer a); 714static void mark (pointer a);
679static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
680static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
681static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
682static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
683static char *readstr_upto (SCHEME_P_ char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684static pointer readstrexp (SCHEME_P); 720static pointer readstrexp (SCHEME_P_ char delim);
685ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
686static int token (SCHEME_P); 722static int token (SCHEME_P);
687static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
856 } 892 }
857 893
858 return ret; 894 return ret;
859} 895}
860 896
861#if USE_MATH
862
863/* Round to nearest. Round to even if midway */
864static double
865round_per_R5RS (double x)
866{
867 double fl = floor (x);
868 double ce = ceil (x);
869 double dfl = x - fl;
870 double dce = ce - x;
871
872 if (dfl > dce)
873 return ce;
874 else if (dfl < dce)
875 return fl;
876 else
877 {
878 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl;
880 else
881 return ce;
882 }
883}
884#endif
885
886static int 897static int
887is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
888{ 899{
889 return x == 0; 900 return x == 0;
890#if 0 901#if 0
… …
895#endif 906#endif
896#endif 907#endif
897} 908}
898 909
899/* allocate new cell segment */ 910/* allocate new cell segment */
900static int 911ecb_cold static int
901alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
902{ 913{
903 pointer newp; 914 struct cell *newp;
904 pointer last; 915 struct cell *last;
905 pointer p; 916 struct cell *p;
906 char *cp; 917 char *cp;
907 long i; 918 long i;
908 int k; 919 int k;
909 920
910 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
911 segsize <<= 1; 922 segsize <<= 1;
912 923
913 for (k = 0; k < n; k++)
914 {
915 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
916 return k;
917
918 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
919 925
920 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
921 return k; 927 return k;
922 928
923 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
924 SCHEME_V->alloc_seg[i] = cp;
925 930
926 newp = (pointer)cp; 931 newp = (struct cell *)cp;
927 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
928 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
929 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
930 last = newp + segsize - 1; 935 last = newp + segsize - 1;
931 936
932 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
933 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
934 set_typeflag (p, T_PAIR); 941 set_typeflag (cp, T_PAIR);
935 set_car (p, NIL); 942 set_car (cp, NIL);
936 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
937 } 944 }
938 945
939 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
940 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
941 }
942 948
943 return n; 949 return 1;
944} 950}
945 951
946/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
947ecb_inline pointer 953ecb_inline pointer
948get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953 return S_SINK; 959 return S_SINK;
954 960
955 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
956 { 962 {
957 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
958 964
959 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
960 966
961 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
962 { 968 {
963 /* if only a few recovered, get more to avoid fruitless gc's */ 969 /* if only a few recovered, get more to avoid fruitless gc's */
964 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
965 { 971 {
966#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
967 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
968 return S_SINK; 974 return S_SINK;
969#endif 975#endif
… …
981 } 987 }
982} 988}
983 989
984/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
985 Tehom */ 991 Tehom */
986 992ecb_hot static void
987static void
988push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
989{ 994{
990 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
991 996
992 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
994 set_car (holder, recent); 999 set_car (holder, recent);
995 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
996 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
997} 1002}
998 1003
999static pointer 1004ecb_hot static pointer
1000get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1001{ 1006{
1002 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1003 1008
1004 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1013} 1018}
1014 1019
1015static pointer 1020static pointer
1016get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017{ 1022{
1018 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
1020 1025
1021 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
1022 return S_SINK; 1027 return S_SINK;
1023 1028
1024 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1025 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1026 1031
1027 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1028 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1029 fill_vector (v, 0, init); 1034 fill_vector (v, 0, init);
1030 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1031 1036
1032 return v; 1037 return v;
1033} 1038}
… …
1042static void 1047static void
1043check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1044{ 1049{
1045 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1046 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1047 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1048 1053
1049 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1050 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1051} 1056}
1052 1057
1053static void 1058static void
1054check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1055{ 1060{
… …
1061#endif 1066#endif
1062 1067
1063/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1064 1069
1065/* get new cons cell */ 1070/* get new cons cell */
1066pointer 1071ecb_hot static pointer
1067xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1068{ 1073{
1069 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1070 1075
1071 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1072
1073 if (immutable)
1074 setimmutable (x);
1075 1077
1076 set_car (x, a); 1078 set_car (x, a);
1077 set_cdr (x, b); 1079 set_cdr (x, b);
1078 1080
1079 return x; 1081 return x;
1080} 1082}
1081 1083
1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1096generate_symbol (SCHEME_P_ const char *name)
1097{
1098 pointer x = mk_string (SCHEME_A_ name);
1099 setimmutable (x);
1100 set_typeflag (x, T_SYMBOL | T_ATOM);
1101 return x;
1102}
1103
1082/* ========== oblist implementation ========== */ 1104/* ========== oblist implementation ========== */
1083 1105
1084#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1085 1107
1108static int
1086static int hash_fn (const char *key, int table_size); 1109hash_fn (const char *key, int table_size)
1110{
1111 const unsigned char *p = (unsigned char *)key;
1112 uint32_t hash = 2166136261U;
1087 1113
1114 while (*p)
1115 hash = (hash ^ *p++) * 16777619;
1116
1117 return hash % table_size;
1118}
1119
1088static pointer 1120ecb_cold static pointer
1089oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1090{ 1122{
1091 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1092} 1124}
1093 1125
1094/* returns the new symbol */ 1126/* returns the new symbol */
1095static pointer 1127ecb_cold static pointer
1096oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1097{ 1129{
1098 int location; 1130 pointer x = generate_symbol (SCHEME_A_ name);
1099
1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1101 set_typeflag (x, T_SYMBOL);
1102 setimmutable (car (x));
1103
1104 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1106 return x; 1133 return x;
1107} 1134}
1108 1135
1109ecb_inline pointer 1136ecb_cold static pointer
1110oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1111{ 1138{
1112 int location; 1139 int location;
1113 pointer x; 1140 pointer x;
1114 char *s; 1141 char *s;
… …
1125 } 1152 }
1126 1153
1127 return NIL; 1154 return NIL;
1128} 1155}
1129 1156
1130static pointer 1157ecb_cold static pointer
1131oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1132{ 1159{
1133 int i; 1160 int i;
1134 pointer x; 1161 pointer x;
1135 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
… …
1141 return ob_list; 1168 return ob_list;
1142} 1169}
1143 1170
1144#else 1171#else
1145 1172
1146static pointer 1173ecb_cold static pointer
1147oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1148{ 1175{
1149 return NIL; 1176 return NIL;
1150} 1177}
1151 1178
1152ecb_inline pointer 1179ecb_cold static pointer
1153oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1154{ 1181{
1155 pointer x; 1182 pointer x;
1156 char *s; 1183 char *s;
1157 1184
… …
1166 1193
1167 return NIL; 1194 return NIL;
1168} 1195}
1169 1196
1170/* returns the new symbol */ 1197/* returns the new symbol */
1171static pointer 1198ecb_cold static pointer
1172oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1173{ 1200{
1174 pointer x; 1201 pointer x = generate_symbol (SCHEME_A_ name);
1175
1176 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1177 set_typeflag (x, T_SYMBOL);
1178 setimmutable (car (x));
1179 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1180 return x; 1203 return x;
1181} 1204}
1182 1205
1183static pointer 1206ecb_cold static pointer
1184oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1185{ 1208{
1186 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1187} 1210}
1188 1211
1189#endif 1212#endif
1190 1213
1191#if USE_PORTS
1192static pointer 1214ecb_cold static pointer
1193mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1194{ 1216{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1218
1197 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1198 x->object.port = p; 1220 set_port (x, p);
1199 1221
1200 return x; 1222 return x;
1201} 1223}
1202#endif
1203 1224
1204pointer 1225ecb_cold pointer
1205mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1206{ 1227{
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1229
1209 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1210 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1211 1232
1212 return x; 1233 return x;
1213} 1234}
1214 1235
1215INTERFACE pointer 1236INTERFACE pointer
1216mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1217{ 1238{
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1240
1220 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1221 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1222 1243
1223 return x; 1244 return x;
1224} 1245}
1225 1246
1226/* get number atom (integer) */ 1247/* get number atom (integer) */
1227INTERFACE pointer 1248INTERFACE pointer
1228mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1229{ 1250{
1251 pointer p = 0;
1252 pointer *pp = &p;
1253
1254#if USE_INTCACHE
1255 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1256 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1257#endif
1258
1259 if (!*pp)
1260 {
1230 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1231 1262
1232 set_typeflag (x, (T_INTEGER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1264 setimmutable (x); /* shouldn't do anything, doesn't cost anything */
1233 set_ivalue (x, n); 1265 set_ivalue (x, n);
1234 1266
1267 *pp = x;
1268 }
1269
1235 return x; 1270 return *pp;
1236} 1271}
1237 1272
1238INTERFACE pointer 1273INTERFACE pointer
1239mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1240{ 1275{
1241#if USE_REAL 1276#if USE_REAL
1242 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1243 1278
1244 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1245 set_rvalue (x, n); 1280 set_rvalue (x, n);
1246 1281
1247 return x; 1282 return x;
1248#else 1283#else
1249 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1273 SCHEME_V->no_memory = 1; 1308 SCHEME_V->no_memory = 1;
1274 return SCHEME_V->strbuff; 1309 return SCHEME_V->strbuff;
1275 } 1310 }
1276 1311
1277 if (str) 1312 if (str)
1278 { 1313 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1279 int l = strlen (str);
1280
1281 if (l > len_str)
1282 l = len_str;
1283
1284 memcpy (q, str, l);
1285 q[l] = 0;
1286 }
1287 else 1314 else
1288 {
1289 memset (q, fill, len_str); 1315 memset (q, fill, len_str);
1316
1290 q[len_str] = 0; 1317 q[len_str] = 0;
1291 }
1292 1318
1293 return q; 1319 return q;
1294} 1320}
1295 1321
1296INTERFACE pointer 1322INTERFACE pointer
… …
1310 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1336 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1311 1337
1312 set_typeflag (x, T_STRING | T_ATOM); 1338 set_typeflag (x, T_STRING | T_ATOM);
1313 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1339 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1314 strlength (x) = len; 1340 strlength (x) = len;
1341
1315 return x; 1342 return x;
1316} 1343}
1317 1344
1318INTERFACE pointer 1345INTERFACE pointer
1319mk_string (SCHEME_P_ const char *str) 1346mk_string (SCHEME_P_ const char *str)
… …
1332{ 1359{
1333 int i; 1360 int i;
1334 1361
1335 for (i = start; i < veclength (vec); i++) 1362 for (i = start; i < veclength (vec); i++)
1336 vecvalue (vec)[i] = obj; 1363 vecvalue (vec)[i] = obj;
1364}
1365
1366INTERFACE void
1367vector_resize (pointer vec, uint32_t newsize, pointer fill)
1368{
1369 uint32_t oldsize = veclength (vec);
1370 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1371 veclength (vec) = newsize;
1372 fill_vector (vec, oldsize, fill);
1337} 1373}
1338 1374
1339INTERFACE pointer 1375INTERFACE pointer
1340vector_get (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1341{ 1377{
… …
1359 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1360 1396
1361 return x; 1397 return x;
1362} 1398}
1363 1399
1364INTERFACE pointer 1400ecb_cold INTERFACE pointer
1365gensym (SCHEME_P) 1401gensym (SCHEME_P)
1366{ 1402{
1367 pointer x; 1403 pointer x;
1368
1369 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1370 {
1371 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1372 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1373 1406
1374 /* first check oblist */ 1407 return generate_symbol (SCHEME_A_ name);
1375 x = oblist_find_by_name (SCHEME_A_ name); 1408}
1376 1409
1377 if (x == NIL) 1410static int
1378 { 1411is_gensym (SCHEME_P_ pointer x)
1379 x = oblist_add_by_name (SCHEME_A_ name); 1412{
1380 return x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1381 }
1382 }
1383
1384 return NIL;
1385} 1414}
1386 1415
1387/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1388static pointer 1417ecb_cold static pointer
1389mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1390{ 1419{
1391 char c, *p; 1420 char c, *p;
1392 int has_dec_point = 0; 1421 int has_dec_point = 0;
1393 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1464 1493
1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1466} 1495}
1467 1496
1468/* make constant */ 1497/* make constant */
1469static pointer 1498ecb_cold static pointer
1470mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1471{ 1500{
1472 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1473 return S_T; 1502 return S_T;
1474 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1475 return S_F; 1504 return S_F;
1476 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1477 { 1506 {
1478 int c; 1507 int c;
1479 1508
1509 // TODO: optimise
1480 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1481 c = ' '; 1511 c = ' ';
1482 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1483 c = '\n'; 1513 c = '\n';
1484 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1485 c = '\r'; 1515 c = '\r';
1486 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1487 c = '\t'; 1517 c = '\t';
1518 else if (stricmp (name + 1, "alarm") == 0)
1519 c = 0x07;
1520 else if (stricmp (name + 1, "backspace") == 0)
1521 c = 0x08;
1522 else if (stricmp (name + 1, "escape") == 0)
1523 c = 0x1b;
1524 else if (stricmp (name + 1, "delete") == 0)
1525 c = 0x7f;
1526 else if (stricmp (name + 1, "null") == 0)
1527 c = 0;
1488 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1489 { 1529 {
1490 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1491 1531
1492 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1506 return mk_character (SCHEME_A_ c); 1546 return mk_character (SCHEME_A_ c);
1507 } 1547 }
1508 else 1548 else
1509 { 1549 {
1510 /* identify base by string index */ 1550 /* identify base by string index */
1511 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x"; 1551 const char baseidx[18] = "ffbf" "ffff" "ofdf" "ffff" "x";
1512 char *base = strchr (baseidx, *name); 1552 char *base = strchr (baseidx, *name);
1513 1553
1514 if (base) 1554 if (base && *base)
1515 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx)); 1555 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1516 1556
1517 return NIL; 1557 return NIL;
1518 } 1558 }
1519} 1559}
1520 1560
1521/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1522 1581
1523/*-- 1582/*--
1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1526 * for marking. 1585 * for marking.
1527 * 1586 *
1528 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another 1588 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector 1589 * word of context in the vector
1531 */ 1590 */
1532static void 1591ecb_hot static void
1533mark (pointer a) 1592mark (pointer a)
1534{ 1593{
1535 pointer t, q, p; 1594 pointer t, q, p;
1536 1595
1537 t = 0; 1596 t = 0;
… …
1594 p = q; 1653 p = q;
1595 goto E6; 1654 goto E6;
1596 } 1655 }
1597} 1656}
1598 1657
1658ecb_hot static void
1659gc_free (SCHEME_P)
1660{
1661 int i;
1662 uint32_t total = 0;
1663
1664 /* Here we scan the cells to build the free-list. */
1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1666 {
1667 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1668 struct cell *p;
1669 total += SCHEME_V->cell_segsize [i];
1670
1671 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1672 {
1673 pointer c = POINTER (p);
1674
1675 if (is_mark (c))
1676 clrmark (c);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (c) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ c);
1683 set_typeflag (c, T_PAIR);
1684 set_car (c, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (c, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = c;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 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");
1697 }
1698}
1699
1599/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1600static void 1701ecb_cold static void
1601gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1602{ 1703{
1603 pointer p;
1604 int i; 1704 int i;
1605 1705
1606 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1607 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1608 1708
… …
1624 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1625 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1626 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1627 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1628 1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1734#endif
1735
1629 /* mark variables a, b */ 1736 /* mark variables a, b */
1630 mark (a); 1737 mark (a);
1631 mark (b); 1738 mark (b);
1632 1739
1633 /* garbage collect */ 1740 /* garbage collect */
1634 clrmark (NIL); 1741 clrmark (NIL);
1635 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1636 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1637 1744
1638 /* free-list is kept sorted by address so as to maintain consecutive
1639 ranges, if possible, for use with vectors. Here we scan the cells
1640 (which are also kept sorted by address) downwards to build the
1641 free-list in sorted order.
1642 */
1643 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1644 {
1645 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1646
1647 while (--p >= SCHEME_V->cell_seg[i])
1648 {
1649 if (is_mark (p))
1650 clrmark (p);
1651 else
1652 {
1653 /* reclaim cell */
1654 if (typeflag (p) != T_PAIR)
1655 {
1656 finalize_cell (SCHEME_A_ p);
1657 set_typeflag (p, T_PAIR);
1658 set_car (p, NIL);
1659 }
1660
1661 ++SCHEME_V->fcells;
1662 set_cdr (p, SCHEME_V->free_cell);
1663 SCHEME_V->free_cell = p;
1664 }
1665 }
1666 }
1667
1668 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1669 { 1746 putstr (SCHEME_A_ "freeing...");
1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1672}
1673 1747
1674static void 1748 gc_free (SCHEME_A);
1675finalize_cell (SCHEME_P_ pointer a)
1676{
1677 /* TODO, fast bitmap check? */
1678 if (is_string (a))
1679 free (strvalue (a));
1680 else if (is_vector (a))
1681 free (vecvalue (a));
1682#if USE_PORTS
1683 else if (is_port (a))
1684 {
1685 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1686 port_close (SCHEME_A_ a, port_input | port_output);
1687
1688 free (a->object.port);
1689 }
1690#endif
1691} 1749}
1692 1750
1693/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1694 1752
1695static int 1753ecb_cold static int
1696file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1697{ 1755{
1698#if USE_PORTS
1699 int fin; 1756 int fin;
1700 1757
1701 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1702 return 0; 1759 return 0;
1703 1760
… …
1709 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1710 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1767 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1711 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1712 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1713 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1714 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1771 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1715 1772
1716#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1717 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1774 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1718 1775
1719 if (fname) 1776 if (fname)
1720 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1721#endif 1778#endif
1722 } 1779 }
1723 1780
1724 return fin >= 0; 1781 return fin >= 0;
1725
1726#else
1727 return 1;
1728#endif
1729} 1782}
1730 1783
1731static void 1784ecb_cold static void
1732file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1733{ 1786{
1734 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1735 { 1788 {
1736 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1737#if USE_PORTS 1790#if USE_PORTS
1738 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1739#endif 1792#endif
1740 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1741 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1742 } 1795 }
1743} 1796}
1744 1797
1745static int 1798ecb_cold static int
1746file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1747{ 1800{
1748#if USE_PORTS 1801#if USE_PORTS
1749 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1750 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1751 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1752#else 1805#else
1753 return 0; 1806 return 0;
1754#endif 1807#endif
1755} 1808}
1756 1809
1757#if USE_PORTS 1810#if USE_PORTS
1758static port * 1811ecb_cold static port *
1759port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1760{ 1813{
1761 int fd; 1814 int fd;
1762 int flags; 1815 int flags;
1763 char *rw; 1816 char *rw;
… …
1786# endif 1839# endif
1787 1840
1788 return pt; 1841 return pt;
1789} 1842}
1790 1843
1791static pointer 1844ecb_cold static pointer
1792port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1793{ 1846{
1794 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1795 1848
1796 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1797 return NIL; 1850 return NIL;
1798 1851
1799 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1800} 1853}
1801 1854
1802static port * 1855ecb_cold static port *
1803port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1804{ 1857{
1805 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1806 1859
1807 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1812 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1813 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1814 return pt; 1867 return pt;
1815} 1868}
1816 1869
1817static pointer 1870ecb_cold static pointer
1818port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1819{ 1872{
1820 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1821 1874
1822 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1823 return NIL; 1876 return NIL;
1824 1877
1825 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1826} 1879}
1827 1880
1828static port * 1881ecb_cold static port *
1829port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1830{ 1883{
1831 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1832 1885
1833 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1839 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1840 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1841 return pt; 1894 return pt;
1842} 1895}
1843 1896
1844static pointer 1897ecb_cold static pointer
1845port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1899{
1847 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1848 1901
1849 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1852 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1853} 1906}
1854 1907
1855# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1856 1909
1857static port * 1910ecb_cold static port *
1858port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1859{ 1912{
1860 char *start; 1913 char *start;
1861 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1862 1915
… …
1876 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1877 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1878 return pt; 1931 return pt;
1879} 1932}
1880 1933
1881static pointer 1934ecb_cold static pointer
1882port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1883{ 1936{
1884 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1885 1938
1886 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1887 return NIL; 1940 return NIL;
1888 1941
1889 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1890} 1943}
1891 1944
1892static void 1945ecb_cold static void
1893port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1894{ 1947{
1895 port *pt = p->object.port; 1948 port *pt = port (p);
1896 1949
1897 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1898 1951
1899 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1900 { 1953 {
… …
1917 } 1970 }
1918} 1971}
1919#endif 1972#endif
1920 1973
1921/* get new character from input file */ 1974/* get new character from input file */
1922static int 1975ecb_cold static int
1923inchar (SCHEME_P) 1976inchar (SCHEME_P)
1924{ 1977{
1925 int c; 1978 int c;
1926 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1927
1928 pt = SCHEME_V->inport->object.port;
1929 1980
1930 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1931 return EOF; 1982 return EOF;
1932 1983
1933 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1943 } 1994 }
1944 1995
1945 return c; 1996 return c;
1946} 1997}
1947 1998
1948static int ungot = -1; 1999ecb_cold static int
1949
1950static int
1951basic_inchar (port *pt) 2000basic_inchar (port *pt)
1952{ 2001{
1953#if USE_PORTS
1954 if (pt->unget != -1) 2002 if (pt->unget != -1)
1955 { 2003 {
1956 int r = pt->unget; 2004 int r = pt->unget;
1957 pt->unget = -1; 2005 pt->unget = -1;
1958 return r; 2006 return r;
1959 } 2007 }
1960 2008
2009#if USE_PORTS
1961 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1962 { 2011 {
1963 char c; 2012 char c;
1964 2013
1965 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1973 return EOF; 2022 return EOF;
1974 else 2023 else
1975 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1976 } 2025 }
1977#else 2026#else
1978 if (ungot == -1)
1979 {
1980 char c; 2027 char c;
1981 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1982 return EOF; 2030 return EOF;
1983 2031
1984 ungot = c;
1985 }
1986
1987 {
1988 int r = ungot;
1989 ungot = -1;
1990 return r; 2032 return c;
1991 }
1992#endif 2033#endif
1993} 2034}
1994 2035
1995/* back character to input buffer */ 2036/* back character to input buffer */
1996static void 2037ecb_cold static void
1997backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
1998{ 2039{
1999#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2000 port *pt;
2001 2041
2002 if (c == EOF) 2042 if (c == EOF)
2003 return; 2043 return;
2004 2044
2005 pt = SCHEME_V->inport->object.port;
2006 pt->unget = c; 2045 pt->unget = c;
2007#else
2008 if (c == EOF)
2009 return;
2010
2011 ungot = c;
2012#endif
2013} 2046}
2014 2047
2015#if USE_PORTS 2048#if USE_PORTS
2016static int 2049ecb_cold static int
2017realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2018{ 2051{
2019 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2020 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2021 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2034 else 2067 else
2035 return 0; 2068 return 0;
2036} 2069}
2037#endif 2070#endif
2038 2071
2039INTERFACE void 2072ecb_cold static void
2040putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2041{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2042#if USE_PORTS 2077#if USE_PORTS
2043 port *pt = SCHEME_V->outport->object.port;
2044
2045 if (pt->kind & port_file)
2046 write (pt->rep.stdio.file, s, strlen (s));
2047 else
2048 for (; *s; s++)
2049 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2050 *pt->rep.string.curr++ = *s;
2051 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2052 *pt->rep.string.curr++ = *s;
2053
2054#else
2055 xwrstr (s);
2056#endif
2057}
2058
2059static void
2060putchars (SCHEME_P_ const char *s, int len)
2061{
2062#if USE_PORTS
2063 port *pt = SCHEME_V->outport->object.port;
2064
2065 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2066 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2067 else 2080 else
2068 { 2081 {
2069 for (; len; len--) 2082 for (; len; len--)
… …
2074 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2075 } 2088 }
2076 } 2089 }
2077 2090
2078#else 2091#else
2079 write (1, s, len); 2092 write (1, s, len); // output not initialised
2080#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2081} 2100}
2082 2101
2083INTERFACE void 2102INTERFACE void
2084putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2085{ 2104{
2086#if USE_PORTS
2087 port *pt = SCHEME_V->outport->object.port;
2088
2089 if (pt->kind & port_file)
2090 {
2091 char cc = c;
2092 write (pt->rep.stdio.file, &cc, 1);
2093 }
2094 else
2095 {
2096 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2097 *pt->rep.string.curr++ = c;
2098 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2099 *pt->rep.string.curr++ = c;
2100 }
2101
2102#else
2103 char cc = c; 2105 char cc = c;
2104 write (1, &c, 1); 2106
2105#endif 2107 putchars (SCHEME_A_ &cc, 1);
2106} 2108}
2107 2109
2108/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2109static char * 2111ecb_cold static char *
2110readstr_upto (SCHEME_P_ char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2111{ 2113{
2112 char *p = SCHEME_V->strbuff; 2114 char *p = SCHEME_V->strbuff + skip;
2113 2115
2114 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2115 2117
2116 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2118 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2117 *p = 0; 2119 *p = 0;
… …
2123 2125
2124 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2125} 2127}
2126 2128
2127/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2128static pointer 2130ecb_cold static pointer
2129readstrexp (SCHEME_P) 2131readstrexp (SCHEME_P_ char delim)
2130{ 2132{
2131 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2132 int c; 2134 int c;
2133 int c1 = 0; 2135 int c1 = 0;
2134 enum
2135 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2136 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2136 2137
2137 for (;;) 2138 for (;;)
2138 { 2139 {
2139 c = inchar (SCHEME_A); 2140 c = inchar (SCHEME_A);
2140 2141
… …
2142 return S_F; 2143 return S_F;
2143 2144
2144 switch (state) 2145 switch (state)
2145 { 2146 {
2146 case st_ok: 2147 case st_ok:
2147 switch (c) 2148 if (ecb_expect_false (c == delim))
2148 {
2149 case '\\':
2150 state = st_bsl;
2151 break;
2152
2153 case '"':
2154 *p = 0;
2155 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2149 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2156 2150
2157 default: 2151 if (ecb_expect_false (c == '\\'))
2152 state = st_bsl;
2153 else
2158 *p++ = c; 2154 *p++ = c;
2159 break;
2160 }
2161 2155
2162 break; 2156 break;
2163 2157
2164 case st_bsl: 2158 case st_bsl:
2165 switch (c) 2159 switch (c)
… …
2174 case '7': 2168 case '7':
2175 state = st_oct1; 2169 state = st_oct1;
2176 c1 = c - '0'; 2170 c1 = c - '0';
2177 break; 2171 break;
2178 2172
2173 case 'a': *p++ = '\a'; state = st_ok; break;
2174 case 'n': *p++ = '\n'; state = st_ok; break;
2175 case 'r': *p++ = '\r'; state = st_ok; break;
2176 case 't': *p++ = '\t'; state = st_ok; break;
2177
2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2186
2187 //TODO: x should end in ;, not two-digit hex
2179 case 'x': 2188 case 'x':
2180 case 'X': 2189 case 'X':
2181 state = st_x1; 2190 state = st_x1;
2182 c1 = 0; 2191 c1 = 0;
2183 break; 2192 break;
2184 2193
2185 case 'n':
2186 *p++ = '\n';
2187 state = st_ok;
2188 break;
2189
2190 case 't':
2191 *p++ = '\t';
2192 state = st_ok;
2193 break;
2194
2195 case 'r':
2196 *p++ = '\r';
2197 state = st_ok;
2198 break;
2199
2200 case '"':
2201 *p++ = '"';
2202 state = st_ok;
2203 break;
2204
2205 default: 2194 default:
2206 *p++ = c; 2195 *p++ = c;
2207 state = st_ok; 2196 state = st_ok;
2208 break; 2197 break;
2209 } 2198 }
2210 2199
2211 break; 2200 break;
2212 2201
2213 case st_x1: 2202 case st_x1:
2214 case st_x2: 2203 case st_x2:
2215 c = toupper (c); 2204 c = tolower (c);
2216 2205
2217 if (c >= '0' && c <= 'F') 2206 if (c >= '0' && c <= '9')
2218 {
2219 if (c <= '9')
2220 c1 = (c1 << 4) + c - '0'; 2207 c1 = (c1 << 4) + c - '0';
2221 else 2208 else if (c >= 'a' && c <= 'f')
2222 c1 = (c1 << 4) + c - 'A' + 10; 2209 c1 = (c1 << 4) + c - 'a' + 10;
2223
2224 if (state == st_x1)
2225 state = st_x2;
2226 else
2227 {
2228 *p++ = c1;
2229 state = st_ok;
2230 }
2231 }
2232 else 2210 else
2233 return S_F; 2211 return S_F;
2212
2213 if (state == st_x1)
2214 state = st_x2;
2215 else
2216 {
2217 *p++ = c1;
2218 state = st_ok;
2219 }
2234 2220
2235 break; 2221 break;
2236 2222
2237 case st_oct1: 2223 case st_oct1:
2238 case st_oct2: 2224 case st_oct2:
… …
2242 backchar (SCHEME_A_ c); 2228 backchar (SCHEME_A_ c);
2243 state = st_ok; 2229 state = st_ok;
2244 } 2230 }
2245 else 2231 else
2246 { 2232 {
2247 if (state == st_oct2 && c1 >= 32) 2233 if (state == st_oct2 && c1 >= ' ')
2248 return S_F; 2234 return S_F;
2249 2235
2250 c1 = (c1 << 3) + (c - '0'); 2236 c1 = (c1 << 3) + (c - '0');
2251 2237
2252 if (state == st_oct1) 2238 if (state == st_oct1)
… …
2257 state = st_ok; 2243 state = st_ok;
2258 } 2244 }
2259 } 2245 }
2260 2246
2261 break; 2247 break;
2262
2263 } 2248 }
2264 } 2249 }
2265} 2250}
2266 2251
2267/* check c is in chars */ 2252/* check c is in chars */
2268ecb_inline int 2253ecb_cold int
2269is_one_of (char *s, int c) 2254is_one_of (const char *s, int c)
2270{ 2255{
2271 if (c == EOF)
2272 return 1;
2273
2274 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2275} 2257}
2276 2258
2277/* skip white characters */ 2259/* skip white characters */
2278ecb_inline int 2260ecb_cold int
2279skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2280{ 2262{
2281 int c, curr_line = 0; 2263 int c, curr_line = 0;
2282 2264
2283 do 2265 do
2284 { 2266 {
2285 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2286#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2287 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2288 curr_line++; 2271 curr_line++;
2289#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2290 } 2276 }
2291 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2292 2278
2293 /* record it */ 2279 /* record it */
2294#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2281 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2282 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2297#endif 2283#endif
2298 2284
2299 if (c != EOF)
2300 {
2301 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2302 return 1; 2286 return 1;
2303 }
2304 else
2305 return EOF;
2306} 2287}
2307 2288
2308/* get token */ 2289/* get token */
2309static int 2290ecb_cold static int
2310token (SCHEME_P) 2291token (SCHEME_P)
2311{ 2292{
2312 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2313 2294
2314 if (c == EOF) 2295 if (c == EOF)
… …
2326 return TOK_RPAREN; 2307 return TOK_RPAREN;
2327 2308
2328 case '.': 2309 case '.':
2329 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2330 2311
2331 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2332 return TOK_DOT; 2313 return TOK_DOT;
2333 else 2314 else
2334 { 2315 {
2335 //TODO: ungetc twice in a row is not supported in C
2336 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2337 backchar (SCHEME_A_ '.');
2338 return TOK_ATOM; 2317 return TOK_DOTATOM;
2339 } 2318 }
2319
2320 case '|':
2321 return TOK_STRATOM;
2340 2322
2341 case '\'': 2323 case '\'':
2342 return TOK_QUOTE; 2324 return TOK_QUOTE;
2343 2325
2344 case ';': 2326 case ';':
… …
2411} 2393}
2412 2394
2413/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2415 2397
2416static void 2398ecb_cold static void
2417printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2418{ 2400{
2419 int i; 2401 int i;
2420 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2421 2403
… …
2476 } 2458 }
2477 2459
2478 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2479} 2461}
2480 2462
2481
2482/* print atoms */ 2463/* print atoms */
2483static void 2464ecb_cold static void
2484printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2485{ 2466{
2486 char *p; 2467 char *p;
2487 int len; 2468 int len;
2488 2469
2489 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2490 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2491} 2472}
2492 2473
2493
2494/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2495static void 2475ecb_cold static void
2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497{ 2477{
2498 char *p; 2478 char *p;
2499 2479
2500 if (l == NIL) 2480 if (l == NIL)
… …
2633 } 2613 }
2634 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2635 p = symname (l); 2615 p = symname (l);
2636 else if (is_proc (l)) 2616 else if (is_proc (l))
2637 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2638#if USE_PRINTF 2620#if USE_PRINTF
2639 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2640 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2641#else 2623#else
2642 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2643#endif 2626#endif
2644 } 2627 }
2645 else if (is_macro (l)) 2628 else if (is_macro (l))
2646 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2647 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2658#endif 2641#endif
2659 } 2642 }
2660 else if (is_continuation (l)) 2643 else if (is_continuation (l))
2661 p = "#<CONTINUATION>"; 2644 p = "#<CONTINUATION>";
2662 else 2645 else
2646 {
2647#if USE_PRINTF
2648 p = SCHEME_V->strbuff;
2649 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2650#else
2663 p = "#<ERROR>"; 2651 p = "#<ERROR>";
2652#endif
2653 }
2664 2654
2665 *pp = p; 2655 *pp = p;
2666 *plen = strlen (p); 2656 *plen = strlen (p);
2667} 2657}
2668 2658
… …
2700 return car (d); 2690 return car (d);
2701 2691
2702 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2703 q = p; 2693 q = p;
2704 2694
2705 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2706 { 2696 {
2707 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2708 2698
2709 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2710 p = cdr (d); 2700 p = cdr (d);
2711 } 2701 }
2712 2702
2713 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2714 return q; 2704 return q;
2715} 2705}
2716 2706
2717/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2718static pointer 2708ecb_hot static pointer
2719reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2720{ 2710{
2721 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2722 pointer p = NIL; 2712 pointer p = NIL;
2723 2713
… …
2726 2716
2727 return p; 2717 return p;
2728} 2718}
2729 2719
2730/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2731static pointer 2721ecb_hot static pointer
2732reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2733{ 2723{
2734 pointer result = term; 2724 pointer result = term;
2735 pointer p = list; 2725 pointer p = list;
2736 2726
… …
2744 2734
2745 return result; 2735 return result;
2746} 2736}
2747 2737
2748/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2749static pointer 2739ecb_hot static pointer
2750revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2751{ 2741{
2752 pointer result = a; 2742 pointer result = a;
2753 pointer p = b; 2743 pointer p = b;
2754 2744
… …
2763 2753
2764 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2765} 2755}
2766 2756
2767/* equivalence of atoms */ 2757/* equivalence of atoms */
2768int 2758ecb_hot int
2769eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2770{ 2760{
2771 if (is_string (a)) 2761 if (is_string (a))
2772 { 2762 {
2773 if (is_string (b)) 2763 if (is_string (b))
… …
2812/* () is #t in R5RS */ 2802/* () is #t in R5RS */
2813#define is_true(p) ((p) != S_F) 2803#define is_true(p) ((p) != S_F)
2814#define is_false(p) ((p) == S_F) 2804#define is_false(p) ((p) == S_F)
2815 2805
2816/* ========== Environment implementation ========== */ 2806/* ========== Environment implementation ========== */
2817
2818#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2819
2820static int
2821hash_fn (const char *key, int table_size)
2822{
2823 const unsigned char *p = key;
2824 uint32_t hash = 2166136261;
2825
2826 while (*p)
2827 hash = (hash ^ *p++) * 16777619;
2828
2829 return hash % table_size;
2830}
2831#endif
2832 2807
2833#ifndef USE_ALIST_ENV 2808#ifndef USE_ALIST_ENV
2834 2809
2835/* 2810/*
2836 * In this implementation, each frame of the environment may be 2811 * In this implementation, each frame of the environment may be
… …
2845{ 2820{
2846 pointer new_frame; 2821 pointer new_frame;
2847 2822
2848 /* The interaction-environment has about 300 variables in it. */ 2823 /* The interaction-environment has about 300 variables in it. */
2849 if (old_env == NIL) 2824 if (old_env == NIL)
2850 new_frame = mk_vector (SCHEME_A_ 461); 2825 new_frame = mk_vector (SCHEME_A_ 29); // was 461
2851 else 2826 else
2852 new_frame = NIL; 2827 new_frame = NIL;
2853 2828
2854 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2829 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2855 setenvironment (SCHEME_V->envir); 2830 setenvironment (SCHEME_V->envir);
2856} 2831}
2857 2832
2833static uint32_t
2834sym_hash (pointer sym, uint32_t size)
2835{
2836 uintptr_t ptr = (uintptr_t)sym;
2837
2838#if 0
2839 /* table size is prime, so why mix */
2840 ptr += ptr >> 32;
2841 ptr += ptr >> 16;
2842 ptr += ptr >> 8;
2843#endif
2844
2845 return ptr % size;
2846}
2847
2858ecb_inline void 2848ecb_inline void
2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2849new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2860{ 2850{
2861 pointer slot = immutable_cons (variable, value); 2851 pointer slot = immutable_cons (variable, value);
2862 2852
2863 if (is_vector (car (env))) 2853 if (is_vector (car (env)))
2864 { 2854 {
2865 int location = hash_fn (symname (variable), veclength (car (env))); 2855 int location = sym_hash (variable, veclength (car (env)));
2866
2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location))); 2856 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2868 } 2857 }
2869 else 2858 else
2870 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2871} 2860}
2872 2861
2873static pointer 2862ecb_hot static pointer
2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2875{ 2864{
2876 pointer x, y; 2865 pointer x, y;
2877 int location;
2878 2866
2879 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
2880 { 2868 {
2881 if (is_vector (car (x))) 2869 if (is_vector (car (x)))
2882 { 2870 {
2883 location = hash_fn (symname (hdl), veclength (car (x))); 2871 int location = sym_hash (hdl, veclength (car (x)));
2884 y = vector_get (car (x), location); 2872 y = vector_get (car (x), location);
2885 } 2873 }
2886 else 2874 else
2887 y = car (x); 2875 y = car (x);
2888 2876
… …
2900 return NIL; 2888 return NIL;
2901} 2889}
2902 2890
2903#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2904 2892
2905ecb_inline void 2893static void
2906new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2907{ 2895{
2908 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2909 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2910} 2898}
2911 2899
2912ecb_inline void 2900static void
2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2901new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2914{ 2902{
2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2916} 2904}
2917 2905
2918static pointer 2906ecb_hot static pointer
2919find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2920{ 2908{
2921 pointer x, y; 2909 pointer x, y;
2922 2910
2923 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2925 for (y = car (x); y != NIL; y = cdr (y)) 2913 for (y = car (x); y != NIL; y = cdr (y))
2926 if (caar (y) == hdl) 2914 if (caar (y) == hdl)
2927 break; 2915 break;
2928 2916
2929 if (y != NIL) 2917 if (y != NIL)
2918 return car (y);
2930 break; 2919 break;
2931 2920
2932 if (!all) 2921 if (!all)
2933 return NIL; 2922 break;
2934 } 2923 }
2935
2936 if (x != NIL)
2937 return car (y);
2938 2924
2939 return NIL; 2925 return NIL;
2940} 2926}
2941 2927
2942#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2943 2929
2944ecb_inline void 2930static void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2932{
2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948} 2935}
2949 2936
2950ecb_inline void 2937static void
2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2952{ 2939{
2953 set_cdr (slot, value); 2940 set_cdr (slot, value);
2954} 2941}
2955 2942
2956ecb_inline pointer 2943static pointer
2957slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2958{ 2945{
2959 return cdr (slot); 2946 return cdr (slot);
2960} 2947}
2961 2948
2962/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2963 2950
2964static int 2951ecb_cold static int
2965xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2966{ 2953{
2967#if USE_ERROR_HOOK
2968 pointer x;
2969 pointer hdl = SCHEME_V->ERROR_HOOK;
2970#endif
2971
2972#if USE_PRINTF 2954#if USE_PRINTF
2973#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2974 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2975 2957
2976 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
2991 } 2973 }
2992#endif 2974#endif
2993#endif 2975#endif
2994 2976
2995#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
2996 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2978 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2997 2979
2998 if (x != NIL) 2980 if (x != NIL)
2999 { 2981 {
3000 pointer code = a 2982 pointer code = a
3001 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3045 pointer code; 3027 pointer code;
3046}; 3028};
3047 3029
3048# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3049 3031
3050static void 3032ecb_hot static void
3051s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3052{ 3034{
3053 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3054 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3055 3037
3056 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3057 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058 { 3040 {
3059 SCHEME_V->dump_size += STACK_GROWTH; 3041 SCHEME_V->dump_size += STACK_GROWTH;
3060 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3042 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061 } 3043 }
3062 3044
… …
3068 next_frame->code = code; 3050 next_frame->code = code;
3069 3051
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3053}
3072 3054
3073static int 3055static ecb_hot int
3074xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3075{ 3057{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3078 3060
… …
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3072
3091 return 0; 3073 return 0;
3092} 3074}
3093 3075
3094ecb_inline void 3076ecb_cold void
3095dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3096{ 3078{
3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3079 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3098 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3099} 3081}
3100 3082
3101ecb_inline void 3083ecb_cold void
3102dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3103{ 3085{
3104 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3107} 3089}
3108 3090
3109static void 3091ecb_cold static void
3110dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3111{ 3093{
3112 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3113 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3114 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3115 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3116} 3098}
3117 3099
3118static void 3100ecb_cold static void
3119dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3120{ 3102{
3121 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3122 int i; 3104 int i;
3123 3105
… …
3129 mark (frame->envir); 3111 mark (frame->envir);
3130 mark (frame->code); 3112 mark (frame->code);
3131 } 3113 }
3132} 3114}
3133 3115
3134static pointer 3116ecb_cold static pointer
3135ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3136{ 3118{
3137 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3138 int i; 3120 int i;
3139 3121
… …
3151 } 3133 }
3152 3134
3153 return cont; 3135 return cont;
3154} 3136}
3155 3137
3156static void 3138ecb_cold static void
3157ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3158{ 3140{
3159 int i = 0; 3141 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3143
… …
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3156}
3175 3157
3176#else 3158#else
3177 3159
3178ecb_inline void 3160ecb_cold void
3179dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3180{ 3162{
3181 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3182} 3164}
3183 3165
3184ecb_inline void 3166ecb_cold void
3185dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3186{ 3168{
3187 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3188} 3170}
3189 3171
3190static void 3172ecb_cold static void
3191dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3192{ 3174{
3193 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3194} 3176}
3195 3177
3196static int 3178ecb_hot static int
3197xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3198{ 3180{
3199 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3200 3182
3201 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
… …
3211 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3212 3194
3213 return 0; 3195 return 0;
3214} 3196}
3215 3197
3216static void 3198ecb_hot static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3200{
3219 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3220 cons (args, 3202 cons (args,
3221 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3222 cons (code, 3204 cons (code,
3223 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3224} 3206}
3225 3207
3208ecb_cold static void
3209dump_stack_mark (SCHEME_P)
3210{
3211 mark (SCHEME_V->dump);
3212}
3213
3214ecb_cold static pointer
3215ss_get_cont (SCHEME_P)
3216{
3217 return SCHEME_V->dump;
3218}
3219
3220ecb_cold static void
3221ss_set_cont (SCHEME_P_ pointer cont)
3222{
3223 SCHEME_V->dump = cont;
3224}
3225
3226#endif
3227
3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3229
3230#if EXPERIMENT
3231
3232static int
3233dtree (SCHEME_P_ int indent, pointer x)
3234{
3235 int c;
3236
3237 if (is_syntax (x))
3238 {
3239 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3240 return 8 + 8;
3241 }
3242
3243 if (x == NIL)
3244 {
3245 printf ("%*sNIL\n", indent, "");
3246 return 3;
3247 }
3248
3249 switch (type (x))
3250 {
3251 case T_INTEGER:
3252 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3253 return 32+8;
3254
3255 case T_SYMBOL:
3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3257 return 24+8;
3258
3259 case T_CLOSURE:
3260 printf ("%*sS<%s>\n", indent, "", "closure");
3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3263
3264 case T_PAIR:
3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3268 return c + 1;
3269
3270 case T_PORT:
3271 printf ("%*sS<%s>\n", indent, "", "port");
3272 return 24+8;
3273
3274 case T_VECTOR:
3275 printf ("%*sS<%s>\n", indent, "", "vector");
3276 return 24+8;
3277
3278 case T_ENVIRONMENT:
3279 printf ("%*sS<%s>\n", indent, "", "environment");
3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3281
3282 default:
3283 printf ("unhandled type %d\n", type (x));
3284 break;
3285 }
3286}
3287
3288#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3289
3290typedef void *stream[1];
3291
3292#define stream_init() { 0 }
3293#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3294#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3295#define stream_free(s) free (s[0])
3296
3297ecb_cold static void
3298stream_put (stream s, uint8_t byte)
3299{
3300 uint32_t *sp = *s;
3301 uint32_t size = sizeof (uint32_t) * 2;
3302 uint32_t offs = size;
3303
3304 if (ecb_expect_true (sp))
3305 {
3306 offs = sp[0];
3307 size = sp[1];
3308 }
3309
3310 if (ecb_expect_false (offs == size))
3311 {
3312 size *= 2;
3313 sp = realloc (sp, size);
3314 *s = sp;
3315 sp[1] = size;
3316
3317 }
3318
3319 ((uint8_t *)sp)[offs++] = byte;
3320 sp[0] = offs;
3321}
3322
3323ecb_cold static void
3324stream_put_v (stream s, uint32_t v)
3325{
3326 while (v > 0x7f)
3327 {
3328 stream_put (s, v | 0x80);
3329 v >>= 7;
3330 }
3331
3332 stream_put (s, v);
3333}
3334
3335ecb_cold static void
3336stream_put_tv (stream s, int bop, uint32_t v)
3337{
3338 printf ("put tv %d %d\n", bop, v);//D
3339 stream_put (s, bop);
3340 stream_put_v (s, v);
3341}
3342
3343ecb_cold static void
3344stream_put_stream (stream s, stream o)
3345{
3346 uint32_t i;
3347
3348 for (i = 0; i < stream_size (o); ++i)
3349 stream_put (s, stream_data (o)[i]);
3350
3351 stream_free (o);
3352}
3353
3354ecb_cold static uint32_t
3355cell_id (SCHEME_P_ pointer x)
3356{
3357 struct cell *p = CELL (x);
3358 int i;
3359
3360 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3361 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3362 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3363
3364 abort ();
3365}
3366
3367// calculates a (preferably small) integer that makes it possible to find
3368// the symbol again. if pointers were offsets into a memory area... until
3369// then, we return segment number in the low bits, and offset in the high
3370// bits.
3371// also, this function must never return 0.
3372ecb_cold static uint32_t
3373symbol_id (SCHEME_P_ pointer sym)
3374{
3375 return cell_id (SCHEME_A_ sym);
3376}
3377
3378enum byteop
3379{
3380 BOP_NIL,
3381 BOP_INTEGER,
3382 BOP_SYMBOL,
3383 BOP_DATUM,
3384 BOP_LIST_BEG,
3385 BOP_LIST_END,
3386 BOP_IF,
3387 BOP_AND,
3388 BOP_OR,
3389 BOP_CASE,
3390 BOP_COND,
3391 BOP_LET,
3392 BOP_LETAST,
3393 BOP_LETREC,
3394 BOP_DEFINE,
3395 BOP_MACRO,
3396 BOP_SET,
3397 BOP_BEGIN,
3398 BOP_LAMBDA,
3399 BOP_DELAY,
3400 BOP_OP,
3401};
3402
3403ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3404
3405ecb_cold static void
3406compile_list (SCHEME_P_ stream s, pointer x)
3407{
3408 // TODO: improper list
3409
3410 for (; x != NIL; x = cdr (x))
3411 {
3412 stream t = stream_init ();
3413 compile_expr (SCHEME_A_ t, car (x));
3414 stream_put_v (s, stream_size (t));
3415 stream_put_stream (s, t);
3416 }
3417
3418 stream_put_v (s, 0);
3419}
3420
3226static void 3421static void
3227dump_stack_mark (SCHEME_P) 3422compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3228{ 3423{
3229 mark (SCHEME_V->dump); 3424 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3425
3426 stream_put (s, BOP_IF);
3427 compile_expr (SCHEME_A_ s, cond);
3428 stream_put_v (s, stream_size (sift));
3429 stream_put_stream (s, sift);
3430 compile_expr (SCHEME_A_ s, iff);
3431}
3432
3433typedef uint32_t stream_fixup;
3434
3435static stream_fixup
3436stream_put_fixup (stream s)
3437{
3438 stream_put (s, 0);
3439 stream_put (s, 0);
3440
3441 return stream_size (s);
3442}
3443
3444static void
3445stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3446{
3447 target -= fixup;
3448 assert (target < (1 << 14));
3449 stream_data (s)[fixup - 2] = target | 0x80;
3450 stream_data (s)[fixup - 1] = target >> 7;
3451}
3452
3453static void
3454compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3455{
3456 for (; cdr (x) != NIL; x = cdr (x))
3457 {
3458 stream t = stream_init ();
3459 compile_expr (SCHEME_A_ t, car (x));
3460 stream_put_v (s, stream_size (t));
3461 stream_put_stream (s, t);
3462 }
3463
3464 stream_put_v (s, 0);
3465}
3466
3467static void
3468compile_case (SCHEME_P_ stream s, pointer x)
3469{
3470 compile_expr (SCHEME_A_ s, caar (x));
3471
3472 for (;;)
3473 {
3474 x = cdr (x);
3475
3476 if (x == NIL)
3477 break;
3478
3479 compile_expr (SCHEME_A_ s, caar (x));
3480 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3481 stream_put_v (s, stream_size (t));
3482 stream_put_stream (s, t);
3483 }
3484
3485 stream_put_v (s, 0);
3486}
3487
3488static void
3489compile_cond (SCHEME_P_ stream s, pointer x)
3490{
3491 for ( ; x != NIL; x = cdr (x))
3492 {
3493 compile_expr (SCHEME_A_ s, caar (x));
3494 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3495 stream_put_v (s, stream_size (t));
3496 stream_put_stream (s, t);
3497 }
3498
3499 stream_put_v (s, 0);
3230} 3500}
3231 3501
3232static pointer 3502static pointer
3233ss_get_cont (SCHEME_P) 3503lookup (SCHEME_P_ pointer x)
3234{ 3504{
3235 return SCHEME_V->dump; 3505 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3236}
3237 3506
3238static void 3507 if (x != NIL)
3239ss_set_cont (SCHEME_P_ pointer cont) 3508 x = slot_value_in_env (x);
3240{
3241 SCHEME_V->dump = cont;
3242}
3243 3509
3244#endif 3510 return x;
3511}
3245 3512
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3513ecb_cold static void
3514compile_expr (SCHEME_P_ stream s, pointer x)
3515{
3516 if (x == NIL)
3517 {
3518 stream_put (s, BOP_NIL);
3519 return;
3520 }
3247 3521
3248static int 3522 if (is_pair (x))
3523 {
3524 pointer head = car (x);
3525
3526 if (is_syntax (head))
3527 {
3528 int syn = syntaxnum (head);
3529 x = cdr (x);
3530
3531 switch (syntaxnum (head))
3532 {
3533 case OP_IF0: /* if */
3534 stream_put_v (s, BOP_IF);
3535 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3536 break;
3537
3538 case OP_OR0: /* or */
3539 stream_put_v (s, BOP_OR);
3540 compile_and_or (SCHEME_A_ s, 0, x);
3541 break;
3542
3543 case OP_AND0: /* and */
3544 stream_put_v (s, BOP_AND);
3545 compile_and_or (SCHEME_A_ s, 1, x);
3546 break;
3547
3548 case OP_CASE0: /* case */
3549 stream_put_v (s, BOP_CASE);
3550 compile_case (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_COND0: /* cond */
3554 stream_put_v (s, BOP_COND);
3555 compile_cond (SCHEME_A_ s, x);
3556 break;
3557
3558 case OP_LET0: /* let */
3559 case OP_LET0AST: /* let* */
3560 case OP_LET0REC: /* letrec */
3561 switch (syn)
3562 {
3563 case OP_LET0: stream_put (s, BOP_LET ); break;
3564 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3565 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3566 }
3567
3568 {
3569 pointer bindings = car (x);
3570 pointer body = cadr (x);
3571
3572 for (x = bindings; x != NIL; x = cdr (x))
3573 {
3574 pointer init = NIL;
3575 pointer var = car (x);
3576
3577 if (is_pair (var))
3578 {
3579 init = cdr (var);
3580 var = car (var);
3581 }
3582
3583 stream_put_v (s, symbol_id (SCHEME_A_ var));
3584 compile_expr (SCHEME_A_ s, init);
3585 }
3586
3587 stream_put_v (s, 0);
3588 compile_expr (SCHEME_A_ s, body);
3589 }
3590 break;
3591
3592 case OP_DEF0: /* define */
3593 case OP_MACRO0: /* macro */
3594 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3595 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3596 compile_expr (SCHEME_A_ s, cadr (x));
3597 break;
3598
3599 case OP_SET0: /* set! */
3600 stream_put (s, BOP_SET);
3601 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3602 compile_expr (SCHEME_A_ s, cadr (x));
3603 break;
3604
3605 case OP_BEGIN: /* begin */
3606 stream_put (s, BOP_BEGIN);
3607 compile_list (SCHEME_A_ s, x);
3608 return;
3609
3610 case OP_QUOTE: /* quote */
3611 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3612 break;
3613
3614 case OP_DELAY: /* delay */
3615 stream_put (s, BOP_DELAY);
3616 compile_expr (SCHEME_A_ s, x);
3617 break;
3618
3619 case OP_LAMBDA: /* lambda */
3620 {
3621 pointer formals = car (x);
3622 pointer body = cadr (x);
3623
3624 stream_put (s, BOP_LAMBDA);
3625
3626 for (; is_pair (formals); formals = cdr (formals))
3627 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3628
3629 stream_put_v (s, 0);
3630 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3631
3632 compile_expr (SCHEME_A_ s, body);
3633 }
3634 break;
3635
3636 case OP_C0STREAM:/* cons-stream */
3637 abort ();
3638 break;
3639 }
3640
3641 return;
3642 }
3643
3644 pointer m = lookup (SCHEME_A_ head);
3645
3646 if (is_macro (m))
3647 {
3648 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3649 SCHEME_V->code = m;
3650 SCHEME_V->args = cons (x, NIL);
3651 Eval_Cycle (SCHEME_A_ OP_APPLY);
3652 x = SCHEME_V->value;
3653 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3654 return;
3655 }
3656
3657 stream_put (s, BOP_LIST_BEG);
3658
3659 for (; x != NIL; x = cdr (x))
3660 compile_expr (SCHEME_A_ s, car (x));
3661
3662 stream_put (s, BOP_LIST_END);
3663 return;
3664 }
3665
3666 switch (type (x))
3667 {
3668 case T_INTEGER:
3669 {
3670 IVALUE iv = ivalue_unchecked (x);
3671 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3672 stream_put_tv (s, BOP_INTEGER, iv);
3673 }
3674 return;
3675
3676 case T_SYMBOL:
3677 if (0)
3678 {
3679 // no can do without more analysis
3680 pointer m = lookup (SCHEME_A_ x);
3681
3682 if (is_proc (m))
3683 {
3684 printf ("compile proc %s %d\n", procname(m), procnum(m));
3685 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3686 }
3687 else
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 }
3690
3691 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3692 return;
3693
3694 default:
3695 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3696 break;
3697 }
3698}
3699
3700ecb_cold static int
3701compile_closure (SCHEME_P_ pointer p)
3702{
3703 stream s = stream_init ();
3704
3705 compile_list (SCHEME_A_ s, cdar (p));
3706
3707 FILE *xxd = popen ("xxd", "we");
3708 fwrite (stream_data (s), 1, stream_size (s), xxd);
3709 fclose (xxd);
3710
3711 return stream_size (s);
3712}
3713
3714#endif
3715
3716/* syntax, eval, core, ... */
3717ecb_hot static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3718opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3719{
3251 pointer args = SCHEME_V->args; 3720 pointer args = SCHEME_V->args;
3252 pointer x, y; 3721 pointer x, y;
3253 3722
3254 switch (op) 3723 switch (op)
3255 { 3724 {
3725#if EXPERIMENT //D
3726 case OP_DEBUG:
3727 {
3728 uint32_t len = compile_closure (SCHEME_A_ car (args));
3729 printf ("len = %d\n", len);
3730 printf ("\n");
3731 s_return (S_T);
3732 }
3733
3734 case OP_DEBUG2:
3735 return -1;
3736#endif
3737
3256 case OP_LOAD: /* load */ 3738 case OP_LOAD: /* load */
3257 if (file_interactive (SCHEME_A)) 3739 if (file_interactive (SCHEME_A))
3258 { 3740 {
3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3741 putstr (SCHEME_A_ "Loading ");
3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3742 putstr (SCHEME_A_ strvalue (car (args)));
3743 putcharacter (SCHEME_A_ '\n');
3261 } 3744 }
3262 3745
3263 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3746 if (!file_push (SCHEME_A_ strvalue (car (args))))
3264 Error_1 ("unable to open", car (args)); 3747 Error_1 ("unable to open", car (args));
3265 else 3748
3266 {
3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3749 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3268 s_goto (OP_T0LVL); 3750 s_goto (OP_T0LVL);
3269 }
3270 3751
3271 case OP_T0LVL: /* top level */ 3752 case OP_T0LVL: /* top level */
3272 3753
3273 /* If we reached the end of file, this loop is done. */ 3754 /* If we reached the end of file, this loop is done. */
3274 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3755 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3275 { 3756 {
3276 if (SCHEME_V->file_i == 0) 3757 if (SCHEME_V->file_i == 0)
3277 { 3758 {
3278 SCHEME_V->args = NIL; 3759 SCHEME_V->args = NIL;
3279 s_goto (OP_QUIT); 3760 s_goto (OP_QUIT);
… …
3290 /* If interactive, be nice to user. */ 3771 /* If interactive, be nice to user. */
3291 if (file_interactive (SCHEME_A)) 3772 if (file_interactive (SCHEME_A))
3292 { 3773 {
3293 SCHEME_V->envir = SCHEME_V->global_env; 3774 SCHEME_V->envir = SCHEME_V->global_env;
3294 dump_stack_reset (SCHEME_A); 3775 dump_stack_reset (SCHEME_A);
3295 putstr (SCHEME_A_ "\n"); 3776 putcharacter (SCHEME_A_ '\n');
3777#if EXPERIMENT
3778 system ("ps v $PPID");
3779#endif
3296 putstr (SCHEME_A_ prompt); 3780 putstr (SCHEME_A_ prompt);
3297 } 3781 }
3298 3782
3299 /* Set up another iteration of REPL */ 3783 /* Set up another iteration of REPL */
3300 SCHEME_V->nesting = 0; 3784 SCHEME_V->nesting = 0;
… …
3335 { 3819 {
3336 SCHEME_V->print_flag = 1; 3820 SCHEME_V->print_flag = 1;
3337 SCHEME_V->args = SCHEME_V->value; 3821 SCHEME_V->args = SCHEME_V->value;
3338 s_goto (OP_P0LIST); 3822 s_goto (OP_P0LIST);
3339 } 3823 }
3340 else 3824
3341 s_return (SCHEME_V->value); 3825 s_return (SCHEME_V->value);
3342 3826
3343 case OP_EVAL: /* main part of evaluation */ 3827 case OP_EVAL: /* main part of evaluation */
3344#if USE_TRACING 3828#if USE_TRACING
3345 if (SCHEME_V->tracing) 3829 if (SCHEME_V->tracing)
3346 { 3830 {
… …
3357#endif 3841#endif
3358 if (is_symbol (SCHEME_V->code)) /* symbol */ 3842 if (is_symbol (SCHEME_V->code)) /* symbol */
3359 { 3843 {
3360 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3844 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3361 3845
3362 if (x != NIL) 3846 if (x == NIL)
3363 s_return (slot_value_in_env (x));
3364 else
3365 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3847 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3848
3849 s_return (slot_value_in_env (x));
3366 } 3850 }
3367 else if (is_pair (SCHEME_V->code)) 3851 else if (is_pair (SCHEME_V->code))
3368 { 3852 {
3369 x = car (SCHEME_V->code); 3853 x = car (SCHEME_V->code);
3370 3854
… …
3379 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3863 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3380 SCHEME_V->code = x; 3864 SCHEME_V->code = x;
3381 s_goto (OP_EVAL); 3865 s_goto (OP_EVAL);
3382 } 3866 }
3383 } 3867 }
3384 else 3868
3385 s_return (SCHEME_V->code); 3869 s_return (SCHEME_V->code);
3386 3870
3387 case OP_E0ARGS: /* eval arguments */ 3871 case OP_E0ARGS: /* eval arguments */
3388 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3872 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3389 { 3873 {
3390 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3874 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3391 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3875 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3392 SCHEME_V->code = SCHEME_V->value; 3876 SCHEME_V->code = SCHEME_V->value;
3393 s_goto (OP_APPLY); 3877 s_goto (OP_APPLY);
3394 } 3878 }
3395 else 3879
3396 {
3397 SCHEME_V->code = cdr (SCHEME_V->code); 3880 SCHEME_V->code = cdr (SCHEME_V->code);
3398 s_goto (OP_E1ARGS); 3881 s_goto (OP_E1ARGS);
3399 }
3400 3882
3401 case OP_E1ARGS: /* eval arguments */ 3883 case OP_E1ARGS: /* eval arguments */
3402 args = cons (SCHEME_V->value, args); 3884 args = cons (SCHEME_V->value, args);
3403 3885
3404 if (is_pair (SCHEME_V->code)) /* continue */ 3886 if (is_pair (SCHEME_V->code)) /* continue */
… …
3415 SCHEME_V->args = cdr (args); 3897 SCHEME_V->args = cdr (args);
3416 s_goto (OP_APPLY); 3898 s_goto (OP_APPLY);
3417 } 3899 }
3418 3900
3419#if USE_TRACING 3901#if USE_TRACING
3420
3421 case OP_TRACING: 3902 case OP_TRACING:
3422 { 3903 {
3423 int tr = SCHEME_V->tracing; 3904 int tr = SCHEME_V->tracing;
3424 3905
3425 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3906 SCHEME_V->tracing = ivalue_unchecked (car (args));
3426 s_return (mk_integer (SCHEME_A_ tr)); 3907 s_return (mk_integer (SCHEME_A_ tr));
3427 } 3908 }
3428
3429#endif 3909#endif
3430 3910
3431 case OP_APPLY: /* apply 'code' to 'args' */ 3911 case OP_APPLY: /* apply 'code' to 'args' */
3432#if USE_TRACING 3912#if USE_TRACING
3433 if (SCHEME_V->tracing) 3913 if (SCHEME_V->tracing)
… …
3443 3923
3444 case OP_REAL_APPLY: 3924 case OP_REAL_APPLY:
3445#endif 3925#endif
3446 if (is_proc (SCHEME_V->code)) 3926 if (is_proc (SCHEME_V->code))
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3927 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 else if (is_foreign (SCHEME_V->code))
3449 {
3450 /* Keep nested calls from GC'ing the arglist */
3451 push_recent_alloc (SCHEME_A_ args, NIL);
3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3453
3454 s_return (x);
3455 }
3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3928 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3457 { 3929 {
3458 /* Should not accept promise */ 3930 /* Should not accept promise */
3459 /* make environment */ 3931 /* make environment */
3460 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3932 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
… …
3487 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3959 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3488 { 3960 {
3489 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3961 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3490 s_return (args != NIL ? car (args) : NIL); 3962 s_return (args != NIL ? car (args) : NIL);
3491 } 3963 }
3492 else 3964 else if (is_foreign (SCHEME_V->code))
3965 {
3966 /* Keep nested calls from GC'ing the arglist */
3967 push_recent_alloc (SCHEME_A_ args, NIL);
3968 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3969
3970 s_return (x);
3971 }
3972
3493 Error_0 ("illegal function"); 3973 Error_0 ("illegal function");
3494 3974
3495 case OP_DOMACRO: /* do macro */ 3975 case OP_DOMACRO: /* do macro */
3496 SCHEME_V->code = SCHEME_V->value; 3976 SCHEME_V->code = SCHEME_V->value;
3497 s_goto (OP_EVAL); 3977 s_goto (OP_EVAL);
3498
3499#if 1
3500 3978
3501 case OP_LAMBDA: /* lambda */ 3979 case OP_LAMBDA: /* lambda */
3502 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3980 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503 set SCHEME_V->value fall thru */ 3981 set SCHEME_V->value fall thru */
3504 { 3982 {
… …
3511 SCHEME_V->code = slot_value_in_env (f); 3989 SCHEME_V->code = slot_value_in_env (f);
3512 s_goto (OP_APPLY); 3990 s_goto (OP_APPLY);
3513 } 3991 }
3514 3992
3515 SCHEME_V->value = SCHEME_V->code; 3993 SCHEME_V->value = SCHEME_V->code;
3516 /* Fallthru */
3517 } 3994 }
3995 /* Fallthru */
3518 3996
3519 case OP_LAMBDA1: 3997 case OP_LAMBDA1:
3520 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3998 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522#else
3523
3524 case OP_LAMBDA: /* lambda */
3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527#endif
3528 3999
3529 case OP_MKCLOSURE: /* make-closure */ 4000 case OP_MKCLOSURE: /* make-closure */
3530 x = car (args); 4001 x = car (args);
3531 4002
3532 if (car (x) == SCHEME_V->LAMBDA) 4003 if (car (x) == SCHEME_V->LAMBDA)
… …
3571 else 4042 else
3572 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4043 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3573 4044
3574 s_return (SCHEME_V->code); 4045 s_return (SCHEME_V->code);
3575 4046
3576
3577 case OP_DEFP: /* defined? */ 4047 case OP_DEFP: /* defined? */
3578 x = SCHEME_V->envir; 4048 x = SCHEME_V->envir;
3579 4049
3580 if (cdr (args) != NIL) 4050 if (cdr (args) != NIL)
3581 x = cadr (args); 4051 x = cadr (args);
… …
3599 s_return (SCHEME_V->value); 4069 s_return (SCHEME_V->value);
3600 } 4070 }
3601 else 4071 else
3602 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4072 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3603 4073
3604
3605 case OP_BEGIN: /* begin */ 4074 case OP_BEGIN: /* begin */
3606 if (!is_pair (SCHEME_V->code)) 4075 if (!is_pair (SCHEME_V->code))
3607 s_return (SCHEME_V->code); 4076 s_return (SCHEME_V->code);
3608 4077
3609 if (cdr (SCHEME_V->code) != NIL) 4078 if (cdr (SCHEME_V->code) != NIL)
… …
3620 case OP_IF1: /* if */ 4089 case OP_IF1: /* if */
3621 if (is_true (SCHEME_V->value)) 4090 if (is_true (SCHEME_V->value))
3622 SCHEME_V->code = car (SCHEME_V->code); 4091 SCHEME_V->code = car (SCHEME_V->code);
3623 else 4092 else
3624 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4093 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4094
3625 s_goto (OP_EVAL); 4095 s_goto (OP_EVAL);
3626 4096
3627 case OP_LET0: /* let */ 4097 case OP_LET0: /* let */
3628 SCHEME_V->args = NIL; 4098 SCHEME_V->args = NIL;
3629 SCHEME_V->value = SCHEME_V->code; 4099 SCHEME_V->value = SCHEME_V->code;
3630 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4100 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3631 s_goto (OP_LET1); 4101 s_goto (OP_LET1);
3632 4102
3633 case OP_LET1: /* let (calculate parameters) */ 4103 case OP_LET1: /* let (calculate parameters) */
4104 case OP_LET1REC: /* letrec (calculate parameters) */
3634 args = cons (SCHEME_V->value, args); 4105 args = cons (SCHEME_V->value, args);
3635 4106
3636 if (is_pair (SCHEME_V->code)) /* continue */ 4107 if (is_pair (SCHEME_V->code)) /* continue */
3637 { 4108 {
3638 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4109 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3639 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4110 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3640 4111
3641 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4112 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3642 SCHEME_V->code = cadar (SCHEME_V->code); 4113 SCHEME_V->code = cadar (SCHEME_V->code);
3643 SCHEME_V->args = NIL; 4114 SCHEME_V->args = NIL;
3644 s_goto (OP_EVAL); 4115 s_goto (OP_EVAL);
3645 } 4116 }
3646 else /* end */ 4117
3647 { 4118 /* end */
3648 args = reverse_in_place (SCHEME_A_ NIL, args); 4119 args = reverse_in_place (SCHEME_A_ NIL, args);
3649 SCHEME_V->code = car (args); 4120 SCHEME_V->code = car (args);
3650 SCHEME_V->args = cdr (args); 4121 SCHEME_V->args = cdr (args);
3651 s_goto (OP_LET2); 4122 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3652 }
3653 4123
3654 case OP_LET2: /* let */ 4124 case OP_LET2: /* let */
3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4125 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3656 4126
3657 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4127 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3661 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4131 if (is_symbol (car (SCHEME_V->code))) /* named let */
3662 { 4132 {
3663 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4133 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3664 { 4134 {
3665 if (!is_pair (x)) 4135 if (!is_pair (x))
3666 Error_1 ("Bad syntax of binding in let :", x); 4136 Error_1 ("Bad syntax of binding in let:", x);
3667 4137
3668 if (!is_list (SCHEME_A_ car (x))) 4138 if (!is_list (SCHEME_A_ car (x)))
3669 Error_1 ("Bad syntax of binding in let :", car (x)); 4139 Error_1 ("Bad syntax of binding in let:", car (x));
3670 4140
3671 args = cons (caar (x), args); 4141 args = cons (caar (x), args);
3672 } 4142 }
3673 4143
3674 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4144 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3691 SCHEME_V->code = cdr (SCHEME_V->code); 4161 SCHEME_V->code = cdr (SCHEME_V->code);
3692 s_goto (OP_BEGIN); 4162 s_goto (OP_BEGIN);
3693 } 4163 }
3694 4164
3695 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4165 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3696 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4166 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3697 4167
3698 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4168 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3699 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4169 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3700 s_goto (OP_EVAL); 4170 s_goto (OP_EVAL);
3701 4171
… …
3712 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4182 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3713 SCHEME_V->code = cadar (SCHEME_V->code); 4183 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL; 4184 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL); 4185 s_goto (OP_EVAL);
3716 } 4186 }
3717 else /* end */ 4187
4188 /* end */
3718 { 4189
3719 SCHEME_V->code = args; 4190 SCHEME_V->code = args;
3720 SCHEME_V->args = NIL; 4191 SCHEME_V->args = NIL;
3721 s_goto (OP_BEGIN); 4192 s_goto (OP_BEGIN);
3722 }
3723 4193
3724 case OP_LET0REC: /* letrec */ 4194 case OP_LET0REC: /* letrec */
3725 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4195 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3726 SCHEME_V->args = NIL; 4196 SCHEME_V->args = NIL;
3727 SCHEME_V->value = SCHEME_V->code; 4197 SCHEME_V->value = SCHEME_V->code;
3728 SCHEME_V->code = car (SCHEME_V->code); 4198 SCHEME_V->code = car (SCHEME_V->code);
3729 s_goto (OP_LET1REC); 4199 s_goto (OP_LET1REC);
3730 4200
3731 case OP_LET1REC: /* letrec (calculate parameters) */ 4201 /* OP_LET1REC handled by OP_LET1 */
3732 args = cons (SCHEME_V->value, args);
3733
3734 if (is_pair (SCHEME_V->code)) /* continue */
3735 {
3736 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3737 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3738
3739 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3740 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL);
3743 }
3744 else /* end */
3745 {
3746 args = reverse_in_place (SCHEME_A_ NIL, args);
3747 SCHEME_V->code = car (args);
3748 SCHEME_V->args = cdr (args);
3749 s_goto (OP_LET2REC);
3750 }
3751 4202
3752 case OP_LET2REC: /* letrec */ 4203 case OP_LET2REC: /* letrec */
3753 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4204 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3754 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4205 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3755 4206
… …
3785 } 4236 }
3786 else 4237 else
3787 { 4238 {
3788 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4239 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3789 s_return (NIL); 4240 s_return (NIL);
3790 else 4241
3791 {
3792 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4242 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3793 SCHEME_V->code = caar (SCHEME_V->code); 4243 SCHEME_V->code = caar (SCHEME_V->code);
3794 s_goto (OP_EVAL); 4244 s_goto (OP_EVAL);
3795 }
3796 } 4245 }
3797 4246
3798 case OP_DELAY: /* delay */ 4247 case OP_DELAY: /* delay */
3799 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4248 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3800 set_typeflag (x, T_PROMISE); 4249 set_typeflag (x, T_PROMISE);
… …
3811 case OP_AND1: /* and */ 4260 case OP_AND1: /* and */
3812 if (is_false (SCHEME_V->value)) 4261 if (is_false (SCHEME_V->value))
3813 s_return (SCHEME_V->value); 4262 s_return (SCHEME_V->value);
3814 else if (SCHEME_V->code == NIL) 4263 else if (SCHEME_V->code == NIL)
3815 s_return (SCHEME_V->value); 4264 s_return (SCHEME_V->value);
3816 else 4265
3817 {
3818 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4266 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3819 SCHEME_V->code = car (SCHEME_V->code); 4267 SCHEME_V->code = car (SCHEME_V->code);
3820 s_goto (OP_EVAL); 4268 s_goto (OP_EVAL);
3821 }
3822 4269
3823 case OP_OR0: /* or */ 4270 case OP_OR0: /* or */
3824 if (SCHEME_V->code == NIL) 4271 if (SCHEME_V->code == NIL)
3825 s_return (S_F); 4272 s_return (S_F);
3826 4273
… …
3831 case OP_OR1: /* or */ 4278 case OP_OR1: /* or */
3832 if (is_true (SCHEME_V->value)) 4279 if (is_true (SCHEME_V->value))
3833 s_return (SCHEME_V->value); 4280 s_return (SCHEME_V->value);
3834 else if (SCHEME_V->code == NIL) 4281 else if (SCHEME_V->code == NIL)
3835 s_return (SCHEME_V->value); 4282 s_return (SCHEME_V->value);
3836 else 4283
3837 {
3838 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4284 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3839 SCHEME_V->code = car (SCHEME_V->code); 4285 SCHEME_V->code = car (SCHEME_V->code);
3840 s_goto (OP_EVAL); 4286 s_goto (OP_EVAL);
3841 }
3842 4287
3843 case OP_C0STREAM: /* cons-stream */ 4288 case OP_C0STREAM: /* cons-stream */
3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4289 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3845 SCHEME_V->code = car (SCHEME_V->code); 4290 SCHEME_V->code = car (SCHEME_V->code);
3846 s_goto (OP_EVAL); 4291 s_goto (OP_EVAL);
… …
3911 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4356 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3912 SCHEME_V->code = caar (x); 4357 SCHEME_V->code = caar (x);
3913 s_goto (OP_EVAL); 4358 s_goto (OP_EVAL);
3914 } 4359 }
3915 } 4360 }
3916 else 4361
3917 s_return (NIL); 4362 s_return (NIL);
3918 4363
3919 case OP_CASE2: /* case */ 4364 case OP_CASE2: /* case */
3920 if (is_true (SCHEME_V->value)) 4365 if (is_true (SCHEME_V->value))
3921 s_goto (OP_BEGIN); 4366 s_goto (OP_BEGIN);
3922 else 4367
3923 s_return (NIL); 4368 s_return (NIL);
3924 4369
3925 case OP_PAPPLY: /* apply */ 4370 case OP_PAPPLY: /* apply */
3926 SCHEME_V->code = car (args); 4371 SCHEME_V->code = car (args);
3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4372 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3928 /*SCHEME_V->args = cadr(args); */ 4373 /*SCHEME_V->args = cadr(args); */
… …
3942 } 4387 }
3943 4388
3944 if (USE_ERROR_CHECKING) abort (); 4389 if (USE_ERROR_CHECKING) abort ();
3945} 4390}
3946 4391
3947static int 4392/* math, cxr */
4393ecb_hot static int
3948opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4394opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3949{ 4395{
3950 pointer args = SCHEME_V->args; 4396 pointer args = SCHEME_V->args;
3951 pointer x = car (args); 4397 pointer x = car (args);
3952 num v; 4398 num v;
3953 4399
3954 switch (op) 4400 switch (op)
3955 { 4401 {
3956#if USE_MATH 4402#if USE_MATH
3957 case OP_INEX2EX: /* inexact->exact */ 4403 case OP_INEX2EX: /* inexact->exact */
3958 {
3959 if (is_integer (x)) 4404 if (!is_integer (x))
3960 s_return (x); 4405 {
3961
3962 RVALUE r = rvalue_unchecked (x); 4406 RVALUE r = rvalue_unchecked (x);
3963 4407
3964 if (r == (RVALUE)(IVALUE)r) 4408 if (r == (RVALUE)(IVALUE)r)
3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4409 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3966 else 4410 else
3967 Error_1 ("inexact->exact: not integral:", x); 4411 Error_1 ("inexact->exact: not integral:", x);
3968 } 4412 }
3969 4413
4414 s_return (x);
4415
4416 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4417 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4418 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4419 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4420
4421 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3970 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4422 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3971 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4423 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4424 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3972 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4425 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3973 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4426 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3974 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4427 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3975 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4428 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4429 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3977 4430
3978 case OP_ATAN: 4431 case OP_ATAN:
4432 s_return (mk_real (SCHEME_A_
3979 if (cdr (args) == NIL) 4433 cdr (args) == NIL
3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4434 ? atan (rvalue (x))
3981 else 4435 : atan2 (rvalue (x), rvalue (cadr (args)))));
3982 {
3983 pointer y = cadr (args);
3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3985 }
3986
3987 case OP_SQRT:
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 4436
3990 case OP_EXPT: 4437 case OP_EXPT:
3991 { 4438 {
3992 RVALUE result; 4439 RVALUE result;
3993 int real_result = 1; 4440 int real_result = 1;
… …
4016 if (real_result) 4463 if (real_result)
4017 s_return (mk_real (SCHEME_A_ result)); 4464 s_return (mk_real (SCHEME_A_ result));
4018 else 4465 else
4019 s_return (mk_integer (SCHEME_A_ result)); 4466 s_return (mk_integer (SCHEME_A_ result));
4020 } 4467 }
4021
4022 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4024
4025 case OP_TRUNCATE:
4026 {
4027 RVALUE n = rvalue (x);
4028 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4029 }
4030
4031 case OP_ROUND:
4032 if (is_integer (x))
4033 s_return (x);
4034
4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4036#endif 4468#endif
4037 4469
4038 case OP_ADD: /* + */ 4470 case OP_ADD: /* + */
4039 v = num_zero; 4471 v = num_zero;
4040 4472
… …
4128 else 4560 else
4129 Error_0 ("modulo: division by zero"); 4561 Error_0 ("modulo: division by zero");
4130 4562
4131 s_return (mk_number (SCHEME_A_ v)); 4563 s_return (mk_number (SCHEME_A_ v));
4132 4564
4133 case OP_CAR: /* car */ 4565 /* the compiler will optimize this mess... */
4134 s_return (caar (args)); 4566 case OP_CAR: op_car: s_return (car (x));
4135 4567 case OP_CDR: op_cdr: s_return (cdr (x));
4136 case OP_CDR: /* cdr */ 4568 case OP_CAAR: op_caar: x = car (x); goto op_car;
4137 s_return (cdar (args)); 4569 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4570 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4571 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4572 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4573 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4574 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4575 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4576 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4577 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4578 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4579 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4580 case OP_CAAAAR: x = car (x); goto op_caaar;
4581 case OP_CAAADR: x = cdr (x); goto op_caaar;
4582 case OP_CAADAR: x = car (x); goto op_caadr;
4583 case OP_CAADDR: x = cdr (x); goto op_caadr;
4584 case OP_CADAAR: x = car (x); goto op_cadar;
4585 case OP_CADADR: x = cdr (x); goto op_cadar;
4586 case OP_CADDAR: x = car (x); goto op_caddr;
4587 case OP_CADDDR: x = cdr (x); goto op_caddr;
4588 case OP_CDAAAR: x = car (x); goto op_cdaar;
4589 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4590 case OP_CDADAR: x = car (x); goto op_cdadr;
4591 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4592 case OP_CDDAAR: x = car (x); goto op_cddar;
4593 case OP_CDDADR: x = cdr (x); goto op_cddar;
4594 case OP_CDDDAR: x = car (x); goto op_cdddr;
4595 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4138 4596
4139 case OP_CONS: /* cons */ 4597 case OP_CONS: /* cons */
4140 set_cdr (args, cadr (args)); 4598 set_cdr (args, cadr (args));
4141 s_return (args); 4599 s_return (args);
4142 4600
… …
4316 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4774 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4317 4775
4318 s_return (newstr); 4776 s_return (newstr);
4319 } 4777 }
4320 4778
4321 case OP_SUBSTR: /* substring */ 4779 case OP_STRING_COPY: /* substring/string-copy */
4322 { 4780 {
4323 char *str = strvalue (x); 4781 char *str = strvalue (x);
4324 int index0 = ivalue_unchecked (cadr (args)); 4782 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4325 int index1; 4783 int index1;
4326 int len; 4784 int len;
4327 4785
4328 if (index0 > strlength (x)) 4786 if (index0 > strlength (x))
4329 Error_1 ("substring: start out of bounds:", cadr (args)); 4787 Error_1 ("string->copy: start out of bounds:", cadr (args));
4330 4788
4331 if (cddr (args) != NIL) 4789 if (cddr (args) != NIL)
4332 { 4790 {
4333 index1 = ivalue_unchecked (caddr (args)); 4791 index1 = ivalue_unchecked (caddr (args));
4334 4792
4335 if (index1 > strlength (x) || index1 < index0) 4793 if (index1 > strlength (x) || index1 < index0)
4336 Error_1 ("substring: end out of bounds:", caddr (args)); 4794 Error_1 ("string->copy: end out of bounds:", caddr (args));
4337 } 4795 }
4338 else 4796 else
4339 index1 = strlength (x); 4797 index1 = strlength (x);
4340 4798
4341 len = index1 - index0; 4799 len = index1 - index0;
4342 x = mk_empty_string (SCHEME_A_ len, ' '); 4800 x = mk_counted_string (SCHEME_A_ str + index0, len);
4343 memcpy (strvalue (x), str + index0, len);
4344 strvalue (x)[len] = 0;
4345 4801
4346 s_return (x); 4802 s_return (x);
4347 } 4803 }
4348 4804
4349 case OP_VECTOR: /* vector */ 4805 case OP_VECTOR: /* vector */
… …
4391 } 4847 }
4392 4848
4393 case OP_VECLEN: /* vector-length */ 4849 case OP_VECLEN: /* vector-length */
4394 s_return (mk_integer (SCHEME_A_ veclength (x))); 4850 s_return (mk_integer (SCHEME_A_ veclength (x)));
4395 4851
4852 case OP_VECRESIZE:
4853 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4854 s_return (x);
4855
4396 case OP_VECREF: /* vector-ref */ 4856 case OP_VECREF: /* vector-ref */
4397 { 4857 {
4398 int index = ivalue_unchecked (cadr (args)); 4858 int index = ivalue_unchecked (cadr (args));
4399 4859
4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4860 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
… …
4419 } 4879 }
4420 4880
4421 if (USE_ERROR_CHECKING) abort (); 4881 if (USE_ERROR_CHECKING) abort ();
4422} 4882}
4423 4883
4424static int 4884/* relational ops */
4885ecb_hot static int
4425opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4886opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4426{ 4887{
4427 pointer x = SCHEME_V->args; 4888 pointer x = SCHEME_V->args;
4428 4889
4429 for (;;) 4890 for (;;)
… …
4450 } 4911 }
4451 4912
4452 s_return (S_T); 4913 s_return (S_T);
4453} 4914}
4454 4915
4455static int 4916/* predicates */
4917ecb_hot static int
4456opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4918opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4457{ 4919{
4458 pointer args = SCHEME_V->args; 4920 pointer args = SCHEME_V->args;
4459 pointer a = car (args); 4921 pointer a = car (args);
4460 pointer d = cdr (args); 4922 pointer d = cdr (args);
4461 int r; 4923 int r;
4462 4924
4463 switch (op) 4925 switch (op)
4464 { 4926 {
4465 case OP_NOT: /* not */ r = is_false (a) ; break; 4927 case OP_NOT: /* not */ r = is_false (a) ; break;
4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4928 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4929 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break; 4930 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4931 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4932 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4933 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4934 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4935 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4936 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4937 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475 4938
4476#if USE_CHAR_CLASSIFIERS 4939#if USE_CHAR_CLASSIFIERS
4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4940 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4941 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4942 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4506 } 4969 }
4507 4970
4508 s_retbool (r); 4971 s_retbool (r);
4509} 4972}
4510 4973
4511static int 4974/* promises, list ops, ports */
4975ecb_hot static int
4512opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4976opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4513{ 4977{
4514 pointer args = SCHEME_V->args; 4978 pointer args = SCHEME_V->args;
4515 pointer a = car (args); 4979 pointer a = car (args);
4516 pointer x, y; 4980 pointer x, y;
… …
4529 } 4993 }
4530 else 4994 else
4531 s_return (SCHEME_V->code); 4995 s_return (SCHEME_V->code);
4532 4996
4533 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4997 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4998 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4535 s_return (SCHEME_V->value); 4999 s_return (SCHEME_V->value);
4536 5000
4537#if USE_PORTS 5001#if USE_PORTS
5002
5003 case OP_EOF_OBJECT: /* eof-object */
5004 s_return (S_EOF);
4538 5005
4539 case OP_WRITE: /* write */ 5006 case OP_WRITE: /* write */
4540 case OP_DISPLAY: /* display */ 5007 case OP_DISPLAY: /* display */
4541 case OP_WRITE_CHAR: /* write-char */ 5008 case OP_WRITE_CHAR: /* write-char */
4542 if (is_pair (cdr (SCHEME_V->args))) 5009 if (is_pair (cdr (SCHEME_V->args)))
… …
4556 else 5023 else
4557 SCHEME_V->print_flag = 0; 5024 SCHEME_V->print_flag = 0;
4558 5025
4559 s_goto (OP_P0LIST); 5026 s_goto (OP_P0LIST);
4560 5027
5028 //TODO: move to scheme
4561 case OP_NEWLINE: /* newline */ 5029 case OP_NEWLINE: /* newline */
4562 if (is_pair (args)) 5030 if (is_pair (args))
4563 { 5031 {
4564 if (a != SCHEME_V->outport) 5032 if (a != SCHEME_V->outport)
4565 { 5033 {
… …
4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5035 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4568 SCHEME_V->outport = a; 5036 SCHEME_V->outport = a;
4569 } 5037 }
4570 } 5038 }
4571 5039
4572 putstr (SCHEME_A_ "\n"); 5040 putcharacter (SCHEME_A_ '\n');
4573 s_return (S_T); 5041 s_return (S_T);
4574#endif 5042#endif
4575 5043
4576 case OP_ERR0: /* error */ 5044 case OP_ERR0: /* error */
4577 SCHEME_V->retcode = -1; 5045 SCHEME_V->retcode = -1;
… …
4586 putstr (SCHEME_A_ strvalue (car (args))); 5054 putstr (SCHEME_A_ strvalue (car (args)));
4587 SCHEME_V->args = cdr (args); 5055 SCHEME_V->args = cdr (args);
4588 s_goto (OP_ERR1); 5056 s_goto (OP_ERR1);
4589 5057
4590 case OP_ERR1: /* error */ 5058 case OP_ERR1: /* error */
4591 putstr (SCHEME_A_ " "); 5059 putcharacter (SCHEME_A_ ' ');
4592 5060
4593 if (args != NIL) 5061 if (args != NIL)
4594 { 5062 {
4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5063 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4596 SCHEME_V->args = a; 5064 SCHEME_V->args = a;
4597 SCHEME_V->print_flag = 1; 5065 SCHEME_V->print_flag = 1;
4598 s_goto (OP_P0LIST); 5066 s_goto (OP_P0LIST);
4599 } 5067 }
4600 else 5068 else
4601 { 5069 {
4602 putstr (SCHEME_A_ "\n"); 5070 putcharacter (SCHEME_A_ '\n');
4603 5071
4604 if (SCHEME_V->interactive_repl) 5072 if (SCHEME_V->interactive_repl)
4605 s_goto (OP_T0LVL); 5073 s_goto (OP_T0LVL);
4606 else 5074 else
4607 return -1; 5075 return -1;
… …
4684 SCHEME_V->gc_verbose = (a != S_F); 5152 SCHEME_V->gc_verbose = (a != S_F);
4685 s_retbool (was); 5153 s_retbool (was);
4686 } 5154 }
4687 5155
4688 case OP_NEWSEGMENT: /* new-segment */ 5156 case OP_NEWSEGMENT: /* new-segment */
5157#if 0
4689 if (!is_pair (args) || !is_number (a)) 5158 if (!is_pair (args) || !is_number (a))
4690 Error_0 ("new-segment: argument must be a number"); 5159 Error_0 ("new-segment: argument must be a number");
4691 5160#endif
4692 alloc_cellseg (SCHEME_A_ ivalue (a)); 5161 s_retbool (alloc_cellseg (SCHEME_A));
4693
4694 s_return (S_T);
4695 5162
4696 case OP_OBLIST: /* oblist */ 5163 case OP_OBLIST: /* oblist */
4697 s_return (oblist_all_symbols (SCHEME_A)); 5164 s_return (oblist_all_symbols (SCHEME_A));
4698 5165
4699#if USE_PORTS 5166#if USE_PORTS
… …
4769 s_return (p == NIL ? S_F : p); 5236 s_return (p == NIL ? S_F : p);
4770 } 5237 }
4771 5238
4772 case OP_GET_OUTSTRING: /* get-output-string */ 5239 case OP_GET_OUTSTRING: /* get-output-string */
4773 { 5240 {
4774 port *p; 5241 port *p = port (a);
4775 5242
4776 if ((p = a->object.port)->kind & port_string) 5243 if (p->kind & port_string)
4777 { 5244 {
4778 off_t size; 5245 off_t size;
4779 char *str; 5246 char *str;
4780 5247
4781 size = p->rep.string.curr - p->rep.string.start + 1; 5248 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4816 } 5283 }
4817 5284
4818 if (USE_ERROR_CHECKING) abort (); 5285 if (USE_ERROR_CHECKING) abort ();
4819} 5286}
4820 5287
4821static int 5288/* reading */
5289ecb_cold static int
4822opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5290opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4823{ 5291{
4824 pointer args = SCHEME_V->args; 5292 pointer args = SCHEME_V->args;
4825 pointer x; 5293 pointer x;
4826 5294
… …
4886 int res; 5354 int res;
4887 5355
4888 if (is_pair (args)) 5356 if (is_pair (args))
4889 p = car (args); 5357 p = car (args);
4890 5358
4891 res = p->object.port->kind & port_string; 5359 res = port (p)->kind & port_string;
4892 5360
4893 s_retbool (res); 5361 s_retbool (res);
4894 } 5362 }
4895 5363
4896 case OP_SET_INPORT: /* set-input-port */ 5364 case OP_SET_INPORT: /* set-input-port */
… …
4905 case OP_RDSEXPR: 5373 case OP_RDSEXPR:
4906 switch (SCHEME_V->tok) 5374 switch (SCHEME_V->tok)
4907 { 5375 {
4908 case TOK_EOF: 5376 case TOK_EOF:
4909 s_return (S_EOF); 5377 s_return (S_EOF);
4910 /* NOTREACHED */
4911 5378
4912 case TOK_VEC: 5379 case TOK_VEC:
4913 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5380 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4914 /* fall through */ 5381 /* fall through */
4915 5382
… …
4918 5385
4919 if (SCHEME_V->tok == TOK_RPAREN) 5386 if (SCHEME_V->tok == TOK_RPAREN)
4920 s_return (NIL); 5387 s_return (NIL);
4921 else if (SCHEME_V->tok == TOK_DOT) 5388 else if (SCHEME_V->tok == TOK_DOT)
4922 Error_0 ("syntax error: illegal dot expression"); 5389 Error_0 ("syntax error: illegal dot expression");
4923 else 5390
4924 {
4925 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5391 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4926 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5392 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4927 s_goto (OP_RDSEXPR); 5393 s_goto (OP_RDSEXPR);
4928 }
4929 5394
4930 case TOK_QUOTE: 5395 case TOK_QUOTE:
4931 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5396 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4932 SCHEME_V->tok = token (SCHEME_A); 5397 SCHEME_V->tok = token (SCHEME_A);
4933 s_goto (OP_RDSEXPR); 5398 s_goto (OP_RDSEXPR);
… …
4939 { 5404 {
4940 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5405 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4941 SCHEME_V->tok = TOK_LPAREN; 5406 SCHEME_V->tok = TOK_LPAREN;
4942 s_goto (OP_RDSEXPR); 5407 s_goto (OP_RDSEXPR);
4943 } 5408 }
4944 else 5409
4945 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5410 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4946
4947 s_goto (OP_RDSEXPR); 5411 s_goto (OP_RDSEXPR);
4948 5412
4949 case TOK_COMMA: 5413 case TOK_COMMA:
4950 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5414 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4951 SCHEME_V->tok = token (SCHEME_A); 5415 SCHEME_V->tok = token (SCHEME_A);
… …
4955 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5419 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4956 SCHEME_V->tok = token (SCHEME_A); 5420 SCHEME_V->tok = token (SCHEME_A);
4957 s_goto (OP_RDSEXPR); 5421 s_goto (OP_RDSEXPR);
4958 5422
4959 case TOK_ATOM: 5423 case TOK_ATOM:
4960 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5424 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5425
5426 case TOK_DOTATOM:
5427 SCHEME_V->strbuff[0] = '.';
5428 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5429
5430 case TOK_STRATOM:
5431 //TODO: haven't checked whether the garbage collector could interfere and free x
5432 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5433 x = readstrexp (SCHEME_A_ '|');
5434 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4961 5435
4962 case TOK_DQUOTE: 5436 case TOK_DQUOTE:
4963 x = readstrexp (SCHEME_A); 5437 x = readstrexp (SCHEME_A_ '"');
4964 5438
4965 if (x == S_F) 5439 if (x == S_F)
4966 Error_0 ("Error reading string"); 5440 Error_0 ("Error reading string");
4967 5441
4968 setimmutable (x); 5442 setimmutable (x);
… …
4972 { 5446 {
4973 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5447 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
4974 5448
4975 if (f == NIL) 5449 if (f == NIL)
4976 Error_0 ("undefined sharp expression"); 5450 Error_0 ("undefined sharp expression");
4977 else 5451
4978 {
4979 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5452 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
4980 s_goto (OP_EVAL); 5453 s_goto (OP_EVAL);
4981 }
4982 } 5454 }
4983 5455
4984 case TOK_SHARP_CONST: 5456 case TOK_SHARP_CONST:
4985 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5457 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4986 Error_0 ("undefined sharp expression"); 5458 Error_0 ("undefined sharp expression");
4987 else 5459
4988 s_return (x); 5460 s_return (x);
4989 5461
4990 default: 5462 default:
4991 Error_0 ("syntax error: illegal token"); 5463 Error_0 ("syntax error: illegal token");
4992 } 5464 }
4993 5465
… …
5086 pointer b = cdr (args); 5558 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b); 5559 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b); 5560 SCHEME_V->args = car (b);
5089 5561
5090 if (a == SCHEME_V->QUOTE && ok_abbr) 5562 if (a == SCHEME_V->QUOTE && ok_abbr)
5091 putstr (SCHEME_A_ "'"); 5563 putcharacter (SCHEME_A_ '\'');
5092 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5564 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`"); 5565 putcharacter (SCHEME_A_ '`');
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5566 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ","); 5567 putcharacter (SCHEME_A_ ',');
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5568 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@"); 5569 putstr (SCHEME_A_ ",@");
5098 else 5570 else
5099 { 5571 {
5100 putstr (SCHEME_A_ "("); 5572 putcharacter (SCHEME_A_ '(');
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5573 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a; 5574 SCHEME_V->args = a;
5103 } 5575 }
5104 5576
5105 s_goto (OP_P0LIST); 5577 s_goto (OP_P0LIST);
… …
5107 5579
5108 case OP_P1LIST: 5580 case OP_P1LIST:
5109 if (is_pair (args)) 5581 if (is_pair (args))
5110 { 5582 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5583 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5112 putstr (SCHEME_A_ " "); 5584 putcharacter (SCHEME_A_ ' ');
5113 SCHEME_V->args = car (args); 5585 SCHEME_V->args = car (args);
5114 s_goto (OP_P0LIST); 5586 s_goto (OP_P0LIST);
5115 } 5587 }
5116 else if (is_vector (args)) 5588 else if (is_vector (args))
5117 { 5589 {
… …
5125 { 5597 {
5126 putstr (SCHEME_A_ " . "); 5598 putstr (SCHEME_A_ " . ");
5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5599 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5128 } 5600 }
5129 5601
5130 putstr (SCHEME_A_ ")"); 5602 putcharacter (SCHEME_A_ ')');
5131 s_return (S_T); 5603 s_return (S_T);
5132 } 5604 }
5133 5605
5134 case OP_PVECFROM: 5606 case OP_PVECFROM:
5135 { 5607 {
5136 int i = ivalue_unchecked (cdr (args)); 5608 IVALUE i = ivalue_unchecked (cdr (args));
5137 pointer vec = car (args); 5609 pointer vec = car (args);
5138 int len = veclength (vec); 5610 uint32_t len = veclength (vec);
5139 5611
5140 if (i == len) 5612 if (i == len)
5141 { 5613 {
5142 putstr (SCHEME_A_ ")"); 5614 putcharacter (SCHEME_A_ ')');
5143 s_return (S_T); 5615 s_return (S_T);
5144 } 5616 }
5145 else 5617 else
5146 { 5618 {
5147 pointer elem = vector_get (vec, i); 5619 pointer elem = vector_get (vec, i);
5148 5620
5149 ivalue_unchecked (cdr (args)) = i + 1; 5621 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5622 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5151 SCHEME_V->args = elem; 5623 SCHEME_V->args = elem;
5152 5624
5153 if (i > 0) 5625 if (i > 0)
5154 putstr (SCHEME_A_ " "); 5626 putcharacter (SCHEME_A_ ' ');
5155 5627
5156 s_goto (OP_P0LIST); 5628 s_goto (OP_P0LIST);
5157 } 5629 }
5158 } 5630 }
5159 } 5631 }
5160 5632
5161 if (USE_ERROR_CHECKING) abort (); 5633 if (USE_ERROR_CHECKING) abort ();
5162} 5634}
5163 5635
5164static int 5636/* list ops */
5637ecb_hot static int
5165opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5638opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5166{ 5639{
5167 pointer args = SCHEME_V->args; 5640 pointer args = SCHEME_V->args;
5168 pointer a = car (args); 5641 pointer a = car (args);
5169 pointer x, y; 5642 pointer x, y;
… …
5192 break; 5665 break;
5193 } 5666 }
5194 5667
5195 if (is_pair (y)) 5668 if (is_pair (y))
5196 s_return (car (y)); 5669 s_return (car (y));
5197 else 5670
5198 s_return (S_F); 5671 s_return (S_F);
5199
5200 5672
5201 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5673 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5202 SCHEME_V->args = a; 5674 SCHEME_V->args = a;
5203 5675
5204 if (SCHEME_V->args == NIL) 5676 if (SCHEME_V->args == NIL)
5205 s_return (S_F); 5677 s_return (S_F);
5206 else if (is_closure (SCHEME_V->args)) 5678 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5207 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5679 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5208 else if (is_macro (SCHEME_V->args)) 5680
5209 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5210 else
5211 s_return (S_F); 5681 s_return (S_F);
5212 5682
5213 case OP_CLOSUREP: /* closure? */ 5683 case OP_CLOSUREP: /* closure? */
5214 /* 5684 /*
5215 * Note, macro object is also a closure. 5685 * Note, macro object is also a closure.
5216 * Therefore, (closure? <#MACRO>) ==> #t 5686 * Therefore, (closure? <#MACRO>) ==> #t
5687 * (schmorp) well, obviously not, fix? TODO
5217 */ 5688 */
5218 s_retbool (is_closure (a)); 5689 s_retbool (is_closure (a));
5219 5690
5220 case OP_MACROP: /* macro? */ 5691 case OP_MACROP: /* macro? */
5221 s_retbool (is_macro (a)); 5692 s_retbool (is_macro (a));
… …
5226 5697
5227/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5698/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5699typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5229 5700
5230typedef int (*test_predicate)(pointer); 5701typedef int (*test_predicate)(pointer);
5231static int 5702
5703ecb_hot static int
5232tst_any (pointer p) 5704tst_any (pointer p)
5233{ 5705{
5234 return 1; 5706 return 1;
5235} 5707}
5236 5708
5237static int 5709ecb_hot static int
5238tst_inonneg (pointer p) 5710tst_inonneg (pointer p)
5239{ 5711{
5240 return is_integer (p) && ivalue_unchecked (p) >= 0; 5712 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241} 5713}
5242 5714
5243static int 5715ecb_hot static int
5244tst_is_list (SCHEME_P_ pointer p) 5716tst_is_list (SCHEME_P_ pointer p)
5245{ 5717{
5246 return p == NIL || is_pair (p); 5718 return p == NIL || is_pair (p);
5247} 5719}
5248 5720
… …
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5763#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h" 5764#include "opdefines.h"
5293#undef OP_DEF 5765#undef OP_DEF
5294; 5766;
5295 5767
5296static const char * 5768ecb_cold static const char *
5297opname (int idx) 5769opname (int idx)
5298{ 5770{
5299 const char *name = opnames; 5771 const char *name = opnames;
5300 5772
5301 /* should do this at compile time, but would require external program, right? */ 5773 /* should do this at compile time, but would require external program, right? */
… …
5303 name += strlen (name) + 1; 5775 name += strlen (name) + 1;
5304 5776
5305 return *name ? name : "ILLEGAL"; 5777 return *name ? name : "ILLEGAL";
5306} 5778}
5307 5779
5308static const char * 5780ecb_cold static const char *
5309procname (pointer x) 5781procname (pointer x)
5310{ 5782{
5311 return opname (procnum (x)); 5783 return opname (procnum (x));
5312} 5784}
5313 5785
… …
5333#undef OP_DEF 5805#undef OP_DEF
5334 {0} 5806 {0}
5335}; 5807};
5336 5808
5337/* kernel of this interpreter */ 5809/* kernel of this interpreter */
5338static void ecb_hot 5810ecb_hot static void
5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5811Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5340{ 5812{
5341 SCHEME_V->op = op; 5813 SCHEME_V->op = op;
5342 5814
5343 for (;;) 5815 for (;;)
… …
5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5898 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5427 return; 5899 return;
5428 5900
5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5901 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5430 { 5902 {
5431 xwrstr ("No memory!\n"); 5903 putstr (SCHEME_A_ "No memory!\n");
5432 return; 5904 return;
5433 } 5905 }
5434 } 5906 }
5435} 5907}
5436 5908
5437/* ========== Initialization of internal keywords ========== */ 5909/* ========== Initialization of internal keywords ========== */
5438 5910
5439static void 5911ecb_cold static void
5440assign_syntax (SCHEME_P_ const char *name) 5912assign_syntax (SCHEME_P_ const char *name)
5441{ 5913{
5442 pointer x = oblist_add_by_name (SCHEME_A_ name); 5914 pointer x = oblist_add_by_name (SCHEME_A_ name);
5443 set_typeflag (x, typeflag (x) | T_SYNTAX); 5915 set_typeflag (x, typeflag (x) | T_SYNTAX);
5444} 5916}
5445 5917
5446static void 5918ecb_cold static void
5447assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5919assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5448{ 5920{
5449 pointer x = mk_symbol (SCHEME_A_ name); 5921 pointer x = mk_symbol (SCHEME_A_ name);
5450 pointer y = mk_proc (SCHEME_A_ op); 5922 pointer y = mk_proc (SCHEME_A_ op);
5451 new_slot_in_env (SCHEME_A_ x, y); 5923 new_slot_in_env (SCHEME_A_ x, y);
… …
5454static pointer 5926static pointer
5455mk_proc (SCHEME_P_ enum scheme_opcodes op) 5927mk_proc (SCHEME_P_ enum scheme_opcodes op)
5456{ 5928{
5457 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5929 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5458 set_typeflag (y, (T_PROC | T_ATOM)); 5930 set_typeflag (y, (T_PROC | T_ATOM));
5459 ivalue_unchecked (y) = op; 5931 set_ivalue (y, op);
5460 return y; 5932 return y;
5461} 5933}
5462 5934
5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5935/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5464static int 5936ecb_hot static int
5465syntaxnum (pointer p) 5937syntaxnum (pointer p)
5466{ 5938{
5467 const char *s = strvalue (car (p)); 5939 const char *s = strvalue (p);
5468 5940
5469 switch (strlength (car (p))) 5941 switch (strlength (p))
5470 { 5942 {
5471 case 2: 5943 case 2:
5472 if (s[0] == 'i') 5944 if (s[0] == 'i')
5473 return OP_IF0; /* if */ 5945 return OP_IF0; /* if */
5474 else 5946 else
… …
5548 6020
5549ecb_cold int 6021ecb_cold int
5550scheme_init (SCHEME_P) 6022scheme_init (SCHEME_P)
5551{ 6023{
5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6024 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5553 pointer x; 6025
6026 /* this memset is not strictly correct, as we assume (intcache)
6027 * that memset 0 will also set pointers to 0, but memset does
6028 * of course not guarantee that. screw such systems.
6029 */
6030 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5554 6031
5555 num_set_fixnum (num_zero, 1); 6032 num_set_fixnum (num_zero, 1);
5556 num_set_ivalue (num_zero, 0); 6033 num_set_ivalue (num_zero, 0);
5557 num_set_fixnum (num_one, 1); 6034 num_set_fixnum (num_one, 1);
5558 num_set_ivalue (num_one, 1); 6035 num_set_ivalue (num_one, 1);
… …
5570 SCHEME_V->save_inport = NIL; 6047 SCHEME_V->save_inport = NIL;
5571 SCHEME_V->loadport = NIL; 6048 SCHEME_V->loadport = NIL;
5572 SCHEME_V->nesting = 0; 6049 SCHEME_V->nesting = 0;
5573 SCHEME_V->interactive_repl = 0; 6050 SCHEME_V->interactive_repl = 0;
5574 6051
5575 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6052 if (!alloc_cellseg (SCHEME_A))
5576 { 6053 {
5577#if USE_ERROR_CHECKING 6054#if USE_ERROR_CHECKING
5578 SCHEME_V->no_memory = 1; 6055 SCHEME_V->no_memory = 1;
5579 return 0; 6056 return 0;
5580#endif 6057#endif
5581 } 6058 }
5582 6059
5583 SCHEME_V->gc_verbose = 0; 6060 SCHEME_V->gc_verbose = 0;
5584 dump_stack_initialize (SCHEME_A); 6061 dump_stack_initialize (SCHEME_A);
5585 SCHEME_V->code = NIL; 6062 SCHEME_V->code = NIL;
5586 SCHEME_V->args = NIL; 6063 SCHEME_V->args = NIL;
5587 SCHEME_V->envir = NIL; 6064 SCHEME_V->envir = NIL;
6065 SCHEME_V->value = NIL;
5588 SCHEME_V->tracing = 0; 6066 SCHEME_V->tracing = 0;
5589 6067
5590 /* init NIL */ 6068 /* init NIL */
5591 set_typeflag (NIL, T_ATOM | T_MARK); 6069 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5592 set_car (NIL, NIL); 6070 set_car (NIL, NIL);
5593 set_cdr (NIL, NIL); 6071 set_cdr (NIL, NIL);
5594 /* init T */ 6072 /* init T */
5595 set_typeflag (S_T, T_ATOM | T_MARK); 6073 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5596 set_car (S_T, S_T); 6074 set_car (S_T, S_T);
5597 set_cdr (S_T, S_T); 6075 set_cdr (S_T, S_T);
5598 /* init F */ 6076 /* init F */
5599 set_typeflag (S_F, T_ATOM | T_MARK); 6077 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5600 set_car (S_F, S_F); 6078 set_car (S_F, S_F);
5601 set_cdr (S_F, S_F); 6079 set_cdr (S_F, S_F);
5602 /* init EOF_OBJ */ 6080 /* init EOF_OBJ */
5603 set_typeflag (S_EOF, T_ATOM | T_MARK); 6081 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5604 set_car (S_EOF, S_EOF); 6082 set_car (S_EOF, S_EOF);
5605 set_cdr (S_EOF, S_EOF); 6083 set_cdr (S_EOF, S_EOF);
5606 /* init sink */ 6084 /* init sink */
5607 set_typeflag (S_SINK, T_PAIR | T_MARK); 6085 set_typeflag (S_SINK, T_PAIR);
5608 set_car (S_SINK, NIL); 6086 set_car (S_SINK, NIL);
5609 6087
5610 /* init c_nest */ 6088 /* init c_nest */
5611 SCHEME_V->c_nest = NIL; 6089 SCHEME_V->c_nest = NIL;
5612 6090
5613 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6091 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5614 /* init global_env */ 6092 /* init global_env */
5615 new_frame_in_env (SCHEME_A_ NIL); 6093 new_frame_in_env (SCHEME_A_ NIL);
5616 SCHEME_V->global_env = SCHEME_V->envir; 6094 SCHEME_V->global_env = SCHEME_V->envir;
5617 /* init else */ 6095 /* init else */
5618 x = mk_symbol (SCHEME_A_ "else"); 6096 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5619 new_slot_in_env (SCHEME_A_ x, S_T);
5620 6097
5621 { 6098 {
5622 static const char *syntax_names[] = { 6099 static const char *syntax_names[] = {
5623 "lambda", "quote", "define", "if", "begin", "set!", 6100 "lambda", "quote", "define", "if", "begin", "set!",
5624 "let", "let*", "letrec", "cond", "delay", "and", 6101 "let", "let*", "letrec", "cond", "delay", "and",
… …
5648 6125
5649 return !SCHEME_V->no_memory; 6126 return !SCHEME_V->no_memory;
5650} 6127}
5651 6128
5652#if USE_PORTS 6129#if USE_PORTS
5653void 6130ecb_cold void
5654scheme_set_input_port_file (SCHEME_P_ int fin) 6131scheme_set_input_port_file (SCHEME_P_ int fin)
5655{ 6132{
5656 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6133 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5657} 6134}
5658 6135
5659void 6136ecb_cold void
5660scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6137scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5661{ 6138{
5662 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6139 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5663} 6140}
5664 6141
5665void 6142ecb_cold void
5666scheme_set_output_port_file (SCHEME_P_ int fout) 6143scheme_set_output_port_file (SCHEME_P_ int fout)
5667{ 6144{
5668 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6145 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5669} 6146}
5670 6147
5671void 6148ecb_cold void
5672scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6149scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5673{ 6150{
5674 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6151 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5675} 6152}
5676#endif 6153#endif
5677 6154
5678void 6155ecb_cold void
5679scheme_set_external_data (SCHEME_P_ void *p) 6156scheme_set_external_data (SCHEME_P_ void *p)
5680{ 6157{
5681 SCHEME_V->ext_data = p; 6158 SCHEME_V->ext_data = p;
5682} 6159}
5683 6160
… …
5715 SCHEME_V->loadport = NIL; 6192 SCHEME_V->loadport = NIL;
5716 SCHEME_V->gc_verbose = 0; 6193 SCHEME_V->gc_verbose = 0;
5717 gc (SCHEME_A_ NIL, NIL); 6194 gc (SCHEME_A_ NIL, NIL);
5718 6195
5719 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6196 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5720 free (SCHEME_V->alloc_seg[i]); 6197 free (SCHEME_V->cell_seg[i]);
5721 6198
5722#if SHOW_ERROR_LINE 6199#if SHOW_ERROR_LINE
5723 for (i = 0; i <= SCHEME_V->file_i; i++) 6200 for (i = 0; i <= SCHEME_V->file_i; i++)
5724 {
5725 if (SCHEME_V->load_stack[i].kind & port_file) 6201 if (SCHEME_V->load_stack[i].kind & port_file)
5726 { 6202 {
5727 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6203 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5728 6204
5729 if (fname) 6205 if (fname)
5730 free (fname); 6206 free (fname);
5731 } 6207 }
5732 }
5733#endif 6208#endif
5734} 6209}
5735 6210
5736void 6211ecb_cold void
5737scheme_load_file (SCHEME_P_ int fin) 6212scheme_load_file (SCHEME_P_ int fin)
5738{ 6213{
5739 scheme_load_named_file (SCHEME_A_ fin, 0); 6214 scheme_load_named_file (SCHEME_A_ fin, 0);
5740} 6215}
5741 6216
5742void 6217ecb_cold void
5743scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6218scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5744{ 6219{
5745 dump_stack_reset (SCHEME_A); 6220 dump_stack_reset (SCHEME_A);
5746 SCHEME_V->envir = SCHEME_V->global_env; 6221 SCHEME_V->envir = SCHEME_V->global_env;
5747 SCHEME_V->file_i = 0; 6222 SCHEME_V->file_i = 0;
5748 SCHEME_V->load_stack[0].unget = -1; 6223 SCHEME_V->load_stack[0].unget = -1;
5749 SCHEME_V->load_stack[0].kind = port_input | port_file; 6224 SCHEME_V->load_stack[0].kind = port_input | port_file;
5750 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6225 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5751#if USE_PORTS
5752 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6226 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5753#endif
5754 SCHEME_V->retcode = 0; 6227 SCHEME_V->retcode = 0;
5755 6228
5756#if USE_PORTS
5757 if (fin == STDIN_FILENO) 6229 if (fin == STDIN_FILENO)
5758 SCHEME_V->interactive_repl = 1; 6230 SCHEME_V->interactive_repl = 1;
5759#endif
5760 6231
5761#if USE_PORTS 6232#if USE_PORTS
5762#if SHOW_ERROR_LINE 6233#if SHOW_ERROR_LINE
5763 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6234 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5764 6235
… …
5768#endif 6239#endif
5769 6240
5770 SCHEME_V->inport = SCHEME_V->loadport; 6241 SCHEME_V->inport = SCHEME_V->loadport;
5771 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6242 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5772 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6243 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6244
5773 set_typeflag (SCHEME_V->loadport, T_ATOM); 6245 set_typeflag (SCHEME_V->loadport, T_ATOM);
5774 6246
5775 if (SCHEME_V->retcode == 0) 6247 if (SCHEME_V->retcode == 0)
5776 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6248 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5777} 6249}
5778 6250
5779void 6251ecb_cold void
5780scheme_load_string (SCHEME_P_ const char *cmd) 6252scheme_load_string (SCHEME_P_ const char *cmd)
5781{ 6253{
6254#if USE_PORTs
5782 dump_stack_reset (SCHEME_A); 6255 dump_stack_reset (SCHEME_A);
5783 SCHEME_V->envir = SCHEME_V->global_env; 6256 SCHEME_V->envir = SCHEME_V->global_env;
5784 SCHEME_V->file_i = 0; 6257 SCHEME_V->file_i = 0;
5785 SCHEME_V->load_stack[0].kind = port_input | port_string; 6258 SCHEME_V->load_stack[0].kind = port_input | port_string;
5786 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6259 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5787 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6260 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6261 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5789#if USE_PORTS
5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6262 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5791#endif
5792 SCHEME_V->retcode = 0; 6263 SCHEME_V->retcode = 0;
5793 SCHEME_V->interactive_repl = 0; 6264 SCHEME_V->interactive_repl = 0;
5794 SCHEME_V->inport = SCHEME_V->loadport; 6265 SCHEME_V->inport = SCHEME_V->loadport;
5795 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5796 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6267 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5797 set_typeflag (SCHEME_V->loadport, T_ATOM); 6268 set_typeflag (SCHEME_V->loadport, T_ATOM);
5798 6269
5799 if (SCHEME_V->retcode == 0) 6270 if (SCHEME_V->retcode == 0)
5800 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6271 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6272#else
6273 abort ();
6274#endif
5801} 6275}
5802 6276
5803void 6277ecb_cold void
5804scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6278scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5805{ 6279{
5806 pointer x; 6280 pointer x;
5807 6281
5808 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6282 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5813 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6287 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5814} 6288}
5815 6289
5816#if !STANDALONE 6290#if !STANDALONE
5817 6291
5818void 6292ecb_cold void
5819scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6293scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5820{ 6294{
5821 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6295 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5822} 6296}
5823 6297
5824void 6298ecb_cold void
5825scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6299scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5826{ 6300{
5827 int i; 6301 int i;
5828 6302
5829 for (i = 0; i < count; i++) 6303 for (i = 0; i < count; i++)
5830 scheme_register_foreign_func (SCHEME_A_ list + i); 6304 scheme_register_foreign_func (SCHEME_A_ list + i);
5831} 6305}
5832 6306
5833pointer 6307ecb_cold pointer
5834scheme_apply0 (SCHEME_P_ const char *procname) 6308scheme_apply0 (SCHEME_P_ const char *procname)
5835{ 6309{
5836 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6310 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5837} 6311}
5838 6312
5839void 6313ecb_cold void
5840save_from_C_call (SCHEME_P) 6314save_from_C_call (SCHEME_P)
5841{ 6315{
5842 pointer saved_data = cons (car (S_SINK), 6316 pointer saved_data = cons (car (S_SINK),
5843 cons (SCHEME_V->envir, 6317 cons (SCHEME_V->envir,
5844 SCHEME_V->dump)); 6318 SCHEME_V->dump));
… …
5848 /* Truncate the dump stack so TS will return here when done, not 6322 /* Truncate the dump stack so TS will return here when done, not
5849 directly resume pre-C-call operations. */ 6323 directly resume pre-C-call operations. */
5850 dump_stack_reset (SCHEME_A); 6324 dump_stack_reset (SCHEME_A);
5851} 6325}
5852 6326
5853void 6327ecb_cold void
5854restore_from_C_call (SCHEME_P) 6328restore_from_C_call (SCHEME_P)
5855{ 6329{
5856 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6330 set_car (S_SINK, caar (SCHEME_V->c_nest));
5857 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6331 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5858 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6332 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5859 /* Pop */ 6333 /* Pop */
5860 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6334 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5861} 6335}
5862 6336
5863/* "func" and "args" are assumed to be already eval'ed. */ 6337/* "func" and "args" are assumed to be already eval'ed. */
5864pointer 6338ecb_cold pointer
5865scheme_call (SCHEME_P_ pointer func, pointer args) 6339scheme_call (SCHEME_P_ pointer func, pointer args)
5866{ 6340{
5867 int old_repl = SCHEME_V->interactive_repl; 6341 int old_repl = SCHEME_V->interactive_repl;
5868 6342
5869 SCHEME_V->interactive_repl = 0; 6343 SCHEME_V->interactive_repl = 0;
… …
5876 SCHEME_V->interactive_repl = old_repl; 6350 SCHEME_V->interactive_repl = old_repl;
5877 restore_from_C_call (SCHEME_A); 6351 restore_from_C_call (SCHEME_A);
5878 return SCHEME_V->value; 6352 return SCHEME_V->value;
5879} 6353}
5880 6354
5881pointer 6355ecb_cold pointer
5882scheme_eval (SCHEME_P_ pointer obj) 6356scheme_eval (SCHEME_P_ pointer obj)
5883{ 6357{
5884 int old_repl = SCHEME_V->interactive_repl; 6358 int old_repl = SCHEME_V->interactive_repl;
5885 6359
5886 SCHEME_V->interactive_repl = 0; 6360 SCHEME_V->interactive_repl = 0;
… …
5898 6372
5899/* ========== Main ========== */ 6373/* ========== Main ========== */
5900 6374
5901#if STANDALONE 6375#if STANDALONE
5902 6376
5903int 6377ecb_cold int
5904main (int argc, char **argv) 6378main (int argc, char **argv)
5905{ 6379{
5906# if USE_MULTIPLICITY 6380# if USE_MULTIPLICITY
5907 scheme ssc; 6381 scheme ssc;
5908 scheme *const SCHEME_V = &ssc; 6382 scheme *const SCHEME_V = &ssc;
… …
5910# endif 6384# endif
5911 int fin; 6385 int fin;
5912 char *file_name = InitFile; 6386 char *file_name = InitFile;
5913 int retcode; 6387 int retcode;
5914 int isfile = 1; 6388 int isfile = 1;
6389#if EXPERIMENT
6390 system ("ps v $PPID");
6391#endif
5915 6392
5916 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6393 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5917 { 6394 {
5918 xwrstr ("Usage: tinyscheme -?\n"); 6395 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5919 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6396 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5920 xwrstr ("followed by\n"); 6397 putstr (SCHEME_A_ "followed by\n");
5921 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6398 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5922 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6399 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5923 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6400 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5924 xwrstr ("Use - as filename for stdin.\n"); 6401 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5925 return 1; 6402 return 1;
5926 } 6403 }
5927 6404
5928 if (!scheme_init (SCHEME_A)) 6405 if (!scheme_init (SCHEME_A))
5929 { 6406 {
5930 xwrstr ("Could not initialize!\n"); 6407 putstr (SCHEME_A_ "Could not initialize!\n");
5931 return 2; 6408 return 2;
5932 } 6409 }
5933 6410
5934# if USE_PORTS 6411# if USE_PORTS
5935 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6412 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5948 } 6425 }
5949#endif 6426#endif
5950 6427
5951 do 6428 do
5952 { 6429 {
5953#if USE_PORTS
5954 if (strcmp (file_name, "-") == 0) 6430 if (strcmp (file_name, "-") == 0)
5955 fin = STDIN_FILENO; 6431 fin = STDIN_FILENO;
5956 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6432 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5957 { 6433 {
5958 pointer args = NIL; 6434 pointer args = NIL;
… …
5976 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6452 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
5977 6453
5978 } 6454 }
5979 else 6455 else
5980 fin = open (file_name, O_RDONLY); 6456 fin = open (file_name, O_RDONLY);
5981#endif
5982 6457
5983 if (isfile && fin < 0) 6458 if (isfile && fin < 0)
5984 { 6459 {
5985 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6460 putstr (SCHEME_A_ "Could not open file ");
6461 putstr (SCHEME_A_ file_name);
6462 putcharacter (SCHEME_A_ '\n');
5986 } 6463 }
5987 else 6464 else
5988 { 6465 {
5989 if (isfile) 6466 if (isfile)
5990 scheme_load_named_file (SCHEME_A_ fin, file_name); 6467 scheme_load_named_file (SCHEME_A_ fin, file_name);
5991 else 6468 else
5992 scheme_load_string (SCHEME_A_ file_name); 6469 scheme_load_string (SCHEME_A_ file_name);
5993 6470
5994#if USE_PORTS
5995 if (!isfile || fin != STDIN_FILENO) 6471 if (!isfile || fin != STDIN_FILENO)
5996 { 6472 {
5997 if (SCHEME_V->retcode != 0) 6473 if (SCHEME_V->retcode != 0)
5998 { 6474 {
5999 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6475 putstr (SCHEME_A_ "Errors encountered reading ");
6476 putstr (SCHEME_A_ file_name);
6477 putcharacter (SCHEME_A_ '\n');
6000 } 6478 }
6001 6479
6002 if (isfile) 6480 if (isfile)
6003 close (fin); 6481 close (fin);
6004 } 6482 }
6005#endif
6006 } 6483 }
6007 6484
6008 file_name = *argv++; 6485 file_name = *argv++;
6009 } 6486 }
6010 while (file_name != 0); 6487 while (file_name != 0);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines