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

Diff Legend

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