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.39 by root, Sun Nov 29 14:22:30 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{
… …
410{ 422{
411 return strvalue (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{
… …
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 set_typeflag (x, T_SYMBOL | T_ATOM); 1092 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x; 1093 return x;
1106} 1094}
1107 1095
1096/* ========== oblist implementation ========== */
1097
1108#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1109 1099
1110static int 1100static int
1111hash_fn (const char *key, int table_size) 1101hash_fn (const char *key, int table_size)
1112{ 1102{
1113 const unsigned char *p = key; 1103 const unsigned char *p = (unsigned char *)key;
1114 uint32_t hash = 2166136261; 1104 uint32_t hash = 2166136261U;
1115 1105
1116 while (*p) 1106 while (*p)
1117 hash = (hash ^ *p++) * 16777619; 1107 hash = (hash ^ *p++) * 16777619;
1118 1108
1119 return hash % table_size; 1109 return hash % table_size;
1120} 1110}
1121 1111
1122static pointer 1112ecb_cold static pointer
1123oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1124{ 1114{
1125 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1126} 1116}
1127 1117
1128/* returns the new symbol */ 1118/* returns the new symbol */
1129static pointer 1119ecb_cold static pointer
1130oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1131{ 1121{
1132 pointer x = generate_symbol (SCHEME_A_ name); 1122 pointer x = generate_symbol (SCHEME_A_ name);
1133 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1134 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)));
1135 return x; 1125 return x;
1136} 1126}
1137 1127
1138ecb_inline pointer 1128ecb_cold static pointer
1139oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1140{ 1130{
1141 int location; 1131 int location;
1142 pointer x; 1132 pointer x;
1143 char *s; 1133 char *s;
… …
1154 } 1144 }
1155 1145
1156 return NIL; 1146 return NIL;
1157} 1147}
1158 1148
1159static pointer 1149ecb_cold static pointer
1160oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1161{ 1151{
1162 int i; 1152 int i;
1163 pointer x; 1153 pointer x;
1164 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
… …
1170 return ob_list; 1160 return ob_list;
1171} 1161}
1172 1162
1173#else 1163#else
1174 1164
1175static pointer 1165ecb_cold static pointer
1176oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1177{ 1167{
1178 return NIL; 1168 return NIL;
1179} 1169}
1180 1170
1181ecb_inline pointer 1171ecb_cold static pointer
1182oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1183{ 1173{
1184 pointer x; 1174 pointer x;
1185 char *s; 1175 char *s;
1186 1176
… …
1195 1185
1196 return NIL; 1186 return NIL;
1197} 1187}
1198 1188
1199/* returns the new symbol */ 1189/* returns the new symbol */
1200static pointer 1190ecb_cold static pointer
1201oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1202{ 1192{
1203 pointer x = mk_string (SCHEME_A_ name); 1193 pointer x = generate_symbol (SCHEME_A_ name);
1204 set_typeflag (x, T_SYMBOL);
1205 setimmutable (x);
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1195 return x;
1208} 1196}
1209 1197
1210static pointer 1198ecb_cold static pointer
1211oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1212{ 1200{
1213 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1214} 1202}
1215 1203
1216#endif 1204#endif
1217 1205
1218#if USE_PORTS
1219static pointer 1206ecb_cold static pointer
1220mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1221{ 1208{
1222 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223 1210
1224 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1225 x->object.port = p; 1212 set_port (x, p);
1226 1213
1227 return x; 1214 return x;
1228} 1215}
1229#endif
1230 1216
1231pointer 1217ecb_cold pointer
1232mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1233{ 1219{
1234 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235 1221
1236 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
1237 x->object.ff = f; 1223 CELL(x)->object.ff = f;
1238 1224
1239 return x; 1225 return x;
1240} 1226}
1241 1227
1242INTERFACE pointer 1228INTERFACE pointer
1243mk_character (SCHEME_P_ int c) 1229mk_character (SCHEME_P_ int c)
1244{ 1230{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1232
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1233 set_typeflag (x, T_CHARACTER | T_ATOM);
1248 set_ivalue (x, c & 0xff); 1234 set_ivalue (x, c & 0xff);
1249 1235
1250 return x; 1236 return x;
1251} 1237}
1252 1238
1253/* get number atom (integer) */ 1239/* get number atom (integer) */
1254INTERFACE pointer 1240INTERFACE pointer
1255mk_integer (SCHEME_P_ long n) 1241mk_integer (SCHEME_P_ long n)
1256{ 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 {
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1253 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1254
1259 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 */
1260 set_ivalue (x, n); 1257 set_ivalue (x, n);
1261 1258
1259 *pp = x;
1260 }
1261
1262 return x; 1262 return *pp;
1263} 1263}
1264 1264
1265INTERFACE pointer 1265INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1267{ 1267{
1268#if USE_REAL 1268#if USE_REAL
1269 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270 1270
1271 set_typeflag (x, (T_REAL | T_ATOM)); 1271 set_typeflag (x, T_REAL | T_ATOM);
1272 set_rvalue (x, n); 1272 set_rvalue (x, n);
1273 1273
1274 return x; 1274 return x;
1275#else 1275#else
1276 return mk_integer (SCHEME_A_ n); 1276 return mk_integer (SCHEME_A_ n);
… …
1387 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1388 1388
1389 return x; 1389 return x;
1390} 1390}
1391 1391
1392INTERFACE pointer 1392ecb_cold INTERFACE pointer
1393gensym (SCHEME_P) 1393gensym (SCHEME_P)
1394{ 1394{
1395 pointer x; 1395 pointer x;
1396 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1397 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1398 1398
1399 return generate_symbol (SCHEME_A_ name); 1399 return generate_symbol (SCHEME_A_ name);
1400} 1400}
1401 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
1402/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1403static pointer 1409ecb_cold static pointer
1404mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1405{ 1411{
1406 char c, *p; 1412 char c, *p;
1407 int has_dec_point = 0; 1413 int has_dec_point = 0;
1408 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1479 1485
1480 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1481} 1487}
1482 1488
1483/* make constant */ 1489/* make constant */
1484static pointer 1490ecb_cold static pointer
1485mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1486{ 1492{
1487 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1488 return S_T; 1494 return S_T;
1489 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1490 return S_F; 1496 return S_F;
1491 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1492 { 1498 {
1493 int c; 1499 int c;
1494 1500
1501 // TODO: optimise
1495 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1496 c = ' '; 1503 c = ' ';
1497 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1498 c = '\n'; 1505 c = '\n';
1499 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1500 c = '\r'; 1507 c = '\r';
1501 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1502 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;
1503 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1504 { 1521 {
1505 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1506 1523
1507 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1532 return NIL; 1549 return NIL;
1533 } 1550 }
1534} 1551}
1535 1552
1536/* ========== 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}
1537 1573
1538/*-- 1574/*--
1539 * 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,
1540 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1541 * for marking. 1577 * for marking.
1542 * 1578 *
1543 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1544 * 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
1545 * word of context in the vector 1581 * word of context in the vector
1546 */ 1582 */
1547static void 1583ecb_hot static void
1548mark (pointer a) 1584mark (pointer a)
1549{ 1585{
1550 pointer t, q, p; 1586 pointer t, q, p;
1551 1587
1552 t = 0; 1588 t = 0;
… …
1609 p = q; 1645 p = q;
1610 goto E6; 1646 goto E6;
1611 } 1647 }
1612} 1648}
1613 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
1614/* garbage collection. parameter a, b is marked. */ 1692/* garbage collection. parameter a, b is marked. */
1615static void 1693ecb_cold static void
1616gc (SCHEME_P_ pointer a, pointer b) 1694gc (SCHEME_P_ pointer a, pointer b)
1617{ 1695{
1618 pointer p;
1619 int i; 1696 int i;
1620 1697
1621 if (SCHEME_V->gc_verbose) 1698 if (SCHEME_V->gc_verbose)
1622 putstr (SCHEME_A_ "gc..."); 1699 putstr (SCHEME_A_ "gc...");
1623 1700
… …
1639 /* Mark recent objects the interpreter doesn't know about yet. */ 1716 /* Mark recent objects the interpreter doesn't know about yet. */
1640 mark (car (S_SINK)); 1717 mark (car (S_SINK));
1641 /* Mark any older stuff above nested C calls */ 1718 /* Mark any older stuff above nested C calls */
1642 mark (SCHEME_V->c_nest); 1719 mark (SCHEME_V->c_nest);
1643 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
1644 /* mark variables a, b */ 1728 /* mark variables a, b */
1645 mark (a); 1729 mark (a);
1646 mark (b); 1730 mark (b);
1647 1731
1648 /* garbage collect */ 1732 /* garbage collect */
1649 clrmark (NIL); 1733 clrmark (NIL);
1650 SCHEME_V->fcells = 0; 1734 SCHEME_V->fcells = 0;
1651 SCHEME_V->free_cell = NIL; 1735 SCHEME_V->free_cell = NIL;
1652 1736
1653 /* free-list is kept sorted by address so as to maintain consecutive
1654 ranges, if possible, for use with vectors. Here we scan the cells
1655 (which are also kept sorted by address) downwards to build the
1656 free-list in sorted order.
1657 */
1658 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1659 {
1660 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1661
1662 while (--p >= SCHEME_V->cell_seg[i])
1663 {
1664 if (is_mark (p))
1665 clrmark (p);
1666 else
1667 {
1668 /* reclaim cell */
1669 if (typeflag (p) != T_PAIR)
1670 {
1671 finalize_cell (SCHEME_A_ p);
1672 set_typeflag (p, T_PAIR);
1673 set_car (p, NIL);
1674 }
1675
1676 ++SCHEME_V->fcells;
1677 set_cdr (p, SCHEME_V->free_cell);
1678 SCHEME_V->free_cell = p;
1679 }
1680 }
1681 }
1682
1683 if (SCHEME_V->gc_verbose) 1737 if (SCHEME_V->gc_verbose)
1684 { 1738 putstr (SCHEME_A_ "freeing...");
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1686 }
1687}
1688 1739
1689static void 1740 gc_free (SCHEME_A);
1690finalize_cell (SCHEME_P_ pointer a)
1691{
1692 /* TODO, fast bitmap check? */
1693 if (is_string (a))
1694 free (strvalue (a));
1695 else if (is_vector (a))
1696 free (vecvalue (a));
1697#if USE_PORTS
1698 else if (is_port (a))
1699 {
1700 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1701 port_close (SCHEME_A_ a, port_input | port_output);
1702
1703 free (a->object.port);
1704 }
1705#endif
1706} 1741}
1707 1742
1708/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1709 1744
1710static int 1745ecb_cold static int
1711file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1712{ 1747{
1713#if USE_PORTS
1714 int fin; 1748 int fin;
1715 1749
1716 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1717 return 0; 1751 return 0;
1718 1752
… …
1724 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1725 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;
1726 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;
1727 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;
1728 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1762 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1729 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);
1730 1764
1731#if SHOW_ERROR_LINE 1765#if SHOW_ERROR_LINE
1732 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;
1733 1767
1734 if (fname) 1768 if (fname)
1735 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);
1736#endif 1770#endif
1737 } 1771 }
1738 1772
1739 return fin >= 0; 1773 return fin >= 0;
1740
1741#else
1742 return 1;
1743#endif
1744} 1774}
1745 1775
1746static void 1776ecb_cold static void
1747file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1748{ 1778{
1749 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1750 { 1780 {
1751 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1752#if USE_PORTS 1782#if USE_PORTS
1753 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1754#endif 1784#endif
1755 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1756 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);
1757 } 1787 }
1758} 1788}
1759 1789
1760static int 1790ecb_cold static int
1761file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1762{ 1792{
1763#if USE_PORTS 1793#if USE_PORTS
1764 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1765 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1766 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1767#else 1797#else
1768 return 0; 1798 return 0;
1769#endif 1799#endif
1770} 1800}
1771 1801
1772#if USE_PORTS 1802#if USE_PORTS
1773static port * 1803ecb_cold static port *
1774port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1775{ 1805{
1776 int fd; 1806 int fd;
1777 int flags; 1807 int flags;
1778 char *rw; 1808 char *rw;
… …
1801# endif 1831# endif
1802 1832
1803 return pt; 1833 return pt;
1804} 1834}
1805 1835
1806static pointer 1836ecb_cold static pointer
1807port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1808{ 1838{
1809 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1810 1840
1811 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1812 return NIL; 1842 return NIL;
1813 1843
1814 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1815} 1845}
1816 1846
1817static port * 1847ecb_cold static port *
1818port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1819{ 1849{
1820 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1821 1851
1822 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1827 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1828 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1829 return pt; 1859 return pt;
1830} 1860}
1831 1861
1832static pointer 1862ecb_cold static pointer
1833port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1834{ 1864{
1835 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1836 1866
1837 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1838 return NIL; 1868 return NIL;
1839 1869
1840 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1841} 1871}
1842 1872
1843static port * 1873ecb_cold static port *
1844port_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)
1845{ 1875{
1846 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1847 1877
1848 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1854 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1855 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1856 return pt; 1886 return pt;
1857} 1887}
1858 1888
1859static pointer 1889ecb_cold static pointer
1860port_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)
1861{ 1891{
1862 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);
1863 1893
1864 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1867 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1868} 1898}
1869 1899
1870# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1871 1901
1872static port * 1902ecb_cold static port *
1873port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1874{ 1904{
1875 char *start; 1905 char *start;
1876 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1877 1907
… …
1891 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1892 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1893 return pt; 1923 return pt;
1894} 1924}
1895 1925
1896static pointer 1926ecb_cold static pointer
1897port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1898{ 1928{
1899 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1900 1930
1901 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1902 return NIL; 1932 return NIL;
1903 1933
1904 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1905} 1935}
1906 1936
1907static void 1937ecb_cold static void
1908port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1909{ 1939{
1910 port *pt = p->object.port; 1940 port *pt = port (p);
1911 1941
1912 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1913 1943
1914 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1915 { 1945 {
… …
1932 } 1962 }
1933} 1963}
1934#endif 1964#endif
1935 1965
1936/* get new character from input file */ 1966/* get new character from input file */
1937static int 1967ecb_cold static int
1938inchar (SCHEME_P) 1968inchar (SCHEME_P)
1939{ 1969{
1940 int c; 1970 int c;
1941 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1942
1943 pt = SCHEME_V->inport->object.port;
1944 1972
1945 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1946 return EOF; 1974 return EOF;
1947 1975
1948 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1958 } 1986 }
1959 1987
1960 return c; 1988 return c;
1961} 1989}
1962 1990
1963static int ungot = -1; 1991ecb_cold static int
1964
1965static int
1966basic_inchar (port *pt) 1992basic_inchar (port *pt)
1967{ 1993{
1968#if USE_PORTS
1969 if (pt->unget != -1) 1994 if (pt->unget != -1)
1970 { 1995 {
1971 int r = pt->unget; 1996 int r = pt->unget;
1972 pt->unget = -1; 1997 pt->unget = -1;
1973 return r; 1998 return r;
1974 } 1999 }
1975 2000
2001#if USE_PORTS
1976 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
1977 { 2003 {
1978 char c; 2004 char c;
1979 2005
1980 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
1988 return EOF; 2014 return EOF;
1989 else 2015 else
1990 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
1991 } 2017 }
1992#else 2018#else
1993 if (ungot == -1)
1994 {
1995 char c; 2019 char c;
1996 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
1997 return EOF; 2022 return EOF;
1998 2023
1999 ungot = c;
2000 }
2001
2002 {
2003 int r = ungot;
2004 ungot = -1;
2005 return r; 2024 return c;
2006 }
2007#endif 2025#endif
2008} 2026}
2009 2027
2010/* back character to input buffer */ 2028/* back character to input buffer */
2011static void 2029ecb_cold static void
2012backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2013{ 2031{
2014#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2015 port *pt;
2016 2033
2017 if (c == EOF) 2034 if (c == EOF)
2018 return; 2035 return;
2019 2036
2020 pt = SCHEME_V->inport->object.port;
2021 pt->unget = c; 2037 pt->unget = c;
2022#else
2023 if (c == EOF)
2024 return;
2025
2026 ungot = c;
2027#endif
2028} 2038}
2029 2039
2030#if USE_PORTS 2040#if USE_PORTS
2031static int 2041ecb_cold static int
2032realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2033{ 2043{
2034 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2035 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;
2036 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2049 else 2059 else
2050 return 0; 2060 return 0;
2051} 2061}
2052#endif 2062#endif
2053 2063
2054INTERFACE void 2064ecb_cold static void
2055putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2056{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2057#if USE_PORTS 2069#if USE_PORTS
2058 port *pt = SCHEME_V->outport->object.port;
2059
2060 if (pt->kind & port_file)
2061 write (pt->rep.stdio.file, s, strlen (s));
2062 else
2063 for (; *s; s++)
2064 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2065 *pt->rep.string.curr++ = *s;
2066 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2067 *pt->rep.string.curr++ = *s;
2068
2069#else
2070 xwrstr (s);
2071#endif
2072}
2073
2074static void
2075putchars (SCHEME_P_ const char *s, int len)
2076{
2077#if USE_PORTS
2078 port *pt = SCHEME_V->outport->object.port;
2079
2080 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2081 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2082 else 2072 else
2083 { 2073 {
2084 for (; len; len--) 2074 for (; len; len--)
… …
2089 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2090 } 2080 }
2091 } 2081 }
2092 2082
2093#else 2083#else
2094 write (1, s, len); 2084 write (1, s, len); // output not initialised
2095#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2096} 2092}
2097 2093
2098INTERFACE void 2094INTERFACE void
2099putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2100{ 2096{
2101#if USE_PORTS
2102 port *pt = SCHEME_V->outport->object.port;
2103
2104 if (pt->kind & port_file)
2105 {
2106 char cc = c;
2107 write (pt->rep.stdio.file, &cc, 1);
2108 }
2109 else
2110 {
2111 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2112 *pt->rep.string.curr++ = c;
2113 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2114 *pt->rep.string.curr++ = c;
2115 }
2116
2117#else
2118 char cc = c; 2097 char cc = c;
2119 write (1, &c, 1); 2098
2120#endif 2099 putchars (SCHEME_A_ &cc, 1);
2121} 2100}
2122 2101
2123/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2124static char * 2103ecb_cold static char *
2125readstr_upto (SCHEME_P_ int skip, const char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2126{ 2105{
2127 char *p = SCHEME_V->strbuff + skip; 2106 char *p = SCHEME_V->strbuff + skip;
2128 2107
2129 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))));
… …
2138 2117
2139 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2140} 2119}
2141 2120
2142/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2143static pointer 2122ecb_cold static pointer
2144readstrexp (SCHEME_P_ char delim) 2123readstrexp (SCHEME_P_ char delim)
2145{ 2124{
2146 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2147 int c; 2126 int c;
2148 int c1 = 0; 2127 int c1 = 0;
… …
2181 case '7': 2160 case '7':
2182 state = st_oct1; 2161 state = st_oct1;
2183 c1 = c - '0'; 2162 c1 = c - '0';
2184 break; 2163 break;
2185 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
2186 case 'x': 2180 case 'x':
2187 case 'X': 2181 case 'X':
2188 state = st_x1; 2182 state = st_x1;
2189 c1 = 0; 2183 c1 = 0;
2190 break;
2191
2192 case 'n':
2193 *p++ = '\n';
2194 state = st_ok;
2195 break;
2196
2197 case 't':
2198 *p++ = '\t';
2199 state = st_ok;
2200 break;
2201
2202 case 'r':
2203 *p++ = '\r';
2204 state = st_ok;
2205 break; 2184 break;
2206 2185
2207 default: 2186 default:
2208 *p++ = c; 2187 *p++ = c;
2209 state = st_ok; 2188 state = st_ok;
… …
2261 } 2240 }
2262 } 2241 }
2263} 2242}
2264 2243
2265/* check c is in chars */ 2244/* check c is in chars */
2266ecb_inline int 2245ecb_cold int
2267is_one_of (const char *s, int c) 2246is_one_of (const char *s, int c)
2268{ 2247{
2269 if (c == EOF)
2270 return 1;
2271
2272 return !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2273} 2249}
2274 2250
2275/* skip white characters */ 2251/* skip white characters */
2276ecb_inline int 2252ecb_cold int
2277skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2278{ 2254{
2279 int c, curr_line = 0; 2255 int c, curr_line = 0;
2280 2256
2281 do 2257 do
2282 { 2258 {
2283 c = inchar (SCHEME_A); 2259 c = inchar (SCHEME_A);
2260
2284#if SHOW_ERROR_LINE 2261#if SHOW_ERROR_LINE
2285 if (c == '\n') 2262 if (ecb_expect_false (c == '\n'))
2286 curr_line++; 2263 curr_line++;
2287#endif 2264#endif
2265
2266 if (ecb_expect_false (c == EOF))
2267 return c;
2288 } 2268 }
2289 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2269 while (is_one_of (WHITESPACE, c));
2290 2270
2291 /* record it */ 2271 /* record it */
2292#if SHOW_ERROR_LINE 2272#if SHOW_ERROR_LINE
2293 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)
2294 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;
2295#endif 2275#endif
2296 2276
2297 if (c != EOF)
2298 {
2299 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2300 return 1; 2278 return 1;
2301 }
2302 else
2303 return EOF;
2304} 2279}
2305 2280
2306/* get token */ 2281/* get token */
2307static int 2282ecb_cold static int
2308token (SCHEME_P) 2283token (SCHEME_P)
2309{ 2284{
2310 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2311 2286
2312 if (c == EOF) 2287 if (c == EOF)
… …
2324 return TOK_RPAREN; 2299 return TOK_RPAREN;
2325 2300
2326 case '.': 2301 case '.':
2327 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2328 2303
2329 if (is_one_of (" \n\t", c)) 2304 if (is_one_of (WHITESPACE, c))
2330 return TOK_DOT; 2305 return TOK_DOT;
2331 else 2306 else
2332 { 2307 {
2333 backchar (SCHEME_A_ c); 2308 backchar (SCHEME_A_ c);
2334 return TOK_DOTATOM; 2309 return TOK_DOTATOM;
… …
2410} 2385}
2411 2386
2412/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2413#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2414 2389
2415static void 2390ecb_cold static void
2416printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2417{ 2392{
2418 int i; 2393 int i;
2419 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2420 2395
… …
2476 2451
2477 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2478} 2453}
2479 2454
2480/* print atoms */ 2455/* print atoms */
2481static void 2456ecb_cold static void
2482printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2483{ 2458{
2484 char *p; 2459 char *p;
2485 int len; 2460 int len;
2486 2461
2487 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2488 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2489} 2464}
2490 2465
2491/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2492static void 2467ecb_cold static void
2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2494{ 2469{
2495 char *p; 2470 char *p;
2496 2471
2497 if (l == NIL) 2472 if (l == NIL)
… …
2704 return car (d); 2679 return car (d);
2705 2680
2706 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2707 q = p; 2682 q = p;
2708 2683
2709 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2710 { 2685 {
2711 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2712 2687
2713 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2714 p = cdr (d); 2689 p = cdr (d);
2715 } 2690 }
2716 2691
2717 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2718 return q; 2693 return q;
2719} 2694}
2720 2695
2721/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2722static pointer 2697ecb_hot static pointer
2723reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2724{ 2699{
2725 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2726 pointer p = NIL; 2701 pointer p = NIL;
2727 2702
… …
2730 2705
2731 return p; 2706 return p;
2732} 2707}
2733 2708
2734/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2735static pointer 2710ecb_hot static pointer
2736reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2737{ 2712{
2738 pointer result = term; 2713 pointer result = term;
2739 pointer p = list; 2714 pointer p = list;
2740 2715
… …
2748 2723
2749 return result; 2724 return result;
2750} 2725}
2751 2726
2752/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2753static pointer 2728ecb_hot static pointer
2754revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2755{ 2730{
2756 pointer result = a; 2731 pointer result = a;
2757 pointer p = b; 2732 pointer p = b;
2758 2733
… …
2767 2742
2768 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2769} 2744}
2770 2745
2771/* equivalence of atoms */ 2746/* equivalence of atoms */
2772int 2747ecb_hot int
2773eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2774{ 2749{
2775 if (is_string (a)) 2750 if (is_string (a))
2776 { 2751 {
2777 if (is_string (b)) 2752 if (is_string (b))
… …
2871 } 2846 }
2872 else 2847 else
2873 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2874} 2849}
2875 2850
2876static pointer 2851ecb_hot static pointer
2877find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2878{ 2853{
2879 pointer x, y; 2854 pointer x, y;
2880 2855
2881 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
… …
2902 return NIL; 2877 return NIL;
2903} 2878}
2904 2879
2905#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2906 2881
2907ecb_inline void 2882static void
2908new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2909{ 2884{
2910 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2911 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2912} 2887}
2913 2888
2914ecb_inline void 2889static void
2915new_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)
2916{ 2891{
2917 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2918} 2893}
2919 2894
2920static pointer 2895ecb_hot static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2897{
2923 pointer x, y; 2898 pointer x, y;
2924 2899
2925 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2939 return NIL; 2914 return NIL;
2940} 2915}
2941 2916
2942#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2943 2918
2944ecb_inline void 2919static void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2921{
2947 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2948 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);
2949} 2924}
2950 2925
2951ecb_inline void 2926static void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2928{
2954 set_cdr (slot, value); 2929 set_cdr (slot, value);
2955} 2930}
2956 2931
2957ecb_inline pointer 2932static pointer
2958slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2959{ 2934{
2960 return cdr (slot); 2935 return cdr (slot);
2961} 2936}
2962 2937
2963/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
2964 2939
2965static int 2940ecb_cold static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2942{
2968#if USE_ERROR_HOOK
2969 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK;
2971#endif
2972
2973#if USE_PRINTF 2943#if USE_PRINTF
2974#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
2975 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
2976 2946
2977 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
2992 } 2962 }
2993#endif 2963#endif
2994#endif 2964#endif
2995 2965
2996#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
2997 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);
2998 2968
2999 if (x != NIL) 2969 if (x != NIL)
3000 { 2970 {
3001 pointer code = a 2971 pointer code = a
3002 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3046 pointer code; 3016 pointer code;
3047}; 3017};
3048 3018
3049# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3050 3020
3051static void 3021ecb_hot static void
3052s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3053{ 3023{
3054 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3055 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3056 3026
3057 /* enough room for the next frame? */ 3027 /* enough room for the next frame? */
3058 if (nframes >= SCHEME_V->dump_size) 3028 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3059 { 3029 {
3060 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3061 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);
3062 } 3032 }
3063 3033
… …
3069 next_frame->code = code; 3039 next_frame->code = code;
3070 3040
3071 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3072} 3042}
3073 3043
3074static int 3044static ecb_hot int
3075xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3076{ 3046{
3077 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3078 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3079 3049
… …
3090 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3091 3061
3092 return 0; 3062 return 0;
3093} 3063}
3094 3064
3095ecb_inline void 3065ecb_cold void
3096dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3097{ 3067{
3098 /* 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 */
3099 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3100} 3070}
3101 3071
3102ecb_inline void 3072ecb_cold void
3103dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3104{ 3074{
3105 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3106 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3107 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3108} 3078}
3109 3079
3110static void 3080ecb_cold static void
3111dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3112{ 3082{
3113 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3114 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3115 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3116 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3117} 3087}
3118 3088
3119static void 3089ecb_cold static void
3120dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3121{ 3091{
3122 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3123 int i; 3093 int i;
3124 3094
… …
3130 mark (frame->envir); 3100 mark (frame->envir);
3131 mark (frame->code); 3101 mark (frame->code);
3132 } 3102 }
3133} 3103}
3134 3104
3135static pointer 3105ecb_cold static pointer
3136ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3137{ 3107{
3138 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3139 int i; 3109 int i;
3140 3110
… …
3152 } 3122 }
3153 3123
3154 return cont; 3124 return cont;
3155} 3125}
3156 3126
3157static void 3127ecb_cold static void
3158ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3159{ 3129{
3160 int i = 0; 3130 int i = 0;
3161 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3162 3132
… …
3174 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3175} 3145}
3176 3146
3177#else 3147#else
3178 3148
3179ecb_inline void 3149ecb_cold void
3180dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3181{ 3151{
3182 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3183} 3153}
3184 3154
3185ecb_inline void 3155ecb_cold void
3186dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3187{ 3157{
3188 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3189} 3159}
3190 3160
3191static void 3161ecb_cold static void
3192dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3193{ 3163{
3194 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3195} 3165}
3196 3166
3197static int 3167ecb_hot static int
3198xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3199{ 3169{
3200 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3201 3171
3202 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3212 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3213 3183
3214 return 0; 3184 return 0;
3215} 3185}
3216 3186
3217static void 3187ecb_hot static void
3218s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3219{ 3189{
3220 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3221 cons (args, 3191 cons (args,
3222 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3223 cons (code, 3193 cons (code,
3224 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3225} 3195}
3226 3196
3227static void 3197ecb_cold static void
3228dump_stack_mark (SCHEME_P) 3198dump_stack_mark (SCHEME_P)
3229{ 3199{
3230 mark (SCHEME_V->dump); 3200 mark (SCHEME_V->dump);
3231} 3201}
3232 3202
3233static pointer 3203ecb_cold static pointer
3234ss_get_cont (SCHEME_P) 3204ss_get_cont (SCHEME_P)
3235{ 3205{
3236 return SCHEME_V->dump; 3206 return SCHEME_V->dump;
3237} 3207}
3238 3208
3239static void 3209ecb_cold static void
3240ss_set_cont (SCHEME_P_ pointer cont) 3210ss_set_cont (SCHEME_P_ pointer cont)
3241{ 3211{
3242 SCHEME_V->dump = cont; 3212 SCHEME_V->dump = cont;
3243} 3213}
3244 3214
3245#endif 3215#endif
3246 3216
3247#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3248 3218
3249#if 1 3219#if EXPERIMENT
3220
3250static int 3221static int
3251debug (SCHEME_P_ int indent, pointer x) 3222dtree (SCHEME_P_ int indent, pointer x)
3252{ 3223{
3253 int c; 3224 int c;
3254 3225
3255 if (is_syntax (x)) 3226 if (is_syntax (x))
3256 { 3227 {
… …
3274 printf ("%*sS<%s>\n", indent, "", symname (x)); 3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3275 return 24+8; 3246 return 24+8;
3276 3247
3277 case T_CLOSURE: 3248 case T_CLOSURE:
3278 printf ("%*sS<%s>\n", indent, "", "closure"); 3249 printf ("%*sS<%s>\n", indent, "", "closure");
3279 debug (SCHEME_A_ indent + 3, cdr(x)); 3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3280 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3281 3252
3282 case T_PAIR: 3253 case T_PAIR:
3283 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3284 c = debug (SCHEME_A_ indent + 3, car (x)); 3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3285 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3286 return c + 1; 3257 return c + 1;
3287 3258
3288 case T_PORT: 3259 case T_PORT:
3289 printf ("%*sS<%s>\n", indent, "", "port"); 3260 printf ("%*sS<%s>\n", indent, "", "port");
3290 return 24+8; 3261 return 24+8;
… …
3293 printf ("%*sS<%s>\n", indent, "", "vector"); 3264 printf ("%*sS<%s>\n", indent, "", "vector");
3294 return 24+8; 3265 return 24+8;
3295 3266
3296 case T_ENVIRONMENT: 3267 case T_ENVIRONMENT:
3297 printf ("%*sS<%s>\n", indent, "", "environment"); 3268 printf ("%*sS<%s>\n", indent, "", "environment");
3298 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3299 3270
3300 default: 3271 default:
3301 printf ("unhandled type %d\n", type (x)); 3272 printf ("unhandled type %d\n", type (x));
3302 break; 3273 break;
3303 } 3274 }
3304} 3275}
3305#endif
3306 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
3307static int 3400static void
3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3402{
3403 //TODO: borked
3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3405
3406 stream_put (s, BOP_BIFF);
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)
3423{
3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3428}
3429
3430static void
3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3432{
3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3437}
3438
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
3308opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3309{ 3646{
3310 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3311 pointer x, y; 3648 pointer x, y;
3312 3649
3313 switch (op) 3650 switch (op)
3314 { 3651 {
3315#if 1 //D 3652#if EXPERIMENT //D
3316 case OP_DEBUG: 3653 case OP_DEBUG:
3317 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3318 printf ("\n"); 3657 printf ("\n");
3319 s_return (S_T); 3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3320#endif 3663#endif
3664
3321 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3322 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3323 { 3667 {
3324 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3668 putstr (SCHEME_A_ "Loading ");
3325 //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');
3326 } 3671 }
3327 3672
3328 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3329 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3330 else 3675
3331 {
3332 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3333 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3334 }
3335 3678
3336 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3337 3680
3338 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3339 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3340 { 3683 {
3341 if (SCHEME_V->file_i == 0) 3684 if (SCHEME_V->file_i == 0)
3342 { 3685 {
3343 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3344 s_goto (OP_QUIT); 3687 s_goto (OP_QUIT);
… …
3355 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3356 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3357 { 3700 {
3358 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3359 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3360 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3361 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3362 } 3708 }
3363 3709
3364 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3365 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3400 { 3746 {
3401 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3402 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3403 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3404 } 3750 }
3405 else 3751
3406 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3407 3753
3408 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3409#if USE_TRACING 3755#if USE_TRACING
3410 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3411 { 3757 {
… …
3422#endif 3768#endif
3423 if (is_symbol (SCHEME_V->code)) /* symbol */ 3769 if (is_symbol (SCHEME_V->code)) /* symbol */
3424 { 3770 {
3425 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);
3426 3772
3427 if (x != NIL) 3773 if (x == NIL)
3428 s_return (slot_value_in_env (x));
3429 else
3430 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));
3431 } 3777 }
3432 else if (is_pair (SCHEME_V->code)) 3778 else if (is_pair (SCHEME_V->code))
3433 { 3779 {
3434 x = car (SCHEME_V->code); 3780 x = car (SCHEME_V->code);
3435 3781
… …
3444 /* 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)); */
3445 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3446 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3447 } 3793 }
3448 } 3794 }
3449 else 3795
3450 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3451 3797
3452 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3453 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3454 { 3800 {
3455 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3456 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3457 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3458 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3459 } 3805 }
3460 else 3806
3461 {
3462 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3463 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3464 }
3465 3809
3466 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3467 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3468 3812
3469 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3480 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3481 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3482 } 3826 }
3483 3827
3484#if USE_TRACING 3828#if USE_TRACING
3485
3486 case OP_TRACING: 3829 case OP_TRACING:
3487 { 3830 {
3488 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3489 3832
3490 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3491 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3492 } 3835 }
3493
3494#endif 3836#endif
3495 3837
3496 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3497#if USE_TRACING 3839#if USE_TRACING
3498 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3512 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3854 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3513 else if (is_foreign (SCHEME_V->code)) 3855 else if (is_foreign (SCHEME_V->code))
3514 { 3856 {
3515 /* Keep nested calls from GC'ing the arglist */ 3857 /* Keep nested calls from GC'ing the arglist */
3516 push_recent_alloc (SCHEME_A_ args, NIL); 3858 push_recent_alloc (SCHEME_A_ args, NIL);
3517 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3859 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3518 3860
3519 s_return (x); 3861 s_return (x);
3520 } 3862 }
3521 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 */
3522 { 3864 {
… …
3552 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3553 { 3895 {
3554 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3555 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3556 } 3898 }
3557 else 3899
3558 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3559 3901
3560 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3561 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3562 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3563
3564#if 1
3565 3905
3566 case OP_LAMBDA: /* lambda */ 3906 case OP_LAMBDA: /* lambda */
3567 /* 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
3568 set SCHEME_V->value fall thru */ 3908 set SCHEME_V->value fall thru */
3569 { 3909 {
… …
3576 SCHEME_V->code = slot_value_in_env (f); 3916 SCHEME_V->code = slot_value_in_env (f);
3577 s_goto (OP_APPLY); 3917 s_goto (OP_APPLY);
3578 } 3918 }
3579 3919
3580 SCHEME_V->value = SCHEME_V->code; 3920 SCHEME_V->value = SCHEME_V->code;
3581 /* Fallthru */
3582 } 3921 }
3922 /* Fallthru */
3583 3923
3584 case OP_LAMBDA1: 3924 case OP_LAMBDA1:
3585 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));
3586
3587#else
3588
3589 case OP_LAMBDA: /* lambda */
3590 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3591
3592#endif
3593 3926
3594 case OP_MKCLOSURE: /* make-closure */ 3927 case OP_MKCLOSURE: /* make-closure */
3595 x = car (args); 3928 x = car (args);
3596 3929
3597 if (car (x) == SCHEME_V->LAMBDA) 3930 if (car (x) == SCHEME_V->LAMBDA)
… …
3636 else 3969 else
3637 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);
3638 3971
3639 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3640 3973
3641
3642 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3643 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3644 3976
3645 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3646 x = cadr (args); 3978 x = cadr (args);
… …
3664 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3665 } 3997 }
3666 else 3998 else
3667 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3668 4000
3669
3670 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3671 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3672 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3673 4004
3674 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3685 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3686 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3687 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3688 else 4019 else
3689 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
3690 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3691 4023
3692 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3693 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3694 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3695 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);
3696 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3697 4029
3698 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3699 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3700 4033
3701 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3702 { 4035 {
3703 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)))
3704 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));
3705 4038
3706 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3707 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3708 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3709 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3710 } 4043 }
3711 else /* end */ 4044
3712 { 4045 /* end */
3713 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3714 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3715 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3716 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3717 }
3718 4050
3719 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3720 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3721 4053
3722 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;
… …
3726 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3727 { 4059 {
3728 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))
3729 { 4061 {
3730 if (!is_pair (x)) 4062 if (!is_pair (x))
3731 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3732 4064
3733 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3734 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3735 4067
3736 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3737 } 4069 }
3738 4070
3739 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)),
… …
3756 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3757 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3758 } 4090 }
3759 4091
3760 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)))
3761 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));
3762 4094
3763 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));
3764 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3765 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3766 4098
… …
3777 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3778 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3779 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3780 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3781 } 4113 }
3782 else /* end */ 4114
4115 /* end */
3783 { 4116
3784 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3785 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3786 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3787 }
3788 4120
3789 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3790 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3791 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3792 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3793 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3794 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3795 4127
3796 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3797 args = cons (SCHEME_V->value, args);
3798
3799 if (is_pair (SCHEME_V->code)) /* continue */
3800 {
3801 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3802 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3803
3804 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3805 SCHEME_V->code = cadar (SCHEME_V->code);
3806 SCHEME_V->args = NIL;
3807 s_goto (OP_EVAL);
3808 }
3809 else /* end */
3810 {
3811 args = reverse_in_place (SCHEME_A_ NIL, args);
3812 SCHEME_V->code = car (args);
3813 SCHEME_V->args = cdr (args);
3814 s_goto (OP_LET2REC);
3815 }
3816 4129
3817 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3818 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))
3819 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3820 4133
… …
3850 } 4163 }
3851 else 4164 else
3852 { 4165 {
3853 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3854 s_return (NIL); 4167 s_return (NIL);
3855 else 4168
3856 {
3857 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3858 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3859 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3860 }
3861 } 4172 }
3862 4173
3863 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3864 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);
3865 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3876 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3877 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3878 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3879 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3880 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3881 else 4192
3882 {
3883 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3884 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3885 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3886 }
3887 4196
3888 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3889 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3890 s_return (S_F); 4199 s_return (S_F);
3891 4200
… …
3896 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3897 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3898 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3899 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3900 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3901 else 4210
3902 {
3903 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3904 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3905 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3906 }
3907 4214
3908 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3909 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3910 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3911 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3976 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3977 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3978 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3979 } 4286 }
3980 } 4287 }
3981 else 4288
3982 s_return (NIL); 4289 s_return (NIL);
3983 4290
3984 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
3985 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
3986 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
3987 else 4294
3988 s_return (NIL); 4295 s_return (NIL);
3989 4296
3990 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
3991 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
3992 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3993 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
4007 } 4314 }
4008 4315
4009 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
4010} 4317}
4011 4318
4012static int 4319/* math, cxr */
4320ecb_hot static int
4013opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4014{ 4322{
4015 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
4016 pointer x = car (args); 4324 pointer x = car (args);
4017 num v; 4325 num v;
4018 4326
4019 switch (op) 4327 switch (op)
4020 { 4328 {
4021#if USE_MATH 4329#if USE_MATH
4022 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
4023 {
4024 if (is_integer (x)) 4331 if (!is_integer (x))
4025 s_return (x); 4332 {
4026
4027 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
4028 4334
4029 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
4030 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4031 else 4337 else
4032 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
4033 } 4339 }
4034 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))));
4035 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))));
4036 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))))));
4037 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))));
4038 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))));
4039 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))));
4040 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))));
4041 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))));
4042 4357
4043 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
4044 if (cdr (args) == NIL) 4360 cdr (args) == NIL
4045 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
4046 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
4047 {
4048 pointer y = cadr (args);
4049 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4050 }
4051
4052 case OP_SQRT:
4053 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4054 4363
4055 case OP_EXPT: 4364 case OP_EXPT:
4056 { 4365 {
4057 RVALUE result; 4366 RVALUE result;
4058 int real_result = 1; 4367 int real_result = 1;
… …
4081 if (real_result) 4390 if (real_result)
4082 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4083 else 4392 else
4084 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4085 } 4394 }
4086
4087 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4088 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4089
4090 case OP_TRUNCATE:
4091 {
4092 RVALUE n = rvalue (x);
4093 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4094 }
4095
4096 case OP_ROUND:
4097 if (is_integer (x))
4098 s_return (x);
4099
4100 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4101#endif 4395#endif
4102 4396
4103 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4104 v = num_zero; 4398 v = num_zero;
4105 4399
… …
4193 else 4487 else
4194 Error_0 ("modulo: division by zero"); 4488 Error_0 ("modulo: division by zero");
4195 4489
4196 s_return (mk_number (SCHEME_A_ v)); 4490 s_return (mk_number (SCHEME_A_ v));
4197 4491
4198 case OP_CAR: /* car */ 4492 /* the compiler will optimize this mess... */
4199 s_return (caar (args)); 4493 case OP_CAR: op_car: s_return (car (x));
4200 4494 case OP_CDR: op_cdr: s_return (cdr (x));
4201 case OP_CDR: /* cdr */ 4495 case OP_CAAR: op_caar: x = car (x); goto op_car;
4202 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;
4203 4523
4204 case OP_CONS: /* cons */ 4524 case OP_CONS: /* cons */
4205 set_cdr (args, cadr (args)); 4525 set_cdr (args, cadr (args));
4206 s_return (args); 4526 s_return (args);
4207 4527
… …
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4702
4383 s_return (newstr); 4703 s_return (newstr);
4384 } 4704 }
4385 4705
4386 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4387 { 4707 {
4388 char *str = strvalue (x); 4708 char *str = strvalue (x);
4389 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4390 int index1; 4710 int index1;
4391 int len; 4711 int len;
4392 4712
4393 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4394 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4395 4715
4396 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4397 { 4717 {
4398 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4399 4719
4400 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4401 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4402 } 4722 }
4403 else 4723 else
4404 index1 = strlength (x); 4724 index1 = strlength (x);
4405 4725
4406 len = index1 - index0; 4726 len = index1 - index0;
4407 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4408 memcpy (strvalue (x), str + index0, len);
4409 strvalue (x)[len] = 0;
4410 4728
4411 s_return (x); 4729 s_return (x);
4412 } 4730 }
4413 4731
4414 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4488 } 4806 }
4489 4807
4490 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4491} 4809}
4492 4810
4493static int 4811/* relational ops */
4812ecb_hot static int
4494opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4495{ 4814{
4496 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4497 4816
4498 for (;;) 4817 for (;;)
… …
4519 } 4838 }
4520 4839
4521 s_return (S_T); 4840 s_return (S_T);
4522} 4841}
4523 4842
4524static int 4843/* predicates */
4844ecb_hot static int
4525opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4526{ 4846{
4527 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4528 pointer a = car (args); 4848 pointer a = car (args);
4529 pointer d = cdr (args); 4849 pointer d = cdr (args);
4530 int r; 4850 int r;
4531 4851
4532 switch (op) 4852 switch (op)
4533 { 4853 {
4534 case OP_NOT: /* not */ r = is_false (a) ; break; 4854 case OP_NOT: /* not */ r = is_false (a) ; break;
4535 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;
4536 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4856 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4537 case OP_NULLP: /* null? */ r = a == NIL ; break; 4857 case OP_NULLP: /* null? */ r = a == NIL ; break;
4538 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;
4539 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4860 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4540 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4861 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4541 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4862 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4542 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 */
4543 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4864 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4544 4865
4545#if USE_CHAR_CLASSIFIERS 4866#if USE_CHAR_CLASSIFIERS
4546 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4867 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4547 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4868 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4548 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4869 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4575 } 4896 }
4576 4897
4577 s_retbool (r); 4898 s_retbool (r);
4578} 4899}
4579 4900
4580static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4581opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4582{ 4904{
4583 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4584 pointer a = car (args); 4906 pointer a = car (args);
4585 pointer x, y; 4907 pointer x, y;
… …
4598 } 4920 }
4599 else 4921 else
4600 s_return (SCHEME_V->code); 4922 s_return (SCHEME_V->code);
4601 4923
4602 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4603 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4604 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4605 4927
4606#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4607 4932
4608 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4609 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4610 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4611 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4625 else 4950 else
4626 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4627 4952
4628 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4629 4954
4955 //TODO: move to scheme
4630 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4631 if (is_pair (args)) 4957 if (is_pair (args))
4632 { 4958 {
4633 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4634 { 4960 {
… …
4636 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4637 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4638 } 4964 }
4639 } 4965 }
4640 4966
4641 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4642 s_return (S_T); 4968 s_return (S_T);
4643#endif 4969#endif
4644 4970
4645 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4646 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4655 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4656 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4657 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4658 4984
4659 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4660 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4661 4987
4662 if (args != NIL) 4988 if (args != NIL)
4663 { 4989 {
4664 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4665 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4666 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4667 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4668 } 4994 }
4669 else 4995 else
4670 { 4996 {
4671 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4672 4998
4673 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4674 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4675 else 5001 else
4676 return -1; 5002 return -1;
… …
4753 SCHEME_V->gc_verbose = (a != S_F); 5079 SCHEME_V->gc_verbose = (a != S_F);
4754 s_retbool (was); 5080 s_retbool (was);
4755 } 5081 }
4756 5082
4757 case OP_NEWSEGMENT: /* new-segment */ 5083 case OP_NEWSEGMENT: /* new-segment */
5084#if 0
4758 if (!is_pair (args) || !is_number (a)) 5085 if (!is_pair (args) || !is_number (a))
4759 Error_0 ("new-segment: argument must be a number"); 5086 Error_0 ("new-segment: argument must be a number");
4760 5087#endif
4761 alloc_cellseg (SCHEME_A_ ivalue (a)); 5088 s_retbool (alloc_cellseg (SCHEME_A));
4762
4763 s_return (S_T);
4764 5089
4765 case OP_OBLIST: /* oblist */ 5090 case OP_OBLIST: /* oblist */
4766 s_return (oblist_all_symbols (SCHEME_A)); 5091 s_return (oblist_all_symbols (SCHEME_A));
4767 5092
4768#if USE_PORTS 5093#if USE_PORTS
… …
4838 s_return (p == NIL ? S_F : p); 5163 s_return (p == NIL ? S_F : p);
4839 } 5164 }
4840 5165
4841 case OP_GET_OUTSTRING: /* get-output-string */ 5166 case OP_GET_OUTSTRING: /* get-output-string */
4842 { 5167 {
4843 port *p; 5168 port *p = port (a);
4844 5169
4845 if ((p = a->object.port)->kind & port_string) 5170 if (p->kind & port_string)
4846 { 5171 {
4847 off_t size; 5172 off_t size;
4848 char *str; 5173 char *str;
4849 5174
4850 size = p->rep.string.curr - p->rep.string.start + 1; 5175 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4885 } 5210 }
4886 5211
4887 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4888} 5213}
4889 5214
4890static int 5215/* reading */
5216ecb_cold static int
4891opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4892{ 5218{
4893 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4894 pointer x; 5220 pointer x;
4895 5221
… …
4955 int res; 5281 int res;
4956 5282
4957 if (is_pair (args)) 5283 if (is_pair (args))
4958 p = car (args); 5284 p = car (args);
4959 5285
4960 res = p->object.port->kind & port_string; 5286 res = port (p)->kind & port_string;
4961 5287
4962 s_retbool (res); 5288 s_retbool (res);
4963 } 5289 }
4964 5290
4965 case OP_SET_INPORT: /* set-input-port */ 5291 case OP_SET_INPORT: /* set-input-port */
… …
4974 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
4975 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
4976 { 5302 {
4977 case TOK_EOF: 5303 case TOK_EOF:
4978 s_return (S_EOF); 5304 s_return (S_EOF);
4979 /* NOTREACHED */
4980 5305
4981 case TOK_VEC: 5306 case TOK_VEC:
4982 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4983 /* fall through */ 5308 /* fall through */
4984 5309
… …
4987 5312
4988 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
4989 s_return (NIL); 5314 s_return (NIL);
4990 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
4991 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
4992 else 5317
4993 {
4994 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4995 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4996 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
4997 }
4998 5321
4999 case TOK_QUOTE: 5322 case TOK_QUOTE:
5000 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5001 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
5002 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
5008 { 5331 {
5009 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5010 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
5011 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
5012 } 5335 }
5013 else 5336
5014 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5015
5016 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
5017 5339
5018 case TOK_COMMA: 5340 case TOK_COMMA:
5019 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5020 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
5031 case TOK_DOTATOM: 5353 case TOK_DOTATOM:
5032 SCHEME_V->strbuff[0] = '.'; 5354 SCHEME_V->strbuff[0] = '.';
5033 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)));
5034 5356
5035 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
5036 x = readstrexp (SCHEME_A_ '|'); 5360 x = readstrexp (SCHEME_A_ '|');
5037 //TODO: haven't checked whether the garbage collector could interfere
5038 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5039 5362
5040 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
5041 x = readstrexp (SCHEME_A_ '"'); 5364 x = readstrexp (SCHEME_A_ '"');
5042 5365
… …
5050 { 5373 {
5051 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);
5052 5375
5053 if (f == NIL) 5376 if (f == NIL)
5054 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
5055 else 5378
5056 {
5057 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5058 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
5059 }
5060 } 5381 }
5061 5382
5062 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
5063 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)
5064 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
5065 else 5386
5066 s_return (x); 5387 s_return (x);
5067 5388
5068 default: 5389 default:
5069 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5070 } 5391 }
5071 5392
… …
5164 pointer b = cdr (args); 5485 pointer b = cdr (args);
5165 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5166 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5167 5488
5168 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5170 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5172 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5173 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5174 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5175 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5176 else 5497 else
5177 { 5498 {
5178 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5179 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5180 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5181 } 5502 }
5182 5503
5183 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5185 5506
5186 case OP_P1LIST: 5507 case OP_P1LIST:
5187 if (is_pair (args)) 5508 if (is_pair (args))
5188 { 5509 {
5189 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5190 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5191 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5192 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5193 } 5514 }
5194 else if (is_vector (args)) 5515 else if (is_vector (args))
5195 { 5516 {
… …
5203 { 5524 {
5204 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5205 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5206 } 5527 }
5207 5528
5208 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5209 s_return (S_T); 5530 s_return (S_T);
5210 } 5531 }
5211 5532
5212 case OP_PVECFROM: 5533 case OP_PVECFROM:
5213 { 5534 {
… …
5215 pointer vec = car (args); 5536 pointer vec = car (args);
5216 int len = veclength (vec); 5537 int len = veclength (vec);
5217 5538
5218 if (i == len) 5539 if (i == len)
5219 { 5540 {
5220 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5221 s_return (S_T); 5542 s_return (S_T);
5222 } 5543 }
5223 else 5544 else
5224 { 5545 {
5225 pointer elem = vector_get (vec, i); 5546 pointer elem = vector_get (vec, i);
… …
5227 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5228 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5229 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5230 5551
5231 if (i > 0) 5552 if (i > 0)
5232 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5233 5554
5234 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5235 } 5556 }
5236 } 5557 }
5237 } 5558 }
5238 5559
5239 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5240} 5561}
5241 5562
5242static int 5563/* list ops */
5564ecb_hot static int
5243opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5244{ 5566{
5245 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5246 pointer a = car (args); 5568 pointer a = car (args);
5247 pointer x, y; 5569 pointer x, y;
… …
5270 break; 5592 break;
5271 } 5593 }
5272 5594
5273 if (is_pair (y)) 5595 if (is_pair (y))
5274 s_return (car (y)); 5596 s_return (car (y));
5275 else 5597
5276 s_return (S_F); 5598 s_return (S_F);
5277
5278 5599
5279 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5280 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5281 5602
5282 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5283 s_return (S_F); 5604 s_return (S_F);
5284 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5286 else if (is_macro (SCHEME_V->args)) 5607
5287 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5288 else
5289 s_return (S_F); 5608 s_return (S_F);
5290 5609
5291 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5292 /* 5611 /*
5293 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5294 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
… …
5305 5624
5306/* 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 */
5307typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5308 5627
5309typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5310static int 5629
5630ecb_hot static int
5311tst_any (pointer p) 5631tst_any (pointer p)
5312{ 5632{
5313 return 1; 5633 return 1;
5314} 5634}
5315 5635
5316static int 5636ecb_hot static int
5317tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5318{ 5638{
5319 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5320} 5640}
5321 5641
5322static int 5642ecb_hot static int
5323tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5324{ 5644{
5325 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5326} 5646}
5327 5647
… …
5370#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5371#include "opdefines.h" 5691#include "opdefines.h"
5372#undef OP_DEF 5692#undef OP_DEF
5373; 5693;
5374 5694
5375static const char * 5695ecb_cold static const char *
5376opname (int idx) 5696opname (int idx)
5377{ 5697{
5378 const char *name = opnames; 5698 const char *name = opnames;
5379 5699
5380 /* 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? */
… …
5382 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5383 5703
5384 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5385} 5705}
5386 5706
5387static const char * 5707ecb_cold static const char *
5388procname (pointer x) 5708procname (pointer x)
5389{ 5709{
5390 return opname (procnum (x)); 5710 return opname (procnum (x));
5391} 5711}
5392 5712
… …
5412#undef OP_DEF 5732#undef OP_DEF
5413 {0} 5733 {0}
5414}; 5734};
5415 5735
5416/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5417static void ecb_hot 5737ecb_hot static void
5418Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5419{ 5739{
5420 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5421 5741
5422 for (;;) 5742 for (;;)
… …
5505 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))
5506 return; 5826 return;
5507 5827
5508 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5828 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5509 { 5829 {
5510 xwrstr ("No memory!\n"); 5830 putstr (SCHEME_A_ "No memory!\n");
5511 return; 5831 return;
5512 } 5832 }
5513 } 5833 }
5514} 5834}
5515 5835
5516/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5517 5837
5518static void 5838ecb_cold static void
5519assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5520{ 5840{
5521 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5522 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5523} 5843}
5524 5844
5525static void 5845ecb_cold static void
5526assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5527{ 5847{
5528 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5529 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5530 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5538 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5539 return y; 5859 return y;
5540} 5860}
5541 5861
5542/* 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! */
5543static int 5863ecb_hot static int
5544syntaxnum (pointer p) 5864syntaxnum (pointer p)
5545{ 5865{
5546 const char *s = strvalue (p); 5866 const char *s = strvalue (p);
5547 5867
5548 switch (strlength (p)) 5868 switch (strlength (p))
… …
5628ecb_cold int 5948ecb_cold int
5629scheme_init (SCHEME_P) 5949scheme_init (SCHEME_P)
5630{ 5950{
5631 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5951 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5632 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));
5633 5959
5634 num_set_fixnum (num_zero, 1); 5960 num_set_fixnum (num_zero, 1);
5635 num_set_ivalue (num_zero, 0); 5961 num_set_ivalue (num_zero, 0);
5636 num_set_fixnum (num_one, 1); 5962 num_set_fixnum (num_one, 1);
5637 num_set_ivalue (num_one, 1); 5963 num_set_ivalue (num_one, 1);
… …
5649 SCHEME_V->save_inport = NIL; 5975 SCHEME_V->save_inport = NIL;
5650 SCHEME_V->loadport = NIL; 5976 SCHEME_V->loadport = NIL;
5651 SCHEME_V->nesting = 0; 5977 SCHEME_V->nesting = 0;
5652 SCHEME_V->interactive_repl = 0; 5978 SCHEME_V->interactive_repl = 0;
5653 5979
5654 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5980 if (!alloc_cellseg (SCHEME_A))
5655 { 5981 {
5656#if USE_ERROR_CHECKING 5982#if USE_ERROR_CHECKING
5657 SCHEME_V->no_memory = 1; 5983 SCHEME_V->no_memory = 1;
5658 return 0; 5984 return 0;
5659#endif 5985#endif
5660 } 5986 }
5661 5987
5662 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5663 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5664 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5665 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5666 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5667 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5668 5995
5669 /* init NIL */ 5996 /* init NIL */
5670 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5671 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5727 6054
5728 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5729} 6056}
5730 6057
5731#if USE_PORTS 6058#if USE_PORTS
5732void 6059ecb_cold void
5733scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5734{ 6061{
5735 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5736} 6063}
5737 6064
5738void 6065ecb_cold void
5739scheme_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)
5740{ 6067{
5741 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);
5742} 6069}
5743 6070
5744void 6071ecb_cold void
5745scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5746{ 6073{
5747 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5748} 6075}
5749 6076
5750void 6077ecb_cold void
5751scheme_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)
5752{ 6079{
5753 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);
5754} 6081}
5755#endif 6082#endif
5756 6083
5757void 6084ecb_cold void
5758scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5759{ 6086{
5760 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5761} 6088}
5762 6089
… …
5794 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5795 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5796 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5797 6124
5798 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5799 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5800 6127
5801#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5802 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5803 {
5804 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5805 { 6131 {
5806 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5807 6133
5808 if (fname) 6134 if (fname)
5809 free (fname); 6135 free (fname);
5810 } 6136 }
5811 }
5812#endif 6137#endif
5813} 6138}
5814 6139
5815void 6140ecb_cold void
5816scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5817{ 6142{
5818 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5819} 6144}
5820 6145
5821void 6146ecb_cold void
5822scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5823{ 6148{
5824 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5825 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5826 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5827 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5828 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5829 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5830#if USE_PORTS
5831 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5832#endif
5833 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5834 6157
5835#if USE_PORTS
5836 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5837 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5838#endif
5839 6160
5840#if USE_PORTS 6161#if USE_PORTS
5841#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5842 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5843 6164
… …
5847#endif 6168#endif
5848 6169
5849 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5850 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5851 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5852 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5853 6175
5854 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5855 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5856} 6178}
5857 6179
5858void 6180ecb_cold void
5859scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5860{ 6182{
6183#if USE_PORTs
5861 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5862 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5863 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5864 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5865 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 */
5866 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);
5867 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5868#if USE_PORTS
5869 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5870#endif
5871 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5872 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5873 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5874 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5875 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5876 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5877 6198
5878 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5879 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5880} 6204}
5881 6205
5882void 6206ecb_cold void
5883scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5884{ 6208{
5885 pointer x; 6209 pointer x;
5886 6210
5887 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5892 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5893} 6217}
5894 6218
5895#if !STANDALONE 6219#if !STANDALONE
5896 6220
5897void 6221ecb_cold void
5898scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5899{ 6223{
5900 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));
5901} 6225}
5902 6226
5903void 6227ecb_cold void
5904scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5905{ 6229{
5906 int i; 6230 int i;
5907 6231
5908 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5909 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5910} 6234}
5911 6235
5912pointer 6236ecb_cold pointer
5913scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5914{ 6238{
5915 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));
5916} 6240}
5917 6241
5918void 6242ecb_cold void
5919save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5920{ 6244{
5921 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5922 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5923 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5927 /* 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
5928 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5929 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5930} 6254}
5931 6255
5932void 6256ecb_cold void
5933restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5934{ 6258{
5935 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5936 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5937 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5938 /* Pop */ 6262 /* Pop */
5939 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5940} 6264}
5941 6265
5942/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5943pointer 6267ecb_cold pointer
5944scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5945{ 6269{
5946 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5947 6271
5948 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
5955 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
5956 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
5957 return SCHEME_V->value; 6281 return SCHEME_V->value;
5958} 6282}
5959 6283
5960pointer 6284ecb_cold pointer
5961scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
5962{ 6286{
5963 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
5964 6288
5965 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
5977 6301
5978/* ========== Main ========== */ 6302/* ========== Main ========== */
5979 6303
5980#if STANDALONE 6304#if STANDALONE
5981 6305
5982int 6306ecb_cold int
5983main (int argc, char **argv) 6307main (int argc, char **argv)
5984{ 6308{
5985# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
5986 scheme ssc; 6310 scheme ssc;
5987 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
5989# endif 6313# endif
5990 int fin; 6314 int fin;
5991 char *file_name = InitFile; 6315 char *file_name = InitFile;
5992 int retcode; 6316 int retcode;
5993 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
5994 system ("ps v $PPID");//D 6319 system ("ps v $PPID");
6320#endif
5995 6321
5996 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5997 { 6323 {
5998 xwrstr ("Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5999 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6000 xwrstr ("followed by\n"); 6326 putstr (SCHEME_A_ "followed by\n");
6001 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6327 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6002 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6003 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6329 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6004 xwrstr ("Use - as filename for stdin.\n"); 6330 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6005 return 1; 6331 return 1;
6006 } 6332 }
6007 6333
6008 if (!scheme_init (SCHEME_A)) 6334 if (!scheme_init (SCHEME_A))
6009 { 6335 {
6010 xwrstr ("Could not initialize!\n"); 6336 putstr (SCHEME_A_ "Could not initialize!\n");
6011 return 2; 6337 return 2;
6012 } 6338 }
6013 6339
6014# if USE_PORTS 6340# if USE_PORTS
6015 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6341 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6028 } 6354 }
6029#endif 6355#endif
6030 6356
6031 do 6357 do
6032 { 6358 {
6033#if USE_PORTS
6034 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
6035 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
6036 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)
6037 { 6362 {
6038 pointer args = NIL; 6363 pointer args = NIL;
… …
6056 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);
6057 6382
6058 } 6383 }
6059 else 6384 else
6060 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
6061#endif
6062 6386
6063 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
6064 { 6388 {
6065 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');
6066 } 6392 }
6067 else 6393 else
6068 { 6394 {
6069 if (isfile) 6395 if (isfile)
6070 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6071 else 6397 else
6072 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6073 6399
6074#if USE_PORTS
6075 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6076 { 6401 {
6077 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6078 { 6403 {
6079 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');
6080 } 6407 }
6081 6408
6082 if (isfile) 6409 if (isfile)
6083 close (fin); 6410 close (fin);
6084 } 6411 }
6085#endif
6086 } 6412 }
6087 6413
6088 file_name = *argv++; 6414 file_name = *argv++;
6089 } 6415 }
6090 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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