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.39 by root, Sun Nov 29 14:22:30 2015 UTC vs.
Revision 1.66 by root, Mon Dec 7 18:10:57 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>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#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
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
74 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
75 TOK_VEC 84 TOK_VEC
76}; 85};
77 86
78#define BACKQUOTE '`' 87#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
80 90
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
84#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
85#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86 96
87#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
88static scheme sc; 98static scheme sc;
89#endif 99#endif
90 100
91static void 101ecb_cold static void
92xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
93{ 103{
94 if (n < 0) 104 if (n < 0)
95 { 105 {
96 *s++ = '-'; 106 *s++ = '-';
… …
98 } 108 }
99 109
100 char *p = s; 110 char *p = s;
101 111
102 do { 112 do {
103 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
104 n /= base; 114 n /= base;
105 } while (n); 115 } while (n);
106 116
107 *p-- = 0; 117 *p-- = 0;
108 118
… …
111 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
112 --p; ++s; 122 --p; ++s;
113 } 123 }
114} 124}
115 125
116static void 126ecb_cold static void
117xnum (char *s, long n) 127xnum (char *s, long n)
118{ 128{
119 xbase (s, n, 10); 129 xbase (s, n, 10);
120} 130}
121 131
122static void 132ecb_cold static void
123xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
124{
125 write (1, s, strlen (s));
126}
127
128static void
129xwrnum (long n)
130{ 134{
131 char buf[64]; 135 char buf[64];
132 136
133 xnum (buf, n); 137 xnum (buf, n);
134 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
135} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
136 144
137static char 145static char
138xtoupper (char c) 146xtoupper (char c)
139{ 147{
140 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
160 168
161#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
162#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
163#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
164 172
173#endif
174
165#if USE_IGNORECASE 175#if USE_IGNORECASE
166static const char * 176ecb_cold static const char *
167xstrlwr (char *s) 177xstrlwr (char *s)
168{ 178{
169 const char *p = s; 179 const char *p = s;
170 180
171 while (*s) 181 while (*s)
… …
184# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
185# define strlwr(s) (s) 195# define strlwr(s) (s)
186#endif 196#endif
187 197
188#ifndef prompt 198#ifndef prompt
189# define prompt "ts> " 199# define prompt "ms> "
190#endif 200#endif
191 201
192#ifndef InitFile 202#ifndef InitFile
193# define InitFile "init.scm" 203# define InitFile "init.scm"
194#endif 204#endif
195 205
196#ifndef FIRST_CELLSEGS
197# define FIRST_CELLSEGS 3
198#endif
199
200enum scheme_types 206enum scheme_types
201{ 207{
202 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
203 T_REAL, 210 T_REAL,
204 T_STRING, 211 T_STRING,
205 T_SYMBOL, 212 T_SYMBOL,
206 T_PROC, 213 T_PROC,
207 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
208 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
209 T_CONTINUATION, 218 T_CONTINUATION,
210 T_FOREIGN, 219 T_FOREIGN,
211 T_CHARACTER,
212 T_PORT, 220 T_PORT,
213 T_VECTOR, 221 T_VECTOR,
214 T_MACRO,
215 T_PROMISE, 222 T_PROMISE,
216 T_ENVIRONMENT, 223 T_ENVIRONMENT,
217 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
218 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
219}; 227};
220 228
221#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
222#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
223#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
224#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
225#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
226 234
227/* num, for generic arithmetic */ 235/* num, for generic arithmetic */
228struct num 236struct num
229{ 237{
230 IVALUE ivalue; 238 IVALUE ivalue;
… …
255static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
256static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
257static num num_rem (num a, num b); 265static num num_rem (num a, num b);
258static num num_mod (num a, num b); 266static num num_mod (num a, num b);
259 267
260#if USE_MATH
261static double round_per_R5RS (double x);
262#endif
263static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
264 269
265static num num_zero; 270static num num_zero;
266static num num_one; 271static num num_one;
267 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
268/* macros for cell operations */ 277/* macros for cell operations */
269#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
270#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
271#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
272 281
273INTERFACE int 282INTERFACE int
274is_string (pointer p) 283is_string (pointer p)
275{ 284{
276 return type (p) == T_STRING; 285 return type (p) == T_STRING;
277} 286}
278 287
279#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
280#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
281 290
282INTERFACE int 291INTERFACE int
283is_vector (pointer p) 292is_vector (pointer p)
284{ 293{
285 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
286} 295}
287 296
288#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293 302
294INTERFACE int 303INTERFACE int
… …
320string_value (pointer p) 329string_value (pointer p)
321{ 330{
322 return strvalue (p); 331 return strvalue (p);
323} 332}
324 333
325#define ivalue_unchecked(p) (p)->object.ivalue 334#define ivalue_unchecked(p) CELL(p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v) 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327 336
328#if USE_REAL 337#if USE_REAL
329#define rvalue_unchecked(p) (p)->object.rvalue 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
330#define set_rvalue(p,v) (p)->object.rvalue = (v) 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331#else 340#else
332#define rvalue_unchecked(p) (p)->object.ivalue 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
333#define set_rvalue(p,v) (p)->object.ivalue = (v) 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334#endif 343#endif
335 344
336INTERFACE long 345INTERFACE long
337charvalue (pointer p) 346charvalue (pointer p)
338{ 347{
339 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
340} 349}
341 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
342INTERFACE int 353INTERFACE int
343is_port (pointer p) 354is_port (pointer p)
344{ 355{
345 return type (p) == T_PORT; 356 return type (p) == T_PORT;
346} 357}
347 358
348INTERFACE int 359INTERFACE int
349is_inport (pointer p) 360is_inport (pointer p)
350{ 361{
351 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
352} 363}
353 364
354INTERFACE int 365INTERFACE int
355is_outport (pointer p) 366is_outport (pointer p)
356{ 367{
357 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
358} 369}
359 370
360INTERFACE int 371INTERFACE int
361is_pair (pointer p) 372is_pair (pointer p)
362{ 373{
363 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
364} 375}
365 376
366#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
367#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368 379
369static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
370static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
371static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
372static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
373 384
374static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
375static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
376static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
378INTERFACE void 391INTERFACE void
379set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
380{ 393{
381 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
382} 395}
383 396
384INTERFACE void 397INTERFACE void
385set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
386{ 399{
387 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
388} 401}
389 402
390INTERFACE pointer 403INTERFACE pointer
391pair_car (pointer p) 404pair_car (pointer p)
392{ 405{
… …
410{ 423{
411 return strvalue (p); 424 return strvalue (p);
412} 425}
413 426
414#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
415SCHEME_EXPORT int 430SCHEME_EXPORT int
416hasprop (pointer p) 431hasprop (pointer p)
417{ 432{
418 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
419} 434}
420
421# define symprop(p) cdr(p)
422#endif 435#endif
423 436
424INTERFACE int 437INTERFACE int
425is_syntax (pointer p) 438is_syntax (pointer p)
426{ 439{
… …
498 511
499#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
500#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
501#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
502 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
503#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
506 525
507INTERFACE int 526INTERFACE int
508is_immutable (pointer p) 527is_immutable (pointer p)
509{ 528{
510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
522 proper list: length 541 proper list: length
523 circular list: -1 542 circular list: -1
524 not even a pair: -2 543 not even a pair: -2
525 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
526*/ 545*/
527INTERFACE int 546ecb_hot INTERFACE int
528list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
529{ 548{
530 int i = 0; 549 int i = 0;
531 pointer slow, fast; 550 pointer slow, fast;
532 551
… …
571{ 590{
572 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
573} 592}
574 593
575#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
576ecb_inline int 596ecb_inline int
577Cisalpha (int c) 597Cisalpha (int c)
578{ 598{
579 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
580} 600}
… …
638 "gs", 658 "gs",
639 "rs", 659 "rs",
640 "us" 660 "us"
641}; 661};
642 662
643static int 663ecb_cold static int
644is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
645{ 665{
646 int i; 666 int i;
647 667
648 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
667 687
668static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
669static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
670static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
671ecb_inline int is_one_of (const char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
672static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
675static int count_consecutive_cells (pointer x, int needed);
676static 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);
677static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
678static 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);
679static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
680static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
681static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
682 701
702static pointer mk_port (SCHEME_P_ port *p);
703
683#if USE_PORTS 704#if USE_PORTS
684static pointer mk_port (SCHEME_P_ port *p);
685static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
686static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
687static 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);
688static 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);
689static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
690static 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);
691static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
692#endif 712#endif
713
693static void mark (pointer a); 714static void mark (pointer a);
694static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
695static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
696static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
697static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
698static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
699static pointer readstrexp (SCHEME_P_ char delim); 720static pointer readstrexp (SCHEME_P_ char delim);
700ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
701static int token (SCHEME_P); 722static int token (SCHEME_P);
702static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
703static 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);
704static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
871 } 892 }
872 893
873 return ret; 894 return ret;
874} 895}
875 896
876#if USE_MATH
877
878/* Round to nearest. Round to even if midway */
879static double
880round_per_R5RS (double x)
881{
882 double fl = floor (x);
883 double ce = ceil (x);
884 double dfl = x - fl;
885 double dce = ce - x;
886
887 if (dfl > dce)
888 return ce;
889 else if (dfl < dce)
890 return fl;
891 else
892 {
893 if (fmod (fl, 2) == 0) /* I imagine this holds */
894 return fl;
895 else
896 return ce;
897 }
898}
899#endif
900
901static int 897static int
902is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
903{ 899{
904 return x == 0; 900 return x == 0;
905#if 0 901#if 0
… …
910#endif 906#endif
911#endif 907#endif
912} 908}
913 909
914/* allocate new cell segment */ 910/* allocate new cell segment */
915static int 911ecb_cold static int
916alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
917{ 913{
918 pointer newp; 914 struct cell *newp;
919 pointer last; 915 struct cell *last;
920 pointer p; 916 struct cell *p;
921 char *cp; 917 char *cp;
922 long i; 918 long i;
923 int k; 919 int k;
924 920
925 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
926 segsize <<= 1; 922 segsize <<= 1;
927 923
928 for (k = 0; k < n; k++)
929 {
930 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931 return k;
932
933 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
934 925
935 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
936 return k; 927 return k;
937 928
938 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
939 SCHEME_V->alloc_seg[i] = cp;
940 930
941 newp = (pointer)cp; 931 newp = (struct cell *)cp;
942 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
943 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
944 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 935 last = newp + segsize - 1;
946 936
947 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
948 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
949 set_typeflag (p, T_PAIR); 941 set_typeflag (cp, T_PAIR);
950 set_car (p, NIL); 942 set_car (cp, NIL);
951 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
952 } 944 }
953 945
954 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
955 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
956 }
957 948
958 return n; 949 return 1;
959} 950}
960 951
961/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
962ecb_inline pointer 953ecb_inline pointer
963get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 959 return S_SINK;
969 960
970 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
971 { 962 {
972 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;
973 964
974 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
975 966
976 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)
977 { 968 {
978 /* 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 */
979 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980 { 971 {
981#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
982 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
983 return S_SINK; 974 return S_SINK;
984#endif 975#endif
… …
996 } 987 }
997} 988}
998 989
999/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
1000 Tehom */ 991 Tehom */
1001 992ecb_hot static void
1002static void
1003push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004{ 994{
1005 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006 996
1007 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
1009 set_car (holder, recent); 999 set_car (holder, recent);
1010 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
1011 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
1012} 1002}
1013 1003
1014static pointer 1004ecb_hot static pointer
1015get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1016{ 1006{
1017 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1018 1008
1019 /* 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
… …
1028} 1018}
1029 1019
1030static pointer 1020static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 1022{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
1035 1025
1036 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1027 return S_SINK;
1038 1028
1039 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1040 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1041 1031
1042 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1043 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1044 fill_vector (v, 0, init); 1034 fill_vector (v, 0, init);
1045 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1046 1036
1047 return v; 1037 return v;
1048} 1038}
… …
1057static void 1047static void
1058check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1059{ 1049{
1060 /* 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. */
1061 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1062 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1063 1053
1064 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1065 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1066} 1056}
1067 1057
1068static void 1058static void
1069check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1070{ 1060{
… …
1076#endif 1066#endif
1077 1067
1078/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1079 1069
1080/* get new cons cell */ 1070/* get new cons cell */
1081pointer 1071ecb_hot static pointer
1082xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1083{ 1073{
1084 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1085 1075
1086 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1087
1088 if (immutable)
1089 setimmutable (x);
1090 1077
1091 set_car (x, a); 1078 set_car (x, a);
1092 set_cdr (x, b); 1079 set_cdr (x, b);
1093 1080
1094 return x; 1081 return x;
1095} 1082}
1096 1083
1097/* ========== oblist implementation ========== */
1098
1099static pointer 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
1100generate_symbol (SCHEME_P_ const char *name) 1096generate_symbol (SCHEME_P_ const char *name)
1101{ 1097{
1102 pointer x = mk_string (SCHEME_A_ name); 1098 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1099 setimmutable (x);
1104 set_typeflag (x, T_SYMBOL | T_ATOM); 1100 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x; 1101 return x;
1106} 1102}
1107 1103
1104/* ========== oblist implementation ========== */
1105
1108#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1109 1107
1110static int 1108static int
1111hash_fn (const char *key, int table_size) 1109hash_fn (const char *key, int table_size)
1112{ 1110{
1113 const unsigned char *p = key; 1111 const unsigned char *p = (unsigned char *)key;
1114 uint32_t hash = 2166136261; 1112 uint32_t hash = 2166136261U;
1115 1113
1116 while (*p) 1114 while (*p)
1117 hash = (hash ^ *p++) * 16777619; 1115 hash = (hash ^ *p++) * 16777619;
1118 1116
1119 return hash % table_size; 1117 return hash % table_size;
1120} 1118}
1121 1119
1122static pointer 1120ecb_cold static pointer
1123oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1124{ 1122{
1125 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1126} 1124}
1127 1125
1128/* returns the new symbol */ 1126/* returns the new symbol */
1129static pointer 1127ecb_cold static pointer
1130oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1131{ 1129{
1132 pointer x = generate_symbol (SCHEME_A_ name); 1130 pointer x = generate_symbol (SCHEME_A_ name);
1133 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1134 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)));
1135 return x; 1133 return x;
1136} 1134}
1137 1135
1138ecb_inline pointer 1136ecb_cold static pointer
1139oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1140{ 1138{
1141 int location; 1139 int location;
1142 pointer x; 1140 pointer x;
1143 char *s; 1141 char *s;
… …
1154 } 1152 }
1155 1153
1156 return NIL; 1154 return NIL;
1157} 1155}
1158 1156
1159static pointer 1157ecb_cold static pointer
1160oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1161{ 1159{
1162 int i; 1160 int i;
1163 pointer x; 1161 pointer x;
1164 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
… …
1170 return ob_list; 1168 return ob_list;
1171} 1169}
1172 1170
1173#else 1171#else
1174 1172
1175static pointer 1173ecb_cold static pointer
1176oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1177{ 1175{
1178 return NIL; 1176 return NIL;
1179} 1177}
1180 1178
1181ecb_inline pointer 1179ecb_cold static pointer
1182oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1183{ 1181{
1184 pointer x; 1182 pointer x;
1185 char *s; 1183 char *s;
1186 1184
… …
1195 1193
1196 return NIL; 1194 return NIL;
1197} 1195}
1198 1196
1199/* returns the new symbol */ 1197/* returns the new symbol */
1200static pointer 1198ecb_cold static pointer
1201oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1202{ 1200{
1203 pointer x = mk_string (SCHEME_A_ name); 1201 pointer x = generate_symbol (SCHEME_A_ name);
1204 set_typeflag (x, T_SYMBOL);
1205 setimmutable (x);
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1203 return x;
1208} 1204}
1209 1205
1210static pointer 1206ecb_cold static pointer
1211oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1212{ 1208{
1213 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1214} 1210}
1215 1211
1216#endif 1212#endif
1217 1213
1218#if USE_PORTS
1219static pointer 1214ecb_cold static pointer
1220mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1221{ 1216{
1222 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223 1218
1224 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1225 x->object.port = p; 1220 set_port (x, p);
1226 1221
1227 return x; 1222 return x;
1228} 1223}
1229#endif
1230 1224
1231pointer 1225ecb_cold pointer
1232mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1233{ 1227{
1234 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235 1229
1236 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1237 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1238 1232
1239 return x; 1233 return x;
1240} 1234}
1241 1235
1242INTERFACE pointer 1236INTERFACE pointer
1243mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1244{ 1238{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1240
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1248 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1249 1243
1250 return x; 1244 return x;
1251} 1245}
1252 1246
1253/* get number atom (integer) */ 1247/* get number atom (integer) */
1254INTERFACE pointer 1248INTERFACE pointer
1255mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1256{ 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 {
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1262
1259 set_typeflag (x, (T_INTEGER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1264 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1260 set_ivalue (x, n); 1265 set_ivalue (x, n);
1261 1266
1267 *pp = x;
1268 }
1269
1262 return x; 1270 return *pp;
1263} 1271}
1264 1272
1265INTERFACE pointer 1273INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1267{ 1275{
1268#if USE_REAL 1276#if USE_REAL
1269 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270 1278
1271 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1272 set_rvalue (x, n); 1280 set_rvalue (x, n);
1273 1281
1274 return x; 1282 return x;
1275#else 1283#else
1276 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1387 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1388 1396
1389 return x; 1397 return x;
1390} 1398}
1391 1399
1392INTERFACE pointer 1400ecb_cold INTERFACE pointer
1393gensym (SCHEME_P) 1401gensym (SCHEME_P)
1394{ 1402{
1395 pointer x; 1403 pointer x;
1396 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1397 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1398 1406
1399 return generate_symbol (SCHEME_A_ name); 1407 return generate_symbol (SCHEME_A_ name);
1400} 1408}
1401 1409
1410static int
1411is_gensym (SCHEME_P_ pointer x)
1412{
1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1414}
1415
1402/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1403static pointer 1417ecb_cold static pointer
1404mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1405{ 1419{
1406 char c, *p; 1420 char c, *p;
1407 int has_dec_point = 0; 1421 int has_dec_point = 0;
1408 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1479 1493
1480 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1481} 1495}
1482 1496
1483/* make constant */ 1497/* make constant */
1484static pointer 1498ecb_cold static pointer
1485mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1486{ 1500{
1487 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1488 return S_T; 1502 return S_T;
1489 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1490 return S_F; 1504 return S_F;
1491 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1492 { 1506 {
1493 int c; 1507 int c;
1494 1508
1509 // TODO: optimise
1495 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1496 c = ' '; 1511 c = ' ';
1497 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1498 c = '\n'; 1513 c = '\n';
1499 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1500 c = '\r'; 1515 c = '\r';
1501 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1502 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;
1503 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1504 { 1529 {
1505 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1506 1531
1507 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1532 return NIL; 1557 return NIL;
1533 } 1558 }
1534} 1559}
1535 1560
1536/* ========== 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}
1537 1581
1538/*-- 1582/*--
1539 * 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,
1540 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1541 * for marking. 1585 * for marking.
1542 * 1586 *
1543 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1544 * 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
1545 * word of context in the vector 1589 * word of context in the vector
1546 */ 1590 */
1547static void 1591ecb_hot static void
1548mark (pointer a) 1592mark (pointer a)
1549{ 1593{
1550 pointer t, q, p; 1594 pointer t, q, p;
1551 1595
1552 t = 0; 1596 t = 0;
… …
1609 p = q; 1653 p = q;
1610 goto E6; 1654 goto E6;
1611 } 1655 }
1612} 1656}
1613 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
1614/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1615static void 1701ecb_cold static void
1616gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1617{ 1703{
1618 pointer p;
1619 int i; 1704 int i;
1620 1705
1621 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1622 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1623 1708
… …
1639 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1640 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1641 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1642 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1643 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
1644 /* mark variables a, b */ 1736 /* mark variables a, b */
1645 mark (a); 1737 mark (a);
1646 mark (b); 1738 mark (b);
1647 1739
1648 /* garbage collect */ 1740 /* garbage collect */
1649 clrmark (NIL); 1741 clrmark (NIL);
1650 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1651 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1652 1744
1653 /* free-list is kept sorted by address so as to maintain consecutive
1654 ranges, if possible, for use with vectors. Here we scan the cells
1655 (which are also kept sorted by address) downwards to build the
1656 free-list in sorted order.
1657 */
1658 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1659 {
1660 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1661
1662 while (--p >= SCHEME_V->cell_seg[i])
1663 {
1664 if (is_mark (p))
1665 clrmark (p);
1666 else
1667 {
1668 /* reclaim cell */
1669 if (typeflag (p) != T_PAIR)
1670 {
1671 finalize_cell (SCHEME_A_ p);
1672 set_typeflag (p, T_PAIR);
1673 set_car (p, NIL);
1674 }
1675
1676 ++SCHEME_V->fcells;
1677 set_cdr (p, SCHEME_V->free_cell);
1678 SCHEME_V->free_cell = p;
1679 }
1680 }
1681 }
1682
1683 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1684 { 1746 putstr (SCHEME_A_ "freeing...");
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1686 }
1687}
1688 1747
1689static void 1748 gc_free (SCHEME_A);
1690finalize_cell (SCHEME_P_ pointer a)
1691{
1692 /* TODO, fast bitmap check? */
1693 if (is_string (a))
1694 free (strvalue (a));
1695 else if (is_vector (a))
1696 free (vecvalue (a));
1697#if USE_PORTS
1698 else if (is_port (a))
1699 {
1700 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1701 port_close (SCHEME_A_ a, port_input | port_output);
1702
1703 free (a->object.port);
1704 }
1705#endif
1706} 1749}
1707 1750
1708/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1709 1752
1710static int 1753ecb_cold static int
1711file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1712{ 1755{
1713#if USE_PORTS
1714 int fin; 1756 int fin;
1715 1757
1716 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1717 return 0; 1759 return 0;
1718 1760
… …
1724 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1725 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;
1726 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;
1727 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;
1728 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1729 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);
1730 1772
1731#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1732 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;
1733 1775
1734 if (fname) 1776 if (fname)
1735 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);
1736#endif 1778#endif
1737 } 1779 }
1738 1780
1739 return fin >= 0; 1781 return fin >= 0;
1740
1741#else
1742 return 1;
1743#endif
1744} 1782}
1745 1783
1746static void 1784ecb_cold static void
1747file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1748{ 1786{
1749 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1750 { 1788 {
1751 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1752#if USE_PORTS 1790#if USE_PORTS
1753 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1754#endif 1792#endif
1755 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1756 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);
1757 } 1795 }
1758} 1796}
1759 1797
1760static int 1798ecb_cold static int
1761file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1762{ 1800{
1763#if USE_PORTS 1801#if USE_PORTS
1764 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1765 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1766 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1767#else 1805#else
1768 return 0; 1806 return 0;
1769#endif 1807#endif
1770} 1808}
1771 1809
1772#if USE_PORTS 1810#if USE_PORTS
1773static port * 1811ecb_cold static port *
1774port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1775{ 1813{
1776 int fd; 1814 int fd;
1777 int flags; 1815 int flags;
1778 char *rw; 1816 char *rw;
… …
1801# endif 1839# endif
1802 1840
1803 return pt; 1841 return pt;
1804} 1842}
1805 1843
1806static pointer 1844ecb_cold static pointer
1807port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1808{ 1846{
1809 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1810 1848
1811 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1812 return NIL; 1850 return NIL;
1813 1851
1814 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1815} 1853}
1816 1854
1817static port * 1855ecb_cold static port *
1818port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1819{ 1857{
1820 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1821 1859
1822 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1827 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1828 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1829 return pt; 1867 return pt;
1830} 1868}
1831 1869
1832static pointer 1870ecb_cold static pointer
1833port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1834{ 1872{
1835 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1836 1874
1837 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1838 return NIL; 1876 return NIL;
1839 1877
1840 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1841} 1879}
1842 1880
1843static port * 1881ecb_cold static port *
1844port_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)
1845{ 1883{
1846 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1847 1885
1848 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1854 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1855 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1856 return pt; 1894 return pt;
1857} 1895}
1858 1896
1859static pointer 1897ecb_cold static pointer
1860port_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)
1861{ 1899{
1862 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);
1863 1901
1864 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1867 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1868} 1906}
1869 1907
1870# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1871 1909
1872static port * 1910ecb_cold static port *
1873port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1874{ 1912{
1875 char *start; 1913 char *start;
1876 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1877 1915
… …
1891 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1892 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1893 return pt; 1931 return pt;
1894} 1932}
1895 1933
1896static pointer 1934ecb_cold static pointer
1897port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1898{ 1936{
1899 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1900 1938
1901 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1902 return NIL; 1940 return NIL;
1903 1941
1904 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1905} 1943}
1906 1944
1907static void 1945ecb_cold static void
1908port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1909{ 1947{
1910 port *pt = p->object.port; 1948 port *pt = port (p);
1911 1949
1912 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1913 1951
1914 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1915 { 1953 {
… …
1932 } 1970 }
1933} 1971}
1934#endif 1972#endif
1935 1973
1936/* get new character from input file */ 1974/* get new character from input file */
1937static int 1975ecb_cold static int
1938inchar (SCHEME_P) 1976inchar (SCHEME_P)
1939{ 1977{
1940 int c; 1978 int c;
1941 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1942
1943 pt = SCHEME_V->inport->object.port;
1944 1980
1945 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1946 return EOF; 1982 return EOF;
1947 1983
1948 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1958 } 1994 }
1959 1995
1960 return c; 1996 return c;
1961} 1997}
1962 1998
1963static int ungot = -1; 1999ecb_cold static int
1964
1965static int
1966basic_inchar (port *pt) 2000basic_inchar (port *pt)
1967{ 2001{
1968#if USE_PORTS
1969 if (pt->unget != -1) 2002 if (pt->unget != -1)
1970 { 2003 {
1971 int r = pt->unget; 2004 int r = pt->unget;
1972 pt->unget = -1; 2005 pt->unget = -1;
1973 return r; 2006 return r;
1974 } 2007 }
1975 2008
2009#if USE_PORTS
1976 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1977 { 2011 {
1978 char c; 2012 char c;
1979 2013
1980 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1988 return EOF; 2022 return EOF;
1989 else 2023 else
1990 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1991 } 2025 }
1992#else 2026#else
1993 if (ungot == -1)
1994 {
1995 char c; 2027 char c;
1996 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1997 return EOF; 2030 return EOF;
1998 2031
1999 ungot = c;
2000 }
2001
2002 {
2003 int r = ungot;
2004 ungot = -1;
2005 return r; 2032 return c;
2006 }
2007#endif 2033#endif
2008} 2034}
2009 2035
2010/* back character to input buffer */ 2036/* back character to input buffer */
2011static void 2037ecb_cold static void
2012backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2013{ 2039{
2014#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2015 port *pt;
2016 2041
2017 if (c == EOF) 2042 if (c == EOF)
2018 return; 2043 return;
2019 2044
2020 pt = SCHEME_V->inport->object.port;
2021 pt->unget = c; 2045 pt->unget = c;
2022#else
2023 if (c == EOF)
2024 return;
2025
2026 ungot = c;
2027#endif
2028} 2046}
2029 2047
2030#if USE_PORTS 2048#if USE_PORTS
2031static int 2049ecb_cold static int
2032realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2033{ 2051{
2034 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2035 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;
2036 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2049 else 2067 else
2050 return 0; 2068 return 0;
2051} 2069}
2052#endif 2070#endif
2053 2071
2054INTERFACE void 2072ecb_cold static void
2055putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2056{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2057#if USE_PORTS 2077#if USE_PORTS
2058 port *pt = SCHEME_V->outport->object.port;
2059
2060 if (pt->kind & port_file)
2061 write (pt->rep.stdio.file, s, strlen (s));
2062 else
2063 for (; *s; s++)
2064 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2065 *pt->rep.string.curr++ = *s;
2066 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2067 *pt->rep.string.curr++ = *s;
2068
2069#else
2070 xwrstr (s);
2071#endif
2072}
2073
2074static void
2075putchars (SCHEME_P_ const char *s, int len)
2076{
2077#if USE_PORTS
2078 port *pt = SCHEME_V->outport->object.port;
2079
2080 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2081 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2082 else 2080 else
2083 { 2081 {
2084 for (; len; len--) 2082 for (; len; len--)
… …
2089 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2090 } 2088 }
2091 } 2089 }
2092 2090
2093#else 2091#else
2094 write (1, s, len); 2092 write (1, s, len); // output not initialised
2095#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2096} 2100}
2097 2101
2098INTERFACE void 2102INTERFACE void
2099putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2100{ 2104{
2101#if USE_PORTS
2102 port *pt = SCHEME_V->outport->object.port;
2103
2104 if (pt->kind & port_file)
2105 {
2106 char cc = c;
2107 write (pt->rep.stdio.file, &cc, 1);
2108 }
2109 else
2110 {
2111 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2112 *pt->rep.string.curr++ = c;
2113 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2114 *pt->rep.string.curr++ = c;
2115 }
2116
2117#else
2118 char cc = c; 2105 char cc = c;
2119 write (1, &c, 1); 2106
2120#endif 2107 putchars (SCHEME_A_ &cc, 1);
2121} 2108}
2122 2109
2123/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2124static char * 2111ecb_cold static char *
2125readstr_upto (SCHEME_P_ int skip, const char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2126{ 2113{
2127 char *p = SCHEME_V->strbuff + skip; 2114 char *p = SCHEME_V->strbuff + skip;
2128 2115
2129 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))));
… …
2138 2125
2139 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2140} 2127}
2141 2128
2142/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2143static pointer 2130ecb_cold static pointer
2144readstrexp (SCHEME_P_ char delim) 2131readstrexp (SCHEME_P_ char delim)
2145{ 2132{
2146 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2147 int c; 2134 int c;
2148 int c1 = 0; 2135 int c1 = 0;
… …
2181 case '7': 2168 case '7':
2182 state = st_oct1; 2169 state = st_oct1;
2183 c1 = c - '0'; 2170 c1 = c - '0';
2184 break; 2171 break;
2185 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
2186 case 'x': 2188 case 'x':
2187 case 'X': 2189 case 'X':
2188 state = st_x1; 2190 state = st_x1;
2189 c1 = 0; 2191 c1 = 0;
2190 break;
2191
2192 case 'n':
2193 *p++ = '\n';
2194 state = st_ok;
2195 break;
2196
2197 case 't':
2198 *p++ = '\t';
2199 state = st_ok;
2200 break;
2201
2202 case 'r':
2203 *p++ = '\r';
2204 state = st_ok;
2205 break; 2192 break;
2206 2193
2207 default: 2194 default:
2208 *p++ = c; 2195 *p++ = c;
2209 state = st_ok; 2196 state = st_ok;
… …
2261 } 2248 }
2262 } 2249 }
2263} 2250}
2264 2251
2265/* check c is in chars */ 2252/* check c is in chars */
2266ecb_inline int 2253ecb_cold int
2267is_one_of (const char *s, int c) 2254is_one_of (const char *s, int c)
2268{ 2255{
2269 if (c == EOF)
2270 return 1;
2271
2272 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2273} 2257}
2274 2258
2275/* skip white characters */ 2259/* skip white characters */
2276ecb_inline int 2260ecb_cold int
2277skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2278{ 2262{
2279 int c, curr_line = 0; 2263 int c, curr_line = 0;
2280 2264
2281 do 2265 do
2282 { 2266 {
2283 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2284#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2285 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2286 curr_line++; 2271 curr_line++;
2287#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2288 } 2276 }
2289 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2290 2278
2291 /* record it */ 2279 /* record it */
2292#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2293 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)
2294 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;
2295#endif 2283#endif
2296 2284
2297 if (c != EOF)
2298 {
2299 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2300 return 1; 2286 return 1;
2301 }
2302 else
2303 return EOF;
2304} 2287}
2305 2288
2306/* get token */ 2289/* get token */
2307static int 2290ecb_cold static int
2308token (SCHEME_P) 2291token (SCHEME_P)
2309{ 2292{
2310 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2311 2294
2312 if (c == EOF) 2295 if (c == EOF)
… …
2324 return TOK_RPAREN; 2307 return TOK_RPAREN;
2325 2308
2326 case '.': 2309 case '.':
2327 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2328 2311
2329 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2330 return TOK_DOT; 2313 return TOK_DOT;
2331 else 2314 else
2332 { 2315 {
2333 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2334 return TOK_DOTATOM; 2317 return TOK_DOTATOM;
… …
2410} 2393}
2411 2394
2412/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2413#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2414 2397
2415static void 2398ecb_cold static void
2416printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2417{ 2400{
2418 int i; 2401 int i;
2419 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2420 2403
… …
2476 2459
2477 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2478} 2461}
2479 2462
2480/* print atoms */ 2463/* print atoms */
2481static void 2464ecb_cold static void
2482printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2483{ 2466{
2484 char *p; 2467 char *p;
2485 int len; 2468 int len;
2486 2469
2487 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2488 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2489} 2472}
2490 2473
2491/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2492static void 2475ecb_cold static void
2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2494{ 2477{
2495 char *p; 2478 char *p;
2496 2479
2497 if (l == NIL) 2480 if (l == NIL)
… …
2704 return car (d); 2687 return car (d);
2705 2688
2706 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2707 q = p; 2690 q = p;
2708 2691
2709 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2710 { 2693 {
2711 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2712 2695
2713 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2714 p = cdr (d); 2697 p = cdr (d);
2715 } 2698 }
2716 2699
2717 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2718 return q; 2701 return q;
2719} 2702}
2720 2703
2721/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2722static pointer 2705ecb_hot static pointer
2723reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2724{ 2707{
2725 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2726 pointer p = NIL; 2709 pointer p = NIL;
2727 2710
… …
2730 2713
2731 return p; 2714 return p;
2732} 2715}
2733 2716
2734/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2735static pointer 2718ecb_hot static pointer
2736reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2737{ 2720{
2738 pointer result = term; 2721 pointer result = term;
2739 pointer p = list; 2722 pointer p = list;
2740 2723
… …
2748 2731
2749 return result; 2732 return result;
2750} 2733}
2751 2734
2752/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2753static pointer 2736ecb_hot static pointer
2754revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2755{ 2738{
2756 pointer result = a; 2739 pointer result = a;
2757 pointer p = b; 2740 pointer p = b;
2758 2741
… …
2767 2750
2768 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2769} 2752}
2770 2753
2771/* equivalence of atoms */ 2754/* equivalence of atoms */
2772int 2755ecb_hot int
2773eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2774{ 2757{
2775 if (is_string (a)) 2758 if (is_string (a))
2776 { 2759 {
2777 if (is_string (b)) 2760 if (is_string (b))
… …
2871 } 2854 }
2872 else 2855 else
2873 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2874} 2857}
2875 2858
2876static pointer 2859ecb_hot static pointer
2877find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2878{ 2861{
2879 pointer x, y; 2862 pointer x, y;
2880 2863
2881 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
… …
2902 return NIL; 2885 return NIL;
2903} 2886}
2904 2887
2905#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2906 2889
2907ecb_inline void 2890static void
2908new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2909{ 2892{
2910 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2911 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2912} 2895}
2913 2896
2914ecb_inline void 2897static void
2915new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2898new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2916{ 2899{
2917 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2918} 2901}
2919 2902
2920static pointer 2903ecb_hot static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2905{
2923 pointer x, y; 2906 pointer x, y;
2924 2907
2925 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2939 return NIL; 2922 return NIL;
2940} 2923}
2941 2924
2942#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2943 2926
2944ecb_inline void 2927static void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2929{
2947 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2948 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2931 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2949} 2932}
2950 2933
2951ecb_inline void 2934static void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2936{
2954 set_cdr (slot, value); 2937 set_cdr (slot, value);
2955} 2938}
2956 2939
2957ecb_inline pointer 2940static pointer
2958slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2959{ 2942{
2960 return cdr (slot); 2943 return cdr (slot);
2961} 2944}
2962 2945
2963/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
2964 2947
2965static int 2948ecb_cold static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2950{
2968#if USE_ERROR_HOOK
2969 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK;
2971#endif
2972
2973#if USE_PRINTF 2951#if USE_PRINTF
2974#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
2975 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
2976 2954
2977 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
2992 } 2970 }
2993#endif 2971#endif
2994#endif 2972#endif
2995 2973
2996#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
2997 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2975 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2998 2976
2999 if (x != NIL) 2977 if (x != NIL)
3000 { 2978 {
3001 pointer code = a 2979 pointer code = a
3002 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3046 pointer code; 3024 pointer code;
3047}; 3025};
3048 3026
3049# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3050 3028
3051static void 3029ecb_hot static void
3052s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3053{ 3031{
3054 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3055 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3056 3034
3057 /* enough room for the next frame? */ 3035 /* enough room for the next frame? */
3058 if (nframes >= SCHEME_V->dump_size) 3036 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3059 { 3037 {
3060 SCHEME_V->dump_size += STACK_GROWTH; 3038 SCHEME_V->dump_size += STACK_GROWTH;
3061 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3039 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3062 } 3040 }
3063 3041
… …
3069 next_frame->code = code; 3047 next_frame->code = code;
3070 3048
3071 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3072} 3050}
3073 3051
3074static int 3052static ecb_hot int
3075xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3076{ 3054{
3077 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3078 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3079 3057
… …
3090 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3091 3069
3092 return 0; 3070 return 0;
3093} 3071}
3094 3072
3095ecb_inline void 3073ecb_cold void
3096dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3097{ 3075{
3098 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3076 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3099 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3100} 3078}
3101 3079
3102ecb_inline void 3080ecb_cold void
3103dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3104{ 3082{
3105 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3106 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3107 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3108} 3086}
3109 3087
3110static void 3088ecb_cold static void
3111dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3112{ 3090{
3113 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3114 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3115 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3116 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3117} 3095}
3118 3096
3119static void 3097ecb_cold static void
3120dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3121{ 3099{
3122 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3123 int i; 3101 int i;
3124 3102
… …
3130 mark (frame->envir); 3108 mark (frame->envir);
3131 mark (frame->code); 3109 mark (frame->code);
3132 } 3110 }
3133} 3111}
3134 3112
3135static pointer 3113ecb_cold static pointer
3136ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3137{ 3115{
3138 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3139 int i; 3117 int i;
3140 3118
… …
3152 } 3130 }
3153 3131
3154 return cont; 3132 return cont;
3155} 3133}
3156 3134
3157static void 3135ecb_cold static void
3158ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3159{ 3137{
3160 int i = 0; 3138 int i = 0;
3161 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3162 3140
… …
3174 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3175} 3153}
3176 3154
3177#else 3155#else
3178 3156
3179ecb_inline void 3157ecb_cold void
3180dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3181{ 3159{
3182 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3183} 3161}
3184 3162
3185ecb_inline void 3163ecb_cold void
3186dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3187{ 3165{
3188 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3189} 3167}
3190 3168
3191static void 3169ecb_cold static void
3192dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3193{ 3171{
3194 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3195} 3173}
3196 3174
3197static int 3175ecb_hot static int
3198xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3199{ 3177{
3200 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3201 3179
3202 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3212 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3213 3191
3214 return 0; 3192 return 0;
3215} 3193}
3216 3194
3217static void 3195ecb_hot static void
3218s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3219{ 3197{
3220 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3221 cons (args, 3199 cons (args,
3222 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3223 cons (code, 3201 cons (code,
3224 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3225} 3203}
3226 3204
3227static void 3205ecb_cold static void
3228dump_stack_mark (SCHEME_P) 3206dump_stack_mark (SCHEME_P)
3229{ 3207{
3230 mark (SCHEME_V->dump); 3208 mark (SCHEME_V->dump);
3231} 3209}
3232 3210
3233static pointer 3211ecb_cold static pointer
3234ss_get_cont (SCHEME_P) 3212ss_get_cont (SCHEME_P)
3235{ 3213{
3236 return SCHEME_V->dump; 3214 return SCHEME_V->dump;
3237} 3215}
3238 3216
3239static void 3217ecb_cold static void
3240ss_set_cont (SCHEME_P_ pointer cont) 3218ss_set_cont (SCHEME_P_ pointer cont)
3241{ 3219{
3242 SCHEME_V->dump = cont; 3220 SCHEME_V->dump = cont;
3243} 3221}
3244 3222
3245#endif 3223#endif
3246 3224
3247#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3225#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3248 3226
3249#if 1 3227#if EXPERIMENT
3228
3250static int 3229static int
3251debug (SCHEME_P_ int indent, pointer x) 3230dtree (SCHEME_P_ int indent, pointer x)
3252{ 3231{
3253 int c; 3232 int c;
3254 3233
3255 if (is_syntax (x)) 3234 if (is_syntax (x))
3256 { 3235 {
… …
3274 printf ("%*sS<%s>\n", indent, "", symname (x)); 3253 printf ("%*sS<%s>\n", indent, "", symname (x));
3275 return 24+8; 3254 return 24+8;
3276 3255
3277 case T_CLOSURE: 3256 case T_CLOSURE:
3278 printf ("%*sS<%s>\n", indent, "", "closure"); 3257 printf ("%*sS<%s>\n", indent, "", "closure");
3279 debug (SCHEME_A_ indent + 3, cdr(x)); 3258 dtree (SCHEME_A_ indent + 3, cdr(x));
3280 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3259 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3281 3260
3282 case T_PAIR: 3261 case T_PAIR:
3283 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3262 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3284 c = debug (SCHEME_A_ indent + 3, car (x)); 3263 c = dtree (SCHEME_A_ indent + 3, car (x));
3285 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3264 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3286 return c + 1; 3265 return c + 1;
3287 3266
3288 case T_PORT: 3267 case T_PORT:
3289 printf ("%*sS<%s>\n", indent, "", "port"); 3268 printf ("%*sS<%s>\n", indent, "", "port");
3290 return 24+8; 3269 return 24+8;
… …
3293 printf ("%*sS<%s>\n", indent, "", "vector"); 3272 printf ("%*sS<%s>\n", indent, "", "vector");
3294 return 24+8; 3273 return 24+8;
3295 3274
3296 case T_ENVIRONMENT: 3275 case T_ENVIRONMENT:
3297 printf ("%*sS<%s>\n", indent, "", "environment"); 3276 printf ("%*sS<%s>\n", indent, "", "environment");
3298 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3277 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3299 3278
3300 default: 3279 default:
3301 printf ("unhandled type %d\n", type (x)); 3280 printf ("unhandled type %d\n", type (x));
3302 break; 3281 break;
3303 } 3282 }
3304} 3283}
3305#endif
3306 3284
3285#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3286
3287typedef void *stream[1];
3288
3289#define stream_init() { 0 }
3290#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3291#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3292#define stream_free(s) free (s[0])
3293
3294ecb_cold static void
3295stream_put (stream s, uint8_t byte)
3296{
3297 uint32_t *sp = *s;
3298 uint32_t size = sizeof (uint32_t) * 2;
3299 uint32_t offs = size;
3300
3301 if (ecb_expect_true (sp))
3302 {
3303 offs = sp[0];
3304 size = sp[1];
3305 }
3306
3307 if (ecb_expect_false (offs == size))
3308 {
3309 size *= 2;
3310 sp = realloc (sp, size);
3311 *s = sp;
3312 sp[1] = size;
3313
3314 }
3315
3316 ((uint8_t *)sp)[offs++] = byte;
3317 sp[0] = offs;
3318}
3319
3320ecb_cold static void
3321stream_put_v (stream s, uint32_t v)
3322{
3323 while (v > 0x7f)
3324 {
3325 stream_put (s, v | 0x80);
3326 v >>= 7;
3327 }
3328
3329 stream_put (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_tv (stream s, int bop, uint32_t v)
3334{
3335 printf ("put tv %d %d\n", bop, v);//D
3336 stream_put (s, bop);
3337 stream_put_v (s, v);
3338}
3339
3340ecb_cold static void
3341stream_put_stream (stream s, stream o)
3342{
3343 uint32_t i;
3344
3345 for (i = 0; i < stream_size (o); ++i)
3346 stream_put (s, stream_data (o)[i]);
3347
3348 stream_free (o);
3349}
3350
3351ecb_cold static uint32_t
3352cell_id (SCHEME_P_ pointer x)
3353{
3354 struct cell *p = CELL (x);
3355 int i;
3356
3357 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3358 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3359 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3360
3361 abort ();
3362}
3363
3364// calculates a (preferably small) integer that makes it possible to find
3365// the symbol again. if pointers were offsets into a memory area... until
3366// then, we return segment number in the low bits, and offset in the high
3367// bits.
3368// also, this function must never return 0.
3369ecb_cold static uint32_t
3370symbol_id (SCHEME_P_ pointer sym)
3371{
3372 return cell_id (SCHEME_A_ sym);
3373}
3374
3375enum byteop
3376{
3377 BOP_NIL,
3378 BOP_INTEGER,
3379 BOP_SYMBOL,
3380 BOP_DATUM,
3381 BOP_LIST_BEG,
3382 BOP_LIST_END,
3383 BOP_IF,
3384 BOP_AND,
3385 BOP_OR,
3386 BOP_CASE,
3387 BOP_COND,
3388 BOP_LET,
3389 BOP_LETAST,
3390 BOP_LETREC,
3391 BOP_DEFINE,
3392 BOP_MACRO,
3393 BOP_SET,
3394 BOP_BEGIN,
3395 BOP_LAMBDA,
3396 BOP_OP,
3397};
3398
3399ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3400
3401ecb_cold static void
3402compile_list (SCHEME_P_ stream s, pointer x)
3403{
3404 // TODO: improper list
3405
3406 for (; x != NIL; x = cdr (x))
3407 {
3408 stream t = stream_init ();
3409 compile_expr (SCHEME_A_ t, car (x));
3410 stream_put_v (s, stream_size (t));
3411 stream_put_stream (s, t);
3412 }
3413
3414 stream_put_v (s, 0);
3415}
3416
3417static void
3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3419{
3420 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3421
3422 stream_put (s, BOP_IF);
3423 compile_expr (SCHEME_A_ s, cond);
3424 stream_put_v (s, stream_size (sift));
3425 stream_put_stream (s, sift);
3426 compile_expr (SCHEME_A_ s, iff);
3427}
3428
3429typedef uint32_t stream_fixup;
3430
3431static stream_fixup
3432stream_put_fixup (stream s)
3433{
3434 stream_put (s, 0);
3435 stream_put (s, 0);
3436
3437 return stream_size (s);
3438}
3439
3440static void
3441stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3442{
3443 target -= fixup;
3444 assert (target < (1 << 14));
3445 stream_data (s)[fixup - 2] = target | 0x80;
3446 stream_data (s)[fixup - 1] = target >> 7;
3447}
3448
3449static void
3450compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3451{
3452 for (; cdr (x) != NIL; x = cdr (x))
3453 {
3454 stream t = stream_init ();
3455 compile_expr (SCHEME_A_ t, car (x));
3456 stream_put_v (s, stream_size (t));
3457 stream_put_stream (s, t);
3458 }
3459
3460 stream_put_v (s, 0);
3461}
3462
3463static void
3464compile_case (SCHEME_P_ stream s, pointer x)
3465{
3466 compile_expr (SCHEME_A_ s, caar (x));
3467
3468 for (;;)
3469 {
3470 x = cdr (x);
3471
3472 if (x == NIL)
3473 break;
3474
3475 compile_expr (SCHEME_A_ s, caar (x));
3476 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3477 stream_put_v (s, stream_size (t));
3478 stream_put_stream (s, t);
3479 }
3480
3481 stream_put_v (s, 0);
3482}
3483
3484static void
3485compile_cond (SCHEME_P_ stream s, pointer x)
3486{
3487 for ( ; x != NIL; x = cdr (x))
3488 {
3489 compile_expr (SCHEME_A_ s, caar (x));
3490 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3491 stream_put_v (s, stream_size (t));
3492 stream_put_stream (s, t);
3493 }
3494
3495 stream_put_v (s, 0);
3496}
3497
3307static int 3498static pointer
3499lookup (SCHEME_P_ pointer x)
3500{
3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3502
3503 if (x != NIL)
3504 x = slot_value_in_env (x);
3505
3506 return x;
3507}
3508
3509ecb_cold static void
3510compile_expr (SCHEME_P_ stream s, pointer x)
3511{
3512 if (x == NIL)
3513 {
3514 stream_put (s, BOP_NIL);
3515 return;
3516 }
3517
3518 if (is_pair (x))
3519 {
3520 pointer head = car (x);
3521
3522 if (is_syntax (head))
3523 {
3524 x = cdr (x);
3525
3526 switch (syntaxnum (head))
3527 {
3528 case OP_IF0: /* if */
3529 stream_put_v (s, BOP_IF);
3530 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3531 break;
3532
3533 case OP_OR0: /* or */
3534 stream_put_v (s, BOP_OR);
3535 compile_and_or (SCHEME_A_ s, 0, x);
3536 break;
3537
3538 case OP_AND0: /* and */
3539 stream_put_v (s, BOP_AND);
3540 compile_and_or (SCHEME_A_ s, 1, x);
3541 break;
3542
3543 case OP_CASE0: /* case */
3544 stream_put_v (s, BOP_CASE);
3545 compile_case (SCHEME_A_ s, x);
3546 break;
3547
3548 case OP_COND0: /* cond */
3549 stream_put_v (s, BOP_COND);
3550 compile_cond (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_LET0: /* let */
3554 case OP_LET0AST: /* let* */
3555 case OP_LET0REC: /* letrec */
3556 switch (syntaxnum (head))
3557 {
3558 case OP_LET0: stream_put (s, BOP_LET ); break;
3559 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3560 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3561 }
3562
3563 {
3564 pointer bindings = car (x);
3565 pointer body = cadr (x);
3566
3567 for (x = bindings; x != NIL; x = cdr (x))
3568 {
3569 pointer init = NIL;
3570 pointer var = car (x);
3571
3572 if (is_pair (var))
3573 {
3574 init = cdr (var);
3575 var = car (var);
3576 }
3577
3578 stream_put_v (s, symbol_id (SCHEME_A_ var));
3579 compile_expr (SCHEME_A_ s, init);
3580 }
3581
3582 stream_put_v (s, 0);
3583 compile_expr (SCHEME_A_ s, body);
3584 }
3585 break;
3586
3587 case OP_DEF0: /* define */
3588 case OP_MACRO0: /* macro */
3589 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3590 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3591 compile_expr (SCHEME_A_ s, cadr (x));
3592 break;
3593
3594 case OP_SET0: /* set! */
3595 stream_put (s, BOP_SET);
3596 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3597 compile_expr (SCHEME_A_ s, cadr (x));
3598 break;
3599
3600 case OP_BEGIN: /* begin */
3601 stream_put (s, BOP_BEGIN);
3602 compile_list (SCHEME_A_ s, x);
3603 return;
3604
3605 case OP_DELAY: /* delay */
3606 abort ();
3607 break;
3608
3609 case OP_QUOTE: /* quote */
3610 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3611 break;
3612
3613 case OP_LAMBDA: /* lambda */
3614 {
3615 pointer formals = car (x);
3616 pointer body = cadr (x);
3617
3618 stream_put (s, BOP_LAMBDA);
3619
3620 for (; is_pair (formals); formals = cdr (formals))
3621 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3622
3623 stream_put_v (s, 0);
3624 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3625
3626 compile_expr (SCHEME_A_ s, body);
3627 }
3628 break;
3629
3630 case OP_C0STREAM:/* cons-stream */
3631 abort ();
3632 break;
3633 }
3634
3635 return;
3636 }
3637
3638 pointer m = lookup (SCHEME_A_ head);
3639
3640 if (is_macro (m))
3641 {
3642 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3643 SCHEME_V->code = m;
3644 SCHEME_V->args = cons (x, NIL);
3645 Eval_Cycle (SCHEME_A_ OP_APPLY);
3646 x = SCHEME_V->value;
3647 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3648 return;
3649 }
3650
3651 stream_put (s, BOP_LIST_BEG);
3652
3653 for (; x != NIL; x = cdr (x))
3654 compile_expr (SCHEME_A_ s, car (x));
3655
3656 stream_put (s, BOP_LIST_END);
3657 return;
3658 }
3659
3660 switch (type (x))
3661 {
3662 case T_INTEGER:
3663 {
3664 IVALUE iv = ivalue_unchecked (x);
3665 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3666 stream_put_tv (s, BOP_INTEGER, iv);
3667 }
3668 return;
3669
3670 case T_SYMBOL:
3671 if (0)
3672 {
3673 // no can do without more analysis
3674 pointer m = lookup (SCHEME_A_ x);
3675
3676 if (is_proc (m))
3677 {
3678 printf ("compile proc %s %d\n", procname(m), procnum(m));
3679 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3680 }
3681 else
3682 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3683 }
3684
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 return;
3687
3688 default:
3689 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3690 break;
3691 }
3692}
3693
3694ecb_cold static int
3695compile_closure (SCHEME_P_ pointer p)
3696{
3697 stream s = stream_init ();
3698
3699 compile_list (SCHEME_A_ s, cdar (p));
3700
3701 FILE *xxd = popen ("xxd", "we");
3702 fwrite (stream_data (s), 1, stream_size (s), xxd);
3703 fclose (xxd);
3704
3705 return stream_size (s);
3706}
3707
3708#endif
3709
3710/* syntax, eval, core, ... */
3711ecb_hot static int
3308opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3309{ 3713{
3310 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3311 pointer x, y; 3715 pointer x, y;
3312 3716
3313 switch (op) 3717 switch (op)
3314 { 3718 {
3315#if 1 //D 3719#if EXPERIMENT //D
3316 case OP_DEBUG: 3720 case OP_DEBUG:
3317 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3721 {
3722 uint32_t len = compile_closure (SCHEME_A_ car (args));
3723 printf ("len = %d\n", len);
3318 printf ("\n"); 3724 printf ("\n");
3319 s_return (S_T); 3725 s_return (S_T);
3726 }
3727
3728 case OP_DEBUG2:
3729 return -1;
3320#endif 3730#endif
3731
3321 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3322 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3323 { 3734 {
3324 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3735 putstr (SCHEME_A_ "Loading ");
3325 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3736 putstr (SCHEME_A_ strvalue (car (args)));
3737 putcharacter (SCHEME_A_ '\n');
3326 } 3738 }
3327 3739
3328 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3329 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3330 else 3742
3331 {
3332 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3333 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3334 }
3335 3745
3336 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3337 3747
3338 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3339 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3340 { 3750 {
3341 if (SCHEME_V->file_i == 0) 3751 if (SCHEME_V->file_i == 0)
3342 { 3752 {
3343 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3344 s_goto (OP_QUIT); 3754 s_goto (OP_QUIT);
… …
3355 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3356 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3357 { 3767 {
3358 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3359 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3360 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3361 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3362 } 3775 }
3363 3776
3364 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3365 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3400 { 3813 {
3401 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3402 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3403 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3404 } 3817 }
3405 else 3818
3406 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3407 3820
3408 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3409#if USE_TRACING 3822#if USE_TRACING
3410 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3411 { 3824 {
… …
3422#endif 3835#endif
3423 if (is_symbol (SCHEME_V->code)) /* symbol */ 3836 if (is_symbol (SCHEME_V->code)) /* symbol */
3424 { 3837 {
3425 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3838 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3426 3839
3427 if (x != NIL) 3840 if (x == NIL)
3428 s_return (slot_value_in_env (x));
3429 else
3430 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3841 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3842
3843 s_return (slot_value_in_env (x));
3431 } 3844 }
3432 else if (is_pair (SCHEME_V->code)) 3845 else if (is_pair (SCHEME_V->code))
3433 { 3846 {
3434 x = car (SCHEME_V->code); 3847 x = car (SCHEME_V->code);
3435 3848
… …
3444 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3857 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3445 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3446 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3447 } 3860 }
3448 } 3861 }
3449 else 3862
3450 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3451 3864
3452 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3453 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3454 { 3867 {
3455 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3456 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3457 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3458 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3459 } 3872 }
3460 else 3873
3461 {
3462 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3463 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3464 }
3465 3876
3466 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3467 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3468 3879
3469 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3480 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3481 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3482 } 3893 }
3483 3894
3484#if USE_TRACING 3895#if USE_TRACING
3485
3486 case OP_TRACING: 3896 case OP_TRACING:
3487 { 3897 {
3488 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3489 3899
3490 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3491 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3492 } 3902 }
3493
3494#endif 3903#endif
3495 3904
3496 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3497#if USE_TRACING 3906#if USE_TRACING
3498 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3512 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3921 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3513 else if (is_foreign (SCHEME_V->code)) 3922 else if (is_foreign (SCHEME_V->code))
3514 { 3923 {
3515 /* Keep nested calls from GC'ing the arglist */ 3924 /* Keep nested calls from GC'ing the arglist */
3516 push_recent_alloc (SCHEME_A_ args, NIL); 3925 push_recent_alloc (SCHEME_A_ args, NIL);
3517 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3926 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3518 3927
3519 s_return (x); 3928 s_return (x);
3520 } 3929 }
3521 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3930 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3522 { 3931 {
… …
3552 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3553 { 3962 {
3554 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3555 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3556 } 3965 }
3557 else 3966
3558 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3559 3968
3560 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3561 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3562 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3563
3564#if 1
3565 3972
3566 case OP_LAMBDA: /* lambda */ 3973 case OP_LAMBDA: /* lambda */
3567 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3974 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3568 set SCHEME_V->value fall thru */ 3975 set SCHEME_V->value fall thru */
3569 { 3976 {
… …
3576 SCHEME_V->code = slot_value_in_env (f); 3983 SCHEME_V->code = slot_value_in_env (f);
3577 s_goto (OP_APPLY); 3984 s_goto (OP_APPLY);
3578 } 3985 }
3579 3986
3580 SCHEME_V->value = SCHEME_V->code; 3987 SCHEME_V->value = SCHEME_V->code;
3581 /* Fallthru */
3582 } 3988 }
3989 /* Fallthru */
3583 3990
3584 case OP_LAMBDA1: 3991 case OP_LAMBDA1:
3585 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3992 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3586
3587#else
3588
3589 case OP_LAMBDA: /* lambda */
3590 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3591
3592#endif
3593 3993
3594 case OP_MKCLOSURE: /* make-closure */ 3994 case OP_MKCLOSURE: /* make-closure */
3595 x = car (args); 3995 x = car (args);
3596 3996
3597 if (car (x) == SCHEME_V->LAMBDA) 3997 if (car (x) == SCHEME_V->LAMBDA)
… …
3636 else 4036 else
3637 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4037 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3638 4038
3639 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3640 4040
3641
3642 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3643 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3644 4043
3645 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3646 x = cadr (args); 4045 x = cadr (args);
… …
3664 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3665 } 4064 }
3666 else 4065 else
3667 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3668 4067
3669
3670 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3671 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3672 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3673 4071
3674 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3685 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3686 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3687 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3688 else 4086 else
3689 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4087 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4088
3690 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3691 4090
3692 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3693 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3694 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3695 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4094 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3696 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3697 4096
3698 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3699 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3700 4100
3701 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3702 { 4102 {
3703 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4103 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3704 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4104 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3705 4105
3706 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3707 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3708 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3709 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3710 } 4110 }
3711 else /* end */ 4111
3712 { 4112 /* end */
3713 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3714 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3715 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3716 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3717 }
3718 4117
3719 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3720 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3721 4120
3722 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4121 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3726 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3727 { 4126 {
3728 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4127 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3729 { 4128 {
3730 if (!is_pair (x)) 4129 if (!is_pair (x))
3731 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3732 4131
3733 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3734 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3735 4134
3736 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3737 } 4136 }
3738 4137
3739 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4138 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3756 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3757 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3758 } 4157 }
3759 4158
3760 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4159 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3761 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4160 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3762 4161
3763 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4162 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3764 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3765 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3766 4165
… …
3777 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3778 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3779 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3780 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3781 } 4180 }
3782 else /* end */ 4181
4182 /* end */
3783 { 4183
3784 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3785 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3786 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3787 }
3788 4187
3789 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3790 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3791 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3792 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3793 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3794 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3795 4194
3796 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3797 args = cons (SCHEME_V->value, args);
3798
3799 if (is_pair (SCHEME_V->code)) /* continue */
3800 {
3801 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3802 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3803
3804 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3805 SCHEME_V->code = cadar (SCHEME_V->code);
3806 SCHEME_V->args = NIL;
3807 s_goto (OP_EVAL);
3808 }
3809 else /* end */
3810 {
3811 args = reverse_in_place (SCHEME_A_ NIL, args);
3812 SCHEME_V->code = car (args);
3813 SCHEME_V->args = cdr (args);
3814 s_goto (OP_LET2REC);
3815 }
3816 4196
3817 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3818 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4198 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3819 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3820 4200
… …
3850 } 4230 }
3851 else 4231 else
3852 { 4232 {
3853 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3854 s_return (NIL); 4234 s_return (NIL);
3855 else 4235
3856 {
3857 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3858 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3859 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3860 }
3861 } 4239 }
3862 4240
3863 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3864 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4242 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3865 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3876 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3877 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3878 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3879 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3880 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3881 else 4259
3882 {
3883 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3884 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3885 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3886 }
3887 4263
3888 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3889 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3890 s_return (S_F); 4266 s_return (S_F);
3891 4267
… …
3896 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3897 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3898 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3899 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3900 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3901 else 4277
3902 {
3903 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3904 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3905 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3906 }
3907 4281
3908 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3909 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3910 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3911 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3976 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3977 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3978 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3979 } 4353 }
3980 } 4354 }
3981 else 4355
3982 s_return (NIL); 4356 s_return (NIL);
3983 4357
3984 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3985 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3986 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3987 else 4361
3988 s_return (NIL); 4362 s_return (NIL);
3989 4363
3990 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3991 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3992 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3993 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
4007 } 4381 }
4008 4382
4009 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
4010} 4384}
4011 4385
4012static int 4386/* math, cxr */
4387ecb_hot static int
4013opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4014{ 4389{
4015 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
4016 pointer x = car (args); 4391 pointer x = car (args);
4017 num v; 4392 num v;
4018 4393
4019 switch (op) 4394 switch (op)
4020 { 4395 {
4021#if USE_MATH 4396#if USE_MATH
4022 case OP_INEX2EX: /* inexact->exact */ 4397 case OP_INEX2EX: /* inexact->exact */
4023 {
4024 if (is_integer (x)) 4398 if (!is_integer (x))
4025 s_return (x); 4399 {
4026
4027 RVALUE r = rvalue_unchecked (x); 4400 RVALUE r = rvalue_unchecked (x);
4028 4401
4029 if (r == (RVALUE)(IVALUE)r) 4402 if (r == (RVALUE)(IVALUE)r)
4030 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4403 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4031 else 4404 else
4032 Error_1 ("inexact->exact: not integral:", x); 4405 Error_1 ("inexact->exact: not integral:", x);
4033 } 4406 }
4034 4407
4408 s_return (x);
4409
4410 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4411 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4412 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4413 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4414
4415 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4035 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4416 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4036 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4417 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4418 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4037 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4419 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4420 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4039 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4421 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4040 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4422 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4041 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4423 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4042 4424
4043 case OP_ATAN: 4425 case OP_ATAN:
4426 s_return (mk_real (SCHEME_A_
4044 if (cdr (args) == NIL) 4427 cdr (args) == NIL
4045 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4428 ? atan (rvalue (x))
4046 else 4429 : atan2 (rvalue (x), rvalue (cadr (args)))));
4047 {
4048 pointer y = cadr (args);
4049 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4050 }
4051
4052 case OP_SQRT:
4053 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4054 4430
4055 case OP_EXPT: 4431 case OP_EXPT:
4056 { 4432 {
4057 RVALUE result; 4433 RVALUE result;
4058 int real_result = 1; 4434 int real_result = 1;
… …
4081 if (real_result) 4457 if (real_result)
4082 s_return (mk_real (SCHEME_A_ result)); 4458 s_return (mk_real (SCHEME_A_ result));
4083 else 4459 else
4084 s_return (mk_integer (SCHEME_A_ result)); 4460 s_return (mk_integer (SCHEME_A_ result));
4085 } 4461 }
4086
4087 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4088 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4089
4090 case OP_TRUNCATE:
4091 {
4092 RVALUE n = rvalue (x);
4093 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4094 }
4095
4096 case OP_ROUND:
4097 if (is_integer (x))
4098 s_return (x);
4099
4100 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4101#endif 4462#endif
4102 4463
4103 case OP_ADD: /* + */ 4464 case OP_ADD: /* + */
4104 v = num_zero; 4465 v = num_zero;
4105 4466
… …
4193 else 4554 else
4194 Error_0 ("modulo: division by zero"); 4555 Error_0 ("modulo: division by zero");
4195 4556
4196 s_return (mk_number (SCHEME_A_ v)); 4557 s_return (mk_number (SCHEME_A_ v));
4197 4558
4198 case OP_CAR: /* car */ 4559 /* the compiler will optimize this mess... */
4199 s_return (caar (args)); 4560 case OP_CAR: op_car: s_return (car (x));
4200 4561 case OP_CDR: op_cdr: s_return (cdr (x));
4201 case OP_CDR: /* cdr */ 4562 case OP_CAAR: op_caar: x = car (x); goto op_car;
4202 s_return (cdar (args)); 4563 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4564 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4565 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4566 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4567 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4568 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4569 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4570 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4571 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4572 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4573 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4574 case OP_CAAAAR: x = car (x); goto op_caaar;
4575 case OP_CAAADR: x = cdr (x); goto op_caaar;
4576 case OP_CAADAR: x = car (x); goto op_caadr;
4577 case OP_CAADDR: x = cdr (x); goto op_caadr;
4578 case OP_CADAAR: x = car (x); goto op_cadar;
4579 case OP_CADADR: x = cdr (x); goto op_cadar;
4580 case OP_CADDAR: x = car (x); goto op_caddr;
4581 case OP_CADDDR: x = cdr (x); goto op_caddr;
4582 case OP_CDAAAR: x = car (x); goto op_cdaar;
4583 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4584 case OP_CDADAR: x = car (x); goto op_cdadr;
4585 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4586 case OP_CDDAAR: x = car (x); goto op_cddar;
4587 case OP_CDDADR: x = cdr (x); goto op_cddar;
4588 case OP_CDDDAR: x = car (x); goto op_cdddr;
4589 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4203 4590
4204 case OP_CONS: /* cons */ 4591 case OP_CONS: /* cons */
4205 set_cdr (args, cadr (args)); 4592 set_cdr (args, cadr (args));
4206 s_return (args); 4593 s_return (args);
4207 4594
… …
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4768 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4769
4383 s_return (newstr); 4770 s_return (newstr);
4384 } 4771 }
4385 4772
4386 case OP_SUBSTR: /* substring */ 4773 case OP_STRING_COPY: /* substring/string-copy */
4387 { 4774 {
4388 char *str = strvalue (x); 4775 char *str = strvalue (x);
4389 int index0 = ivalue_unchecked (cadr (args)); 4776 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4390 int index1; 4777 int index1;
4391 int len; 4778 int len;
4392 4779
4393 if (index0 > strlength (x)) 4780 if (index0 > strlength (x))
4394 Error_1 ("substring: start out of bounds:", cadr (args)); 4781 Error_1 ("string->copy: start out of bounds:", cadr (args));
4395 4782
4396 if (cddr (args) != NIL) 4783 if (cddr (args) != NIL)
4397 { 4784 {
4398 index1 = ivalue_unchecked (caddr (args)); 4785 index1 = ivalue_unchecked (caddr (args));
4399 4786
4400 if (index1 > strlength (x) || index1 < index0) 4787 if (index1 > strlength (x) || index1 < index0)
4401 Error_1 ("substring: end out of bounds:", caddr (args)); 4788 Error_1 ("string->copy: end out of bounds:", caddr (args));
4402 } 4789 }
4403 else 4790 else
4404 index1 = strlength (x); 4791 index1 = strlength (x);
4405 4792
4406 len = index1 - index0; 4793 len = index1 - index0;
4407 x = mk_empty_string (SCHEME_A_ len, ' '); 4794 x = mk_counted_string (SCHEME_A_ str + index0, len);
4408 memcpy (strvalue (x), str + index0, len);
4409 strvalue (x)[len] = 0;
4410 4795
4411 s_return (x); 4796 s_return (x);
4412 } 4797 }
4413 4798
4414 case OP_VECTOR: /* vector */ 4799 case OP_VECTOR: /* vector */
… …
4488 } 4873 }
4489 4874
4490 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4491} 4876}
4492 4877
4493static int 4878/* relational ops */
4879ecb_hot static int
4494opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4495{ 4881{
4496 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4497 4883
4498 for (;;) 4884 for (;;)
… …
4519 } 4905 }
4520 4906
4521 s_return (S_T); 4907 s_return (S_T);
4522} 4908}
4523 4909
4524static int 4910/* predicates */
4911ecb_hot static int
4525opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4526{ 4913{
4527 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4528 pointer a = car (args); 4915 pointer a = car (args);
4529 pointer d = cdr (args); 4916 pointer d = cdr (args);
4530 int r; 4917 int r;
4531 4918
4532 switch (op) 4919 switch (op)
4533 { 4920 {
4534 case OP_NOT: /* not */ r = is_false (a) ; break; 4921 case OP_NOT: /* not */ r = is_false (a) ; break;
4535 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4922 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4536 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4923 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4537 case OP_NULLP: /* null? */ r = a == NIL ; break; 4924 case OP_NULLP: /* null? */ r = a == NIL ; break;
4538 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4925 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4926 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4539 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4927 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4540 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4928 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4541 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4929 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4542 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4930 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4543 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4931 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4544 4932
4545#if USE_CHAR_CLASSIFIERS 4933#if USE_CHAR_CLASSIFIERS
4546 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4934 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4547 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4935 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4548 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4936 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4575 } 4963 }
4576 4964
4577 s_retbool (r); 4965 s_retbool (r);
4578} 4966}
4579 4967
4580static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4581opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4582{ 4971{
4583 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4584 pointer a = car (args); 4973 pointer a = car (args);
4585 pointer x, y; 4974 pointer x, y;
… …
4598 } 4987 }
4599 else 4988 else
4600 s_return (SCHEME_V->code); 4989 s_return (SCHEME_V->code);
4601 4990
4602 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4991 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4603 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4992 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4604 s_return (SCHEME_V->value); 4993 s_return (SCHEME_V->value);
4605 4994
4606#if USE_PORTS 4995#if USE_PORTS
4996
4997 case OP_EOF_OBJECT: /* eof-object */
4998 s_return (S_EOF);
4607 4999
4608 case OP_WRITE: /* write */ 5000 case OP_WRITE: /* write */
4609 case OP_DISPLAY: /* display */ 5001 case OP_DISPLAY: /* display */
4610 case OP_WRITE_CHAR: /* write-char */ 5002 case OP_WRITE_CHAR: /* write-char */
4611 if (is_pair (cdr (SCHEME_V->args))) 5003 if (is_pair (cdr (SCHEME_V->args)))
… …
4625 else 5017 else
4626 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4627 5019
4628 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4629 5021
5022 //TODO: move to scheme
4630 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4631 if (is_pair (args)) 5024 if (is_pair (args))
4632 { 5025 {
4633 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4634 { 5027 {
… …
4636 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4637 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4638 } 5031 }
4639 } 5032 }
4640 5033
4641 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4642 s_return (S_T); 5035 s_return (S_T);
4643#endif 5036#endif
4644 5037
4645 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4646 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4655 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4656 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4657 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4658 5051
4659 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4660 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4661 5054
4662 if (args != NIL) 5055 if (args != NIL)
4663 { 5056 {
4664 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4665 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4666 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4667 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4668 } 5061 }
4669 else 5062 else
4670 { 5063 {
4671 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4672 5065
4673 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4674 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4675 else 5068 else
4676 return -1; 5069 return -1;
… …
4753 SCHEME_V->gc_verbose = (a != S_F); 5146 SCHEME_V->gc_verbose = (a != S_F);
4754 s_retbool (was); 5147 s_retbool (was);
4755 } 5148 }
4756 5149
4757 case OP_NEWSEGMENT: /* new-segment */ 5150 case OP_NEWSEGMENT: /* new-segment */
5151#if 0
4758 if (!is_pair (args) || !is_number (a)) 5152 if (!is_pair (args) || !is_number (a))
4759 Error_0 ("new-segment: argument must be a number"); 5153 Error_0 ("new-segment: argument must be a number");
4760 5154#endif
4761 alloc_cellseg (SCHEME_A_ ivalue (a)); 5155 s_retbool (alloc_cellseg (SCHEME_A));
4762
4763 s_return (S_T);
4764 5156
4765 case OP_OBLIST: /* oblist */ 5157 case OP_OBLIST: /* oblist */
4766 s_return (oblist_all_symbols (SCHEME_A)); 5158 s_return (oblist_all_symbols (SCHEME_A));
4767 5159
4768#if USE_PORTS 5160#if USE_PORTS
… …
4838 s_return (p == NIL ? S_F : p); 5230 s_return (p == NIL ? S_F : p);
4839 } 5231 }
4840 5232
4841 case OP_GET_OUTSTRING: /* get-output-string */ 5233 case OP_GET_OUTSTRING: /* get-output-string */
4842 { 5234 {
4843 port *p; 5235 port *p = port (a);
4844 5236
4845 if ((p = a->object.port)->kind & port_string) 5237 if (p->kind & port_string)
4846 { 5238 {
4847 off_t size; 5239 off_t size;
4848 char *str; 5240 char *str;
4849 5241
4850 size = p->rep.string.curr - p->rep.string.start + 1; 5242 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4885 } 5277 }
4886 5278
4887 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4888} 5280}
4889 5281
4890static int 5282/* reading */
5283ecb_cold static int
4891opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4892{ 5285{
4893 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4894 pointer x; 5287 pointer x;
4895 5288
… …
4955 int res; 5348 int res;
4956 5349
4957 if (is_pair (args)) 5350 if (is_pair (args))
4958 p = car (args); 5351 p = car (args);
4959 5352
4960 res = p->object.port->kind & port_string; 5353 res = port (p)->kind & port_string;
4961 5354
4962 s_retbool (res); 5355 s_retbool (res);
4963 } 5356 }
4964 5357
4965 case OP_SET_INPORT: /* set-input-port */ 5358 case OP_SET_INPORT: /* set-input-port */
… …
4974 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
4975 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
4976 { 5369 {
4977 case TOK_EOF: 5370 case TOK_EOF:
4978 s_return (S_EOF); 5371 s_return (S_EOF);
4979 /* NOTREACHED */
4980 5372
4981 case TOK_VEC: 5373 case TOK_VEC:
4982 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4983 /* fall through */ 5375 /* fall through */
4984 5376
… …
4987 5379
4988 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
4989 s_return (NIL); 5381 s_return (NIL);
4990 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
4991 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
4992 else 5384
4993 {
4994 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4995 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4996 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
4997 }
4998 5388
4999 case TOK_QUOTE: 5389 case TOK_QUOTE:
5000 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5001 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
5002 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
5008 { 5398 {
5009 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5010 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
5011 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
5012 } 5402 }
5013 else 5403
5014 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5015
5016 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
5017 5406
5018 case TOK_COMMA: 5407 case TOK_COMMA:
5019 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5020 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
5031 case TOK_DOTATOM: 5420 case TOK_DOTATOM:
5032 SCHEME_V->strbuff[0] = '.'; 5421 SCHEME_V->strbuff[0] = '.';
5033 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5422 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5034 5423
5035 case TOK_STRATOM: 5424 case TOK_STRATOM:
5425 //TODO: haven't checked whether the garbage collector could interfere and free x
5426 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5036 x = readstrexp (SCHEME_A_ '|'); 5427 x = readstrexp (SCHEME_A_ '|');
5037 //TODO: haven't checked whether the garbage collector could interfere
5038 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5428 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5039 5429
5040 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
5041 x = readstrexp (SCHEME_A_ '"'); 5431 x = readstrexp (SCHEME_A_ '"');
5042 5432
… …
5050 { 5440 {
5051 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5441 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5052 5442
5053 if (f == NIL) 5443 if (f == NIL)
5054 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
5055 else 5445
5056 {
5057 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5058 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
5059 }
5060 } 5448 }
5061 5449
5062 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
5063 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5451 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5064 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
5065 else 5453
5066 s_return (x); 5454 s_return (x);
5067 5455
5068 default: 5456 default:
5069 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
5070 } 5458 }
5071 5459
… …
5164 pointer b = cdr (args); 5552 pointer b = cdr (args);
5165 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5166 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5167 5555
5168 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5170 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5172 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5173 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5174 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5175 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5176 else 5564 else
5177 { 5565 {
5178 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5179 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5180 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5181 } 5569 }
5182 5570
5183 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5185 5573
5186 case OP_P1LIST: 5574 case OP_P1LIST:
5187 if (is_pair (args)) 5575 if (is_pair (args))
5188 { 5576 {
5189 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5190 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5191 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5192 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5193 } 5581 }
5194 else if (is_vector (args)) 5582 else if (is_vector (args))
5195 { 5583 {
… …
5203 { 5591 {
5204 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5205 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5206 } 5594 }
5207 5595
5208 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5209 s_return (S_T); 5597 s_return (S_T);
5210 } 5598 }
5211 5599
5212 case OP_PVECFROM: 5600 case OP_PVECFROM:
5213 { 5601 {
… …
5215 pointer vec = car (args); 5603 pointer vec = car (args);
5216 int len = veclength (vec); 5604 int len = veclength (vec);
5217 5605
5218 if (i == len) 5606 if (i == len)
5219 { 5607 {
5220 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5221 s_return (S_T); 5609 s_return (S_T);
5222 } 5610 }
5223 else 5611 else
5224 { 5612 {
5225 pointer elem = vector_get (vec, i); 5613 pointer elem = vector_get (vec, i);
… …
5227 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5228 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5229 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5230 5618
5231 if (i > 0) 5619 if (i > 0)
5232 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5233 5621
5234 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5235 } 5623 }
5236 } 5624 }
5237 } 5625 }
5238 5626
5239 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5240} 5628}
5241 5629
5242static int 5630/* list ops */
5631ecb_hot static int
5243opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5244{ 5633{
5245 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5246 pointer a = car (args); 5635 pointer a = car (args);
5247 pointer x, y; 5636 pointer x, y;
… …
5270 break; 5659 break;
5271 } 5660 }
5272 5661
5273 if (is_pair (y)) 5662 if (is_pair (y))
5274 s_return (car (y)); 5663 s_return (car (y));
5275 else 5664
5276 s_return (S_F); 5665 s_return (S_F);
5277
5278 5666
5279 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5280 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5281 5669
5282 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5283 s_return (S_F); 5671 s_return (S_F);
5284 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5286 else if (is_macro (SCHEME_V->args)) 5674
5287 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5288 else
5289 s_return (S_F); 5675 s_return (S_F);
5290 5676
5291 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5292 /* 5678 /*
5293 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5294 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
… …
5305 5691
5306/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5692/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5307typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5308 5694
5309typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5310static int 5696
5697ecb_hot static int
5311tst_any (pointer p) 5698tst_any (pointer p)
5312{ 5699{
5313 return 1; 5700 return 1;
5314} 5701}
5315 5702
5316static int 5703ecb_hot static int
5317tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5318{ 5705{
5319 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5320} 5707}
5321 5708
5322static int 5709ecb_hot static int
5323tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5324{ 5711{
5325 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5326} 5713}
5327 5714
… …
5370#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5371#include "opdefines.h" 5758#include "opdefines.h"
5372#undef OP_DEF 5759#undef OP_DEF
5373; 5760;
5374 5761
5375static const char * 5762ecb_cold static const char *
5376opname (int idx) 5763opname (int idx)
5377{ 5764{
5378 const char *name = opnames; 5765 const char *name = opnames;
5379 5766
5380 /* should do this at compile time, but would require external program, right? */ 5767 /* should do this at compile time, but would require external program, right? */
… …
5382 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5383 5770
5384 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5385} 5772}
5386 5773
5387static const char * 5774ecb_cold static const char *
5388procname (pointer x) 5775procname (pointer x)
5389{ 5776{
5390 return opname (procnum (x)); 5777 return opname (procnum (x));
5391} 5778}
5392 5779
… …
5412#undef OP_DEF 5799#undef OP_DEF
5413 {0} 5800 {0}
5414}; 5801};
5415 5802
5416/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5417static void ecb_hot 5804ecb_hot static void
5418Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5419{ 5806{
5420 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5421 5808
5422 for (;;) 5809 for (;;)
… …
5505 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5892 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5506 return; 5893 return;
5507 5894
5508 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5895 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5509 { 5896 {
5510 xwrstr ("No memory!\n"); 5897 putstr (SCHEME_A_ "No memory!\n");
5511 return; 5898 return;
5512 } 5899 }
5513 } 5900 }
5514} 5901}
5515 5902
5516/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5517 5904
5518static void 5905ecb_cold static void
5519assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5520{ 5907{
5521 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5522 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5523} 5910}
5524 5911
5525static void 5912ecb_cold static void
5526assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5527{ 5914{
5528 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5529 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5530 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5538 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5539 return y; 5926 return y;
5540} 5927}
5541 5928
5542/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5929/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5543static int 5930ecb_hot static int
5544syntaxnum (pointer p) 5931syntaxnum (pointer p)
5545{ 5932{
5546 const char *s = strvalue (p); 5933 const char *s = strvalue (p);
5547 5934
5548 switch (strlength (p)) 5935 switch (strlength (p))
… …
5627 6014
5628ecb_cold int 6015ecb_cold int
5629scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5630{ 6017{
5631 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5632 pointer x; 6019
6020 /* this memset is not strictly correct, as we assume (intcache)
6021 * that memset 0 will also set pointers to 0, but memset does
6022 * of course not guarantee that. screw such systems.
6023 */
6024 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5633 6025
5634 num_set_fixnum (num_zero, 1); 6026 num_set_fixnum (num_zero, 1);
5635 num_set_ivalue (num_zero, 0); 6027 num_set_ivalue (num_zero, 0);
5636 num_set_fixnum (num_one, 1); 6028 num_set_fixnum (num_one, 1);
5637 num_set_ivalue (num_one, 1); 6029 num_set_ivalue (num_one, 1);
… …
5649 SCHEME_V->save_inport = NIL; 6041 SCHEME_V->save_inport = NIL;
5650 SCHEME_V->loadport = NIL; 6042 SCHEME_V->loadport = NIL;
5651 SCHEME_V->nesting = 0; 6043 SCHEME_V->nesting = 0;
5652 SCHEME_V->interactive_repl = 0; 6044 SCHEME_V->interactive_repl = 0;
5653 6045
5654 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6046 if (!alloc_cellseg (SCHEME_A))
5655 { 6047 {
5656#if USE_ERROR_CHECKING 6048#if USE_ERROR_CHECKING
5657 SCHEME_V->no_memory = 1; 6049 SCHEME_V->no_memory = 1;
5658 return 0; 6050 return 0;
5659#endif 6051#endif
5660 } 6052 }
5661 6053
5662 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5663 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5664 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5665 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5666 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5667 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5668 6061
5669 /* init NIL */ 6062 /* init NIL */
5670 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5671 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5672 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5673 /* init T */ 6066 /* init T */
5674 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5675 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5676 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5677 /* init F */ 6070 /* init F */
5678 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5679 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5680 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5681 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5682 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5683 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5684 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5685 /* init sink */ 6078 /* init sink */
5686 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5687 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5688 6081
5689 /* init c_nest */ 6082 /* init c_nest */
5690 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5691 6084
5692 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5693 /* init global_env */ 6086 /* init global_env */
5694 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5695 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5696 /* init else */ 6089 /* init else */
5697 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5698 new_slot_in_env (SCHEME_A_ x, S_T);
5699 6091
5700 { 6092 {
5701 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5702 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5703 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5727 6119
5728 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5729} 6121}
5730 6122
5731#if USE_PORTS 6123#if USE_PORTS
5732void 6124ecb_cold void
5733scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5734{ 6126{
5735 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5736} 6128}
5737 6129
5738void 6130ecb_cold void
5739scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6131scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5740{ 6132{
5741 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6133 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5742} 6134}
5743 6135
5744void 6136ecb_cold void
5745scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5746{ 6138{
5747 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5748} 6140}
5749 6141
5750void 6142ecb_cold void
5751scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6143scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5752{ 6144{
5753 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6145 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5754} 6146}
5755#endif 6147#endif
5756 6148
5757void 6149ecb_cold void
5758scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5759{ 6151{
5760 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5761} 6153}
5762 6154
… …
5794 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5795 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5796 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5797 6189
5798 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5799 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5800 6192
5801#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5802 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5803 {
5804 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5805 { 6196 {
5806 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5807 6198
5808 if (fname) 6199 if (fname)
5809 free (fname); 6200 free (fname);
5810 } 6201 }
5811 }
5812#endif 6202#endif
5813} 6203}
5814 6204
5815void 6205ecb_cold void
5816scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5817{ 6207{
5818 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5819} 6209}
5820 6210
5821void 6211ecb_cold void
5822scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5823{ 6213{
5824 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5825 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5826 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5827 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5828 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5829 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5830#if USE_PORTS
5831 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5832#endif
5833 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5834 6222
5835#if USE_PORTS
5836 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5837 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5838#endif
5839 6225
5840#if USE_PORTS 6226#if USE_PORTS
5841#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5842 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5843 6229
… …
5847#endif 6233#endif
5848 6234
5849 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5850 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5851 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5852 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5853 6240
5854 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5855 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5856} 6243}
5857 6244
5858void 6245ecb_cold void
5859scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5860{ 6247{
6248#if USE_PORTs
5861 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5862 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5863 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5864 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5865 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6253 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5866 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6254 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5867 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5868#if USE_PORTS
5869 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5870#endif
5871 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5872 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5873 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5874 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5875 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5876 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5877 6263
5878 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5879 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5880} 6269}
5881 6270
5882void 6271ecb_cold void
5883scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5884{ 6273{
5885 pointer x; 6274 pointer x;
5886 6275
5887 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5892 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5893} 6282}
5894 6283
5895#if !STANDALONE 6284#if !STANDALONE
5896 6285
5897void 6286ecb_cold void
5898scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5899{ 6288{
5900 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6289 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5901} 6290}
5902 6291
5903void 6292ecb_cold void
5904scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5905{ 6294{
5906 int i; 6295 int i;
5907 6296
5908 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5909 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5910} 6299}
5911 6300
5912pointer 6301ecb_cold pointer
5913scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5914{ 6303{
5915 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6304 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5916} 6305}
5917 6306
5918void 6307ecb_cold void
5919save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5920{ 6309{
5921 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5922 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5923 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5927 /* Truncate the dump stack so TS will return here when done, not 6316 /* Truncate the dump stack so TS will return here when done, not
5928 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5929 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5930} 6319}
5931 6320
5932void 6321ecb_cold void
5933restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5934{ 6323{
5935 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5936 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5937 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5938 /* Pop */ 6327 /* Pop */
5939 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5940} 6329}
5941 6330
5942/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5943pointer 6332ecb_cold pointer
5944scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5945{ 6334{
5946 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5947 6336
5948 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5955 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5956 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5957 return SCHEME_V->value; 6346 return SCHEME_V->value;
5958} 6347}
5959 6348
5960pointer 6349ecb_cold pointer
5961scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5962{ 6351{
5963 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5964 6353
5965 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
5977 6366
5978/* ========== Main ========== */ 6367/* ========== Main ========== */
5979 6368
5980#if STANDALONE 6369#if STANDALONE
5981 6370
5982int 6371ecb_cold int
5983main (int argc, char **argv) 6372main (int argc, char **argv)
5984{ 6373{
5985# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
5986 scheme ssc; 6375 scheme ssc;
5987 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
5989# endif 6378# endif
5990 int fin; 6379 int fin;
5991 char *file_name = InitFile; 6380 char *file_name = InitFile;
5992 int retcode; 6381 int retcode;
5993 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
5994 system ("ps v $PPID");//D 6384 system ("ps v $PPID");
6385#endif
5995 6386
5996 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5997 { 6388 {
5998 xwrstr ("Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5999 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6000 xwrstr ("followed by\n"); 6391 putstr (SCHEME_A_ "followed by\n");
6001 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6392 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6002 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6393 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6003 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6394 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6004 xwrstr ("Use - as filename for stdin.\n"); 6395 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6005 return 1; 6396 return 1;
6006 } 6397 }
6007 6398
6008 if (!scheme_init (SCHEME_A)) 6399 if (!scheme_init (SCHEME_A))
6009 { 6400 {
6010 xwrstr ("Could not initialize!\n"); 6401 putstr (SCHEME_A_ "Could not initialize!\n");
6011 return 2; 6402 return 2;
6012 } 6403 }
6013 6404
6014# if USE_PORTS 6405# if USE_PORTS
6015 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6406 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6028 } 6419 }
6029#endif 6420#endif
6030 6421
6031 do 6422 do
6032 { 6423 {
6033#if USE_PORTS
6034 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
6035 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
6036 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6426 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6037 { 6427 {
6038 pointer args = NIL; 6428 pointer args = NIL;
… …
6056 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6446 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6057 6447
6058 } 6448 }
6059 else 6449 else
6060 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
6061#endif
6062 6451
6063 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
6064 { 6453 {
6065 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6454 putstr (SCHEME_A_ "Could not open file ");
6455 putstr (SCHEME_A_ file_name);
6456 putcharacter (SCHEME_A_ '\n');
6066 } 6457 }
6067 else 6458 else
6068 { 6459 {
6069 if (isfile) 6460 if (isfile)
6070 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
6071 else 6462 else
6072 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
6073 6464
6074#if USE_PORTS
6075 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
6076 { 6466 {
6077 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
6078 { 6468 {
6079 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6469 putstr (SCHEME_A_ "Errors encountered reading ");
6470 putstr (SCHEME_A_ file_name);
6471 putcharacter (SCHEME_A_ '\n');
6080 } 6472 }
6081 6473
6082 if (isfile) 6474 if (isfile)
6083 close (fin); 6475 close (fin);
6084 } 6476 }
6085#endif
6086 } 6477 }
6087 6478
6088 file_name = *argv++; 6479 file_name = *argv++;
6089 } 6480 }
6090 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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