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.37 by root, Sun Nov 29 05:09:24 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
74 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
75 TOK_VEC 84 TOK_VEC
76}; 85};
77 86
78#define BACKQUOTE '`' 87#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
80 90
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
84#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
85#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86 96
87#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
88static scheme sc; 98static scheme sc;
89#endif 99#endif
90 100
91static void 101ecb_cold static void
92xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
93{ 103{
94 if (n < 0) 104 if (n < 0)
95 { 105 {
96 *s++ = '-'; 106 *s++ = '-';
… …
98 } 108 }
99 109
100 char *p = s; 110 char *p = s;
101 111
102 do { 112 do {
103 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
104 n /= base; 114 n /= base;
105 } while (n); 115 } while (n);
106 116
107 *p-- = 0; 117 *p-- = 0;
108 118
… …
111 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
112 --p; ++s; 122 --p; ++s;
113 } 123 }
114} 124}
115 125
116static void 126ecb_cold static void
117xnum (char *s, long n) 127xnum (char *s, long n)
118{ 128{
119 xbase (s, n, 10); 129 xbase (s, n, 10);
120} 130}
121 131
122static void 132ecb_cold static void
123xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
124{
125 write (1, s, strlen (s));
126}
127
128static void
129xwrnum (long n)
130{ 134{
131 char buf[64]; 135 char buf[64];
132 136
133 xnum (buf, n); 137 xnum (buf, n);
134 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
135} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
136 144
137static char 145static char
138xtoupper (char c) 146xtoupper (char c)
139{ 147{
140 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
160 168
161#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
162#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
163#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
164 172
173#endif
174
165#if USE_IGNORECASE 175#if USE_IGNORECASE
166static const char * 176ecb_cold static const char *
167xstrlwr (char *s) 177xstrlwr (char *s)
168{ 178{
169 const char *p = s; 179 const char *p = s;
170 180
171 while (*s) 181 while (*s)
… …
184# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
185# define strlwr(s) (s) 195# define strlwr(s) (s)
186#endif 196#endif
187 197
188#ifndef prompt 198#ifndef prompt
189# define prompt "ts> " 199# define prompt "ms> "
190#endif 200#endif
191 201
192#ifndef InitFile 202#ifndef InitFile
193# define InitFile "init.scm" 203# define InitFile "init.scm"
194#endif 204#endif
195 205
196#ifndef FIRST_CELLSEGS
197# define FIRST_CELLSEGS 3
198#endif
199
200enum scheme_types 206enum scheme_types
201{ 207{
202 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
203 T_REAL, 210 T_REAL,
204 T_STRING, 211 T_STRING,
205 T_SYMBOL, 212 T_SYMBOL,
206 T_PROC, 213 T_PROC,
207 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
208 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
209 T_CONTINUATION, 218 T_CONTINUATION,
210 T_FOREIGN, 219 T_FOREIGN,
211 T_CHARACTER,
212 T_PORT, 220 T_PORT,
213 T_VECTOR, 221 T_VECTOR,
214 T_MACRO,
215 T_PROMISE, 222 T_PROMISE,
216 T_ENVIRONMENT, 223 T_ENVIRONMENT,
217 /* one more... */ 224
218 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
219}; 226};
220 227
221#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
222#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
255static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
256static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
257static num num_rem (num a, num b); 264static num num_rem (num a, num b);
258static num num_mod (num a, num b); 265static num num_mod (num a, num b);
259 266
260#if USE_MATH
261static double round_per_R5RS (double x);
262#endif
263static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
264 268
265static num num_zero; 269static num num_zero;
266static num num_one; 270static num num_one;
267 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
268/* macros for cell operations */ 276/* macros for cell operations */
269#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
270#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
271#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
272 280
273INTERFACE int 281INTERFACE int
274is_string (pointer p) 282is_string (pointer p)
275{ 283{
276 return type (p) == T_STRING; 284 return type (p) == T_STRING;
277} 285}
278 286
279#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
280#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
281 289
282INTERFACE int 290INTERFACE int
283is_vector (pointer p) 291is_vector (pointer p)
284{ 292{
285 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
286} 294}
287 295
288#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293 301
294INTERFACE int 302INTERFACE int
… …
320string_value (pointer p) 328string_value (pointer p)
321{ 329{
322 return strvalue (p); 330 return strvalue (p);
323} 331}
324 332
325#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327 335
328#if USE_REAL 336#if USE_REAL
329#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
330#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331#else 339#else
332#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
333#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334#endif 342#endif
335 343
336INTERFACE long 344INTERFACE long
337charvalue (pointer p) 345charvalue (pointer p)
338{ 346{
339 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
340} 348}
341 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
342INTERFACE int 352INTERFACE int
343is_port (pointer p) 353is_port (pointer p)
344{ 354{
345 return type (p) == T_PORT; 355 return type (p) == T_PORT;
346} 356}
347 357
348INTERFACE int 358INTERFACE int
349is_inport (pointer p) 359is_inport (pointer p)
350{ 360{
351 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
352} 362}
353 363
354INTERFACE int 364INTERFACE int
355is_outport (pointer p) 365is_outport (pointer p)
356{ 366{
357 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
358} 368}
359 369
360INTERFACE int 370INTERFACE int
361is_pair (pointer p) 371is_pair (pointer p)
362{ 372{
363 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
364} 374}
365 375
366#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
367#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368 378
369static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
370static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
371static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
372static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
373 383
374static pointer cadar (pointer p) { return car (cdr (car (p))); } 384static pointer cadar (pointer p) { return car (cdr (car (p))); }
375static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 385static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
376static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377 387
388static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
389
378INTERFACE void 390INTERFACE void
379set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
380{ 392{
381 p->object.cons.car = q; 393 CELL(p)->object.cons.car = CELL (q);
382} 394}
383 395
384INTERFACE void 396INTERFACE void
385set_cdr (pointer p, pointer q) 397set_cdr (pointer p, pointer q)
386{ 398{
387 p->object.cons.cdr = q; 399 CELL(p)->object.cons.cdr = CELL (q);
388} 400}
389 401
390INTERFACE pointer 402INTERFACE pointer
391pair_car (pointer p) 403pair_car (pointer p)
392{ 404{
… …
406} 418}
407 419
408INTERFACE char * 420INTERFACE char *
409symname (pointer p) 421symname (pointer p)
410{ 422{
411 return strvalue (car (p)); 423 return strvalue (p);
412} 424}
413 425
414#if USE_PLIST 426#if USE_PLIST
427#error plists are broken because symbols are no longer pairs
428#define symprop(p) cdr(p)
415SCHEME_EXPORT int 429SCHEME_EXPORT int
416hasprop (pointer p) 430hasprop (pointer p)
417{ 431{
418 return typeflag (p) & T_SYMBOL; 432 return typeflag (p) & T_SYMBOL;
419} 433}
420
421# define symprop(p) cdr(p)
422#endif 434#endif
423 435
424INTERFACE int 436INTERFACE int
425is_syntax (pointer p) 437is_syntax (pointer p)
426{ 438{
… …
440} 452}
441 453
442INTERFACE char * 454INTERFACE char *
443syntaxname (pointer p) 455syntaxname (pointer p)
444{ 456{
445 return strvalue (car (p)); 457 return strvalue (p);
446} 458}
447 459
448#define procnum(p) ivalue_unchecked (p) 460#define procnum(p) ivalue_unchecked (p)
449static const char *procname (pointer x); 461static const char *procname (pointer x);
450 462
… …
522 proper list: length 534 proper list: length
523 circular list: -1 535 circular list: -1
524 not even a pair: -2 536 not even a pair: -2
525 dotted list: -2 minus length before dot 537 dotted list: -2 minus length before dot
526*/ 538*/
527INTERFACE int 539ecb_hot INTERFACE int
528list_length (SCHEME_P_ pointer a) 540list_length (SCHEME_P_ pointer a)
529{ 541{
530 int i = 0; 542 int i = 0;
531 pointer slow, fast; 543 pointer slow, fast;
532 544
… …
571{ 583{
572 return list_length (SCHEME_A_ a) >= 0; 584 return list_length (SCHEME_A_ a) >= 0;
573} 585}
574 586
575#if USE_CHAR_CLASSIFIERS 587#if USE_CHAR_CLASSIFIERS
588
576ecb_inline int 589ecb_inline int
577Cisalpha (int c) 590Cisalpha (int c)
578{ 591{
579 return isascii (c) && isalpha (c); 592 return isascii (c) && isalpha (c);
580} 593}
… …
638 "gs", 651 "gs",
639 "rs", 652 "rs",
640 "us" 653 "us"
641}; 654};
642 655
643static int 656ecb_cold static int
644is_ascii_name (const char *name, int *pc) 657is_ascii_name (const char *name, int *pc)
645{ 658{
646 int i; 659 int i;
647 660
648 for (i = 0; i < 32; i++) 661 for (i = 0; i < 32; i++)
… …
667 680
668static int file_push (SCHEME_P_ const char *fname); 681static int file_push (SCHEME_P_ const char *fname);
669static void file_pop (SCHEME_P); 682static void file_pop (SCHEME_P);
670static int file_interactive (SCHEME_P); 683static int file_interactive (SCHEME_P);
671ecb_inline int is_one_of (const char *s, int c); 684ecb_inline int is_one_of (const char *s, int c);
672static int alloc_cellseg (SCHEME_P_ int n); 685static int alloc_cellseg (SCHEME_P);
673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 686ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674static void finalize_cell (SCHEME_P_ pointer a); 687static void finalize_cell (SCHEME_P_ pointer a);
675static int count_consecutive_cells (pointer x, int needed);
676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 688static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677static pointer mk_number (SCHEME_P_ const num n); 689static pointer mk_number (SCHEME_P_ const num n);
678static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 690static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
679static pointer mk_vector (SCHEME_P_ uint32_t len); 691static pointer mk_vector (SCHEME_P_ uint32_t len);
680static pointer mk_atom (SCHEME_P_ char *q); 692static pointer mk_atom (SCHEME_P_ char *q);
681static pointer mk_sharp_const (SCHEME_P_ char *name); 693static pointer mk_sharp_const (SCHEME_P_ char *name);
682 694
695static pointer mk_port (SCHEME_P_ port *p);
696
683#if USE_PORTS 697#if USE_PORTS
684static pointer mk_port (SCHEME_P_ port *p);
685static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 698static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
686static pointer port_from_file (SCHEME_P_ int, int prop); 699static pointer port_from_file (SCHEME_P_ int, int prop);
687static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 700static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
688static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 701static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
689static port *port_rep_from_file (SCHEME_P_ int, int prop); 702static port *port_rep_from_file (SCHEME_P_ int, int prop);
690static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 703static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
691static void port_close (SCHEME_P_ pointer p, int flag); 704static void port_close (SCHEME_P_ pointer p, int flag);
692#endif 705#endif
706
693static void mark (pointer a); 707static void mark (pointer a);
694static void gc (SCHEME_P_ pointer a, pointer b); 708static void gc (SCHEME_P_ pointer a, pointer b);
695static int basic_inchar (port *pt); 709static int basic_inchar (port *pt);
696static int inchar (SCHEME_P); 710static int inchar (SCHEME_P);
697static void backchar (SCHEME_P_ int c); 711static void backchar (SCHEME_P_ int c);
698static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 712static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
699static pointer readstrexp (SCHEME_P_ char delim); 713static pointer readstrexp (SCHEME_P_ char delim);
700ecb_inline int skipspace (SCHEME_P); 714static int skipspace (SCHEME_P);
701static int token (SCHEME_P); 715static int token (SCHEME_P);
702static void printslashstring (SCHEME_P_ char *s, int len); 716static void printslashstring (SCHEME_P_ char *s, int len);
703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 717static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
704static void printatom (SCHEME_P_ pointer l, int f); 718static void printatom (SCHEME_P_ pointer l, int f);
705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 719static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
871 } 885 }
872 886
873 return ret; 887 return ret;
874} 888}
875 889
876#if USE_MATH
877
878/* Round to nearest. Round to even if midway */
879static double
880round_per_R5RS (double x)
881{
882 double fl = floor (x);
883 double ce = ceil (x);
884 double dfl = x - fl;
885 double dce = ce - x;
886
887 if (dfl > dce)
888 return ce;
889 else if (dfl < dce)
890 return fl;
891 else
892 {
893 if (fmod (fl, 2) == 0) /* I imagine this holds */
894 return fl;
895 else
896 return ce;
897 }
898}
899#endif
900
901static int 890static int
902is_zero_rvalue (RVALUE x) 891is_zero_rvalue (RVALUE x)
903{ 892{
904 return x == 0; 893 return x == 0;
905#if 0 894#if 0
… …
910#endif 899#endif
911#endif 900#endif
912} 901}
913 902
914/* allocate new cell segment */ 903/* allocate new cell segment */
915static int 904ecb_cold static int
916alloc_cellseg (SCHEME_P_ int n) 905alloc_cellseg (SCHEME_P)
917{ 906{
918 pointer newp; 907 struct cell *newp;
919 pointer last; 908 struct cell *last;
920 pointer p; 909 struct cell *p;
921 char *cp; 910 char *cp;
922 long i; 911 long i;
923 int k; 912 int k;
924 913
925 static int segsize = CELL_SEGSIZE >> 1; 914 static int segsize = CELL_SEGSIZE >> 1;
926 segsize <<= 1; 915 segsize <<= 1;
927 916
928 for (k = 0; k < n; k++)
929 {
930 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931 return k;
932
933 cp = malloc (segsize * sizeof (struct cell)); 917 cp = malloc (segsize * sizeof (struct cell));
934 918
935 if (!cp && USE_ERROR_CHECKING) 919 if (!cp && USE_ERROR_CHECKING)
936 return k; 920 return k;
937 921
938 i = ++SCHEME_V->last_cell_seg; 922 i = ++SCHEME_V->last_cell_seg;
939 SCHEME_V->alloc_seg[i] = cp;
940 923
941 newp = (pointer)cp; 924 newp = (struct cell *)cp;
942 SCHEME_V->cell_seg[i] = newp; 925 SCHEME_V->cell_seg[i] = newp;
943 SCHEME_V->cell_segsize[i] = segsize; 926 SCHEME_V->cell_segsize[i] = segsize;
944 SCHEME_V->fcells += segsize; 927 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 928 last = newp + segsize - 1;
946 929
947 for (p = newp; p <= last; p++) 930 for (p = newp; p <= last; p++)
948 { 931 {
932 pointer cp = POINTER (p);
949 set_typeflag (p, T_PAIR); 933 set_typeflag (cp, T_PAIR);
950 set_car (p, NIL); 934 set_car (cp, NIL);
951 set_cdr (p, p + 1); 935 set_cdr (cp, POINTER (p + 1));
952 } 936 }
953 937
954 set_cdr (last, SCHEME_V->free_cell); 938 set_cdr (POINTER (last), SCHEME_V->free_cell);
955 SCHEME_V->free_cell = newp; 939 SCHEME_V->free_cell = POINTER (newp);
956 }
957 940
958 return n; 941 return 1;
959} 942}
960 943
961/* get new cell. parameter a, b is marked by gc. */ 944/* get new cell. parameter a, b is marked by gc. */
962ecb_inline pointer 945ecb_inline pointer
963get_cell_x (SCHEME_P_ pointer a, pointer b) 946get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 950 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 951 return S_SINK;
969 952
970 if (SCHEME_V->free_cell == NIL) 953 if (SCHEME_V->free_cell == NIL)
971 { 954 {
972 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 955 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
973 956
974 gc (SCHEME_A_ a, b); 957 gc (SCHEME_A_ a, b);
975 958
976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 959 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
977 { 960 {
978 /* if only a few recovered, get more to avoid fruitless gc's */ 961 /* if only a few recovered, get more to avoid fruitless gc's */
979 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 962 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980 { 963 {
981#if USE_ERROR_CHECKING 964#if USE_ERROR_CHECKING
982 SCHEME_V->no_memory = 1; 965 SCHEME_V->no_memory = 1;
983 return S_SINK; 966 return S_SINK;
984#endif 967#endif
… …
996 } 979 }
997} 980}
998 981
999/* To retain recent allocs before interpreter knows about them - 982/* To retain recent allocs before interpreter knows about them -
1000 Tehom */ 983 Tehom */
1001 984ecb_hot static void
1002static void
1003push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 985push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004{ 986{
1005 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 987 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006 988
1007 set_typeflag (holder, T_PAIR); 989 set_typeflag (holder, T_PAIR);
… …
1009 set_car (holder, recent); 991 set_car (holder, recent);
1010 set_cdr (holder, car (S_SINK)); 992 set_cdr (holder, car (S_SINK));
1011 set_car (S_SINK, holder); 993 set_car (S_SINK, holder);
1012} 994}
1013 995
1014static pointer 996ecb_hot static pointer
1015get_cell (SCHEME_P_ pointer a, pointer b) 997get_cell (SCHEME_P_ pointer a, pointer b)
1016{ 998{
1017 pointer cell = get_cell_x (SCHEME_A_ a, b); 999 pointer cell = get_cell_x (SCHEME_A_ a, b);
1018 1000
1019 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1001 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1028} 1010}
1029 1011
1030static pointer 1012static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1013get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 1014{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1015 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1016 pointer *e = malloc (len * sizeof (pointer));
1035 1017
1036 if (!e && USE_ERROR_CHECKING) 1018 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1019 return S_SINK;
1038 1020
1039 /* Record it as a vector so that gc understands it. */ 1021 /* Record it as a vector so that gc understands it. */
1040 set_typeflag (v, T_VECTOR | T_ATOM); 1022 set_typeflag (v, T_VECTOR | T_ATOM);
1041 1023
1042 v->object.vector.vvalue = e; 1024 CELL(v)->object.vector.vvalue = e;
1043 v->object.vector.length = len; 1025 CELL(v)->object.vector.length = len;
1044 fill_vector (v, 0, init); 1026 fill_vector (v, 0, init);
1045 push_recent_alloc (SCHEME_A_ v, NIL); 1027 push_recent_alloc (SCHEME_A_ v, NIL);
1046 1028
1047 return v; 1029 return v;
1048} 1030}
… …
1057static void 1039static void
1058check_cell_alloced (pointer p, int expect_alloced) 1040check_cell_alloced (pointer p, int expect_alloced)
1059{ 1041{
1060 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1042 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1061 if (typeflag (p) & !expect_alloced) 1043 if (typeflag (p) & !expect_alloced)
1062 xwrstr ("Cell is already allocated!\n"); 1044 putstr (SCHEME_A_ "Cell is already allocated!\n");
1063 1045
1064 if (!(typeflag (p)) & expect_alloced) 1046 if (!(typeflag (p)) & expect_alloced)
1065 xwrstr ("Cell is not allocated!\n"); 1047 putstr (SCHEME_A_ "Cell is not allocated!\n");
1066} 1048}
1067 1049
1068static void 1050static void
1069check_range_alloced (pointer p, int n, int expect_alloced) 1051check_range_alloced (pointer p, int n, int expect_alloced)
1070{ 1052{
… …
1076#endif 1058#endif
1077 1059
1078/* Medium level cell allocation */ 1060/* Medium level cell allocation */
1079 1061
1080/* get new cons cell */ 1062/* get new cons cell */
1081pointer 1063ecb_hot static pointer
1082xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1064xcons (SCHEME_P_ pointer a, pointer b)
1083{ 1065{
1084 pointer x = get_cell (SCHEME_A_ a, b); 1066 pointer x = get_cell (SCHEME_A_ a, b);
1085 1067
1086 set_typeflag (x, T_PAIR); 1068 set_typeflag (x, T_PAIR);
1087
1088 if (immutable)
1089 setimmutable (x);
1090 1069
1091 set_car (x, a); 1070 set_car (x, a);
1092 set_cdr (x, b); 1071 set_cdr (x, b);
1093 1072
1094 return x; 1073 return x;
1095} 1074}
1096 1075
1097/* ========== oblist implementation ========== */
1098
1099static pointer 1076ecb_hot static pointer
1077ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1078{
1079 pointer x = xcons (SCHEME_A_ a, b);
1080 setimmutable (x);
1081 return x;
1082}
1083
1084#define cons(a,b) xcons (SCHEME_A_ a, b)
1085#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1086
1087ecb_cold static pointer
1100generate_symbol (SCHEME_P_ const char *name) 1088generate_symbol (SCHEME_P_ const char *name)
1101{ 1089{
1102 pointer x = mk_string (SCHEME_A_ name); 1090 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1091 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL); 1092 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1093 return x;
1107} 1094}
1095
1096/* ========== oblist implementation ========== */
1108 1097
1109#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1110 1099
1111static int 1100static int
1112hash_fn (const char *key, int table_size) 1101hash_fn (const char *key, int table_size)
1113{ 1102{
1114 const unsigned char *p = key; 1103 const unsigned char *p = (unsigned char *)key;
1115 uint32_t hash = 2166136261; 1104 uint32_t hash = 2166136261U;
1116 1105
1117 while (*p) 1106 while (*p)
1118 hash = (hash ^ *p++) * 16777619; 1107 hash = (hash ^ *p++) * 16777619;
1119 1108
1120 return hash % table_size; 1109 return hash % table_size;
1121} 1110}
1122 1111
1123static pointer 1112ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1125{ 1114{
1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1127} 1116}
1128 1117
1129/* returns the new symbol */ 1118/* returns the new symbol */
1130static pointer 1119ecb_cold static pointer
1131oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1132{ 1121{
1133 pointer x = generate_symbol (SCHEME_A_ name); 1122 pointer x = generate_symbol (SCHEME_A_ name);
1134 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1124 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1136 return x; 1125 return x;
1137} 1126}
1138 1127
1139ecb_inline pointer 1128ecb_cold static pointer
1140oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1141{ 1130{
1142 int location; 1131 int location;
1143 pointer x; 1132 pointer x;
1144 char *s; 1133 char *s;
… …
1155 } 1144 }
1156 1145
1157 return NIL; 1146 return NIL;
1158} 1147}
1159 1148
1160static pointer 1149ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1162{ 1151{
1163 int i; 1152 int i;
1164 pointer x; 1153 pointer x;
1165 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
… …
1171 return ob_list; 1160 return ob_list;
1172} 1161}
1173 1162
1174#else 1163#else
1175 1164
1176static pointer 1165ecb_cold static pointer
1177oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1178{ 1167{
1179 return NIL; 1168 return NIL;
1180} 1169}
1181 1170
1182ecb_inline pointer 1171ecb_cold static pointer
1183oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1184{ 1173{
1185 pointer x; 1174 pointer x;
1186 char *s; 1175 char *s;
1187 1176
… …
1196 1185
1197 return NIL; 1186 return NIL;
1198} 1187}
1199 1188
1200/* returns the new symbol */ 1189/* returns the new symbol */
1201static pointer 1190ecb_cold static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1192{
1204 pointer x = mk_string (SCHEME_A_ name); 1193 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1195 return x;
1209} 1196}
1210 1197
1211static pointer 1198ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1213{ 1200{
1214 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1215} 1202}
1216 1203
1217#endif 1204#endif
1218 1205
1219#if USE_PORTS
1220static pointer 1206ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1222{ 1208{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1210
1225 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1212 set_port (x, p);
1227 1213
1228 return x; 1214 return x;
1229} 1215}
1230#endif
1231 1216
1232pointer 1217ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1219{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1221
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1223 CELL(x)->object.ff = f;
1239 1224
1240 return x; 1225 return x;
1241} 1226}
1242 1227
1243INTERFACE pointer 1228INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1229mk_character (SCHEME_P_ int c)
1245{ 1230{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1232
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1233 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1234 set_ivalue (x, c & 0xff);
1250 1235
1251 return x; 1236 return x;
1252} 1237}
1253 1238
1254/* get number atom (integer) */ 1239/* get number atom (integer) */
1255INTERFACE pointer 1240INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1241mk_integer (SCHEME_P_ long n)
1257{ 1242{
1243 pointer p = 0;
1244 pointer *pp = &p;
1245
1246#if USE_INTCACHE
1247 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1248 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1249#endif
1250
1251 if (!*pp)
1252 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1253 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1254
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1255 set_typeflag (x, T_INTEGER | T_ATOM);
1256 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1257 set_ivalue (x, n);
1262 1258
1259 *pp = x;
1260 }
1261
1263 return x; 1262 return *pp;
1264} 1263}
1265 1264
1266INTERFACE pointer 1265INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1268{ 1267{
1269#if USE_REAL 1268#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1270
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1271 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1272 set_rvalue (x, n);
1274 1273
1275 return x; 1274 return x;
1276#else 1275#else
1277 return mk_integer (SCHEME_A_ n); 1276 return mk_integer (SCHEME_A_ n);
… …
1388 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1389 1388
1390 return x; 1389 return x;
1391} 1390}
1392 1391
1393INTERFACE pointer 1392ecb_cold INTERFACE pointer
1394gensym (SCHEME_P) 1393gensym (SCHEME_P)
1395{ 1394{
1396 pointer x; 1395 pointer x;
1397 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1398 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1398
1400 return generate_symbol (SCHEME_A_ name); 1399 return generate_symbol (SCHEME_A_ name);
1401} 1400}
1402 1401
1402static int
1403is_gensym (SCHEME_P_ pointer x)
1404{
1405 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1406}
1407
1403/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1404static pointer 1409ecb_cold static pointer
1405mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1406{ 1411{
1407 char c, *p; 1412 char c, *p;
1408 int has_dec_point = 0; 1413 int has_dec_point = 0;
1409 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1480 1485
1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1482} 1487}
1483 1488
1484/* make constant */ 1489/* make constant */
1485static pointer 1490ecb_cold static pointer
1486mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1487{ 1492{
1488 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1489 return S_T; 1494 return S_T;
1490 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1491 return S_F; 1496 return S_F;
1492 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1493 { 1498 {
1494 int c; 1499 int c;
1495 1500
1501 // TODO: optimise
1496 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1497 c = ' '; 1503 c = ' ';
1498 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1499 c = '\n'; 1505 c = '\n';
1500 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1501 c = '\r'; 1507 c = '\r';
1502 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1503 c = '\t'; 1509 c = '\t';
1510 else if (stricmp (name + 1, "alarm") == 0)
1511 c = 0x07;
1512 else if (stricmp (name + 1, "backspace") == 0)
1513 c = 0x08;
1514 else if (stricmp (name + 1, "escape") == 0)
1515 c = 0x1b;
1516 else if (stricmp (name + 1, "delete") == 0)
1517 c = 0x7f;
1518 else if (stricmp (name + 1, "null") == 0)
1519 c = 0;
1504 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1505 { 1521 {
1506 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1507 1523
1508 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1533 return NIL; 1549 return NIL;
1534 } 1550 }
1535} 1551}
1536 1552
1537/* ========== garbage collector ========== */ 1553/* ========== garbage collector ========== */
1554
1555static void
1556finalize_cell (SCHEME_P_ pointer a)
1557{
1558 /* TODO, fast bitmap check? */
1559 if (is_string (a) || is_symbol (a))
1560 free (strvalue (a));
1561 else if (is_vector (a))
1562 free (vecvalue (a));
1563#if USE_PORTS
1564 else if (is_port (a))
1565 {
1566 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1567 port_close (SCHEME_A_ a, port_input | port_output);
1568
1569 free (port (a));
1570 }
1571#endif
1572}
1538 1573
1539/*-- 1574/*--
1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1575 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1542 * for marking. 1577 * for marking.
1543 * 1578 *
1544 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another 1580 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector 1581 * word of context in the vector
1547 */ 1582 */
1548static void 1583ecb_hot static void
1549mark (pointer a) 1584mark (pointer a)
1550{ 1585{
1551 pointer t, q, p; 1586 pointer t, q, p;
1552 1587
1553 t = 0; 1588 t = 0;
… …
1610 p = q; 1645 p = q;
1611 goto E6; 1646 goto E6;
1612 } 1647 }
1613} 1648}
1614 1649
1650ecb_hot static void
1651gc_free (SCHEME_P)
1652{
1653 int i;
1654 uint32_t total = 0;
1655
1656 /* Here we scan the cells to build the free-list. */
1657 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1658 {
1659 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1660 struct cell *p;
1661 total += SCHEME_V->cell_segsize [i];
1662
1663 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 {
1665 pointer c = POINTER (p);
1666
1667 if (is_mark (c))
1668 clrmark (c);
1669 else
1670 {
1671 /* reclaim cell */
1672 if (typeflag (c) != T_PAIR)
1673 {
1674 finalize_cell (SCHEME_A_ c);
1675 set_typeflag (c, T_PAIR);
1676 set_car (c, NIL);
1677 }
1678
1679 ++SCHEME_V->fcells;
1680 set_cdr (c, SCHEME_V->free_cell);
1681 SCHEME_V->free_cell = c;
1682 }
1683 }
1684 }
1685
1686 if (SCHEME_V->gc_verbose)
1687 {
1688 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");
1689 }
1690}
1691
1615/* garbage collection. parameter a, b is marked. */ 1692/* garbage collection. parameter a, b is marked. */
1616static void 1693ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1694gc (SCHEME_P_ pointer a, pointer b)
1618{ 1695{
1619 pointer p;
1620 int i; 1696 int i;
1621 1697
1622 if (SCHEME_V->gc_verbose) 1698 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1699 putstr (SCHEME_A_ "gc...");
1624 1700
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1716 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1717 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1718 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1719 mark (SCHEME_V->c_nest);
1644 1720
1721#if USE_INTCACHE
1722 /* mark intcache */
1723 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1724 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1725 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1726#endif
1727
1645 /* mark variables a, b */ 1728 /* mark variables a, b */
1646 mark (a); 1729 mark (a);
1647 mark (b); 1730 mark (b);
1648 1731
1649 /* garbage collect */ 1732 /* garbage collect */
1650 clrmark (NIL); 1733 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1734 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1735 SCHEME_V->free_cell = NIL;
1653 1736
1654 /* free-list is kept sorted by address so as to maintain consecutive
1655 ranges, if possible, for use with vectors. Here we scan the cells
1656 (which are also kept sorted by address) downwards to build the
1657 free-list in sorted order.
1658 */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1662
1663 while (--p >= SCHEME_V->cell_seg[i])
1664 {
1665 if (is_mark (p))
1666 clrmark (p);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (p) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose) 1737 if (SCHEME_V->gc_verbose)
1685 { 1738 putstr (SCHEME_A_ "freeing...");
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1688}
1689 1739
1690static void 1740 gc_free (SCHEME_A);
1691finalize_cell (SCHEME_P_ pointer a)
1692{
1693 /* TODO, fast bitmap check? */
1694 if (is_string (a))
1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1698#if USE_PORTS
1699 else if (is_port (a))
1700 {
1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1702 port_close (SCHEME_A_ a, port_input | port_output);
1703
1704 free (a->object.port);
1705 }
1706#endif
1707} 1741}
1708 1742
1709/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1710 1744
1711static int 1745ecb_cold static int
1712file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1713{ 1747{
1714#if USE_PORTS
1715 int fin; 1748 int fin;
1716 1749
1717 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1718 return 0; 1751 return 0;
1719 1752
… …
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1761 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1762 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1764
1732#if SHOW_ERROR_LINE 1765#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1767
1735 if (fname) 1768 if (fname)
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1737#endif 1770#endif
1738 } 1771 }
1739 1772
1740 return fin >= 0; 1773 return fin >= 0;
1741
1742#else
1743 return 1;
1744#endif
1745} 1774}
1746 1775
1747static void 1776ecb_cold static void
1748file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1749{ 1778{
1750 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1751 { 1780 {
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1782#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1784#endif
1756 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1787 }
1759} 1788}
1760 1789
1761static int 1790ecb_cold static int
1762file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1763{ 1792{
1764#if USE_PORTS 1793#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1797#else
1769 return 0; 1798 return 0;
1770#endif 1799#endif
1771} 1800}
1772 1801
1773#if USE_PORTS 1802#if USE_PORTS
1774static port * 1803ecb_cold static port *
1775port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1776{ 1805{
1777 int fd; 1806 int fd;
1778 int flags; 1807 int flags;
1779 char *rw; 1808 char *rw;
… …
1802# endif 1831# endif
1803 1832
1804 return pt; 1833 return pt;
1805} 1834}
1806 1835
1807static pointer 1836ecb_cold static pointer
1808port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1809{ 1838{
1810 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1811 1840
1812 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1813 return NIL; 1842 return NIL;
1814 1843
1815 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1816} 1845}
1817 1846
1818static port * 1847ecb_cold static port *
1819port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1820{ 1849{
1821 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1822 1851
1823 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1828 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1829 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1830 return pt; 1859 return pt;
1831} 1860}
1832 1861
1833static pointer 1862ecb_cold static pointer
1834port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1835{ 1864{
1836 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1837 1866
1838 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1839 return NIL; 1868 return NIL;
1840 1869
1841 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1842} 1871}
1843 1872
1844static port * 1873ecb_cold static port *
1845port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1875{
1847 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1848 1877
1849 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1856 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1857 return pt; 1886 return pt;
1858} 1887}
1859 1888
1860static pointer 1889ecb_cold static pointer
1861port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1862{ 1891{
1863 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1864 1893
1865 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1868 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1869} 1898}
1870 1899
1871# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1872 1901
1873static port * 1902ecb_cold static port *
1874port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1875{ 1904{
1876 char *start; 1905 char *start;
1877 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1878 1907
… …
1892 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1893 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1894 return pt; 1923 return pt;
1895} 1924}
1896 1925
1897static pointer 1926ecb_cold static pointer
1898port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1899{ 1928{
1900 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1901 1930
1902 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1903 return NIL; 1932 return NIL;
1904 1933
1905 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1906} 1935}
1907 1936
1908static void 1937ecb_cold static void
1909port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1910{ 1939{
1911 port *pt = p->object.port; 1940 port *pt = port (p);
1912 1941
1913 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1914 1943
1915 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1945 {
… …
1933 } 1962 }
1934} 1963}
1935#endif 1964#endif
1936 1965
1937/* get new character from input file */ 1966/* get new character from input file */
1938static int 1967ecb_cold static int
1939inchar (SCHEME_P) 1968inchar (SCHEME_P)
1940{ 1969{
1941 int c; 1970 int c;
1942 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1972
1946 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1947 return EOF; 1974 return EOF;
1948 1975
1949 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1959 } 1986 }
1960 1987
1961 return c; 1988 return c;
1962} 1989}
1963 1990
1964static int ungot = -1; 1991ecb_cold static int
1965
1966static int
1967basic_inchar (port *pt) 1992basic_inchar (port *pt)
1968{ 1993{
1969#if USE_PORTS
1970 if (pt->unget != -1) 1994 if (pt->unget != -1)
1971 { 1995 {
1972 int r = pt->unget; 1996 int r = pt->unget;
1973 pt->unget = -1; 1997 pt->unget = -1;
1974 return r; 1998 return r;
1975 } 1999 }
1976 2000
2001#if USE_PORTS
1977 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
1978 { 2003 {
1979 char c; 2004 char c;
1980 2005
1981 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
1989 return EOF; 2014 return EOF;
1990 else 2015 else
1991 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
1992 } 2017 }
1993#else 2018#else
1994 if (ungot == -1)
1995 {
1996 char c; 2019 char c;
1997 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
1998 return EOF; 2022 return EOF;
1999 2023
2000 ungot = c;
2001 }
2002
2003 {
2004 int r = ungot;
2005 ungot = -1;
2006 return r; 2024 return c;
2007 }
2008#endif 2025#endif
2009} 2026}
2010 2027
2011/* back character to input buffer */ 2028/* back character to input buffer */
2012static void 2029ecb_cold static void
2013backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2014{ 2031{
2015#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2016 port *pt;
2017 2033
2018 if (c == EOF) 2034 if (c == EOF)
2019 return; 2035 return;
2020 2036
2021 pt = SCHEME_V->inport->object.port;
2022 pt->unget = c; 2037 pt->unget = c;
2023#else
2024 if (c == EOF)
2025 return;
2026
2027 ungot = c;
2028#endif
2029} 2038}
2030 2039
2031#if USE_PORTS 2040#if USE_PORTS
2032static int 2041ecb_cold static int
2033realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2034{ 2043{
2035 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2036 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2045 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2037 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2050 else 2059 else
2051 return 0; 2060 return 0;
2052} 2061}
2053#endif 2062#endif
2054 2063
2055INTERFACE void 2064ecb_cold static void
2056putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2057{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2058#if USE_PORTS 2069#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port;
2060
2061 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s));
2063 else
2064 for (; *s; s++)
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = *s;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = *s;
2069
2070#else
2071 xwrstr (s);
2072#endif
2073}
2074
2075static void
2076putchars (SCHEME_P_ const char *s, int len)
2077{
2078#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port;
2080
2081 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2083 else 2072 else
2084 { 2073 {
2085 for (; len; len--) 2074 for (; len; len--)
… …
2090 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2091 } 2080 }
2092 } 2081 }
2093 2082
2094#else 2083#else
2095 write (1, s, len); 2084 write (1, s, len); // output not initialised
2096#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2097} 2092}
2098 2093
2099INTERFACE void 2094INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2101{ 2096{
2102#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port;
2104
2105 if (pt->kind & port_file)
2106 {
2107 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1);
2109 }
2110 else
2111 {
2112 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2113 *pt->rep.string.curr++ = c;
2114 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2115 *pt->rep.string.curr++ = c;
2116 }
2117
2118#else
2119 char cc = c; 2097 char cc = c;
2120 write (1, &c, 1); 2098
2121#endif 2099 putchars (SCHEME_A_ &cc, 1);
2122} 2100}
2123 2101
2124/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2125static char * 2103ecb_cold static char *
2126readstr_upto (SCHEME_P_ int skip, const char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2127{ 2105{
2128 char *p = SCHEME_V->strbuff + skip; 2106 char *p = SCHEME_V->strbuff + skip;
2129 2107
2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2108 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2139 2117
2140 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2141} 2119}
2142 2120
2143/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2144static pointer 2122ecb_cold static pointer
2145readstrexp (SCHEME_P_ char delim) 2123readstrexp (SCHEME_P_ char delim)
2146{ 2124{
2147 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2148 int c; 2126 int c;
2149 int c1 = 0; 2127 int c1 = 0;
… …
2182 case '7': 2160 case '7':
2183 state = st_oct1; 2161 state = st_oct1;
2184 c1 = c - '0'; 2162 c1 = c - '0';
2185 break; 2163 break;
2186 2164
2165 case 'a': *p++ = '\a'; state = st_ok; break;
2166 case 'n': *p++ = '\n'; state = st_ok; break;
2167 case 'r': *p++ = '\r'; state = st_ok; break;
2168 case 't': *p++ = '\t'; state = st_ok; break;
2169
2170 // this overshoots the minimum requirements of r7rs
2171 case ' ':
2172 case '\t':
2173 case '\r':
2174 case '\n':
2175 skipspace (SCHEME_A);
2176 state = st_ok;
2177 break;
2178
2179 //TODO: x should end in ;, not two-digit hex
2187 case 'x': 2180 case 'x':
2188 case 'X': 2181 case 'X':
2189 state = st_x1; 2182 state = st_x1;
2190 c1 = 0; 2183 c1 = 0;
2191 break;
2192
2193 case 'n':
2194 *p++ = '\n';
2195 state = st_ok;
2196 break;
2197
2198 case 't':
2199 *p++ = '\t';
2200 state = st_ok;
2201 break;
2202
2203 case 'r':
2204 *p++ = '\r';
2205 state = st_ok;
2206 break; 2184 break;
2207 2185
2208 default: 2186 default:
2209 *p++ = c; 2187 *p++ = c;
2210 state = st_ok; 2188 state = st_ok;
… …
2262 } 2240 }
2263 } 2241 }
2264} 2242}
2265 2243
2266/* check c is in chars */ 2244/* check c is in chars */
2267ecb_inline int 2245ecb_cold int
2268is_one_of (const char *s, int c) 2246is_one_of (const char *s, int c)
2269{ 2247{
2270 if (c == EOF)
2271 return 1;
2272
2273 return !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2274} 2249}
2275 2250
2276/* skip white characters */ 2251/* skip white characters */
2277ecb_inline int 2252ecb_cold int
2278skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2279{ 2254{
2280 int c, curr_line = 0; 2255 int c, curr_line = 0;
2281 2256
2282 do 2257 do
2283 { 2258 {
2284 c = inchar (SCHEME_A); 2259 c = inchar (SCHEME_A);
2260
2285#if SHOW_ERROR_LINE 2261#if SHOW_ERROR_LINE
2286 if (c == '\n') 2262 if (ecb_expect_false (c == '\n'))
2287 curr_line++; 2263 curr_line++;
2288#endif 2264#endif
2265
2266 if (ecb_expect_false (c == EOF))
2267 return c;
2289 } 2268 }
2290 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2269 while (is_one_of (WHITESPACE, c));
2291 2270
2292 /* record it */ 2271 /* record it */
2293#if SHOW_ERROR_LINE 2272#if SHOW_ERROR_LINE
2294 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2273 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2295 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2274 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2296#endif 2275#endif
2297 2276
2298 if (c != EOF)
2299 {
2300 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2301 return 1; 2278 return 1;
2302 }
2303 else
2304 return EOF;
2305} 2279}
2306 2280
2307/* get token */ 2281/* get token */
2308static int 2282ecb_cold static int
2309token (SCHEME_P) 2283token (SCHEME_P)
2310{ 2284{
2311 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2312 2286
2313 if (c == EOF) 2287 if (c == EOF)
… …
2325 return TOK_RPAREN; 2299 return TOK_RPAREN;
2326 2300
2327 case '.': 2301 case '.':
2328 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2329 2303
2330 if (is_one_of (" \n\t", c)) 2304 if (is_one_of (WHITESPACE, c))
2331 return TOK_DOT; 2305 return TOK_DOT;
2332 else 2306 else
2333 { 2307 {
2334 backchar (SCHEME_A_ c); 2308 backchar (SCHEME_A_ c);
2335 return TOK_DOTATOM; 2309 return TOK_DOTATOM;
… …
2411} 2385}
2412 2386
2413/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2415 2389
2416static void 2390ecb_cold static void
2417printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2418{ 2392{
2419 int i; 2393 int i;
2420 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2421 2395
… …
2476 } 2450 }
2477 2451
2478 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2479} 2453}
2480 2454
2481
2482/* print atoms */ 2455/* print atoms */
2483static void 2456ecb_cold static void
2484printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2485{ 2458{
2486 char *p; 2459 char *p;
2487 int len; 2460 int len;
2488 2461
2489 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2490 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2491} 2464}
2492 2465
2493
2494/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2495static void 2467ecb_cold static void
2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497{ 2469{
2498 char *p; 2470 char *p;
2499 2471
2500 if (l == NIL) 2472 if (l == NIL)
… …
2658#endif 2630#endif
2659 } 2631 }
2660 else if (is_continuation (l)) 2632 else if (is_continuation (l))
2661 p = "#<CONTINUATION>"; 2633 p = "#<CONTINUATION>";
2662 else 2634 else
2635 {
2636#if USE_PRINTF
2637 p = SCHEME_V->strbuff;
2638 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2639#else
2663 p = "#<ERROR>"; 2640 p = "#<ERROR>";
2641#endif
2642 }
2664 2643
2665 *pp = p; 2644 *pp = p;
2666 *plen = strlen (p); 2645 *plen = strlen (p);
2667} 2646}
2668 2647
… …
2700 return car (d); 2679 return car (d);
2701 2680
2702 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2703 q = p; 2682 q = p;
2704 2683
2705 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2706 { 2685 {
2707 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2708 2687
2709 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2710 p = cdr (d); 2689 p = cdr (d);
2711 } 2690 }
2712 2691
2713 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2714 return q; 2693 return q;
2715} 2694}
2716 2695
2717/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2718static pointer 2697ecb_hot static pointer
2719reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2720{ 2699{
2721 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2722 pointer p = NIL; 2701 pointer p = NIL;
2723 2702
… …
2726 2705
2727 return p; 2706 return p;
2728} 2707}
2729 2708
2730/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2731static pointer 2710ecb_hot static pointer
2732reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2733{ 2712{
2734 pointer result = term; 2713 pointer result = term;
2735 pointer p = list; 2714 pointer p = list;
2736 2715
… …
2744 2723
2745 return result; 2724 return result;
2746} 2725}
2747 2726
2748/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2749static pointer 2728ecb_hot static pointer
2750revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2751{ 2730{
2752 pointer result = a; 2731 pointer result = a;
2753 pointer p = b; 2732 pointer p = b;
2754 2733
… …
2763 2742
2764 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2765} 2744}
2766 2745
2767/* equivalence of atoms */ 2746/* equivalence of atoms */
2768int 2747ecb_hot int
2769eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2770{ 2749{
2771 if (is_string (a)) 2750 if (is_string (a))
2772 { 2751 {
2773 if (is_string (b)) 2752 if (is_string (b))
… …
2867 } 2846 }
2868 else 2847 else
2869 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2870} 2849}
2871 2850
2872static pointer 2851ecb_hot static pointer
2873find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2874{ 2853{
2875 pointer x, y; 2854 pointer x, y;
2876 2855
2877 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
… …
2898 return NIL; 2877 return NIL;
2899} 2878}
2900 2879
2901#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2902 2881
2903ecb_inline void 2882static void
2904new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2905{ 2884{
2906 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2907 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2908} 2887}
2909 2888
2910ecb_inline void 2889static void
2911new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2890new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2912{ 2891{
2913 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2914} 2893}
2915 2894
2916static pointer 2895ecb_hot static pointer
2917find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2918{ 2897{
2919 pointer x, y; 2898 pointer x, y;
2920 2899
2921 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2935 return NIL; 2914 return NIL;
2936} 2915}
2937 2916
2938#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2939 2918
2940ecb_inline void 2919static void
2941new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2942{ 2921{
2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2943 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2923 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2944} 2924}
2945 2925
2946ecb_inline void 2926static void
2947set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2948{ 2928{
2949 set_cdr (slot, value); 2929 set_cdr (slot, value);
2950} 2930}
2951 2931
2952ecb_inline pointer 2932static pointer
2953slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2954{ 2934{
2955 return cdr (slot); 2935 return cdr (slot);
2956} 2936}
2957 2937
2958/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
2959 2939
2960static int 2940ecb_cold static int
2961xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
2962{ 2942{
2963#if USE_ERROR_HOOK
2964 pointer x;
2965 pointer hdl = SCHEME_V->ERROR_HOOK;
2966#endif
2967
2968#if USE_PRINTF 2943#if USE_PRINTF
2969#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
2970 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
2971 2946
2972 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
2987 } 2962 }
2988#endif 2963#endif
2989#endif 2964#endif
2990 2965
2991#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
2992 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2967 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2993 2968
2994 if (x != NIL) 2969 if (x != NIL)
2995 { 2970 {
2996 pointer code = a 2971 pointer code = a
2997 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3041 pointer code; 3016 pointer code;
3042}; 3017};
3043 3018
3044# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3045 3020
3046static void 3021ecb_hot static void
3047s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3048{ 3023{
3049 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3050 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3051 3026
3052 /* enough room for the next frame? */ 3027 /* enough room for the next frame? */
3053 if (nframes >= SCHEME_V->dump_size) 3028 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3054 { 3029 {
3055 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3056 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3057 } 3032 }
3058 3033
… …
3064 next_frame->code = code; 3039 next_frame->code = code;
3065 3040
3066 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3067} 3042}
3068 3043
3069static int 3044static ecb_hot int
3070xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3071{ 3046{
3072 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3073 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3074 3049
… …
3085 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3086 3061
3087 return 0; 3062 return 0;
3088} 3063}
3089 3064
3090ecb_inline void 3065ecb_cold void
3091dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3092{ 3067{
3093 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3094 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3095} 3070}
3096 3071
3097ecb_inline void 3072ecb_cold void
3098dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3099{ 3074{
3100 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3101 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3102 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3103} 3078}
3104 3079
3105static void 3080ecb_cold static void
3106dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3107{ 3082{
3108 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3109 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3110 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3111 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3112} 3087}
3113 3088
3114static void 3089ecb_cold static void
3115dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3116{ 3091{
3117 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3118 int i; 3093 int i;
3119 3094
… …
3125 mark (frame->envir); 3100 mark (frame->envir);
3126 mark (frame->code); 3101 mark (frame->code);
3127 } 3102 }
3128} 3103}
3129 3104
3130static pointer 3105ecb_cold static pointer
3131ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3132{ 3107{
3133 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3134 int i; 3109 int i;
3135 3110
… …
3147 } 3122 }
3148 3123
3149 return cont; 3124 return cont;
3150} 3125}
3151 3126
3152static void 3127ecb_cold static void
3153ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3154{ 3129{
3155 int i = 0; 3130 int i = 0;
3156 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3157 3132
… …
3169 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3170} 3145}
3171 3146
3172#else 3147#else
3173 3148
3174ecb_inline void 3149ecb_cold void
3175dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3176{ 3151{
3177 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3178} 3153}
3179 3154
3180ecb_inline void 3155ecb_cold void
3181dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3182{ 3157{
3183 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3184} 3159}
3185 3160
3186static void 3161ecb_cold static void
3187dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3188{ 3163{
3189 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3190} 3165}
3191 3166
3192static int 3167ecb_hot static int
3193xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3194{ 3169{
3195 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3196 3171
3197 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3207 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3208 3183
3209 return 0; 3184 return 0;
3210} 3185}
3211 3186
3212static void 3187ecb_hot static void
3213s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3214{ 3189{
3215 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3216 cons (args, 3191 cons (args,
3217 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3218 cons (code, 3193 cons (code,
3219 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3220} 3195}
3221 3196
3197ecb_cold static void
3198dump_stack_mark (SCHEME_P)
3199{
3200 mark (SCHEME_V->dump);
3201}
3202
3203ecb_cold static pointer
3204ss_get_cont (SCHEME_P)
3205{
3206 return SCHEME_V->dump;
3207}
3208
3209ecb_cold static void
3210ss_set_cont (SCHEME_P_ pointer cont)
3211{
3212 SCHEME_V->dump = cont;
3213}
3214
3215#endif
3216
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218
3219#if EXPERIMENT
3220
3221static int
3222dtree (SCHEME_P_ int indent, pointer x)
3223{
3224 int c;
3225
3226 if (is_syntax (x))
3227 {
3228 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3229 return 8 + 8;
3230 }
3231
3232 if (x == NIL)
3233 {
3234 printf ("%*sNIL\n", indent, "");
3235 return 3;
3236 }
3237
3238 switch (type (x))
3239 {
3240 case T_INTEGER:
3241 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3242 return 32+8;
3243
3244 case T_SYMBOL:
3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3246 return 24+8;
3247
3248 case T_CLOSURE:
3249 printf ("%*sS<%s>\n", indent, "", "closure");
3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3252
3253 case T_PAIR:
3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3257 return c + 1;
3258
3259 case T_PORT:
3260 printf ("%*sS<%s>\n", indent, "", "port");
3261 return 24+8;
3262
3263 case T_VECTOR:
3264 printf ("%*sS<%s>\n", indent, "", "vector");
3265 return 24+8;
3266
3267 case T_ENVIRONMENT:
3268 printf ("%*sS<%s>\n", indent, "", "environment");
3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3270
3271 default:
3272 printf ("unhandled type %d\n", type (x));
3273 break;
3274 }
3275}
3276
3277#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3278
3279typedef void *stream[1];
3280
3281#define stream_init() { 0 }
3282#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3283#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3284#define stream_free(s) free (s[0])
3285
3286ecb_cold static void
3287stream_put (stream s, uint8_t byte)
3288{
3289 uint32_t *sp = *s;
3290 uint32_t size = sizeof (uint32_t) * 2;
3291 uint32_t offs = size;
3292
3293 if (ecb_expect_true (sp))
3294 {
3295 offs = sp[0];
3296 size = sp[1];
3297 }
3298
3299 if (ecb_expect_false (offs == size))
3300 {
3301 size *= 2;
3302 sp = realloc (sp, size);
3303 *s = sp;
3304 sp[1] = size;
3305
3306 }
3307
3308 ((uint8_t *)sp)[offs++] = byte;
3309 sp[0] = offs;
3310}
3311
3312ecb_cold static void
3313stream_put_v (stream s, uint32_t v)
3314{
3315 while (v > 0x7f)
3316 {
3317 stream_put (s, v | 0x80);
3318 v >>= 7;
3319 }
3320
3321 stream_put (s, v);
3322}
3323
3324ecb_cold static void
3325stream_put_tv (stream s, int bop, uint32_t v)
3326{
3327 printf ("put tv %d %d\n", bop, v);//D
3328 stream_put (s, bop);
3329 stream_put_v (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_stream (stream s, stream o)
3334{
3335 uint32_t i;
3336
3337 for (i = 0; i < stream_size (o); ++i)
3338 stream_put (s, stream_data (o)[i]);
3339
3340 stream_free (o);
3341}
3342
3343// calculates a (preferably small) integer that makes it possible to find
3344// the symbol again. if pointers were offsets into a memory area... until
3345// then, we return segment number in the low bits, and offset in the high
3346// bits.
3347// also, this function must never return 0.
3348ecb_cold static uint32_t
3349symbol_id (SCHEME_P_ pointer sym)
3350{
3351 struct cell *p = CELL (sym);
3352 int i;
3353
3354 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3355 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3356 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3357
3358 abort ();
3359}
3360
3361ecb_cold static uint32_t
3362cell_id (SCHEME_P_ pointer p)
3363{
3364 return symbol_id (SCHEME_A_ p);
3365}
3366
3367enum byteop
3368{
3369 BOP_NIL,
3370 BOP_SYNTAX,
3371 BOP_INTEGER,
3372 BOP_SYMBOL,
3373 BOP_LIST_BEG,
3374 BOP_LIST_END,
3375 BOP_BIFT, // branch if true
3376 BOP_BIFF, // branch if false
3377 BOP_BIFNE, // branch if not eqv?
3378 BOP_BRA, // "short" branch
3379 BOP_JMP, // "long" jump
3380 BOP_DATUM,
3381 BOP_LET,
3382 BOP_LETAST,
3383 BOP_LETREC,
3384 BOP_DEFINE,
3385 BOP_MACRO,
3386 BOP_SET,
3387 BOP_BEGIN,
3388 BOP_LAMBDA,
3389};
3390
3391ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3392
3393ecb_cold static void
3394compile_list (SCHEME_P_ stream s, pointer x)
3395{
3396 for (; x != NIL; x = cdr (x))
3397 compile_expr (SCHEME_A_ s, car (x));
3398}
3399
3222static void 3400static void
3223dump_stack_mark (SCHEME_P) 3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3224{ 3402{
3225 mark (SCHEME_V->dump); 3403 //TODO: borked
3226} 3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3227 3405
3228static pointer 3406 stream_put (s, BOP_BIFF);
3229ss_get_cont (SCHEME_P) 3407 compile_expr (SCHEME_A_ s, cond);
3408 stream_put_v (s, stream_size (sift));
3409 stream_put_stream (s, sift);
3410
3411 if (iff != NIL)
3412 {
3413 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3414 stream_put_tv (s, BOP_BRA, stream_size (siff));
3415 stream_put_stream (s, siff);
3416 }
3417}
3418
3419typedef uint32_t stream_fixup;
3420
3421static stream_fixup
3422stream_put_fixup (stream s)
3230{ 3423{
3231 return SCHEME_V->dump; 3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3232} 3428}
3233 3429
3234static void 3430static void
3235ss_set_cont (SCHEME_P_ pointer cont) 3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3236{ 3432{
3237 SCHEME_V->dump = cont; 3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3238} 3437}
3239 3438
3240#endif
3241
3242#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3243
3244static int 3439static void
3440compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3441{
3442 if (cdr (x) == NIL)
3443 compile_expr (SCHEME_A_ s, car (x));
3444 else
3445 {
3446 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3447 compile_expr (SCHEME_A_ s, car (x));
3448 stream_fixup end = stream_put_fixup (s);
3449
3450 compile_and_or (SCHEME_A_ s, and, cdr (x));
3451 stream_fix_fixup (s, end, stream_size (s));
3452 }
3453}
3454
3455ecb_cold static void
3456compile_expr (SCHEME_P_ stream s, pointer x)
3457{
3458 if (x == NIL)
3459 {
3460 stream_put (s, BOP_NIL);
3461 return;
3462 }
3463
3464 if (is_pair (x))
3465 {
3466 pointer head = car (x);
3467
3468 if (is_syntax (head))
3469 {
3470 x = cdr (x);
3471
3472 switch (syntaxnum (head))
3473 {
3474 case OP_IF0: /* if */
3475 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3476 break;
3477
3478 case OP_OR0: /* or */
3479 compile_and_or (SCHEME_A_ s, 0, x);
3480 break;
3481
3482 case OP_AND0: /* and */
3483 compile_and_or (SCHEME_A_ s, 1, x);
3484 break;
3485
3486 case OP_CASE0: /* case */
3487 abort ();
3488 break;
3489
3490 case OP_COND0: /* cond */
3491 abort ();
3492 break;
3493
3494 case OP_LET0: /* let */
3495 case OP_LET0AST: /* let* */
3496 case OP_LET0REC: /* letrec */
3497 switch (syntaxnum (head))
3498 {
3499 case OP_LET0: stream_put (s, BOP_LET ); break;
3500 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3501 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3502 }
3503
3504 {
3505 pointer bindings = car (x);
3506 pointer body = cadr (x);
3507
3508 for (x = bindings; x != NIL; x = cdr (x))
3509 {
3510 pointer init = NIL;
3511 pointer var = car (x);
3512
3513 if (is_pair (var))
3514 {
3515 init = cdr (var);
3516 var = car (var);
3517 }
3518
3519 stream_put_v (s, symbol_id (SCHEME_A_ var));
3520 compile_expr (SCHEME_A_ s, init);
3521 }
3522
3523 stream_put_v (s, 0);
3524 compile_expr (SCHEME_A_ s, body);
3525 }
3526 break;
3527
3528 case OP_DEF0: /* define */
3529 case OP_MACRO0: /* macro */
3530 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3531 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3532 compile_expr (SCHEME_A_ s, cadr (x));
3533 break;
3534
3535 case OP_SET0: /* set! */
3536 stream_put (s, BOP_SET);
3537 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3538 compile_expr (SCHEME_A_ s, cadr (x));
3539 break;
3540
3541 case OP_BEGIN: /* begin */
3542 stream_put (s, BOP_BEGIN);
3543 compile_list (SCHEME_A_ s, x);
3544 return;
3545
3546 case OP_DELAY: /* delay */
3547 abort ();
3548 break;
3549
3550 case OP_QUOTE: /* quote */
3551 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3552 break;
3553
3554 case OP_LAMBDA: /* lambda */
3555 {
3556 pointer formals = car (x);
3557 pointer body = cadr (x);
3558
3559 stream_put (s, BOP_LAMBDA);
3560
3561 for (; is_pair (formals); formals = cdr (formals))
3562 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3563
3564 stream_put_v (s, 0);
3565 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3566
3567 compile_expr (SCHEME_A_ s, body);
3568 }
3569 break;
3570
3571 case OP_C0STREAM:/* cons-stream */
3572 abort ();
3573 break;
3574 }
3575
3576 return;
3577 }
3578
3579 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3580
3581 if (m != NIL)
3582 {
3583 m = slot_value_in_env (m);
3584
3585 if (is_macro (m))
3586 {
3587 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3588 SCHEME_V->code = m;
3589 SCHEME_V->args = cons (x, NIL);
3590 Eval_Cycle (SCHEME_A_ OP_APPLY);
3591 x = SCHEME_V->value;
3592 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3593 return;
3594 }
3595 }
3596 }
3597
3598 switch (type (x))
3599 {
3600 case T_INTEGER:
3601 {
3602 IVALUE iv = ivalue_unchecked (x);
3603 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3604 stream_put_tv (s, BOP_INTEGER, iv);
3605 }
3606 return;
3607
3608 case T_SYMBOL:
3609 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3610 return;
3611
3612 case T_PAIR:
3613 stream_put (s, BOP_LIST_BEG);
3614
3615 for (; x != NIL; x = cdr (x))
3616 compile_expr (SCHEME_A_ s, car (x));
3617
3618 stream_put (s, BOP_LIST_END);
3619 return;
3620
3621 default:
3622 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3623 break;
3624 }
3625}
3626
3627ecb_cold static int
3628compile_closure (SCHEME_P_ pointer p)
3629{
3630 stream s = stream_init ();
3631
3632 compile_list (SCHEME_A_ s, cdar (p));
3633
3634 FILE *xxd = popen ("xxd", "we");
3635 fwrite (stream_data (s), 1, stream_size (s), xxd);
3636 fclose (xxd);
3637
3638 return stream_size (s);
3639}
3640
3641#endif
3642
3643/* syntax, eval, core, ... */
3644ecb_hot static int
3245opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3246{ 3646{
3247 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3248 pointer x, y; 3648 pointer x, y;
3249 3649
3250 switch (op) 3650 switch (op)
3251 { 3651 {
3652#if EXPERIMENT //D
3653 case OP_DEBUG:
3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3657 printf ("\n");
3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3663#endif
3664
3252 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3253 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3254 { 3667 {
3255 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3668 putstr (SCHEME_A_ "Loading ");
3256 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3669 putstr (SCHEME_A_ strvalue (car (args)));
3670 putcharacter (SCHEME_A_ '\n');
3257 } 3671 }
3258 3672
3259 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3260 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3261 else 3675
3262 {
3263 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3264 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3265 }
3266 3678
3267 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3268 3680
3269 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3270 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3271 { 3683 {
3272 if (SCHEME_V->file_i == 0) 3684 if (SCHEME_V->file_i == 0)
3273 { 3685 {
3274 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3275 s_goto (OP_QUIT); 3687 s_goto (OP_QUIT);
… …
3286 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3287 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3288 { 3700 {
3289 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3290 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3291 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3292 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3293 } 3708 }
3294 3709
3295 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3296 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3331 { 3746 {
3332 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3333 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3334 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3335 } 3750 }
3336 else 3751
3337 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3338 3753
3339 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3340#if USE_TRACING 3755#if USE_TRACING
3341 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3342 { 3757 {
… …
3353#endif 3768#endif
3354 if (is_symbol (SCHEME_V->code)) /* symbol */ 3769 if (is_symbol (SCHEME_V->code)) /* symbol */
3355 { 3770 {
3356 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3771 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3357 3772
3358 if (x != NIL) 3773 if (x == NIL)
3359 s_return (slot_value_in_env (x));
3360 else
3361 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3774 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3775
3776 s_return (slot_value_in_env (x));
3362 } 3777 }
3363 else if (is_pair (SCHEME_V->code)) 3778 else if (is_pair (SCHEME_V->code))
3364 { 3779 {
3365 x = car (SCHEME_V->code); 3780 x = car (SCHEME_V->code);
3366 3781
… …
3375 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3790 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3376 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3377 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3378 } 3793 }
3379 } 3794 }
3380 else 3795
3381 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3382 3797
3383 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3384 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3385 { 3800 {
3386 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3387 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3388 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3389 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3390 } 3805 }
3391 else 3806
3392 {
3393 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3394 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3395 }
3396 3809
3397 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3398 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3399 3812
3400 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3411 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3412 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3413 } 3826 }
3414 3827
3415#if USE_TRACING 3828#if USE_TRACING
3416
3417 case OP_TRACING: 3829 case OP_TRACING:
3418 { 3830 {
3419 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3420 3832
3421 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3422 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3423 } 3835 }
3424
3425#endif 3836#endif
3426 3837
3427 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3428#if USE_TRACING 3839#if USE_TRACING
3429 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3443 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3854 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3444 else if (is_foreign (SCHEME_V->code)) 3855 else if (is_foreign (SCHEME_V->code))
3445 { 3856 {
3446 /* Keep nested calls from GC'ing the arglist */ 3857 /* Keep nested calls from GC'ing the arglist */
3447 push_recent_alloc (SCHEME_A_ args, NIL); 3858 push_recent_alloc (SCHEME_A_ args, NIL);
3448 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3859 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3449 3860
3450 s_return (x); 3861 s_return (x);
3451 } 3862 }
3452 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3863 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3453 { 3864 {
… …
3483 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3484 { 3895 {
3485 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3486 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3487 } 3898 }
3488 else 3899
3489 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3490 3901
3491 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3492 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3493 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3494
3495#if 1
3496 3905
3497 case OP_LAMBDA: /* lambda */ 3906 case OP_LAMBDA: /* lambda */
3498 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3907 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3499 set SCHEME_V->value fall thru */ 3908 set SCHEME_V->value fall thru */
3500 { 3909 {
… …
3507 SCHEME_V->code = slot_value_in_env (f); 3916 SCHEME_V->code = slot_value_in_env (f);
3508 s_goto (OP_APPLY); 3917 s_goto (OP_APPLY);
3509 } 3918 }
3510 3919
3511 SCHEME_V->value = SCHEME_V->code; 3920 SCHEME_V->value = SCHEME_V->code;
3512 /* Fallthru */
3513 } 3921 }
3922 /* Fallthru */
3514 3923
3515 case OP_LAMBDA1: 3924 case OP_LAMBDA1:
3516 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3925 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3517
3518#else
3519
3520 case OP_LAMBDA: /* lambda */
3521 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3522
3523#endif
3524 3926
3525 case OP_MKCLOSURE: /* make-closure */ 3927 case OP_MKCLOSURE: /* make-closure */
3526 x = car (args); 3928 x = car (args);
3527 3929
3528 if (car (x) == SCHEME_V->LAMBDA) 3930 if (car (x) == SCHEME_V->LAMBDA)
… …
3567 else 3969 else
3568 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3970 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3569 3971
3570 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3571 3973
3572
3573 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3574 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3575 3976
3576 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3577 x = cadr (args); 3978 x = cadr (args);
… …
3595 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3596 } 3997 }
3597 else 3998 else
3598 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3599 4000
3600
3601 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3602 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3603 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3604 4004
3605 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3616 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3617 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3618 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3619 else 4019 else
3620 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4020 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4021
3621 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3622 4023
3623 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3624 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3625 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3626 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4027 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3627 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3628 4029
3629 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3630 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3631 4033
3632 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3633 { 4035 {
3634 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4036 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3635 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4037 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3636 4038
3637 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3638 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3639 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3640 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3641 } 4043 }
3642 else /* end */ 4044
3643 { 4045 /* end */
3644 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3645 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3646 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3647 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3648 }
3649 4050
3650 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3651 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3652 4053
3653 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4054 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3657 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3658 { 4059 {
3659 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4060 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3660 { 4061 {
3661 if (!is_pair (x)) 4062 if (!is_pair (x))
3662 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3663 4064
3664 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3665 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3666 4067
3667 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3668 } 4069 }
3669 4070
3670 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4071 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3687 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3688 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3689 } 4090 }
3690 4091
3691 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4092 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3692 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4093 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3693 4094
3694 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4095 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3695 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3696 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3697 4098
… …
3708 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3709 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3710 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3711 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3712 } 4113 }
3713 else /* end */ 4114
4115 /* end */
3714 { 4116
3715 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3716 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3717 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3718 }
3719 4120
3720 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3721 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3722 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3723 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3724 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3725 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3726 4127
3727 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3728 args = cons (SCHEME_V->value, args);
3729
3730 if (is_pair (SCHEME_V->code)) /* continue */
3731 {
3732 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3733 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3734
3735 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3736 SCHEME_V->code = cadar (SCHEME_V->code);
3737 SCHEME_V->args = NIL;
3738 s_goto (OP_EVAL);
3739 }
3740 else /* end */
3741 {
3742 args = reverse_in_place (SCHEME_A_ NIL, args);
3743 SCHEME_V->code = car (args);
3744 SCHEME_V->args = cdr (args);
3745 s_goto (OP_LET2REC);
3746 }
3747 4129
3748 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3749 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4131 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3750 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3751 4133
… …
3781 } 4163 }
3782 else 4164 else
3783 { 4165 {
3784 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3785 s_return (NIL); 4167 s_return (NIL);
3786 else 4168
3787 {
3788 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3789 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3790 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3791 }
3792 } 4172 }
3793 4173
3794 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3795 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4175 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3796 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3807 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3808 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3809 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3810 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3811 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3812 else 4192
3813 {
3814 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3815 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3816 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3817 }
3818 4196
3819 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3820 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3821 s_return (S_F); 4199 s_return (S_F);
3822 4200
… …
3827 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3828 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3829 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3830 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3831 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3832 else 4210
3833 {
3834 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3835 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3836 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3837 }
3838 4214
3839 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3840 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3841 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3842 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3907 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3908 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3909 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3910 } 4286 }
3911 } 4287 }
3912 else 4288
3913 s_return (NIL); 4289 s_return (NIL);
3914 4290
3915 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
3916 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
3917 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
3918 else 4294
3919 s_return (NIL); 4295 s_return (NIL);
3920 4296
3921 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
3922 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
3923 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3924 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
3938 } 4314 }
3939 4315
3940 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
3941} 4317}
3942 4318
3943static int 4319/* math, cxr */
4320ecb_hot static int
3944opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3945{ 4322{
3946 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
3947 pointer x = car (args); 4324 pointer x = car (args);
3948 num v; 4325 num v;
3949 4326
3950 switch (op) 4327 switch (op)
3951 { 4328 {
3952#if USE_MATH 4329#if USE_MATH
3953 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
3954 {
3955 if (is_integer (x)) 4331 if (!is_integer (x))
3956 s_return (x); 4332 {
3957
3958 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
3959 4334
3960 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
3961 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3962 else 4337 else
3963 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
3964 } 4339 }
3965 4340
4341 s_return (x);
4342
4343 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4344 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4345 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4346 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4347
4348 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3966 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4349 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3967 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4350 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4351 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3968 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4352 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3969 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4353 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3970 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4354 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3971 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4355 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3972 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4356 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 4357
3974 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
3975 if (cdr (args) == NIL) 4360 cdr (args) == NIL
3976 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
3977 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
3978 {
3979 pointer y = cadr (args);
3980 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3981 }
3982
3983 case OP_SQRT:
3984 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3985 4363
3986 case OP_EXPT: 4364 case OP_EXPT:
3987 { 4365 {
3988 RVALUE result; 4366 RVALUE result;
3989 int real_result = 1; 4367 int real_result = 1;
… …
4012 if (real_result) 4390 if (real_result)
4013 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4014 else 4392 else
4015 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4016 } 4394 }
4017
4018 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4019 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4020
4021 case OP_TRUNCATE:
4022 {
4023 RVALUE n = rvalue (x);
4024 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4025 }
4026
4027 case OP_ROUND:
4028 if (is_integer (x))
4029 s_return (x);
4030
4031 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4032#endif 4395#endif
4033 4396
4034 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4035 v = num_zero; 4398 v = num_zero;
4036 4399
… …
4124 else 4487 else
4125 Error_0 ("modulo: division by zero"); 4488 Error_0 ("modulo: division by zero");
4126 4489
4127 s_return (mk_number (SCHEME_A_ v)); 4490 s_return (mk_number (SCHEME_A_ v));
4128 4491
4129 case OP_CAR: /* car */ 4492 /* the compiler will optimize this mess... */
4130 s_return (caar (args)); 4493 case OP_CAR: op_car: s_return (car (x));
4131 4494 case OP_CDR: op_cdr: s_return (cdr (x));
4132 case OP_CDR: /* cdr */ 4495 case OP_CAAR: op_caar: x = car (x); goto op_car;
4133 s_return (cdar (args)); 4496 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4497 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4498 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4499 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4500 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4501 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4502 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4503 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4504 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4505 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4506 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4507 case OP_CAAAAR: x = car (x); goto op_caaar;
4508 case OP_CAAADR: x = cdr (x); goto op_caaar;
4509 case OP_CAADAR: x = car (x); goto op_caadr;
4510 case OP_CAADDR: x = cdr (x); goto op_caadr;
4511 case OP_CADAAR: x = car (x); goto op_cadar;
4512 case OP_CADADR: x = cdr (x); goto op_cadar;
4513 case OP_CADDAR: x = car (x); goto op_caddr;
4514 case OP_CADDDR: x = cdr (x); goto op_caddr;
4515 case OP_CDAAAR: x = car (x); goto op_cdaar;
4516 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4517 case OP_CDADAR: x = car (x); goto op_cdadr;
4518 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4519 case OP_CDDAAR: x = car (x); goto op_cddar;
4520 case OP_CDDADR: x = cdr (x); goto op_cddar;
4521 case OP_CDDDAR: x = car (x); goto op_cdddr;
4522 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4134 4523
4135 case OP_CONS: /* cons */ 4524 case OP_CONS: /* cons */
4136 set_cdr (args, cadr (args)); 4525 set_cdr (args, cadr (args));
4137 s_return (args); 4526 s_return (args);
4138 4527
… …
4312 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4313 4702
4314 s_return (newstr); 4703 s_return (newstr);
4315 } 4704 }
4316 4705
4317 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4318 { 4707 {
4319 char *str = strvalue (x); 4708 char *str = strvalue (x);
4320 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4321 int index1; 4710 int index1;
4322 int len; 4711 int len;
4323 4712
4324 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4325 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4326 4715
4327 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4328 { 4717 {
4329 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4330 4719
4331 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4332 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4333 } 4722 }
4334 else 4723 else
4335 index1 = strlength (x); 4724 index1 = strlength (x);
4336 4725
4337 len = index1 - index0; 4726 len = index1 - index0;
4338 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4339 memcpy (strvalue (x), str + index0, len);
4340 strvalue (x)[len] = 0;
4341 4728
4342 s_return (x); 4729 s_return (x);
4343 } 4730 }
4344 4731
4345 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4419 } 4806 }
4420 4807
4421 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4422} 4809}
4423 4810
4424static int 4811/* relational ops */
4812ecb_hot static int
4425opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4426{ 4814{
4427 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4428 4816
4429 for (;;) 4817 for (;;)
… …
4450 } 4838 }
4451 4839
4452 s_return (S_T); 4840 s_return (S_T);
4453} 4841}
4454 4842
4455static int 4843/* predicates */
4844ecb_hot static int
4456opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4457{ 4846{
4458 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4459 pointer a = car (args); 4848 pointer a = car (args);
4460 pointer d = cdr (args); 4849 pointer d = cdr (args);
4461 int r; 4850 int r;
4462 4851
4463 switch (op) 4852 switch (op)
4464 { 4853 {
4465 case OP_NOT: /* not */ r = is_false (a) ; break; 4854 case OP_NOT: /* not */ r = is_false (a) ; break;
4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4855 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4856 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break; 4857 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4858 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4859 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4860 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4861 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4862 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4863 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4864 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475 4865
4476#if USE_CHAR_CLASSIFIERS 4866#if USE_CHAR_CLASSIFIERS
4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4867 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4868 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4869 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4506 } 4896 }
4507 4897
4508 s_retbool (r); 4898 s_retbool (r);
4509} 4899}
4510 4900
4511static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4512opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4513{ 4904{
4514 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4515 pointer a = car (args); 4906 pointer a = car (args);
4516 pointer x, y; 4907 pointer x, y;
… …
4529 } 4920 }
4530 else 4921 else
4531 s_return (SCHEME_V->code); 4922 s_return (SCHEME_V->code);
4532 4923
4533 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4535 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4536 4927
4537#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4538 4932
4539 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4540 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4541 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4542 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4556 else 4950 else
4557 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4558 4952
4559 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4560 4954
4955 //TODO: move to scheme
4561 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4562 if (is_pair (args)) 4957 if (is_pair (args))
4563 { 4958 {
4564 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4565 { 4960 {
… …
4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4568 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4569 } 4964 }
4570 } 4965 }
4571 4966
4572 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4573 s_return (S_T); 4968 s_return (S_T);
4574#endif 4969#endif
4575 4970
4576 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4577 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4586 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4587 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4588 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4589 4984
4590 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4591 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4592 4987
4593 if (args != NIL) 4988 if (args != NIL)
4594 { 4989 {
4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4596 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4597 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4598 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4599 } 4994 }
4600 else 4995 else
4601 { 4996 {
4602 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4603 4998
4604 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4605 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4606 else 5001 else
4607 return -1; 5002 return -1;
… …
4684 SCHEME_V->gc_verbose = (a != S_F); 5079 SCHEME_V->gc_verbose = (a != S_F);
4685 s_retbool (was); 5080 s_retbool (was);
4686 } 5081 }
4687 5082
4688 case OP_NEWSEGMENT: /* new-segment */ 5083 case OP_NEWSEGMENT: /* new-segment */
5084#if 0
4689 if (!is_pair (args) || !is_number (a)) 5085 if (!is_pair (args) || !is_number (a))
4690 Error_0 ("new-segment: argument must be a number"); 5086 Error_0 ("new-segment: argument must be a number");
4691 5087#endif
4692 alloc_cellseg (SCHEME_A_ ivalue (a)); 5088 s_retbool (alloc_cellseg (SCHEME_A));
4693
4694 s_return (S_T);
4695 5089
4696 case OP_OBLIST: /* oblist */ 5090 case OP_OBLIST: /* oblist */
4697 s_return (oblist_all_symbols (SCHEME_A)); 5091 s_return (oblist_all_symbols (SCHEME_A));
4698 5092
4699#if USE_PORTS 5093#if USE_PORTS
… …
4769 s_return (p == NIL ? S_F : p); 5163 s_return (p == NIL ? S_F : p);
4770 } 5164 }
4771 5165
4772 case OP_GET_OUTSTRING: /* get-output-string */ 5166 case OP_GET_OUTSTRING: /* get-output-string */
4773 { 5167 {
4774 port *p; 5168 port *p = port (a);
4775 5169
4776 if ((p = a->object.port)->kind & port_string) 5170 if (p->kind & port_string)
4777 { 5171 {
4778 off_t size; 5172 off_t size;
4779 char *str; 5173 char *str;
4780 5174
4781 size = p->rep.string.curr - p->rep.string.start + 1; 5175 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4816 } 5210 }
4817 5211
4818 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4819} 5213}
4820 5214
4821static int 5215/* reading */
5216ecb_cold static int
4822opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4823{ 5218{
4824 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4825 pointer x; 5220 pointer x;
4826 5221
… …
4886 int res; 5281 int res;
4887 5282
4888 if (is_pair (args)) 5283 if (is_pair (args))
4889 p = car (args); 5284 p = car (args);
4890 5285
4891 res = p->object.port->kind & port_string; 5286 res = port (p)->kind & port_string;
4892 5287
4893 s_retbool (res); 5288 s_retbool (res);
4894 } 5289 }
4895 5290
4896 case OP_SET_INPORT: /* set-input-port */ 5291 case OP_SET_INPORT: /* set-input-port */
… …
4905 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
4906 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
4907 { 5302 {
4908 case TOK_EOF: 5303 case TOK_EOF:
4909 s_return (S_EOF); 5304 s_return (S_EOF);
4910 /* NOTREACHED */
4911 5305
4912 case TOK_VEC: 5306 case TOK_VEC:
4913 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4914 /* fall through */ 5308 /* fall through */
4915 5309
… …
4918 5312
4919 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
4920 s_return (NIL); 5314 s_return (NIL);
4921 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
4922 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
4923 else 5317
4924 {
4925 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4926 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4927 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
4928 }
4929 5321
4930 case TOK_QUOTE: 5322 case TOK_QUOTE:
4931 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4932 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
4933 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
4939 { 5331 {
4940 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4941 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
4942 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
4943 } 5335 }
4944 else 5336
4945 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4946
4947 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
4948 5339
4949 case TOK_COMMA: 5340 case TOK_COMMA:
4950 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4951 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
4962 case TOK_DOTATOM: 5353 case TOK_DOTATOM:
4963 SCHEME_V->strbuff[0] = '.'; 5354 SCHEME_V->strbuff[0] = '.';
4964 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5355 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4965 5356
4966 case TOK_STRATOM: 5357 case TOK_STRATOM:
5358 //TODO: haven't checked whether the garbage collector could interfere and free x
5359 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
4967 x = readstrexp (SCHEME_A_ '|'); 5360 x = readstrexp (SCHEME_A_ '|');
4968 //TODO: haven't checked whether the garbage collector could interfere
4969 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4970 5362
4971 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
4972 x = readstrexp (SCHEME_A_ '"'); 5364 x = readstrexp (SCHEME_A_ '"');
4973 5365
… …
4981 { 5373 {
4982 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5374 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
4983 5375
4984 if (f == NIL) 5376 if (f == NIL)
4985 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
4986 else 5378
4987 {
4988 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
4989 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
4990 }
4991 } 5381 }
4992 5382
4993 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
4994 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5384 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4995 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
4996 else 5386
4997 s_return (x); 5387 s_return (x);
4998 5388
4999 default: 5389 default:
5000 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5001 } 5391 }
5002 5392
… …
5095 pointer b = cdr (args); 5485 pointer b = cdr (args);
5096 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5097 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5098 5488
5099 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5100 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5101 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5102 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5103 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5105 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5106 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5107 else 5497 else
5108 { 5498 {
5109 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5110 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5111 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5112 } 5502 }
5113 5503
5114 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5116 5506
5117 case OP_P1LIST: 5507 case OP_P1LIST:
5118 if (is_pair (args)) 5508 if (is_pair (args))
5119 { 5509 {
5120 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5121 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5122 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5123 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5124 } 5514 }
5125 else if (is_vector (args)) 5515 else if (is_vector (args))
5126 { 5516 {
… …
5134 { 5524 {
5135 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5136 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5137 } 5527 }
5138 5528
5139 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5140 s_return (S_T); 5530 s_return (S_T);
5141 } 5531 }
5142 5532
5143 case OP_PVECFROM: 5533 case OP_PVECFROM:
5144 { 5534 {
… …
5146 pointer vec = car (args); 5536 pointer vec = car (args);
5147 int len = veclength (vec); 5537 int len = veclength (vec);
5148 5538
5149 if (i == len) 5539 if (i == len)
5150 { 5540 {
5151 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5152 s_return (S_T); 5542 s_return (S_T);
5153 } 5543 }
5154 else 5544 else
5155 { 5545 {
5156 pointer elem = vector_get (vec, i); 5546 pointer elem = vector_get (vec, i);
… …
5158 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5159 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5160 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5161 5551
5162 if (i > 0) 5552 if (i > 0)
5163 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5164 5554
5165 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5166 } 5556 }
5167 } 5557 }
5168 } 5558 }
5169 5559
5170 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5171} 5561}
5172 5562
5173static int 5563/* list ops */
5564ecb_hot static int
5174opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5175{ 5566{
5176 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5177 pointer a = car (args); 5568 pointer a = car (args);
5178 pointer x, y; 5569 pointer x, y;
… …
5201 break; 5592 break;
5202 } 5593 }
5203 5594
5204 if (is_pair (y)) 5595 if (is_pair (y))
5205 s_return (car (y)); 5596 s_return (car (y));
5206 else 5597
5207 s_return (S_F); 5598 s_return (S_F);
5208
5209 5599
5210 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5211 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5212 5602
5213 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5214 s_return (S_F); 5604 s_return (S_F);
5215 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5216 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5217 else if (is_macro (SCHEME_V->args)) 5607
5218 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5219 else
5220 s_return (S_F); 5608 s_return (S_F);
5221 5609
5222 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5223 /* 5611 /*
5224 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5225 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
5614 * (schmorp) well, obviously not, fix? TODO
5226 */ 5615 */
5227 s_retbool (is_closure (a)); 5616 s_retbool (is_closure (a));
5228 5617
5229 case OP_MACROP: /* macro? */ 5618 case OP_MACROP: /* macro? */
5230 s_retbool (is_macro (a)); 5619 s_retbool (is_macro (a));
… …
5235 5624
5236/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5625/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5238 5627
5239typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5240static int 5629
5630ecb_hot static int
5241tst_any (pointer p) 5631tst_any (pointer p)
5242{ 5632{
5243 return 1; 5633 return 1;
5244} 5634}
5245 5635
5246static int 5636ecb_hot static int
5247tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5248{ 5638{
5249 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250} 5640}
5251 5641
5252static int 5642ecb_hot static int
5253tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5254{ 5644{
5255 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5256} 5646}
5257 5647
… …
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h" 5691#include "opdefines.h"
5302#undef OP_DEF 5692#undef OP_DEF
5303; 5693;
5304 5694
5305static const char * 5695ecb_cold static const char *
5306opname (int idx) 5696opname (int idx)
5307{ 5697{
5308 const char *name = opnames; 5698 const char *name = opnames;
5309 5699
5310 /* should do this at compile time, but would require external program, right? */ 5700 /* should do this at compile time, but would require external program, right? */
… …
5312 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5313 5703
5314 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5315} 5705}
5316 5706
5317static const char * 5707ecb_cold static const char *
5318procname (pointer x) 5708procname (pointer x)
5319{ 5709{
5320 return opname (procnum (x)); 5710 return opname (procnum (x));
5321} 5711}
5322 5712
… …
5342#undef OP_DEF 5732#undef OP_DEF
5343 {0} 5733 {0}
5344}; 5734};
5345 5735
5346/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5347static void ecb_hot 5737ecb_hot static void
5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5349{ 5739{
5350 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5351 5741
5352 for (;;) 5742 for (;;)
… …
5435 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5825 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5436 return; 5826 return;
5437 5827
5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5828 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5439 { 5829 {
5440 xwrstr ("No memory!\n"); 5830 putstr (SCHEME_A_ "No memory!\n");
5441 return; 5831 return;
5442 } 5832 }
5443 } 5833 }
5444} 5834}
5445 5835
5446/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5447 5837
5448static void 5838ecb_cold static void
5449assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5450{ 5840{
5451 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5452 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5453} 5843}
5454 5844
5455static void 5845ecb_cold static void
5456assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5457{ 5847{
5458 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5459 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5460 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5468 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5469 return y; 5859 return y;
5470} 5860}
5471 5861
5472/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5862/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5473static int 5863ecb_hot static int
5474syntaxnum (pointer p) 5864syntaxnum (pointer p)
5475{ 5865{
5476 const char *s = strvalue (car (p)); 5866 const char *s = strvalue (p);
5477 5867
5478 switch (strlength (car (p))) 5868 switch (strlength (p))
5479 { 5869 {
5480 case 2: 5870 case 2:
5481 if (s[0] == 'i') 5871 if (s[0] == 'i')
5482 return OP_IF0; /* if */ 5872 return OP_IF0; /* if */
5483 else 5873 else
… …
5558ecb_cold int 5948ecb_cold int
5559scheme_init (SCHEME_P) 5949scheme_init (SCHEME_P)
5560{ 5950{
5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5951 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5562 pointer x; 5952 pointer x;
5953
5954 /* this memset is not strictly correct, as we assume (intcache)
5955 * that memset 0 will also set pointers to 0, but memset does
5956 * of course not guarantee that. screw such systems.
5957 */
5958 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5563 5959
5564 num_set_fixnum (num_zero, 1); 5960 num_set_fixnum (num_zero, 1);
5565 num_set_ivalue (num_zero, 0); 5961 num_set_ivalue (num_zero, 0);
5566 num_set_fixnum (num_one, 1); 5962 num_set_fixnum (num_one, 1);
5567 num_set_ivalue (num_one, 1); 5963 num_set_ivalue (num_one, 1);
… …
5579 SCHEME_V->save_inport = NIL; 5975 SCHEME_V->save_inport = NIL;
5580 SCHEME_V->loadport = NIL; 5976 SCHEME_V->loadport = NIL;
5581 SCHEME_V->nesting = 0; 5977 SCHEME_V->nesting = 0;
5582 SCHEME_V->interactive_repl = 0; 5978 SCHEME_V->interactive_repl = 0;
5583 5979
5584 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5980 if (!alloc_cellseg (SCHEME_A))
5585 { 5981 {
5586#if USE_ERROR_CHECKING 5982#if USE_ERROR_CHECKING
5587 SCHEME_V->no_memory = 1; 5983 SCHEME_V->no_memory = 1;
5588 return 0; 5984 return 0;
5589#endif 5985#endif
5590 } 5986 }
5591 5987
5592 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5593 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5594 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5595 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5596 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5597 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5598 5995
5599 /* init NIL */ 5996 /* init NIL */
5600 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5601 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5657 6054
5658 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5659} 6056}
5660 6057
5661#if USE_PORTS 6058#if USE_PORTS
5662void 6059ecb_cold void
5663scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5664{ 6061{
5665 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5666} 6063}
5667 6064
5668void 6065ecb_cold void
5669scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6066scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5670{ 6067{
5671 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6068 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5672} 6069}
5673 6070
5674void 6071ecb_cold void
5675scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5676{ 6073{
5677 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5678} 6075}
5679 6076
5680void 6077ecb_cold void
5681scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6078scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5682{ 6079{
5683 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6080 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5684} 6081}
5685#endif 6082#endif
5686 6083
5687void 6084ecb_cold void
5688scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5689{ 6086{
5690 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5691} 6088}
5692 6089
… …
5724 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5725 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5726 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5727 6124
5728 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5729 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5730 6127
5731#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5732 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5733 {
5734 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5735 { 6131 {
5736 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5737 6133
5738 if (fname) 6134 if (fname)
5739 free (fname); 6135 free (fname);
5740 } 6136 }
5741 }
5742#endif 6137#endif
5743} 6138}
5744 6139
5745void 6140ecb_cold void
5746scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5747{ 6142{
5748 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5749} 6144}
5750 6145
5751void 6146ecb_cold void
5752scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5753{ 6148{
5754 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5755 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5756 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5757 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5758 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5759 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5760#if USE_PORTS
5761 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5762#endif
5763 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5764 6157
5765#if USE_PORTS
5766 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5767 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5768#endif
5769 6160
5770#if USE_PORTS 6161#if USE_PORTS
5771#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5772 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5773 6164
… …
5777#endif 6168#endif
5778 6169
5779 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5780 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5781 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5782 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5783 6175
5784 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5785 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5786} 6178}
5787 6179
5788void 6180ecb_cold void
5789scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5790{ 6182{
6183#if USE_PORTs
5791 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5792 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5793 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5794 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5795 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6188 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5796 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6189 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5797 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5798#if USE_PORTS
5799 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5800#endif
5801 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5802 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5803 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5804 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5805 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5806 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5807 6198
5808 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5809 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5810} 6204}
5811 6205
5812void 6206ecb_cold void
5813scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5814{ 6208{
5815 pointer x; 6209 pointer x;
5816 6210
5817 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5822 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5823} 6217}
5824 6218
5825#if !STANDALONE 6219#if !STANDALONE
5826 6220
5827void 6221ecb_cold void
5828scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5829{ 6223{
5830 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6224 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5831} 6225}
5832 6226
5833void 6227ecb_cold void
5834scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5835{ 6229{
5836 int i; 6230 int i;
5837 6231
5838 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5839 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5840} 6234}
5841 6235
5842pointer 6236ecb_cold pointer
5843scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5844{ 6238{
5845 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6239 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5846} 6240}
5847 6241
5848void 6242ecb_cold void
5849save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5850{ 6244{
5851 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5852 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5853 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5857 /* Truncate the dump stack so TS will return here when done, not 6251 /* Truncate the dump stack so TS will return here when done, not
5858 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5859 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5860} 6254}
5861 6255
5862void 6256ecb_cold void
5863restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5864{ 6258{
5865 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5866 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5867 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5868 /* Pop */ 6262 /* Pop */
5869 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5870} 6264}
5871 6265
5872/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5873pointer 6267ecb_cold pointer
5874scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5875{ 6269{
5876 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5877 6271
5878 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
5885 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
5886 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
5887 return SCHEME_V->value; 6281 return SCHEME_V->value;
5888} 6282}
5889 6283
5890pointer 6284ecb_cold pointer
5891scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
5892{ 6286{
5893 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
5894 6288
5895 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
5907 6301
5908/* ========== Main ========== */ 6302/* ========== Main ========== */
5909 6303
5910#if STANDALONE 6304#if STANDALONE
5911 6305
5912int 6306ecb_cold int
5913main (int argc, char **argv) 6307main (int argc, char **argv)
5914{ 6308{
5915# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
5916 scheme ssc; 6310 scheme ssc;
5917 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
5919# endif 6313# endif
5920 int fin; 6314 int fin;
5921 char *file_name = InitFile; 6315 char *file_name = InitFile;
5922 int retcode; 6316 int retcode;
5923 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
6319 system ("ps v $PPID");
6320#endif
5924 6321
5925 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5926 { 6323 {
5927 xwrstr ("Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5928 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5929 xwrstr ("followed by\n"); 6326 putstr (SCHEME_A_ "followed by\n");
5930 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6327 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5931 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5932 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6329 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5933 xwrstr ("Use - as filename for stdin.\n"); 6330 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5934 return 1; 6331 return 1;
5935 } 6332 }
5936 6333
5937 if (!scheme_init (SCHEME_A)) 6334 if (!scheme_init (SCHEME_A))
5938 { 6335 {
5939 xwrstr ("Could not initialize!\n"); 6336 putstr (SCHEME_A_ "Could not initialize!\n");
5940 return 2; 6337 return 2;
5941 } 6338 }
5942 6339
5943# if USE_PORTS 6340# if USE_PORTS
5944 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6341 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5957 } 6354 }
5958#endif 6355#endif
5959 6356
5960 do 6357 do
5961 { 6358 {
5962#if USE_PORTS
5963 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
5964 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
5965 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6361 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5966 { 6362 {
5967 pointer args = NIL; 6363 pointer args = NIL;
… …
5985 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6381 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
5986 6382
5987 } 6383 }
5988 else 6384 else
5989 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
5990#endif
5991 6386
5992 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
5993 { 6388 {
5994 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6389 putstr (SCHEME_A_ "Could not open file ");
6390 putstr (SCHEME_A_ file_name);
6391 putcharacter (SCHEME_A_ '\n');
5995 } 6392 }
5996 else 6393 else
5997 { 6394 {
5998 if (isfile) 6395 if (isfile)
5999 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6000 else 6397 else
6001 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6002 6399
6003#if USE_PORTS
6004 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6005 { 6401 {
6006 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6007 { 6403 {
6008 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6404 putstr (SCHEME_A_ "Errors encountered reading ");
6405 putstr (SCHEME_A_ file_name);
6406 putcharacter (SCHEME_A_ '\n');
6009 } 6407 }
6010 6408
6011 if (isfile) 6409 if (isfile)
6012 close (fin); 6410 close (fin);
6013 } 6411 }
6014#endif
6015 } 6412 }
6016 6413
6017 file_name = *argv++; 6414 file_name = *argv++;
6018 } 6415 }
6019 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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