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.47 by root, Mon Nov 30 09:25:19 2015 UTC vs.
Revision 1.66 by root, Mon Dec 7 18:10:57 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1 21#define _POSIX_C_SOURCE 200201
22 22#define _XOPEN_SOURCE 600
23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define _GNU_SOURCE 1 /* for malloc mremap */
24#include "malloc.c"
25 24
26#define SCHEME_SOURCE 25#define SCHEME_SOURCE
27#include "scheme-private.h" 26#include "scheme-private.h"
28#ifndef WIN32 27#ifndef WIN32
29# include <unistd.h> 28# include <unistd.h>
30#endif 29#endif
31#if USE_MATH 30#if USE_MATH
32# include <math.h> 31# include <math.h>
33#endif 32#endif
34 33
34#define ECB_NO_THREADS 1
35#include "ecb.h" 35#include "ecb.h"
36 36
37#include <sys/types.h> 37#include <sys/types.h>
38#include <sys/stat.h> 38#include <sys/stat.h>
39#include <fcntl.h> 39#include <fcntl.h>
… …
47#include <string.h> 47#include <string.h>
48 48
49#include <limits.h> 49#include <limits.h>
50#include <inttypes.h> 50#include <inttypes.h>
51#include <float.h> 51#include <float.h>
52//#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
53 60
54#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
55 || '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 \
56 || '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 \
57 || '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 \
… …
79 86
80#define BACKQUOTE '`' 87#define BACKQUOTE '`'
81#define WHITESPACE " \t\r\n\v\f" 88#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE 89#define DELIMITERS "()\";" WHITESPACE
83 90
84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
87#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
88#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
89 96
90#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
91static scheme sc; 98static scheme sc;
92#endif 99#endif
93 100
94static void 101ecb_cold static void
95xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
96{ 103{
97 if (n < 0) 104 if (n < 0)
98 { 105 {
99 *s++ = '-'; 106 *s++ = '-';
… …
101 } 108 }
102 109
103 char *p = s; 110 char *p = s;
104 111
105 do { 112 do {
106 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
107 n /= base; 114 n /= base;
108 } while (n); 115 } while (n);
109 116
110 *p-- = 0; 117 *p-- = 0;
111 118
… …
114 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
115 --p; ++s; 122 --p; ++s;
116 } 123 }
117} 124}
118 125
119static void 126ecb_cold static void
120xnum (char *s, long n) 127xnum (char *s, long n)
121{ 128{
122 xbase (s, n, 10); 129 xbase (s, n, 10);
123} 130}
124 131
125static void 132ecb_cold static void
126xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
127{
128 write (1, s, strlen (s));
129}
130
131static void
132xwrnum (long n)
133{ 134{
134 char buf[64]; 135 char buf[64];
135 136
136 xnum (buf, n); 137 xnum (buf, n);
137 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
138} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
139 144
140static char 145static char
141xtoupper (char c) 146xtoupper (char c)
142{ 147{
143 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
163 168
164#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
165#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
166#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
167 172
173#endif
174
168#if USE_IGNORECASE 175#if USE_IGNORECASE
169static const char * 176ecb_cold static const char *
170xstrlwr (char *s) 177xstrlwr (char *s)
171{ 178{
172 const char *p = s; 179 const char *p = s;
173 180
174 while (*s) 181 while (*s)
… …
187# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
188# define strlwr(s) (s) 195# define strlwr(s) (s)
189#endif 196#endif
190 197
191#ifndef prompt 198#ifndef prompt
192# define prompt "ts> " 199# define prompt "ms> "
193#endif 200#endif
194 201
195#ifndef InitFile 202#ifndef InitFile
196# define InitFile "init.scm" 203# define InitFile "init.scm"
197#endif 204#endif
198 205
199#ifndef FIRST_CELLSEGS
200# define FIRST_CELLSEGS 3
201#endif
202
203enum scheme_types 206enum scheme_types
204{ 207{
205 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
206 T_REAL, 210 T_REAL,
207 T_STRING, 211 T_STRING,
208 T_SYMBOL, 212 T_SYMBOL,
209 T_PROC, 213 T_PROC,
210 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
211 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
212 T_CONTINUATION, 218 T_CONTINUATION,
213 T_FOREIGN, 219 T_FOREIGN,
214 T_CHARACTER,
215 T_PORT, 220 T_PORT,
216 T_VECTOR, 221 T_VECTOR,
217 T_MACRO,
218 T_PROMISE, 222 T_PROMISE,
219 T_ENVIRONMENT, 223 T_ENVIRONMENT,
220 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
221 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
222}; 227};
223 228
224#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
225#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
226#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
227#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
228#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
229 234
230/* num, for generic arithmetic */ 235/* num, for generic arithmetic */
231struct num 236struct num
232{ 237{
233 IVALUE ivalue; 238 IVALUE ivalue;
… …
258static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
259static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
260static num num_rem (num a, num b); 265static num num_rem (num a, num b);
261static num num_mod (num a, num b); 266static num num_mod (num a, num b);
262 267
263#if USE_MATH
264static double round_per_R5RS (double x);
265#endif
266static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
267 269
268static num num_zero; 270static num num_zero;
269static num num_one; 271static num num_one;
270 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
271/* macros for cell operations */ 277/* macros for cell operations */
272#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
273#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
274#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
275 281
276INTERFACE int 282INTERFACE int
277is_string (pointer p) 283is_string (pointer p)
278{ 284{
279 return type (p) == T_STRING; 285 return type (p) == T_STRING;
280} 286}
281 287
282#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
283#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
284 290
285INTERFACE int 291INTERFACE int
286is_vector (pointer p) 292is_vector (pointer p)
287{ 293{
288 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
289} 295}
290 296
291#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
292#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
294INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
296 302
297INTERFACE int 303INTERFACE int
… …
323string_value (pointer p) 329string_value (pointer p)
324{ 330{
325 return strvalue (p); 331 return strvalue (p);
326} 332}
327 333
328#define ivalue_unchecked(p) (p)->object.ivalue 334#define ivalue_unchecked(p) CELL(p)->object.ivalue
329#define set_ivalue(p,v) (p)->object.ivalue = (v) 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
330 336
331#if USE_REAL 337#if USE_REAL
332#define rvalue_unchecked(p) (p)->object.rvalue 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
333#define set_rvalue(p,v) (p)->object.rvalue = (v) 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
334#else 340#else
335#define rvalue_unchecked(p) (p)->object.ivalue 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
336#define set_rvalue(p,v) (p)->object.ivalue = (v) 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
337#endif 343#endif
338 344
339INTERFACE long 345INTERFACE long
340charvalue (pointer p) 346charvalue (pointer p)
341{ 347{
342 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
343} 349}
344 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
345INTERFACE int 353INTERFACE int
346is_port (pointer p) 354is_port (pointer p)
347{ 355{
348 return type (p) == T_PORT; 356 return type (p) == T_PORT;
349} 357}
350 358
351INTERFACE int 359INTERFACE int
352is_inport (pointer p) 360is_inport (pointer p)
353{ 361{
354 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
355} 363}
356 364
357INTERFACE int 365INTERFACE int
358is_outport (pointer p) 366is_outport (pointer p)
359{ 367{
360 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
361} 369}
362 370
363INTERFACE int 371INTERFACE int
364is_pair (pointer p) 372is_pair (pointer p)
365{ 373{
366 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
367} 375}
368 376
369#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
370#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
371 379
372static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
373static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
374static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
375static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
376 384
377static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
378static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
379static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
380 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
381INTERFACE void 391INTERFACE void
382set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
383{ 393{
384 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
385} 395}
386 396
387INTERFACE void 397INTERFACE void
388set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
389{ 399{
390 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
391} 401}
392 402
393INTERFACE pointer 403INTERFACE pointer
394pair_car (pointer p) 404pair_car (pointer p)
395{ 405{
… …
501 511
502#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
503#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
504#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
505 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
506#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
507#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
508#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
509 525
510INTERFACE int 526INTERFACE int
511is_immutable (pointer p) 527is_immutable (pointer p)
512{ 528{
513 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
525 proper list: length 541 proper list: length
526 circular list: -1 542 circular list: -1
527 not even a pair: -2 543 not even a pair: -2
528 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
529*/ 545*/
530INTERFACE int 546ecb_hot INTERFACE int
531list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
532{ 548{
533 int i = 0; 549 int i = 0;
534 pointer slow, fast; 550 pointer slow, fast;
535 551
… …
574{ 590{
575 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
576} 592}
577 593
578#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
579ecb_inline int 596ecb_inline int
580Cisalpha (int c) 597Cisalpha (int c)
581{ 598{
582 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
583} 600}
… …
641 "gs", 658 "gs",
642 "rs", 659 "rs",
643 "us" 660 "us"
644}; 661};
645 662
646static int 663ecb_cold static int
647is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
648{ 665{
649 int i; 666 int i;
650 667
651 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
670 687
671static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
672static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
673static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
674ecb_inline int is_one_of (const char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
675static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
677static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
678static int count_consecutive_cells (pointer x, int needed);
679static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
680static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
681static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
682static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
683static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
684static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
685 701
702static pointer mk_port (SCHEME_P_ port *p);
703
686#if USE_PORTS 704#if USE_PORTS
687static pointer mk_port (SCHEME_P_ port *p);
688static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
689static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
690static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
691static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
692static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
693static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
694static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
695#endif 712#endif
713
696static void mark (pointer a); 714static void mark (pointer a);
697static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
698static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
699static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
700static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
701static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
702static pointer readstrexp (SCHEME_P_ char delim); 720static pointer readstrexp (SCHEME_P_ char delim);
703ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
704static int token (SCHEME_P); 722static int token (SCHEME_P);
705static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
706static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
707static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
708static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
874 } 892 }
875 893
876 return ret; 894 return ret;
877} 895}
878 896
879#if USE_MATH
880
881/* Round to nearest. Round to even if midway */
882static double
883round_per_R5RS (double x)
884{
885 double fl = floor (x);
886 double ce = ceil (x);
887 double dfl = x - fl;
888 double dce = ce - x;
889
890 if (dfl > dce)
891 return ce;
892 else if (dfl < dce)
893 return fl;
894 else
895 {
896 if (fmod (fl, 2) == 0) /* I imagine this holds */
897 return fl;
898 else
899 return ce;
900 }
901}
902#endif
903
904static int 897static int
905is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
906{ 899{
907 return x == 0; 900 return x == 0;
908#if 0 901#if 0
… …
913#endif 906#endif
914#endif 907#endif
915} 908}
916 909
917/* allocate new cell segment */ 910/* allocate new cell segment */
918static int 911ecb_cold static int
919alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
920{ 913{
921 pointer newp; 914 struct cell *newp;
922 pointer last; 915 struct cell *last;
923 pointer p; 916 struct cell *p;
924 char *cp; 917 char *cp;
925 long i; 918 long i;
926 int k; 919 int k;
927 920
928 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
929 segsize <<= 1; 922 segsize <<= 1;
930 923
931 for (k = 0; k < n; k++)
932 {
933 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
934 return k;
935
936 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
937 925
938 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
939 return k; 927 return k;
940 928
941 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
942 SCHEME_V->alloc_seg[i] = cp;
943 930
944 newp = (pointer)cp; 931 newp = (struct cell *)cp;
945 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
946 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
947 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
948 last = newp + segsize - 1; 935 last = newp + segsize - 1;
949 936
950 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
951 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
952 set_typeflag (p, T_PAIR); 941 set_typeflag (cp, T_PAIR);
953 set_car (p, NIL); 942 set_car (cp, NIL);
954 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
955 } 944 }
956 945
957 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
958 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
959 }
960 948
961 return n; 949 return 1;
962} 950}
963 951
964/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
965ecb_inline pointer 953ecb_inline pointer
966get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
971 return S_SINK; 959 return S_SINK;
972 960
973 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
974 { 962 {
975 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
976 964
977 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
978 966
979 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
980 { 968 {
981 /* if only a few recovered, get more to avoid fruitless gc's */ 969 /* if only a few recovered, get more to avoid fruitless gc's */
982 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
983 { 971 {
984#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
985 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
986 return S_SINK; 974 return S_SINK;
987#endif 975#endif
… …
999 } 987 }
1000} 988}
1001 989
1002/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
1003 Tehom */ 991 Tehom */
1004 992ecb_hot static void
1005static void
1006push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1007{ 994{
1008 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1009 996
1010 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
1012 set_car (holder, recent); 999 set_car (holder, recent);
1013 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
1014 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
1015} 1002}
1016 1003
1017static pointer 1004ecb_hot static pointer
1018get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1019{ 1006{
1020 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1021 1008
1022 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1040 return S_SINK; 1027 return S_SINK;
1041 1028
1042 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1043 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1044 1031
1045 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1046 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1047 fill_vector (v, 0, init); 1034 fill_vector (v, 0, init);
1048 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1049 1036
1050 return v; 1037 return v;
1051} 1038}
… …
1060static void 1047static void
1061check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1062{ 1049{
1063 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1064 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1065 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1066 1053
1067 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1068 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1069} 1056}
1070 1057
1071static void 1058static void
1072check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1073{ 1060{
… …
1079#endif 1066#endif
1080 1067
1081/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1082 1069
1083/* get new cons cell */ 1070/* get new cons cell */
1084pointer 1071ecb_hot static pointer
1085xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1086{ 1073{
1087 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1088 1075
1089 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1090
1091 if (immutable)
1092 setimmutable (x);
1093 1077
1094 set_car (x, a); 1078 set_car (x, a);
1095 set_cdr (x, b); 1079 set_cdr (x, b);
1096 1080
1097 return x; 1081 return x;
1098} 1082}
1099 1083
1100static pointer 1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1096generate_symbol (SCHEME_P_ const char *name)
1102{ 1097{
1103 pointer x = mk_string (SCHEME_A_ name); 1098 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1099 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1100 set_typeflag (x, T_SYMBOL | T_ATOM);
… …
1111#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1112 1107
1113static int 1108static int
1114hash_fn (const char *key, int table_size) 1109hash_fn (const char *key, int table_size)
1115{ 1110{
1116 const unsigned char *p = key; 1111 const unsigned char *p = (unsigned char *)key;
1117 uint32_t hash = 2166136261; 1112 uint32_t hash = 2166136261U;
1118 1113
1119 while (*p) 1114 while (*p)
1120 hash = (hash ^ *p++) * 16777619; 1115 hash = (hash ^ *p++) * 16777619;
1121 1116
1122 return hash % table_size; 1117 return hash % table_size;
1123} 1118}
1124 1119
1125static pointer 1120ecb_cold static pointer
1126oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1127{ 1122{
1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1129} 1124}
1130 1125
1131/* returns the new symbol */ 1126/* returns the new symbol */
1132static pointer 1127ecb_cold static pointer
1133oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1134{ 1129{
1135 pointer x = generate_symbol (SCHEME_A_ name); 1130 pointer x = generate_symbol (SCHEME_A_ name);
1136 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1138 return x; 1133 return x;
1139} 1134}
1140 1135
1141ecb_inline pointer 1136ecb_cold static pointer
1142oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1143{ 1138{
1144 int location; 1139 int location;
1145 pointer x; 1140 pointer x;
1146 char *s; 1141 char *s;
… …
1157 } 1152 }
1158 1153
1159 return NIL; 1154 return NIL;
1160} 1155}
1161 1156
1162static pointer 1157ecb_cold static pointer
1163oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1164{ 1159{
1165 int i; 1160 int i;
1166 pointer x; 1161 pointer x;
1167 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
… …
1173 return ob_list; 1168 return ob_list;
1174} 1169}
1175 1170
1176#else 1171#else
1177 1172
1178static pointer 1173ecb_cold static pointer
1179oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1180{ 1175{
1181 return NIL; 1176 return NIL;
1182} 1177}
1183 1178
1184ecb_inline pointer 1179ecb_cold static pointer
1185oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1186{ 1181{
1187 pointer x; 1182 pointer x;
1188 char *s; 1183 char *s;
1189 1184
… …
1198 1193
1199 return NIL; 1194 return NIL;
1200} 1195}
1201 1196
1202/* returns the new symbol */ 1197/* returns the new symbol */
1203static pointer 1198ecb_cold static pointer
1204oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1205{ 1200{
1206 pointer x = mk_string (SCHEME_A_ name); 1201 pointer x = generate_symbol (SCHEME_A_ name);
1207 set_typeflag (x, T_SYMBOL);
1208 setimmutable (x);
1209 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1210 return x; 1203 return x;
1211} 1204}
1212 1205
1213static pointer 1206ecb_cold static pointer
1214oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1215{ 1208{
1216 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1217} 1210}
1218 1211
1219#endif 1212#endif
1220 1213
1221#if USE_PORTS
1222static pointer 1214ecb_cold static pointer
1223mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1224{ 1216{
1225 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1226 1218
1227 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1228 x->object.port = p; 1220 set_port (x, p);
1229 1221
1230 return x; 1222 return x;
1231} 1223}
1232#endif
1233 1224
1234pointer 1225ecb_cold pointer
1235mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1236{ 1227{
1237 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1238 1229
1239 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1240 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1241 1232
1242 return x; 1233 return x;
1243} 1234}
1244 1235
1245INTERFACE pointer 1236INTERFACE pointer
1246mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1247{ 1238{
1248 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1249 1240
1250 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1251 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1252 1243
1253 return x; 1244 return x;
1254} 1245}
1255 1246
1256/* get number atom (integer) */ 1247/* get number atom (integer) */
1257INTERFACE pointer 1248INTERFACE pointer
1258mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1259{ 1250{
1251 pointer p = 0;
1252 pointer *pp = &p;
1253
1254#if USE_INTCACHE
1255 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1256 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1257#endif
1258
1259 if (!*pp)
1260 {
1260 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1261 1262
1262 set_typeflag (x, (T_INTEGER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1264 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1263 set_ivalue (x, n); 1265 set_ivalue (x, n);
1264 1266
1267 *pp = x;
1268 }
1269
1265 return x; 1270 return *pp;
1266} 1271}
1267 1272
1268INTERFACE pointer 1273INTERFACE pointer
1269mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1270{ 1275{
1271#if USE_REAL 1276#if USE_REAL
1272 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1273 1278
1274 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1275 set_rvalue (x, n); 1280 set_rvalue (x, n);
1276 1281
1277 return x; 1282 return x;
1278#else 1283#else
1279 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1390 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1391 1396
1392 return x; 1397 return x;
1393} 1398}
1394 1399
1395INTERFACE pointer 1400ecb_cold INTERFACE pointer
1396gensym (SCHEME_P) 1401gensym (SCHEME_P)
1397{ 1402{
1398 pointer x; 1403 pointer x;
1399 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1400 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
… …
1407{ 1412{
1408 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1409} 1414}
1410 1415
1411/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1412static pointer 1417ecb_cold static pointer
1413mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1414{ 1419{
1415 char c, *p; 1420 char c, *p;
1416 int has_dec_point = 0; 1421 int has_dec_point = 0;
1417 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1488 1493
1489 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1490} 1495}
1491 1496
1492/* make constant */ 1497/* make constant */
1493static pointer 1498ecb_cold static pointer
1494mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1495{ 1500{
1496 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1497 return S_T; 1502 return S_T;
1498 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1499 return S_F; 1504 return S_F;
1500 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1501 { 1506 {
1502 int c; 1507 int c;
1503 1508
1509 // TODO: optimise
1504 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1505 c = ' '; 1511 c = ' ';
1506 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1507 c = '\n'; 1513 c = '\n';
1508 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1509 c = '\r'; 1515 c = '\r';
1510 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1511 c = '\t'; 1517 c = '\t';
1518 else if (stricmp (name + 1, "alarm") == 0)
1519 c = 0x07;
1520 else if (stricmp (name + 1, "backspace") == 0)
1521 c = 0x08;
1522 else if (stricmp (name + 1, "escape") == 0)
1523 c = 0x1b;
1524 else if (stricmp (name + 1, "delete") == 0)
1525 c = 0x7f;
1526 else if (stricmp (name + 1, "null") == 0)
1527 c = 0;
1512 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1513 { 1529 {
1514 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1515 1531
1516 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1541 return NIL; 1557 return NIL;
1542 } 1558 }
1543} 1559}
1544 1560
1545/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1546 1581
1547/*-- 1582/*--
1548 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1549 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1550 * for marking. 1585 * for marking.
1551 * 1586 *
1552 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1553 * which is inherited form tinyscheme and could be fixed by having another 1588 * which is inherited form tinyscheme and could be fixed by having another
1554 * word of context in the vector 1589 * word of context in the vector
1555 */ 1590 */
1556static void 1591ecb_hot static void
1557mark (pointer a) 1592mark (pointer a)
1558{ 1593{
1559 pointer t, q, p; 1594 pointer t, q, p;
1560 1595
1561 t = 0; 1596 t = 0;
… …
1618 p = q; 1653 p = q;
1619 goto E6; 1654 goto E6;
1620 } 1655 }
1621} 1656}
1622 1657
1658ecb_hot static void
1659gc_free (SCHEME_P)
1660{
1661 int i;
1662 uint32_t total = 0;
1663
1664 /* Here we scan the cells to build the free-list. */
1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1666 {
1667 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1668 struct cell *p;
1669 total += SCHEME_V->cell_segsize [i];
1670
1671 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1672 {
1673 pointer c = POINTER (p);
1674
1675 if (is_mark (c))
1676 clrmark (c);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (c) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ c);
1683 set_typeflag (c, T_PAIR);
1684 set_car (c, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (c, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = c;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1697 }
1698}
1699
1623/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1624static void 1701ecb_cold static void
1625gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1626{ 1703{
1627 pointer p;
1628 int i; 1704 int i;
1629 1705
1630 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1631 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1632 1708
… …
1648 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1649 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1650 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1651 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1652 1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1734#endif
1735
1653 /* mark variables a, b */ 1736 /* mark variables a, b */
1654 mark (a); 1737 mark (a);
1655 mark (b); 1738 mark (b);
1656 1739
1657 /* garbage collect */ 1740 /* garbage collect */
1658 clrmark (NIL); 1741 clrmark (NIL);
1659 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1660 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1661 1744
1662 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1663 xwrstr ("freeing..."); 1746 putstr (SCHEME_A_ "freeing...");
1664 1747
1665 uint32_t total = 0; 1748 gc_free (SCHEME_A);
1666
1667 /* Here we scan the cells to build the free-list. */
1668 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1669 {
1670 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1671 total += SCHEME_V->cell_segsize [i];
1672
1673 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1674 {
1675 if (is_mark (p))
1676 clrmark (p);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (p) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ p);
1683 set_typeflag (p, T_PAIR);
1684 set_car (p, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (p, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = p;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1697 }
1698}
1699
1700static void
1701finalize_cell (SCHEME_P_ pointer a)
1702{
1703 /* TODO, fast bitmap check? */
1704 if (is_string (a) || is_symbol (a))
1705 free (strvalue (a));
1706 else if (is_vector (a))
1707 free (vecvalue (a));
1708#if USE_PORTS
1709 else if (is_port (a))
1710 {
1711 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1712 port_close (SCHEME_A_ a, port_input | port_output);
1713
1714 free (a->object.port);
1715 }
1716#endif
1717} 1749}
1718 1750
1719/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1720 1752
1721static int 1753ecb_cold static int
1722file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1723{ 1755{
1724#if USE_PORTS
1725 int fin; 1756 int fin;
1726 1757
1727 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1728 return 0; 1759 return 0;
1729 1760
… …
1735 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1736 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1767 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1737 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1738 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1739 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1740 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1771 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1741 1772
1742#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1743 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1774 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1744 1775
1745 if (fname) 1776 if (fname)
1746 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1747#endif 1778#endif
1748 } 1779 }
1749 1780
1750 return fin >= 0; 1781 return fin >= 0;
1751
1752#else
1753 return 1;
1754#endif
1755} 1782}
1756 1783
1757static void 1784ecb_cold static void
1758file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1759{ 1786{
1760 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1761 { 1788 {
1762 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1763#if USE_PORTS 1790#if USE_PORTS
1764 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1765#endif 1792#endif
1766 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1767 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1768 } 1795 }
1769} 1796}
1770 1797
1771static int 1798ecb_cold static int
1772file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1773{ 1800{
1774#if USE_PORTS 1801#if USE_PORTS
1775 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1776 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1777 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1778#else 1805#else
1779 return 0; 1806 return 0;
1780#endif 1807#endif
1781} 1808}
1782 1809
1783#if USE_PORTS 1810#if USE_PORTS
1784static port * 1811ecb_cold static port *
1785port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1786{ 1813{
1787 int fd; 1814 int fd;
1788 int flags; 1815 int flags;
1789 char *rw; 1816 char *rw;
… …
1812# endif 1839# endif
1813 1840
1814 return pt; 1841 return pt;
1815} 1842}
1816 1843
1817static pointer 1844ecb_cold static pointer
1818port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1819{ 1846{
1820 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1821 1848
1822 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1823 return NIL; 1850 return NIL;
1824 1851
1825 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1826} 1853}
1827 1854
1828static port * 1855ecb_cold static port *
1829port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1830{ 1857{
1831 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1832 1859
1833 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1838 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1839 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1840 return pt; 1867 return pt;
1841} 1868}
1842 1869
1843static pointer 1870ecb_cold static pointer
1844port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1845{ 1872{
1846 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1847 1874
1848 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1849 return NIL; 1876 return NIL;
1850 1877
1851 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1852} 1879}
1853 1880
1854static port * 1881ecb_cold static port *
1855port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1856{ 1883{
1857 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1858 1885
1859 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1865 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1866 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1867 return pt; 1894 return pt;
1868} 1895}
1869 1896
1870static pointer 1897ecb_cold static pointer
1871port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1872{ 1899{
1873 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1874 1901
1875 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1878 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1879} 1906}
1880 1907
1881# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1882 1909
1883static port * 1910ecb_cold static port *
1884port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1885{ 1912{
1886 char *start; 1913 char *start;
1887 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1888 1915
… …
1902 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1903 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1904 return pt; 1931 return pt;
1905} 1932}
1906 1933
1907static pointer 1934ecb_cold static pointer
1908port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1909{ 1936{
1910 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1911 1938
1912 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1913 return NIL; 1940 return NIL;
1914 1941
1915 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1916} 1943}
1917 1944
1918static void 1945ecb_cold static void
1919port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1920{ 1947{
1921 port *pt = p->object.port; 1948 port *pt = port (p);
1922 1949
1923 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1924 1951
1925 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1926 { 1953 {
… …
1943 } 1970 }
1944} 1971}
1945#endif 1972#endif
1946 1973
1947/* get new character from input file */ 1974/* get new character from input file */
1948static int 1975ecb_cold static int
1949inchar (SCHEME_P) 1976inchar (SCHEME_P)
1950{ 1977{
1951 int c; 1978 int c;
1952 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1953
1954 pt = SCHEME_V->inport->object.port;
1955 1980
1956 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1957 return EOF; 1982 return EOF;
1958 1983
1959 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1969 } 1994 }
1970 1995
1971 return c; 1996 return c;
1972} 1997}
1973 1998
1974static int ungot = -1; 1999ecb_cold static int
1975
1976static int
1977basic_inchar (port *pt) 2000basic_inchar (port *pt)
1978{ 2001{
1979#if USE_PORTS
1980 if (pt->unget != -1) 2002 if (pt->unget != -1)
1981 { 2003 {
1982 int r = pt->unget; 2004 int r = pt->unget;
1983 pt->unget = -1; 2005 pt->unget = -1;
1984 return r; 2006 return r;
1985 } 2007 }
1986 2008
2009#if USE_PORTS
1987 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1988 { 2011 {
1989 char c; 2012 char c;
1990 2013
1991 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1999 return EOF; 2022 return EOF;
2000 else 2023 else
2001 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
2002 } 2025 }
2003#else 2026#else
2004 if (ungot == -1)
2005 {
2006 char c; 2027 char c;
2007 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
2008 return EOF; 2030 return EOF;
2009 2031
2010 ungot = c;
2011 }
2012
2013 {
2014 int r = ungot;
2015 ungot = -1;
2016 return r; 2032 return c;
2017 }
2018#endif 2033#endif
2019} 2034}
2020 2035
2021/* back character to input buffer */ 2036/* back character to input buffer */
2022static void 2037ecb_cold static void
2023backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2024{ 2039{
2025#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2026 port *pt;
2027 2041
2028 if (c == EOF) 2042 if (c == EOF)
2029 return; 2043 return;
2030 2044
2031 pt = SCHEME_V->inport->object.port;
2032 pt->unget = c; 2045 pt->unget = c;
2033#else
2034 if (c == EOF)
2035 return;
2036
2037 ungot = c;
2038#endif
2039} 2046}
2040 2047
2041#if USE_PORTS 2048#if USE_PORTS
2042static int 2049ecb_cold static int
2043realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2044{ 2051{
2045 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2046 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2047 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2060 else 2067 else
2061 return 0; 2068 return 0;
2062} 2069}
2063#endif 2070#endif
2064 2071
2065INTERFACE void 2072ecb_cold static void
2066putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2067{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2068#if USE_PORTS 2077#if USE_PORTS
2069 port *pt = SCHEME_V->outport->object.port;
2070
2071 if (pt->kind & port_file)
2072 write (pt->rep.stdio.file, s, strlen (s));
2073 else
2074 for (; *s; s++)
2075 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2076 *pt->rep.string.curr++ = *s;
2077 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2078 *pt->rep.string.curr++ = *s;
2079
2080#else
2081 xwrstr (s);
2082#endif
2083}
2084
2085static void
2086putchars (SCHEME_P_ const char *s, int len)
2087{
2088#if USE_PORTS
2089 port *pt = SCHEME_V->outport->object.port;
2090
2091 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2092 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2093 else 2080 else
2094 { 2081 {
2095 for (; len; len--) 2082 for (; len; len--)
… …
2100 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2101 } 2088 }
2102 } 2089 }
2103 2090
2104#else 2091#else
2105 write (1, s, len); 2092 write (1, s, len); // output not initialised
2106#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2107} 2100}
2108 2101
2109INTERFACE void 2102INTERFACE void
2110putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2111{ 2104{
2112#if USE_PORTS
2113 port *pt = SCHEME_V->outport->object.port;
2114
2115 if (pt->kind & port_file)
2116 {
2117 char cc = c;
2118 write (pt->rep.stdio.file, &cc, 1);
2119 }
2120 else
2121 {
2122 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2123 *pt->rep.string.curr++ = c;
2124 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2125 *pt->rep.string.curr++ = c;
2126 }
2127
2128#else
2129 char cc = c; 2105 char cc = c;
2130 write (1, &c, 1); 2106
2131#endif 2107 putchars (SCHEME_A_ &cc, 1);
2132} 2108}
2133 2109
2134/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2135static char * 2111ecb_cold static char *
2136readstr_upto (SCHEME_P_ int skip, const char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2137{ 2113{
2138 char *p = SCHEME_V->strbuff + skip; 2114 char *p = SCHEME_V->strbuff + skip;
2139 2115
2140 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2149 2125
2150 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2151} 2127}
2152 2128
2153/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2154static pointer 2130ecb_cold static pointer
2155readstrexp (SCHEME_P_ char delim) 2131readstrexp (SCHEME_P_ char delim)
2156{ 2132{
2157 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2158 int c; 2134 int c;
2159 int c1 = 0; 2135 int c1 = 0;
… …
2192 case '7': 2168 case '7':
2193 state = st_oct1; 2169 state = st_oct1;
2194 c1 = c - '0'; 2170 c1 = c - '0';
2195 break; 2171 break;
2196 2172
2173 case 'a': *p++ = '\a'; state = st_ok; break;
2174 case 'n': *p++ = '\n'; state = st_ok; break;
2175 case 'r': *p++ = '\r'; state = st_ok; break;
2176 case 't': *p++ = '\t'; state = st_ok; break;
2177
2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2186
2187 //TODO: x should end in ;, not two-digit hex
2197 case 'x': 2188 case 'x':
2198 case 'X': 2189 case 'X':
2199 state = st_x1; 2190 state = st_x1;
2200 c1 = 0; 2191 c1 = 0;
2201 break;
2202
2203 case 'n':
2204 *p++ = '\n';
2205 state = st_ok;
2206 break;
2207
2208 case 't':
2209 *p++ = '\t';
2210 state = st_ok;
2211 break;
2212
2213 case 'r':
2214 *p++ = '\r';
2215 state = st_ok;
2216 break; 2192 break;
2217 2193
2218 default: 2194 default:
2219 *p++ = c; 2195 *p++ = c;
2220 state = st_ok; 2196 state = st_ok;
… …
2272 } 2248 }
2273 } 2249 }
2274} 2250}
2275 2251
2276/* check c is in chars */ 2252/* check c is in chars */
2277ecb_inline int 2253ecb_cold int
2278is_one_of (const char *s, int c) 2254is_one_of (const char *s, int c)
2279{ 2255{
2280 return c == EOF || !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2281} 2257}
2282 2258
2283/* skip white characters */ 2259/* skip white characters */
2284ecb_inline int 2260ecb_cold int
2285skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2286{ 2262{
2287 int c, curr_line = 0; 2263 int c, curr_line = 0;
2288 2264
2289 do 2265 do
… …
2309 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2310 return 1; 2286 return 1;
2311} 2287}
2312 2288
2313/* get token */ 2289/* get token */
2314static int 2290ecb_cold static int
2315token (SCHEME_P) 2291token (SCHEME_P)
2316{ 2292{
2317 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2318 2294
2319 if (c == EOF) 2295 if (c == EOF)
… …
2417} 2393}
2418 2394
2419/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2420#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2421 2397
2422static void 2398ecb_cold static void
2423printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2424{ 2400{
2425 int i; 2401 int i;
2426 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2427 2403
… …
2483 2459
2484 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2485} 2461}
2486 2462
2487/* print atoms */ 2463/* print atoms */
2488static void 2464ecb_cold static void
2489printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2490{ 2466{
2491 char *p; 2467 char *p;
2492 int len; 2468 int len;
2493 2469
2494 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2495 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2496} 2472}
2497 2473
2498/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2499static void 2475ecb_cold static void
2500atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2501{ 2477{
2502 char *p; 2478 char *p;
2503 2479
2504 if (l == NIL) 2480 if (l == NIL)
… …
2711 return car (d); 2687 return car (d);
2712 2688
2713 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2714 q = p; 2690 q = p;
2715 2691
2716 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2717 { 2693 {
2718 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2719 2695
2720 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2721 p = cdr (d); 2697 p = cdr (d);
2722 } 2698 }
2723 2699
2724 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2725 return q; 2701 return q;
2726} 2702}
2727 2703
2728/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2729static pointer 2705ecb_hot static pointer
2730reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2731{ 2707{
2732 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2733 pointer p = NIL; 2709 pointer p = NIL;
2734 2710
… …
2737 2713
2738 return p; 2714 return p;
2739} 2715}
2740 2716
2741/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2742static pointer 2718ecb_hot static pointer
2743reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2744{ 2720{
2745 pointer result = term; 2721 pointer result = term;
2746 pointer p = list; 2722 pointer p = list;
2747 2723
… …
2755 2731
2756 return result; 2732 return result;
2757} 2733}
2758 2734
2759/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2760static pointer 2736ecb_hot static pointer
2761revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2762{ 2738{
2763 pointer result = a; 2739 pointer result = a;
2764 pointer p = b; 2740 pointer p = b;
2765 2741
… …
2774 2750
2775 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2776} 2752}
2777 2753
2778/* equivalence of atoms */ 2754/* equivalence of atoms */
2779int 2755ecb_hot int
2780eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2781{ 2757{
2782 if (is_string (a)) 2758 if (is_string (a))
2783 { 2759 {
2784 if (is_string (b)) 2760 if (is_string (b))
… …
2878 } 2854 }
2879 else 2855 else
2880 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2881} 2857}
2882 2858
2883static pointer 2859ecb_hot static pointer
2884find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2885{ 2861{
2886 pointer x, y; 2862 pointer x, y;
2887 2863
2888 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
… …
2909 return NIL; 2885 return NIL;
2910} 2886}
2911 2887
2912#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2913 2889
2914ecb_inline void 2890static void
2915new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2916{ 2892{
2917 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2918 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2919} 2895}
2920 2896
2921ecb_inline void 2897static void
2922new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2898new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2923{ 2899{
2924 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2925} 2901}
2926 2902
2927static pointer 2903ecb_hot static pointer
2928find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2929{ 2905{
2930 pointer x, y; 2906 pointer x, y;
2931 2907
2932 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2946 return NIL; 2922 return NIL;
2947} 2923}
2948 2924
2949#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2950 2926
2951ecb_inline void 2927static void
2952new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2953{ 2929{
2954 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2955 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2931 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2956} 2932}
2957 2933
2958ecb_inline void 2934static void
2959set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2960{ 2936{
2961 set_cdr (slot, value); 2937 set_cdr (slot, value);
2962} 2938}
2963 2939
2964ecb_inline pointer 2940static pointer
2965slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2966{ 2942{
2967 return cdr (slot); 2943 return cdr (slot);
2968} 2944}
2969 2945
2970/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
2971 2947
2972static int 2948ecb_cold static int
2973xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
2974{ 2950{
2975#if USE_ERROR_HOOK
2976 pointer x;
2977 pointer hdl = SCHEME_V->ERROR_HOOK;
2978#endif
2979
2980#if USE_PRINTF 2951#if USE_PRINTF
2981#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
2982 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
2983 2954
2984 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
2999 } 2970 }
3000#endif 2971#endif
3001#endif 2972#endif
3002 2973
3003#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
3004 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2975 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
3005 2976
3006 if (x != NIL) 2977 if (x != NIL)
3007 { 2978 {
3008 pointer code = a 2979 pointer code = a
3009 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3053 pointer code; 3024 pointer code;
3054}; 3025};
3055 3026
3056# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3057 3028
3058static void 3029ecb_hot static void
3059s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3060{ 3031{
3061 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3062 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3063 3034
3064 /* enough room for the next frame? */ 3035 /* enough room for the next frame? */
3065 if (nframes >= SCHEME_V->dump_size) 3036 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3066 { 3037 {
3067 SCHEME_V->dump_size += STACK_GROWTH; 3038 SCHEME_V->dump_size += STACK_GROWTH;
3068 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3039 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3069 } 3040 }
3070 3041
… …
3076 next_frame->code = code; 3047 next_frame->code = code;
3077 3048
3078 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3079} 3050}
3080 3051
3081static int 3052static ecb_hot int
3082xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3083{ 3054{
3084 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3085 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3086 3057
… …
3097 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3098 3069
3099 return 0; 3070 return 0;
3100} 3071}
3101 3072
3102ecb_inline void 3073ecb_cold void
3103dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3104{ 3075{
3105 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3076 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3106 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3107} 3078}
3108 3079
3109ecb_inline void 3080ecb_cold void
3110dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3111{ 3082{
3112 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3113 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3114 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3115} 3086}
3116 3087
3117static void 3088ecb_cold static void
3118dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3119{ 3090{
3120 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3121 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3122 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3123 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3124} 3095}
3125 3096
3126static void 3097ecb_cold static void
3127dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3128{ 3099{
3129 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3130 int i; 3101 int i;
3131 3102
… …
3137 mark (frame->envir); 3108 mark (frame->envir);
3138 mark (frame->code); 3109 mark (frame->code);
3139 } 3110 }
3140} 3111}
3141 3112
3142static pointer 3113ecb_cold static pointer
3143ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3144{ 3115{
3145 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3146 int i; 3117 int i;
3147 3118
… …
3159 } 3130 }
3160 3131
3161 return cont; 3132 return cont;
3162} 3133}
3163 3134
3164static void 3135ecb_cold static void
3165ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3166{ 3137{
3167 int i = 0; 3138 int i = 0;
3168 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3169 3140
… …
3181 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3182} 3153}
3183 3154
3184#else 3155#else
3185 3156
3186ecb_inline void 3157ecb_cold void
3187dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3188{ 3159{
3189 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3190} 3161}
3191 3162
3192ecb_inline void 3163ecb_cold void
3193dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3194{ 3165{
3195 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3196} 3167}
3197 3168
3198static void 3169ecb_cold static void
3199dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3200{ 3171{
3201 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3202} 3173}
3203 3174
3204static int 3175ecb_hot static int
3205xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3206{ 3177{
3207 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3208 3179
3209 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3219 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3220 3191
3221 return 0; 3192 return 0;
3222} 3193}
3223 3194
3224static void 3195ecb_hot static void
3225s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3226{ 3197{
3227 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3228 cons (args, 3199 cons (args,
3229 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3230 cons (code, 3201 cons (code,
3231 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3232} 3203}
3233 3204
3234static void 3205ecb_cold static void
3235dump_stack_mark (SCHEME_P) 3206dump_stack_mark (SCHEME_P)
3236{ 3207{
3237 mark (SCHEME_V->dump); 3208 mark (SCHEME_V->dump);
3238} 3209}
3239 3210
3240static pointer 3211ecb_cold static pointer
3241ss_get_cont (SCHEME_P) 3212ss_get_cont (SCHEME_P)
3242{ 3213{
3243 return SCHEME_V->dump; 3214 return SCHEME_V->dump;
3244} 3215}
3245 3216
3246static void 3217ecb_cold static void
3247ss_set_cont (SCHEME_P_ pointer cont) 3218ss_set_cont (SCHEME_P_ pointer cont)
3248{ 3219{
3249 SCHEME_V->dump = cont; 3220 SCHEME_V->dump = cont;
3250} 3221}
3251 3222
3252#endif 3223#endif
3253 3224
3254#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3225#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3255 3226
3256#if EXPERIMENT 3227#if EXPERIMENT
3228
3257static int 3229static int
3258debug (SCHEME_P_ int indent, pointer x) 3230dtree (SCHEME_P_ int indent, pointer x)
3259{ 3231{
3260 int c; 3232 int c;
3261 3233
3262 if (is_syntax (x)) 3234 if (is_syntax (x))
3263 { 3235 {
… …
3281 printf ("%*sS<%s>\n", indent, "", symname (x)); 3253 printf ("%*sS<%s>\n", indent, "", symname (x));
3282 return 24+8; 3254 return 24+8;
3283 3255
3284 case T_CLOSURE: 3256 case T_CLOSURE:
3285 printf ("%*sS<%s>\n", indent, "", "closure"); 3257 printf ("%*sS<%s>\n", indent, "", "closure");
3286 debug (SCHEME_A_ indent + 3, cdr(x)); 3258 dtree (SCHEME_A_ indent + 3, cdr(x));
3287 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3259 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3288 3260
3289 case T_PAIR: 3261 case T_PAIR:
3290 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3262 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3291 c = debug (SCHEME_A_ indent + 3, car (x)); 3263 c = dtree (SCHEME_A_ indent + 3, car (x));
3292 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3264 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3293 return c + 1; 3265 return c + 1;
3294 3266
3295 case T_PORT: 3267 case T_PORT:
3296 printf ("%*sS<%s>\n", indent, "", "port"); 3268 printf ("%*sS<%s>\n", indent, "", "port");
3297 return 24+8; 3269 return 24+8;
… …
3300 printf ("%*sS<%s>\n", indent, "", "vector"); 3272 printf ("%*sS<%s>\n", indent, "", "vector");
3301 return 24+8; 3273 return 24+8;
3302 3274
3303 case T_ENVIRONMENT: 3275 case T_ENVIRONMENT:
3304 printf ("%*sS<%s>\n", indent, "", "environment"); 3276 printf ("%*sS<%s>\n", indent, "", "environment");
3305 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3277 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3306 3278
3307 default: 3279 default:
3308 printf ("unhandled type %d\n", type (x)); 3280 printf ("unhandled type %d\n", type (x));
3309 break; 3281 break;
3310 } 3282 }
3311} 3283}
3312#endif
3313 3284
3285#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3286
3287typedef void *stream[1];
3288
3289#define stream_init() { 0 }
3290#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3291#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3292#define stream_free(s) free (s[0])
3293
3294ecb_cold static void
3295stream_put (stream s, uint8_t byte)
3296{
3297 uint32_t *sp = *s;
3298 uint32_t size = sizeof (uint32_t) * 2;
3299 uint32_t offs = size;
3300
3301 if (ecb_expect_true (sp))
3302 {
3303 offs = sp[0];
3304 size = sp[1];
3305 }
3306
3307 if (ecb_expect_false (offs == size))
3308 {
3309 size *= 2;
3310 sp = realloc (sp, size);
3311 *s = sp;
3312 sp[1] = size;
3313
3314 }
3315
3316 ((uint8_t *)sp)[offs++] = byte;
3317 sp[0] = offs;
3318}
3319
3320ecb_cold static void
3321stream_put_v (stream s, uint32_t v)
3322{
3323 while (v > 0x7f)
3324 {
3325 stream_put (s, v | 0x80);
3326 v >>= 7;
3327 }
3328
3329 stream_put (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_tv (stream s, int bop, uint32_t v)
3334{
3335 printf ("put tv %d %d\n", bop, v);//D
3336 stream_put (s, bop);
3337 stream_put_v (s, v);
3338}
3339
3340ecb_cold static void
3341stream_put_stream (stream s, stream o)
3342{
3343 uint32_t i;
3344
3345 for (i = 0; i < stream_size (o); ++i)
3346 stream_put (s, stream_data (o)[i]);
3347
3348 stream_free (o);
3349}
3350
3351ecb_cold static uint32_t
3352cell_id (SCHEME_P_ pointer x)
3353{
3354 struct cell *p = CELL (x);
3355 int i;
3356
3357 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3358 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3359 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3360
3361 abort ();
3362}
3363
3364// calculates a (preferably small) integer that makes it possible to find
3365// the symbol again. if pointers were offsets into a memory area... until
3366// then, we return segment number in the low bits, and offset in the high
3367// bits.
3368// also, this function must never return 0.
3369ecb_cold static uint32_t
3370symbol_id (SCHEME_P_ pointer sym)
3371{
3372 return cell_id (SCHEME_A_ sym);
3373}
3374
3375enum byteop
3376{
3377 BOP_NIL,
3378 BOP_INTEGER,
3379 BOP_SYMBOL,
3380 BOP_DATUM,
3381 BOP_LIST_BEG,
3382 BOP_LIST_END,
3383 BOP_IF,
3384 BOP_AND,
3385 BOP_OR,
3386 BOP_CASE,
3387 BOP_COND,
3388 BOP_LET,
3389 BOP_LETAST,
3390 BOP_LETREC,
3391 BOP_DEFINE,
3392 BOP_MACRO,
3393 BOP_SET,
3394 BOP_BEGIN,
3395 BOP_LAMBDA,
3396 BOP_OP,
3397};
3398
3399ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3400
3401ecb_cold static void
3402compile_list (SCHEME_P_ stream s, pointer x)
3403{
3404 // TODO: improper list
3405
3406 for (; x != NIL; x = cdr (x))
3407 {
3408 stream t = stream_init ();
3409 compile_expr (SCHEME_A_ t, car (x));
3410 stream_put_v (s, stream_size (t));
3411 stream_put_stream (s, t);
3412 }
3413
3414 stream_put_v (s, 0);
3415}
3416
3417static void
3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3419{
3420 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3421
3422 stream_put (s, BOP_IF);
3423 compile_expr (SCHEME_A_ s, cond);
3424 stream_put_v (s, stream_size (sift));
3425 stream_put_stream (s, sift);
3426 compile_expr (SCHEME_A_ s, iff);
3427}
3428
3429typedef uint32_t stream_fixup;
3430
3431static stream_fixup
3432stream_put_fixup (stream s)
3433{
3434 stream_put (s, 0);
3435 stream_put (s, 0);
3436
3437 return stream_size (s);
3438}
3439
3440static void
3441stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3442{
3443 target -= fixup;
3444 assert (target < (1 << 14));
3445 stream_data (s)[fixup - 2] = target | 0x80;
3446 stream_data (s)[fixup - 1] = target >> 7;
3447}
3448
3449static void
3450compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3451{
3452 for (; cdr (x) != NIL; x = cdr (x))
3453 {
3454 stream t = stream_init ();
3455 compile_expr (SCHEME_A_ t, car (x));
3456 stream_put_v (s, stream_size (t));
3457 stream_put_stream (s, t);
3458 }
3459
3460 stream_put_v (s, 0);
3461}
3462
3463static void
3464compile_case (SCHEME_P_ stream s, pointer x)
3465{
3466 compile_expr (SCHEME_A_ s, caar (x));
3467
3468 for (;;)
3469 {
3470 x = cdr (x);
3471
3472 if (x == NIL)
3473 break;
3474
3475 compile_expr (SCHEME_A_ s, caar (x));
3476 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3477 stream_put_v (s, stream_size (t));
3478 stream_put_stream (s, t);
3479 }
3480
3481 stream_put_v (s, 0);
3482}
3483
3484static void
3485compile_cond (SCHEME_P_ stream s, pointer x)
3486{
3487 for ( ; x != NIL; x = cdr (x))
3488 {
3489 compile_expr (SCHEME_A_ s, caar (x));
3490 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3491 stream_put_v (s, stream_size (t));
3492 stream_put_stream (s, t);
3493 }
3494
3495 stream_put_v (s, 0);
3496}
3497
3314static int 3498static pointer
3499lookup (SCHEME_P_ pointer x)
3500{
3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3502
3503 if (x != NIL)
3504 x = slot_value_in_env (x);
3505
3506 return x;
3507}
3508
3509ecb_cold static void
3510compile_expr (SCHEME_P_ stream s, pointer x)
3511{
3512 if (x == NIL)
3513 {
3514 stream_put (s, BOP_NIL);
3515 return;
3516 }
3517
3518 if (is_pair (x))
3519 {
3520 pointer head = car (x);
3521
3522 if (is_syntax (head))
3523 {
3524 x = cdr (x);
3525
3526 switch (syntaxnum (head))
3527 {
3528 case OP_IF0: /* if */
3529 stream_put_v (s, BOP_IF);
3530 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3531 break;
3532
3533 case OP_OR0: /* or */
3534 stream_put_v (s, BOP_OR);
3535 compile_and_or (SCHEME_A_ s, 0, x);
3536 break;
3537
3538 case OP_AND0: /* and */
3539 stream_put_v (s, BOP_AND);
3540 compile_and_or (SCHEME_A_ s, 1, x);
3541 break;
3542
3543 case OP_CASE0: /* case */
3544 stream_put_v (s, BOP_CASE);
3545 compile_case (SCHEME_A_ s, x);
3546 break;
3547
3548 case OP_COND0: /* cond */
3549 stream_put_v (s, BOP_COND);
3550 compile_cond (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_LET0: /* let */
3554 case OP_LET0AST: /* let* */
3555 case OP_LET0REC: /* letrec */
3556 switch (syntaxnum (head))
3557 {
3558 case OP_LET0: stream_put (s, BOP_LET ); break;
3559 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3560 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3561 }
3562
3563 {
3564 pointer bindings = car (x);
3565 pointer body = cadr (x);
3566
3567 for (x = bindings; x != NIL; x = cdr (x))
3568 {
3569 pointer init = NIL;
3570 pointer var = car (x);
3571
3572 if (is_pair (var))
3573 {
3574 init = cdr (var);
3575 var = car (var);
3576 }
3577
3578 stream_put_v (s, symbol_id (SCHEME_A_ var));
3579 compile_expr (SCHEME_A_ s, init);
3580 }
3581
3582 stream_put_v (s, 0);
3583 compile_expr (SCHEME_A_ s, body);
3584 }
3585 break;
3586
3587 case OP_DEF0: /* define */
3588 case OP_MACRO0: /* macro */
3589 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3590 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3591 compile_expr (SCHEME_A_ s, cadr (x));
3592 break;
3593
3594 case OP_SET0: /* set! */
3595 stream_put (s, BOP_SET);
3596 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3597 compile_expr (SCHEME_A_ s, cadr (x));
3598 break;
3599
3600 case OP_BEGIN: /* begin */
3601 stream_put (s, BOP_BEGIN);
3602 compile_list (SCHEME_A_ s, x);
3603 return;
3604
3605 case OP_DELAY: /* delay */
3606 abort ();
3607 break;
3608
3609 case OP_QUOTE: /* quote */
3610 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3611 break;
3612
3613 case OP_LAMBDA: /* lambda */
3614 {
3615 pointer formals = car (x);
3616 pointer body = cadr (x);
3617
3618 stream_put (s, BOP_LAMBDA);
3619
3620 for (; is_pair (formals); formals = cdr (formals))
3621 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3622
3623 stream_put_v (s, 0);
3624 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3625
3626 compile_expr (SCHEME_A_ s, body);
3627 }
3628 break;
3629
3630 case OP_C0STREAM:/* cons-stream */
3631 abort ();
3632 break;
3633 }
3634
3635 return;
3636 }
3637
3638 pointer m = lookup (SCHEME_A_ head);
3639
3640 if (is_macro (m))
3641 {
3642 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3643 SCHEME_V->code = m;
3644 SCHEME_V->args = cons (x, NIL);
3645 Eval_Cycle (SCHEME_A_ OP_APPLY);
3646 x = SCHEME_V->value;
3647 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3648 return;
3649 }
3650
3651 stream_put (s, BOP_LIST_BEG);
3652
3653 for (; x != NIL; x = cdr (x))
3654 compile_expr (SCHEME_A_ s, car (x));
3655
3656 stream_put (s, BOP_LIST_END);
3657 return;
3658 }
3659
3660 switch (type (x))
3661 {
3662 case T_INTEGER:
3663 {
3664 IVALUE iv = ivalue_unchecked (x);
3665 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3666 stream_put_tv (s, BOP_INTEGER, iv);
3667 }
3668 return;
3669
3670 case T_SYMBOL:
3671 if (0)
3672 {
3673 // no can do without more analysis
3674 pointer m = lookup (SCHEME_A_ x);
3675
3676 if (is_proc (m))
3677 {
3678 printf ("compile proc %s %d\n", procname(m), procnum(m));
3679 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3680 }
3681 else
3682 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3683 }
3684
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 return;
3687
3688 default:
3689 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3690 break;
3691 }
3692}
3693
3694ecb_cold static int
3695compile_closure (SCHEME_P_ pointer p)
3696{
3697 stream s = stream_init ();
3698
3699 compile_list (SCHEME_A_ s, cdar (p));
3700
3701 FILE *xxd = popen ("xxd", "we");
3702 fwrite (stream_data (s), 1, stream_size (s), xxd);
3703 fclose (xxd);
3704
3705 return stream_size (s);
3706}
3707
3708#endif
3709
3710/* syntax, eval, core, ... */
3711ecb_hot static int
3315opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3316{ 3713{
3317 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3318 pointer x, y; 3715 pointer x, y;
3319 3716
3320 switch (op) 3717 switch (op)
3321 { 3718 {
3322#if EXPERIMENT //D 3719#if EXPERIMENT //D
3323 case OP_DEBUG: 3720 case OP_DEBUG:
3324 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3721 {
3722 uint32_t len = compile_closure (SCHEME_A_ car (args));
3723 printf ("len = %d\n", len);
3325 printf ("\n"); 3724 printf ("\n");
3326 s_return (S_T); 3725 s_return (S_T);
3726 }
3727
3728 case OP_DEBUG2:
3729 return -1;
3327#endif 3730#endif
3731
3328 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3329 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3330 { 3734 {
3331 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3735 putstr (SCHEME_A_ "Loading ");
3332 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3736 putstr (SCHEME_A_ strvalue (car (args)));
3737 putcharacter (SCHEME_A_ '\n');
3333 } 3738 }
3334 3739
3335 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3336 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3337 else 3742
3338 {
3339 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3340 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3341 }
3342 3745
3343 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3344 3747
3345 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3346 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3347 { 3750 {
3348 if (SCHEME_V->file_i == 0) 3751 if (SCHEME_V->file_i == 0)
3349 { 3752 {
3350 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3351 s_goto (OP_QUIT); 3754 s_goto (OP_QUIT);
… …
3362 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3363 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3364 { 3767 {
3365 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3366 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3367 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3368 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3369 } 3775 }
3370 3776
3371 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3372 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3407 { 3813 {
3408 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3409 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3410 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3411 } 3817 }
3412 else 3818
3413 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3414 3820
3415 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3416#if USE_TRACING 3822#if USE_TRACING
3417 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3418 { 3824 {
… …
3429#endif 3835#endif
3430 if (is_symbol (SCHEME_V->code)) /* symbol */ 3836 if (is_symbol (SCHEME_V->code)) /* symbol */
3431 { 3837 {
3432 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3838 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3433 3839
3434 if (x != NIL) 3840 if (x == NIL)
3435 s_return (slot_value_in_env (x));
3436 else
3437 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3841 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3842
3843 s_return (slot_value_in_env (x));
3438 } 3844 }
3439 else if (is_pair (SCHEME_V->code)) 3845 else if (is_pair (SCHEME_V->code))
3440 { 3846 {
3441 x = car (SCHEME_V->code); 3847 x = car (SCHEME_V->code);
3442 3848
… …
3451 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3857 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3452 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3453 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3454 } 3860 }
3455 } 3861 }
3456 else 3862
3457 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3458 3864
3459 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3460 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3461 { 3867 {
3462 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3463 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3464 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3465 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3466 } 3872 }
3467 else 3873
3468 {
3469 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3470 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3471 }
3472 3876
3473 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3474 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3475 3879
3476 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3487 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3488 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3489 } 3893 }
3490 3894
3491#if USE_TRACING 3895#if USE_TRACING
3492
3493 case OP_TRACING: 3896 case OP_TRACING:
3494 { 3897 {
3495 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3496 3899
3497 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3498 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3499 } 3902 }
3500
3501#endif 3903#endif
3502 3904
3503 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3504#if USE_TRACING 3906#if USE_TRACING
3505 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3519 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3921 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3520 else if (is_foreign (SCHEME_V->code)) 3922 else if (is_foreign (SCHEME_V->code))
3521 { 3923 {
3522 /* Keep nested calls from GC'ing the arglist */ 3924 /* Keep nested calls from GC'ing the arglist */
3523 push_recent_alloc (SCHEME_A_ args, NIL); 3925 push_recent_alloc (SCHEME_A_ args, NIL);
3524 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3926 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3525 3927
3526 s_return (x); 3928 s_return (x);
3527 } 3929 }
3528 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3930 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3529 { 3931 {
… …
3559 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3560 { 3962 {
3561 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3562 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3563 } 3965 }
3564 else 3966
3565 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3566 3968
3567 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3568 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3569 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3570
3571#if 1
3572 3972
3573 case OP_LAMBDA: /* lambda */ 3973 case OP_LAMBDA: /* lambda */
3574 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3974 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3575 set SCHEME_V->value fall thru */ 3975 set SCHEME_V->value fall thru */
3576 { 3976 {
… …
3583 SCHEME_V->code = slot_value_in_env (f); 3983 SCHEME_V->code = slot_value_in_env (f);
3584 s_goto (OP_APPLY); 3984 s_goto (OP_APPLY);
3585 } 3985 }
3586 3986
3587 SCHEME_V->value = SCHEME_V->code; 3987 SCHEME_V->value = SCHEME_V->code;
3588 /* Fallthru */
3589 } 3988 }
3989 /* Fallthru */
3590 3990
3591 case OP_LAMBDA1: 3991 case OP_LAMBDA1:
3592 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3992 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3593
3594#else
3595
3596 case OP_LAMBDA: /* lambda */
3597 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3598
3599#endif
3600 3993
3601 case OP_MKCLOSURE: /* make-closure */ 3994 case OP_MKCLOSURE: /* make-closure */
3602 x = car (args); 3995 x = car (args);
3603 3996
3604 if (car (x) == SCHEME_V->LAMBDA) 3997 if (car (x) == SCHEME_V->LAMBDA)
… …
3643 else 4036 else
3644 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4037 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3645 4038
3646 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3647 4040
3648
3649 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3650 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3651 4043
3652 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3653 x = cadr (args); 4045 x = cadr (args);
… …
3671 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3672 } 4064 }
3673 else 4065 else
3674 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3675 4067
3676
3677 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3678 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3679 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3680 4071
3681 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3692 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3693 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3694 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3695 else 4086 else
3696 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4087 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4088
3697 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3698 4090
3699 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3700 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3701 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3702 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4094 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3703 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3704 4096
3705 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3706 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3707 4100
3708 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3709 { 4102 {
3710 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4103 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3711 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4104 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3712 4105
3713 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3714 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3715 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3716 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3717 } 4110 }
3718 else /* end */ 4111
3719 { 4112 /* end */
3720 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3721 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3722 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3723 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3724 }
3725 4117
3726 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3727 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3728 4120
3729 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4121 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3733 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3734 { 4126 {
3735 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4127 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3736 { 4128 {
3737 if (!is_pair (x)) 4129 if (!is_pair (x))
3738 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3739 4131
3740 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3741 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3742 4134
3743 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3744 } 4136 }
3745 4137
3746 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4138 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3763 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3764 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3765 } 4157 }
3766 4158
3767 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4159 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3768 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4160 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3769 4161
3770 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4162 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3771 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3772 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3773 4165
… …
3784 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3785 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3786 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3787 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3788 } 4180 }
3789 else /* end */ 4181
4182 /* end */
3790 { 4183
3791 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3792 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3793 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3794 }
3795 4187
3796 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3797 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3798 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3799 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3800 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3801 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3802 4194
3803 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3804 args = cons (SCHEME_V->value, args);
3805
3806 if (is_pair (SCHEME_V->code)) /* continue */
3807 {
3808 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3809 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3810
3811 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3812 SCHEME_V->code = cadar (SCHEME_V->code);
3813 SCHEME_V->args = NIL;
3814 s_goto (OP_EVAL);
3815 }
3816 else /* end */
3817 {
3818 args = reverse_in_place (SCHEME_A_ NIL, args);
3819 SCHEME_V->code = car (args);
3820 SCHEME_V->args = cdr (args);
3821 s_goto (OP_LET2REC);
3822 }
3823 4196
3824 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3825 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4198 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3826 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3827 4200
… …
3857 } 4230 }
3858 else 4231 else
3859 { 4232 {
3860 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3861 s_return (NIL); 4234 s_return (NIL);
3862 else 4235
3863 {
3864 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3865 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3866 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3867 }
3868 } 4239 }
3869 4240
3870 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3871 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4242 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3883 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3884 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3885 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3886 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3887 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3888 else 4259
3889 {
3890 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3891 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3892 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3893 }
3894 4263
3895 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3896 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3897 s_return (S_F); 4266 s_return (S_F);
3898 4267
… …
3903 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3904 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3905 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3906 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3907 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3908 else 4277
3909 {
3910 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3911 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3912 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3913 }
3914 4281
3915 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3916 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3917 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3918 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3983 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3984 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3985 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3986 } 4353 }
3987 } 4354 }
3988 else 4355
3989 s_return (NIL); 4356 s_return (NIL);
3990 4357
3991 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3992 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3993 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3994 else 4361
3995 s_return (NIL); 4362 s_return (NIL);
3996 4363
3997 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3998 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3999 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4000 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
4014 } 4381 }
4015 4382
4016 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
4017} 4384}
4018 4385
4019static int 4386/* math, cxr */
4387ecb_hot static int
4020opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4021{ 4389{
4022 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
4023 pointer x = car (args); 4391 pointer x = car (args);
4024 num v; 4392 num v;
4025 4393
4026 switch (op) 4394 switch (op)
4027 { 4395 {
4028#if USE_MATH 4396#if USE_MATH
4029 case OP_INEX2EX: /* inexact->exact */ 4397 case OP_INEX2EX: /* inexact->exact */
4030 {
4031 if (is_integer (x)) 4398 if (!is_integer (x))
4032 s_return (x); 4399 {
4033
4034 RVALUE r = rvalue_unchecked (x); 4400 RVALUE r = rvalue_unchecked (x);
4035 4401
4036 if (r == (RVALUE)(IVALUE)r) 4402 if (r == (RVALUE)(IVALUE)r)
4037 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4403 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4038 else 4404 else
4039 Error_1 ("inexact->exact: not integral:", x); 4405 Error_1 ("inexact->exact: not integral:", x);
4040 } 4406 }
4041 4407
4408 s_return (x);
4409
4410 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4411 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4412 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4413 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4414
4415 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4042 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4416 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4043 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4417 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4418 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4044 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4419 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4045 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4420 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4046 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4421 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4047 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4422 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4048 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4423 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4049 4424
4050 case OP_ATAN: 4425 case OP_ATAN:
4426 s_return (mk_real (SCHEME_A_
4051 if (cdr (args) == NIL) 4427 cdr (args) == NIL
4052 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4428 ? atan (rvalue (x))
4053 else 4429 : atan2 (rvalue (x), rvalue (cadr (args)))));
4054 {
4055 pointer y = cadr (args);
4056 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4057 }
4058
4059 case OP_SQRT:
4060 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4061 4430
4062 case OP_EXPT: 4431 case OP_EXPT:
4063 { 4432 {
4064 RVALUE result; 4433 RVALUE result;
4065 int real_result = 1; 4434 int real_result = 1;
… …
4088 if (real_result) 4457 if (real_result)
4089 s_return (mk_real (SCHEME_A_ result)); 4458 s_return (mk_real (SCHEME_A_ result));
4090 else 4459 else
4091 s_return (mk_integer (SCHEME_A_ result)); 4460 s_return (mk_integer (SCHEME_A_ result));
4092 } 4461 }
4093
4094 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4095 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4096
4097 case OP_TRUNCATE:
4098 {
4099 RVALUE n = rvalue (x);
4100 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4101 }
4102
4103 case OP_ROUND:
4104 if (is_integer (x))
4105 s_return (x);
4106
4107 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4108#endif 4462#endif
4109 4463
4110 case OP_ADD: /* + */ 4464 case OP_ADD: /* + */
4111 v = num_zero; 4465 v = num_zero;
4112 4466
… …
4414 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4768 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4415 4769
4416 s_return (newstr); 4770 s_return (newstr);
4417 } 4771 }
4418 4772
4419 case OP_SUBSTR: /* substring */ 4773 case OP_STRING_COPY: /* substring/string-copy */
4420 { 4774 {
4421 char *str = strvalue (x); 4775 char *str = strvalue (x);
4422 int index0 = ivalue_unchecked (cadr (args)); 4776 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4423 int index1; 4777 int index1;
4424 int len; 4778 int len;
4425 4779
4426 if (index0 > strlength (x)) 4780 if (index0 > strlength (x))
4427 Error_1 ("substring: start out of bounds:", cadr (args)); 4781 Error_1 ("string->copy: start out of bounds:", cadr (args));
4428 4782
4429 if (cddr (args) != NIL) 4783 if (cddr (args) != NIL)
4430 { 4784 {
4431 index1 = ivalue_unchecked (caddr (args)); 4785 index1 = ivalue_unchecked (caddr (args));
4432 4786
4433 if (index1 > strlength (x) || index1 < index0) 4787 if (index1 > strlength (x) || index1 < index0)
4434 Error_1 ("substring: end out of bounds:", caddr (args)); 4788 Error_1 ("string->copy: end out of bounds:", caddr (args));
4435 } 4789 }
4436 else 4790 else
4437 index1 = strlength (x); 4791 index1 = strlength (x);
4438 4792
4439 len = index1 - index0; 4793 len = index1 - index0;
4440 x = mk_empty_string (SCHEME_A_ len, ' '); 4794 x = mk_counted_string (SCHEME_A_ str + index0, len);
4441 memcpy (strvalue (x), str + index0, len);
4442 strvalue (x)[len] = 0;
4443 4795
4444 s_return (x); 4796 s_return (x);
4445 } 4797 }
4446 4798
4447 case OP_VECTOR: /* vector */ 4799 case OP_VECTOR: /* vector */
… …
4521 } 4873 }
4522 4874
4523 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4524} 4876}
4525 4877
4526static int 4878/* relational ops */
4879ecb_hot static int
4527opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4528{ 4881{
4529 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4530 4883
4531 for (;;) 4884 for (;;)
… …
4552 } 4905 }
4553 4906
4554 s_return (S_T); 4907 s_return (S_T);
4555} 4908}
4556 4909
4557static int 4910/* predicates */
4911ecb_hot static int
4558opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4559{ 4913{
4560 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4561 pointer a = car (args); 4915 pointer a = car (args);
4562 pointer d = cdr (args); 4916 pointer d = cdr (args);
… …
4609 } 4963 }
4610 4964
4611 s_retbool (r); 4965 s_retbool (r);
4612} 4966}
4613 4967
4614static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4615opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4616{ 4971{
4617 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4618 pointer a = car (args); 4973 pointer a = car (args);
4619 pointer x, y; 4974 pointer x, y;
… …
4632 } 4987 }
4633 else 4988 else
4634 s_return (SCHEME_V->code); 4989 s_return (SCHEME_V->code);
4635 4990
4636 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4991 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4637 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4992 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4638 s_return (SCHEME_V->value); 4993 s_return (SCHEME_V->value);
4639 4994
4640#if USE_PORTS 4995#if USE_PORTS
4996
4997 case OP_EOF_OBJECT: /* eof-object */
4998 s_return (S_EOF);
4641 4999
4642 case OP_WRITE: /* write */ 5000 case OP_WRITE: /* write */
4643 case OP_DISPLAY: /* display */ 5001 case OP_DISPLAY: /* display */
4644 case OP_WRITE_CHAR: /* write-char */ 5002 case OP_WRITE_CHAR: /* write-char */
4645 if (is_pair (cdr (SCHEME_V->args))) 5003 if (is_pair (cdr (SCHEME_V->args)))
… …
4659 else 5017 else
4660 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4661 5019
4662 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4663 5021
5022 //TODO: move to scheme
4664 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4665 if (is_pair (args)) 5024 if (is_pair (args))
4666 { 5025 {
4667 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4668 { 5027 {
… …
4670 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4671 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4672 } 5031 }
4673 } 5032 }
4674 5033
4675 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4676 s_return (S_T); 5035 s_return (S_T);
4677#endif 5036#endif
4678 5037
4679 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4680 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4689 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4690 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4691 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4692 5051
4693 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4694 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4695 5054
4696 if (args != NIL) 5055 if (args != NIL)
4697 { 5056 {
4698 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4699 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4700 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4701 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4702 } 5061 }
4703 else 5062 else
4704 { 5063 {
4705 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4706 5065
4707 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4708 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4709 else 5068 else
4710 return -1; 5069 return -1;
… …
4787 SCHEME_V->gc_verbose = (a != S_F); 5146 SCHEME_V->gc_verbose = (a != S_F);
4788 s_retbool (was); 5147 s_retbool (was);
4789 } 5148 }
4790 5149
4791 case OP_NEWSEGMENT: /* new-segment */ 5150 case OP_NEWSEGMENT: /* new-segment */
5151#if 0
4792 if (!is_pair (args) || !is_number (a)) 5152 if (!is_pair (args) || !is_number (a))
4793 Error_0 ("new-segment: argument must be a number"); 5153 Error_0 ("new-segment: argument must be a number");
4794 5154#endif
4795 alloc_cellseg (SCHEME_A_ ivalue (a)); 5155 s_retbool (alloc_cellseg (SCHEME_A));
4796
4797 s_return (S_T);
4798 5156
4799 case OP_OBLIST: /* oblist */ 5157 case OP_OBLIST: /* oblist */
4800 s_return (oblist_all_symbols (SCHEME_A)); 5158 s_return (oblist_all_symbols (SCHEME_A));
4801 5159
4802#if USE_PORTS 5160#if USE_PORTS
… …
4872 s_return (p == NIL ? S_F : p); 5230 s_return (p == NIL ? S_F : p);
4873 } 5231 }
4874 5232
4875 case OP_GET_OUTSTRING: /* get-output-string */ 5233 case OP_GET_OUTSTRING: /* get-output-string */
4876 { 5234 {
4877 port *p; 5235 port *p = port (a);
4878 5236
4879 if ((p = a->object.port)->kind & port_string) 5237 if (p->kind & port_string)
4880 { 5238 {
4881 off_t size; 5239 off_t size;
4882 char *str; 5240 char *str;
4883 5241
4884 size = p->rep.string.curr - p->rep.string.start + 1; 5242 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4919 } 5277 }
4920 5278
4921 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4922} 5280}
4923 5281
4924static int 5282/* reading */
5283ecb_cold static int
4925opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4926{ 5285{
4927 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4928 pointer x; 5287 pointer x;
4929 5288
… …
4989 int res; 5348 int res;
4990 5349
4991 if (is_pair (args)) 5350 if (is_pair (args))
4992 p = car (args); 5351 p = car (args);
4993 5352
4994 res = p->object.port->kind & port_string; 5353 res = port (p)->kind & port_string;
4995 5354
4996 s_retbool (res); 5355 s_retbool (res);
4997 } 5356 }
4998 5357
4999 case OP_SET_INPORT: /* set-input-port */ 5358 case OP_SET_INPORT: /* set-input-port */
… …
5008 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
5009 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
5010 { 5369 {
5011 case TOK_EOF: 5370 case TOK_EOF:
5012 s_return (S_EOF); 5371 s_return (S_EOF);
5013 /* NOTREACHED */
5014 5372
5015 case TOK_VEC: 5373 case TOK_VEC:
5016 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5017 /* fall through */ 5375 /* fall through */
5018 5376
… …
5021 5379
5022 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
5023 s_return (NIL); 5381 s_return (NIL);
5024 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
5025 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
5026 else 5384
5027 {
5028 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
5029 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
5030 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
5031 }
5032 5388
5033 case TOK_QUOTE: 5389 case TOK_QUOTE:
5034 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5035 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
5036 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
5042 { 5398 {
5043 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5044 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
5045 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
5046 } 5402 }
5047 else 5403
5048 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5049
5050 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
5051 5406
5052 case TOK_COMMA: 5407 case TOK_COMMA:
5053 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5054 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
5065 case TOK_DOTATOM: 5420 case TOK_DOTATOM:
5066 SCHEME_V->strbuff[0] = '.'; 5421 SCHEME_V->strbuff[0] = '.';
5067 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5422 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5068 5423
5069 case TOK_STRATOM: 5424 case TOK_STRATOM:
5425 //TODO: haven't checked whether the garbage collector could interfere and free x
5426 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5070 x = readstrexp (SCHEME_A_ '|'); 5427 x = readstrexp (SCHEME_A_ '|');
5071 //TODO: haven't checked whether the garbage collector could interfere
5072 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5428 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5073 5429
5074 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
5075 x = readstrexp (SCHEME_A_ '"'); 5431 x = readstrexp (SCHEME_A_ '"');
5076 5432
… …
5084 { 5440 {
5085 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5441 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5086 5442
5087 if (f == NIL) 5443 if (f == NIL)
5088 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
5089 else 5445
5090 {
5091 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5092 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
5093 }
5094 } 5448 }
5095 5449
5096 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
5097 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5451 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5098 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
5099 else 5453
5100 s_return (x); 5454 s_return (x);
5101 5455
5102 default: 5456 default:
5103 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
5104 } 5458 }
5105 5459
… …
5198 pointer b = cdr (args); 5552 pointer b = cdr (args);
5199 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5200 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5201 5555
5202 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5203 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5204 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5205 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5206 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5207 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5208 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5209 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5210 else 5564 else
5211 { 5565 {
5212 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5213 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5214 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5215 } 5569 }
5216 5570
5217 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5219 5573
5220 case OP_P1LIST: 5574 case OP_P1LIST:
5221 if (is_pair (args)) 5575 if (is_pair (args))
5222 { 5576 {
5223 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5224 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5225 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5226 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5227 } 5581 }
5228 else if (is_vector (args)) 5582 else if (is_vector (args))
5229 { 5583 {
… …
5237 { 5591 {
5238 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5239 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5240 } 5594 }
5241 5595
5242 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5243 s_return (S_T); 5597 s_return (S_T);
5244 } 5598 }
5245 5599
5246 case OP_PVECFROM: 5600 case OP_PVECFROM:
5247 { 5601 {
… …
5249 pointer vec = car (args); 5603 pointer vec = car (args);
5250 int len = veclength (vec); 5604 int len = veclength (vec);
5251 5605
5252 if (i == len) 5606 if (i == len)
5253 { 5607 {
5254 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5255 s_return (S_T); 5609 s_return (S_T);
5256 } 5610 }
5257 else 5611 else
5258 { 5612 {
5259 pointer elem = vector_get (vec, i); 5613 pointer elem = vector_get (vec, i);
… …
5261 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5262 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5263 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5264 5618
5265 if (i > 0) 5619 if (i > 0)
5266 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5267 5621
5268 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5269 } 5623 }
5270 } 5624 }
5271 } 5625 }
5272 5626
5273 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5274} 5628}
5275 5629
5276static int 5630/* list ops */
5631ecb_hot static int
5277opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5278{ 5633{
5279 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5280 pointer a = car (args); 5635 pointer a = car (args);
5281 pointer x, y; 5636 pointer x, y;
… …
5304 break; 5659 break;
5305 } 5660 }
5306 5661
5307 if (is_pair (y)) 5662 if (is_pair (y))
5308 s_return (car (y)); 5663 s_return (car (y));
5309 else 5664
5310 s_return (S_F); 5665 s_return (S_F);
5311
5312 5666
5313 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5314 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5315 5669
5316 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5317 s_return (S_F); 5671 s_return (S_F);
5318 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5319 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5320 else if (is_macro (SCHEME_V->args)) 5674
5321 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5322 else
5323 s_return (S_F); 5675 s_return (S_F);
5324 5676
5325 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5326 /* 5678 /*
5327 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5328 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
… …
5339 5691
5340/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5692/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5341typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5342 5694
5343typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5344static int 5696
5697ecb_hot static int
5345tst_any (pointer p) 5698tst_any (pointer p)
5346{ 5699{
5347 return 1; 5700 return 1;
5348} 5701}
5349 5702
5350static int 5703ecb_hot static int
5351tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5352{ 5705{
5353 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5354} 5707}
5355 5708
5356static int 5709ecb_hot static int
5357tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5358{ 5711{
5359 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5360} 5713}
5361 5714
… …
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5405#include "opdefines.h" 5758#include "opdefines.h"
5406#undef OP_DEF 5759#undef OP_DEF
5407; 5760;
5408 5761
5409static const char * 5762ecb_cold static const char *
5410opname (int idx) 5763opname (int idx)
5411{ 5764{
5412 const char *name = opnames; 5765 const char *name = opnames;
5413 5766
5414 /* should do this at compile time, but would require external program, right? */ 5767 /* should do this at compile time, but would require external program, right? */
… …
5416 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5417 5770
5418 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5419} 5772}
5420 5773
5421static const char * 5774ecb_cold static const char *
5422procname (pointer x) 5775procname (pointer x)
5423{ 5776{
5424 return opname (procnum (x)); 5777 return opname (procnum (x));
5425} 5778}
5426 5779
… …
5446#undef OP_DEF 5799#undef OP_DEF
5447 {0} 5800 {0}
5448}; 5801};
5449 5802
5450/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5451static void ecb_hot 5804ecb_hot static void
5452Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5453{ 5806{
5454 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5455 5808
5456 for (;;) 5809 for (;;)
… …
5539 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5892 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5540 return; 5893 return;
5541 5894
5542 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5895 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5543 { 5896 {
5544 xwrstr ("No memory!\n"); 5897 putstr (SCHEME_A_ "No memory!\n");
5545 return; 5898 return;
5546 } 5899 }
5547 } 5900 }
5548} 5901}
5549 5902
5550/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5551 5904
5552static void 5905ecb_cold static void
5553assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5554{ 5907{
5555 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5556 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5557} 5910}
5558 5911
5559static void 5912ecb_cold static void
5560assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5561{ 5914{
5562 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5563 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5564 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5572 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5573 return y; 5926 return y;
5574} 5927}
5575 5928
5576/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5929/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5577static int 5930ecb_hot static int
5578syntaxnum (pointer p) 5931syntaxnum (pointer p)
5579{ 5932{
5580 const char *s = strvalue (p); 5933 const char *s = strvalue (p);
5581 5934
5582 switch (strlength (p)) 5935 switch (strlength (p))
… …
5661 6014
5662ecb_cold int 6015ecb_cold int
5663scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5664{ 6017{
5665 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5666 pointer x; 6019
6020 /* this memset is not strictly correct, as we assume (intcache)
6021 * that memset 0 will also set pointers to 0, but memset does
6022 * of course not guarantee that. screw such systems.
6023 */
6024 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5667 6025
5668 num_set_fixnum (num_zero, 1); 6026 num_set_fixnum (num_zero, 1);
5669 num_set_ivalue (num_zero, 0); 6027 num_set_ivalue (num_zero, 0);
5670 num_set_fixnum (num_one, 1); 6028 num_set_fixnum (num_one, 1);
5671 num_set_ivalue (num_one, 1); 6029 num_set_ivalue (num_one, 1);
… …
5683 SCHEME_V->save_inport = NIL; 6041 SCHEME_V->save_inport = NIL;
5684 SCHEME_V->loadport = NIL; 6042 SCHEME_V->loadport = NIL;
5685 SCHEME_V->nesting = 0; 6043 SCHEME_V->nesting = 0;
5686 SCHEME_V->interactive_repl = 0; 6044 SCHEME_V->interactive_repl = 0;
5687 6045
5688 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6046 if (!alloc_cellseg (SCHEME_A))
5689 { 6047 {
5690#if USE_ERROR_CHECKING 6048#if USE_ERROR_CHECKING
5691 SCHEME_V->no_memory = 1; 6049 SCHEME_V->no_memory = 1;
5692 return 0; 6050 return 0;
5693#endif 6051#endif
5694 } 6052 }
5695 6053
5696 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5697 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5698 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5699 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5700 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5701 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5702 6061
5703 /* init NIL */ 6062 /* init NIL */
5704 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5705 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5706 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5707 /* init T */ 6066 /* init T */
5708 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5709 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5710 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5711 /* init F */ 6070 /* init F */
5712 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5713 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5714 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5715 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5716 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5717 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5718 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5719 /* init sink */ 6078 /* init sink */
5720 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5721 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5722 6081
5723 /* init c_nest */ 6082 /* init c_nest */
5724 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5725 6084
5726 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5727 /* init global_env */ 6086 /* init global_env */
5728 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5729 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5730 /* init else */ 6089 /* init else */
5731 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5732 new_slot_in_env (SCHEME_A_ x, S_T);
5733 6091
5734 { 6092 {
5735 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5736 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5737 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5761 6119
5762 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5763} 6121}
5764 6122
5765#if USE_PORTS 6123#if USE_PORTS
5766void 6124ecb_cold void
5767scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5768{ 6126{
5769 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5770} 6128}
5771 6129
5772void 6130ecb_cold void
5773scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6131scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5774{ 6132{
5775 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6133 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5776} 6134}
5777 6135
5778void 6136ecb_cold void
5779scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5780{ 6138{
5781 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5782} 6140}
5783 6141
5784void 6142ecb_cold void
5785scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6143scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5786{ 6144{
5787 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6145 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5788} 6146}
5789#endif 6147#endif
5790 6148
5791void 6149ecb_cold void
5792scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5793{ 6151{
5794 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5795} 6153}
5796 6154
… …
5828 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5829 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5830 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5831 6189
5832 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5833 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5834 6192
5835#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5836 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5837 {
5838 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5839 { 6196 {
5840 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5841 6198
5842 if (fname) 6199 if (fname)
5843 free (fname); 6200 free (fname);
5844 } 6201 }
5845 }
5846#endif 6202#endif
5847} 6203}
5848 6204
5849void 6205ecb_cold void
5850scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5851{ 6207{
5852 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5853} 6209}
5854 6210
5855void 6211ecb_cold void
5856scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5857{ 6213{
5858 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5859 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5860 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5861 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5862 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5863 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5864#if USE_PORTS
5865 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5866#endif
5867 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5868 6222
5869#if USE_PORTS
5870 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5871 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5872#endif
5873 6225
5874#if USE_PORTS 6226#if USE_PORTS
5875#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5876 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5877 6229
… …
5881#endif 6233#endif
5882 6234
5883 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5884 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5885 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5886 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5887 6240
5888 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5889 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5890} 6243}
5891 6244
5892void 6245ecb_cold void
5893scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5894{ 6247{
6248#if USE_PORTs
5895 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5896 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5897 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5898 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5899 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6253 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5900 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6254 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5901 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5902#if USE_PORTS
5903 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5904#endif
5905 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5906 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5907 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5908 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5909 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5910 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5911 6263
5912 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5913 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5914} 6269}
5915 6270
5916void 6271ecb_cold void
5917scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5918{ 6273{
5919 pointer x; 6274 pointer x;
5920 6275
5921 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5926 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5927} 6282}
5928 6283
5929#if !STANDALONE 6284#if !STANDALONE
5930 6285
5931void 6286ecb_cold void
5932scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5933{ 6288{
5934 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6289 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5935} 6290}
5936 6291
5937void 6292ecb_cold void
5938scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5939{ 6294{
5940 int i; 6295 int i;
5941 6296
5942 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5943 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5944} 6299}
5945 6300
5946pointer 6301ecb_cold pointer
5947scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5948{ 6303{
5949 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6304 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5950} 6305}
5951 6306
5952void 6307ecb_cold void
5953save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5954{ 6309{
5955 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5956 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5957 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5961 /* Truncate the dump stack so TS will return here when done, not 6316 /* Truncate the dump stack so TS will return here when done, not
5962 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5963 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5964} 6319}
5965 6320
5966void 6321ecb_cold void
5967restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5968{ 6323{
5969 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5970 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5971 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5972 /* Pop */ 6327 /* Pop */
5973 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5974} 6329}
5975 6330
5976/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5977pointer 6332ecb_cold pointer
5978scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5979{ 6334{
5980 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5981 6336
5982 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5989 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5990 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5991 return SCHEME_V->value; 6346 return SCHEME_V->value;
5992} 6347}
5993 6348
5994pointer 6349ecb_cold pointer
5995scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5996{ 6351{
5997 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5998 6353
5999 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
6011 6366
6012/* ========== Main ========== */ 6367/* ========== Main ========== */
6013 6368
6014#if STANDALONE 6369#if STANDALONE
6015 6370
6016int 6371ecb_cold int
6017main (int argc, char **argv) 6372main (int argc, char **argv)
6018{ 6373{
6019# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
6020 scheme ssc; 6375 scheme ssc;
6021 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
6023# endif 6378# endif
6024 int fin; 6379 int fin;
6025 char *file_name = InitFile; 6380 char *file_name = InitFile;
6026 int retcode; 6381 int retcode;
6027 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
6028 system ("ps v $PPID");//D 6384 system ("ps v $PPID");
6385#endif
6029 6386
6030 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6031 { 6388 {
6032 xwrstr ("Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6033 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6034 xwrstr ("followed by\n"); 6391 putstr (SCHEME_A_ "followed by\n");
6035 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6392 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6036 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6393 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6037 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6394 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6038 xwrstr ("Use - as filename for stdin.\n"); 6395 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6039 return 1; 6396 return 1;
6040 } 6397 }
6041 6398
6042 if (!scheme_init (SCHEME_A)) 6399 if (!scheme_init (SCHEME_A))
6043 { 6400 {
6044 xwrstr ("Could not initialize!\n"); 6401 putstr (SCHEME_A_ "Could not initialize!\n");
6045 return 2; 6402 return 2;
6046 } 6403 }
6047 6404
6048# if USE_PORTS 6405# if USE_PORTS
6049 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6406 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6062 } 6419 }
6063#endif 6420#endif
6064 6421
6065 do 6422 do
6066 { 6423 {
6067#if USE_PORTS
6068 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
6069 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
6070 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6426 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6071 { 6427 {
6072 pointer args = NIL; 6428 pointer args = NIL;
… …
6090 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6446 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6091 6447
6092 } 6448 }
6093 else 6449 else
6094 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
6095#endif
6096 6451
6097 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
6098 { 6453 {
6099 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6454 putstr (SCHEME_A_ "Could not open file ");
6455 putstr (SCHEME_A_ file_name);
6456 putcharacter (SCHEME_A_ '\n');
6100 } 6457 }
6101 else 6458 else
6102 { 6459 {
6103 if (isfile) 6460 if (isfile)
6104 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
6105 else 6462 else
6106 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
6107 6464
6108#if USE_PORTS
6109 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
6110 { 6466 {
6111 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
6112 { 6468 {
6113 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6469 putstr (SCHEME_A_ "Errors encountered reading ");
6470 putstr (SCHEME_A_ file_name);
6471 putcharacter (SCHEME_A_ '\n');
6114 } 6472 }
6115 6473
6116 if (isfile) 6474 if (isfile)
6117 close (fin); 6475 close (fin);
6118 } 6476 }
6119#endif
6120 } 6477 }
6121 6478
6122 file_name = *argv++; 6479 file_name = *argv++;
6123 } 6480 }
6124 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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