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.27 by root, Sat Nov 28 05:13:08 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, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276INTERFACE uint32_t vector_length (pointer vec);
277INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
278INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
279
280INTERFACE uint32_t
281vector_length (pointer vec)
282{
283 return vec->object.vector.length;
284}
285 302
286INTERFACE int 303INTERFACE int
287is_integer (pointer p) 304is_integer (pointer p)
288{ 305{
289 return type (p) == T_INTEGER; 306 return type (p) == T_INTEGER;
… …
312string_value (pointer p) 329string_value (pointer p)
313{ 330{
314 return strvalue (p); 331 return strvalue (p);
315} 332}
316 333
317#define ivalue_unchecked(p) (p)->object.ivalue 334#define ivalue_unchecked(p) CELL(p)->object.ivalue
318#define set_ivalue(p,v) (p)->object.ivalue = (v) 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
319 336
320#if USE_REAL 337#if USE_REAL
321#define rvalue_unchecked(p) (p)->object.rvalue 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
322#define set_rvalue(p,v) (p)->object.rvalue = (v) 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
323#else 340#else
324#define rvalue_unchecked(p) (p)->object.ivalue 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
325#define set_rvalue(p,v) (p)->object.ivalue = (v) 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
326#endif 343#endif
327 344
328INTERFACE long 345INTERFACE long
329charvalue (pointer p) 346charvalue (pointer p)
330{ 347{
331 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
332} 349}
333 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
334INTERFACE int 353INTERFACE int
335is_port (pointer p) 354is_port (pointer p)
336{ 355{
337 return type (p) == T_PORT; 356 return type (p) == T_PORT;
338} 357}
339 358
340INTERFACE int 359INTERFACE int
341is_inport (pointer p) 360is_inport (pointer p)
342{ 361{
343 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
344} 363}
345 364
346INTERFACE int 365INTERFACE int
347is_outport (pointer p) 366is_outport (pointer p)
348{ 367{
349 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
350} 369}
351 370
352INTERFACE int 371INTERFACE int
353is_pair (pointer p) 372is_pair (pointer p)
354{ 373{
355 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
356} 375}
357 376
358#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
359#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
360 379
361static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
362static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
363static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
364static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
365 384
366static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
367static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
368static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
369 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
370INTERFACE void 391INTERFACE void
371set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
372{ 393{
373 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
374} 395}
375 396
376INTERFACE void 397INTERFACE void
377set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
378{ 399{
379 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
380} 401}
381 402
382INTERFACE pointer 403INTERFACE pointer
383pair_car (pointer p) 404pair_car (pointer p)
384{ 405{
… …
398} 419}
399 420
400INTERFACE char * 421INTERFACE char *
401symname (pointer p) 422symname (pointer p)
402{ 423{
403 return strvalue (car (p)); 424 return strvalue (p);
404} 425}
405 426
406#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
407SCHEME_EXPORT int 430SCHEME_EXPORT int
408hasprop (pointer p) 431hasprop (pointer p)
409{ 432{
410 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
411} 434}
412
413# define symprop(p) cdr(p)
414#endif 435#endif
415 436
416INTERFACE int 437INTERFACE int
417is_syntax (pointer p) 438is_syntax (pointer p)
418{ 439{
… …
432} 453}
433 454
434INTERFACE char * 455INTERFACE char *
435syntaxname (pointer p) 456syntaxname (pointer p)
436{ 457{
437 return strvalue (car (p)); 458 return strvalue (p);
438} 459}
439 460
440#define procnum(p) ivalue_unchecked (p) 461#define procnum(p) ivalue_unchecked (p)
441static const char *procname (pointer x); 462static const char *procname (pointer x);
442 463
… …
490 511
491#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
492#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
493#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
494 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
495#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
496#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
497#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
498 525
499INTERFACE int 526INTERFACE int
500is_immutable (pointer p) 527is_immutable (pointer p)
501{ 528{
502 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
514 proper list: length 541 proper list: length
515 circular list: -1 542 circular list: -1
516 not even a pair: -2 543 not even a pair: -2
517 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
518*/ 545*/
519INTERFACE int 546ecb_hot INTERFACE int
520list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
521{ 548{
522 int i = 0; 549 int i = 0;
523 pointer slow, fast; 550 pointer slow, fast;
524 551
… …
563{ 590{
564 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
565} 592}
566 593
567#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
568ecb_inline int 596ecb_inline int
569Cisalpha (int c) 597Cisalpha (int c)
570{ 598{
571 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
572} 600}
… …
630 "gs", 658 "gs",
631 "rs", 659 "rs",
632 "us" 660 "us"
633}; 661};
634 662
635static int 663ecb_cold static int
636is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
637{ 665{
638 int i; 666 int i;
639 667
640 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
658#endif 686#endif
659 687
660static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
661static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
662static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
663ecb_inline int is_one_of (char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
664static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
665ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
666static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
667static int count_consecutive_cells (pointer x, int needed);
668static 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);
669static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
670static 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);
671static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
672static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
673static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
674 701
702static pointer mk_port (SCHEME_P_ port *p);
703
675#if USE_PORTS 704#if USE_PORTS
676static pointer mk_port (SCHEME_P_ port *p);
677static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
678static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
679static 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);
680static 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);
681static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
682static 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);
683static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
684#endif 712#endif
713
685static void mark (pointer a); 714static void mark (pointer a);
686static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
687static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
688static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
689static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
690static char *readstr_upto (SCHEME_P_ char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
691static pointer readstrexp (SCHEME_P); 720static pointer readstrexp (SCHEME_P_ char delim);
692ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
693static int token (SCHEME_P); 722static int token (SCHEME_P);
694static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
695static 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);
696static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
697static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
863 } 892 }
864 893
865 return ret; 894 return ret;
866} 895}
867 896
868#if USE_MATH
869
870/* Round to nearest. Round to even if midway */
871static double
872round_per_R5RS (double x)
873{
874 double fl = floor (x);
875 double ce = ceil (x);
876 double dfl = x - fl;
877 double dce = ce - x;
878
879 if (dfl > dce)
880 return ce;
881 else if (dfl < dce)
882 return fl;
883 else
884 {
885 if (fmod (fl, 2) == 0) /* I imagine this holds */
886 return fl;
887 else
888 return ce;
889 }
890}
891#endif
892
893static int 897static int
894is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
895{ 899{
896 return x == 0; 900 return x == 0;
897#if 0 901#if 0
… …
902#endif 906#endif
903#endif 907#endif
904} 908}
905 909
906/* allocate new cell segment */ 910/* allocate new cell segment */
907static int 911ecb_cold static int
908alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
909{ 913{
910 pointer newp; 914 struct cell *newp;
911 pointer last; 915 struct cell *last;
912 pointer p; 916 struct cell *p;
913 char *cp; 917 char *cp;
914 long i; 918 long i;
915 int k; 919 int k;
916 920
917 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
918 segsize <<= 1; 922 segsize <<= 1;
919 923
920 for (k = 0; k < n; k++)
921 {
922 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
923 return k;
924
925 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
926 925
927 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
928 return k; 927 return k;
929 928
930 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
931 SCHEME_V->alloc_seg[i] = cp;
932 930
933 /* insert new segment in address order */ 931 newp = (struct cell *)cp;
934 newp = (pointer)cp;
935 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
936 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
937
938 //TODO: insert, not swap
939 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
940 {
941 p = SCHEME_V->cell_seg[i];
942 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
943 SCHEME_V->cell_seg[i - 1] = p;
944
945 k = SCHEME_V->cell_segsize[i];
946 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
947 SCHEME_V->cell_segsize[i - 1] = k;
948
949 --i;
950 }
951
952 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
953 last = newp + segsize - 1; 935 last = newp + segsize - 1;
954 936
955 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
956 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
957 set_typeflag (p, T_PAIR); 941 set_typeflag (cp, T_PAIR);
958 set_car (p, NIL); 942 set_car (cp, NIL);
959 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
960 } 944 }
961 945
962 /* insert new cells in address order on free list */
963 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
964 {
965 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
966 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
967 }
968 else
969 {
970 p = SCHEME_V->free_cell;
971 948
972 while (cdr (p) != NIL && newp > cdr (p))
973 p = cdr (p);
974
975 set_cdr (last, cdr (p));
976 set_cdr (p, newp);
977 }
978 }
979
980 return n; 949 return 1;
981} 950}
982 951
983/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
984ecb_inline pointer 953ecb_inline pointer
985get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
989 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
990 return S_SINK; 959 return S_SINK;
991 960
992 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
993 { 962 {
994 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;
995 964
996 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
997 966
998 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)
999 { 968 {
1000 /* 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 */
1001 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
1002 { 971 {
1003#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
1004 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
1005 return S_SINK; 974 return S_SINK;
1006#endif 975#endif
… …
1018 } 987 }
1019} 988}
1020 989
1021/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
1022 Tehom */ 991 Tehom */
1023 992ecb_hot static void
1024static void
1025push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1026{ 994{
1027 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1028 996
1029 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
1031 set_car (holder, recent); 999 set_car (holder, recent);
1032 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
1033 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
1034} 1002}
1035 1003
1036static pointer 1004ecb_hot static pointer
1037get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1038{ 1006{
1039 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1040 1008
1041 /* 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
… …
1050} 1018}
1051 1019
1052static pointer 1020static pointer
1053get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1054{ 1022{
1055 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1056 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
1057 1025
1058 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
1059 return S_SINK; 1027 return S_SINK;
1060 1028
1061 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1062 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1063 1031
1064 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1065 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1066 fill_vector (v, init); 1034 fill_vector (v, 0, init);
1067 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1068 1036
1069 return v; 1037 return v;
1070} 1038}
1071 1039
… …
1079static void 1047static void
1080check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1081{ 1049{
1082 /* 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. */
1083 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1084 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1085 1053
1086 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1087 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1088} 1056}
1089 1057
1090static void 1058static void
1091check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1092{ 1060{
… …
1098#endif 1066#endif
1099 1067
1100/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1101 1069
1102/* get new cons cell */ 1070/* get new cons cell */
1103pointer 1071ecb_hot static pointer
1104xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1105{ 1073{
1106 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1107 1075
1108 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1109
1110 if (immutable)
1111 setimmutable (x);
1112 1077
1113 set_car (x, a); 1078 set_car (x, a);
1114 set_cdr (x, b); 1079 set_cdr (x, b);
1115 1080
1116 return x; 1081 return x;
1117} 1082}
1118 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
1119/* ========== oblist implementation ========== */ 1104/* ========== oblist implementation ========== */
1120 1105
1121#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1122 1107
1108static int
1123static int hash_fn (const char *key, int table_size); 1109hash_fn (const char *key, int table_size)
1110{
1111 const unsigned char *p = (unsigned char *)key;
1112 uint32_t hash = 2166136261U;
1124 1113
1114 while (*p)
1115 hash = (hash ^ *p++) * 16777619;
1116
1117 return hash % table_size;
1118}
1119
1125static pointer 1120ecb_cold static pointer
1126oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1127{ 1122{
1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1129} 1124}
1130 1125
1131/* returns the new symbol */ 1126/* returns the new symbol */
1132static pointer 1127ecb_cold static pointer
1133oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1134{ 1129{
1135 int location; 1130 pointer x = generate_symbol (SCHEME_A_ name);
1136
1137 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1138 set_typeflag (x, T_SYMBOL);
1139 setimmutable (car (x));
1140
1141 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1142 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1143 return x; 1133 return x;
1144} 1134}
1145 1135
1146ecb_inline pointer 1136ecb_cold static pointer
1147oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1148{ 1138{
1149 int location; 1139 int location;
1150 pointer x; 1140 pointer x;
1151 char *s; 1141 char *s;
1152 1142
1153 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1143 location = hash_fn (name, veclength (SCHEME_V->oblist));
1154 1144
1155 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1145 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1156 { 1146 {
1157 s = symname (car (x)); 1147 s = symname (car (x));
1158 1148
1159 /* case-insensitive, per R5RS section 2 */ 1149 /* case-insensitive, per R5RS section 2 */
1160 if (stricmp (name, s) == 0) 1150 if (stricmp (name, s) == 0)
… …
1162 } 1152 }
1163 1153
1164 return NIL; 1154 return NIL;
1165} 1155}
1166 1156
1167static pointer 1157ecb_cold static pointer
1168oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1169{ 1159{
1170 int i; 1160 int i;
1171 pointer x; 1161 pointer x;
1172 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
1173 1163
1174 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1175 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1165 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1176 ob_list = cons (x, ob_list); 1166 ob_list = cons (x, ob_list);
1177 1167
1178 return ob_list; 1168 return ob_list;
1179} 1169}
1180 1170
1181#else 1171#else
1182 1172
1183static pointer 1173ecb_cold static pointer
1184oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1185{ 1175{
1186 return NIL; 1176 return NIL;
1187} 1177}
1188 1178
1189ecb_inline pointer 1179ecb_cold static pointer
1190oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1191{ 1181{
1192 pointer x; 1182 pointer x;
1193 char *s; 1183 char *s;
1194 1184
… …
1203 1193
1204 return NIL; 1194 return NIL;
1205} 1195}
1206 1196
1207/* returns the new symbol */ 1197/* returns the new symbol */
1208static pointer 1198ecb_cold static pointer
1209oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1210{ 1200{
1211 pointer x; 1201 pointer x = generate_symbol (SCHEME_A_ name);
1212
1213 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1214 set_typeflag (x, T_SYMBOL);
1215 setimmutable (car (x));
1216 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1217 return x; 1203 return x;
1218} 1204}
1219 1205
1220static pointer 1206ecb_cold static pointer
1221oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1222{ 1208{
1223 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1224} 1210}
1225 1211
1226#endif 1212#endif
1227 1213
1228#if USE_PORTS
1229static pointer 1214ecb_cold static pointer
1230mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1231{ 1216{
1232 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1233 1218
1234 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1235 x->object.port = p; 1220 set_port (x, p);
1236 1221
1237 return x; 1222 return x;
1238} 1223}
1239#endif
1240 1224
1241pointer 1225ecb_cold pointer
1242mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1243{ 1227{
1244 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1245 1229
1246 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1247 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1248 1232
1249 return x; 1233 return x;
1250} 1234}
1251 1235
1252INTERFACE pointer 1236INTERFACE pointer
1253mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1254{ 1238{
1255 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1256 1240
1257 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1258 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1259 1243
1260 return x; 1244 return x;
1261} 1245}
1262 1246
1263/* get number atom (integer) */ 1247/* get number atom (integer) */
1264INTERFACE pointer 1248INTERFACE pointer
1265mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1266{ 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 {
1267 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1268 1262
1269 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 */
1270 set_ivalue (x, n); 1265 set_ivalue (x, n);
1271 1266
1267 *pp = x;
1268 }
1269
1272 return x; 1270 return *pp;
1273} 1271}
1274 1272
1275INTERFACE pointer 1273INTERFACE pointer
1276mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1277{ 1275{
1278#if USE_REAL 1276#if USE_REAL
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1278
1281 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1282 set_rvalue (x, n); 1280 set_rvalue (x, n);
1283 1281
1284 return x; 1282 return x;
1285#else 1283#else
1286 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1310 SCHEME_V->no_memory = 1; 1308 SCHEME_V->no_memory = 1;
1311 return SCHEME_V->strbuff; 1309 return SCHEME_V->strbuff;
1312 } 1310 }
1313 1311
1314 if (str) 1312 if (str)
1315 { 1313 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1316 int l = strlen (str);
1317
1318 if (l > len_str)
1319 l = len_str;
1320
1321 memcpy (q, str, l);
1322 q[l] = 0;
1323 }
1324 else 1314 else
1325 {
1326 memset (q, fill, len_str); 1315 memset (q, fill, len_str);
1316
1327 q[len_str] = 0; 1317 q[len_str] = 0;
1328 }
1329 1318
1330 return q; 1319 return q;
1331} 1320}
1332 1321
1333INTERFACE pointer 1322INTERFACE pointer
… …
1347 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1336 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1348 1337
1349 set_typeflag (x, T_STRING | T_ATOM); 1338 set_typeflag (x, T_STRING | T_ATOM);
1350 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1339 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1351 strlength (x) = len; 1340 strlength (x) = len;
1341
1352 return x; 1342 return x;
1353} 1343}
1354 1344
1355INTERFACE pointer 1345INTERFACE pointer
1356mk_string (SCHEME_P_ const char *str) 1346mk_string (SCHEME_P_ const char *str)
… …
1363{ 1353{
1364 return get_vector_object (SCHEME_A_ len, NIL); 1354 return get_vector_object (SCHEME_A_ len, NIL);
1365} 1355}
1366 1356
1367INTERFACE void 1357INTERFACE void
1368fill_vector (pointer vec, pointer obj) 1358fill_vector (pointer vec, uint32_t start, pointer obj)
1369{ 1359{
1370 int i; 1360 int i;
1371 1361
1372 for (i = 0; i < vec->object.vector.length; i++) 1362 for (i = start; i < veclength (vec); i++)
1373 vecvalue (vec)[i] = obj; 1363 vecvalue (vec)[i] = obj;
1374} 1364}
1375 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);
1373}
1374
1376INTERFACE pointer 1375INTERFACE pointer
1377vector_elem (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1378{ 1377{
1379 return vecvalue(vec)[ielem]; 1378 return vecvalue(vec)[ielem];
1380} 1379}
1381 1380
1382INTERFACE void 1381INTERFACE void
1383set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1382vector_set (pointer vec, uint32_t ielem, pointer a)
1384{ 1383{
1385 vecvalue(vec)[ielem] = a; 1384 vecvalue(vec)[ielem] = a;
1386} 1385}
1387 1386
1388/* get new symbol */ 1387/* get new symbol */
… …
1396 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1397 1396
1398 return x; 1397 return x;
1399} 1398}
1400 1399
1401INTERFACE pointer 1400ecb_cold INTERFACE pointer
1402gensym (SCHEME_P) 1401gensym (SCHEME_P)
1403{ 1402{
1404 pointer x; 1403 pointer x;
1405
1406 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1407 {
1408 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1409 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1410 1406
1411 /* first check oblist */ 1407 return generate_symbol (SCHEME_A_ name);
1412 x = oblist_find_by_name (SCHEME_A_ name); 1408}
1413 1409
1414 if (x == NIL) 1410static int
1415 { 1411is_gensym (SCHEME_P_ pointer x)
1416 x = oblist_add_by_name (SCHEME_A_ name); 1412{
1417 return x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1418 }
1419 }
1420
1421 return NIL;
1422} 1414}
1423 1415
1424/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1425static pointer 1417ecb_cold static pointer
1426mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1427{ 1419{
1428 char c, *p; 1420 char c, *p;
1429 int has_dec_point = 0; 1421 int has_dec_point = 0;
1430 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1501 1493
1502 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1503} 1495}
1504 1496
1505/* make constant */ 1497/* make constant */
1506static pointer 1498ecb_cold static pointer
1507mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1508{ 1500{
1509 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1510 return S_T; 1502 return S_T;
1511 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1512 return S_F; 1504 return S_F;
1513 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1514 { 1506 {
1515 int c; 1507 int c;
1516 1508
1509 // TODO: optimise
1517 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1518 c = ' '; 1511 c = ' ';
1519 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1520 c = '\n'; 1513 c = '\n';
1521 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1522 c = '\r'; 1515 c = '\r';
1523 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1524 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;
1525 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1526 { 1529 {
1527 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1528 1531
1529 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1554 return NIL; 1557 return NIL;
1555 } 1558 }
1556} 1559}
1557 1560
1558/* ========== 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}
1559 1581
1560/*-- 1582/*--
1561 * 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,
1562 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1563 * for marking. 1585 * for marking.
1564 * 1586 *
1565 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1566 * 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
1567 * word of context in the vector 1589 * word of context in the vector
1568 */ 1590 */
1569static void 1591ecb_hot static void
1570mark (pointer a) 1592mark (pointer a)
1571{ 1593{
1572 pointer t, q, p; 1594 pointer t, q, p;
1573 1595
1574 t = 0; 1596 t = 0;
… …
1578 1600
1579 if (ecb_expect_false (is_vector (p))) 1601 if (ecb_expect_false (is_vector (p)))
1580 { 1602 {
1581 int i; 1603 int i;
1582 1604
1583 for (i = 0; i < p->object.vector.length; i++) 1605 for (i = 0; i < veclength (p); i++)
1584 mark (vecvalue (p)[i]); 1606 mark (vecvalue (p)[i]);
1585 } 1607 }
1586 1608
1587 if (is_atom (p)) 1609 if (is_atom (p))
1588 goto E6; 1610 goto E6;
… …
1631 p = q; 1653 p = q;
1632 goto E6; 1654 goto E6;
1633 } 1655 }
1634} 1656}
1635 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
1636/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1637static void 1701ecb_cold static void
1638gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1639{ 1703{
1640 pointer p;
1641 int i; 1704 int i;
1642 1705
1643 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1644 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1645 1708
… …
1661 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1662 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1663 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1664 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1665 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
1666 /* mark variables a, b */ 1736 /* mark variables a, b */
1667 mark (a); 1737 mark (a);
1668 mark (b); 1738 mark (b);
1669 1739
1670 /* garbage collect */ 1740 /* garbage collect */
1671 clrmark (NIL); 1741 clrmark (NIL);
1672 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1673 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1674 1744
1675 /* free-list is kept sorted by address so as to maintain consecutive
1676 ranges, if possible, for use with vectors. Here we scan the cells
1677 (which are also kept sorted by address) downwards to build the
1678 free-list in sorted order.
1679 */
1680 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1681 {
1682 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1683
1684 while (--p >= SCHEME_V->cell_seg[i])
1685 {
1686 if (is_mark (p))
1687 clrmark (p);
1688 else
1689 {
1690 /* reclaim cell */
1691 if (typeflag (p) != T_PAIR)
1692 {
1693 finalize_cell (SCHEME_A_ p);
1694 set_typeflag (p, T_PAIR);
1695 set_car (p, NIL);
1696 }
1697
1698 ++SCHEME_V->fcells;
1699 set_cdr (p, SCHEME_V->free_cell);
1700 SCHEME_V->free_cell = p;
1701 }
1702 }
1703 }
1704
1705 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1706 { 1746 putstr (SCHEME_A_ "freeing...");
1707 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1708 }
1709}
1710 1747
1711static void 1748 gc_free (SCHEME_A);
1712finalize_cell (SCHEME_P_ pointer a)
1713{
1714 /* TODO, fast bitmap check? */
1715 if (is_string (a))
1716 free (strvalue (a));
1717 else if (is_vector (a))
1718 free (vecvalue (a));
1719#if USE_PORTS
1720 else if (is_port (a))
1721 {
1722 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1723 port_close (SCHEME_A_ a, port_input | port_output);
1724
1725 free (a->object.port);
1726 }
1727#endif
1728} 1749}
1729 1750
1730/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1731 1752
1732static int 1753ecb_cold static int
1733file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1734{ 1755{
1735#if USE_PORTS
1736 int fin; 1756 int fin;
1737 1757
1738 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1739 return 0; 1759 return 0;
1740 1760
… …
1746 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1747 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;
1748 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;
1749 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;
1750 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1751 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);
1752 1772
1753#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1754 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;
1755 1775
1756 if (fname) 1776 if (fname)
1757 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);
1758#endif 1778#endif
1759 } 1779 }
1760 1780
1761 return fin >= 0; 1781 return fin >= 0;
1762
1763#else
1764 return 1;
1765#endif
1766} 1782}
1767 1783
1768static void 1784ecb_cold static void
1769file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1770{ 1786{
1771 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1772 { 1788 {
1773 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1774#if USE_PORTS 1790#if USE_PORTS
1775 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1776#endif 1792#endif
1777 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1778 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);
1779 } 1795 }
1780} 1796}
1781 1797
1782static int 1798ecb_cold static int
1783file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1784{ 1800{
1785#if USE_PORTS 1801#if USE_PORTS
1786 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1787 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1788 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1789#else 1805#else
1790 return 0; 1806 return 0;
1791#endif 1807#endif
1792} 1808}
1793 1809
1794#if USE_PORTS 1810#if USE_PORTS
1795static port * 1811ecb_cold static port *
1796port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1797{ 1813{
1798 int fd; 1814 int fd;
1799 int flags; 1815 int flags;
1800 char *rw; 1816 char *rw;
… …
1823# endif 1839# endif
1824 1840
1825 return pt; 1841 return pt;
1826} 1842}
1827 1843
1828static pointer 1844ecb_cold static pointer
1829port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1830{ 1846{
1831 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1832 1848
1833 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1834 return NIL; 1850 return NIL;
1835 1851
1836 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1837} 1853}
1838 1854
1839static port * 1855ecb_cold static port *
1840port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1841{ 1857{
1842 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1843 1859
1844 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1849 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1850 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1851 return pt; 1867 return pt;
1852} 1868}
1853 1869
1854static pointer 1870ecb_cold static pointer
1855port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1856{ 1872{
1857 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1858 1874
1859 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1860 return NIL; 1876 return NIL;
1861 1877
1862 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1863} 1879}
1864 1880
1865static port * 1881ecb_cold static port *
1866port_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)
1867{ 1883{
1868 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1869 1885
1870 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1876 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1877 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1878 return pt; 1894 return pt;
1879} 1895}
1880 1896
1881static pointer 1897ecb_cold static pointer
1882port_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)
1883{ 1899{
1884 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);
1885 1901
1886 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1889 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1890} 1906}
1891 1907
1892# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1893 1909
1894static port * 1910ecb_cold static port *
1895port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1896{ 1912{
1897 char *start; 1913 char *start;
1898 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1899 1915
… …
1913 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1914 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1915 return pt; 1931 return pt;
1916} 1932}
1917 1933
1918static pointer 1934ecb_cold static pointer
1919port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1920{ 1936{
1921 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1922 1938
1923 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1924 return NIL; 1940 return NIL;
1925 1941
1926 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1927} 1943}
1928 1944
1929static void 1945ecb_cold static void
1930port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1931{ 1947{
1932 port *pt = p->object.port; 1948 port *pt = port (p);
1933 1949
1934 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1935 1951
1936 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1937 { 1953 {
… …
1954 } 1970 }
1955} 1971}
1956#endif 1972#endif
1957 1973
1958/* get new character from input file */ 1974/* get new character from input file */
1959static int 1975ecb_cold static int
1960inchar (SCHEME_P) 1976inchar (SCHEME_P)
1961{ 1977{
1962 int c; 1978 int c;
1963 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1964
1965 pt = SCHEME_V->inport->object.port;
1966 1980
1967 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1968 return EOF; 1982 return EOF;
1969 1983
1970 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1980 } 1994 }
1981 1995
1982 return c; 1996 return c;
1983} 1997}
1984 1998
1985static int ungot = -1; 1999ecb_cold static int
1986
1987static int
1988basic_inchar (port *pt) 2000basic_inchar (port *pt)
1989{ 2001{
1990#if USE_PORTS
1991 if (pt->unget != -1) 2002 if (pt->unget != -1)
1992 { 2003 {
1993 int r = pt->unget; 2004 int r = pt->unget;
1994 pt->unget = -1; 2005 pt->unget = -1;
1995 return r; 2006 return r;
1996 } 2007 }
1997 2008
2009#if USE_PORTS
1998 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1999 { 2011 {
2000 char c; 2012 char c;
2001 2013
2002 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
2010 return EOF; 2022 return EOF;
2011 else 2023 else
2012 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
2013 } 2025 }
2014#else 2026#else
2015 if (ungot == -1)
2016 {
2017 char c; 2027 char c;
2018 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
2019 return EOF; 2030 return EOF;
2020 2031
2021 ungot = c;
2022 }
2023
2024 {
2025 int r = ungot;
2026 ungot = -1;
2027 return r; 2032 return c;
2028 }
2029#endif 2033#endif
2030} 2034}
2031 2035
2032/* back character to input buffer */ 2036/* back character to input buffer */
2033static void 2037ecb_cold static void
2034backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2035{ 2039{
2036#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2037 port *pt;
2038 2041
2039 if (c == EOF) 2042 if (c == EOF)
2040 return; 2043 return;
2041 2044
2042 pt = SCHEME_V->inport->object.port;
2043 pt->unget = c; 2045 pt->unget = c;
2044#else
2045 if (c == EOF)
2046 return;
2047
2048 ungot = c;
2049#endif
2050} 2046}
2051 2047
2052#if USE_PORTS 2048#if USE_PORTS
2053static int 2049ecb_cold static int
2054realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2055{ 2051{
2056 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2057 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;
2058 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2071 else 2067 else
2072 return 0; 2068 return 0;
2073} 2069}
2074#endif 2070#endif
2075 2071
2076INTERFACE void 2072ecb_cold static void
2077putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2078{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2079#if USE_PORTS 2077#if USE_PORTS
2080 port *pt = SCHEME_V->outport->object.port;
2081
2082 if (pt->kind & port_file)
2083 write (pt->rep.stdio.file, s, strlen (s));
2084 else
2085 for (; *s; s++)
2086 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2087 *pt->rep.string.curr++ = *s;
2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2089 *pt->rep.string.curr++ = *s;
2090
2091#else
2092 xwrstr (s);
2093#endif
2094}
2095
2096static void
2097putchars (SCHEME_P_ const char *s, int len)
2098{
2099#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port;
2101
2102 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2103 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2104 else 2080 else
2105 { 2081 {
2106 for (; len; len--) 2082 for (; len; len--)
… …
2111 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2112 } 2088 }
2113 } 2089 }
2114 2090
2115#else 2091#else
2116 write (1, s, len); 2092 write (1, s, len); // output not initialised
2117#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2118} 2100}
2119 2101
2120INTERFACE void 2102INTERFACE void
2121putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2122{ 2104{
2123#if USE_PORTS
2124 port *pt = SCHEME_V->outport->object.port;
2125
2126 if (pt->kind & port_file)
2127 {
2128 char cc = c;
2129 write (pt->rep.stdio.file, &cc, 1);
2130 }
2131 else
2132 {
2133 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2134 *pt->rep.string.curr++ = c;
2135 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2136 *pt->rep.string.curr++ = c;
2137 }
2138
2139#else
2140 char cc = c; 2105 char cc = c;
2141 write (1, &c, 1); 2106
2142#endif 2107 putchars (SCHEME_A_ &cc, 1);
2143} 2108}
2144 2109
2145/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2146static char * 2111ecb_cold static char *
2147readstr_upto (SCHEME_P_ char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2148{ 2113{
2149 char *p = SCHEME_V->strbuff; 2114 char *p = SCHEME_V->strbuff + skip;
2150 2115
2151 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))));
2152 2117
2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2118 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2154 *p = 0; 2119 *p = 0;
… …
2160 2125
2161 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2162} 2127}
2163 2128
2164/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2165static pointer 2130ecb_cold static pointer
2166readstrexp (SCHEME_P) 2131readstrexp (SCHEME_P_ char delim)
2167{ 2132{
2168 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2169 int c; 2134 int c;
2170 int c1 = 0; 2135 int c1 = 0;
2171 enum
2172 { 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;
2173 2137
2174 for (;;) 2138 for (;;)
2175 { 2139 {
2176 c = inchar (SCHEME_A); 2140 c = inchar (SCHEME_A);
2177 2141
… …
2179 return S_F; 2143 return S_F;
2180 2144
2181 switch (state) 2145 switch (state)
2182 { 2146 {
2183 case st_ok: 2147 case st_ok:
2184 switch (c) 2148 if (ecb_expect_false (c == delim))
2185 {
2186 case '\\':
2187 state = st_bsl;
2188 break;
2189
2190 case '"':
2191 *p = 0;
2192 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);
2193 2150
2194 default: 2151 if (ecb_expect_false (c == '\\'))
2152 state = st_bsl;
2153 else
2195 *p++ = c; 2154 *p++ = c;
2196 break;
2197 }
2198 2155
2199 break; 2156 break;
2200 2157
2201 case st_bsl: 2158 case st_bsl:
2202 switch (c) 2159 switch (c)
… …
2211 case '7': 2168 case '7':
2212 state = st_oct1; 2169 state = st_oct1;
2213 c1 = c - '0'; 2170 c1 = c - '0';
2214 break; 2171 break;
2215 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
2216 case 'x': 2188 case 'x':
2217 case 'X': 2189 case 'X':
2218 state = st_x1; 2190 state = st_x1;
2219 c1 = 0; 2191 c1 = 0;
2220 break; 2192 break;
2221 2193
2222 case 'n':
2223 *p++ = '\n';
2224 state = st_ok;
2225 break;
2226
2227 case 't':
2228 *p++ = '\t';
2229 state = st_ok;
2230 break;
2231
2232 case 'r':
2233 *p++ = '\r';
2234 state = st_ok;
2235 break;
2236
2237 case '"':
2238 *p++ = '"';
2239 state = st_ok;
2240 break;
2241
2242 default: 2194 default:
2243 *p++ = c; 2195 *p++ = c;
2244 state = st_ok; 2196 state = st_ok;
2245 break; 2197 break;
2246 } 2198 }
2247 2199
2248 break; 2200 break;
2249 2201
2250 case st_x1: 2202 case st_x1:
2251 case st_x2: 2203 case st_x2:
2252 c = toupper (c); 2204 c = tolower (c);
2253 2205
2254 if (c >= '0' && c <= 'F') 2206 if (c >= '0' && c <= '9')
2255 {
2256 if (c <= '9')
2257 c1 = (c1 << 4) + c - '0'; 2207 c1 = (c1 << 4) + c - '0';
2258 else 2208 else if (c >= 'a' && c <= 'f')
2259 c1 = (c1 << 4) + c - 'A' + 10; 2209 c1 = (c1 << 4) + c - 'a' + 10;
2260
2261 if (state == st_x1)
2262 state = st_x2;
2263 else
2264 {
2265 *p++ = c1;
2266 state = st_ok;
2267 }
2268 }
2269 else 2210 else
2270 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 }
2271 2220
2272 break; 2221 break;
2273 2222
2274 case st_oct1: 2223 case st_oct1:
2275 case st_oct2: 2224 case st_oct2:
… …
2279 backchar (SCHEME_A_ c); 2228 backchar (SCHEME_A_ c);
2280 state = st_ok; 2229 state = st_ok;
2281 } 2230 }
2282 else 2231 else
2283 { 2232 {
2284 if (state == st_oct2 && c1 >= 32) 2233 if (state == st_oct2 && c1 >= ' ')
2285 return S_F; 2234 return S_F;
2286 2235
2287 c1 = (c1 << 3) + (c - '0'); 2236 c1 = (c1 << 3) + (c - '0');
2288 2237
2289 if (state == st_oct1) 2238 if (state == st_oct1)
… …
2294 state = st_ok; 2243 state = st_ok;
2295 } 2244 }
2296 } 2245 }
2297 2246
2298 break; 2247 break;
2299
2300 } 2248 }
2301 } 2249 }
2302} 2250}
2303 2251
2304/* check c is in chars */ 2252/* check c is in chars */
2305ecb_inline int 2253ecb_cold int
2306is_one_of (char *s, int c) 2254is_one_of (const char *s, int c)
2307{ 2255{
2308 if (c == EOF)
2309 return 1;
2310
2311 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2312} 2257}
2313 2258
2314/* skip white characters */ 2259/* skip white characters */
2315ecb_inline int 2260ecb_cold int
2316skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2317{ 2262{
2318 int c, curr_line = 0; 2263 int c, curr_line = 0;
2319 2264
2320 do 2265 do
2321 { 2266 {
2322 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2323#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2324 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2325 curr_line++; 2271 curr_line++;
2326#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2327 } 2276 }
2328 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2329 2278
2330 /* record it */ 2279 /* record it */
2331#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2332 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)
2333 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;
2334#endif 2283#endif
2335 2284
2336 if (c != EOF)
2337 {
2338 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2339 return 1; 2286 return 1;
2340 }
2341 else
2342 return EOF;
2343} 2287}
2344 2288
2345/* get token */ 2289/* get token */
2346static int 2290ecb_cold static int
2347token (SCHEME_P) 2291token (SCHEME_P)
2348{ 2292{
2349 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2350 2294
2351 if (c == EOF) 2295 if (c == EOF)
… …
2363 return TOK_RPAREN; 2307 return TOK_RPAREN;
2364 2308
2365 case '.': 2309 case '.':
2366 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2367 2311
2368 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2369 return TOK_DOT; 2313 return TOK_DOT;
2370 else 2314 else
2371 { 2315 {
2372 //TODO: ungetc twice in a row is not supported in C
2373 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2374 backchar (SCHEME_A_ '.');
2375 return TOK_ATOM; 2317 return TOK_DOTATOM;
2376 } 2318 }
2319
2320 case '|':
2321 return TOK_STRATOM;
2377 2322
2378 case '\'': 2323 case '\'':
2379 return TOK_QUOTE; 2324 return TOK_QUOTE;
2380 2325
2381 case ';': 2326 case ';':
… …
2448} 2393}
2449 2394
2450/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2451#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2452 2397
2453static void 2398ecb_cold static void
2454printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2455{ 2400{
2456 int i; 2401 int i;
2457 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2458 2403
… …
2513 } 2458 }
2514 2459
2515 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2516} 2461}
2517 2462
2518
2519/* print atoms */ 2463/* print atoms */
2520static void 2464ecb_cold static void
2521printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2522{ 2466{
2523 char *p; 2467 char *p;
2524 int len; 2468 int len;
2525 2469
2526 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2527 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2528} 2472}
2529 2473
2530
2531/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2532static void 2475ecb_cold static void
2533atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2534{ 2477{
2535 char *p; 2478 char *p;
2536 2479
2537 if (l == NIL) 2480 if (l == NIL)
… …
2695#endif 2638#endif
2696 } 2639 }
2697 else if (is_continuation (l)) 2640 else if (is_continuation (l))
2698 p = "#<CONTINUATION>"; 2641 p = "#<CONTINUATION>";
2699 else 2642 else
2643 {
2644#if USE_PRINTF
2645 p = SCHEME_V->strbuff;
2646 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2647#else
2700 p = "#<ERROR>"; 2648 p = "#<ERROR>";
2649#endif
2650 }
2701 2651
2702 *pp = p; 2652 *pp = p;
2703 *plen = strlen (p); 2653 *plen = strlen (p);
2704} 2654}
2705 2655
… …
2737 return car (d); 2687 return car (d);
2738 2688
2739 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2740 q = p; 2690 q = p;
2741 2691
2742 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2743 { 2693 {
2744 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2745 2695
2746 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2747 p = cdr (d); 2697 p = cdr (d);
2748 } 2698 }
2749 2699
2750 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2751 return q; 2701 return q;
2752} 2702}
2753 2703
2754/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2755static pointer 2705ecb_hot static pointer
2756reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2757{ 2707{
2758 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2759 pointer p = NIL; 2709 pointer p = NIL;
2760 2710
… …
2763 2713
2764 return p; 2714 return p;
2765} 2715}
2766 2716
2767/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2768static pointer 2718ecb_hot static pointer
2769reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2770{ 2720{
2771 pointer result = term; 2721 pointer result = term;
2772 pointer p = list; 2722 pointer p = list;
2773 2723
… …
2781 2731
2782 return result; 2732 return result;
2783} 2733}
2784 2734
2785/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2786static pointer 2736ecb_hot static pointer
2787revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2788{ 2738{
2789 pointer result = a; 2739 pointer result = a;
2790 pointer p = b; 2740 pointer p = b;
2791 2741
… …
2800 2750
2801 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2802} 2752}
2803 2753
2804/* equivalence of atoms */ 2754/* equivalence of atoms */
2805int 2755ecb_hot int
2806eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2807{ 2757{
2808 if (is_string (a)) 2758 if (is_string (a))
2809 { 2759 {
2810 if (is_string (b)) 2760 if (is_string (b))
… …
2849/* () is #t in R5RS */ 2799/* () is #t in R5RS */
2850#define is_true(p) ((p) != S_F) 2800#define is_true(p) ((p) != S_F)
2851#define is_false(p) ((p) == S_F) 2801#define is_false(p) ((p) == S_F)
2852 2802
2853/* ========== Environment implementation ========== */ 2803/* ========== Environment implementation ========== */
2854
2855#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2856
2857static int
2858hash_fn (const char *key, int table_size)
2859{
2860 const unsigned char *p = key;
2861 uint32_t hash = 2166136261;
2862
2863 while (*p)
2864 hash = (hash ^ *p++) * 16777619;
2865
2866 return hash % table_size;
2867}
2868#endif
2869 2804
2870#ifndef USE_ALIST_ENV 2805#ifndef USE_ALIST_ENV
2871 2806
2872/* 2807/*
2873 * In this implementation, each frame of the environment may be 2808 * In this implementation, each frame of the environment may be
… …
2890 2825
2891 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2826 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2892 setenvironment (SCHEME_V->envir); 2827 setenvironment (SCHEME_V->envir);
2893} 2828}
2894 2829
2830static uint32_t
2831sym_hash (pointer sym, uint32_t size)
2832{
2833 uintptr_t ptr = (uintptr_t)sym;
2834
2835#if 0
2836 /* table size is prime, so why mix */
2837 ptr += ptr >> 32;
2838 ptr += ptr >> 16;
2839 ptr += ptr >> 8;
2840#endif
2841
2842 return ptr % size;
2843}
2844
2895ecb_inline void 2845ecb_inline void
2896new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2846new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2897{ 2847{
2898 pointer slot = immutable_cons (variable, value); 2848 pointer slot = immutable_cons (variable, value);
2899 2849
2900 if (is_vector (car (env))) 2850 if (is_vector (car (env)))
2901 { 2851 {
2902 int location = hash_fn (symname (variable), veclength (car (env))); 2852 int location = sym_hash (variable, veclength (car (env)));
2903
2904 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2853 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2905 } 2854 }
2906 else 2855 else
2907 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2908} 2857}
2909 2858
2910static pointer 2859ecb_hot static pointer
2911find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2912{ 2861{
2913 pointer x, y; 2862 pointer x, y;
2914 int location;
2915 2863
2916 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
2917 { 2865 {
2918 if (is_vector (car (x))) 2866 if (is_vector (car (x)))
2919 { 2867 {
2920 location = hash_fn (symname (hdl), veclength (car (x))); 2868 int location = sym_hash (hdl, veclength (car (x)));
2921 y = vector_elem (car (x), location); 2869 y = vector_get (car (x), location);
2922 } 2870 }
2923 else 2871 else
2924 y = car (x); 2872 y = car (x);
2925 2873
2926 for (; y != NIL; y = cdr (y)) 2874 for (; y != NIL; y = cdr (y))
2927 if (caar (y) == hdl) 2875 if (caar (y) == hdl)
2928 break; 2876 break;
2929 2877
2930 if (y != NIL) 2878 if (y != NIL)
2879 return car (y);
2880
2881 if (!all)
2931 break; 2882 break;
2932
2933 if (!all)
2934 return NIL;
2935 } 2883 }
2936
2937 if (x != NIL)
2938 return car (y);
2939 2884
2940 return NIL; 2885 return NIL;
2941} 2886}
2942 2887
2943#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2944 2889
2945ecb_inline void 2890static void
2946new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2947{ 2892{
2948 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2949 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2950} 2895}
2951 2896
2952ecb_inline void 2897static void
2953new_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)
2954{ 2899{
2955 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2956} 2901}
2957 2902
2958static pointer 2903ecb_hot static pointer
2959find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2960{ 2905{
2961 pointer x, y; 2906 pointer x, y;
2962 2907
2963 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2965 for (y = car (x); y != NIL; y = cdr (y)) 2910 for (y = car (x); y != NIL; y = cdr (y))
2966 if (caar (y) == hdl) 2911 if (caar (y) == hdl)
2967 break; 2912 break;
2968 2913
2969 if (y != NIL) 2914 if (y != NIL)
2915 return car (y);
2970 break; 2916 break;
2971 2917
2972 if (!all) 2918 if (!all)
2973 return NIL; 2919 break;
2974 } 2920 }
2975
2976 if (x != NIL)
2977 return car (y);
2978 2921
2979 return NIL; 2922 return NIL;
2980} 2923}
2981 2924
2982#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2983 2926
2984ecb_inline void 2927static void
2985new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2986{ 2929{
2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2987 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);
2988} 2932}
2989 2933
2990ecb_inline void 2934static void
2991set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2992{ 2936{
2993 set_cdr (slot, value); 2937 set_cdr (slot, value);
2994} 2938}
2995 2939
2996ecb_inline pointer 2940static pointer
2997slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2998{ 2942{
2999 return cdr (slot); 2943 return cdr (slot);
3000} 2944}
3001 2945
3002/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
3003 2947
3004static int 2948ecb_cold static int
3005xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
3006{ 2950{
3007#if USE_ERROR_HOOK
3008 pointer x;
3009 pointer hdl = SCHEME_V->ERROR_HOOK;
3010#endif
3011
3012#if USE_PRINTF 2951#if USE_PRINTF
3013#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
3014 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
3015 2954
3016 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
3031 } 2970 }
3032#endif 2971#endif
3033#endif 2972#endif
3034 2973
3035#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
3036 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);
3037 2976
3038 if (x != NIL) 2977 if (x != NIL)
3039 { 2978 {
3040 pointer code = a 2979 pointer code = a
3041 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3085 pointer code; 3024 pointer code;
3086}; 3025};
3087 3026
3088# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3089 3028
3090static void 3029ecb_hot static void
3091s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3092{ 3031{
3093 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3094 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3095 3034
3096 /* enough room for the next frame? */ 3035 /* enough room for the next frame? */
3097 if (nframes >= SCHEME_V->dump_size) 3036 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3098 { 3037 {
3099 SCHEME_V->dump_size += STACK_GROWTH; 3038 SCHEME_V->dump_size += STACK_GROWTH;
3100 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);
3101 } 3040 }
3102 3041
… …
3108 next_frame->code = code; 3047 next_frame->code = code;
3109 3048
3110 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3111} 3050}
3112 3051
3113static int 3052static ecb_hot int
3114xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3115{ 3054{
3116 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3117 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3118 3057
… …
3129 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3130 3069
3131 return 0; 3070 return 0;
3132} 3071}
3133 3072
3134ecb_inline void 3073ecb_cold void
3135dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3136{ 3075{
3137 /* 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 */
3138 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3139} 3078}
3140 3079
3141ecb_inline void 3080ecb_cold void
3142dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3143{ 3082{
3144 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3145 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3146 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3147} 3086}
3148 3087
3149static void 3088ecb_cold static void
3150dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3151{ 3090{
3152 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3153 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3154 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3155 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3156} 3095}
3157 3096
3158static void 3097ecb_cold static void
3159dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3160{ 3099{
3161 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3162 int i; 3101 int i;
3163 3102
… …
3169 mark (frame->envir); 3108 mark (frame->envir);
3170 mark (frame->code); 3109 mark (frame->code);
3171 } 3110 }
3172} 3111}
3173 3112
3174static pointer 3113ecb_cold static pointer
3175ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3176{ 3115{
3177 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3178 int i; 3117 int i;
3179 3118
… …
3191 } 3130 }
3192 3131
3193 return cont; 3132 return cont;
3194} 3133}
3195 3134
3196static void 3135ecb_cold static void
3197ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3198{ 3137{
3199 int i = 0; 3138 int i = 0;
3200 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3201 3140
… …
3213 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3214} 3153}
3215 3154
3216#else 3155#else
3217 3156
3218ecb_inline void 3157ecb_cold void
3219dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3220{ 3159{
3221 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3222} 3161}
3223 3162
3224ecb_inline void 3163ecb_cold void
3225dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3226{ 3165{
3227 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3228} 3167}
3229 3168
3230static void 3169ecb_cold static void
3231dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3232{ 3171{
3233 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3234} 3173}
3235 3174
3236static int 3175ecb_hot static int
3237xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3238{ 3177{
3239 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3240 3179
3241 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3251 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3252 3191
3253 return 0; 3192 return 0;
3254} 3193}
3255 3194
3256static void 3195ecb_hot static void
3257s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3258{ 3197{
3259 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3260 cons (args, 3199 cons (args,
3261 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3262 cons (code, 3201 cons (code,
3263 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3264} 3203}
3265 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
3266static void 3417static void
3267dump_stack_mark (SCHEME_P) 3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3268{ 3419{
3269 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);
3270} 3496}
3271 3497
3272static pointer 3498static pointer
3273ss_get_cont (SCHEME_P) 3499lookup (SCHEME_P_ pointer x)
3274{ 3500{
3275 return SCHEME_V->dump; 3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3276}
3277 3502
3278static void 3503 if (x != NIL)
3279ss_set_cont (SCHEME_P_ pointer cont) 3504 x = slot_value_in_env (x);
3280{
3281 SCHEME_V->dump = cont;
3282}
3283 3505
3284#endif 3506 return x;
3507}
3285 3508
3286#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 }
3287 3517
3288static 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
3289opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3290{ 3713{
3291 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3292 pointer x, y; 3715 pointer x, y;
3293 3716
3294 switch (op) 3717 switch (op)
3295 { 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
3296 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3297 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3298 { 3734 {
3299 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3735 putstr (SCHEME_A_ "Loading ");
3300 //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');
3301 } 3738 }
3302 3739
3303 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3304 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3305 else 3742
3306 {
3307 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3308 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3309 }
3310 3745
3311 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3312 3747
3313 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3314 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3315 { 3750 {
3316 if (SCHEME_V->file_i == 0) 3751 if (SCHEME_V->file_i == 0)
3317 { 3752 {
3318 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3319 s_goto (OP_QUIT); 3754 s_goto (OP_QUIT);
… …
3330 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3331 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3332 { 3767 {
3333 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3334 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3335 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3336 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3337 } 3775 }
3338 3776
3339 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3340 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3375 { 3813 {
3376 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3377 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3378 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3379 } 3817 }
3380 else 3818
3381 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3382 3820
3383 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3384#if USE_TRACING 3822#if USE_TRACING
3385 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3386 { 3824 {
… …
3397#endif 3835#endif
3398 if (is_symbol (SCHEME_V->code)) /* symbol */ 3836 if (is_symbol (SCHEME_V->code)) /* symbol */
3399 { 3837 {
3400 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);
3401 3839
3402 if (x != NIL) 3840 if (x == NIL)
3403 s_return (slot_value_in_env (x));
3404 else
3405 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));
3406 } 3844 }
3407 else if (is_pair (SCHEME_V->code)) 3845 else if (is_pair (SCHEME_V->code))
3408 { 3846 {
3409 x = car (SCHEME_V->code); 3847 x = car (SCHEME_V->code);
3410 3848
… …
3419 /* 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)); */
3420 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3421 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3422 } 3860 }
3423 } 3861 }
3424 else 3862
3425 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3426 3864
3427 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3428 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3429 { 3867 {
3430 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3431 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3432 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3433 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3434 } 3872 }
3435 else 3873
3436 {
3437 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3438 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3439 }
3440 3876
3441 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3442 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3443 3879
3444 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3455 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3456 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3457 } 3893 }
3458 3894
3459#if USE_TRACING 3895#if USE_TRACING
3460
3461 case OP_TRACING: 3896 case OP_TRACING:
3462 { 3897 {
3463 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3464 3899
3465 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3466 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3467 } 3902 }
3468
3469#endif 3903#endif
3470 3904
3471 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3472#if USE_TRACING 3906#if USE_TRACING
3473 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3487 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3921 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3488 else if (is_foreign (SCHEME_V->code)) 3922 else if (is_foreign (SCHEME_V->code))
3489 { 3923 {
3490 /* Keep nested calls from GC'ing the arglist */ 3924 /* Keep nested calls from GC'ing the arglist */
3491 push_recent_alloc (SCHEME_A_ args, NIL); 3925 push_recent_alloc (SCHEME_A_ args, NIL);
3492 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3926 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3493 3927
3494 s_return (x); 3928 s_return (x);
3495 } 3929 }
3496 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 */
3497 { 3931 {
… …
3527 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3528 { 3962 {
3529 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3530 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3531 } 3965 }
3532 else 3966
3533 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3534 3968
3535 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3536 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3537 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3538
3539#if 1
3540 3972
3541 case OP_LAMBDA: /* lambda */ 3973 case OP_LAMBDA: /* lambda */
3542 /* 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
3543 set SCHEME_V->value fall thru */ 3975 set SCHEME_V->value fall thru */
3544 { 3976 {
… …
3551 SCHEME_V->code = slot_value_in_env (f); 3983 SCHEME_V->code = slot_value_in_env (f);
3552 s_goto (OP_APPLY); 3984 s_goto (OP_APPLY);
3553 } 3985 }
3554 3986
3555 SCHEME_V->value = SCHEME_V->code; 3987 SCHEME_V->value = SCHEME_V->code;
3556 /* Fallthru */
3557 } 3988 }
3989 /* Fallthru */
3558 3990
3559 case OP_LAMBDA1: 3991 case OP_LAMBDA1:
3560 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));
3561
3562#else
3563
3564 case OP_LAMBDA: /* lambda */
3565 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3566
3567#endif
3568 3993
3569 case OP_MKCLOSURE: /* make-closure */ 3994 case OP_MKCLOSURE: /* make-closure */
3570 x = car (args); 3995 x = car (args);
3571 3996
3572 if (car (x) == SCHEME_V->LAMBDA) 3997 if (car (x) == SCHEME_V->LAMBDA)
… …
3611 else 4036 else
3612 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);
3613 4038
3614 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3615 4040
3616
3617 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3618 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3619 4043
3620 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3621 x = cadr (args); 4045 x = cadr (args);
… …
3639 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3640 } 4064 }
3641 else 4065 else
3642 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3643 4067
3644
3645 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3646 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3647 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3648 4071
3649 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3660 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3661 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3662 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3663 else 4086 else
3664 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
3665 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3666 4090
3667 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3668 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3669 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3670 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);
3671 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3672 4096
3673 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3674 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3675 4100
3676 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3677 { 4102 {
3678 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)))
3679 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));
3680 4105
3681 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3682 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3683 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3684 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3685 } 4110 }
3686 else /* end */ 4111
3687 { 4112 /* end */
3688 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3689 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3690 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3691 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3692 }
3693 4117
3694 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3695 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3696 4120
3697 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;
… …
3701 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3702 { 4126 {
3703 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))
3704 { 4128 {
3705 if (!is_pair (x)) 4129 if (!is_pair (x))
3706 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3707 4131
3708 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3709 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3710 4134
3711 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3712 } 4136 }
3713 4137
3714 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)),
… …
3731 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3732 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3733 } 4157 }
3734 4158
3735 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)))
3736 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));
3737 4161
3738 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));
3739 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3740 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3741 4165
… …
3752 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3753 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3754 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3755 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3756 } 4180 }
3757 else /* end */ 4181
4182 /* end */
3758 { 4183
3759 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3760 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3761 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3762 }
3763 4187
3764 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3765 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3766 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3767 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3768 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3769 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3770 4194
3771 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3772 args = cons (SCHEME_V->value, args);
3773
3774 if (is_pair (SCHEME_V->code)) /* continue */
3775 {
3776 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3777 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3778
3779 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3780 SCHEME_V->code = cadar (SCHEME_V->code);
3781 SCHEME_V->args = NIL;
3782 s_goto (OP_EVAL);
3783 }
3784 else /* end */
3785 {
3786 args = reverse_in_place (SCHEME_A_ NIL, args);
3787 SCHEME_V->code = car (args);
3788 SCHEME_V->args = cdr (args);
3789 s_goto (OP_LET2REC);
3790 }
3791 4196
3792 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3793 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))
3794 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3795 4200
… …
3825 } 4230 }
3826 else 4231 else
3827 { 4232 {
3828 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3829 s_return (NIL); 4234 s_return (NIL);
3830 else 4235
3831 {
3832 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3833 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3834 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3835 }
3836 } 4239 }
3837 4240
3838 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3839 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);
3840 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3851 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3852 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3853 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3854 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3855 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3856 else 4259
3857 {
3858 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3859 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3860 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3861 }
3862 4263
3863 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3864 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3865 s_return (S_F); 4266 s_return (S_F);
3866 4267
… …
3871 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3872 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3873 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3874 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3875 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3876 else 4277
3877 {
3878 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3879 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3880 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3881 }
3882 4281
3883 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3884 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3885 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3886 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3951 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3952 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3953 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3954 } 4353 }
3955 } 4354 }
3956 else 4355
3957 s_return (NIL); 4356 s_return (NIL);
3958 4357
3959 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3960 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3961 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3962 else 4361
3963 s_return (NIL); 4362 s_return (NIL);
3964 4363
3965 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3966 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3967 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3968 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
3982 } 4381 }
3983 4382
3984 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
3985} 4384}
3986 4385
3987static int 4386/* math, cxr */
4387ecb_hot static int
3988opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3989{ 4389{
3990 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
3991 pointer x = car (args); 4391 pointer x = car (args);
3992 num v; 4392 num v;
3993 4393
3994 switch (op) 4394 switch (op)
3995 { 4395 {
3996#if USE_MATH 4396#if USE_MATH
3997 case OP_INEX2EX: /* inexact->exact */ 4397 case OP_INEX2EX: /* inexact->exact */
3998 {
3999 if (is_integer (x)) 4398 if (!is_integer (x))
4000 s_return (x); 4399 {
4001
4002 RVALUE r = rvalue_unchecked (x); 4400 RVALUE r = rvalue_unchecked (x);
4003 4401
4004 if (r == (RVALUE)(IVALUE)r) 4402 if (r == (RVALUE)(IVALUE)r)
4005 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4403 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4006 else 4404 else
4007 Error_1 ("inexact->exact: not integral:", x); 4405 Error_1 ("inexact->exact: not integral:", x);
4008 } 4406 }
4009 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))));
4010 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))));
4011 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))))));
4012 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))));
4013 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))));
4014 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))));
4015 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))));
4016 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))));
4017 4424
4018 case OP_ATAN: 4425 case OP_ATAN:
4426 s_return (mk_real (SCHEME_A_
4019 if (cdr (args) == NIL) 4427 cdr (args) == NIL
4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4428 ? atan (rvalue (x))
4021 else 4429 : atan2 (rvalue (x), rvalue (cadr (args)))));
4022 {
4023 pointer y = cadr (args);
4024 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4025 }
4026
4027 case OP_SQRT:
4028 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4029 4430
4030 case OP_EXPT: 4431 case OP_EXPT:
4031 { 4432 {
4032 RVALUE result; 4433 RVALUE result;
4033 int real_result = 1; 4434 int real_result = 1;
… …
4056 if (real_result) 4457 if (real_result)
4057 s_return (mk_real (SCHEME_A_ result)); 4458 s_return (mk_real (SCHEME_A_ result));
4058 else 4459 else
4059 s_return (mk_integer (SCHEME_A_ result)); 4460 s_return (mk_integer (SCHEME_A_ result));
4060 } 4461 }
4061
4062 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4063 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4064
4065 case OP_TRUNCATE:
4066 {
4067 RVALUE n = rvalue (x);
4068 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4069 }
4070
4071 case OP_ROUND:
4072 if (is_integer (x))
4073 s_return (x);
4074
4075 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4076#endif 4462#endif
4077 4463
4078 case OP_ADD: /* + */ 4464 case OP_ADD: /* + */
4079 v = num_zero; 4465 v = num_zero;
4080 4466
… …
4168 else 4554 else
4169 Error_0 ("modulo: division by zero"); 4555 Error_0 ("modulo: division by zero");
4170 4556
4171 s_return (mk_number (SCHEME_A_ v)); 4557 s_return (mk_number (SCHEME_A_ v));
4172 4558
4173 case OP_CAR: /* car */ 4559 /* the compiler will optimize this mess... */
4174 s_return (caar (args)); 4560 case OP_CAR: op_car: s_return (car (x));
4175 4561 case OP_CDR: op_cdr: s_return (cdr (x));
4176 case OP_CDR: /* cdr */ 4562 case OP_CAAR: op_caar: x = car (x); goto op_car;
4177 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;
4178 4590
4179 case OP_CONS: /* cons */ 4591 case OP_CONS: /* cons */
4180 set_cdr (args, cadr (args)); 4592 set_cdr (args, cadr (args));
4181 s_return (args); 4593 s_return (args);
4182 4594
… …
4356 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4768 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4357 4769
4358 s_return (newstr); 4770 s_return (newstr);
4359 } 4771 }
4360 4772
4361 case OP_SUBSTR: /* substring */ 4773 case OP_STRING_COPY: /* substring/string-copy */
4362 { 4774 {
4363 char *str = strvalue (x); 4775 char *str = strvalue (x);
4364 int index0 = ivalue_unchecked (cadr (args)); 4776 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4365 int index1; 4777 int index1;
4366 int len; 4778 int len;
4367 4779
4368 if (index0 > strlength (x)) 4780 if (index0 > strlength (x))
4369 Error_1 ("substring: start out of bounds:", cadr (args)); 4781 Error_1 ("string->copy: start out of bounds:", cadr (args));
4370 4782
4371 if (cddr (args) != NIL) 4783 if (cddr (args) != NIL)
4372 { 4784 {
4373 index1 = ivalue_unchecked (caddr (args)); 4785 index1 = ivalue_unchecked (caddr (args));
4374 4786
4375 if (index1 > strlength (x) || index1 < index0) 4787 if (index1 > strlength (x) || index1 < index0)
4376 Error_1 ("substring: end out of bounds:", caddr (args)); 4788 Error_1 ("string->copy: end out of bounds:", caddr (args));
4377 } 4789 }
4378 else 4790 else
4379 index1 = strlength (x); 4791 index1 = strlength (x);
4380 4792
4381 len = index1 - index0; 4793 len = index1 - index0;
4382 x = mk_empty_string (SCHEME_A_ len, ' '); 4794 x = mk_counted_string (SCHEME_A_ str + index0, len);
4383 memcpy (strvalue (x), str + index0, len);
4384 strvalue (x)[len] = 0;
4385 4795
4386 s_return (x); 4796 s_return (x);
4387 } 4797 }
4388 4798
4389 case OP_VECTOR: /* vector */ 4799 case OP_VECTOR: /* vector */
… …
4401 if (SCHEME_V->no_memory) 4811 if (SCHEME_V->no_memory)
4402 s_return (S_SINK); 4812 s_return (S_SINK);
4403#endif 4813#endif
4404 4814
4405 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4815 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4406 set_vector_elem (vec, i, car (x)); 4816 vector_set (vec, i, car (x));
4407 4817
4408 s_return (vec); 4818 s_return (vec);
4409 } 4819 }
4410 4820
4411 case OP_MKVECTOR: /* make-vector */ 4821 case OP_MKVECTOR: /* make-vector */
… …
4423 if (SCHEME_V->no_memory) 4833 if (SCHEME_V->no_memory)
4424 s_return (S_SINK); 4834 s_return (S_SINK);
4425#endif 4835#endif
4426 4836
4427 if (fill != NIL) 4837 if (fill != NIL)
4428 fill_vector (vec, fill); 4838 fill_vector (vec, 0, fill);
4429 4839
4430 s_return (vec); 4840 s_return (vec);
4431 } 4841 }
4432 4842
4433 case OP_VECLEN: /* vector-length */ 4843 case OP_VECLEN: /* vector-length */
4434 s_return (mk_integer (SCHEME_A_ veclength (x))); 4844 s_return (mk_integer (SCHEME_A_ veclength (x)));
4845
4846 case OP_VECRESIZE:
4847 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4848 s_return (x);
4435 4849
4436 case OP_VECREF: /* vector-ref */ 4850 case OP_VECREF: /* vector-ref */
4437 { 4851 {
4438 int index = ivalue_unchecked (cadr (args)); 4852 int index = ivalue_unchecked (cadr (args));
4439 4853
4440 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4854 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4441 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4855 Error_1 ("vector-ref: out of bounds:", cadr (args));
4442 4856
4443 s_return (vector_elem (x, index)); 4857 s_return (vector_get (x, index));
4444 } 4858 }
4445 4859
4446 case OP_VECSET: /* vector-set! */ 4860 case OP_VECSET: /* vector-set! */
4447 { 4861 {
4448 int index = ivalue_unchecked (cadr (args)); 4862 int index = ivalue_unchecked (cadr (args));
… …
4451 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4865 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4452 4866
4453 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4867 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4454 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4868 Error_1 ("vector-set!: out of bounds:", cadr (args));
4455 4869
4456 set_vector_elem (x, index, caddr (args)); 4870 vector_set (x, index, caddr (args));
4457 s_return (x); 4871 s_return (x);
4458 } 4872 }
4459 } 4873 }
4460 4874
4461 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4462} 4876}
4463 4877
4464static int 4878/* relational ops */
4879ecb_hot static int
4465opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4466{ 4881{
4467 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4468 4883
4469 for (;;) 4884 for (;;)
… …
4490 } 4905 }
4491 4906
4492 s_return (S_T); 4907 s_return (S_T);
4493} 4908}
4494 4909
4495static int 4910/* predicates */
4911ecb_hot static int
4496opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4497{ 4913{
4498 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4499 pointer a = car (args); 4915 pointer a = car (args);
4500 pointer d = cdr (args); 4916 pointer d = cdr (args);
4501 int r; 4917 int r;
4502 4918
4503 switch (op) 4919 switch (op)
4504 { 4920 {
4505 case OP_NOT: /* not */ r = is_false (a) ; break; 4921 case OP_NOT: /* not */ r = is_false (a) ; break;
4506 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;
4507 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4923 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4508 case OP_NULLP: /* null? */ r = a == NIL ; break; 4924 case OP_NULLP: /* null? */ r = a == NIL ; break;
4509 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;
4510 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4927 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4511 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4928 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4512 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4929 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4513 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 */
4514 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4931 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4515 4932
4516#if USE_CHAR_CLASSIFIERS 4933#if USE_CHAR_CLASSIFIERS
4517 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4934 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4518 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4935 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4519 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4936 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4546 } 4963 }
4547 4964
4548 s_retbool (r); 4965 s_retbool (r);
4549} 4966}
4550 4967
4551static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4552opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4553{ 4971{
4554 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4555 pointer a = car (args); 4973 pointer a = car (args);
4556 pointer x, y; 4974 pointer x, y;
… …
4569 } 4987 }
4570 else 4988 else
4571 s_return (SCHEME_V->code); 4989 s_return (SCHEME_V->code);
4572 4990
4573 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4991 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4574 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4992 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4575 s_return (SCHEME_V->value); 4993 s_return (SCHEME_V->value);
4576 4994
4577#if USE_PORTS 4995#if USE_PORTS
4996
4997 case OP_EOF_OBJECT: /* eof-object */
4998 s_return (S_EOF);
4578 4999
4579 case OP_WRITE: /* write */ 5000 case OP_WRITE: /* write */
4580 case OP_DISPLAY: /* display */ 5001 case OP_DISPLAY: /* display */
4581 case OP_WRITE_CHAR: /* write-char */ 5002 case OP_WRITE_CHAR: /* write-char */
4582 if (is_pair (cdr (SCHEME_V->args))) 5003 if (is_pair (cdr (SCHEME_V->args)))
… …
4596 else 5017 else
4597 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4598 5019
4599 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4600 5021
5022 //TODO: move to scheme
4601 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4602 if (is_pair (args)) 5024 if (is_pair (args))
4603 { 5025 {
4604 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4605 { 5027 {
… …
4607 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4608 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4609 } 5031 }
4610 } 5032 }
4611 5033
4612 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4613 s_return (S_T); 5035 s_return (S_T);
4614#endif 5036#endif
4615 5037
4616 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4617 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4626 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4627 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4628 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4629 5051
4630 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4631 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4632 5054
4633 if (args != NIL) 5055 if (args != NIL)
4634 { 5056 {
4635 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4636 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4637 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4638 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4639 } 5061 }
4640 else 5062 else
4641 { 5063 {
4642 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4643 5065
4644 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4645 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4646 else 5068 else
4647 return -1; 5069 return -1;
… …
4724 SCHEME_V->gc_verbose = (a != S_F); 5146 SCHEME_V->gc_verbose = (a != S_F);
4725 s_retbool (was); 5147 s_retbool (was);
4726 } 5148 }
4727 5149
4728 case OP_NEWSEGMENT: /* new-segment */ 5150 case OP_NEWSEGMENT: /* new-segment */
5151#if 0
4729 if (!is_pair (args) || !is_number (a)) 5152 if (!is_pair (args) || !is_number (a))
4730 Error_0 ("new-segment: argument must be a number"); 5153 Error_0 ("new-segment: argument must be a number");
4731 5154#endif
4732 alloc_cellseg (SCHEME_A_ ivalue (a)); 5155 s_retbool (alloc_cellseg (SCHEME_A));
4733
4734 s_return (S_T);
4735 5156
4736 case OP_OBLIST: /* oblist */ 5157 case OP_OBLIST: /* oblist */
4737 s_return (oblist_all_symbols (SCHEME_A)); 5158 s_return (oblist_all_symbols (SCHEME_A));
4738 5159
4739#if USE_PORTS 5160#if USE_PORTS
… …
4809 s_return (p == NIL ? S_F : p); 5230 s_return (p == NIL ? S_F : p);
4810 } 5231 }
4811 5232
4812 case OP_GET_OUTSTRING: /* get-output-string */ 5233 case OP_GET_OUTSTRING: /* get-output-string */
4813 { 5234 {
4814 port *p; 5235 port *p = port (a);
4815 5236
4816 if ((p = a->object.port)->kind & port_string) 5237 if (p->kind & port_string)
4817 { 5238 {
4818 off_t size; 5239 off_t size;
4819 char *str; 5240 char *str;
4820 5241
4821 size = p->rep.string.curr - p->rep.string.start + 1; 5242 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4856 } 5277 }
4857 5278
4858 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4859} 5280}
4860 5281
4861static int 5282/* reading */
5283ecb_cold static int
4862opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4863{ 5285{
4864 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4865 pointer x; 5287 pointer x;
4866 5288
… …
4926 int res; 5348 int res;
4927 5349
4928 if (is_pair (args)) 5350 if (is_pair (args))
4929 p = car (args); 5351 p = car (args);
4930 5352
4931 res = p->object.port->kind & port_string; 5353 res = port (p)->kind & port_string;
4932 5354
4933 s_retbool (res); 5355 s_retbool (res);
4934 } 5356 }
4935 5357
4936 case OP_SET_INPORT: /* set-input-port */ 5358 case OP_SET_INPORT: /* set-input-port */
… …
4945 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
4946 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
4947 { 5369 {
4948 case TOK_EOF: 5370 case TOK_EOF:
4949 s_return (S_EOF); 5371 s_return (S_EOF);
4950 /* NOTREACHED */
4951 5372
4952 case TOK_VEC: 5373 case TOK_VEC:
4953 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4954 /* fall through */ 5375 /* fall through */
4955 5376
… …
4958 5379
4959 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
4960 s_return (NIL); 5381 s_return (NIL);
4961 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
4962 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
4963 else 5384
4964 {
4965 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4966 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4967 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
4968 }
4969 5388
4970 case TOK_QUOTE: 5389 case TOK_QUOTE:
4971 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4972 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
4973 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
4979 { 5398 {
4980 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4981 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
4982 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
4983 } 5402 }
4984 else 5403
4985 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4986
4987 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
4988 5406
4989 case TOK_COMMA: 5407 case TOK_COMMA:
4990 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4991 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
4995 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5413 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4996 SCHEME_V->tok = token (SCHEME_A); 5414 SCHEME_V->tok = token (SCHEME_A);
4997 s_goto (OP_RDSEXPR); 5415 s_goto (OP_RDSEXPR);
4998 5416
4999 case TOK_ATOM: 5417 case TOK_ATOM:
5000 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)));
5001 5429
5002 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
5003 x = readstrexp (SCHEME_A); 5431 x = readstrexp (SCHEME_A_ '"');
5004 5432
5005 if (x == S_F) 5433 if (x == S_F)
5006 Error_0 ("Error reading string"); 5434 Error_0 ("Error reading string");
5007 5435
5008 setimmutable (x); 5436 setimmutable (x);
… …
5012 { 5440 {
5013 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);
5014 5442
5015 if (f == NIL) 5443 if (f == NIL)
5016 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
5017 else 5445
5018 {
5019 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5020 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
5021 }
5022 } 5448 }
5023 5449
5024 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
5025 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)
5026 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
5027 else 5453
5028 s_return (x); 5454 s_return (x);
5029 5455
5030 default: 5456 default:
5031 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
5032 } 5458 }
5033 5459
… …
5126 pointer b = cdr (args); 5552 pointer b = cdr (args);
5127 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5128 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5129 5555
5130 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5131 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5132 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5133 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5134 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5136 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5137 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5138 else 5564 else
5139 { 5565 {
5140 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5141 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5142 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5143 } 5569 }
5144 5570
5145 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5147 5573
5148 case OP_P1LIST: 5574 case OP_P1LIST:
5149 if (is_pair (args)) 5575 if (is_pair (args))
5150 { 5576 {
5151 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5152 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5153 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5154 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5155 } 5581 }
5156 else if (is_vector (args)) 5582 else if (is_vector (args))
5157 { 5583 {
… …
5165 { 5591 {
5166 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5167 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5168 } 5594 }
5169 5595
5170 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5171 s_return (S_T); 5597 s_return (S_T);
5172 } 5598 }
5173 5599
5174 case OP_PVECFROM: 5600 case OP_PVECFROM:
5175 { 5601 {
… …
5177 pointer vec = car (args); 5603 pointer vec = car (args);
5178 int len = veclength (vec); 5604 int len = veclength (vec);
5179 5605
5180 if (i == len) 5606 if (i == len)
5181 { 5607 {
5182 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5183 s_return (S_T); 5609 s_return (S_T);
5184 } 5610 }
5185 else 5611 else
5186 { 5612 {
5187 pointer elem = vector_elem (vec, i); 5613 pointer elem = vector_get (vec, i);
5188 5614
5189 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5190 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5191 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5192 5618
5193 if (i > 0) 5619 if (i > 0)
5194 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5195 5621
5196 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5197 } 5623 }
5198 } 5624 }
5199 } 5625 }
5200 5626
5201 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5202} 5628}
5203 5629
5204static int 5630/* list ops */
5631ecb_hot static int
5205opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5206{ 5633{
5207 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5208 pointer a = car (args); 5635 pointer a = car (args);
5209 pointer x, y; 5636 pointer x, y;
… …
5232 break; 5659 break;
5233 } 5660 }
5234 5661
5235 if (is_pair (y)) 5662 if (is_pair (y))
5236 s_return (car (y)); 5663 s_return (car (y));
5237 else 5664
5238 s_return (S_F); 5665 s_return (S_F);
5239
5240 5666
5241 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5242 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5243 5669
5244 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5245 s_return (S_F); 5671 s_return (S_F);
5246 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5247 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5248 else if (is_macro (SCHEME_V->args)) 5674
5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5250 else
5251 s_return (S_F); 5675 s_return (S_F);
5252 5676
5253 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5254 /* 5678 /*
5255 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5256 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
5681 * (schmorp) well, obviously not, fix? TODO
5257 */ 5682 */
5258 s_retbool (is_closure (a)); 5683 s_retbool (is_closure (a));
5259 5684
5260 case OP_MACROP: /* macro? */ 5685 case OP_MACROP: /* macro? */
5261 s_retbool (is_macro (a)); 5686 s_retbool (is_macro (a));
… …
5266 5691
5267/* 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 */
5268typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5269 5694
5270typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5271static int 5696
5697ecb_hot static int
5272tst_any (pointer p) 5698tst_any (pointer p)
5273{ 5699{
5274 return 1; 5700 return 1;
5275} 5701}
5276 5702
5277static int 5703ecb_hot static int
5278tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5279{ 5705{
5280 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5281} 5707}
5282 5708
5283static int 5709ecb_hot static int
5284tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5285{ 5711{
5286 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5287} 5713}
5288 5714
… …
5331#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5332#include "opdefines.h" 5758#include "opdefines.h"
5333#undef OP_DEF 5759#undef OP_DEF
5334; 5760;
5335 5761
5336static const char * 5762ecb_cold static const char *
5337opname (int idx) 5763opname (int idx)
5338{ 5764{
5339 const char *name = opnames; 5765 const char *name = opnames;
5340 5766
5341 /* 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? */
… …
5343 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5344 5770
5345 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5346} 5772}
5347 5773
5348static const char * 5774ecb_cold static const char *
5349procname (pointer x) 5775procname (pointer x)
5350{ 5776{
5351 return opname (procnum (x)); 5777 return opname (procnum (x));
5352} 5778}
5353 5779
… …
5373#undef OP_DEF 5799#undef OP_DEF
5374 {0} 5800 {0}
5375}; 5801};
5376 5802
5377/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5378static void ecb_hot 5804ecb_hot static void
5379Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5380{ 5806{
5381 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5382 5808
5383 for (;;) 5809 for (;;)
… …
5430 { 5856 {
5431 if (!tests[j - 1].fct (arg)) 5857 if (!tests[j - 1].fct (arg))
5432 break; 5858 break;
5433 } 5859 }
5434 5860
5435 if (t[1]) /* last test is replicated as necessary */ 5861 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5436 t++; 5862 t++;
5437 5863
5438 arglist = cdr (arglist); 5864 arglist = cdr (arglist);
5439 i++; 5865 i++;
5440 } 5866 }
… …
5466 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))
5467 return; 5893 return;
5468 5894
5469 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5895 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5470 { 5896 {
5471 xwrstr ("No memory!\n"); 5897 putstr (SCHEME_A_ "No memory!\n");
5472 return; 5898 return;
5473 } 5899 }
5474 } 5900 }
5475} 5901}
5476 5902
5477/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5478 5904
5479static void 5905ecb_cold static void
5480assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5481{ 5907{
5482 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5483 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5484} 5910}
5485 5911
5486static void 5912ecb_cold static void
5487assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5488{ 5914{
5489 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5490 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5491 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5499 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5500 return y; 5926 return y;
5501} 5927}
5502 5928
5503/* 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! */
5504static int 5930ecb_hot static int
5505syntaxnum (pointer p) 5931syntaxnum (pointer p)
5506{ 5932{
5507 const char *s = strvalue (car (p)); 5933 const char *s = strvalue (p);
5508 5934
5509 switch (strlength (car (p))) 5935 switch (strlength (p))
5510 { 5936 {
5511 case 2: 5937 case 2:
5512 if (s[0] == 'i') 5938 if (s[0] == 'i')
5513 return OP_IF0; /* if */ 5939 return OP_IF0; /* if */
5514 else 5940 else
… …
5588 6014
5589ecb_cold int 6015ecb_cold int
5590scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5591{ 6017{
5592 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5593 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));
5594 6025
5595 num_set_fixnum (num_zero, 1); 6026 num_set_fixnum (num_zero, 1);
5596 num_set_ivalue (num_zero, 0); 6027 num_set_ivalue (num_zero, 0);
5597 num_set_fixnum (num_one, 1); 6028 num_set_fixnum (num_one, 1);
5598 num_set_ivalue (num_one, 1); 6029 num_set_ivalue (num_one, 1);
… …
5610 SCHEME_V->save_inport = NIL; 6041 SCHEME_V->save_inport = NIL;
5611 SCHEME_V->loadport = NIL; 6042 SCHEME_V->loadport = NIL;
5612 SCHEME_V->nesting = 0; 6043 SCHEME_V->nesting = 0;
5613 SCHEME_V->interactive_repl = 0; 6044 SCHEME_V->interactive_repl = 0;
5614 6045
5615 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6046 if (!alloc_cellseg (SCHEME_A))
5616 { 6047 {
5617#if USE_ERROR_CHECKING 6048#if USE_ERROR_CHECKING
5618 SCHEME_V->no_memory = 1; 6049 SCHEME_V->no_memory = 1;
5619 return 0; 6050 return 0;
5620#endif 6051#endif
5621 } 6052 }
5622 6053
5623 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5624 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5625 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5626 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5627 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5628 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5629 6061
5630 /* init NIL */ 6062 /* init NIL */
5631 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5632 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5633 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5634 /* init T */ 6066 /* init T */
5635 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5636 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5637 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5638 /* init F */ 6070 /* init F */
5639 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5640 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5641 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5642 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5643 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5644 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5645 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5646 /* init sink */ 6078 /* init sink */
5647 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5648 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5649 6081
5650 /* init c_nest */ 6082 /* init c_nest */
5651 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5652 6084
5653 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5654 /* init global_env */ 6086 /* init global_env */
5655 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5656 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5657 /* init else */ 6089 /* init else */
5658 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5659 new_slot_in_env (SCHEME_A_ x, S_T);
5660 6091
5661 { 6092 {
5662 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5663 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5664 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5688 6119
5689 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5690} 6121}
5691 6122
5692#if USE_PORTS 6123#if USE_PORTS
5693void 6124ecb_cold void
5694scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5695{ 6126{
5696 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5697} 6128}
5698 6129
5699void 6130ecb_cold void
5700scheme_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)
5701{ 6132{
5702 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);
5703} 6134}
5704 6135
5705void 6136ecb_cold void
5706scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5707{ 6138{
5708 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5709} 6140}
5710 6141
5711void 6142ecb_cold void
5712scheme_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)
5713{ 6144{
5714 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);
5715} 6146}
5716#endif 6147#endif
5717 6148
5718void 6149ecb_cold void
5719scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5720{ 6151{
5721 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5722} 6153}
5723 6154
… …
5755 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5756 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5757 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5758 6189
5759 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5760 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5761 6192
5762#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5763 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5764 {
5765 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5766 { 6196 {
5767 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5768 6198
5769 if (fname) 6199 if (fname)
5770 free (fname); 6200 free (fname);
5771 } 6201 }
5772 }
5773#endif 6202#endif
5774} 6203}
5775 6204
5776void 6205ecb_cold void
5777scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5778{ 6207{
5779 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5780} 6209}
5781 6210
5782void 6211ecb_cold void
5783scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5784{ 6213{
5785 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5786 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5787 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5788 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5789 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5790 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5791#if USE_PORTS
5792 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5793#endif
5794 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5795 6222
5796#if USE_PORTS
5797 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5798 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5799#endif
5800 6225
5801#if USE_PORTS 6226#if USE_PORTS
5802#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5803 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5804 6229
… …
5808#endif 6233#endif
5809 6234
5810 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5811 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5812 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5813 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5814 6240
5815 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5816 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5817} 6243}
5818 6244
5819void 6245ecb_cold void
5820scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5821{ 6247{
6248#if USE_PORTs
5822 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5823 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5824 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5825 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5826 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 */
5827 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);
5828 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5829#if USE_PORTS
5830 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5831#endif
5832 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5833 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5834 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5835 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5836 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5837 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5838 6263
5839 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5840 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5841} 6269}
5842 6270
5843void 6271ecb_cold void
5844scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5845{ 6273{
5846 pointer x; 6274 pointer x;
5847 6275
5848 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5853 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5854} 6282}
5855 6283
5856#if !STANDALONE 6284#if !STANDALONE
5857 6285
5858void 6286ecb_cold void
5859scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5860{ 6288{
5861 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));
5862} 6290}
5863 6291
5864void 6292ecb_cold void
5865scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5866{ 6294{
5867 int i; 6295 int i;
5868 6296
5869 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5870 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5871} 6299}
5872 6300
5873pointer 6301ecb_cold pointer
5874scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5875{ 6303{
5876 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));
5877} 6305}
5878 6306
5879void 6307ecb_cold void
5880save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5881{ 6309{
5882 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5883 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5884 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5888 /* 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
5889 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5890 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5891} 6319}
5892 6320
5893void 6321ecb_cold void
5894restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5895{ 6323{
5896 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5897 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5898 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5899 /* Pop */ 6327 /* Pop */
5900 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5901} 6329}
5902 6330
5903/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5904pointer 6332ecb_cold pointer
5905scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5906{ 6334{
5907 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5908 6336
5909 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5916 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5917 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5918 return SCHEME_V->value; 6346 return SCHEME_V->value;
5919} 6347}
5920 6348
5921pointer 6349ecb_cold pointer
5922scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5923{ 6351{
5924 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5925 6353
5926 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
5938 6366
5939/* ========== Main ========== */ 6367/* ========== Main ========== */
5940 6368
5941#if STANDALONE 6369#if STANDALONE
5942 6370
5943int 6371ecb_cold int
5944main (int argc, char **argv) 6372main (int argc, char **argv)
5945{ 6373{
5946# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
5947 scheme ssc; 6375 scheme ssc;
5948 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
5950# endif 6378# endif
5951 int fin; 6379 int fin;
5952 char *file_name = InitFile; 6380 char *file_name = InitFile;
5953 int retcode; 6381 int retcode;
5954 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
6384 system ("ps v $PPID");
6385#endif
5955 6386
5956 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5957 { 6388 {
5958 xwrstr ("Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5959 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5960 xwrstr ("followed by\n"); 6391 putstr (SCHEME_A_ "followed by\n");
5961 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6392 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5962 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6393 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5963 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6394 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5964 xwrstr ("Use - as filename for stdin.\n"); 6395 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5965 return 1; 6396 return 1;
5966 } 6397 }
5967 6398
5968 if (!scheme_init (SCHEME_A)) 6399 if (!scheme_init (SCHEME_A))
5969 { 6400 {
5970 xwrstr ("Could not initialize!\n"); 6401 putstr (SCHEME_A_ "Could not initialize!\n");
5971 return 2; 6402 return 2;
5972 } 6403 }
5973 6404
5974# if USE_PORTS 6405# if USE_PORTS
5975 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6406 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5988 } 6419 }
5989#endif 6420#endif
5990 6421
5991 do 6422 do
5992 { 6423 {
5993#if USE_PORTS
5994 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
5995 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
5996 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)
5997 { 6427 {
5998 pointer args = NIL; 6428 pointer args = NIL;
… …
6016 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);
6017 6447
6018 } 6448 }
6019 else 6449 else
6020 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
6021#endif
6022 6451
6023 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
6024 { 6453 {
6025 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');
6026 } 6457 }
6027 else 6458 else
6028 { 6459 {
6029 if (isfile) 6460 if (isfile)
6030 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
6031 else 6462 else
6032 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
6033 6464
6034#if USE_PORTS
6035 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
6036 { 6466 {
6037 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
6038 { 6468 {
6039 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');
6040 } 6472 }
6041 6473
6042 if (isfile) 6474 if (isfile)
6043 close (fin); 6475 close (fin);
6044 } 6476 }
6045#endif
6046 } 6477 }
6047 6478
6048 file_name = *argv++; 6479 file_name = *argv++;
6049 } 6480 }
6050 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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