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.32 by root, Sat Nov 28 10:56:45 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 = mk_string (SCHEME_A_ name); 1201 pointer x = generate_symbol (SCHEME_A_ name);
1175 set_typeflag (x, T_SYMBOL);
1176 setimmutable (x);
1177 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1178 return x; 1203 return x;
1179} 1204}
1180 1205
1181static pointer 1206ecb_cold static pointer
1182oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1183{ 1208{
1184 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1185} 1210}
1186 1211
1187#endif 1212#endif
1188 1213
1189#if USE_PORTS
1190static pointer 1214ecb_cold static pointer
1191mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1192{ 1216{
1193 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1194 1218
1195 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1196 x->object.port = p; 1220 set_port (x, p);
1197 1221
1198 return x; 1222 return x;
1199} 1223}
1200#endif
1201 1224
1202pointer 1225ecb_cold pointer
1203mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1204{ 1227{
1205 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1206 1229
1207 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1208 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1209 1232
1210 return x; 1233 return x;
1211} 1234}
1212 1235
1213INTERFACE pointer 1236INTERFACE pointer
1214mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1215{ 1238{
1216 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1217 1240
1218 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1219 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1220 1243
1221 return x; 1244 return x;
1222} 1245}
1223 1246
1224/* get number atom (integer) */ 1247/* get number atom (integer) */
1225INTERFACE pointer 1248INTERFACE pointer
1226mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1227{ 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 {
1228 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1229 1262
1230 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 */
1231 set_ivalue (x, n); 1265 set_ivalue (x, n);
1232 1266
1267 *pp = x;
1268 }
1269
1233 return x; 1270 return *pp;
1234} 1271}
1235 1272
1236INTERFACE pointer 1273INTERFACE pointer
1237mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1238{ 1275{
1239#if USE_REAL 1276#if USE_REAL
1240 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1241 1278
1242 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1243 set_rvalue (x, n); 1280 set_rvalue (x, n);
1244 1281
1245 return x; 1282 return x;
1246#else 1283#else
1247 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1271 SCHEME_V->no_memory = 1; 1308 SCHEME_V->no_memory = 1;
1272 return SCHEME_V->strbuff; 1309 return SCHEME_V->strbuff;
1273 } 1310 }
1274 1311
1275 if (str) 1312 if (str)
1276 { 1313 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1277 int l = strlen (str);
1278
1279 if (l > len_str)
1280 l = len_str;
1281
1282 memcpy (q, str, l);
1283 q[l] = 0;
1284 }
1285 else 1314 else
1286 {
1287 memset (q, fill, len_str); 1315 memset (q, fill, len_str);
1316
1288 q[len_str] = 0; 1317 q[len_str] = 0;
1289 }
1290 1318
1291 return q; 1319 return q;
1292} 1320}
1293 1321
1294INTERFACE pointer 1322INTERFACE pointer
… …
1308 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1336 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1309 1337
1310 set_typeflag (x, T_STRING | T_ATOM); 1338 set_typeflag (x, T_STRING | T_ATOM);
1311 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1339 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1312 strlength (x) = len; 1340 strlength (x) = len;
1341
1313 return x; 1342 return x;
1314} 1343}
1315 1344
1316INTERFACE pointer 1345INTERFACE pointer
1317mk_string (SCHEME_P_ const char *str) 1346mk_string (SCHEME_P_ const char *str)
… …
1330{ 1359{
1331 int i; 1360 int i;
1332 1361
1333 for (i = start; i < veclength (vec); i++) 1362 for (i = start; i < veclength (vec); i++)
1334 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);
1335} 1373}
1336 1374
1337INTERFACE pointer 1375INTERFACE pointer
1338vector_get (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1339{ 1377{
… …
1357 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1358 1396
1359 return x; 1397 return x;
1360} 1398}
1361 1399
1362INTERFACE pointer 1400ecb_cold INTERFACE pointer
1363gensym (SCHEME_P) 1401gensym (SCHEME_P)
1364{ 1402{
1365 pointer x; 1403 pointer x;
1366
1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1368 {
1369 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1370 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1371 1406
1372 /* first check oblist */ 1407 return generate_symbol (SCHEME_A_ name);
1373 x = oblist_find_by_name (SCHEME_A_ name); 1408}
1374 1409
1375 if (x == NIL) 1410static int
1376 { 1411is_gensym (SCHEME_P_ pointer x)
1377 x = oblist_add_by_name (SCHEME_A_ name); 1412{
1378 return x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1379 }
1380 }
1381
1382 return NIL;
1383} 1414}
1384 1415
1385/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1386static pointer 1417ecb_cold static pointer
1387mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1388{ 1419{
1389 char c, *p; 1420 char c, *p;
1390 int has_dec_point = 0; 1421 int has_dec_point = 0;
1391 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1462 1493
1463 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1464} 1495}
1465 1496
1466/* make constant */ 1497/* make constant */
1467static pointer 1498ecb_cold static pointer
1468mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1469{ 1500{
1470 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1471 return S_T; 1502 return S_T;
1472 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1473 return S_F; 1504 return S_F;
1474 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1475 { 1506 {
1476 int c; 1507 int c;
1477 1508
1509 // TODO: optimise
1478 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1479 c = ' '; 1511 c = ' ';
1480 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1481 c = '\n'; 1513 c = '\n';
1482 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1483 c = '\r'; 1515 c = '\r';
1484 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1485 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;
1486 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1487 { 1529 {
1488 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1489 1531
1490 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1515 return NIL; 1557 return NIL;
1516 } 1558 }
1517} 1559}
1518 1560
1519/* ========== 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}
1520 1581
1521/*-- 1582/*--
1522 * 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,
1523 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1524 * for marking. 1585 * for marking.
1525 * 1586 *
1526 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1527 * 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
1528 * word of context in the vector 1589 * word of context in the vector
1529 */ 1590 */
1530static void 1591ecb_hot static void
1531mark (pointer a) 1592mark (pointer a)
1532{ 1593{
1533 pointer t, q, p; 1594 pointer t, q, p;
1534 1595
1535 t = 0; 1596 t = 0;
… …
1592 p = q; 1653 p = q;
1593 goto E6; 1654 goto E6;
1594 } 1655 }
1595} 1656}
1596 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
1597/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1598static void 1701ecb_cold static void
1599gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1600{ 1703{
1601 pointer p;
1602 int i; 1704 int i;
1603 1705
1604 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1605 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1606 1708
… …
1622 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1623 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1624 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1625 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1626 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
1627 /* mark variables a, b */ 1736 /* mark variables a, b */
1628 mark (a); 1737 mark (a);
1629 mark (b); 1738 mark (b);
1630 1739
1631 /* garbage collect */ 1740 /* garbage collect */
1632 clrmark (NIL); 1741 clrmark (NIL);
1633 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1634 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1635 1744
1636 /* free-list is kept sorted by address so as to maintain consecutive
1637 ranges, if possible, for use with vectors. Here we scan the cells
1638 (which are also kept sorted by address) downwards to build the
1639 free-list in sorted order.
1640 */
1641 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1642 {
1643 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1644
1645 while (--p >= SCHEME_V->cell_seg[i])
1646 {
1647 if (is_mark (p))
1648 clrmark (p);
1649 else
1650 {
1651 /* reclaim cell */
1652 if (typeflag (p) != T_PAIR)
1653 {
1654 finalize_cell (SCHEME_A_ p);
1655 set_typeflag (p, T_PAIR);
1656 set_car (p, NIL);
1657 }
1658
1659 ++SCHEME_V->fcells;
1660 set_cdr (p, SCHEME_V->free_cell);
1661 SCHEME_V->free_cell = p;
1662 }
1663 }
1664 }
1665
1666 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1667 { 1746 putstr (SCHEME_A_ "freeing...");
1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1669 }
1670}
1671 1747
1672static void 1748 gc_free (SCHEME_A);
1673finalize_cell (SCHEME_P_ pointer a)
1674{
1675 /* TODO, fast bitmap check? */
1676 if (is_string (a))
1677 free (strvalue (a));
1678 else if (is_vector (a))
1679 free (vecvalue (a));
1680#if USE_PORTS
1681 else if (is_port (a))
1682 {
1683 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1684 port_close (SCHEME_A_ a, port_input | port_output);
1685
1686 free (a->object.port);
1687 }
1688#endif
1689} 1749}
1690 1750
1691/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1692 1752
1693static int 1753ecb_cold static int
1694file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1695{ 1755{
1696#if USE_PORTS
1697 int fin; 1756 int fin;
1698 1757
1699 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1700 return 0; 1759 return 0;
1701 1760
… …
1707 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1708 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;
1709 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;
1710 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;
1711 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1712 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);
1713 1772
1714#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1715 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;
1716 1775
1717 if (fname) 1776 if (fname)
1718 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);
1719#endif 1778#endif
1720 } 1779 }
1721 1780
1722 return fin >= 0; 1781 return fin >= 0;
1723
1724#else
1725 return 1;
1726#endif
1727} 1782}
1728 1783
1729static void 1784ecb_cold static void
1730file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1731{ 1786{
1732 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1733 { 1788 {
1734 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1735#if USE_PORTS 1790#if USE_PORTS
1736 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1737#endif 1792#endif
1738 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1739 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);
1740 } 1795 }
1741} 1796}
1742 1797
1743static int 1798ecb_cold static int
1744file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1745{ 1800{
1746#if USE_PORTS 1801#if USE_PORTS
1747 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1748 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1749 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1750#else 1805#else
1751 return 0; 1806 return 0;
1752#endif 1807#endif
1753} 1808}
1754 1809
1755#if USE_PORTS 1810#if USE_PORTS
1756static port * 1811ecb_cold static port *
1757port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1758{ 1813{
1759 int fd; 1814 int fd;
1760 int flags; 1815 int flags;
1761 char *rw; 1816 char *rw;
… …
1784# endif 1839# endif
1785 1840
1786 return pt; 1841 return pt;
1787} 1842}
1788 1843
1789static pointer 1844ecb_cold static pointer
1790port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1791{ 1846{
1792 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1793 1848
1794 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1795 return NIL; 1850 return NIL;
1796 1851
1797 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1798} 1853}
1799 1854
1800static port * 1855ecb_cold static port *
1801port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1802{ 1857{
1803 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1804 1859
1805 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1810 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1811 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1812 return pt; 1867 return pt;
1813} 1868}
1814 1869
1815static pointer 1870ecb_cold static pointer
1816port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1817{ 1872{
1818 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1819 1874
1820 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1821 return NIL; 1876 return NIL;
1822 1877
1823 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1824} 1879}
1825 1880
1826static port * 1881ecb_cold static port *
1827port_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)
1828{ 1883{
1829 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1830 1885
1831 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1837 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1838 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1839 return pt; 1894 return pt;
1840} 1895}
1841 1896
1842static pointer 1897ecb_cold static pointer
1843port_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)
1844{ 1899{
1845 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);
1846 1901
1847 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1850 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1851} 1906}
1852 1907
1853# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1854 1909
1855static port * 1910ecb_cold static port *
1856port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1857{ 1912{
1858 char *start; 1913 char *start;
1859 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1860 1915
… …
1874 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1875 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1876 return pt; 1931 return pt;
1877} 1932}
1878 1933
1879static pointer 1934ecb_cold static pointer
1880port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1881{ 1936{
1882 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1883 1938
1884 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1885 return NIL; 1940 return NIL;
1886 1941
1887 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1888} 1943}
1889 1944
1890static void 1945ecb_cold static void
1891port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1892{ 1947{
1893 port *pt = p->object.port; 1948 port *pt = port (p);
1894 1949
1895 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1896 1951
1897 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1898 { 1953 {
… …
1915 } 1970 }
1916} 1971}
1917#endif 1972#endif
1918 1973
1919/* get new character from input file */ 1974/* get new character from input file */
1920static int 1975ecb_cold static int
1921inchar (SCHEME_P) 1976inchar (SCHEME_P)
1922{ 1977{
1923 int c; 1978 int c;
1924 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1925
1926 pt = SCHEME_V->inport->object.port;
1927 1980
1928 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1929 return EOF; 1982 return EOF;
1930 1983
1931 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1941 } 1994 }
1942 1995
1943 return c; 1996 return c;
1944} 1997}
1945 1998
1946static int ungot = -1; 1999ecb_cold static int
1947
1948static int
1949basic_inchar (port *pt) 2000basic_inchar (port *pt)
1950{ 2001{
1951#if USE_PORTS
1952 if (pt->unget != -1) 2002 if (pt->unget != -1)
1953 { 2003 {
1954 int r = pt->unget; 2004 int r = pt->unget;
1955 pt->unget = -1; 2005 pt->unget = -1;
1956 return r; 2006 return r;
1957 } 2007 }
1958 2008
2009#if USE_PORTS
1959 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1960 { 2011 {
1961 char c; 2012 char c;
1962 2013
1963 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1971 return EOF; 2022 return EOF;
1972 else 2023 else
1973 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1974 } 2025 }
1975#else 2026#else
1976 if (ungot == -1)
1977 {
1978 char c; 2027 char c;
1979 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1980 return EOF; 2030 return EOF;
1981 2031
1982 ungot = c;
1983 }
1984
1985 {
1986 int r = ungot;
1987 ungot = -1;
1988 return r; 2032 return c;
1989 }
1990#endif 2033#endif
1991} 2034}
1992 2035
1993/* back character to input buffer */ 2036/* back character to input buffer */
1994static void 2037ecb_cold static void
1995backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
1996{ 2039{
1997#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
1998 port *pt;
1999 2041
2000 if (c == EOF) 2042 if (c == EOF)
2001 return; 2043 return;
2002 2044
2003 pt = SCHEME_V->inport->object.port;
2004 pt->unget = c; 2045 pt->unget = c;
2005#else
2006 if (c == EOF)
2007 return;
2008
2009 ungot = c;
2010#endif
2011} 2046}
2012 2047
2013#if USE_PORTS 2048#if USE_PORTS
2014static int 2049ecb_cold static int
2015realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2016{ 2051{
2017 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2018 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;
2019 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2032 else 2067 else
2033 return 0; 2068 return 0;
2034} 2069}
2035#endif 2070#endif
2036 2071
2037INTERFACE void 2072ecb_cold static void
2038putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2039{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2040#if USE_PORTS 2077#if USE_PORTS
2041 port *pt = SCHEME_V->outport->object.port;
2042
2043 if (pt->kind & port_file)
2044 write (pt->rep.stdio.file, s, strlen (s));
2045 else
2046 for (; *s; s++)
2047 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2048 *pt->rep.string.curr++ = *s;
2049 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2050 *pt->rep.string.curr++ = *s;
2051
2052#else
2053 xwrstr (s);
2054#endif
2055}
2056
2057static void
2058putchars (SCHEME_P_ const char *s, int len)
2059{
2060#if USE_PORTS
2061 port *pt = SCHEME_V->outport->object.port;
2062
2063 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2064 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2065 else 2080 else
2066 { 2081 {
2067 for (; len; len--) 2082 for (; len; len--)
… …
2072 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2073 } 2088 }
2074 } 2089 }
2075 2090
2076#else 2091#else
2077 write (1, s, len); 2092 write (1, s, len); // output not initialised
2078#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2079} 2100}
2080 2101
2081INTERFACE void 2102INTERFACE void
2082putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2083{ 2104{
2084#if USE_PORTS
2085 port *pt = SCHEME_V->outport->object.port;
2086
2087 if (pt->kind & port_file)
2088 {
2089 char cc = c;
2090 write (pt->rep.stdio.file, &cc, 1);
2091 }
2092 else
2093 {
2094 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2095 *pt->rep.string.curr++ = c;
2096 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2097 *pt->rep.string.curr++ = c;
2098 }
2099
2100#else
2101 char cc = c; 2105 char cc = c;
2102 write (1, &c, 1); 2106
2103#endif 2107 putchars (SCHEME_A_ &cc, 1);
2104} 2108}
2105 2109
2106/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2107static char * 2111ecb_cold static char *
2108readstr_upto (SCHEME_P_ char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2109{ 2113{
2110 char *p = SCHEME_V->strbuff; 2114 char *p = SCHEME_V->strbuff + skip;
2111 2115
2112 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))));
2113 2117
2114 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2118 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2115 *p = 0; 2119 *p = 0;
… …
2121 2125
2122 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2123} 2127}
2124 2128
2125/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2126static pointer 2130ecb_cold static pointer
2127readstrexp (SCHEME_P) 2131readstrexp (SCHEME_P_ char delim)
2128{ 2132{
2129 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2130 int c; 2134 int c;
2131 int c1 = 0; 2135 int c1 = 0;
2132 enum
2133 { 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;
2134 2137
2135 for (;;) 2138 for (;;)
2136 { 2139 {
2137 c = inchar (SCHEME_A); 2140 c = inchar (SCHEME_A);
2138 2141
… …
2140 return S_F; 2143 return S_F;
2141 2144
2142 switch (state) 2145 switch (state)
2143 { 2146 {
2144 case st_ok: 2147 case st_ok:
2145 switch (c) 2148 if (ecb_expect_false (c == delim))
2146 {
2147 case '\\':
2148 state = st_bsl;
2149 break;
2150
2151 case '"':
2152 *p = 0;
2153 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);
2154 2150
2155 default: 2151 if (ecb_expect_false (c == '\\'))
2152 state = st_bsl;
2153 else
2156 *p++ = c; 2154 *p++ = c;
2157 break;
2158 }
2159 2155
2160 break; 2156 break;
2161 2157
2162 case st_bsl: 2158 case st_bsl:
2163 switch (c) 2159 switch (c)
… …
2172 case '7': 2168 case '7':
2173 state = st_oct1; 2169 state = st_oct1;
2174 c1 = c - '0'; 2170 c1 = c - '0';
2175 break; 2171 break;
2176 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
2177 case 'x': 2188 case 'x':
2178 case 'X': 2189 case 'X':
2179 state = st_x1; 2190 state = st_x1;
2180 c1 = 0; 2191 c1 = 0;
2181 break; 2192 break;
2182 2193
2183 case 'n':
2184 *p++ = '\n';
2185 state = st_ok;
2186 break;
2187
2188 case 't':
2189 *p++ = '\t';
2190 state = st_ok;
2191 break;
2192
2193 case 'r':
2194 *p++ = '\r';
2195 state = st_ok;
2196 break;
2197
2198 case '"':
2199 *p++ = '"';
2200 state = st_ok;
2201 break;
2202
2203 default: 2194 default:
2204 *p++ = c; 2195 *p++ = c;
2205 state = st_ok; 2196 state = st_ok;
2206 break; 2197 break;
2207 } 2198 }
2208 2199
2209 break; 2200 break;
2210 2201
2211 case st_x1: 2202 case st_x1:
2212 case st_x2: 2203 case st_x2:
2213 c = toupper (c); 2204 c = tolower (c);
2214 2205
2215 if (c >= '0' && c <= 'F') 2206 if (c >= '0' && c <= '9')
2216 {
2217 if (c <= '9')
2218 c1 = (c1 << 4) + c - '0'; 2207 c1 = (c1 << 4) + c - '0';
2219 else 2208 else if (c >= 'a' && c <= 'f')
2220 c1 = (c1 << 4) + c - 'A' + 10; 2209 c1 = (c1 << 4) + c - 'a' + 10;
2221
2222 if (state == st_x1)
2223 state = st_x2;
2224 else
2225 {
2226 *p++ = c1;
2227 state = st_ok;
2228 }
2229 }
2230 else 2210 else
2231 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 }
2232 2220
2233 break; 2221 break;
2234 2222
2235 case st_oct1: 2223 case st_oct1:
2236 case st_oct2: 2224 case st_oct2:
… …
2240 backchar (SCHEME_A_ c); 2228 backchar (SCHEME_A_ c);
2241 state = st_ok; 2229 state = st_ok;
2242 } 2230 }
2243 else 2231 else
2244 { 2232 {
2245 if (state == st_oct2 && c1 >= 32) 2233 if (state == st_oct2 && c1 >= ' ')
2246 return S_F; 2234 return S_F;
2247 2235
2248 c1 = (c1 << 3) + (c - '0'); 2236 c1 = (c1 << 3) + (c - '0');
2249 2237
2250 if (state == st_oct1) 2238 if (state == st_oct1)
… …
2255 state = st_ok; 2243 state = st_ok;
2256 } 2244 }
2257 } 2245 }
2258 2246
2259 break; 2247 break;
2260
2261 } 2248 }
2262 } 2249 }
2263} 2250}
2264 2251
2265/* check c is in chars */ 2252/* check c is in chars */
2266ecb_inline int 2253ecb_cold int
2267is_one_of (char *s, int c) 2254is_one_of (const char *s, int c)
2268{ 2255{
2269 if (c == EOF)
2270 return 1;
2271
2272 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2273} 2257}
2274 2258
2275/* skip white characters */ 2259/* skip white characters */
2276ecb_inline int 2260ecb_cold int
2277skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2278{ 2262{
2279 int c, curr_line = 0; 2263 int c, curr_line = 0;
2280 2264
2281 do 2265 do
2282 { 2266 {
2283 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2284#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2285 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2286 curr_line++; 2271 curr_line++;
2287#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2288 } 2276 }
2289 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2290 2278
2291 /* record it */ 2279 /* record it */
2292#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2293 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2281 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2294 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2282 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2295#endif 2283#endif
2296 2284
2297 if (c != EOF)
2298 {
2299 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2300 return 1; 2286 return 1;
2301 }
2302 else
2303 return EOF;
2304} 2287}
2305 2288
2306/* get token */ 2289/* get token */
2307static int 2290ecb_cold static int
2308token (SCHEME_P) 2291token (SCHEME_P)
2309{ 2292{
2310 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2311 2294
2312 if (c == EOF) 2295 if (c == EOF)
… …
2324 return TOK_RPAREN; 2307 return TOK_RPAREN;
2325 2308
2326 case '.': 2309 case '.':
2327 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2328 2311
2329 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2330 return TOK_DOT; 2313 return TOK_DOT;
2331 else 2314 else
2332 { 2315 {
2333 //TODO: ungetc twice in a row is not supported in C
2334 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2335 backchar (SCHEME_A_ '.');
2336 return TOK_ATOM; 2317 return TOK_DOTATOM;
2337 } 2318 }
2319
2320 case '|':
2321 return TOK_STRATOM;
2338 2322
2339 case '\'': 2323 case '\'':
2340 return TOK_QUOTE; 2324 return TOK_QUOTE;
2341 2325
2342 case ';': 2326 case ';':
… …
2409} 2393}
2410 2394
2411/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2412#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2413 2397
2414static void 2398ecb_cold static void
2415printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2416{ 2400{
2417 int i; 2401 int i;
2418 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2419 2403
… …
2474 } 2458 }
2475 2459
2476 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2477} 2461}
2478 2462
2479
2480/* print atoms */ 2463/* print atoms */
2481static void 2464ecb_cold static void
2482printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2483{ 2466{
2484 char *p; 2467 char *p;
2485 int len; 2468 int len;
2486 2469
2487 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2488 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2489} 2472}
2490 2473
2491
2492/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2493static void 2475ecb_cold static void
2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2495{ 2477{
2496 char *p; 2478 char *p;
2497 2479
2498 if (l == NIL) 2480 if (l == NIL)
… …
2656#endif 2638#endif
2657 } 2639 }
2658 else if (is_continuation (l)) 2640 else if (is_continuation (l))
2659 p = "#<CONTINUATION>"; 2641 p = "#<CONTINUATION>";
2660 else 2642 else
2643 {
2644#if USE_PRINTF
2645 p = SCHEME_V->strbuff;
2646 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2647#else
2661 p = "#<ERROR>"; 2648 p = "#<ERROR>";
2649#endif
2650 }
2662 2651
2663 *pp = p; 2652 *pp = p;
2664 *plen = strlen (p); 2653 *plen = strlen (p);
2665} 2654}
2666 2655
… …
2698 return car (d); 2687 return car (d);
2699 2688
2700 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2701 q = p; 2690 q = p;
2702 2691
2703 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2704 { 2693 {
2705 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2706 2695
2707 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2708 p = cdr (d); 2697 p = cdr (d);
2709 } 2698 }
2710 2699
2711 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2712 return q; 2701 return q;
2713} 2702}
2714 2703
2715/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2716static pointer 2705ecb_hot static pointer
2717reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2718{ 2707{
2719 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2720 pointer p = NIL; 2709 pointer p = NIL;
2721 2710
… …
2724 2713
2725 return p; 2714 return p;
2726} 2715}
2727 2716
2728/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2729static pointer 2718ecb_hot static pointer
2730reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2731{ 2720{
2732 pointer result = term; 2721 pointer result = term;
2733 pointer p = list; 2722 pointer p = list;
2734 2723
… …
2742 2731
2743 return result; 2732 return result;
2744} 2733}
2745 2734
2746/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2747static pointer 2736ecb_hot static pointer
2748revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2749{ 2738{
2750 pointer result = a; 2739 pointer result = a;
2751 pointer p = b; 2740 pointer p = b;
2752 2741
… …
2761 2750
2762 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2763} 2752}
2764 2753
2765/* equivalence of atoms */ 2754/* equivalence of atoms */
2766int 2755ecb_hot int
2767eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2768{ 2757{
2769 if (is_string (a)) 2758 if (is_string (a))
2770 { 2759 {
2771 if (is_string (b)) 2760 if (is_string (b))
… …
2810/* () is #t in R5RS */ 2799/* () is #t in R5RS */
2811#define is_true(p) ((p) != S_F) 2800#define is_true(p) ((p) != S_F)
2812#define is_false(p) ((p) == S_F) 2801#define is_false(p) ((p) == S_F)
2813 2802
2814/* ========== Environment implementation ========== */ 2803/* ========== Environment implementation ========== */
2815
2816#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2817
2818static int
2819hash_fn (const char *key, int table_size)
2820{
2821 const unsigned char *p = key;
2822 uint32_t hash = 2166136261;
2823
2824 while (*p)
2825 hash = (hash ^ *p++) * 16777619;
2826
2827 return hash % table_size;
2828}
2829#endif
2830 2804
2831#ifndef USE_ALIST_ENV 2805#ifndef USE_ALIST_ENV
2832 2806
2833/* 2807/*
2834 * In this implementation, each frame of the environment may be 2808 * In this implementation, each frame of the environment may be
… …
2857sym_hash (pointer sym, uint32_t size) 2831sym_hash (pointer sym, uint32_t size)
2858{ 2832{
2859 uintptr_t ptr = (uintptr_t)sym; 2833 uintptr_t ptr = (uintptr_t)sym;
2860 2834
2861#if 0 2835#if 0
2862 /* tqable size is prime, so why mix */ 2836 /* table size is prime, so why mix */
2863 ptr += ptr >> 32; 2837 ptr += ptr >> 32;
2864 ptr += ptr >> 16; 2838 ptr += ptr >> 16;
2865 ptr += ptr >> 8; 2839 ptr += ptr >> 8;
2866#endif 2840#endif
2867 2841
… …
2880 } 2854 }
2881 else 2855 else
2882 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2883} 2857}
2884 2858
2885static pointer 2859ecb_hot static pointer
2886find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2887{ 2861{
2888 pointer x, y; 2862 pointer x, y;
2889 2863
2890 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
… …
2911 return NIL; 2885 return NIL;
2912} 2886}
2913 2887
2914#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2915 2889
2916ecb_inline void 2890static void
2917new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2918{ 2892{
2919 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2920 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2921} 2895}
2922 2896
2923ecb_inline void 2897static void
2924new_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)
2925{ 2899{
2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2927} 2901}
2928 2902
2929static pointer 2903ecb_hot static pointer
2930find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2931{ 2905{
2932 pointer x, y; 2906 pointer x, y;
2933 2907
2934 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2948 return NIL; 2922 return NIL;
2949} 2923}
2950 2924
2951#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2952 2926
2953ecb_inline void 2927static void
2954new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2955{ 2929{
2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2956 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);
2957} 2932}
2958 2933
2959ecb_inline void 2934static void
2960set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2961{ 2936{
2962 set_cdr (slot, value); 2937 set_cdr (slot, value);
2963} 2938}
2964 2939
2965ecb_inline pointer 2940static pointer
2966slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2967{ 2942{
2968 return cdr (slot); 2943 return cdr (slot);
2969} 2944}
2970 2945
2971/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
2972 2947
2973static int 2948ecb_cold static int
2974xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
2975{ 2950{
2976#if USE_ERROR_HOOK
2977 pointer x;
2978 pointer hdl = SCHEME_V->ERROR_HOOK;
2979#endif
2980
2981#if USE_PRINTF 2951#if USE_PRINTF
2982#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
2983 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
2984 2954
2985 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
3000 } 2970 }
3001#endif 2971#endif
3002#endif 2972#endif
3003 2973
3004#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
3005 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);
3006 2976
3007 if (x != NIL) 2977 if (x != NIL)
3008 { 2978 {
3009 pointer code = a 2979 pointer code = a
3010 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3054 pointer code; 3024 pointer code;
3055}; 3025};
3056 3026
3057# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3058 3028
3059static void 3029ecb_hot static void
3060s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3061{ 3031{
3062 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3063 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3064 3034
3065 /* enough room for the next frame? */ 3035 /* enough room for the next frame? */
3066 if (nframes >= SCHEME_V->dump_size) 3036 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3067 { 3037 {
3068 SCHEME_V->dump_size += STACK_GROWTH; 3038 SCHEME_V->dump_size += STACK_GROWTH;
3069 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);
3070 } 3040 }
3071 3041
… …
3077 next_frame->code = code; 3047 next_frame->code = code;
3078 3048
3079 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3080} 3050}
3081 3051
3082static int 3052static ecb_hot int
3083xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3084{ 3054{
3085 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3086 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3087 3057
… …
3098 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3099 3069
3100 return 0; 3070 return 0;
3101} 3071}
3102 3072
3103ecb_inline void 3073ecb_cold void
3104dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3105{ 3075{
3106 /* 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 */
3107 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3108} 3078}
3109 3079
3110ecb_inline void 3080ecb_cold void
3111dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3112{ 3082{
3113 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3114 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3115 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3116} 3086}
3117 3087
3118static void 3088ecb_cold static void
3119dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3120{ 3090{
3121 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3122 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3123 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3124 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3125} 3095}
3126 3096
3127static void 3097ecb_cold static void
3128dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3129{ 3099{
3130 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3131 int i; 3101 int i;
3132 3102
… …
3138 mark (frame->envir); 3108 mark (frame->envir);
3139 mark (frame->code); 3109 mark (frame->code);
3140 } 3110 }
3141} 3111}
3142 3112
3143static pointer 3113ecb_cold static pointer
3144ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3145{ 3115{
3146 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3147 int i; 3117 int i;
3148 3118
… …
3160 } 3130 }
3161 3131
3162 return cont; 3132 return cont;
3163} 3133}
3164 3134
3165static void 3135ecb_cold static void
3166ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3167{ 3137{
3168 int i = 0; 3138 int i = 0;
3169 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3170 3140
… …
3182 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3183} 3153}
3184 3154
3185#else 3155#else
3186 3156
3187ecb_inline void 3157ecb_cold void
3188dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3189{ 3159{
3190 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3191} 3161}
3192 3162
3193ecb_inline void 3163ecb_cold void
3194dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3195{ 3165{
3196 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3197} 3167}
3198 3168
3199static void 3169ecb_cold static void
3200dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3201{ 3171{
3202 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3203} 3173}
3204 3174
3205static int 3175ecb_hot static int
3206xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3207{ 3177{
3208 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3209 3179
3210 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3220 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3221 3191
3222 return 0; 3192 return 0;
3223} 3193}
3224 3194
3225static void 3195ecb_hot static void
3226s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3227{ 3197{
3228 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3229 cons (args, 3199 cons (args,
3230 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3231 cons (code, 3201 cons (code,
3232 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3233} 3203}
3234 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
3235static void 3417static void
3236dump_stack_mark (SCHEME_P) 3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3237{ 3419{
3238 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);
3239} 3496}
3240 3497
3241static pointer 3498static pointer
3242ss_get_cont (SCHEME_P) 3499lookup (SCHEME_P_ pointer x)
3243{ 3500{
3244 return SCHEME_V->dump; 3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3245}
3246 3502
3247static void 3503 if (x != NIL)
3248ss_set_cont (SCHEME_P_ pointer cont) 3504 x = slot_value_in_env (x);
3249{
3250 SCHEME_V->dump = cont;
3251}
3252 3505
3253#endif 3506 return x;
3507}
3254 3508
3255#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 }
3256 3517
3257static 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
3258opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3259{ 3713{
3260 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3261 pointer x, y; 3715 pointer x, y;
3262 3716
3263 switch (op) 3717 switch (op)
3264 { 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
3265 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3266 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3267 { 3734 {
3268 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3735 putstr (SCHEME_A_ "Loading ");
3269 //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');
3270 } 3738 }
3271 3739
3272 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3273 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3274 else 3742
3275 {
3276 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3277 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3278 }
3279 3745
3280 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3281 3747
3282 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3283 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3284 { 3750 {
3285 if (SCHEME_V->file_i == 0) 3751 if (SCHEME_V->file_i == 0)
3286 { 3752 {
3287 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3288 s_goto (OP_QUIT); 3754 s_goto (OP_QUIT);
… …
3299 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3300 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3301 { 3767 {
3302 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3303 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3304 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3305 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3306 } 3775 }
3307 3776
3308 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3309 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3344 { 3813 {
3345 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3346 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3347 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3348 } 3817 }
3349 else 3818
3350 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3351 3820
3352 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3353#if USE_TRACING 3822#if USE_TRACING
3354 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3355 { 3824 {
… …
3366#endif 3835#endif
3367 if (is_symbol (SCHEME_V->code)) /* symbol */ 3836 if (is_symbol (SCHEME_V->code)) /* symbol */
3368 { 3837 {
3369 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);
3370 3839
3371 if (x != NIL) 3840 if (x == NIL)
3372 s_return (slot_value_in_env (x));
3373 else
3374 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));
3375 } 3844 }
3376 else if (is_pair (SCHEME_V->code)) 3845 else if (is_pair (SCHEME_V->code))
3377 { 3846 {
3378 x = car (SCHEME_V->code); 3847 x = car (SCHEME_V->code);
3379 3848
… …
3388 /* 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)); */
3389 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3390 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3391 } 3860 }
3392 } 3861 }
3393 else 3862
3394 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3395 3864
3396 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3397 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3398 { 3867 {
3399 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3400 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3401 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3402 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3403 } 3872 }
3404 else 3873
3405 {
3406 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3407 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3408 }
3409 3876
3410 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3411 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3412 3879
3413 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3424 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3425 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3426 } 3893 }
3427 3894
3428#if USE_TRACING 3895#if USE_TRACING
3429
3430 case OP_TRACING: 3896 case OP_TRACING:
3431 { 3897 {
3432 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3433 3899
3434 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3435 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3436 } 3902 }
3437
3438#endif 3903#endif
3439 3904
3440 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3441#if USE_TRACING 3906#if USE_TRACING
3442 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3456 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3921 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3457 else if (is_foreign (SCHEME_V->code)) 3922 else if (is_foreign (SCHEME_V->code))
3458 { 3923 {
3459 /* Keep nested calls from GC'ing the arglist */ 3924 /* Keep nested calls from GC'ing the arglist */
3460 push_recent_alloc (SCHEME_A_ args, NIL); 3925 push_recent_alloc (SCHEME_A_ args, NIL);
3461 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3926 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3462 3927
3463 s_return (x); 3928 s_return (x);
3464 } 3929 }
3465 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 */
3466 { 3931 {
… …
3496 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3497 { 3962 {
3498 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3499 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3500 } 3965 }
3501 else 3966
3502 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3503 3968
3504 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3505 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3506 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3507
3508#if 1
3509 3972
3510 case OP_LAMBDA: /* lambda */ 3973 case OP_LAMBDA: /* lambda */
3511 /* 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
3512 set SCHEME_V->value fall thru */ 3975 set SCHEME_V->value fall thru */
3513 { 3976 {
… …
3520 SCHEME_V->code = slot_value_in_env (f); 3983 SCHEME_V->code = slot_value_in_env (f);
3521 s_goto (OP_APPLY); 3984 s_goto (OP_APPLY);
3522 } 3985 }
3523 3986
3524 SCHEME_V->value = SCHEME_V->code; 3987 SCHEME_V->value = SCHEME_V->code;
3525 /* Fallthru */
3526 } 3988 }
3989 /* Fallthru */
3527 3990
3528 case OP_LAMBDA1: 3991 case OP_LAMBDA1:
3529 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));
3530
3531#else
3532
3533 case OP_LAMBDA: /* lambda */
3534 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3535
3536#endif
3537 3993
3538 case OP_MKCLOSURE: /* make-closure */ 3994 case OP_MKCLOSURE: /* make-closure */
3539 x = car (args); 3995 x = car (args);
3540 3996
3541 if (car (x) == SCHEME_V->LAMBDA) 3997 if (car (x) == SCHEME_V->LAMBDA)
… …
3580 else 4036 else
3581 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);
3582 4038
3583 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3584 4040
3585
3586 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3587 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3588 4043
3589 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3590 x = cadr (args); 4045 x = cadr (args);
… …
3608 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3609 } 4064 }
3610 else 4065 else
3611 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3612 4067
3613
3614 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3615 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3616 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3617 4071
3618 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3629 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3630 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3631 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3632 else 4086 else
3633 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
3634 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3635 4090
3636 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3637 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3638 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3639 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);
3640 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3641 4096
3642 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3643 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3644 4100
3645 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3646 { 4102 {
3647 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)))
3648 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));
3649 4105
3650 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3651 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3652 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3653 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3654 } 4110 }
3655 else /* end */ 4111
3656 { 4112 /* end */
3657 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3658 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3659 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3660 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3661 }
3662 4117
3663 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3664 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3665 4120
3666 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;
… …
3670 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3671 { 4126 {
3672 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))
3673 { 4128 {
3674 if (!is_pair (x)) 4129 if (!is_pair (x))
3675 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3676 4131
3677 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3678 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3679 4134
3680 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3681 } 4136 }
3682 4137
3683 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)),
… …
3700 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3701 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3702 } 4157 }
3703 4158
3704 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)))
3705 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));
3706 4161
3707 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));
3708 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3709 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3710 4165
… …
3721 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3722 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3723 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3724 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3725 } 4180 }
3726 else /* end */ 4181
4182 /* end */
3727 { 4183
3728 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3729 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3730 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3731 }
3732 4187
3733 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3734 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3735 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3736 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3737 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3738 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3739 4194
3740 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3741 args = cons (SCHEME_V->value, args);
3742
3743 if (is_pair (SCHEME_V->code)) /* continue */
3744 {
3745 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3746 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3747
3748 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3749 SCHEME_V->code = cadar (SCHEME_V->code);
3750 SCHEME_V->args = NIL;
3751 s_goto (OP_EVAL);
3752 }
3753 else /* end */
3754 {
3755 args = reverse_in_place (SCHEME_A_ NIL, args);
3756 SCHEME_V->code = car (args);
3757 SCHEME_V->args = cdr (args);
3758 s_goto (OP_LET2REC);
3759 }
3760 4196
3761 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3762 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))
3763 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3764 4200
… …
3794 } 4230 }
3795 else 4231 else
3796 { 4232 {
3797 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3798 s_return (NIL); 4234 s_return (NIL);
3799 else 4235
3800 {
3801 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3802 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3803 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3804 }
3805 } 4239 }
3806 4240
3807 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3808 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);
3809 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3820 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3821 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3822 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3823 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3824 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3825 else 4259
3826 {
3827 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3828 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3829 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3830 }
3831 4263
3832 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3833 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3834 s_return (S_F); 4266 s_return (S_F);
3835 4267
… …
3840 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3841 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3842 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3843 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3844 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3845 else 4277
3846 {
3847 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3848 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3849 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3850 }
3851 4281
3852 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3853 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3854 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3855 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3920 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3921 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3922 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3923 } 4353 }
3924 } 4354 }
3925 else 4355
3926 s_return (NIL); 4356 s_return (NIL);
3927 4357
3928 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3929 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3930 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3931 else 4361
3932 s_return (NIL); 4362 s_return (NIL);
3933 4363
3934 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3935 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3936 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3937 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
3951 } 4381 }
3952 4382
3953 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
3954} 4384}
3955 4385
3956static int 4386/* math, cxr */
4387ecb_hot static int
3957opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3958{ 4389{
3959 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
3960 pointer x = car (args); 4391 pointer x = car (args);
3961 num v; 4392 num v;
3962 4393
3963 switch (op) 4394 switch (op)
3964 { 4395 {
3965#if USE_MATH 4396#if USE_MATH
3966 case OP_INEX2EX: /* inexact->exact */ 4397 case OP_INEX2EX: /* inexact->exact */
3967 {
3968 if (is_integer (x)) 4398 if (!is_integer (x))
3969 s_return (x); 4399 {
3970
3971 RVALUE r = rvalue_unchecked (x); 4400 RVALUE r = rvalue_unchecked (x);
3972 4401
3973 if (r == (RVALUE)(IVALUE)r) 4402 if (r == (RVALUE)(IVALUE)r)
3974 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4403 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3975 else 4404 else
3976 Error_1 ("inexact->exact: not integral:", x); 4405 Error_1 ("inexact->exact: not integral:", x);
3977 } 4406 }
3978 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))));
3979 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))));
3980 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))))));
3981 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))));
3982 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))));
3983 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))));
3984 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))));
3985 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))));
3986 4424
3987 case OP_ATAN: 4425 case OP_ATAN:
4426 s_return (mk_real (SCHEME_A_
3988 if (cdr (args) == NIL) 4427 cdr (args) == NIL
3989 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4428 ? atan (rvalue (x))
3990 else 4429 : atan2 (rvalue (x), rvalue (cadr (args)))));
3991 {
3992 pointer y = cadr (args);
3993 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3994 }
3995
3996 case OP_SQRT:
3997 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3998 4430
3999 case OP_EXPT: 4431 case OP_EXPT:
4000 { 4432 {
4001 RVALUE result; 4433 RVALUE result;
4002 int real_result = 1; 4434 int real_result = 1;
… …
4025 if (real_result) 4457 if (real_result)
4026 s_return (mk_real (SCHEME_A_ result)); 4458 s_return (mk_real (SCHEME_A_ result));
4027 else 4459 else
4028 s_return (mk_integer (SCHEME_A_ result)); 4460 s_return (mk_integer (SCHEME_A_ result));
4029 } 4461 }
4030
4031 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4032 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4033
4034 case OP_TRUNCATE:
4035 {
4036 RVALUE n = rvalue (x);
4037 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4038 }
4039
4040 case OP_ROUND:
4041 if (is_integer (x))
4042 s_return (x);
4043
4044 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4045#endif 4462#endif
4046 4463
4047 case OP_ADD: /* + */ 4464 case OP_ADD: /* + */
4048 v = num_zero; 4465 v = num_zero;
4049 4466
… …
4137 else 4554 else
4138 Error_0 ("modulo: division by zero"); 4555 Error_0 ("modulo: division by zero");
4139 4556
4140 s_return (mk_number (SCHEME_A_ v)); 4557 s_return (mk_number (SCHEME_A_ v));
4141 4558
4142 case OP_CAR: /* car */ 4559 /* the compiler will optimize this mess... */
4143 s_return (caar (args)); 4560 case OP_CAR: op_car: s_return (car (x));
4144 4561 case OP_CDR: op_cdr: s_return (cdr (x));
4145 case OP_CDR: /* cdr */ 4562 case OP_CAAR: op_caar: x = car (x); goto op_car;
4146 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;
4147 4590
4148 case OP_CONS: /* cons */ 4591 case OP_CONS: /* cons */
4149 set_cdr (args, cadr (args)); 4592 set_cdr (args, cadr (args));
4150 s_return (args); 4593 s_return (args);
4151 4594
… …
4325 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4768 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4326 4769
4327 s_return (newstr); 4770 s_return (newstr);
4328 } 4771 }
4329 4772
4330 case OP_SUBSTR: /* substring */ 4773 case OP_STRING_COPY: /* substring/string-copy */
4331 { 4774 {
4332 char *str = strvalue (x); 4775 char *str = strvalue (x);
4333 int index0 = ivalue_unchecked (cadr (args)); 4776 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4334 int index1; 4777 int index1;
4335 int len; 4778 int len;
4336 4779
4337 if (index0 > strlength (x)) 4780 if (index0 > strlength (x))
4338 Error_1 ("substring: start out of bounds:", cadr (args)); 4781 Error_1 ("string->copy: start out of bounds:", cadr (args));
4339 4782
4340 if (cddr (args) != NIL) 4783 if (cddr (args) != NIL)
4341 { 4784 {
4342 index1 = ivalue_unchecked (caddr (args)); 4785 index1 = ivalue_unchecked (caddr (args));
4343 4786
4344 if (index1 > strlength (x) || index1 < index0) 4787 if (index1 > strlength (x) || index1 < index0)
4345 Error_1 ("substring: end out of bounds:", caddr (args)); 4788 Error_1 ("string->copy: end out of bounds:", caddr (args));
4346 } 4789 }
4347 else 4790 else
4348 index1 = strlength (x); 4791 index1 = strlength (x);
4349 4792
4350 len = index1 - index0; 4793 len = index1 - index0;
4351 x = mk_empty_string (SCHEME_A_ len, ' '); 4794 x = mk_counted_string (SCHEME_A_ str + index0, len);
4352 memcpy (strvalue (x), str + index0, len);
4353 strvalue (x)[len] = 0;
4354 4795
4355 s_return (x); 4796 s_return (x);
4356 } 4797 }
4357 4798
4358 case OP_VECTOR: /* vector */ 4799 case OP_VECTOR: /* vector */
… …
4400 } 4841 }
4401 4842
4402 case OP_VECLEN: /* vector-length */ 4843 case OP_VECLEN: /* vector-length */
4403 s_return (mk_integer (SCHEME_A_ veclength (x))); 4844 s_return (mk_integer (SCHEME_A_ veclength (x)));
4404 4845
4846 case OP_VECRESIZE:
4847 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4848 s_return (x);
4849
4405 case OP_VECREF: /* vector-ref */ 4850 case OP_VECREF: /* vector-ref */
4406 { 4851 {
4407 int index = ivalue_unchecked (cadr (args)); 4852 int index = ivalue_unchecked (cadr (args));
4408 4853
4409 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4854 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
… …
4428 } 4873 }
4429 4874
4430 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4431} 4876}
4432 4877
4433static int 4878/* relational ops */
4879ecb_hot static int
4434opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4435{ 4881{
4436 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4437 4883
4438 for (;;) 4884 for (;;)
… …
4459 } 4905 }
4460 4906
4461 s_return (S_T); 4907 s_return (S_T);
4462} 4908}
4463 4909
4464static int 4910/* predicates */
4911ecb_hot static int
4465opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4466{ 4913{
4467 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4468 pointer a = car (args); 4915 pointer a = car (args);
4469 pointer d = cdr (args); 4916 pointer d = cdr (args);
4470 int r; 4917 int r;
4471 4918
4472 switch (op) 4919 switch (op)
4473 { 4920 {
4474 case OP_NOT: /* not */ r = is_false (a) ; break; 4921 case OP_NOT: /* not */ r = is_false (a) ; break;
4475 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;
4476 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4923 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4477 case OP_NULLP: /* null? */ r = a == NIL ; break; 4924 case OP_NULLP: /* null? */ r = a == NIL ; break;
4478 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;
4479 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4927 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4480 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4928 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4481 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4929 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4482 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 */
4483 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4931 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4484 4932
4485#if USE_CHAR_CLASSIFIERS 4933#if USE_CHAR_CLASSIFIERS
4486 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4934 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4487 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4935 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4488 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4936 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4515 } 4963 }
4516 4964
4517 s_retbool (r); 4965 s_retbool (r);
4518} 4966}
4519 4967
4520static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4521opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4522{ 4971{
4523 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4524 pointer a = car (args); 4973 pointer a = car (args);
4525 pointer x, y; 4974 pointer x, y;
… …
4538 } 4987 }
4539 else 4988 else
4540 s_return (SCHEME_V->code); 4989 s_return (SCHEME_V->code);
4541 4990
4542 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4991 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4543 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4992 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4544 s_return (SCHEME_V->value); 4993 s_return (SCHEME_V->value);
4545 4994
4546#if USE_PORTS 4995#if USE_PORTS
4996
4997 case OP_EOF_OBJECT: /* eof-object */
4998 s_return (S_EOF);
4547 4999
4548 case OP_WRITE: /* write */ 5000 case OP_WRITE: /* write */
4549 case OP_DISPLAY: /* display */ 5001 case OP_DISPLAY: /* display */
4550 case OP_WRITE_CHAR: /* write-char */ 5002 case OP_WRITE_CHAR: /* write-char */
4551 if (is_pair (cdr (SCHEME_V->args))) 5003 if (is_pair (cdr (SCHEME_V->args)))
… …
4565 else 5017 else
4566 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4567 5019
4568 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4569 5021
5022 //TODO: move to scheme
4570 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4571 if (is_pair (args)) 5024 if (is_pair (args))
4572 { 5025 {
4573 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4574 { 5027 {
… …
4576 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4577 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4578 } 5031 }
4579 } 5032 }
4580 5033
4581 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4582 s_return (S_T); 5035 s_return (S_T);
4583#endif 5036#endif
4584 5037
4585 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4586 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4595 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4596 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4597 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4598 5051
4599 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4600 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4601 5054
4602 if (args != NIL) 5055 if (args != NIL)
4603 { 5056 {
4604 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4605 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4606 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4607 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4608 } 5061 }
4609 else 5062 else
4610 { 5063 {
4611 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4612 5065
4613 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4614 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4615 else 5068 else
4616 return -1; 5069 return -1;
… …
4693 SCHEME_V->gc_verbose = (a != S_F); 5146 SCHEME_V->gc_verbose = (a != S_F);
4694 s_retbool (was); 5147 s_retbool (was);
4695 } 5148 }
4696 5149
4697 case OP_NEWSEGMENT: /* new-segment */ 5150 case OP_NEWSEGMENT: /* new-segment */
5151#if 0
4698 if (!is_pair (args) || !is_number (a)) 5152 if (!is_pair (args) || !is_number (a))
4699 Error_0 ("new-segment: argument must be a number"); 5153 Error_0 ("new-segment: argument must be a number");
4700 5154#endif
4701 alloc_cellseg (SCHEME_A_ ivalue (a)); 5155 s_retbool (alloc_cellseg (SCHEME_A));
4702
4703 s_return (S_T);
4704 5156
4705 case OP_OBLIST: /* oblist */ 5157 case OP_OBLIST: /* oblist */
4706 s_return (oblist_all_symbols (SCHEME_A)); 5158 s_return (oblist_all_symbols (SCHEME_A));
4707 5159
4708#if USE_PORTS 5160#if USE_PORTS
… …
4778 s_return (p == NIL ? S_F : p); 5230 s_return (p == NIL ? S_F : p);
4779 } 5231 }
4780 5232
4781 case OP_GET_OUTSTRING: /* get-output-string */ 5233 case OP_GET_OUTSTRING: /* get-output-string */
4782 { 5234 {
4783 port *p; 5235 port *p = port (a);
4784 5236
4785 if ((p = a->object.port)->kind & port_string) 5237 if (p->kind & port_string)
4786 { 5238 {
4787 off_t size; 5239 off_t size;
4788 char *str; 5240 char *str;
4789 5241
4790 size = p->rep.string.curr - p->rep.string.start + 1; 5242 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4825 } 5277 }
4826 5278
4827 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4828} 5280}
4829 5281
4830static int 5282/* reading */
5283ecb_cold static int
4831opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4832{ 5285{
4833 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4834 pointer x; 5287 pointer x;
4835 5288
… …
4895 int res; 5348 int res;
4896 5349
4897 if (is_pair (args)) 5350 if (is_pair (args))
4898 p = car (args); 5351 p = car (args);
4899 5352
4900 res = p->object.port->kind & port_string; 5353 res = port (p)->kind & port_string;
4901 5354
4902 s_retbool (res); 5355 s_retbool (res);
4903 } 5356 }
4904 5357
4905 case OP_SET_INPORT: /* set-input-port */ 5358 case OP_SET_INPORT: /* set-input-port */
… …
4914 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
4915 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
4916 { 5369 {
4917 case TOK_EOF: 5370 case TOK_EOF:
4918 s_return (S_EOF); 5371 s_return (S_EOF);
4919 /* NOTREACHED */
4920 5372
4921 case TOK_VEC: 5373 case TOK_VEC:
4922 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4923 /* fall through */ 5375 /* fall through */
4924 5376
… …
4927 5379
4928 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
4929 s_return (NIL); 5381 s_return (NIL);
4930 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
4931 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
4932 else 5384
4933 {
4934 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4935 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4936 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
4937 }
4938 5388
4939 case TOK_QUOTE: 5389 case TOK_QUOTE:
4940 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4941 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
4942 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
4948 { 5398 {
4949 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4950 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
4951 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
4952 } 5402 }
4953 else 5403
4954 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4955
4956 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
4957 5406
4958 case TOK_COMMA: 5407 case TOK_COMMA:
4959 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4960 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
4964 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5413 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4965 SCHEME_V->tok = token (SCHEME_A); 5414 SCHEME_V->tok = token (SCHEME_A);
4966 s_goto (OP_RDSEXPR); 5415 s_goto (OP_RDSEXPR);
4967 5416
4968 case TOK_ATOM: 5417 case TOK_ATOM:
4969 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)));
4970 5429
4971 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
4972 x = readstrexp (SCHEME_A); 5431 x = readstrexp (SCHEME_A_ '"');
4973 5432
4974 if (x == S_F) 5433 if (x == S_F)
4975 Error_0 ("Error reading string"); 5434 Error_0 ("Error reading string");
4976 5435
4977 setimmutable (x); 5436 setimmutable (x);
… …
4981 { 5440 {
4982 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);
4983 5442
4984 if (f == NIL) 5443 if (f == NIL)
4985 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
4986 else 5445
4987 {
4988 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
4989 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
4990 }
4991 } 5448 }
4992 5449
4993 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
4994 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)
4995 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
4996 else 5453
4997 s_return (x); 5454 s_return (x);
4998 5455
4999 default: 5456 default:
5000 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
5001 } 5458 }
5002 5459
… …
5095 pointer b = cdr (args); 5552 pointer b = cdr (args);
5096 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5097 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5098 5555
5099 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5100 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5101 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5102 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5103 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5105 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5106 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5107 else 5564 else
5108 { 5565 {
5109 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5110 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5111 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5112 } 5569 }
5113 5570
5114 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5116 5573
5117 case OP_P1LIST: 5574 case OP_P1LIST:
5118 if (is_pair (args)) 5575 if (is_pair (args))
5119 { 5576 {
5120 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5121 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5122 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5123 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5124 } 5581 }
5125 else if (is_vector (args)) 5582 else if (is_vector (args))
5126 { 5583 {
… …
5134 { 5591 {
5135 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5136 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5137 } 5594 }
5138 5595
5139 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5140 s_return (S_T); 5597 s_return (S_T);
5141 } 5598 }
5142 5599
5143 case OP_PVECFROM: 5600 case OP_PVECFROM:
5144 { 5601 {
… …
5146 pointer vec = car (args); 5603 pointer vec = car (args);
5147 int len = veclength (vec); 5604 int len = veclength (vec);
5148 5605
5149 if (i == len) 5606 if (i == len)
5150 { 5607 {
5151 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5152 s_return (S_T); 5609 s_return (S_T);
5153 } 5610 }
5154 else 5611 else
5155 { 5612 {
5156 pointer elem = vector_get (vec, i); 5613 pointer elem = vector_get (vec, i);
… …
5158 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5159 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5160 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5161 5618
5162 if (i > 0) 5619 if (i > 0)
5163 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5164 5621
5165 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5166 } 5623 }
5167 } 5624 }
5168 } 5625 }
5169 5626
5170 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5171} 5628}
5172 5629
5173static int 5630/* list ops */
5631ecb_hot static int
5174opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5175{ 5633{
5176 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5177 pointer a = car (args); 5635 pointer a = car (args);
5178 pointer x, y; 5636 pointer x, y;
… …
5201 break; 5659 break;
5202 } 5660 }
5203 5661
5204 if (is_pair (y)) 5662 if (is_pair (y))
5205 s_return (car (y)); 5663 s_return (car (y));
5206 else 5664
5207 s_return (S_F); 5665 s_return (S_F);
5208
5209 5666
5210 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5211 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5212 5669
5213 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5214 s_return (S_F); 5671 s_return (S_F);
5215 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5216 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5217 else if (is_macro (SCHEME_V->args)) 5674
5218 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5219 else
5220 s_return (S_F); 5675 s_return (S_F);
5221 5676
5222 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5223 /* 5678 /*
5224 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5225 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
5681 * (schmorp) well, obviously not, fix? TODO
5226 */ 5682 */
5227 s_retbool (is_closure (a)); 5683 s_retbool (is_closure (a));
5228 5684
5229 case OP_MACROP: /* macro? */ 5685 case OP_MACROP: /* macro? */
5230 s_retbool (is_macro (a)); 5686 s_retbool (is_macro (a));
… …
5235 5691
5236/* 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 */
5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5238 5694
5239typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5240static int 5696
5697ecb_hot static int
5241tst_any (pointer p) 5698tst_any (pointer p)
5242{ 5699{
5243 return 1; 5700 return 1;
5244} 5701}
5245 5702
5246static int 5703ecb_hot static int
5247tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5248{ 5705{
5249 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250} 5707}
5251 5708
5252static int 5709ecb_hot static int
5253tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5254{ 5711{
5255 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5256} 5713}
5257 5714
… …
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h" 5758#include "opdefines.h"
5302#undef OP_DEF 5759#undef OP_DEF
5303; 5760;
5304 5761
5305static const char * 5762ecb_cold static const char *
5306opname (int idx) 5763opname (int idx)
5307{ 5764{
5308 const char *name = opnames; 5765 const char *name = opnames;
5309 5766
5310 /* 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? */
… …
5312 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5313 5770
5314 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5315} 5772}
5316 5773
5317static const char * 5774ecb_cold static const char *
5318procname (pointer x) 5775procname (pointer x)
5319{ 5776{
5320 return opname (procnum (x)); 5777 return opname (procnum (x));
5321} 5778}
5322 5779
… …
5342#undef OP_DEF 5799#undef OP_DEF
5343 {0} 5800 {0}
5344}; 5801};
5345 5802
5346/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5347static void ecb_hot 5804ecb_hot static void
5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5349{ 5806{
5350 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5351 5808
5352 for (;;) 5809 for (;;)
… …
5435 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))
5436 return; 5893 return;
5437 5894
5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5895 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5439 { 5896 {
5440 xwrstr ("No memory!\n"); 5897 putstr (SCHEME_A_ "No memory!\n");
5441 return; 5898 return;
5442 } 5899 }
5443 } 5900 }
5444} 5901}
5445 5902
5446/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5447 5904
5448static void 5905ecb_cold static void
5449assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5450{ 5907{
5451 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5452 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5453} 5910}
5454 5911
5455static void 5912ecb_cold static void
5456assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5457{ 5914{
5458 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5459 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5460 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5468 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5469 return y; 5926 return y;
5470} 5927}
5471 5928
5472/* 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! */
5473static int 5930ecb_hot static int
5474syntaxnum (pointer p) 5931syntaxnum (pointer p)
5475{ 5932{
5476 const char *s = strvalue (car (p)); 5933 const char *s = strvalue (p);
5477 5934
5478 switch (strlength (car (p))) 5935 switch (strlength (p))
5479 { 5936 {
5480 case 2: 5937 case 2:
5481 if (s[0] == 'i') 5938 if (s[0] == 'i')
5482 return OP_IF0; /* if */ 5939 return OP_IF0; /* if */
5483 else 5940 else
… …
5557 6014
5558ecb_cold int 6015ecb_cold int
5559scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5560{ 6017{
5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5562 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));
5563 6025
5564 num_set_fixnum (num_zero, 1); 6026 num_set_fixnum (num_zero, 1);
5565 num_set_ivalue (num_zero, 0); 6027 num_set_ivalue (num_zero, 0);
5566 num_set_fixnum (num_one, 1); 6028 num_set_fixnum (num_one, 1);
5567 num_set_ivalue (num_one, 1); 6029 num_set_ivalue (num_one, 1);
… …
5579 SCHEME_V->save_inport = NIL; 6041 SCHEME_V->save_inport = NIL;
5580 SCHEME_V->loadport = NIL; 6042 SCHEME_V->loadport = NIL;
5581 SCHEME_V->nesting = 0; 6043 SCHEME_V->nesting = 0;
5582 SCHEME_V->interactive_repl = 0; 6044 SCHEME_V->interactive_repl = 0;
5583 6045
5584 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6046 if (!alloc_cellseg (SCHEME_A))
5585 { 6047 {
5586#if USE_ERROR_CHECKING 6048#if USE_ERROR_CHECKING
5587 SCHEME_V->no_memory = 1; 6049 SCHEME_V->no_memory = 1;
5588 return 0; 6050 return 0;
5589#endif 6051#endif
5590 } 6052 }
5591 6053
5592 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5593 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5594 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5595 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5596 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5597 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5598 6061
5599 /* init NIL */ 6062 /* init NIL */
5600 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5601 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5602 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5603 /* init T */ 6066 /* init T */
5604 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5605 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5606 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5607 /* init F */ 6070 /* init F */
5608 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5609 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5610 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5611 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5612 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5613 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5614 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5615 /* init sink */ 6078 /* init sink */
5616 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5617 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5618 6081
5619 /* init c_nest */ 6082 /* init c_nest */
5620 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5621 6084
5622 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5623 /* init global_env */ 6086 /* init global_env */
5624 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5625 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5626 /* init else */ 6089 /* init else */
5627 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5628 new_slot_in_env (SCHEME_A_ x, S_T);
5629 6091
5630 { 6092 {
5631 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5632 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5633 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5657 6119
5658 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5659} 6121}
5660 6122
5661#if USE_PORTS 6123#if USE_PORTS
5662void 6124ecb_cold void
5663scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5664{ 6126{
5665 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5666} 6128}
5667 6129
5668void 6130ecb_cold void
5669scheme_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)
5670{ 6132{
5671 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);
5672} 6134}
5673 6135
5674void 6136ecb_cold void
5675scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5676{ 6138{
5677 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5678} 6140}
5679 6141
5680void 6142ecb_cold void
5681scheme_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)
5682{ 6144{
5683 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);
5684} 6146}
5685#endif 6147#endif
5686 6148
5687void 6149ecb_cold void
5688scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5689{ 6151{
5690 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5691} 6153}
5692 6154
… …
5724 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5725 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5726 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5727 6189
5728 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5729 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5730 6192
5731#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5732 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5733 {
5734 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5735 { 6196 {
5736 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5737 6198
5738 if (fname) 6199 if (fname)
5739 free (fname); 6200 free (fname);
5740 } 6201 }
5741 }
5742#endif 6202#endif
5743} 6203}
5744 6204
5745void 6205ecb_cold void
5746scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5747{ 6207{
5748 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5749} 6209}
5750 6210
5751void 6211ecb_cold void
5752scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5753{ 6213{
5754 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5755 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5756 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5757 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5758 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5759 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5760#if USE_PORTS
5761 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5762#endif
5763 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5764 6222
5765#if USE_PORTS
5766 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5767 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5768#endif
5769 6225
5770#if USE_PORTS 6226#if USE_PORTS
5771#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5772 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5773 6229
… …
5777#endif 6233#endif
5778 6234
5779 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5780 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5781 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5782 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5783 6240
5784 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5785 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5786} 6243}
5787 6244
5788void 6245ecb_cold void
5789scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5790{ 6247{
6248#if USE_PORTs
5791 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5792 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5793 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5794 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5795 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 */
5796 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);
5797 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5798#if USE_PORTS
5799 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5800#endif
5801 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5802 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5803 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5804 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5805 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5806 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5807 6263
5808 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5809 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5810} 6269}
5811 6270
5812void 6271ecb_cold void
5813scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5814{ 6273{
5815 pointer x; 6274 pointer x;
5816 6275
5817 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5822 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5823} 6282}
5824 6283
5825#if !STANDALONE 6284#if !STANDALONE
5826 6285
5827void 6286ecb_cold void
5828scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5829{ 6288{
5830 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));
5831} 6290}
5832 6291
5833void 6292ecb_cold void
5834scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5835{ 6294{
5836 int i; 6295 int i;
5837 6296
5838 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5839 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5840} 6299}
5841 6300
5842pointer 6301ecb_cold pointer
5843scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5844{ 6303{
5845 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));
5846} 6305}
5847 6306
5848void 6307ecb_cold void
5849save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5850{ 6309{
5851 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5852 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5853 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5857 /* 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
5858 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5859 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5860} 6319}
5861 6320
5862void 6321ecb_cold void
5863restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5864{ 6323{
5865 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5866 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5867 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5868 /* Pop */ 6327 /* Pop */
5869 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5870} 6329}
5871 6330
5872/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5873pointer 6332ecb_cold pointer
5874scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5875{ 6334{
5876 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5877 6336
5878 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5885 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5886 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5887 return SCHEME_V->value; 6346 return SCHEME_V->value;
5888} 6347}
5889 6348
5890pointer 6349ecb_cold pointer
5891scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5892{ 6351{
5893 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5894 6353
5895 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
5907 6366
5908/* ========== Main ========== */ 6367/* ========== Main ========== */
5909 6368
5910#if STANDALONE 6369#if STANDALONE
5911 6370
5912int 6371ecb_cold int
5913main (int argc, char **argv) 6372main (int argc, char **argv)
5914{ 6373{
5915# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
5916 scheme ssc; 6375 scheme ssc;
5917 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
5919# endif 6378# endif
5920 int fin; 6379 int fin;
5921 char *file_name = InitFile; 6380 char *file_name = InitFile;
5922 int retcode; 6381 int retcode;
5923 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
6384 system ("ps v $PPID");
6385#endif
5924 6386
5925 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5926 { 6388 {
5927 xwrstr ("Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5928 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5929 xwrstr ("followed by\n"); 6391 putstr (SCHEME_A_ "followed by\n");
5930 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6392 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5931 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6393 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5932 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6394 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5933 xwrstr ("Use - as filename for stdin.\n"); 6395 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5934 return 1; 6396 return 1;
5935 } 6397 }
5936 6398
5937 if (!scheme_init (SCHEME_A)) 6399 if (!scheme_init (SCHEME_A))
5938 { 6400 {
5939 xwrstr ("Could not initialize!\n"); 6401 putstr (SCHEME_A_ "Could not initialize!\n");
5940 return 2; 6402 return 2;
5941 } 6403 }
5942 6404
5943# if USE_PORTS 6405# if USE_PORTS
5944 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6406 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5957 } 6419 }
5958#endif 6420#endif
5959 6421
5960 do 6422 do
5961 { 6423 {
5962#if USE_PORTS
5963 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
5964 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
5965 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)
5966 { 6427 {
5967 pointer args = NIL; 6428 pointer args = NIL;
… …
5985 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);
5986 6447
5987 } 6448 }
5988 else 6449 else
5989 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
5990#endif
5991 6451
5992 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
5993 { 6453 {
5994 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');
5995 } 6457 }
5996 else 6458 else
5997 { 6459 {
5998 if (isfile) 6460 if (isfile)
5999 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
6000 else 6462 else
6001 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
6002 6464
6003#if USE_PORTS
6004 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
6005 { 6466 {
6006 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
6007 { 6468 {
6008 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');
6009 } 6472 }
6010 6473
6011 if (isfile) 6474 if (isfile)
6012 close (fin); 6475 close (fin);
6013 } 6476 }
6014#endif
6015 } 6477 }
6016 6478
6017 file_name = *argv++; 6479 file_name = *argv++;
6018 } 6480 }
6019 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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