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.50 by root, Tue Dec 1 00:47:54 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define 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) 91#define NIL POINTER (&SCHEME_V->xNIL)
85#define S_T (&SCHEME_V->xT) 92#define S_T POINTER (&SCHEME_V->xT)
86#define S_F (&SCHEME_V->xF) 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
221 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
222}; 226};
223 227
224#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
225#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
258static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
259static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
260static num num_rem (num a, num b); 264static num num_rem (num a, num b);
261static num num_mod (num a, num b); 265static num num_mod (num a, num b);
262 266
263#if USE_MATH
264static double round_per_R5RS (double x);
265#endif
266static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
267 268
268static num num_zero; 269static num num_zero;
269static num num_one; 270static num num_one;
270 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
271/* macros for cell operations */ 276/* macros for cell operations */
272#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
273#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
274#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
275 280
276INTERFACE int 281INTERFACE int
277is_string (pointer p) 282is_string (pointer p)
278{ 283{
279 return type (p) == T_STRING; 284 return type (p) == T_STRING;
280} 285}
281 286
282#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
283#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
284 289
285INTERFACE int 290INTERFACE int
286is_vector (pointer p) 291is_vector (pointer p)
287{ 292{
288 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
289} 294}
290 295
291#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
292#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
294INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
296 301
297INTERFACE int 302INTERFACE int
… …
323string_value (pointer p) 328string_value (pointer p)
324{ 329{
325 return strvalue (p); 330 return strvalue (p);
326} 331}
327 332
328#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
329#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
330 335
331#if USE_REAL 336#if USE_REAL
332#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
333#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
334#else 339#else
335#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
336#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
337#endif 342#endif
338 343
339INTERFACE long 344INTERFACE long
340charvalue (pointer p) 345charvalue (pointer p)
341{ 346{
342 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
343} 348}
344 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
345INTERFACE int 352INTERFACE int
346is_port (pointer p) 353is_port (pointer p)
347{ 354{
348 return type (p) == T_PORT; 355 return type (p) == T_PORT;
349} 356}
350 357
351INTERFACE int 358INTERFACE int
352is_inport (pointer p) 359is_inport (pointer p)
353{ 360{
354 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
355} 362}
356 363
357INTERFACE int 364INTERFACE int
358is_outport (pointer p) 365is_outport (pointer p)
359{ 366{
360 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
361} 368}
362 369
363INTERFACE int 370INTERFACE int
364is_pair (pointer p) 371is_pair (pointer p)
365{ 372{
366 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
367} 374}
368 375
369#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
370#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
371 378
372static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
373static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
374static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
375static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
376 383
377static pointer cadar (pointer p) { return car (cdr (car (p))); } 384static pointer cadar (pointer p) { return car (cdr (car (p))); }
378static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 385static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
379static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
380 387
388static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
389
381INTERFACE void 390INTERFACE void
382set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
383{ 392{
384 p->object.cons.car = q; 393 CELL(p)->object.cons.car = CELL (q);
385} 394}
386 395
387INTERFACE void 396INTERFACE void
388set_cdr (pointer p, pointer q) 397set_cdr (pointer p, pointer q)
389{ 398{
390 p->object.cons.cdr = q; 399 CELL(p)->object.cons.cdr = CELL (q);
391} 400}
392 401
393INTERFACE pointer 402INTERFACE pointer
394pair_car (pointer p) 403pair_car (pointer p)
395{ 404{
… …
525 proper list: length 534 proper list: length
526 circular list: -1 535 circular list: -1
527 not even a pair: -2 536 not even a pair: -2
528 dotted list: -2 minus length before dot 537 dotted list: -2 minus length before dot
529*/ 538*/
530INTERFACE int 539ecb_hot INTERFACE int
531list_length (SCHEME_P_ pointer a) 540list_length (SCHEME_P_ pointer a)
532{ 541{
533 int i = 0; 542 int i = 0;
534 pointer slow, fast; 543 pointer slow, fast;
535 544
… …
574{ 583{
575 return list_length (SCHEME_A_ a) >= 0; 584 return list_length (SCHEME_A_ a) >= 0;
576} 585}
577 586
578#if USE_CHAR_CLASSIFIERS 587#if USE_CHAR_CLASSIFIERS
588
579ecb_inline int 589ecb_inline int
580Cisalpha (int c) 590Cisalpha (int c)
581{ 591{
582 return isascii (c) && isalpha (c); 592 return isascii (c) && isalpha (c);
583} 593}
… …
641 "gs", 651 "gs",
642 "rs", 652 "rs",
643 "us" 653 "us"
644}; 654};
645 655
646static int 656ecb_cold static int
647is_ascii_name (const char *name, int *pc) 657is_ascii_name (const char *name, int *pc)
648{ 658{
649 int i; 659 int i;
650 660
651 for (i = 0; i < 32; i++) 661 for (i = 0; i < 32; i++)
… …
670 680
671static int file_push (SCHEME_P_ const char *fname); 681static int file_push (SCHEME_P_ const char *fname);
672static void file_pop (SCHEME_P); 682static void file_pop (SCHEME_P);
673static int file_interactive (SCHEME_P); 683static int file_interactive (SCHEME_P);
674ecb_inline int is_one_of (const char *s, int c); 684ecb_inline int is_one_of (const char *s, int c);
675static int alloc_cellseg (SCHEME_P_ int n); 685static int alloc_cellseg (SCHEME_P);
676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 686ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
677static void finalize_cell (SCHEME_P_ pointer a); 687static 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); 688static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
680static pointer mk_number (SCHEME_P_ const num n); 689static pointer mk_number (SCHEME_P_ const num n);
681static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 690static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
682static pointer mk_vector (SCHEME_P_ uint32_t len); 691static pointer mk_vector (SCHEME_P_ uint32_t len);
683static pointer mk_atom (SCHEME_P_ char *q); 692static pointer mk_atom (SCHEME_P_ char *q);
684static pointer mk_sharp_const (SCHEME_P_ char *name); 693static pointer mk_sharp_const (SCHEME_P_ char *name);
685 694
695static pointer mk_port (SCHEME_P_ port *p);
696
686#if USE_PORTS 697#if USE_PORTS
687static pointer mk_port (SCHEME_P_ port *p);
688static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 698static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
689static pointer port_from_file (SCHEME_P_ int, int prop); 699static pointer port_from_file (SCHEME_P_ int, int prop);
690static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 700static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
691static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 701static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
692static port *port_rep_from_file (SCHEME_P_ int, int prop); 702static 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); 703static 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); 704static void port_close (SCHEME_P_ pointer p, int flag);
695#endif 705#endif
706
696static void mark (pointer a); 707static void mark (pointer a);
697static void gc (SCHEME_P_ pointer a, pointer b); 708static void gc (SCHEME_P_ pointer a, pointer b);
698static int basic_inchar (port *pt); 709static int basic_inchar (port *pt);
699static int inchar (SCHEME_P); 710static int inchar (SCHEME_P);
700static void backchar (SCHEME_P_ int c); 711static void backchar (SCHEME_P_ int c);
701static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 712static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
702static pointer readstrexp (SCHEME_P_ char delim); 713static pointer readstrexp (SCHEME_P_ char delim);
703ecb_inline int skipspace (SCHEME_P); 714static int skipspace (SCHEME_P);
704static int token (SCHEME_P); 715static int token (SCHEME_P);
705static void printslashstring (SCHEME_P_ char *s, int len); 716static void printslashstring (SCHEME_P_ char *s, int len);
706static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 717static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
707static void printatom (SCHEME_P_ pointer l, int f); 718static void printatom (SCHEME_P_ pointer l, int f);
708static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 719static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
874 } 885 }
875 886
876 return ret; 887 return ret;
877} 888}
878 889
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 890static int
905is_zero_rvalue (RVALUE x) 891is_zero_rvalue (RVALUE x)
906{ 892{
907 return x == 0; 893 return x == 0;
908#if 0 894#if 0
… …
913#endif 899#endif
914#endif 900#endif
915} 901}
916 902
917/* allocate new cell segment */ 903/* allocate new cell segment */
918static int 904ecb_cold static int
919alloc_cellseg (SCHEME_P_ int n) 905alloc_cellseg (SCHEME_P)
920{ 906{
921 pointer newp; 907 struct cell *newp;
922 pointer last; 908 struct cell *last;
923 pointer p; 909 struct cell *p;
924 char *cp; 910 char *cp;
925 long i; 911 long i;
926 int k; 912 int k;
927 913
928 static int segsize = CELL_SEGSIZE >> 1; 914 static int segsize = CELL_SEGSIZE >> 1;
929 segsize <<= 1; 915 segsize <<= 1;
930 916
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)); 917 cp = malloc (segsize * sizeof (struct cell));
937 918
938 if (!cp && USE_ERROR_CHECKING) 919 if (!cp && USE_ERROR_CHECKING)
939 return k; 920 return k;
940 921
941 i = ++SCHEME_V->last_cell_seg; 922 i = ++SCHEME_V->last_cell_seg;
942 SCHEME_V->alloc_seg[i] = cp;
943 923
944 newp = (pointer)cp; 924 newp = (struct cell *)cp;
945 SCHEME_V->cell_seg[i] = newp; 925 SCHEME_V->cell_seg[i] = newp;
946 SCHEME_V->cell_segsize[i] = segsize; 926 SCHEME_V->cell_segsize[i] = segsize;
947 SCHEME_V->fcells += segsize; 927 SCHEME_V->fcells += segsize;
948 last = newp + segsize - 1; 928 last = newp + segsize - 1;
949 929
950 for (p = newp; p <= last; p++) 930 for (p = newp; p <= last; p++)
951 { 931 {
932 pointer cp = POINTER (p);
952 set_typeflag (p, T_PAIR); 933 set_typeflag (cp, T_PAIR);
953 set_car (p, NIL); 934 set_car (cp, NIL);
954 set_cdr (p, p + 1); 935 set_cdr (cp, POINTER (p + 1));
955 } 936 }
956 937
957 set_cdr (last, SCHEME_V->free_cell); 938 set_cdr (POINTER (last), SCHEME_V->free_cell);
958 SCHEME_V->free_cell = newp; 939 SCHEME_V->free_cell = POINTER (newp);
959 }
960 940
961 return n; 941 return 1;
962} 942}
963 943
964/* get new cell. parameter a, b is marked by gc. */ 944/* get new cell. parameter a, b is marked by gc. */
965ecb_inline pointer 945ecb_inline pointer
966get_cell_x (SCHEME_P_ pointer a, pointer b) 946get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 950 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
971 return S_SINK; 951 return S_SINK;
972 952
973 if (SCHEME_V->free_cell == NIL) 953 if (SCHEME_V->free_cell == NIL)
974 { 954 {
975 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1; 955 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
976 956
977 gc (SCHEME_A_ a, b); 957 gc (SCHEME_A_ a, b);
978 958
979 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 959 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
980 { 960 {
981 /* if only a few recovered, get more to avoid fruitless gc's */ 961 /* if only a few recovered, get more to avoid fruitless gc's */
982 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 962 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
983 { 963 {
984#if USE_ERROR_CHECKING 964#if USE_ERROR_CHECKING
985 SCHEME_V->no_memory = 1; 965 SCHEME_V->no_memory = 1;
986 return S_SINK; 966 return S_SINK;
987#endif 967#endif
… …
999 } 979 }
1000} 980}
1001 981
1002/* To retain recent allocs before interpreter knows about them - 982/* To retain recent allocs before interpreter knows about them -
1003 Tehom */ 983 Tehom */
1004 984ecb_hot static void
1005static void
1006push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 985push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1007{ 986{
1008 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 987 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1009 988
1010 set_typeflag (holder, T_PAIR); 989 set_typeflag (holder, T_PAIR);
… …
1012 set_car (holder, recent); 991 set_car (holder, recent);
1013 set_cdr (holder, car (S_SINK)); 992 set_cdr (holder, car (S_SINK));
1014 set_car (S_SINK, holder); 993 set_car (S_SINK, holder);
1015} 994}
1016 995
1017static pointer 996ecb_hot static pointer
1018get_cell (SCHEME_P_ pointer a, pointer b) 997get_cell (SCHEME_P_ pointer a, pointer b)
1019{ 998{
1020 pointer cell = get_cell_x (SCHEME_A_ a, b); 999 pointer cell = get_cell_x (SCHEME_A_ a, b);
1021 1000
1022 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1001 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1040 return S_SINK; 1019 return S_SINK;
1041 1020
1042 /* Record it as a vector so that gc understands it. */ 1021 /* Record it as a vector so that gc understands it. */
1043 set_typeflag (v, T_VECTOR | T_ATOM); 1022 set_typeflag (v, T_VECTOR | T_ATOM);
1044 1023
1045 v->object.vector.vvalue = e; 1024 CELL(v)->object.vector.vvalue = e;
1046 v->object.vector.length = len; 1025 CELL(v)->object.vector.length = len;
1047 fill_vector (v, 0, init); 1026 fill_vector (v, 0, init);
1048 push_recent_alloc (SCHEME_A_ v, NIL); 1027 push_recent_alloc (SCHEME_A_ v, NIL);
1049 1028
1050 return v; 1029 return v;
1051} 1030}
… …
1060static void 1039static void
1061check_cell_alloced (pointer p, int expect_alloced) 1040check_cell_alloced (pointer p, int expect_alloced)
1062{ 1041{
1063 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1042 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1064 if (typeflag (p) & !expect_alloced) 1043 if (typeflag (p) & !expect_alloced)
1065 xwrstr ("Cell is already allocated!\n"); 1044 putstr (SCHEME_A_ "Cell is already allocated!\n");
1066 1045
1067 if (!(typeflag (p)) & expect_alloced) 1046 if (!(typeflag (p)) & expect_alloced)
1068 xwrstr ("Cell is not allocated!\n"); 1047 putstr (SCHEME_A_ "Cell is not allocated!\n");
1069} 1048}
1070 1049
1071static void 1050static void
1072check_range_alloced (pointer p, int n, int expect_alloced) 1051check_range_alloced (pointer p, int n, int expect_alloced)
1073{ 1052{
… …
1079#endif 1058#endif
1080 1059
1081/* Medium level cell allocation */ 1060/* Medium level cell allocation */
1082 1061
1083/* get new cons cell */ 1062/* get new cons cell */
1084pointer 1063ecb_hot static pointer
1085xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1064xcons (SCHEME_P_ pointer a, pointer b)
1086{ 1065{
1087 pointer x = get_cell (SCHEME_A_ a, b); 1066 pointer x = get_cell (SCHEME_A_ a, b);
1088 1067
1089 set_typeflag (x, T_PAIR); 1068 set_typeflag (x, T_PAIR);
1090
1091 if (immutable)
1092 setimmutable (x);
1093 1069
1094 set_car (x, a); 1070 set_car (x, a);
1095 set_cdr (x, b); 1071 set_cdr (x, b);
1096 1072
1097 return x; 1073 return x;
1098} 1074}
1099 1075
1100static pointer 1076ecb_hot static pointer
1077ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1078{
1079 pointer x = xcons (SCHEME_A_ a, b);
1080 setimmutable (x);
1081 return x;
1082}
1083
1084#define cons(a,b) xcons (SCHEME_A_ a, b)
1085#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1086
1087ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1088generate_symbol (SCHEME_P_ const char *name)
1102{ 1089{
1103 pointer x = mk_string (SCHEME_A_ name); 1090 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1091 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1092 set_typeflag (x, T_SYMBOL | T_ATOM);
… …
1111#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1112 1099
1113static int 1100static int
1114hash_fn (const char *key, int table_size) 1101hash_fn (const char *key, int table_size)
1115{ 1102{
1116 const unsigned char *p = key; 1103 const unsigned char *p = (unsigned char *)key;
1117 uint32_t hash = 2166136261; 1104 uint32_t hash = 2166136261U;
1118 1105
1119 while (*p) 1106 while (*p)
1120 hash = (hash ^ *p++) * 16777619; 1107 hash = (hash ^ *p++) * 16777619;
1121 1108
1122 return hash % table_size; 1109 return hash % table_size;
1123} 1110}
1124 1111
1125static pointer 1112ecb_cold static pointer
1126oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1127{ 1114{
1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1129} 1116}
1130 1117
1131/* returns the new symbol */ 1118/* returns the new symbol */
1132static pointer 1119ecb_cold static pointer
1133oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1134{ 1121{
1135 pointer x = generate_symbol (SCHEME_A_ name); 1122 pointer x = generate_symbol (SCHEME_A_ name);
1136 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 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))); 1124 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1138 return x; 1125 return x;
1139} 1126}
1140 1127
1141ecb_inline pointer 1128ecb_cold static pointer
1142oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1143{ 1130{
1144 int location; 1131 int location;
1145 pointer x; 1132 pointer x;
1146 char *s; 1133 char *s;
… …
1157 } 1144 }
1158 1145
1159 return NIL; 1146 return NIL;
1160} 1147}
1161 1148
1162static pointer 1149ecb_cold static pointer
1163oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1164{ 1151{
1165 int i; 1152 int i;
1166 pointer x; 1153 pointer x;
1167 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
… …
1173 return ob_list; 1160 return ob_list;
1174} 1161}
1175 1162
1176#else 1163#else
1177 1164
1178static pointer 1165ecb_cold static pointer
1179oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1180{ 1167{
1181 return NIL; 1168 return NIL;
1182} 1169}
1183 1170
1184ecb_inline pointer 1171ecb_cold static pointer
1185oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1186{ 1173{
1187 pointer x; 1174 pointer x;
1188 char *s; 1175 char *s;
1189 1176
… …
1198 1185
1199 return NIL; 1186 return NIL;
1200} 1187}
1201 1188
1202/* returns the new symbol */ 1189/* returns the new symbol */
1203static pointer 1190ecb_cold static pointer
1204oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1205{ 1192{
1206 pointer x = generate_symbol (SCHEME_A_ name); 1193 pointer x = generate_symbol (SCHEME_A_ name);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1195 return x;
1209} 1196}
1210 1197
1211static pointer 1198ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1213{ 1200{
1214 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1215} 1202}
1216 1203
1217#endif 1204#endif
1218 1205
1219#if USE_PORTS
1220static pointer 1206ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1222{ 1208{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1210
1225 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1212 set_port (x, p);
1227 1213
1228 return x; 1214 return x;
1229} 1215}
1230#endif
1231 1216
1232pointer 1217ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1219{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1221
1237 set_typeflag (x, T_FOREIGN | T_ATOM); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1223 CELL(x)->object.ff = f;
1239 1224
1240 return x; 1225 return x;
1241} 1226}
1242 1227
1243INTERFACE pointer 1228INTERFACE pointer
… …
1402 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1403 1388
1404 return x; 1389 return x;
1405} 1390}
1406 1391
1407INTERFACE pointer 1392ecb_cold INTERFACE pointer
1408gensym (SCHEME_P) 1393gensym (SCHEME_P)
1409{ 1394{
1410 pointer x; 1395 pointer x;
1411 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1412 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
… …
1419{ 1404{
1420 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x; 1405 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1421} 1406}
1422 1407
1423/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1424static pointer 1409ecb_cold static pointer
1425mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1426{ 1411{
1427 char c, *p; 1412 char c, *p;
1428 int has_dec_point = 0; 1413 int has_dec_point = 0;
1429 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1500 1485
1501 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1502} 1487}
1503 1488
1504/* make constant */ 1489/* make constant */
1505static pointer 1490ecb_cold static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1507{ 1492{
1508 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1509 return S_T; 1494 return S_T;
1510 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1511 return S_F; 1496 return S_F;
1512 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1513 { 1498 {
1514 int c; 1499 int c;
1515 1500
1501 // TODO: optimise
1516 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1517 c = ' '; 1503 c = ' ';
1518 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1519 c = '\n'; 1505 c = '\n';
1520 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1521 c = '\r'; 1507 c = '\r';
1522 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1523 c = '\t'; 1509 c = '\t';
1510 else if (stricmp (name + 1, "alarm") == 0)
1511 c = 0x07;
1512 else if (stricmp (name + 1, "backspace") == 0)
1513 c = 0x08;
1514 else if (stricmp (name + 1, "escape") == 0)
1515 c = 0x1b;
1516 else if (stricmp (name + 1, "delete") == 0)
1517 c = 0x7f;
1518 else if (stricmp (name + 1, "null") == 0)
1519 c = 0;
1524 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1525 { 1521 {
1526 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1527 1523
1528 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1553 return NIL; 1549 return NIL;
1554 } 1550 }
1555} 1551}
1556 1552
1557/* ========== garbage collector ========== */ 1553/* ========== garbage collector ========== */
1554
1555static void
1556finalize_cell (SCHEME_P_ pointer a)
1557{
1558 /* TODO, fast bitmap check? */
1559 if (is_string (a) || is_symbol (a))
1560 free (strvalue (a));
1561 else if (is_vector (a))
1562 free (vecvalue (a));
1563#if USE_PORTS
1564 else if (is_port (a))
1565 {
1566 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1567 port_close (SCHEME_A_ a, port_input | port_output);
1568
1569 free (port (a));
1570 }
1571#endif
1572}
1558 1573
1559/*-- 1574/*--
1560 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1575 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1561 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1562 * for marking. 1577 * for marking.
1563 * 1578 *
1564 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1565 * which is inherited form tinyscheme and could be fixed by having another 1580 * which is inherited form tinyscheme and could be fixed by having another
1566 * word of context in the vector 1581 * word of context in the vector
1567 */ 1582 */
1568static void 1583ecb_hot static void
1569mark (pointer a) 1584mark (pointer a)
1570{ 1585{
1571 pointer t, q, p; 1586 pointer t, q, p;
1572 1587
1573 t = 0; 1588 t = 0;
… …
1630 p = q; 1645 p = q;
1631 goto E6; 1646 goto E6;
1632 } 1647 }
1633} 1648}
1634 1649
1650ecb_hot static void
1651gc_free (SCHEME_P)
1652{
1653 int i;
1654 uint32_t total = 0;
1655
1656 /* Here we scan the cells to build the free-list. */
1657 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1658 {
1659 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1660 struct cell *p;
1661 total += SCHEME_V->cell_segsize [i];
1662
1663 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 {
1665 pointer c = POINTER (p);
1666
1667 if (is_mark (c))
1668 clrmark (c);
1669 else
1670 {
1671 /* reclaim cell */
1672 if (typeflag (c) != T_PAIR)
1673 {
1674 finalize_cell (SCHEME_A_ c);
1675 set_typeflag (c, T_PAIR);
1676 set_car (c, NIL);
1677 }
1678
1679 ++SCHEME_V->fcells;
1680 set_cdr (c, SCHEME_V->free_cell);
1681 SCHEME_V->free_cell = c;
1682 }
1683 }
1684 }
1685
1686 if (SCHEME_V->gc_verbose)
1687 {
1688 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1689 }
1690}
1691
1635/* garbage collection. parameter a, b is marked. */ 1692/* garbage collection. parameter a, b is marked. */
1636static void 1693ecb_cold static void
1637gc (SCHEME_P_ pointer a, pointer b) 1694gc (SCHEME_P_ pointer a, pointer b)
1638{ 1695{
1639 pointer p;
1640 int i; 1696 int i;
1641 1697
1642 if (SCHEME_V->gc_verbose) 1698 if (SCHEME_V->gc_verbose)
1643 putstr (SCHEME_A_ "gc..."); 1699 putstr (SCHEME_A_ "gc...");
1644 1700
… …
1677 clrmark (NIL); 1733 clrmark (NIL);
1678 SCHEME_V->fcells = 0; 1734 SCHEME_V->fcells = 0;
1679 SCHEME_V->free_cell = NIL; 1735 SCHEME_V->free_cell = NIL;
1680 1736
1681 if (SCHEME_V->gc_verbose) 1737 if (SCHEME_V->gc_verbose)
1682 xwrstr ("freeing..."); 1738 putstr (SCHEME_A_ "freeing...");
1683 1739
1684 uint32_t total = 0; 1740 gc_free (SCHEME_A);
1685
1686 /* Here we scan the cells to build the free-list. */
1687 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1688 {
1689 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1690 total += SCHEME_V->cell_segsize [i];
1691
1692 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1693 {
1694 if (is_mark (p))
1695 clrmark (p);
1696 else
1697 {
1698 /* reclaim cell */
1699 if (typeflag (p) != T_PAIR)
1700 {
1701 finalize_cell (SCHEME_A_ p);
1702 set_typeflag (p, T_PAIR);
1703 set_car (p, NIL);
1704 }
1705
1706 ++SCHEME_V->fcells;
1707 set_cdr (p, SCHEME_V->free_cell);
1708 SCHEME_V->free_cell = p;
1709 }
1710 }
1711 }
1712
1713 if (SCHEME_V->gc_verbose)
1714 {
1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1716 }
1717}
1718
1719static void
1720finalize_cell (SCHEME_P_ pointer a)
1721{
1722 /* TODO, fast bitmap check? */
1723 if (is_string (a) || is_symbol (a))
1724 free (strvalue (a));
1725 else if (is_vector (a))
1726 free (vecvalue (a));
1727#if USE_PORTS
1728 else if (is_port (a))
1729 {
1730 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1731 port_close (SCHEME_A_ a, port_input | port_output);
1732
1733 free (a->object.port);
1734 }
1735#endif
1736} 1741}
1737 1742
1738/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1739 1744
1740static int 1745ecb_cold static int
1741file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1742{ 1747{
1743#if USE_PORTS
1744 int fin; 1748 int fin;
1745 1749
1746 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1747 return 0; 1751 return 0;
1748 1752
… …
1754 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1755 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1761 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1758 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1762 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1759 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1760 1764
1761#if SHOW_ERROR_LINE 1765#if SHOW_ERROR_LINE
1762 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1763 1767
1764 if (fname) 1768 if (fname)
1765 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1766#endif 1770#endif
1767 } 1771 }
1768 1772
1769 return fin >= 0; 1773 return fin >= 0;
1770
1771#else
1772 return 1;
1773#endif
1774} 1774}
1775 1775
1776static void 1776ecb_cold static void
1777file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1778{ 1778{
1779 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1780 { 1780 {
1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1782#if USE_PORTS 1782#if USE_PORTS
1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1784#endif 1784#endif
1785 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1786 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1787 } 1787 }
1788} 1788}
1789 1789
1790static int 1790ecb_cold static int
1791file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1792{ 1792{
1793#if USE_PORTS 1793#if USE_PORTS
1794 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1796 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1797#else 1797#else
1798 return 0; 1798 return 0;
1799#endif 1799#endif
1800} 1800}
1801 1801
1802#if USE_PORTS 1802#if USE_PORTS
1803static port * 1803ecb_cold static port *
1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1805{ 1805{
1806 int fd; 1806 int fd;
1807 int flags; 1807 int flags;
1808 char *rw; 1808 char *rw;
… …
1831# endif 1831# endif
1832 1832
1833 return pt; 1833 return pt;
1834} 1834}
1835 1835
1836static pointer 1836ecb_cold static pointer
1837port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1838{ 1838{
1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1840 1840
1841 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1842 return NIL; 1842 return NIL;
1843 1843
1844 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1845} 1845}
1846 1846
1847static port * 1847ecb_cold static port *
1848port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1849{ 1849{
1850 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1851 1851
1852 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1857 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1858 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1859 return pt; 1859 return pt;
1860} 1860}
1861 1861
1862static pointer 1862ecb_cold static pointer
1863port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1864{ 1864{
1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1866 1866
1867 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1868 return NIL; 1868 return NIL;
1869 1869
1870 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1871} 1871}
1872 1872
1873static port * 1873ecb_cold static port *
1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1875{ 1875{
1876 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1877 1877
1878 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1884 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1885 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1886 return pt; 1886 return pt;
1887} 1887}
1888 1888
1889static pointer 1889ecb_cold static pointer
1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1891{ 1891{
1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1893 1893
1894 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1897 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1898} 1898}
1899 1899
1900# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1901 1901
1902static port * 1902ecb_cold static port *
1903port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1904{ 1904{
1905 char *start; 1905 char *start;
1906 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1907 1907
… …
1921 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1923 return pt; 1923 return pt;
1924} 1924}
1925 1925
1926static pointer 1926ecb_cold static pointer
1927port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1928{ 1928{
1929 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1930 1930
1931 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1932 return NIL; 1932 return NIL;
1933 1933
1934 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1935} 1935}
1936 1936
1937static void 1937ecb_cold static void
1938port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1939{ 1939{
1940 port *pt = p->object.port; 1940 port *pt = port (p);
1941 1941
1942 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1943 1943
1944 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1945 { 1945 {
… …
1962 } 1962 }
1963} 1963}
1964#endif 1964#endif
1965 1965
1966/* get new character from input file */ 1966/* get new character from input file */
1967static int 1967ecb_cold static int
1968inchar (SCHEME_P) 1968inchar (SCHEME_P)
1969{ 1969{
1970 int c; 1970 int c;
1971 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1972
1973 pt = SCHEME_V->inport->object.port;
1974 1972
1975 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1976 return EOF; 1974 return EOF;
1977 1975
1978 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1988 } 1986 }
1989 1987
1990 return c; 1988 return c;
1991} 1989}
1992 1990
1993static int ungot = -1; 1991ecb_cold static int
1994
1995static int
1996basic_inchar (port *pt) 1992basic_inchar (port *pt)
1997{ 1993{
1998#if USE_PORTS
1999 if (pt->unget != -1) 1994 if (pt->unget != -1)
2000 { 1995 {
2001 int r = pt->unget; 1996 int r = pt->unget;
2002 pt->unget = -1; 1997 pt->unget = -1;
2003 return r; 1998 return r;
2004 } 1999 }
2005 2000
2001#if USE_PORTS
2006 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
2007 { 2003 {
2008 char c; 2004 char c;
2009 2005
2010 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
2018 return EOF; 2014 return EOF;
2019 else 2015 else
2020 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
2021 } 2017 }
2022#else 2018#else
2023 if (ungot == -1)
2024 {
2025 char c; 2019 char c;
2026 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
2027 return EOF; 2022 return EOF;
2028 2023
2029 ungot = c;
2030 }
2031
2032 {
2033 int r = ungot;
2034 ungot = -1;
2035 return r; 2024 return c;
2036 }
2037#endif 2025#endif
2038} 2026}
2039 2027
2040/* back character to input buffer */ 2028/* back character to input buffer */
2041static void 2029ecb_cold static void
2042backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2043{ 2031{
2044#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2045 port *pt;
2046 2033
2047 if (c == EOF) 2034 if (c == EOF)
2048 return; 2035 return;
2049 2036
2050 pt = SCHEME_V->inport->object.port;
2051 pt->unget = c; 2037 pt->unget = c;
2052#else
2053 if (c == EOF)
2054 return;
2055
2056 ungot = c;
2057#endif
2058} 2038}
2059 2039
2060#if USE_PORTS 2040#if USE_PORTS
2061static int 2041ecb_cold static int
2062realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2063{ 2043{
2064 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2065 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2045 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2066 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2079 else 2059 else
2080 return 0; 2060 return 0;
2081} 2061}
2082#endif 2062#endif
2083 2063
2084INTERFACE void 2064ecb_cold static void
2085putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2086{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2087#if USE_PORTS 2069#if USE_PORTS
2088 port *pt = SCHEME_V->outport->object.port;
2089
2090 if (pt->kind & port_file)
2091 write (pt->rep.stdio.file, s, strlen (s));
2092 else
2093 for (; *s; s++)
2094 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2095 *pt->rep.string.curr++ = *s;
2096 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2097 *pt->rep.string.curr++ = *s;
2098
2099#else
2100 xwrstr (s);
2101#endif
2102}
2103
2104static void
2105putchars (SCHEME_P_ const char *s, int len)
2106{
2107#if USE_PORTS
2108 port *pt = SCHEME_V->outport->object.port;
2109
2110 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2111 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2112 else 2072 else
2113 { 2073 {
2114 for (; len; len--) 2074 for (; len; len--)
… …
2119 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2120 } 2080 }
2121 } 2081 }
2122 2082
2123#else 2083#else
2124 write (1, s, len); 2084 write (1, s, len); // output not initialised
2125#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2126} 2092}
2127 2093
2128INTERFACE void 2094INTERFACE void
2129putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2130{ 2096{
2131#if USE_PORTS
2132 port *pt = SCHEME_V->outport->object.port;
2133
2134 if (pt->kind & port_file)
2135 {
2136 char cc = c;
2137 write (pt->rep.stdio.file, &cc, 1);
2138 }
2139 else
2140 {
2141 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2142 *pt->rep.string.curr++ = c;
2143 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2144 *pt->rep.string.curr++ = c;
2145 }
2146
2147#else
2148 char cc = c; 2097 char cc = c;
2149 write (1, &c, 1); 2098
2150#endif 2099 putchars (SCHEME_A_ &cc, 1);
2151} 2100}
2152 2101
2153/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2154static char * 2103ecb_cold static char *
2155readstr_upto (SCHEME_P_ int skip, const char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2156{ 2105{
2157 char *p = SCHEME_V->strbuff + skip; 2106 char *p = SCHEME_V->strbuff + skip;
2158 2107
2159 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2108 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2168 2117
2169 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2170} 2119}
2171 2120
2172/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2173static pointer 2122ecb_cold static pointer
2174readstrexp (SCHEME_P_ char delim) 2123readstrexp (SCHEME_P_ char delim)
2175{ 2124{
2176 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2177 int c; 2126 int c;
2178 int c1 = 0; 2127 int c1 = 0;
… …
2211 case '7': 2160 case '7':
2212 state = st_oct1; 2161 state = st_oct1;
2213 c1 = c - '0'; 2162 c1 = c - '0';
2214 break; 2163 break;
2215 2164
2165 case 'a': *p++ = '\a'; state = st_ok; break;
2166 case 'n': *p++ = '\n'; state = st_ok; break;
2167 case 'r': *p++ = '\r'; state = st_ok; break;
2168 case 't': *p++ = '\t'; state = st_ok; break;
2169
2170 // this overshoots the minimum requirements of r7rs
2171 case ' ':
2172 case '\t':
2173 case '\r':
2174 case '\n':
2175 skipspace (SCHEME_A);
2176 state = st_ok;
2177 break;
2178
2179 //TODO: x should end in ;, not two-digit hex
2216 case 'x': 2180 case 'x':
2217 case 'X': 2181 case 'X':
2218 state = st_x1; 2182 state = st_x1;
2219 c1 = 0; 2183 c1 = 0;
2220 break;
2221
2222 case 'n':
2223 *p++ = '\n';
2224 state = st_ok;
2225 break;
2226
2227 case 't':
2228 *p++ = '\t';
2229 state = st_ok;
2230 break;
2231
2232 case 'r':
2233 *p++ = '\r';
2234 state = st_ok;
2235 break; 2184 break;
2236 2185
2237 default: 2186 default:
2238 *p++ = c; 2187 *p++ = c;
2239 state = st_ok; 2188 state = st_ok;
… …
2291 } 2240 }
2292 } 2241 }
2293} 2242}
2294 2243
2295/* check c is in chars */ 2244/* check c is in chars */
2296ecb_inline int 2245ecb_cold int
2297is_one_of (const char *s, int c) 2246is_one_of (const char *s, int c)
2298{ 2247{
2299 return c == EOF || !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2300} 2249}
2301 2250
2302/* skip white characters */ 2251/* skip white characters */
2303ecb_inline int 2252ecb_cold int
2304skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2305{ 2254{
2306 int c, curr_line = 0; 2255 int c, curr_line = 0;
2307 2256
2308 do 2257 do
… …
2328 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2329 return 1; 2278 return 1;
2330} 2279}
2331 2280
2332/* get token */ 2281/* get token */
2333static int 2282ecb_cold static int
2334token (SCHEME_P) 2283token (SCHEME_P)
2335{ 2284{
2336 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2337 2286
2338 if (c == EOF) 2287 if (c == EOF)
… …
2436} 2385}
2437 2386
2438/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2439#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2440 2389
2441static void 2390ecb_cold static void
2442printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2443{ 2392{
2444 int i; 2393 int i;
2445 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2446 2395
… …
2502 2451
2503 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2504} 2453}
2505 2454
2506/* print atoms */ 2455/* print atoms */
2507static void 2456ecb_cold static void
2508printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2509{ 2458{
2510 char *p; 2459 char *p;
2511 int len; 2460 int len;
2512 2461
2513 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2514 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2515} 2464}
2516 2465
2517/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2518static void 2467ecb_cold static void
2519atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2520{ 2469{
2521 char *p; 2470 char *p;
2522 2471
2523 if (l == NIL) 2472 if (l == NIL)
… …
2730 return car (d); 2679 return car (d);
2731 2680
2732 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2733 q = p; 2682 q = p;
2734 2683
2735 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2736 { 2685 {
2737 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2738 2687
2739 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2740 p = cdr (d); 2689 p = cdr (d);
2741 } 2690 }
2742 2691
2743 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2744 return q; 2693 return q;
2745} 2694}
2746 2695
2747/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2748static pointer 2697ecb_hot static pointer
2749reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2750{ 2699{
2751 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2752 pointer p = NIL; 2701 pointer p = NIL;
2753 2702
… …
2756 2705
2757 return p; 2706 return p;
2758} 2707}
2759 2708
2760/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2761static pointer 2710ecb_hot static pointer
2762reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2763{ 2712{
2764 pointer result = term; 2713 pointer result = term;
2765 pointer p = list; 2714 pointer p = list;
2766 2715
… …
2774 2723
2775 return result; 2724 return result;
2776} 2725}
2777 2726
2778/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2779static pointer 2728ecb_hot static pointer
2780revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2781{ 2730{
2782 pointer result = a; 2731 pointer result = a;
2783 pointer p = b; 2732 pointer p = b;
2784 2733
… …
2793 2742
2794 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2795} 2744}
2796 2745
2797/* equivalence of atoms */ 2746/* equivalence of atoms */
2798int 2747ecb_hot int
2799eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2800{ 2749{
2801 if (is_string (a)) 2750 if (is_string (a))
2802 { 2751 {
2803 if (is_string (b)) 2752 if (is_string (b))
… …
2897 } 2846 }
2898 else 2847 else
2899 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2900} 2849}
2901 2850
2902static pointer 2851ecb_hot static pointer
2903find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2904{ 2853{
2905 pointer x, y; 2854 pointer x, y;
2906 2855
2907 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
… …
2928 return NIL; 2877 return NIL;
2929} 2878}
2930 2879
2931#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2932 2881
2933ecb_inline void 2882static void
2934new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2935{ 2884{
2936 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2937 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2938} 2887}
2939 2888
2940ecb_inline void 2889static void
2941new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2890new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2942{ 2891{
2943 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2944} 2893}
2945 2894
2946static pointer 2895ecb_hot static pointer
2947find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2948{ 2897{
2949 pointer x, y; 2898 pointer x, y;
2950 2899
2951 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2965 return NIL; 2914 return NIL;
2966} 2915}
2967 2916
2968#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2969 2918
2970ecb_inline void 2919static void
2971new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2972{ 2921{
2973 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2974 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2923 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2975} 2924}
2976 2925
2977ecb_inline void 2926static void
2978set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2979{ 2928{
2980 set_cdr (slot, value); 2929 set_cdr (slot, value);
2981} 2930}
2982 2931
2983ecb_inline pointer 2932static pointer
2984slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2985{ 2934{
2986 return cdr (slot); 2935 return cdr (slot);
2987} 2936}
2988 2937
2989/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
2990 2939
2991static int 2940ecb_cold static int
2992xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
2993{ 2942{
2994#if USE_ERROR_HOOK
2995 pointer x;
2996 pointer hdl = SCHEME_V->ERROR_HOOK;
2997#endif
2998
2999#if USE_PRINTF 2943#if USE_PRINTF
3000#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
3001 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
3002 2946
3003 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
3018 } 2962 }
3019#endif 2963#endif
3020#endif 2964#endif
3021 2965
3022#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
3023 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2967 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
3024 2968
3025 if (x != NIL) 2969 if (x != NIL)
3026 { 2970 {
3027 pointer code = a 2971 pointer code = a
3028 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3072 pointer code; 3016 pointer code;
3073}; 3017};
3074 3018
3075# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3076 3020
3077static void 3021ecb_hot static void
3078s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3079{ 3023{
3080 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3081 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3082 3026
3083 /* enough room for the next frame? */ 3027 /* enough room for the next frame? */
3084 if (nframes >= SCHEME_V->dump_size) 3028 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3085 { 3029 {
3086 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3087 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3088 } 3032 }
3089 3033
… …
3095 next_frame->code = code; 3039 next_frame->code = code;
3096 3040
3097 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3098} 3042}
3099 3043
3100static int 3044static ecb_hot int
3101xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3102{ 3046{
3103 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3104 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3105 3049
… …
3116 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3117 3061
3118 return 0; 3062 return 0;
3119} 3063}
3120 3064
3121ecb_inline void 3065ecb_cold void
3122dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3123{ 3067{
3124 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3125 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3126} 3070}
3127 3071
3128ecb_inline void 3072ecb_cold void
3129dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3130{ 3074{
3131 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3132 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3133 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3134} 3078}
3135 3079
3136static void 3080ecb_cold static void
3137dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3138{ 3082{
3139 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3140 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3141 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3142 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3143} 3087}
3144 3088
3145static void 3089ecb_cold static void
3146dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3147{ 3091{
3148 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3149 int i; 3093 int i;
3150 3094
… …
3156 mark (frame->envir); 3100 mark (frame->envir);
3157 mark (frame->code); 3101 mark (frame->code);
3158 } 3102 }
3159} 3103}
3160 3104
3161static pointer 3105ecb_cold static pointer
3162ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3163{ 3107{
3164 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3165 int i; 3109 int i;
3166 3110
… …
3178 } 3122 }
3179 3123
3180 return cont; 3124 return cont;
3181} 3125}
3182 3126
3183static void 3127ecb_cold static void
3184ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3185{ 3129{
3186 int i = 0; 3130 int i = 0;
3187 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3188 3132
… …
3200 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3201} 3145}
3202 3146
3203#else 3147#else
3204 3148
3205ecb_inline void 3149ecb_cold void
3206dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3207{ 3151{
3208 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3209} 3153}
3210 3154
3211ecb_inline void 3155ecb_cold void
3212dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3213{ 3157{
3214 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3215} 3159}
3216 3160
3217static void 3161ecb_cold static void
3218dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3219{ 3163{
3220 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3221} 3165}
3222 3166
3223static int 3167ecb_hot static int
3224xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3225{ 3169{
3226 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3227 3171
3228 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3238 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3239 3183
3240 return 0; 3184 return 0;
3241} 3185}
3242 3186
3243static void 3187ecb_hot static void
3244s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3245{ 3189{
3246 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3247 cons (args, 3191 cons (args,
3248 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3249 cons (code, 3193 cons (code,
3250 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3251} 3195}
3252 3196
3253static void 3197ecb_cold static void
3254dump_stack_mark (SCHEME_P) 3198dump_stack_mark (SCHEME_P)
3255{ 3199{
3256 mark (SCHEME_V->dump); 3200 mark (SCHEME_V->dump);
3257} 3201}
3258 3202
3259static pointer 3203ecb_cold static pointer
3260ss_get_cont (SCHEME_P) 3204ss_get_cont (SCHEME_P)
3261{ 3205{
3262 return SCHEME_V->dump; 3206 return SCHEME_V->dump;
3263} 3207}
3264 3208
3265static void 3209ecb_cold static void
3266ss_set_cont (SCHEME_P_ pointer cont) 3210ss_set_cont (SCHEME_P_ pointer cont)
3267{ 3211{
3268 SCHEME_V->dump = cont; 3212 SCHEME_V->dump = cont;
3269} 3213}
3270 3214
3271#endif 3215#endif
3272 3216
3273#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3274 3218
3275#if EXPERIMENT 3219#if EXPERIMENT
3220
3276static int 3221static int
3277debug (SCHEME_P_ int indent, pointer x) 3222dtree (SCHEME_P_ int indent, pointer x)
3278{ 3223{
3279 int c; 3224 int c;
3280 3225
3281 if (is_syntax (x)) 3226 if (is_syntax (x))
3282 { 3227 {
… …
3300 printf ("%*sS<%s>\n", indent, "", symname (x)); 3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3301 return 24+8; 3246 return 24+8;
3302 3247
3303 case T_CLOSURE: 3248 case T_CLOSURE:
3304 printf ("%*sS<%s>\n", indent, "", "closure"); 3249 printf ("%*sS<%s>\n", indent, "", "closure");
3305 debug (SCHEME_A_ indent + 3, cdr(x)); 3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3306 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3307 3252
3308 case T_PAIR: 3253 case T_PAIR:
3309 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3310 c = debug (SCHEME_A_ indent + 3, car (x)); 3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3311 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3312 return c + 1; 3257 return c + 1;
3313 3258
3314 case T_PORT: 3259 case T_PORT:
3315 printf ("%*sS<%s>\n", indent, "", "port"); 3260 printf ("%*sS<%s>\n", indent, "", "port");
3316 return 24+8; 3261 return 24+8;
… …
3319 printf ("%*sS<%s>\n", indent, "", "vector"); 3264 printf ("%*sS<%s>\n", indent, "", "vector");
3320 return 24+8; 3265 return 24+8;
3321 3266
3322 case T_ENVIRONMENT: 3267 case T_ENVIRONMENT:
3323 printf ("%*sS<%s>\n", indent, "", "environment"); 3268 printf ("%*sS<%s>\n", indent, "", "environment");
3324 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3325 3270
3326 default: 3271 default:
3327 printf ("unhandled type %d\n", type (x)); 3272 printf ("unhandled type %d\n", type (x));
3328 break; 3273 break;
3329 } 3274 }
3330} 3275}
3331#endif
3332 3276
3277#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3278
3279typedef void *stream[1];
3280
3281#define stream_init() { 0 }
3282#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3283#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3284#define stream_free(s) free (s[0])
3285
3286ecb_cold static void
3287stream_put (stream s, uint8_t byte)
3288{
3289 uint32_t *sp = *s;
3290 uint32_t size = sizeof (uint32_t) * 2;
3291 uint32_t offs = size;
3292
3293 if (ecb_expect_true (sp))
3294 {
3295 offs = sp[0];
3296 size = sp[1];
3297 }
3298
3299 if (ecb_expect_false (offs == size))
3300 {
3301 size *= 2;
3302 sp = realloc (sp, size);
3303 *s = sp;
3304 sp[1] = size;
3305
3306 }
3307
3308 ((uint8_t *)sp)[offs++] = byte;
3309 sp[0] = offs;
3310}
3311
3312ecb_cold static void
3313stream_put_v (stream s, uint32_t v)
3314{
3315 while (v > 0x7f)
3316 {
3317 stream_put (s, v | 0x80);
3318 v >>= 7;
3319 }
3320
3321 stream_put (s, v);
3322}
3323
3324ecb_cold static void
3325stream_put_tv (stream s, int bop, uint32_t v)
3326{
3327 printf ("put tv %d %d\n", bop, v);//D
3328 stream_put (s, bop);
3329 stream_put_v (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_stream (stream s, stream o)
3334{
3335 uint32_t i;
3336
3337 for (i = 0; i < stream_size (o); ++i)
3338 stream_put (s, stream_data (o)[i]);
3339
3340 stream_free (o);
3341}
3342
3343// calculates a (preferably small) integer that makes it possible to find
3344// the symbol again. if pointers were offsets into a memory area... until
3345// then, we return segment number in the low bits, and offset in the high
3346// bits.
3347// also, this function must never return 0.
3348ecb_cold static uint32_t
3349symbol_id (SCHEME_P_ pointer sym)
3350{
3351 struct cell *p = CELL (sym);
3352 int i;
3353
3354 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3355 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3356 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3357
3358 abort ();
3359}
3360
3361ecb_cold static uint32_t
3362cell_id (SCHEME_P_ pointer p)
3363{
3364 return symbol_id (SCHEME_A_ p);
3365}
3366
3367enum byteop
3368{
3369 BOP_NIL,
3370 BOP_SYNTAX,
3371 BOP_INTEGER,
3372 BOP_SYMBOL,
3373 BOP_LIST_BEG,
3374 BOP_LIST_END,
3375 BOP_BIFT, // branch if true
3376 BOP_BIFF, // branch if false
3377 BOP_BIFNE, // branch if not eqv?
3378 BOP_BRA, // "short" branch
3379 BOP_JMP, // "long" jump
3380 BOP_DATUM,
3381 BOP_LET,
3382 BOP_LETAST,
3383 BOP_LETREC,
3384 BOP_DEFINE,
3385 BOP_MACRO,
3386 BOP_SET,
3387 BOP_BEGIN,
3388 BOP_LAMBDA,
3389};
3390
3391ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3392
3393ecb_cold static void
3394compile_list (SCHEME_P_ stream s, pointer x)
3395{
3396 for (; x != NIL; x = cdr (x))
3397 compile_expr (SCHEME_A_ s, car (x));
3398}
3399
3333static int 3400static void
3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3402{
3403 //TODO: borked
3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3405
3406 stream_put (s, BOP_BIFF);
3407 compile_expr (SCHEME_A_ s, cond);
3408 stream_put_v (s, stream_size (sift));
3409 stream_put_stream (s, sift);
3410
3411 if (iff != NIL)
3412 {
3413 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3414 stream_put_tv (s, BOP_BRA, stream_size (siff));
3415 stream_put_stream (s, siff);
3416 }
3417}
3418
3419typedef uint32_t stream_fixup;
3420
3421static stream_fixup
3422stream_put_fixup (stream s)
3423{
3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3428}
3429
3430static void
3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3432{
3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3437}
3438
3439static void
3440compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3441{
3442 if (cdr (x) == NIL)
3443 compile_expr (SCHEME_A_ s, car (x));
3444 else
3445 {
3446 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3447 compile_expr (SCHEME_A_ s, car (x));
3448 stream_fixup end = stream_put_fixup (s);
3449
3450 compile_and_or (SCHEME_A_ s, and, cdr (x));
3451 stream_fix_fixup (s, end, stream_size (s));
3452 }
3453}
3454
3455ecb_cold static void
3456compile_expr (SCHEME_P_ stream s, pointer x)
3457{
3458 if (x == NIL)
3459 {
3460 stream_put (s, BOP_NIL);
3461 return;
3462 }
3463
3464 if (is_pair (x))
3465 {
3466 pointer head = car (x);
3467
3468 if (is_syntax (head))
3469 {
3470 x = cdr (x);
3471
3472 switch (syntaxnum (head))
3473 {
3474 case OP_IF0: /* if */
3475 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3476 break;
3477
3478 case OP_OR0: /* or */
3479 compile_and_or (SCHEME_A_ s, 0, x);
3480 break;
3481
3482 case OP_AND0: /* and */
3483 compile_and_or (SCHEME_A_ s, 1, x);
3484 break;
3485
3486 case OP_CASE0: /* case */
3487 abort ();
3488 break;
3489
3490 case OP_COND0: /* cond */
3491 abort ();
3492 break;
3493
3494 case OP_LET0: /* let */
3495 case OP_LET0AST: /* let* */
3496 case OP_LET0REC: /* letrec */
3497 switch (syntaxnum (head))
3498 {
3499 case OP_LET0: stream_put (s, BOP_LET ); break;
3500 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3501 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3502 }
3503
3504 {
3505 pointer bindings = car (x);
3506 pointer body = cadr (x);
3507
3508 for (x = bindings; x != NIL; x = cdr (x))
3509 {
3510 pointer init = NIL;
3511 pointer var = car (x);
3512
3513 if (is_pair (var))
3514 {
3515 init = cdr (var);
3516 var = car (var);
3517 }
3518
3519 stream_put_v (s, symbol_id (SCHEME_A_ var));
3520 compile_expr (SCHEME_A_ s, init);
3521 }
3522
3523 stream_put_v (s, 0);
3524 compile_expr (SCHEME_A_ s, body);
3525 }
3526 break;
3527
3528 case OP_DEF0: /* define */
3529 case OP_MACRO0: /* macro */
3530 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3531 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3532 compile_expr (SCHEME_A_ s, cadr (x));
3533 break;
3534
3535 case OP_SET0: /* set! */
3536 stream_put (s, BOP_SET);
3537 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3538 compile_expr (SCHEME_A_ s, cadr (x));
3539 break;
3540
3541 case OP_BEGIN: /* begin */
3542 stream_put (s, BOP_BEGIN);
3543 compile_list (SCHEME_A_ s, x);
3544 return;
3545
3546 case OP_DELAY: /* delay */
3547 abort ();
3548 break;
3549
3550 case OP_QUOTE: /* quote */
3551 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3552 break;
3553
3554 case OP_LAMBDA: /* lambda */
3555 {
3556 pointer formals = car (x);
3557 pointer body = cadr (x);
3558
3559 stream_put (s, BOP_LAMBDA);
3560
3561 for (; is_pair (formals); formals = cdr (formals))
3562 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3563
3564 stream_put_v (s, 0);
3565 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3566
3567 compile_expr (SCHEME_A_ s, body);
3568 }
3569 break;
3570
3571 case OP_C0STREAM:/* cons-stream */
3572 abort ();
3573 break;
3574 }
3575
3576 return;
3577 }
3578
3579 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3580
3581 if (m != NIL)
3582 {
3583 m = slot_value_in_env (m);
3584
3585 if (is_macro (m))
3586 {
3587 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3588 SCHEME_V->code = m;
3589 SCHEME_V->args = cons (x, NIL);
3590 Eval_Cycle (SCHEME_A_ OP_APPLY);
3591 x = SCHEME_V->value;
3592 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3593 return;
3594 }
3595 }
3596 }
3597
3598 switch (type (x))
3599 {
3600 case T_INTEGER:
3601 {
3602 IVALUE iv = ivalue_unchecked (x);
3603 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3604 stream_put_tv (s, BOP_INTEGER, iv);
3605 }
3606 return;
3607
3608 case T_SYMBOL:
3609 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3610 return;
3611
3612 case T_PAIR:
3613 stream_put (s, BOP_LIST_BEG);
3614
3615 for (; x != NIL; x = cdr (x))
3616 compile_expr (SCHEME_A_ s, car (x));
3617
3618 stream_put (s, BOP_LIST_END);
3619 return;
3620
3621 default:
3622 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3623 break;
3624 }
3625}
3626
3627ecb_cold static int
3628compile_closure (SCHEME_P_ pointer p)
3629{
3630 stream s = stream_init ();
3631
3632 compile_list (SCHEME_A_ s, cdar (p));
3633
3634 FILE *xxd = popen ("xxd", "we");
3635 fwrite (stream_data (s), 1, stream_size (s), xxd);
3636 fclose (xxd);
3637
3638 return stream_size (s);
3639}
3640
3641#endif
3642
3643/* syntax, eval, core, ... */
3644ecb_hot static int
3334opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3335{ 3646{
3336 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3337 pointer x, y; 3648 pointer x, y;
3338 3649
3339 switch (op) 3650 switch (op)
3340 { 3651 {
3341#if EXPERIMENT //D 3652#if EXPERIMENT //D
3342 case OP_DEBUG: 3653 case OP_DEBUG:
3343 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3344 printf ("\n"); 3657 printf ("\n");
3345 s_return (S_T); 3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3346#endif 3663#endif
3664
3347 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3348 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3349 { 3667 {
3350 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3668 putstr (SCHEME_A_ "Loading ");
3351 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3669 putstr (SCHEME_A_ strvalue (car (args)));
3670 putcharacter (SCHEME_A_ '\n');
3352 } 3671 }
3353 3672
3354 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3355 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3356 else 3675
3357 {
3358 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3359 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3360 }
3361 3678
3362 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3363 3680
3364 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3365 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3366 { 3683 {
3367 if (SCHEME_V->file_i == 0) 3684 if (SCHEME_V->file_i == 0)
3368 { 3685 {
3369 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3370 s_goto (OP_QUIT); 3687 s_goto (OP_QUIT);
… …
3381 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3382 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3383 { 3700 {
3384 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3385 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3386 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3387 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3388 } 3708 }
3389 3709
3390 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3391 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3426 { 3746 {
3427 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3428 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3429 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3430 } 3750 }
3431 else 3751
3432 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3433 3753
3434 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3435#if USE_TRACING 3755#if USE_TRACING
3436 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3437 { 3757 {
… …
3448#endif 3768#endif
3449 if (is_symbol (SCHEME_V->code)) /* symbol */ 3769 if (is_symbol (SCHEME_V->code)) /* symbol */
3450 { 3770 {
3451 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3771 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3452 3772
3453 if (x != NIL) 3773 if (x == NIL)
3454 s_return (slot_value_in_env (x));
3455 else
3456 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3774 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3775
3776 s_return (slot_value_in_env (x));
3457 } 3777 }
3458 else if (is_pair (SCHEME_V->code)) 3778 else if (is_pair (SCHEME_V->code))
3459 { 3779 {
3460 x = car (SCHEME_V->code); 3780 x = car (SCHEME_V->code);
3461 3781
… …
3470 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3790 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3471 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3472 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3473 } 3793 }
3474 } 3794 }
3475 else 3795
3476 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3477 3797
3478 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3479 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3480 { 3800 {
3481 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3482 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3483 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3484 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3485 } 3805 }
3486 else 3806
3487 {
3488 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3489 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3490 }
3491 3809
3492 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3493 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3494 3812
3495 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3506 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3507 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3508 } 3826 }
3509 3827
3510#if USE_TRACING 3828#if USE_TRACING
3511
3512 case OP_TRACING: 3829 case OP_TRACING:
3513 { 3830 {
3514 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3515 3832
3516 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3517 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3518 } 3835 }
3519
3520#endif 3836#endif
3521 3837
3522 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3523#if USE_TRACING 3839#if USE_TRACING
3524 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3538 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3854 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3539 else if (is_foreign (SCHEME_V->code)) 3855 else if (is_foreign (SCHEME_V->code))
3540 { 3856 {
3541 /* Keep nested calls from GC'ing the arglist */ 3857 /* Keep nested calls from GC'ing the arglist */
3542 push_recent_alloc (SCHEME_A_ args, NIL); 3858 push_recent_alloc (SCHEME_A_ args, NIL);
3543 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3859 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3544 3860
3545 s_return (x); 3861 s_return (x);
3546 } 3862 }
3547 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3863 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3548 { 3864 {
… …
3578 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3579 { 3895 {
3580 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3581 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3582 } 3898 }
3583 else 3899
3584 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3585 3901
3586 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3587 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3588 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3589 3905
… …
3653 else 3969 else
3654 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3970 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3655 3971
3656 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3657 3973
3658
3659 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3660 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3661 3976
3662 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3663 x = cadr (args); 3978 x = cadr (args);
… …
3681 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3682 } 3997 }
3683 else 3998 else
3684 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3685 4000
3686
3687 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3688 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3689 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3690 4004
3691 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3702 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3703 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3704 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3705 else 4019 else
3706 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4020 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4021
3707 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3708 4023
3709 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3710 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3711 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3712 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4027 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3713 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3714 4029
3715 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3716 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3717 4033
3718 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3719 { 4035 {
3720 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4036 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3721 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4037 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3722 4038
3723 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3724 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3725 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3726 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3727 } 4043 }
3728 else /* end */ 4044
3729 { 4045 /* end */
3730 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3731 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3732 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3733 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3734 }
3735 4050
3736 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3737 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3738 4053
3739 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4054 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3743 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3744 { 4059 {
3745 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4060 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3746 { 4061 {
3747 if (!is_pair (x)) 4062 if (!is_pair (x))
3748 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3749 4064
3750 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3751 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3752 4067
3753 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3754 } 4069 }
3755 4070
3756 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4071 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3773 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3774 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3775 } 4090 }
3776 4091
3777 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4092 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3778 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4093 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3779 4094
3780 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4095 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3781 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3782 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3783 4098
… …
3794 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3795 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3796 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3797 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3798 } 4113 }
3799 else /* end */ 4114
4115 /* end */
3800 { 4116
3801 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3802 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3803 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3804 }
3805 4120
3806 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3807 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3808 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3809 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3810 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3811 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3812 4127
3813 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3814 args = cons (SCHEME_V->value, args);
3815
3816 if (is_pair (SCHEME_V->code)) /* continue */
3817 {
3818 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3819 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3820
3821 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3822 SCHEME_V->code = cadar (SCHEME_V->code);
3823 SCHEME_V->args = NIL;
3824 s_goto (OP_EVAL);
3825 }
3826 else /* end */
3827 {
3828 args = reverse_in_place (SCHEME_A_ NIL, args);
3829 SCHEME_V->code = car (args);
3830 SCHEME_V->args = cdr (args);
3831 s_goto (OP_LET2REC);
3832 }
3833 4129
3834 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3835 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4131 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3836 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3837 4133
… …
3867 } 4163 }
3868 else 4164 else
3869 { 4165 {
3870 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3871 s_return (NIL); 4167 s_return (NIL);
3872 else 4168
3873 {
3874 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3875 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3876 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3877 }
3878 } 4172 }
3879 4173
3880 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3881 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4175 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3882 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3893 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3894 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3895 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3896 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3897 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3898 else 4192
3899 {
3900 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3901 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3902 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3903 }
3904 4196
3905 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3906 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3907 s_return (S_F); 4199 s_return (S_F);
3908 4200
… …
3913 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3914 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3915 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3916 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3917 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3918 else 4210
3919 {
3920 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3921 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3922 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3923 }
3924 4214
3925 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3926 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3927 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3928 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3993 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3994 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3995 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3996 } 4286 }
3997 } 4287 }
3998 else 4288
3999 s_return (NIL); 4289 s_return (NIL);
4000 4290
4001 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
4002 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
4003 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
4004 else 4294
4005 s_return (NIL); 4295 s_return (NIL);
4006 4296
4007 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
4008 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
4009 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4010 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
4024 } 4314 }
4025 4315
4026 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
4027} 4317}
4028 4318
4029static int 4319/* math, cxr */
4320ecb_hot static int
4030opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4031{ 4322{
4032 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
4033 pointer x = car (args); 4324 pointer x = car (args);
4034 num v; 4325 num v;
4035 4326
4036 switch (op) 4327 switch (op)
4037 { 4328 {
4038#if USE_MATH 4329#if USE_MATH
4039 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
4040 {
4041 if (is_integer (x)) 4331 if (!is_integer (x))
4042 s_return (x); 4332 {
4043
4044 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
4045 4334
4046 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
4047 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4048 else 4337 else
4049 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
4050 } 4339 }
4051 4340
4341 s_return (x);
4342
4343 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4344 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4345 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4346 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4347
4348 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4052 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4349 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4053 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4350 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4351 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4054 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4352 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4055 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4353 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4056 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4354 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4057 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4355 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4058 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4356 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4059 4357
4060 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
4061 if (cdr (args) == NIL) 4360 cdr (args) == NIL
4062 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
4063 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
4064 {
4065 pointer y = cadr (args);
4066 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4067 }
4068
4069 case OP_SQRT:
4070 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4071 4363
4072 case OP_EXPT: 4364 case OP_EXPT:
4073 { 4365 {
4074 RVALUE result; 4366 RVALUE result;
4075 int real_result = 1; 4367 int real_result = 1;
… …
4098 if (real_result) 4390 if (real_result)
4099 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4100 else 4392 else
4101 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4102 } 4394 }
4103
4104 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4105 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4106
4107 case OP_TRUNCATE:
4108 {
4109 RVALUE n = rvalue (x);
4110 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4111 }
4112
4113 case OP_ROUND:
4114 if (is_integer (x))
4115 s_return (x);
4116
4117 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4118#endif 4395#endif
4119 4396
4120 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4121 v = num_zero; 4398 v = num_zero;
4122 4399
… …
4424 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4425 4702
4426 s_return (newstr); 4703 s_return (newstr);
4427 } 4704 }
4428 4705
4429 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4430 { 4707 {
4431 char *str = strvalue (x); 4708 char *str = strvalue (x);
4432 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4433 int index1; 4710 int index1;
4434 int len; 4711 int len;
4435 4712
4436 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4437 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4438 4715
4439 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4440 { 4717 {
4441 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4442 4719
4443 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4444 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4445 } 4722 }
4446 else 4723 else
4447 index1 = strlength (x); 4724 index1 = strlength (x);
4448 4725
4449 len = index1 - index0; 4726 len = index1 - index0;
4450 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4451 memcpy (strvalue (x), str + index0, len);
4452 strvalue (x)[len] = 0;
4453 4728
4454 s_return (x); 4729 s_return (x);
4455 } 4730 }
4456 4731
4457 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4531 } 4806 }
4532 4807
4533 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4534} 4809}
4535 4810
4536static int 4811/* relational ops */
4812ecb_hot static int
4537opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4538{ 4814{
4539 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4540 4816
4541 for (;;) 4817 for (;;)
… …
4562 } 4838 }
4563 4839
4564 s_return (S_T); 4840 s_return (S_T);
4565} 4841}
4566 4842
4567static int 4843/* predicates */
4844ecb_hot static int
4568opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4569{ 4846{
4570 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4571 pointer a = car (args); 4848 pointer a = car (args);
4572 pointer d = cdr (args); 4849 pointer d = cdr (args);
… …
4619 } 4896 }
4620 4897
4621 s_retbool (r); 4898 s_retbool (r);
4622} 4899}
4623 4900
4624static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4625opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4626{ 4904{
4627 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4628 pointer a = car (args); 4906 pointer a = car (args);
4629 pointer x, y; 4907 pointer x, y;
… …
4642 } 4920 }
4643 else 4921 else
4644 s_return (SCHEME_V->code); 4922 s_return (SCHEME_V->code);
4645 4923
4646 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4647 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4648 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4649 4927
4650#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4651 4932
4652 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4653 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4654 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4655 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4669 else 4950 else
4670 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4671 4952
4672 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4673 4954
4955 //TODO: move to scheme
4674 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4675 if (is_pair (args)) 4957 if (is_pair (args))
4676 { 4958 {
4677 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4678 { 4960 {
… …
4680 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4681 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4682 } 4964 }
4683 } 4965 }
4684 4966
4685 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4686 s_return (S_T); 4968 s_return (S_T);
4687#endif 4969#endif
4688 4970
4689 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4690 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4699 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4700 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4701 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4702 4984
4703 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4704 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4705 4987
4706 if (args != NIL) 4988 if (args != NIL)
4707 { 4989 {
4708 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4709 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4710 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4711 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4712 } 4994 }
4713 else 4995 else
4714 { 4996 {
4715 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4716 4998
4717 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4718 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4719 else 5001 else
4720 return -1; 5002 return -1;
… …
4797 SCHEME_V->gc_verbose = (a != S_F); 5079 SCHEME_V->gc_verbose = (a != S_F);
4798 s_retbool (was); 5080 s_retbool (was);
4799 } 5081 }
4800 5082
4801 case OP_NEWSEGMENT: /* new-segment */ 5083 case OP_NEWSEGMENT: /* new-segment */
5084#if 0
4802 if (!is_pair (args) || !is_number (a)) 5085 if (!is_pair (args) || !is_number (a))
4803 Error_0 ("new-segment: argument must be a number"); 5086 Error_0 ("new-segment: argument must be a number");
4804 5087#endif
4805 alloc_cellseg (SCHEME_A_ ivalue (a)); 5088 s_retbool (alloc_cellseg (SCHEME_A));
4806
4807 s_return (S_T);
4808 5089
4809 case OP_OBLIST: /* oblist */ 5090 case OP_OBLIST: /* oblist */
4810 s_return (oblist_all_symbols (SCHEME_A)); 5091 s_return (oblist_all_symbols (SCHEME_A));
4811 5092
4812#if USE_PORTS 5093#if USE_PORTS
… …
4882 s_return (p == NIL ? S_F : p); 5163 s_return (p == NIL ? S_F : p);
4883 } 5164 }
4884 5165
4885 case OP_GET_OUTSTRING: /* get-output-string */ 5166 case OP_GET_OUTSTRING: /* get-output-string */
4886 { 5167 {
4887 port *p; 5168 port *p = port (a);
4888 5169
4889 if ((p = a->object.port)->kind & port_string) 5170 if (p->kind & port_string)
4890 { 5171 {
4891 off_t size; 5172 off_t size;
4892 char *str; 5173 char *str;
4893 5174
4894 size = p->rep.string.curr - p->rep.string.start + 1; 5175 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4929 } 5210 }
4930 5211
4931 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4932} 5213}
4933 5214
4934static int 5215/* reading */
5216ecb_cold static int
4935opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4936{ 5218{
4937 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4938 pointer x; 5220 pointer x;
4939 5221
… …
4999 int res; 5281 int res;
5000 5282
5001 if (is_pair (args)) 5283 if (is_pair (args))
5002 p = car (args); 5284 p = car (args);
5003 5285
5004 res = p->object.port->kind & port_string; 5286 res = port (p)->kind & port_string;
5005 5287
5006 s_retbool (res); 5288 s_retbool (res);
5007 } 5289 }
5008 5290
5009 case OP_SET_INPORT: /* set-input-port */ 5291 case OP_SET_INPORT: /* set-input-port */
… …
5018 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
5019 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
5020 { 5302 {
5021 case TOK_EOF: 5303 case TOK_EOF:
5022 s_return (S_EOF); 5304 s_return (S_EOF);
5023 /* NOTREACHED */
5024 5305
5025 case TOK_VEC: 5306 case TOK_VEC:
5026 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5027 /* fall through */ 5308 /* fall through */
5028 5309
… …
5031 5312
5032 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
5033 s_return (NIL); 5314 s_return (NIL);
5034 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
5035 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
5036 else 5317
5037 {
5038 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
5039 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
5040 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
5041 }
5042 5321
5043 case TOK_QUOTE: 5322 case TOK_QUOTE:
5044 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5045 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
5046 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
5052 { 5331 {
5053 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5054 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
5055 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
5056 } 5335 }
5057 else 5336
5058 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5059
5060 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
5061 5339
5062 case TOK_COMMA: 5340 case TOK_COMMA:
5063 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5064 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
5075 case TOK_DOTATOM: 5353 case TOK_DOTATOM:
5076 SCHEME_V->strbuff[0] = '.'; 5354 SCHEME_V->strbuff[0] = '.';
5077 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5355 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5078 5356
5079 case TOK_STRATOM: 5357 case TOK_STRATOM:
5358 //TODO: haven't checked whether the garbage collector could interfere and free x
5359 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5080 x = readstrexp (SCHEME_A_ '|'); 5360 x = readstrexp (SCHEME_A_ '|');
5081 //TODO: haven't checked whether the garbage collector could interfere
5082 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5083 5362
5084 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
5085 x = readstrexp (SCHEME_A_ '"'); 5364 x = readstrexp (SCHEME_A_ '"');
5086 5365
… …
5094 { 5373 {
5095 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5374 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5096 5375
5097 if (f == NIL) 5376 if (f == NIL)
5098 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
5099 else 5378
5100 {
5101 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5102 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
5103 }
5104 } 5381 }
5105 5382
5106 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
5107 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5384 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5108 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
5109 else 5386
5110 s_return (x); 5387 s_return (x);
5111 5388
5112 default: 5389 default:
5113 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5114 } 5391 }
5115 5392
… …
5208 pointer b = cdr (args); 5485 pointer b = cdr (args);
5209 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5210 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5211 5488
5212 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5213 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5214 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5215 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5216 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5217 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5218 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5219 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5220 else 5497 else
5221 { 5498 {
5222 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5223 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5224 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5225 } 5502 }
5226 5503
5227 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5229 5506
5230 case OP_P1LIST: 5507 case OP_P1LIST:
5231 if (is_pair (args)) 5508 if (is_pair (args))
5232 { 5509 {
5233 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5234 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5235 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5236 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5237 } 5514 }
5238 else if (is_vector (args)) 5515 else if (is_vector (args))
5239 { 5516 {
… …
5247 { 5524 {
5248 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5249 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5250 } 5527 }
5251 5528
5252 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5253 s_return (S_T); 5530 s_return (S_T);
5254 } 5531 }
5255 5532
5256 case OP_PVECFROM: 5533 case OP_PVECFROM:
5257 { 5534 {
… …
5259 pointer vec = car (args); 5536 pointer vec = car (args);
5260 int len = veclength (vec); 5537 int len = veclength (vec);
5261 5538
5262 if (i == len) 5539 if (i == len)
5263 { 5540 {
5264 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5265 s_return (S_T); 5542 s_return (S_T);
5266 } 5543 }
5267 else 5544 else
5268 { 5545 {
5269 pointer elem = vector_get (vec, i); 5546 pointer elem = vector_get (vec, i);
… …
5271 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5272 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5273 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5274 5551
5275 if (i > 0) 5552 if (i > 0)
5276 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5277 5554
5278 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5279 } 5556 }
5280 } 5557 }
5281 } 5558 }
5282 5559
5283 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5284} 5561}
5285 5562
5286static int 5563/* list ops */
5564ecb_hot static int
5287opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5288{ 5566{
5289 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5290 pointer a = car (args); 5568 pointer a = car (args);
5291 pointer x, y; 5569 pointer x, y;
… …
5314 break; 5592 break;
5315 } 5593 }
5316 5594
5317 if (is_pair (y)) 5595 if (is_pair (y))
5318 s_return (car (y)); 5596 s_return (car (y));
5319 else 5597
5320 s_return (S_F); 5598 s_return (S_F);
5321
5322 5599
5323 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5324 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5325 5602
5326 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5327 s_return (S_F); 5604 s_return (S_F);
5328 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5329 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5330 else if (is_macro (SCHEME_V->args)) 5607
5331 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5332 else
5333 s_return (S_F); 5608 s_return (S_F);
5334 5609
5335 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5336 /* 5611 /*
5337 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5338 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
… …
5349 5624
5350/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5625/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5351typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5352 5627
5353typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5354static int 5629
5630ecb_hot static int
5355tst_any (pointer p) 5631tst_any (pointer p)
5356{ 5632{
5357 return 1; 5633 return 1;
5358} 5634}
5359 5635
5360static int 5636ecb_hot static int
5361tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5362{ 5638{
5363 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5364} 5640}
5365 5641
5366static int 5642ecb_hot static int
5367tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5368{ 5644{
5369 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5370} 5646}
5371 5647
… …
5414#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5415#include "opdefines.h" 5691#include "opdefines.h"
5416#undef OP_DEF 5692#undef OP_DEF
5417; 5693;
5418 5694
5419static const char * 5695ecb_cold static const char *
5420opname (int idx) 5696opname (int idx)
5421{ 5697{
5422 const char *name = opnames; 5698 const char *name = opnames;
5423 5699
5424 /* should do this at compile time, but would require external program, right? */ 5700 /* should do this at compile time, but would require external program, right? */
… …
5426 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5427 5703
5428 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5429} 5705}
5430 5706
5431static const char * 5707ecb_cold static const char *
5432procname (pointer x) 5708procname (pointer x)
5433{ 5709{
5434 return opname (procnum (x)); 5710 return opname (procnum (x));
5435} 5711}
5436 5712
… …
5456#undef OP_DEF 5732#undef OP_DEF
5457 {0} 5733 {0}
5458}; 5734};
5459 5735
5460/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5461static void ecb_hot 5737ecb_hot static void
5462Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5463{ 5739{
5464 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5465 5741
5466 for (;;) 5742 for (;;)
… …
5549 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5825 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5550 return; 5826 return;
5551 5827
5552 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5828 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5553 { 5829 {
5554 xwrstr ("No memory!\n"); 5830 putstr (SCHEME_A_ "No memory!\n");
5555 return; 5831 return;
5556 } 5832 }
5557 } 5833 }
5558} 5834}
5559 5835
5560/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5561 5837
5562static void 5838ecb_cold static void
5563assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5564{ 5840{
5565 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5566 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5567} 5843}
5568 5844
5569static void 5845ecb_cold static void
5570assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5571{ 5847{
5572 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5573 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5574 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5582 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5583 return y; 5859 return y;
5584} 5860}
5585 5861
5586/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5862/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5587static int 5863ecb_hot static int
5588syntaxnum (pointer p) 5864syntaxnum (pointer p)
5589{ 5865{
5590 const char *s = strvalue (p); 5866 const char *s = strvalue (p);
5591 5867
5592 switch (strlength (p)) 5868 switch (strlength (p))
… …
5699 SCHEME_V->save_inport = NIL; 5975 SCHEME_V->save_inport = NIL;
5700 SCHEME_V->loadport = NIL; 5976 SCHEME_V->loadport = NIL;
5701 SCHEME_V->nesting = 0; 5977 SCHEME_V->nesting = 0;
5702 SCHEME_V->interactive_repl = 0; 5978 SCHEME_V->interactive_repl = 0;
5703 5979
5704 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5980 if (!alloc_cellseg (SCHEME_A))
5705 { 5981 {
5706#if USE_ERROR_CHECKING 5982#if USE_ERROR_CHECKING
5707 SCHEME_V->no_memory = 1; 5983 SCHEME_V->no_memory = 1;
5708 return 0; 5984 return 0;
5709#endif 5985#endif
5710 } 5986 }
5711 5987
5712 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5713 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5714 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5715 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5716 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5717 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5718 5995
5719 /* init NIL */ 5996 /* init NIL */
5720 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5721 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5777 6054
5778 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5779} 6056}
5780 6057
5781#if USE_PORTS 6058#if USE_PORTS
5782void 6059ecb_cold void
5783scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5784{ 6061{
5785 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5786} 6063}
5787 6064
5788void 6065ecb_cold void
5789scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6066scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5790{ 6067{
5791 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6068 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5792} 6069}
5793 6070
5794void 6071ecb_cold void
5795scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5796{ 6073{
5797 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5798} 6075}
5799 6076
5800void 6077ecb_cold void
5801scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6078scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5802{ 6079{
5803 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6080 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5804} 6081}
5805#endif 6082#endif
5806 6083
5807void 6084ecb_cold void
5808scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5809{ 6086{
5810 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5811} 6088}
5812 6089
… …
5844 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5845 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5846 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5847 6124
5848 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5849 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5850 6127
5851#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5852 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5853 {
5854 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5855 { 6131 {
5856 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5857 6133
5858 if (fname) 6134 if (fname)
5859 free (fname); 6135 free (fname);
5860 } 6136 }
5861 }
5862#endif 6137#endif
5863} 6138}
5864 6139
5865void 6140ecb_cold void
5866scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5867{ 6142{
5868 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5869} 6144}
5870 6145
5871void 6146ecb_cold void
5872scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5873{ 6148{
5874 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5875 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5876 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5877 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5878 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5879 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5880#if USE_PORTS
5881 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5882#endif
5883 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5884 6157
5885#if USE_PORTS
5886 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5887 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5888#endif
5889 6160
5890#if USE_PORTS 6161#if USE_PORTS
5891#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5892 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5893 6164
… …
5897#endif 6168#endif
5898 6169
5899 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5900 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5901 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5902 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5903 6175
5904 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5905 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5906} 6178}
5907 6179
5908void 6180ecb_cold void
5909scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5910{ 6182{
6183#if USE_PORTs
5911 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5912 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5913 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5914 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5915 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6188 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5916 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6189 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5917 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5918#if USE_PORTS
5919 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5920#endif
5921 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5922 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5923 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5924 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5925 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5926 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5927 6198
5928 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5929 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5930} 6204}
5931 6205
5932void 6206ecb_cold void
5933scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5934{ 6208{
5935 pointer x; 6209 pointer x;
5936 6210
5937 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5942 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5943} 6217}
5944 6218
5945#if !STANDALONE 6219#if !STANDALONE
5946 6220
5947void 6221ecb_cold void
5948scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5949{ 6223{
5950 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6224 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5951} 6225}
5952 6226
5953void 6227ecb_cold void
5954scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5955{ 6229{
5956 int i; 6230 int i;
5957 6231
5958 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5959 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5960} 6234}
5961 6235
5962pointer 6236ecb_cold pointer
5963scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5964{ 6238{
5965 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6239 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5966} 6240}
5967 6241
5968void 6242ecb_cold void
5969save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5970{ 6244{
5971 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5972 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5973 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5977 /* Truncate the dump stack so TS will return here when done, not 6251 /* Truncate the dump stack so TS will return here when done, not
5978 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5979 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5980} 6254}
5981 6255
5982void 6256ecb_cold void
5983restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5984{ 6258{
5985 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5986 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5987 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5988 /* Pop */ 6262 /* Pop */
5989 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5990} 6264}
5991 6265
5992/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5993pointer 6267ecb_cold pointer
5994scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5995{ 6269{
5996 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5997 6271
5998 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
6005 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
6006 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
6007 return SCHEME_V->value; 6281 return SCHEME_V->value;
6008} 6282}
6009 6283
6010pointer 6284ecb_cold pointer
6011scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
6012{ 6286{
6013 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
6014 6288
6015 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
6027 6301
6028/* ========== Main ========== */ 6302/* ========== Main ========== */
6029 6303
6030#if STANDALONE 6304#if STANDALONE
6031 6305
6032int 6306ecb_cold int
6033main (int argc, char **argv) 6307main (int argc, char **argv)
6034{ 6308{
6035# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
6036 scheme ssc; 6310 scheme ssc;
6037 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
6039# endif 6313# endif
6040 int fin; 6314 int fin;
6041 char *file_name = InitFile; 6315 char *file_name = InitFile;
6042 int retcode; 6316 int retcode;
6043 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
6044 system ("ps v $PPID");//D 6319 system ("ps v $PPID");
6320#endif
6045 6321
6046 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6047 { 6323 {
6048 xwrstr ("Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6049 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6050 xwrstr ("followed by\n"); 6326 putstr (SCHEME_A_ "followed by\n");
6051 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6327 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6052 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6053 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6329 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6054 xwrstr ("Use - as filename for stdin.\n"); 6330 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6055 return 1; 6331 return 1;
6056 } 6332 }
6057 6333
6058 if (!scheme_init (SCHEME_A)) 6334 if (!scheme_init (SCHEME_A))
6059 { 6335 {
6060 xwrstr ("Could not initialize!\n"); 6336 putstr (SCHEME_A_ "Could not initialize!\n");
6061 return 2; 6337 return 2;
6062 } 6338 }
6063 6339
6064# if USE_PORTS 6340# if USE_PORTS
6065 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6341 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6078 } 6354 }
6079#endif 6355#endif
6080 6356
6081 do 6357 do
6082 { 6358 {
6083#if USE_PORTS
6084 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
6085 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
6086 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6361 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6087 { 6362 {
6088 pointer args = NIL; 6363 pointer args = NIL;
… …
6106 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6381 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6107 6382
6108 } 6383 }
6109 else 6384 else
6110 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
6111#endif
6112 6386
6113 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
6114 { 6388 {
6115 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6389 putstr (SCHEME_A_ "Could not open file ");
6390 putstr (SCHEME_A_ file_name);
6391 putcharacter (SCHEME_A_ '\n');
6116 } 6392 }
6117 else 6393 else
6118 { 6394 {
6119 if (isfile) 6395 if (isfile)
6120 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6121 else 6397 else
6122 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6123 6399
6124#if USE_PORTS
6125 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6126 { 6401 {
6127 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6128 { 6403 {
6129 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6404 putstr (SCHEME_A_ "Errors encountered reading ");
6405 putstr (SCHEME_A_ file_name);
6406 putcharacter (SCHEME_A_ '\n');
6130 } 6407 }
6131 6408
6132 if (isfile) 6409 if (isfile)
6133 close (fin); 6410 close (fin);
6134 } 6411 }
6135#endif
6136 } 6412 }
6137 6413
6138 file_name = *argv++; 6414 file_name = *argv++;
6139 } 6415 }
6140 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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