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

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

Diff Legend

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