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

Diff Legend

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