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.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.70 by root, Mon Dec 7 22:13:31 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
35#include "ecb.h"
36
33#include <sys/types.h> 37#include <sys/types.h>
34#include <sys/stat.h> 38#include <sys/stat.h>
35#include <fcntl.h> 39#include <fcntl.h>
36 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
37#include <string.h> 47#include <string.h>
38#include <stdlib.h>
39 48
40#include <limits.h> 49#include <limits.h>
41#include <inttypes.h> 50#include <inttypes.h>
42#include <float.h> 51#include <float.h>
43//#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
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
44 68
45enum { 69enum {
46 TOK_EOF, 70 TOK_EOF,
47 TOK_LPAREN, 71 TOK_LPAREN,
48 TOK_RPAREN, 72 TOK_RPAREN,
49 TOK_DOT, 73 TOK_DOT,
50 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 77 TOK_QUOTE,
52 TOK_DQUOTE, 78 TOK_DQUOTE,
53 TOK_BQUOTE, 79 TOK_BQUOTE,
54 TOK_COMMA, 80 TOK_COMMA,
55 TOK_ATMARK, 81 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
58 TOK_VEC 84 TOK_VEC
59}; 85};
60 86
61#define BACKQUOTE '`' 87#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
63 90
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69 96
70#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
71static scheme sc; 98static scheme sc;
72#endif 99#endif
73 100
74static void 101ecb_cold static void
75xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
76{ 103{
77 if (n < 0) 104 if (n < 0)
78 { 105 {
79 *s++ = '-'; 106 *s++ = '-';
… …
81 } 108 }
82 109
83 char *p = s; 110 char *p = s;
84 111
85 do { 112 do {
86 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
87 n /= base; 114 n /= base;
88 } while (n); 115 } while (n);
89 116
90 *p-- = 0; 117 *p-- = 0;
91 118
… …
94 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
95 --p; ++s; 122 --p; ++s;
96 } 123 }
97} 124}
98 125
99static void 126ecb_cold static void
100xnum (char *s, long n) 127xnum (char *s, long n)
101{ 128{
102 xbase (s, n, 10); 129 xbase (s, n, 10);
103} 130}
104 131
105static void 132ecb_cold static void
106xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
107{
108 write (1, s, strlen (s));
109}
110
111static void
112xwrnum (long n)
113{ 134{
114 char buf[64]; 135 char buf[64];
115 136
116 xnum (buf, n); 137 xnum (buf, n);
117 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
118} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
119 144
120static char 145static char
121xtoupper (char c) 146xtoupper (char c)
122{ 147{
123 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
143 168
144#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
147 172
148#if USE_STRLWR 173#endif
174
175#if USE_IGNORECASE
149static const char * 176ecb_cold static const char *
150strlwr (char *s) 177xstrlwr (char *s)
151{ 178{
152 const char *p = s; 179 const char *p = s;
153 180
154 while (*s) 181 while (*s)
155 { 182 {
… …
157 s++; 184 s++;
158 } 185 }
159 186
160 return p; 187 return p;
161} 188}
162#endif
163 189
190#define stricmp(a,b) strcasecmp (a, b)
191#define strlwr(s) xstrlwr (s)
192
193#else
164#define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 195# define strlwr(s) (s)
196#endif
166 197
167#ifndef prompt 198#ifndef prompt
168# define prompt "ts> " 199# define prompt "ms> "
169#endif 200#endif
170 201
171#ifndef InitFile 202#ifndef InitFile
172# define InitFile "init.scm" 203# define InitFile "init.scm"
173#endif 204#endif
174 205
175#ifndef FIRST_CELLSEGS
176# define FIRST_CELLSEGS 3
177#endif
178
179enum scheme_types 206enum scheme_types
180{ 207{
208 T_INTEGER,
209 T_CHARACTER,
181 T_FREE, 210 T_REAL,
182 T_STRING, 211 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 212 T_SYMBOL,
185 T_PROC, 213 T_PROC,
186 T_PAIR, 214 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
188 T_CONTINUATION, 218 T_CONTINUATION,
189 T_FOREIGN, 219 T_FOREIGN,
190 T_CHARACTER,
191 T_PORT, 220 T_PORT,
192 T_VECTOR, 221 T_VECTOR,
193 T_MACRO,
194 T_PROMISE, 222 T_PROMISE,
195 T_ENVIRONMENT, 223 T_ENVIRONMENT,
196 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
197 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
198}; 227};
199 228
200#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
201#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
202#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
203#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
205 234
206static num num_add (num a, num b); 235/* num, for generic arithmetic */
207static num num_mul (num a, num b); 236struct num
208static num num_div (num a, num b); 237{
238 IVALUE ivalue;
239#if USE_REAL
240 RVALUE rvalue;
241 char is_fixnum;
242#endif
243};
244
245#if USE_REAL
246# define num_is_fixnum(n) (n).is_fixnum
247# define num_set_fixnum(n,f) (n).is_fixnum = (f)
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).rvalue
250# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).rvalue = (r)
252#else
253# define num_is_fixnum(n) 1
254# define num_set_fixnum(n,f) 0
255# define num_ivalue(n) (n).ivalue
256# define num_rvalue(n) (n).ivalue
257# define num_set_ivalue(n,i) (n).ivalue = (i)
258# define num_set_rvalue(n,r) (n).ivalue = (r)
259#endif
260
261enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
262
263static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 265static num num_rem (num a, num b);
212static num num_mod (num a, num b); 266static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 267
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
223
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 269
230static num num_zero; 270static num num_zero;
231static num num_one; 271static num num_one;
232 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
233/* macros for cell operations */ 277/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
237 281
238INTERFACE INLINE int 282INTERFACE int
239is_string (pointer p) 283is_string (pointer p)
240{ 284{
241 return type (p) == T_STRING; 285 return type (p) == T_STRING;
242} 286}
243 287
244#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
246 290
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 291INTERFACE int
249is_vector (pointer p) 292is_vector (pointer p)
250{ 293{
251 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
252} 295}
253 296
254#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 302
261INTERFACE uint32_t 303INTERFACE int
262vector_length (pointer vec) 304is_integer (pointer p)
263{ 305{
264 return vec->object.vector.length; 306 return type (p) == T_INTEGER;
265} 307}
266 308
309/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 310INTERFACE int
311is_real (pointer p)
312{
313 return type (p) == T_REAL;
314}
315
316INTERFACE int
268is_number (pointer p) 317is_number (pointer p)
269{ 318{
270 return type (p) == T_NUMBER; 319 return is_integer (p) || is_real (p);
271} 320}
272 321
273INTERFACE INLINE int 322INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 323is_character (pointer p)
293{ 324{
294 return type (p) == T_CHARACTER; 325 return type (p) == T_CHARACTER;
295} 326}
296 327
297INTERFACE INLINE char * 328INTERFACE char *
298string_value (pointer p) 329string_value (pointer p)
299{ 330{
300 return strvalue (p); 331 return strvalue (p);
301} 332}
302 333
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 334#define ivalue_unchecked(p) (CELL(p)->object.ivalue + 0)
335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
336
334#if USE_REAL 337#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 340#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
340# define set_num_integer(p) 0 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 343#endif
344
343INTERFACE long 345INTERFACE long
344charvalue (pointer p) 346charvalue (pointer p)
345{ 347{
346 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
347} 349}
348 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
349INTERFACE INLINE int 353INTERFACE int
350is_port (pointer p) 354is_port (pointer p)
351{ 355{
352 return type (p) == T_PORT; 356 return type (p) == T_PORT;
353} 357}
354 358
355INTERFACE INLINE int 359INTERFACE int
356is_inport (pointer p) 360is_inport (pointer p)
357{ 361{
358 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
359} 363}
360 364
361INTERFACE INLINE int 365INTERFACE int
362is_outport (pointer p) 366is_outport (pointer p)
363{ 367{
364 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
365} 369}
366 370
367INTERFACE INLINE int 371INTERFACE int
368is_pair (pointer p) 372is_pair (pointer p)
369{ 373{
370 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
371} 375}
372 376
373#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
375 379
376#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 384
381#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
384 390
385INTERFACE void 391INTERFACE void
386set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
387{ 393{
388 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
389} 395}
390 396
391INTERFACE void 397INTERFACE void
392set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
393{ 399{
394 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
395} 401}
396 402
397INTERFACE pointer 403INTERFACE pointer
398pair_car (pointer p) 404pair_car (pointer p)
399{ 405{
… …
404pair_cdr (pointer p) 410pair_cdr (pointer p)
405{ 411{
406 return cdr (p); 412 return cdr (p);
407} 413}
408 414
409INTERFACE INLINE int 415INTERFACE int
410is_symbol (pointer p) 416is_symbol (pointer p)
411{ 417{
412 return type (p) == T_SYMBOL; 418 return type (p) == T_SYMBOL;
413} 419}
414 420
415INTERFACE INLINE char * 421INTERFACE char *
416symname (pointer p) 422symname (pointer p)
417{ 423{
418 return strvalue (car (p)); 424 return strvalue (p);
419} 425}
420 426
421#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 430SCHEME_EXPORT int
423hasprop (pointer p) 431hasprop (pointer p)
424{ 432{
425 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
426} 434}
427
428# define symprop(p) cdr(p)
429#endif 435#endif
430 436
431INTERFACE INLINE int 437INTERFACE int
432is_syntax (pointer p) 438is_syntax (pointer p)
433{ 439{
434 return typeflag (p) & T_SYNTAX; 440 return typeflag (p) & T_SYNTAX;
435} 441}
436 442
437INTERFACE INLINE int 443INTERFACE int
438is_proc (pointer p) 444is_proc (pointer p)
439{ 445{
440 return type (p) == T_PROC; 446 return type (p) == T_PROC;
441} 447}
442 448
443INTERFACE INLINE int 449INTERFACE int
444is_foreign (pointer p) 450is_foreign (pointer p)
445{ 451{
446 return type (p) == T_FOREIGN; 452 return type (p) == T_FOREIGN;
447} 453}
448 454
449INTERFACE INLINE char * 455INTERFACE char *
450syntaxname (pointer p) 456syntaxname (pointer p)
451{ 457{
452 return strvalue (car (p)); 458 return strvalue (p);
453} 459}
454 460
455#define procnum(p) ivalue (p) 461#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 462static const char *procname (pointer x);
457 463
458INTERFACE INLINE int 464INTERFACE int
459is_closure (pointer p) 465is_closure (pointer p)
460{ 466{
461 return type (p) == T_CLOSURE; 467 return type (p) == T_CLOSURE;
462} 468}
463 469
464INTERFACE INLINE int 470INTERFACE int
465is_macro (pointer p) 471is_macro (pointer p)
466{ 472{
467 return type (p) == T_MACRO; 473 return type (p) == T_MACRO;
468} 474}
469 475
470INTERFACE INLINE pointer 476INTERFACE pointer
471closure_code (pointer p) 477closure_code (pointer p)
472{ 478{
473 return car (p); 479 return car (p);
474} 480}
475 481
476INTERFACE INLINE pointer 482INTERFACE pointer
477closure_env (pointer p) 483closure_env (pointer p)
478{ 484{
479 return cdr (p); 485 return cdr (p);
480} 486}
481 487
482INTERFACE INLINE int 488INTERFACE int
483is_continuation (pointer p) 489is_continuation (pointer p)
484{ 490{
485 return type (p) == T_CONTINUATION; 491 return type (p) == T_CONTINUATION;
486} 492}
487 493
488#define cont_dump(p) cdr (p) 494#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 495#define set_cont_dump(p,v) set_cdr ((p), (v))
490 496
491/* To do: promise should be forced ONCE only */ 497/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 498INTERFACE int
493is_promise (pointer p) 499is_promise (pointer p)
494{ 500{
495 return type (p) == T_PROMISE; 501 return type (p) == T_PROMISE;
496} 502}
497 503
498INTERFACE INLINE int 504INTERFACE int
499is_environment (pointer p) 505is_environment (pointer p)
500{ 506{
501 return type (p) == T_ENVIRONMENT; 507 return type (p) == T_ENVIRONMENT;
502} 508}
503 509
… …
505 511
506#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
507#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
508#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
509 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
510#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
513 525
514INTERFACE INLINE int 526INTERFACE int
515is_immutable (pointer p) 527is_immutable (pointer p)
516{ 528{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 530}
519 531
520INTERFACE INLINE void 532INTERFACE void
521setimmutable (pointer p) 533setimmutable (pointer p)
522{ 534{
523#if USE_ERROR_CHECKING 535#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 536 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 537#endif
526} 538}
527 539
540/* Result is:
541 proper list: length
542 circular list: -1
543 not even a pair: -2
544 dotted list: -2 minus length before dot
545*/
546ecb_hot INTERFACE int
547list_length (SCHEME_P_ pointer a)
548{
549 int i = 0;
550 pointer slow, fast;
551
552 slow = fast = a;
553
554 while (1)
555 {
556 if (fast == NIL)
557 return i;
558
559 if (!is_pair (fast))
560 return -2 - i;
561
562 fast = cdr (fast);
563 ++i;
564
565 if (fast == NIL)
566 return i;
567
568 if (!is_pair (fast))
569 return -2 - i;
570
571 ++i;
572 fast = cdr (fast);
573
574 /* Safe because we would have already returned if `fast'
575 encountered a non-pair. */
576 slow = cdr (slow);
577
578 if (fast == slow)
579 {
580 /* the fast pointer has looped back around and caught up
581 with the slow pointer, hence the structure is circular,
582 not of finite length, and therefore not a list */
583 return -1;
584 }
585 }
586}
587
588INTERFACE int
589is_list (SCHEME_P_ pointer a)
590{
591 return list_length (SCHEME_A_ a) >= 0;
592}
593
528#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
529static INLINE int 595
596ecb_inline int
530Cisalpha (int c) 597Cisalpha (int c)
531{ 598{
532 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
533} 600}
534 601
535static INLINE int 602ecb_inline int
536Cisdigit (int c) 603Cisdigit (int c)
537{ 604{
538 return isascii (c) && isdigit (c); 605 return isascii (c) && isdigit (c);
539} 606}
540 607
541static INLINE int 608ecb_inline int
542Cisspace (int c) 609Cisspace (int c)
543{ 610{
544 return isascii (c) && isspace (c); 611 return isascii (c) && isspace (c);
545} 612}
546 613
547static INLINE int 614ecb_inline int
548Cisupper (int c) 615Cisupper (int c)
549{ 616{
550 return isascii (c) && isupper (c); 617 return isascii (c) && isupper (c);
551} 618}
552 619
553static INLINE int 620ecb_inline int
554Cislower (int c) 621Cislower (int c)
555{ 622{
556 return isascii (c) && islower (c); 623 return isascii (c) && islower (c);
557} 624}
558#endif 625#endif
… …
591 "gs", 658 "gs",
592 "rs", 659 "rs",
593 "us" 660 "us"
594}; 661};
595 662
596static int 663ecb_cold static int
597is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
598{ 665{
599 int i; 666 int i;
600 667
601 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
619#endif 686#endif
620 687
621static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
626static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed);
629static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
630static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
631static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
632static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
633static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
634static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
635 701
702static pointer mk_port (SCHEME_P_ port *p);
703
636#if USE_PORTS 704#if USE_PORTS
637static pointer mk_port (SCHEME_P_ port *p);
638static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
639static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
640static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
641static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
642static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
643static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
644static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
645#endif 712#endif
713
646static void mark (pointer a); 714static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 720static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
654static int token (SCHEME_P); 722static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
656static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
657static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 730static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 731static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 732static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 733static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 734static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 735static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
736static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 737static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 738static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 739static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 740static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 741static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 742static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 743static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 744static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 745static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 746
747static IVALUE
748ivalue (pointer x)
749{
750 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
751}
752
753static RVALUE
754rvalue (pointer x)
755{
756 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
757}
758
759INTERFACE num
760nvalue (pointer x)
761{
762 num n;
763
764 num_set_fixnum (n, is_integer (x));
765
766 if (num_is_fixnum (n))
767 num_set_ivalue (n, ivalue_unchecked (x));
768 else
769 num_set_rvalue (n, rvalue_unchecked (x));
770
771 return n;
772}
773
678static num 774static num
679num_add (num a, num b) 775num_op (enum num_op op, num a, num b)
680{ 776{
681 num ret; 777 num ret;
682 778
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 779 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 780
685 if (num_is_fixnum (ret)) 781 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 782 {
783 switch (op)
784 {
785 case NUM_ADD: a.ivalue += b.ivalue; break;
786 case NUM_SUB: a.ivalue -= b.ivalue; break;
787 case NUM_MUL: a.ivalue *= b.ivalue; break;
788 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
789 }
790
791 num_set_ivalue (ret, a.ivalue);
792 }
793#if USE_REAL
687 else 794 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 795 {
796 switch (op)
797 {
798 case NUM_ADD: a.rvalue += b.rvalue; break;
799 case NUM_SUB: a.rvalue -= b.rvalue; break;
800 case NUM_MUL: a.rvalue *= b.rvalue; break;
801 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
802 }
689 803
690 return ret; 804 num_set_rvalue (ret, a.rvalue);
691} 805 }
692 806#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 807
705 return ret; 808 return ret;
706} 809}
707 810
708static num 811static num
709num_div (num a, num b) 812num_div (num a, num b)
710{ 813{
711 num ret; 814 num ret;
712 815
713 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 816 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
714 817
715 if (num_is_fixnum (ret)) 818 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 819 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 820 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 821 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 822
750 return ret; 823 return ret;
751} 824}
752 825
753static num 826static num
… …
755{ 828{
756 num ret; 829 num ret;
757 long e1, e2, res; 830 long e1, e2, res;
758 831
759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 832 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
760 e1 = num_get_ivalue (a); 833 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 834 e2 = num_ivalue (b);
762 res = e1 % e2; 835 res = e1 % e2;
763 836
764 /* remainder should have same sign as second operand */ 837 /* remainder should have same sign as second operand */
765 if (res > 0) 838 if (res > 0)
766 { 839 {
… …
782{ 855{
783 num ret; 856 num ret;
784 long e1, e2, res; 857 long e1, e2, res;
785 858
786 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 859 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
787 e1 = num_get_ivalue (a); 860 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 861 e2 = num_ivalue (b);
789 res = e1 % e2; 862 res = e1 % e2;
790 863
791 /* modulo should have same sign as second operand */ 864 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 865 if (res * e2 < 0)
793 res += e2; 866 res += e2;
794 867
795 num_set_ivalue (ret, res); 868 num_set_ivalue (ret, res);
796 return ret; 869 return ret;
797} 870}
798 871
872/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 873static int
800num_eq (num a, num b) 874num_cmp (num a, num b)
801{ 875{
876 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 877 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 878
805 if (is_fixnum) 879 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 880 {
881 IVALUE av = num_ivalue (a);
882 IVALUE bv = num_ivalue (b);
883
884 ret = av == bv ? 0 : av < bv ? -1 : +1;
885 }
807 else 886 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 887 {
888 RVALUE av = num_rvalue (a);
889 RVALUE bv = num_rvalue (b);
890
891 ret = av == bv ? 0 : av < bv ? -1 : +1;
892 }
809 893
810 return ret; 894 return ret;
811} 895}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852}
853
854#if USE_MATH
855
856/* Round to nearest. Round to even if midway */
857static double
858round_per_R5RS (double x)
859{
860 double fl = floor (x);
861 double ce = ceil (x);
862 double dfl = x - fl;
863 double dce = ce - x;
864
865 if (dfl > dce)
866 return ce;
867 else if (dfl < dce)
868 return fl;
869 else
870 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
872 return fl;
873 else
874 return ce;
875 }
876}
877#endif
878 896
879static int 897static int
880is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
881{ 899{
900 return x == 0;
901#if 0
882#if USE_REAL 902#if USE_REAL
883 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 903 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
884#else 904#else
885 return x == 0; 905 return x == 0;
886#endif 906#endif
907#endif
887} 908}
888 909
889/* allocate new cell segment */ 910/* allocate new cell segment */
890static int 911ecb_cold static int
891alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
892{ 913{
893 pointer newp; 914 struct cell *newp;
894 pointer last; 915 struct cell *last;
895 pointer p; 916 struct cell *p;
896 char *cp; 917 char *cp;
897 long i; 918 long i;
898 int k; 919 int k;
899 920
900 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
901 segsize <<= 1; 922 segsize <<= 1;
902 923
903 for (k = 0; k < n; k++)
904 {
905 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
906 return k;
907
908 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
909 925
910 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
911 return k; 927 return k;
912 928
913 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp;
915 930
916 /* insert new segment in address order */ 931 newp = (struct cell *)cp;
917 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 935 last = newp + segsize - 1;
937 936
938 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
939 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
940 set_typeflag (p, T_FREE); 941 set_typeflag (cp, T_PAIR);
941 set_car (p, NIL); 942 set_car (cp, NIL);
942 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
943 } 944 }
944 945
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954 948
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 }
962
963 return n; 949 return 1;
964} 950}
965 951
966/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 953ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 955{
970 if (SCHEME_V->free_cell == NIL) 956 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 957 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 959 return S_SINK;
974 960
975 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
976 { 962 {
977 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
978 964
979 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
980 966
981 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
982 { 968 {
983 /* if only a few recovered, get more to avoid fruitless gc's */ 969 /* if only a few recovered, get more to avoid fruitless gc's */
984 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
985 { 971 {
986#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
987 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
988 return S_SINK; 974 return S_SINK;
989#endif 975#endif
… …
1001 } 987 }
1002} 988}
1003 989
1004/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
1005 Tehom */ 991 Tehom */
1006 992ecb_hot static void
1007static void
1008push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1009{ 994{
1010 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1011 996
1012 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
1014 set_car (holder, recent); 999 set_car (holder, recent);
1015 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
1016 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
1017} 1002}
1018 1003
1019static pointer 1004ecb_hot static pointer
1020get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1021{ 1006{
1022 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1023 1008
1024 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1033} 1018}
1034 1019
1035static pointer 1020static pointer
1036get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1037{ 1022{
1038 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1039 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
1040 1025
1041 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
1042 return S_SINK; 1027 return S_SINK;
1043 1028
1044 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1031
1047 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1049 fill_vector (v, init); 1034 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1036
1052 return v; 1037 return v;
1053} 1038}
1054 1039
1055static INLINE void 1040ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1041ok_to_freely_gc (SCHEME_P)
1057{ 1042{
1058 set_car (S_SINK, NIL); 1043 set_car (S_SINK, NIL);
1059} 1044}
1060 1045
… …
1062static void 1047static void
1063check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1064{ 1049{
1065 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1066 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1067 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1068 1053
1069 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1070 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1071} 1056}
1072 1057
1073static void 1058static void
1074check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1075{ 1060{
… …
1081#endif 1066#endif
1082 1067
1083/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1084 1069
1085/* get new cons cell */ 1070/* get new cons cell */
1086pointer 1071ecb_hot static pointer
1087xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1088{ 1073{
1089 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1090 1075
1091 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1092
1093 if (immutable)
1094 setimmutable (x);
1095 1077
1096 set_car (x, a); 1078 set_car (x, a);
1097 set_cdr (x, b); 1079 set_cdr (x, b);
1098 1080
1099 return x; 1081 return x;
1100} 1082}
1101 1083
1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1096generate_symbol (SCHEME_P_ const char *name)
1097{
1098 pointer x = mk_string (SCHEME_A_ name);
1099 setimmutable (x);
1100 set_typeflag (x, T_SYMBOL | T_ATOM);
1101 return x;
1102}
1103
1102/* ========== oblist implementation ========== */ 1104/* ========== oblist implementation ========== */
1103 1105
1104#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1105 1107
1108static int
1106static int hash_fn (const char *key, int table_size); 1109hash_fn (const char *key, int table_size)
1110{
1111 const unsigned char *p = (unsigned char *)key;
1112 uint32_t hash = 2166136261U;
1107 1113
1114 while (*p)
1115 hash = (hash ^ *p++) * 16777619;
1116
1117 return hash % table_size;
1118}
1119
1108static pointer 1120ecb_cold static pointer
1109oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1110{ 1122{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1112} 1124}
1113 1125
1114/* returns the new symbol */ 1126/* returns the new symbol */
1115static pointer 1127ecb_cold static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1129{
1118 int location; 1130 pointer x = generate_symbol (SCHEME_A_ name);
1119
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x));
1123
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1133 return x;
1127} 1134}
1128 1135
1129static INLINE pointer 1136ecb_cold static pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1138{
1132 int location; 1139 int location;
1133 pointer x; 1140 pointer x;
1134 char *s; 1141 char *s;
1135 1142
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1143 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1144
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1145 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1146 {
1140 s = symname (car (x)); 1147 s = symname (car (x));
1141 1148
1142 /* case-insensitive, per R5RS section 2 */ 1149 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1150 if (stricmp (name, s) == 0)
… …
1145 } 1152 }
1146 1153
1147 return NIL; 1154 return NIL;
1148} 1155}
1149 1156
1150static pointer 1157ecb_cold static pointer
1151oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1152{ 1159{
1153 int i; 1160 int i;
1154 pointer x; 1161 pointer x;
1155 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
1156 1163
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1165 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1166 ob_list = cons (x, ob_list);
1160 1167
1161 return ob_list; 1168 return ob_list;
1162} 1169}
1163 1170
1164#else 1171#else
1165 1172
1166static pointer 1173ecb_cold static pointer
1167oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1168{ 1175{
1169 return NIL; 1176 return NIL;
1170} 1177}
1171 1178
1172static INLINE pointer 1179ecb_cold static pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1181{
1175 pointer x; 1182 pointer x;
1176 char *s; 1183 char *s;
1177 1184
… …
1186 1193
1187 return NIL; 1194 return NIL;
1188} 1195}
1189 1196
1190/* returns the new symbol */ 1197/* returns the new symbol */
1191static pointer 1198ecb_cold static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1200{
1194 pointer x; 1201 pointer x = generate_symbol (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x));
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1203 return x;
1201} 1204}
1202 1205
1203static pointer 1206ecb_cold static pointer
1204oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1205{ 1208{
1206 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1207} 1210}
1208 1211
1209#endif 1212#endif
1210 1213
1211#if USE_PORTS
1212static pointer 1214ecb_cold static pointer
1213mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1214{ 1216{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1218
1217 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1218 x->object.port = p; 1220 set_port (x, p);
1219 1221
1220 return x; 1222 return x;
1221} 1223}
1222#endif
1223 1224
1224pointer 1225ecb_cold pointer
1225mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1226{ 1227{
1227 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1228 1229
1229 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1230 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1231 1232
1232 return x; 1233 return x;
1233} 1234}
1234 1235
1235INTERFACE pointer 1236INTERFACE pointer
1236mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1237{ 1238{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1240
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1241 ivalue_unchecked (x) = c & 0xff; 1242 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1243
1243 return x; 1244 return x;
1244} 1245}
1245 1246
1246/* get number atom (integer) */ 1247/* get number atom (integer) */
1247INTERFACE pointer 1248INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1249mk_integer (SCHEME_P_ long n)
1249{ 1250{
1251 pointer p = 0;
1252 pointer *pp = &p;
1253
1254#if USE_INTCACHE
1255 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1256 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1257#endif
1258
1259 if (!*pp)
1260 {
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1262
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1253 ivalue_unchecked (x) = num; 1264 setimmutable (x); /* shouldn't do anything, doesn't cost anything */
1254 set_num_integer (x); 1265 set_ivalue (x, n);
1266
1267 *pp = x;
1268 }
1269
1255 return x; 1270 return *pp;
1256} 1271}
1257 1272
1258INTERFACE pointer 1273INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1260{ 1275{
1276#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1278
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1264 rvalue_unchecked (x) = n; 1280 set_rvalue (x, n);
1265 set_num_real (x); 1281
1266 return x; 1282 return x;
1283#else
1284 return mk_integer (SCHEME_A_ n);
1285#endif
1267} 1286}
1268 1287
1269static pointer 1288static pointer
1270mk_number (SCHEME_P_ const num n) 1289mk_number (SCHEME_P_ const num n)
1271{ 1290{
1291#if USE_REAL
1272 if (num_is_fixnum (n)) 1292 return num_is_fixnum (n)
1293 ? mk_integer (SCHEME_A_ num_ivalue (n))
1294 : mk_real (SCHEME_A_ num_rvalue (n));
1295#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1296 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1297#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1298}
1277 1299
1278/* allocate name to string area */ 1300/* allocate name to string area */
1279static char * 1301static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1302store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1286 SCHEME_V->no_memory = 1; 1308 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1309 return SCHEME_V->strbuff;
1288 } 1310 }
1289 1311
1290 if (str) 1312 if (str)
1291 { 1313 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1314 else
1301 {
1302 memset (q, fill, len_str); 1315 memset (q, fill, len_str);
1316
1303 q[len_str] = 0; 1317 q[len_str] = 0;
1304 }
1305 1318
1306 return q; 1319 return q;
1307} 1320}
1308 1321
1309INTERFACE pointer 1322INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1336 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1337
1325 set_typeflag (x, T_STRING | T_ATOM); 1338 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1339 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1340 strlength (x) = len;
1341
1328 return x; 1342 return x;
1329} 1343}
1330 1344
1331INTERFACE pointer 1345INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1346mk_string (SCHEME_P_ const char *str)
… …
1339{ 1353{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1354 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1355}
1342 1356
1343INTERFACE void 1357INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1358fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1359{
1346 int i; 1360 int i;
1347 1361
1348 for (i = 0; i < vec->object.vector.length; i++) 1362 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1363 vecvalue (vec)[i] = obj;
1350} 1364}
1351 1365
1366INTERFACE void
1367vector_resize (pointer vec, uint32_t newsize, pointer fill)
1368{
1369 uint32_t oldsize = veclength (vec);
1370 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1371 veclength (vec) = newsize;
1372 fill_vector (vec, oldsize, fill);
1373}
1374
1352INTERFACE pointer 1375INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1354{ 1377{
1355 return vecvalue(vec)[ielem]; 1378 return vecvalue(vec)[ielem];
1356} 1379}
1357 1380
1358INTERFACE void 1381INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1382vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1383{
1361 vecvalue(vec)[ielem] = a; 1384 vecvalue(vec)[ielem] = a;
1362} 1385}
1363 1386
1364/* get new symbol */ 1387/* get new symbol */
… …
1372 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1373 1396
1374 return x; 1397 return x;
1375} 1398}
1376 1399
1377INTERFACE pointer 1400ecb_cold INTERFACE pointer
1378gensym (SCHEME_P) 1401gensym (SCHEME_P)
1379{ 1402{
1380 pointer x; 1403 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1386 1406
1387 /* first check oblist */ 1407 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name); 1408}
1389 1409
1390 if (x == NIL) 1410static int
1391 { 1411is_gensym (SCHEME_P_ pointer x)
1392 x = oblist_add_by_name (SCHEME_A_ name); 1412{
1393 return x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1414}
1399 1415
1400/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1401static pointer 1417ecb_cold static pointer
1402mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1403{ 1419{
1404 char c, *p; 1420 char c, *p;
1405 int has_dec_point = 0; 1421 int has_dec_point = 0;
1406 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1456 } 1472 }
1457 else if ((c == 'e') || (c == 'E')) 1473 else if ((c == 'e') || (c == 'E'))
1458 { 1474 {
1459 if (!has_fp_exp) 1475 if (!has_fp_exp)
1460 { 1476 {
1461 has_dec_point = 1; /* decimal point illegal 1477 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1478 p++;
1464 1479
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1480 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1481 continue;
1467 } 1482 }
… …
1478 1493
1479 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1480} 1495}
1481 1496
1482/* make constant */ 1497/* make constant */
1483static pointer 1498ecb_cold static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1485{ 1500{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1490 return S_T; 1502 return S_T;
1491 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1492 return S_F; 1504 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1494 { 1506 {
1495 int c = 0; 1507 int c;
1496 1508
1509 // TODO: optimise
1497 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1511 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1513 c = '\n';
1501 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1502 c = '\r'; 1515 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1517 c = '\t';
1518 else if (stricmp (name + 1, "alarm") == 0)
1519 c = 0x07;
1520 else if (stricmp (name + 1, "backspace") == 0)
1521 c = 0x08;
1522 else if (stricmp (name + 1, "escape") == 0)
1523 c = 0x1b;
1524 else if (stricmp (name + 1, "delete") == 0)
1525 c = 0x7f;
1526 else if (stricmp (name + 1, "null") == 0)
1527 c = 0;
1505 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1506 { 1529 {
1507 int c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1508 1531
1509 if (c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1533 c = c1;
1511 else 1534 else
1512 return NIL; 1535 return NIL;
1513 1536 }
1514#if USE_ASCII_NAMES 1537#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1538 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1539 /* nothing */;
1519#endif 1540#endif
1520 }
1521 else if (name[2] == 0) 1541 else if (name[2] == 0)
1522 c = name[1]; 1542 c = name[1];
1523 else 1543 else
1524 return NIL; 1544 return NIL;
1525 1545
1526 return mk_character (SCHEME_A_ c); 1546 return mk_character (SCHEME_A_ c);
1527 } 1547 }
1528 else 1548 else
1529 { 1549 {
1530 /* identify base by string index */ 1550 /* identify base by string index */
1531 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x"; 1551 const char baseidx[18] = "ffbf" "ffff" "ofdf" "ffff" "x";
1532 char *base = strchr (baseidx, *name); 1552 char *base = strchr (baseidx, *name);
1533 1553
1534 if (base) 1554 if (base && *base)
1535 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx)); 1555 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1536 1556
1537 return NIL; 1557 return NIL;
1538 } 1558 }
1539} 1559}
1540 1560
1541/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1542 1581
1543/*-- 1582/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1585 * for marking.
1586 *
1587 * The exception is vectors - vectors are currently marked recursively,
1588 * which is inherited form tinyscheme and could be fixed by having another
1589 * word of context in the vector
1547 */ 1590 */
1548static void 1591ecb_hot static void
1549mark (pointer a) 1592mark (pointer a)
1550{ 1593{
1551 pointer t, q, p; 1594 pointer t, q, p;
1552 1595
1553 t = 0; 1596 t = 0;
1554 p = a; 1597 p = a;
1555E2: 1598E2:
1556 setmark (p); 1599 setmark (p);
1557 1600
1558 if (is_vector (p)) 1601 if (ecb_expect_false (is_vector (p)))
1559 { 1602 {
1560 int i; 1603 int i;
1561 1604
1562 for (i = 0; i < p->object.vector.length; i++) 1605 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1606 mark (vecvalue (p)[i]);
1564 } 1607 }
1565 1608
1566 if (is_atom (p)) 1609 if (is_atom (p))
1567 goto E6; 1610 goto E6;
… …
1610 p = q; 1653 p = q;
1611 goto E6; 1654 goto E6;
1612 } 1655 }
1613} 1656}
1614 1657
1658ecb_hot static void
1659gc_free (SCHEME_P)
1660{
1661 int i;
1662 uint32_t total = 0;
1663
1664 /* Here we scan the cells to build the free-list. */
1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1666 {
1667 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1668 struct cell *p;
1669 total += SCHEME_V->cell_segsize [i];
1670
1671 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1672 {
1673 pointer c = POINTER (p);
1674
1675 if (is_mark (c))
1676 clrmark (c);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (c) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ c);
1683 set_typeflag (c, T_PAIR);
1684 set_car (c, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (c, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = c;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1697 }
1698}
1699
1615/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1616static void 1701ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1618{ 1703{
1619 pointer p;
1620 int i; 1704 int i;
1621 1705
1622 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1624 1708
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1644 1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1734#endif
1735
1645 /* mark variables a, b */ 1736 /* mark variables a, b */
1646 mark (a); 1737 mark (a);
1647 mark (b); 1738 mark (b);
1648 1739
1649 /* garbage collect */ 1740 /* garbage collect */
1650 clrmark (NIL); 1741 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1653 1744
1654 /* free-list is kept sorted by address so as to maintain consecutive
1655 ranges, if possible, for use with vectors. Here we scan the cells
1656 (which are also kept sorted by address) downwards to build the
1657 free-list in sorted order.
1658 */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1662
1663 while (--p >= SCHEME_V->cell_seg[i])
1664 {
1665 if (is_mark (p))
1666 clrmark (p);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (p) != T_FREE)
1671 {
1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_FREE);
1674 set_car (p, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1746 putstr (SCHEME_A_ "freeing...");
1686}
1687 1747
1688static void 1748 gc_free (SCHEME_A);
1689finalize_cell (SCHEME_P_ pointer a)
1690{
1691 if (is_string (a))
1692 free (strvalue (a));
1693 else if (is_vector (a))
1694 free (vecvalue (a));
1695#if USE_PORTS
1696 else if (is_port (a))
1697 {
1698 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1699 port_close (SCHEME_A_ a, port_input | port_output);
1700
1701 free (a->object.port);
1702 }
1703#endif
1704} 1749}
1705 1750
1706/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1707 1752
1708static int 1753ecb_cold static int
1709file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1710{ 1755{
1711#if USE_PORTS
1712 int fin; 1756 int fin;
1713 1757
1714 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1715 return 0; 1759 return 0;
1716 1760
… …
1722 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1723 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1767 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1724 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1725 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1726 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1727 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1771 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1728 1772
1729#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1730 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1774 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1731 1775
1732 if (fname) 1776 if (fname)
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1734#endif 1778#endif
1735 } 1779 }
1736 1780
1737 return fin >= 0; 1781 return fin >= 0;
1738
1739#else
1740 return 1;
1741#endif
1742} 1782}
1743 1783
1744static void 1784ecb_cold static void
1745file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1746{ 1786{
1747 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1748 { 1788 {
1749 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1750#if USE_PORTS 1790#if USE_PORTS
1751 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1752#endif 1792#endif
1753 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1754 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1755 } 1795 }
1756} 1796}
1757 1797
1758static int 1798ecb_cold static int
1759file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1760{ 1800{
1761#if USE_PORTS 1801#if USE_PORTS
1762 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1763 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1764 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1765#else 1805#else
1766 return 0; 1806 return 0;
1767#endif 1807#endif
1768} 1808}
1769 1809
1770#if USE_PORTS 1810#if USE_PORTS
1771static port * 1811ecb_cold static port *
1772port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1773{ 1813{
1774 int fd; 1814 int fd;
1775 int flags; 1815 int flags;
1776 char *rw; 1816 char *rw;
… …
1799# endif 1839# endif
1800 1840
1801 return pt; 1841 return pt;
1802} 1842}
1803 1843
1804static pointer 1844ecb_cold static pointer
1805port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1806{ 1846{
1807 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1808 1848
1809 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1810 return NIL; 1850 return NIL;
1811 1851
1812 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1813} 1853}
1814 1854
1815static port * 1855ecb_cold static port *
1816port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1817{ 1857{
1818 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1819 1859
1820 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1825 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1826 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1827 return pt; 1867 return pt;
1828} 1868}
1829 1869
1830static pointer 1870ecb_cold static pointer
1831port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1832{ 1872{
1833 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1834 1874
1835 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1836 return NIL; 1876 return NIL;
1837 1877
1838 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1839} 1879}
1840 1880
1841static port * 1881ecb_cold static port *
1842port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1843{ 1883{
1844 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1845 1885
1846 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1852 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1853 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1854 return pt; 1894 return pt;
1855} 1895}
1856 1896
1857static pointer 1897ecb_cold static pointer
1858port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1859{ 1899{
1860 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1861 1901
1862 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1865 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1866} 1906}
1867 1907
1868# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1869 1909
1870static port * 1910ecb_cold static port *
1871port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1872{ 1912{
1873 char *start; 1913 char *start;
1874 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1875 1915
… …
1889 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1890 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1891 return pt; 1931 return pt;
1892} 1932}
1893 1933
1894static pointer 1934ecb_cold static pointer
1895port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1896{ 1936{
1897 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1898 1938
1899 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1900 return NIL; 1940 return NIL;
1901 1941
1902 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1903} 1943}
1904 1944
1905static void 1945ecb_cold static void
1906port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1907{ 1947{
1908 port *pt = p->object.port; 1948 port *pt = port (p);
1909 1949
1910 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1911 1951
1912 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1913 { 1953 {
… …
1930 } 1970 }
1931} 1971}
1932#endif 1972#endif
1933 1973
1934/* get new character from input file */ 1974/* get new character from input file */
1935static int 1975ecb_cold static int
1936inchar (SCHEME_P) 1976inchar (SCHEME_P)
1937{ 1977{
1938 int c; 1978 int c;
1939 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1940
1941 pt = SCHEME_V->inport->object.port;
1942 1980
1943 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1944 return EOF; 1982 return EOF;
1945 1983
1946 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1956 } 1994 }
1957 1995
1958 return c; 1996 return c;
1959} 1997}
1960 1998
1961static int ungot = -1; 1999ecb_cold static int
1962
1963static int
1964basic_inchar (port *pt) 2000basic_inchar (port *pt)
1965{ 2001{
1966#if USE_PORTS
1967 if (pt->unget != -1) 2002 if (pt->unget != -1)
1968 { 2003 {
1969 int r = pt->unget; 2004 int r = pt->unget;
1970 pt->unget = -1; 2005 pt->unget = -1;
1971 return r; 2006 return r;
1972 } 2007 }
1973 2008
2009#if USE_PORTS
1974 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1975 { 2011 {
1976 char c; 2012 char c;
1977 2013
1978 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1986 return EOF; 2022 return EOF;
1987 else 2023 else
1988 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1989 } 2025 }
1990#else 2026#else
1991 if (ungot == -1)
1992 {
1993 char c; 2027 char c;
1994 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1995 return EOF; 2030 return EOF;
1996 2031
1997 ungot = c;
1998 }
1999
2000 {
2001 int r = ungot;
2002 ungot = -1;
2003 return r; 2032 return c;
2004 }
2005#endif 2033#endif
2006} 2034}
2007 2035
2008/* back character to input buffer */ 2036/* back character to input buffer */
2009static void 2037ecb_cold static void
2010backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2011{ 2039{
2012#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2013 port *pt;
2014 2041
2015 if (c == EOF) 2042 if (c == EOF)
2016 return; 2043 return;
2017 2044
2018 pt = SCHEME_V->inport->object.port;
2019 pt->unget = c; 2045 pt->unget = c;
2020#else
2021 if (c == EOF)
2022 return;
2023
2024 ungot = c;
2025#endif
2026} 2046}
2027 2047
2028#if USE_PORTS 2048#if USE_PORTS
2029static int 2049ecb_cold static int
2030realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2031{ 2051{
2032 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2033 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2034 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2047 else 2067 else
2048 return 0; 2068 return 0;
2049} 2069}
2050#endif 2070#endif
2051 2071
2052INTERFACE void 2072ecb_cold static void
2053putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2054{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2055#if USE_PORTS 2077#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port;
2057
2058 if (pt->kind & port_file)
2059 write (pt->rep.stdio.file, s, strlen (s));
2060 else
2061 for (; *s; s++)
2062 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2063 *pt->rep.string.curr++ = *s;
2064 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2065 *pt->rep.string.curr++ = *s;
2066
2067#else
2068 xwrstr (s);
2069#endif
2070}
2071
2072static void
2073putchars (SCHEME_P_ const char *s, int len)
2074{
2075#if USE_PORTS
2076 port *pt = SCHEME_V->outport->object.port;
2077
2078 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2079 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2080 else 2080 else
2081 { 2081 {
2082 for (; len; len--) 2082 for (; len; len--)
… …
2087 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2088 } 2088 }
2089 } 2089 }
2090 2090
2091#else 2091#else
2092 write (1, s, len); 2092 write (1, s, len); // output not initialised
2093#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2094} 2100}
2095 2101
2096INTERFACE void 2102INTERFACE void
2097putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2098{ 2104{
2099#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port;
2101
2102 if (pt->kind & port_file)
2103 {
2104 char cc = c;
2105 write (pt->rep.stdio.file, &cc, 1);
2106 }
2107 else
2108 {
2109 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2110 *pt->rep.string.curr++ = c;
2111 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2112 *pt->rep.string.curr++ = c;
2113 }
2114
2115#else
2116 char cc = c; 2105 char cc = c;
2117 write (1, &c, 1); 2106
2118#endif 2107 putchars (SCHEME_A_ &cc, 1);
2119} 2108}
2120 2109
2121/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2122static char * 2111ecb_cold static char *
2123readstr_upto (SCHEME_P_ char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2113{
2125 char *p = SCHEME_V->strbuff; 2114 char *p = SCHEME_V->strbuff + skip;
2126 2115
2127 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2128 2117
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2118 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2119 *p = 0;
… …
2136 2125
2137 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2138} 2127}
2139 2128
2140/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2141static pointer 2130ecb_cold static pointer
2142readstrexp (SCHEME_P) 2131readstrexp (SCHEME_P_ char delim)
2143{ 2132{
2144 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2145 int c; 2134 int c;
2146 int c1 = 0; 2135 int c1 = 0;
2147 enum
2148 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2136 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2149 2137
2150 for (;;) 2138 for (;;)
2151 { 2139 {
2152 c = inchar (SCHEME_A); 2140 c = inchar (SCHEME_A);
2153 2141
… …
2155 return S_F; 2143 return S_F;
2156 2144
2157 switch (state) 2145 switch (state)
2158 { 2146 {
2159 case st_ok: 2147 case st_ok:
2160 switch (c) 2148 if (ecb_expect_false (c == delim))
2161 {
2162 case '\\':
2163 state = st_bsl;
2164 break;
2165
2166 case '"':
2167 *p = 0;
2168 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2149 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2169 2150
2170 default: 2151 if (ecb_expect_false (c == '\\'))
2152 state = st_bsl;
2153 else
2171 *p++ = c; 2154 *p++ = c;
2172 break;
2173 }
2174 2155
2175 break; 2156 break;
2176 2157
2177 case st_bsl: 2158 case st_bsl:
2178 switch (c) 2159 switch (c)
… …
2187 case '7': 2168 case '7':
2188 state = st_oct1; 2169 state = st_oct1;
2189 c1 = c - '0'; 2170 c1 = c - '0';
2190 break; 2171 break;
2191 2172
2173 case 'a': *p++ = '\a'; state = st_ok; break;
2174 case 'n': *p++ = '\n'; state = st_ok; break;
2175 case 'r': *p++ = '\r'; state = st_ok; break;
2176 case 't': *p++ = '\t'; state = st_ok; break;
2177
2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2186
2187 //TODO: x should end in ;, not two-digit hex
2192 case 'x': 2188 case 'x':
2193 case 'X': 2189 case 'X':
2194 state = st_x1; 2190 state = st_x1;
2195 c1 = 0; 2191 c1 = 0;
2196 break; 2192 break;
2197 2193
2198 case 'n':
2199 *p++ = '\n';
2200 state = st_ok;
2201 break;
2202
2203 case 't':
2204 *p++ = '\t';
2205 state = st_ok;
2206 break;
2207
2208 case 'r':
2209 *p++ = '\r';
2210 state = st_ok;
2211 break;
2212
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2194 default:
2219 *p++ = c; 2195 *p++ = c;
2220 state = st_ok; 2196 state = st_ok;
2221 break; 2197 break;
2222 } 2198 }
2223 2199
2224 break; 2200 break;
2225 2201
2226 case st_x1: 2202 case st_x1:
2227 case st_x2: 2203 case st_x2:
2228 c = toupper (c); 2204 c = tolower (c);
2229 2205
2230 if (c >= '0' && c <= 'F') 2206 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2207 c1 = (c1 << 4) + c - '0';
2234 else 2208 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2209 c1 = (c1 << 4) + c - 'a' + 10;
2236
2237 if (state == st_x1)
2238 state = st_x2;
2239 else
2240 {
2241 *p++ = c1;
2242 state = st_ok;
2243 }
2244 }
2245 else 2210 else
2246 return S_F; 2211 return S_F;
2212
2213 if (state == st_x1)
2214 state = st_x2;
2215 else
2216 {
2217 *p++ = c1;
2218 state = st_ok;
2219 }
2247 2220
2248 break; 2221 break;
2249 2222
2250 case st_oct1: 2223 case st_oct1:
2251 case st_oct2: 2224 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2228 backchar (SCHEME_A_ c);
2256 state = st_ok; 2229 state = st_ok;
2257 } 2230 }
2258 else 2231 else
2259 { 2232 {
2260 if (state == st_oct2 && c1 >= 32) 2233 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2234 return S_F;
2262 2235
2263 c1 = (c1 << 3) + (c - '0'); 2236 c1 = (c1 << 3) + (c - '0');
2264 2237
2265 if (state == st_oct1) 2238 if (state == st_oct1)
… …
2270 state = st_ok; 2243 state = st_ok;
2271 } 2244 }
2272 } 2245 }
2273 2246
2274 break; 2247 break;
2275
2276 } 2248 }
2277 } 2249 }
2278} 2250}
2279 2251
2280/* check c is in chars */ 2252/* check c is in chars */
2281static INLINE int 2253ecb_cold int
2282is_one_of (char *s, int c) 2254is_one_of (const char *s, int c)
2283{ 2255{
2284 if (c == EOF)
2285 return 1;
2286
2287 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2288} 2257}
2289 2258
2290/* skip white characters */ 2259/* skip white characters */
2291static INLINE int 2260ecb_cold int
2292skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2293{ 2262{
2294 int c, curr_line = 0; 2263 int c, curr_line = 0;
2295 2264
2296 do 2265 do
2297 { 2266 {
2298 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2299#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2300 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2301 curr_line++; 2271 curr_line++;
2302#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2303 } 2276 }
2304 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2305 2278
2306 /* record it */ 2279 /* record it */
2307#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2308 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2281 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2309 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2282 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2310#endif 2283#endif
2311 2284
2312 if (c != EOF)
2313 {
2314 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2315 return 1; 2286 return 1;
2316 }
2317 else
2318 return EOF;
2319} 2287}
2320 2288
2321/* get token */ 2289/* get token */
2322static int 2290ecb_cold static int
2323token (SCHEME_P) 2291token (SCHEME_P)
2324{ 2292{
2325 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2326 2294
2327 if (c == EOF) 2295 if (c == EOF)
… …
2339 return TOK_RPAREN; 2307 return TOK_RPAREN;
2340 2308
2341 case '.': 2309 case '.':
2342 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2343 2311
2344 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2345 return TOK_DOT; 2313 return TOK_DOT;
2346 else 2314 else
2347 { 2315 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2317 return TOK_DOTATOM;
2352 } 2318 }
2319
2320 case '|':
2321 return TOK_STRATOM;
2353 2322
2354 case '\'': 2323 case '\'':
2355 return TOK_QUOTE; 2324 return TOK_QUOTE;
2356 2325
2357 case ';': 2326 case ';':
… …
2424} 2393}
2425 2394
2426/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2427#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2428 2397
2429static void 2398ecb_cold static void
2430printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2431{ 2400{
2432 int i; 2401 int i;
2433 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2434 2403
… …
2489 } 2458 }
2490 2459
2491 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2492} 2461}
2493 2462
2494
2495/* print atoms */ 2463/* print atoms */
2496static void 2464ecb_cold static void
2497printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2498{ 2466{
2499 char *p; 2467 char *p;
2500 int len; 2468 int len;
2501 2469
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2504} 2472}
2505 2473
2506
2507/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2508static void 2475ecb_cold static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2477{
2511 char *p; 2478 char *p;
2512 2479
2513 if (l == NIL) 2480 if (l == NIL)
… …
2524 { 2491 {
2525 p = SCHEME_V->strbuff; 2492 p = SCHEME_V->strbuff;
2526 2493
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2494 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2495 {
2529 if (num_is_integer (l)) 2496 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2497 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2498#if USE_REAL
2532 else 2499 else
2533 { 2500 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2501 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2646 } 2613 }
2647 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2648 p = symname (l); 2615 p = symname (l);
2649 else if (is_proc (l)) 2616 else if (is_proc (l))
2650 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2651#if USE_PRINTF 2620#if USE_PRINTF
2652 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2653 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2654#else 2623#else
2655 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2656#endif 2626#endif
2657 } 2627 }
2658 else if (is_macro (l)) 2628 else if (is_macro (l))
2659 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2660 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2671#endif 2641#endif
2672 } 2642 }
2673 else if (is_continuation (l)) 2643 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2644 p = "#<CONTINUATION>";
2675 else 2645 else
2646 {
2647#if USE_PRINTF
2648 p = SCHEME_V->strbuff;
2649 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2650#else
2676 p = "#<ERROR>"; 2651 p = "#<ERROR>";
2652#endif
2653 }
2677 2654
2678 *pp = p; 2655 *pp = p;
2679 *plen = strlen (p); 2656 *plen = strlen (p);
2680} 2657}
2681 2658
… …
2713 return car (d); 2690 return car (d);
2714 2691
2715 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2716 q = p; 2693 q = p;
2717 2694
2718 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2719 { 2696 {
2720 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2721 2698
2722 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2723 p = cdr (d); 2700 p = cdr (d);
2724 } 2701 }
2725 2702
2726 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2727 return q; 2704 return q;
2728} 2705}
2729 2706
2730/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2731static pointer 2708ecb_hot static pointer
2732reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2733{ 2710{
2734 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2735 pointer p = NIL; 2712 pointer p = NIL;
2736 2713
… …
2739 2716
2740 return p; 2717 return p;
2741} 2718}
2742 2719
2743/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2744static pointer 2721ecb_hot static pointer
2745reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2746{ 2723{
2747 pointer result = term; 2724 pointer result = term;
2748 pointer p = list; 2725 pointer p = list;
2749 2726
… …
2757 2734
2758 return result; 2735 return result;
2759} 2736}
2760 2737
2761/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2762static pointer 2739ecb_hot static pointer
2763revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2764{ 2741{
2765 pointer result = a; 2742 pointer result = a;
2766 pointer p = b; 2743 pointer p = b;
2767 2744
… …
2776 2753
2777 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2778} 2755}
2779 2756
2780/* equivalence of atoms */ 2757/* equivalence of atoms */
2781int 2758ecb_hot int
2782eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2783{ 2760{
2784 if (is_string (a)) 2761 if (is_string (a))
2785 { 2762 {
2786 if (is_string (b)) 2763 if (is_string (b))
… …
2789 return 0; 2766 return 0;
2790 } 2767 }
2791 else if (is_number (a)) 2768 else if (is_number (a))
2792 { 2769 {
2793 if (is_number (b)) 2770 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2771 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2772
2797 return 0; 2773 return 0;
2798 } 2774 }
2799 else if (is_character (a)) 2775 else if (is_character (a))
2800 { 2776 {
… …
2826/* () is #t in R5RS */ 2802/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2803#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2804#define is_false(p) ((p) == S_F)
2829 2805
2830/* ========== Environment implementation ========== */ 2806/* ========== Environment implementation ========== */
2831
2832#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2833
2834static int
2835hash_fn (const char *key, int table_size)
2836{
2837 const unsigned char *p = key;
2838 uint32_t hash = 2166136261;
2839
2840 while (*p)
2841 hash = (hash ^ *p++) * 16777619;
2842
2843 return hash % table_size;
2844}
2845#endif
2846 2807
2847#ifndef USE_ALIST_ENV 2808#ifndef USE_ALIST_ENV
2848 2809
2849/* 2810/*
2850 * In this implementation, each frame of the environment may be 2811 * In this implementation, each frame of the environment may be
… …
2859{ 2820{
2860 pointer new_frame; 2821 pointer new_frame;
2861 2822
2862 /* The interaction-environment has about 300 variables in it. */ 2823 /* The interaction-environment has about 300 variables in it. */
2863 if (old_env == NIL) 2824 if (old_env == NIL)
2864 new_frame = mk_vector (SCHEME_A_ 461); 2825 new_frame = mk_vector (SCHEME_A_ 29); // was 461
2865 else 2826 else
2866 new_frame = NIL; 2827 new_frame = NIL;
2867 2828
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2829 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2830 setenvironment (SCHEME_V->envir);
2870} 2831}
2871 2832
2872static INLINE void 2833static uint32_t
2834sym_hash (pointer sym, uint32_t size)
2835{
2836 uintptr_t ptr = (uintptr_t)sym;
2837
2838#if 0
2839 /* table size is prime, so why mix */
2840 ptr += ptr >> 32;
2841 ptr += ptr >> 16;
2842 ptr += ptr >> 8;
2843#endif
2844
2845 return ptr % size;
2846}
2847
2848ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2849new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2850{
2875 pointer slot = immutable_cons (variable, value); 2851 pointer slot = immutable_cons (variable, value);
2876 2852
2877 if (is_vector (car (env))) 2853 if (is_vector (car (env)))
2878 { 2854 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2855 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2856 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2857 }
2883 else 2858 else
2884 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2885} 2860}
2886 2861
2887static pointer 2862ecb_hot static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2864{
2890 pointer x, y; 2865 pointer x, y;
2891 int location;
2892 2866
2893 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
2894 { 2868 {
2895 if (is_vector (car (x))) 2869 if (is_vector (car (x)))
2896 { 2870 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2871 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2872 y = vector_get (car (x), location);
2899 } 2873 }
2900 else 2874 else
2901 y = car (x); 2875 y = car (x);
2902 2876
2903 for (; y != NIL; y = cdr (y)) 2877 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2878 if (caar (y) == hdl)
2905 break; 2879 break;
2906 2880
2907 if (y != NIL) 2881 if (y != NIL)
2882 return car (y);
2883
2884 if (!all)
2908 break; 2885 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2886 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2887
2917 return NIL; 2888 return NIL;
2918} 2889}
2919 2890
2920#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2921 2892
2922static INLINE void 2893static void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2895{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2927} 2898}
2928 2899
2929static INLINE void 2900static void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2901new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2902{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2904}
2934 2905
2935static pointer 2906ecb_hot static pointer
2936find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2937{ 2908{
2938 pointer x, y; 2909 pointer x, y;
2939 2910
2940 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2913 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2914 if (caar (y) == hdl)
2944 break; 2915 break;
2945 2916
2946 if (y != NIL) 2917 if (y != NIL)
2918 return car (y);
2947 break; 2919 break;
2948 2920
2949 if (!all) 2921 if (!all)
2950 return NIL; 2922 break;
2951 } 2923 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2924
2956 return NIL; 2925 return NIL;
2957} 2926}
2958 2927
2959#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2960 2929
2961static INLINE void 2930static void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2932{
2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2935}
2966 2936
2967static INLINE void 2937static void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2939{
2970 set_cdr (slot, value); 2940 set_cdr (slot, value);
2971} 2941}
2972 2942
2973static INLINE pointer 2943static pointer
2974slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2975{ 2945{
2976 return cdr (slot); 2946 return cdr (slot);
2977} 2947}
2978 2948
2979/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2980 2950
2981static pointer 2951ecb_cold static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2953{
2984#if USE_ERROR_HOOK
2985 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK;
2987#endif
2988
2989#if USE_PRINTF 2954#if USE_PRINTF
2990#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2991 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2992 2957
2993 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
3008 } 2973 }
3009#endif 2974#endif
3010#endif 2975#endif
3011 2976
3012#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
3013 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2978 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
3014 2979
3015 if (x != NIL) 2980 if (x != NIL)
3016 { 2981 {
3017 pointer code = a 2982 pointer code = a
3018 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 2986 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 2987 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 2988 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 2989 SCHEME_V->op = OP_EVAL;
3025 2990
3026 return S_T; 2991 return 0;
3027 } 2992 }
3028#endif 2993#endif
3029 2994
3030 if (a) 2995 if (a)
3031 SCHEME_V->args = cons (a, NIL); 2996 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 2998 SCHEME_V->args = NIL;
3034 2999
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3000 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3001 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3002 SCHEME_V->op = OP_ERR0;
3003
3038 return S_T; 3004 return 0;
3039} 3005}
3040 3006
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3007#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3008#define Error_0(s) Error_1 (s, 0)
3043 3009
3044/* Too small to turn into function */ 3010/* Too small to turn into function */
3045#define BEGIN do { 3011#define BEGIN do {
3046#define END } while (0) 3012#define END } while (0)
3047#define s_goto(a) BEGIN \ 3013#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3014 SCHEME_V->op = a; \
3049 return S_T; END 3015 return 0; END
3050 3016
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3017#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3018
3053#ifndef USE_SCHEME_STACK 3019#ifndef USE_SCHEME_STACK
3054 3020
… …
3061 pointer code; 3027 pointer code;
3062}; 3028};
3063 3029
3064# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3065 3031
3066static void 3032ecb_hot static void
3067s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3068{ 3034{
3069 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3070 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3071 3037
3072 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3073 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3074 { 3040 {
3075 SCHEME_V->dump_size += STACK_GROWTH; 3041 SCHEME_V->dump_size += STACK_GROWTH;
3076 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3042 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3077 } 3043 }
3078 3044
3079 next_frame = SCHEME_V->dump_base + nframes; 3045 next_frame = SCHEME_V->dump_base + nframes;
3080 3046
3081 next_frame->op = op; 3047 next_frame->op = op;
3082 next_frame->args = args; 3048 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3049 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3050 next_frame->code = code;
3085 3051
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3053}
3088 3054
3089static pointer 3055static ecb_hot int
3090xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3091{ 3057{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3094 3060
3095 SCHEME_V->value = a; 3061 SCHEME_V->value = a;
3096 3062
3097 if (nframes <= 0) 3063 if (nframes <= 0)
3098 return NIL; 3064 return -1;
3099 3065
3100 frame = &SCHEME_V->dump_base[--nframes]; 3066 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3067 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3068 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3069 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3070 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3072
3107 return S_T; 3073 return 0;
3108} 3074}
3109 3075
3110static INLINE void 3076ecb_cold void
3111dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3112{ 3078{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3079 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3115} 3081}
3116 3082
3117static INLINE void 3083ecb_cold void
3118dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3119{ 3085{
3120 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3123} 3089}
3124 3090
3125static void 3091ecb_cold static void
3126dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3127{ 3093{
3128 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3129 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3130 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3131 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3132} 3098}
3133 3099
3134static void 3100ecb_cold static void
3135dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3136{ 3102{
3137 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3138 int i; 3104 int i;
3139 3105
… …
3145 mark (frame->envir); 3111 mark (frame->envir);
3146 mark (frame->code); 3112 mark (frame->code);
3147 } 3113 }
3148} 3114}
3149 3115
3150static pointer 3116ecb_cold static pointer
3151ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3152{ 3118{
3153 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3154 int i; 3120 int i;
3155 3121
… …
3167 } 3133 }
3168 3134
3169 return cont; 3135 return cont;
3170} 3136}
3171 3137
3172static void 3138ecb_cold static void
3173ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3174{ 3140{
3175 int i = 0; 3141 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3143
3178 while (cont != NIL) 3144 while (cont != NIL)
3179 { 3145 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3146 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3147 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3148 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3149 frame->code = car (cont) ; cont = cdr (cont);
3184 3150
3185 ++frame; 3151 ++frame;
3186 ++i; 3152 ++i;
3187 } 3153 }
3188 3154
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3156}
3191 3157
3192#else 3158#else
3193 3159
3194static INLINE void 3160ecb_cold void
3195dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3196{ 3162{
3197 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3198} 3164}
3199 3165
3200static INLINE void 3166ecb_cold void
3201dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3202{ 3168{
3203 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3204} 3170}
3205 3171
3206static void 3172ecb_cold static void
3207dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3208{ 3174{
3209 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3210} 3176}
3211 3177
3212static pointer 3178ecb_hot static int
3213xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3214{ 3180{
3215 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3216 3182
3217 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
3218 3184
3219 if (dump == NIL) 3185 if (dump == NIL)
3220 return NIL; 3186 return -1;
3221 3187
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3188 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3189 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3190 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3191 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3192
3227 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3228 3194
3229 return S_T; 3195 return 0;
3230} 3196}
3231 3197
3232static void 3198ecb_hot static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3200{
3235 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3236 cons (args, 3202 cons (args,
3237 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3238 cons (code, 3204 cons (code,
3239 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3240} 3206}
3241 3207
3208ecb_cold static void
3209dump_stack_mark (SCHEME_P)
3210{
3211 mark (SCHEME_V->dump);
3212}
3213
3214ecb_cold static pointer
3215ss_get_cont (SCHEME_P)
3216{
3217 return SCHEME_V->dump;
3218}
3219
3220ecb_cold static void
3221ss_set_cont (SCHEME_P_ pointer cont)
3222{
3223 SCHEME_V->dump = cont;
3224}
3225
3226#endif
3227
3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3229
3230#if EXPERIMENT
3231
3232static int
3233dtree (SCHEME_P_ int indent, pointer x)
3234{
3235 int c;
3236
3237 if (is_syntax (x))
3238 {
3239 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3240 return 8 + 8;
3241 }
3242
3243 if (x == NIL)
3244 {
3245 printf ("%*sNIL\n", indent, "");
3246 return 3;
3247 }
3248
3249 switch (type (x))
3250 {
3251 case T_INTEGER:
3252 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3253 return 32+8;
3254
3255 case T_SYMBOL:
3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3257 return 24+8;
3258
3259 case T_CLOSURE:
3260 printf ("%*sS<%s>\n", indent, "", "closure");
3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3263
3264 case T_PAIR:
3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3268 return c + 1;
3269
3270 case T_PORT:
3271 printf ("%*sS<%s>\n", indent, "", "port");
3272 return 24+8;
3273
3274 case T_VECTOR:
3275 printf ("%*sS<%s>\n", indent, "", "vector");
3276 return 24+8;
3277
3278 case T_ENVIRONMENT:
3279 printf ("%*sS<%s>\n", indent, "", "environment");
3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3281
3282 default:
3283 printf ("unhandled type %d\n", type (x));
3284 break;
3285 }
3286}
3287
3288#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3289
3290typedef void *stream[1];
3291
3292#define stream_init() { 0 }
3293#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3294#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3295#define stream_free(s) free (s[0])
3296
3297ecb_cold static void
3298stream_put (stream s, uint8_t byte)
3299{
3300 uint32_t *sp = *s;
3301 uint32_t size = sizeof (uint32_t) * 2;
3302 uint32_t offs = size;
3303
3304 if (ecb_expect_true (sp))
3305 {
3306 offs = sp[0];
3307 size = sp[1];
3308 }
3309
3310 if (ecb_expect_false (offs == size))
3311 {
3312 size *= 2;
3313 sp = realloc (sp, size);
3314 *s = sp;
3315 sp[1] = size;
3316
3317 }
3318
3319 ((uint8_t *)sp)[offs++] = byte;
3320 sp[0] = offs;
3321}
3322
3323ecb_cold static void
3324stream_put_v (stream s, uint32_t v)
3325{
3326 while (v > 0x7f)
3327 {
3328 stream_put (s, v | 0x80);
3329 v >>= 7;
3330 }
3331
3332 stream_put (s, v);
3333}
3334
3335ecb_cold static void
3336stream_put_tv (stream s, int bop, uint32_t v)
3337{
3338 printf ("put tv %d %d\n", bop, v);//D
3339 stream_put (s, bop);
3340 stream_put_v (s, v);
3341}
3342
3343ecb_cold static void
3344stream_put_stream (stream s, stream o)
3345{
3346 uint32_t i;
3347
3348 for (i = 0; i < stream_size (o); ++i)
3349 stream_put (s, stream_data (o)[i]);
3350
3351 stream_free (o);
3352}
3353
3354ecb_cold static uint32_t
3355cell_id (SCHEME_P_ pointer x)
3356{
3357 struct cell *p = CELL (x);
3358 int i;
3359
3360 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3361 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3362 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3363
3364 abort ();
3365}
3366
3367// calculates a (preferably small) integer that makes it possible to find
3368// the symbol again. if pointers were offsets into a memory area... until
3369// then, we return segment number in the low bits, and offset in the high
3370// bits.
3371// also, this function must never return 0.
3372ecb_cold static uint32_t
3373symbol_id (SCHEME_P_ pointer sym)
3374{
3375 return cell_id (SCHEME_A_ sym);
3376}
3377
3378enum byteop
3379{
3380 BOP_NIL,
3381 BOP_INTEGER,
3382 BOP_SYMBOL,
3383 BOP_DATUM,
3384 BOP_LIST_BEG,
3385 BOP_LIST_END,
3386 BOP_IF,
3387 BOP_AND,
3388 BOP_OR,
3389 BOP_CASE,
3390 BOP_COND,
3391 BOP_LET,
3392 BOP_LETAST,
3393 BOP_LETREC,
3394 BOP_DEFINE,
3395 BOP_MACRO,
3396 BOP_SET,
3397 BOP_BEGIN,
3398 BOP_LAMBDA,
3399 BOP_DELAY,
3400 BOP_OP,
3401};
3402
3403ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3404
3405ecb_cold static void
3406compile_list (SCHEME_P_ stream s, pointer x)
3407{
3408 // TODO: improper list
3409
3410 for (; x != NIL; x = cdr (x))
3411 {
3412 stream t = stream_init ();
3413 compile_expr (SCHEME_A_ t, car (x));
3414 stream_put_v (s, stream_size (t));
3415 stream_put_stream (s, t);
3416 }
3417
3418 stream_put_v (s, 0);
3419}
3420
3242static void 3421static void
3243dump_stack_mark (SCHEME_P) 3422compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3244{ 3423{
3245 mark (SCHEME_V->dump); 3424 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3425
3426 stream_put (s, BOP_IF);
3427 compile_expr (SCHEME_A_ s, cond);
3428 stream_put_v (s, stream_size (sift));
3429 stream_put_stream (s, sift);
3430 compile_expr (SCHEME_A_ s, iff);
3431}
3432
3433typedef uint32_t stream_fixup;
3434
3435static stream_fixup
3436stream_put_fixup (stream s)
3437{
3438 stream_put (s, 0);
3439 stream_put (s, 0);
3440
3441 return stream_size (s);
3442}
3443
3444static void
3445stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3446{
3447 target -= fixup;
3448 assert (target < (1 << 14));
3449 stream_data (s)[fixup - 2] = target | 0x80;
3450 stream_data (s)[fixup - 1] = target >> 7;
3451}
3452
3453static void
3454compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3455{
3456 for (; cdr (x) != NIL; x = cdr (x))
3457 {
3458 stream t = stream_init ();
3459 compile_expr (SCHEME_A_ t, car (x));
3460 stream_put_v (s, stream_size (t));
3461 stream_put_stream (s, t);
3462 }
3463
3464 stream_put_v (s, 0);
3465}
3466
3467static void
3468compile_case (SCHEME_P_ stream s, pointer x)
3469{
3470 compile_expr (SCHEME_A_ s, caar (x));
3471
3472 for (;;)
3473 {
3474 x = cdr (x);
3475
3476 if (x == NIL)
3477 break;
3478
3479 compile_expr (SCHEME_A_ s, caar (x));
3480 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3481 stream_put_v (s, stream_size (t));
3482 stream_put_stream (s, t);
3483 }
3484
3485 stream_put_v (s, 0);
3486}
3487
3488static void
3489compile_cond (SCHEME_P_ stream s, pointer x)
3490{
3491 for ( ; x != NIL; x = cdr (x))
3492 {
3493 compile_expr (SCHEME_A_ s, caar (x));
3494 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3495 stream_put_v (s, stream_size (t));
3496 stream_put_stream (s, t);
3497 }
3498
3499 stream_put_v (s, 0);
3246} 3500}
3247 3501
3248static pointer 3502static pointer
3249ss_get_cont (SCHEME_P) 3503lookup (SCHEME_P_ pointer x)
3250{ 3504{
3251 return SCHEME_V->dump; 3505 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3252}
3253 3506
3254static void 3507 if (x != NIL)
3255ss_set_cont (SCHEME_P_ pointer cont) 3508 x = slot_value_in_env (x);
3256{
3257 SCHEME_V->dump = cont;
3258}
3259 3509
3260#endif 3510 return x;
3511}
3261 3512
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3513ecb_cold static void
3514compile_expr (SCHEME_P_ stream s, pointer x)
3515{
3516 if (x == NIL)
3517 {
3518 stream_put (s, BOP_NIL);
3519 return;
3520 }
3263 3521
3264static pointer 3522 if (is_pair (x))
3523 {
3524 pointer head = car (x);
3525
3526 if (is_syntax (head))
3527 {
3528 int syn = syntaxnum (head);
3529 x = cdr (x);
3530
3531 switch (syntaxnum (head))
3532 {
3533 case OP_IF0: /* if */
3534 stream_put_v (s, BOP_IF);
3535 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3536 break;
3537
3538 case OP_OR0: /* or */
3539 stream_put_v (s, BOP_OR);
3540 compile_and_or (SCHEME_A_ s, 0, x);
3541 break;
3542
3543 case OP_AND0: /* and */
3544 stream_put_v (s, BOP_AND);
3545 compile_and_or (SCHEME_A_ s, 1, x);
3546 break;
3547
3548 case OP_CASE0: /* case */
3549 stream_put_v (s, BOP_CASE);
3550 compile_case (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_COND0: /* cond */
3554 stream_put_v (s, BOP_COND);
3555 compile_cond (SCHEME_A_ s, x);
3556 break;
3557
3558 case OP_LET0: /* let */
3559 case OP_LET0AST: /* let* */
3560 case OP_LET0REC: /* letrec */
3561 switch (syn)
3562 {
3563 case OP_LET0: stream_put (s, BOP_LET ); break;
3564 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3565 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3566 }
3567
3568 {
3569 pointer bindings = car (x);
3570 pointer body = cadr (x);
3571
3572 for (x = bindings; x != NIL; x = cdr (x))
3573 {
3574 pointer init = NIL;
3575 pointer var = car (x);
3576
3577 if (is_pair (var))
3578 {
3579 init = cdr (var);
3580 var = car (var);
3581 }
3582
3583 stream_put_v (s, symbol_id (SCHEME_A_ var));
3584 compile_expr (SCHEME_A_ s, init);
3585 }
3586
3587 stream_put_v (s, 0);
3588 compile_expr (SCHEME_A_ s, body);
3589 }
3590 break;
3591
3592 case OP_DEF0: /* define */
3593 case OP_MACRO0: /* macro */
3594 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3595 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3596 compile_expr (SCHEME_A_ s, cadr (x));
3597 break;
3598
3599 case OP_SET0: /* set! */
3600 stream_put (s, BOP_SET);
3601 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3602 compile_expr (SCHEME_A_ s, cadr (x));
3603 break;
3604
3605 case OP_BEGIN: /* begin */
3606 stream_put (s, BOP_BEGIN);
3607 compile_list (SCHEME_A_ s, x);
3608 return;
3609
3610 case OP_QUOTE: /* quote */
3611 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3612 break;
3613
3614 case OP_DELAY: /* delay */
3615 stream_put (s, BOP_DELAY);
3616 compile_expr (SCHEME_A_ s, x);
3617 break;
3618
3619 case OP_LAMBDA: /* lambda */
3620 {
3621 pointer formals = car (x);
3622 pointer body = cadr (x);
3623
3624 stream_put (s, BOP_LAMBDA);
3625
3626 for (; is_pair (formals); formals = cdr (formals))
3627 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3628
3629 stream_put_v (s, 0);
3630 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3631
3632 compile_expr (SCHEME_A_ s, body);
3633 }
3634 break;
3635
3636 case OP_C0STREAM:/* cons-stream */
3637 abort ();
3638 break;
3639 }
3640
3641 return;
3642 }
3643
3644 pointer m = lookup (SCHEME_A_ head);
3645
3646 if (is_macro (m))
3647 {
3648 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3649 SCHEME_V->code = m;
3650 SCHEME_V->args = cons (x, NIL);
3651 Eval_Cycle (SCHEME_A_ OP_APPLY);
3652 x = SCHEME_V->value;
3653 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3654 return;
3655 }
3656
3657 stream_put (s, BOP_LIST_BEG);
3658
3659 for (; x != NIL; x = cdr (x))
3660 compile_expr (SCHEME_A_ s, car (x));
3661
3662 stream_put (s, BOP_LIST_END);
3663 return;
3664 }
3665
3666 switch (type (x))
3667 {
3668 case T_INTEGER:
3669 {
3670 IVALUE iv = ivalue_unchecked (x);
3671 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3672 stream_put_tv (s, BOP_INTEGER, iv);
3673 }
3674 return;
3675
3676 case T_SYMBOL:
3677 if (0)
3678 {
3679 // no can do without more analysis
3680 pointer m = lookup (SCHEME_A_ x);
3681
3682 if (is_proc (m))
3683 {
3684 printf ("compile proc %s %d\n", procname(m), procnum(m));
3685 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3686 }
3687 else
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 }
3690
3691 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3692 return;
3693
3694 default:
3695 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3696 break;
3697 }
3698}
3699
3700ecb_cold static int
3701compile_closure (SCHEME_P_ pointer p)
3702{
3703 stream s = stream_init ();
3704
3705 compile_list (SCHEME_A_ s, cdar (p));
3706
3707 FILE *xxd = popen ("xxd", "we");
3708 fwrite (stream_data (s), 1, stream_size (s), xxd);
3709 fclose (xxd);
3710
3711 return stream_size (s);
3712}
3713
3714#endif
3715
3716/* syntax, eval, core, ... */
3717ecb_hot static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3718opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3719{
3720 pointer args = SCHEME_V->args;
3267 pointer x, y; 3721 pointer x, y;
3268 3722
3269 switch (op) 3723 switch (op)
3270 { 3724 {
3725#if EXPERIMENT //D
3726 case OP_DEBUG:
3727 {
3728 uint32_t len = compile_closure (SCHEME_A_ car (args));
3729 printf ("len = %d\n", len);
3730 printf ("\n");
3731 s_return (S_T);
3732 }
3733
3734 case OP_DEBUG2:
3735 return -1;
3736#endif
3737
3271 case OP_LOAD: /* load */ 3738 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3739 if (file_interactive (SCHEME_A))
3273 { 3740 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3741 putstr (SCHEME_A_ "Loading ");
3275 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3742 putstr (SCHEME_A_ strvalue (car (args)));
3743 putcharacter (SCHEME_A_ '\n');
3276 } 3744 }
3277 3745
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3746 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3747 Error_1 ("unable to open", car (args));
3280 else 3748
3281 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3749 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3750 s_goto (OP_T0LVL);
3284 }
3285 3751
3286 case OP_T0LVL: /* top level */ 3752 case OP_T0LVL: /* top level */
3287 3753
3288 /* If we reached the end of file, this loop is done. */ 3754 /* If we reached the end of file, this loop is done. */
3289 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3755 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3290 { 3756 {
3291 if (SCHEME_V->file_i == 0) 3757 if (SCHEME_V->file_i == 0)
3292 { 3758 {
3293 SCHEME_V->args = NIL; 3759 SCHEME_V->args = NIL;
3294 s_goto (OP_QUIT); 3760 s_goto (OP_QUIT);
… …
3305 /* If interactive, be nice to user. */ 3771 /* If interactive, be nice to user. */
3306 if (file_interactive (SCHEME_A)) 3772 if (file_interactive (SCHEME_A))
3307 { 3773 {
3308 SCHEME_V->envir = SCHEME_V->global_env; 3774 SCHEME_V->envir = SCHEME_V->global_env;
3309 dump_stack_reset (SCHEME_A); 3775 dump_stack_reset (SCHEME_A);
3310 putstr (SCHEME_A_ "\n"); 3776 putcharacter (SCHEME_A_ '\n');
3777#if EXPERIMENT
3778 system ("ps v $PPID");
3779#endif
3311 putstr (SCHEME_A_ prompt); 3780 putstr (SCHEME_A_ prompt);
3312 } 3781 }
3313 3782
3314 /* Set up another iteration of REPL */ 3783 /* Set up another iteration of REPL */
3315 SCHEME_V->nesting = 0; 3784 SCHEME_V->nesting = 0;
… …
3350 { 3819 {
3351 SCHEME_V->print_flag = 1; 3820 SCHEME_V->print_flag = 1;
3352 SCHEME_V->args = SCHEME_V->value; 3821 SCHEME_V->args = SCHEME_V->value;
3353 s_goto (OP_P0LIST); 3822 s_goto (OP_P0LIST);
3354 } 3823 }
3355 else 3824
3356 s_return (SCHEME_V->value); 3825 s_return (SCHEME_V->value);
3357 3826
3358 case OP_EVAL: /* main part of evaluation */ 3827 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3828#if USE_TRACING
3360 if (SCHEME_V->tracing) 3829 if (SCHEME_V->tracing)
3361 { 3830 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3831 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3832 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3833 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3834 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3835 s_goto (OP_P0LIST);
3367 } 3836 }
3368 3837
… …
3372#endif 3841#endif
3373 if (is_symbol (SCHEME_V->code)) /* symbol */ 3842 if (is_symbol (SCHEME_V->code)) /* symbol */
3374 { 3843 {
3375 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3844 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3376 3845
3377 if (x != NIL) 3846 if (x == NIL)
3378 s_return (slot_value_in_env (x));
3379 else
3380 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3847 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3848
3849 s_return (slot_value_in_env (x));
3381 } 3850 }
3382 else if (is_pair (SCHEME_V->code)) 3851 else if (is_pair (SCHEME_V->code))
3383 { 3852 {
3384 x = car (SCHEME_V->code); 3853 x = car (SCHEME_V->code);
3385 3854
… …
3394 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3863 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3395 SCHEME_V->code = x; 3864 SCHEME_V->code = x;
3396 s_goto (OP_EVAL); 3865 s_goto (OP_EVAL);
3397 } 3866 }
3398 } 3867 }
3399 else 3868
3400 s_return (SCHEME_V->code); 3869 s_return (SCHEME_V->code);
3401 3870
3402 case OP_E0ARGS: /* eval arguments */ 3871 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3872 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3873 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3874 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3875 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3876 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3877 s_goto (OP_APPLY);
3409 } 3878 }
3410 else 3879
3411 {
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3880 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3881 s_goto (OP_E1ARGS);
3414 }
3415 3882
3416 case OP_E1ARGS: /* eval arguments */ 3883 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3884 args = cons (SCHEME_V->value, args);
3418 3885
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3886 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3887 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3888 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3889 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3890 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3891 s_goto (OP_EVAL);
3425 } 3892 }
3426 else /* end */ 3893 else /* end */
3427 { 3894 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3895 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3896 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3897 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3898 s_goto (OP_APPLY);
3432 } 3899 }
3433 3900
3434#if USE_TRACING 3901#if USE_TRACING
3435
3436 case OP_TRACING: 3902 case OP_TRACING:
3437 { 3903 {
3438 int tr = SCHEME_V->tracing; 3904 int tr = SCHEME_V->tracing;
3439 3905
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3906 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3907 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3908 }
3443
3444#endif 3909#endif
3445 3910
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3911 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3912#if USE_TRACING
3448 if (SCHEME_V->tracing) 3913 if (SCHEME_V->tracing)
3449 { 3914 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3915 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3916 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3917 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3918 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3919 s_goto (OP_P0LIST);
3455 } 3920 }
3456 3921
3457 /* fall through */ 3922 /* fall through */
3458 3923
3459 case OP_REAL_APPLY: 3924 case OP_REAL_APPLY:
3460#endif 3925#endif
3461 if (is_proc (SCHEME_V->code)) 3926 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3927 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code))
3466 {
3467 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args);
3470
3471 s_return (x);
3472 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3928 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3929 {
3475 /* Should not accept promise */ 3930 /* Should not accept promise */
3476 /* make environment */ 3931 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3932 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3933
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3934 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3935 {
3481 if (y == NIL) 3936 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3937 Error_0 ("not enough arguments");
3483 else 3938 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3939 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3957 s_goto (OP_BEGIN);
3503 } 3958 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3959 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3960 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3961 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3962 s_return (args != NIL ? car (args) : NIL);
3508 } 3963 }
3509 else 3964 else if (is_foreign (SCHEME_V->code))
3965 {
3966 /* Keep nested calls from GC'ing the arglist */
3967 push_recent_alloc (SCHEME_A_ args, NIL);
3968 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3969
3970 s_return (x);
3971 }
3972
3510 Error_0 ("illegal function"); 3973 Error_0 ("illegal function");
3511 3974
3512 case OP_DOMACRO: /* do macro */ 3975 case OP_DOMACRO: /* do macro */
3513 SCHEME_V->code = SCHEME_V->value; 3976 SCHEME_V->code = SCHEME_V->value;
3514 s_goto (OP_EVAL); 3977 s_goto (OP_EVAL);
3515
3516#if 1
3517 3978
3518 case OP_LAMBDA: /* lambda */ 3979 case OP_LAMBDA: /* lambda */
3519 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3980 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3520 set SCHEME_V->value fall thru */ 3981 set SCHEME_V->value fall thru */
3521 { 3982 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3983 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3984
3524 if (f != NIL) 3985 if (f != NIL)
3525 { 3986 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3987 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3988 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3989 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3990 s_goto (OP_APPLY);
3530 } 3991 }
3531 3992
3532 SCHEME_V->value = SCHEME_V->code; 3993 SCHEME_V->value = SCHEME_V->code;
3533 /* Fallthru */
3534 } 3994 }
3995 /* Fallthru */
3535 3996
3536 case OP_LAMBDA1: 3997 case OP_LAMBDA1:
3537 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3998 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3538 3999
3539#else
3540
3541 case OP_LAMBDA: /* lambda */
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543
3544#endif
3545
3546 case OP_MKCLOSURE: /* make-closure */ 4000 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 4001 x = car (args);
3548 4002
3549 if (car (x) == SCHEME_V->LAMBDA) 4003 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 4004 x = cdr (x);
3551 4005
3552 if (cdr (SCHEME_V->args) == NIL) 4006 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 4007 y = SCHEME_V->envir;
3554 else 4008 else
3555 y = cadr (SCHEME_V->args); 4009 y = cadr (args);
3556 4010
3557 s_return (mk_closure (SCHEME_A_ x, y)); 4011 s_return (mk_closure (SCHEME_A_ x, y));
3558 4012
3559 case OP_QUOTE: /* quote */ 4013 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 4014 s_return (car (SCHEME_V->code));
… …
3588 else 4042 else
3589 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4043 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3590 4044
3591 s_return (SCHEME_V->code); 4045 s_return (SCHEME_V->code);
3592 4046
3593
3594 case OP_DEFP: /* defined? */ 4047 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 4048 x = SCHEME_V->envir;
3596 4049
3597 if (cdr (SCHEME_V->args) != NIL) 4050 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 4051 x = cadr (args);
3599 4052
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 4053 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 4054
3602 case OP_SET0: /* set! */ 4055 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 4056 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 4057 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 4058
… …
3616 s_return (SCHEME_V->value); 4069 s_return (SCHEME_V->value);
3617 } 4070 }
3618 else 4071 else
3619 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4072 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3620 4073
3621
3622 case OP_BEGIN: /* begin */ 4074 case OP_BEGIN: /* begin */
3623 if (!is_pair (SCHEME_V->code)) 4075 if (!is_pair (SCHEME_V->code))
3624 s_return (SCHEME_V->code); 4076 s_return (SCHEME_V->code);
3625 4077
3626 if (cdr (SCHEME_V->code) != NIL) 4078 if (cdr (SCHEME_V->code) != NIL)
… …
3636 4088
3637 case OP_IF1: /* if */ 4089 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 4090 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 4091 SCHEME_V->code = car (SCHEME_V->code);
3640 else 4092 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 4093 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642 4094
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 4095 s_goto (OP_EVAL);
3645 4096
3646 case OP_LET0: /* let */ 4097 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 4098 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 4099 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4100 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 4101 s_goto (OP_LET1);
3651 4102
3652 case OP_LET1: /* let (calculate parameters) */ 4103 case OP_LET1: /* let (calculate parameters) */
4104 case OP_LET1REC: /* letrec (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4105 args = cons (SCHEME_V->value, args);
3654 4106
3655 if (is_pair (SCHEME_V->code)) /* continue */ 4107 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 4108 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4109 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3658 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4110 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3659 4111
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 4112 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 4113 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 4114 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 4115 s_goto (OP_EVAL);
3664 } 4116 }
3665 else /* end */ 4117
3666 { 4118 /* end */
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 4119 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 4120 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 4121 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 4122 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3671 }
3672 4123
3673 case OP_LET2: /* let */ 4124 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4125 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 4126
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 4127 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3677 y != NIL; x = cdr (x), y = cdr (y)) 4128 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4129 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 4130
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4131 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 4132 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 4133 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 4134 {
3684 if (!is_pair (x)) 4135 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 4136 Error_1 ("Bad syntax of binding in let:", x);
3686 4137
3687 if (!is_list (SCHEME_A_ car (x))) 4138 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 4139 Error_1 ("Bad syntax of binding in let:", car (x));
3689 4140
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 4141 args = cons (caar (x), args);
3691 } 4142 }
3692 4143
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 4144 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 4145 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 4146 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 4147 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 4148 }
3700 else 4149 else
3701 { 4150 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 4151 SCHEME_V->code = cdr (SCHEME_V->code);
3703 SCHEME_V->args = NIL;
3704 } 4152 }
3705 4153
4154 SCHEME_V->args = NIL;
3706 s_goto (OP_BEGIN); 4155 s_goto (OP_BEGIN);
3707 4156
3708 case OP_LET0AST: /* let* */ 4157 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 4158 if (car (SCHEME_V->code) == NIL)
3710 { 4159 {
… …
3712 SCHEME_V->code = cdr (SCHEME_V->code); 4161 SCHEME_V->code = cdr (SCHEME_V->code);
3713 s_goto (OP_BEGIN); 4162 s_goto (OP_BEGIN);
3714 } 4163 }
3715 4164
3716 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4165 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3717 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4166 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3718 4167
3719 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4168 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3720 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4169 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3721 s_goto (OP_EVAL); 4170 s_goto (OP_EVAL);
3722 4171
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 4177 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 4178 SCHEME_V->code = cdr (SCHEME_V->code);
3730 4179
3731 if (is_pair (SCHEME_V->code)) /* continue */ 4180 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 4181 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 4182 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 4183 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 4184 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 4185 s_goto (OP_EVAL);
3737 } 4186 }
3738 else /* end */ 4187
4188 /* end */
3739 { 4189
3740 SCHEME_V->code = SCHEME_V->args; 4190 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 4191 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 4192 s_goto (OP_BEGIN);
3743 }
3744 4193
3745 case OP_LET0REC: /* letrec */ 4194 case OP_LET0REC: /* letrec */
3746 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4195 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3747 SCHEME_V->args = NIL; 4196 SCHEME_V->args = NIL;
3748 SCHEME_V->value = SCHEME_V->code; 4197 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 4198 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 4199 s_goto (OP_LET1REC);
3751 4200
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 4201 /* OP_LET1REC handled by OP_LET1 */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args);
3754
3755 if (is_pair (SCHEME_V->code)) /* continue */
3756 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3758 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL);
3764 }
3765 else /* end */
3766 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args);
3768 SCHEME_V->code = car (SCHEME_V->args);
3769 SCHEME_V->args = cdr (SCHEME_V->args);
3770 s_goto (OP_LET2REC);
3771 }
3772 4202
3773 case OP_LET2REC: /* letrec */ 4203 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 4204 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4205 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 4206
3777 SCHEME_V->code = cdr (SCHEME_V->code); 4207 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 4208 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 4209 s_goto (OP_BEGIN);
… …
3806 } 4236 }
3807 else 4237 else
3808 { 4238 {
3809 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4239 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3810 s_return (NIL); 4240 s_return (NIL);
3811 else 4241
3812 {
3813 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4242 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3814 SCHEME_V->code = caar (SCHEME_V->code); 4243 SCHEME_V->code = caar (SCHEME_V->code);
3815 s_goto (OP_EVAL); 4244 s_goto (OP_EVAL);
3816 }
3817 } 4245 }
3818 4246
3819 case OP_DELAY: /* delay */ 4247 case OP_DELAY: /* delay */
3820 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4248 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3821 set_typeflag (x, T_PROMISE); 4249 set_typeflag (x, T_PROMISE);
… …
3832 case OP_AND1: /* and */ 4260 case OP_AND1: /* and */
3833 if (is_false (SCHEME_V->value)) 4261 if (is_false (SCHEME_V->value))
3834 s_return (SCHEME_V->value); 4262 s_return (SCHEME_V->value);
3835 else if (SCHEME_V->code == NIL) 4263 else if (SCHEME_V->code == NIL)
3836 s_return (SCHEME_V->value); 4264 s_return (SCHEME_V->value);
3837 else 4265
3838 {
3839 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4266 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3840 SCHEME_V->code = car (SCHEME_V->code); 4267 SCHEME_V->code = car (SCHEME_V->code);
3841 s_goto (OP_EVAL); 4268 s_goto (OP_EVAL);
3842 }
3843 4269
3844 case OP_OR0: /* or */ 4270 case OP_OR0: /* or */
3845 if (SCHEME_V->code == NIL) 4271 if (SCHEME_V->code == NIL)
3846 s_return (S_F); 4272 s_return (S_F);
3847 4273
… …
3852 case OP_OR1: /* or */ 4278 case OP_OR1: /* or */
3853 if (is_true (SCHEME_V->value)) 4279 if (is_true (SCHEME_V->value))
3854 s_return (SCHEME_V->value); 4280 s_return (SCHEME_V->value);
3855 else if (SCHEME_V->code == NIL) 4281 else if (SCHEME_V->code == NIL)
3856 s_return (SCHEME_V->value); 4282 s_return (SCHEME_V->value);
3857 else 4283
3858 {
3859 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4284 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3860 SCHEME_V->code = car (SCHEME_V->code); 4285 SCHEME_V->code = car (SCHEME_V->code);
3861 s_goto (OP_EVAL); 4286 s_goto (OP_EVAL);
3862 }
3863 4287
3864 case OP_C0STREAM: /* cons-stream */ 4288 case OP_C0STREAM: /* cons-stream */
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4289 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 4290 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 4291 s_goto (OP_EVAL);
3868 4292
3869 case OP_C1STREAM: /* cons-stream */ 4293 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 4294 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3871 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4295 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 4296 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 4297 s_return (cons (args, x));
3874 4298
3875 case OP_MACRO0: /* macro */ 4299 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 4300 if (is_pair (car (SCHEME_V->code)))
3877 { 4301 {
3878 x = caar (SCHEME_V->code); 4302 x = caar (SCHEME_V->code);
… …
3911 { 4335 {
3912 if (!is_pair (y = caar (x))) 4336 if (!is_pair (y = caar (x)))
3913 break; 4337 break;
3914 4338
3915 for (; y != NIL; y = cdr (y)) 4339 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 4340 if (eqv (car (y), SCHEME_V->value))
3918 break; 4341 break;
3919 }
3920 4342
3921 if (y != NIL) 4343 if (y != NIL)
3922 break; 4344 break;
3923 } 4345 }
3924 4346
… …
3934 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4356 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3935 SCHEME_V->code = caar (x); 4357 SCHEME_V->code = caar (x);
3936 s_goto (OP_EVAL); 4358 s_goto (OP_EVAL);
3937 } 4359 }
3938 } 4360 }
3939 else 4361
3940 s_return (NIL); 4362 s_return (NIL);
3941 4363
3942 case OP_CASE2: /* case */ 4364 case OP_CASE2: /* case */
3943 if (is_true (SCHEME_V->value)) 4365 if (is_true (SCHEME_V->value))
3944 s_goto (OP_BEGIN); 4366 s_goto (OP_BEGIN);
3945 else 4367
3946 s_return (NIL); 4368 s_return (NIL);
3947 4369
3948 case OP_PAPPLY: /* apply */ 4370 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 4371 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4372 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4373 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 4374 s_goto (OP_APPLY);
3953 4375
3954 case OP_PEVAL: /* eval */ 4376 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 4377 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 4378 SCHEME_V->envir = cadr (args);
3957 4379
3958 SCHEME_V->code = car (SCHEME_V->args); 4380 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 4381 s_goto (OP_EVAL);
3960 4382
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 4383 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 4384 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4385 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 4386 s_goto (OP_APPLY);
3965 } 4387 }
3966 4388
3967 return S_T; 4389 if (USE_ERROR_CHECKING) abort ();
3968} 4390}
3969 4391
3970static pointer 4392/* math, cxr */
4393ecb_hot static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4394opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 4395{
3973 pointer x; 4396 pointer args = SCHEME_V->args;
4397 pointer x = car (args);
3974 num v; 4398 num v;
3975 4399
4400 switch (op)
4401 {
3976#if USE_MATH 4402#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4403 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args);
3986
3987 if (num_is_integer (x)) 4404 if (!is_integer (x))
3988 s_return (x); 4405 {
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4406 RVALUE r = rvalue_unchecked (x);
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4407
4408 if (r == (RVALUE)(IVALUE)r)
4409 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3991 else 4410 else
3992 Error_1 ("inexact->exact: not integral:", x); 4411 Error_1 ("inexact->exact: not integral:", x);
4412 }
3993 4413
3994 case OP_EXP: 4414 s_return (x);
3995 x = car (SCHEME_V->args); 4415
4416 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4417 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4418 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4419 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4420
4421 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4422 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4423 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4001 4424 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4425 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4426 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4427 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4428 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4429 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4430
4022 case OP_ATAN: 4431 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else
4028 {
4029 pointer y = cadr (SCHEME_V->args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 }
4033
4034 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4432 s_return (mk_real (SCHEME_A_
4433 cdr (args) == NIL
4434 ? atan (rvalue (x))
4435 : atan2 (rvalue (x), rvalue (cadr (args)))));
4037 4436
4038 case OP_EXPT: 4437 case OP_EXPT:
4039 { 4438 {
4040 RVALUE result; 4439 RVALUE result;
4041 int real_result = 1; 4440 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4441 pointer y = cadr (args);
4043 4442
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4443 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4444 real_result = 0;
4048 4445
4049 /* This 'if' is an R5RS compatibility fix. */ 4446 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4447 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4448 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4449 result = 0;
4053 else 4450 else
4054 result = pow (rvalue (x), rvalue (y)); 4451 result = pow (rvalue (x), rvalue (y));
4055 4452
4056 /* Before returning integer result make sure we can. */ 4453 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4454 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4455 if (!real_result)
4059 { 4456 {
4060 long result_as_long = (long) result; 4457 long result_as_long = result;
4061 4458
4062 if (result != (RVALUE) result_as_long) 4459 if (result != result_as_long)
4063 real_result = 1; 4460 real_result = 1;
4064 } 4461 }
4065 4462
4066 if (real_result) 4463 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4464 s_return (mk_real (SCHEME_A_ result));
4068 else 4465 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4466 s_return (mk_integer (SCHEME_A_ result));
4070 } 4467 }
4071
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079
4080 case OP_TRUNCATE:
4081 {
4082 RVALUE rvalue_of_x;
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 }
4092
4093 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x))
4097 s_return (x);
4098
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4468#endif
4101 4469
4102 case OP_ADD: /* + */ 4470 case OP_ADD: /* + */
4103 v = num_zero; 4471 v = num_zero;
4104 4472
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4473 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4474 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4475
4108 s_return (mk_number (SCHEME_A_ v)); 4476 s_return (mk_number (SCHEME_A_ v));
4109 4477
4110 case OP_MUL: /* * */ 4478 case OP_MUL: /* * */
4111 v = num_one; 4479 v = num_one;
4112 4480
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4481 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4482 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4483
4116 s_return (mk_number (SCHEME_A_ v)); 4484 s_return (mk_number (SCHEME_A_ v));
4117 4485
4118 case OP_SUB: /* - */ 4486 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4487 if (cdr (args) == NIL)
4120 { 4488 {
4121 x = SCHEME_V->args; 4489 x = args;
4122 v = num_zero; 4490 v = num_zero;
4123 } 4491 }
4124 else 4492 else
4125 { 4493 {
4126 x = cdr (SCHEME_V->args); 4494 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4495 v = nvalue (car (args));
4128 } 4496 }
4129 4497
4130 for (; x != NIL; x = cdr (x)) 4498 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4499 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4500
4133 s_return (mk_number (SCHEME_A_ v)); 4501 s_return (mk_number (SCHEME_A_ v));
4134 4502
4135 case OP_DIV: /* / */ 4503 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4504 if (cdr (args) == NIL)
4137 { 4505 {
4138 x = SCHEME_V->args; 4506 x = args;
4139 v = num_one; 4507 v = num_one;
4140 } 4508 }
4141 else 4509 else
4142 { 4510 {
4143 x = cdr (SCHEME_V->args); 4511 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4512 v = nvalue (car (args));
4145 } 4513 }
4146 4514
4147 for (; x != NIL; x = cdr (x)) 4515 for (; x != NIL; x = cdr (x))
4516 if (!is_zero_rvalue (rvalue (car (x))))
4517 v = num_div (v, nvalue (car (x)));
4518 else
4519 Error_0 ("/: division by zero");
4520
4521 s_return (mk_number (SCHEME_A_ v));
4522
4523 case OP_INTDIV: /* quotient */
4524 if (cdr (args) == NIL)
4148 { 4525 {
4149 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x)));
4151 else
4152 Error_0 ("/: division by zero");
4153 }
4154
4155 s_return (mk_number (SCHEME_A_ v));
4156
4157 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL)
4159 {
4160 x = SCHEME_V->args; 4526 x = args;
4161 v = num_one; 4527 v = num_one;
4162 } 4528 }
4163 else 4529 else
4164 { 4530 {
4165 x = cdr (SCHEME_V->args); 4531 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4532 v = nvalue (car (args));
4167 } 4533 }
4168 4534
4169 for (; x != NIL; x = cdr (x)) 4535 for (; x != NIL; x = cdr (x))
4170 { 4536 {
4171 if (ivalue (car (x)) != 0) 4537 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4538 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4539 else
4174 Error_0 ("quotient: division by zero"); 4540 Error_0 ("quotient: division by zero");
4175 } 4541 }
4176 4542
4177 s_return (mk_number (SCHEME_A_ v)); 4543 s_return (mk_number (SCHEME_A_ v));
4178 4544
4179 case OP_REM: /* remainder */ 4545 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4546 v = nvalue (x);
4181 4547
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4548 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4549 v = num_rem (v, nvalue (cadr (args)));
4184 else 4550 else
4185 Error_0 ("remainder: division by zero"); 4551 Error_0 ("remainder: division by zero");
4186 4552
4187 s_return (mk_number (SCHEME_A_ v)); 4553 s_return (mk_number (SCHEME_A_ v));
4188 4554
4189 case OP_MOD: /* modulo */ 4555 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4556 v = nvalue (x);
4191 4557
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4558 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4559 v = num_mod (v, nvalue (cadr (args)));
4194 else 4560 else
4195 Error_0 ("modulo: division by zero"); 4561 Error_0 ("modulo: division by zero");
4196 4562
4197 s_return (mk_number (SCHEME_A_ v)); 4563 s_return (mk_number (SCHEME_A_ v));
4198 4564
4199 case OP_CAR: /* car */ 4565 /* the compiler will optimize this mess... */
4200 s_return (caar (SCHEME_V->args)); 4566 case OP_CAR: op_car: s_return (car (x));
4201 4567 case OP_CDR: op_cdr: s_return (cdr (x));
4202 case OP_CDR: /* cdr */ 4568 case OP_CAAR: op_caar: x = car (x); goto op_car;
4203 s_return (cdar (SCHEME_V->args)); 4569 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4570 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4571 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4572 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4573 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4574 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4575 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4576 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4577 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4578 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4579 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4580 case OP_CAAAAR: x = car (x); goto op_caaar;
4581 case OP_CAAADR: x = cdr (x); goto op_caaar;
4582 case OP_CAADAR: x = car (x); goto op_caadr;
4583 case OP_CAADDR: x = cdr (x); goto op_caadr;
4584 case OP_CADAAR: x = car (x); goto op_cadar;
4585 case OP_CADADR: x = cdr (x); goto op_cadar;
4586 case OP_CADDAR: x = car (x); goto op_caddr;
4587 case OP_CADDDR: x = cdr (x); goto op_caddr;
4588 case OP_CDAAAR: x = car (x); goto op_cdaar;
4589 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4590 case OP_CDADAR: x = car (x); goto op_cdadr;
4591 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4592 case OP_CDDAAR: x = car (x); goto op_cddar;
4593 case OP_CDDADR: x = cdr (x); goto op_cddar;
4594 case OP_CDDDAR: x = car (x); goto op_cdddr;
4595 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4204 4596
4205 case OP_CONS: /* cons */ 4597 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4598 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4599 s_return (args);
4208 4600
4209 case OP_SETCAR: /* set-car! */ 4601 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4602 if (!is_immutable (x))
4211 { 4603 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4604 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4605 s_return (car (args));
4214 } 4606 }
4215 else 4607 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4608 Error_0 ("set-car!: unable to alter immutable pair");
4217 4609
4218 case OP_SETCDR: /* set-cdr! */ 4610 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4611 if (!is_immutable (x))
4220 { 4612 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4613 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4614 s_return (car (args));
4223 } 4615 }
4224 else 4616 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4617 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4618
4227 case OP_CHAR2INT: /* char->integer */ 4619 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4620 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4621
4230 case OP_INT2CHAR: /* integer->char */ 4622 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4623 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4624
4233 case OP_CHARUPCASE: 4625 case OP_CHARUPCASE:
4234 { 4626 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4627 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4628 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4629 s_return (mk_character (SCHEME_A_ c));
4238 } 4630 }
4239 4631
4240 case OP_CHARDNCASE: 4632 case OP_CHARDNCASE:
4241 { 4633 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4634 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4635 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4636 s_return (mk_character (SCHEME_A_ c));
4245 } 4637 }
4246 4638
4247 case OP_STR2SYM: /* string->symbol */ 4639 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4640 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4641
4250 case OP_STR2ATOM: /* string->atom */ 4642 case OP_STR2ATOM: /* string->atom */
4251 { 4643 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4644 char *s = strvalue (x);
4253 long pf = 0; 4645 long pf = 0;
4254 4646
4255 if (cdr (SCHEME_V->args) != NIL) 4647 if (cdr (args) != NIL)
4256 { 4648 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4649 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4650 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4651 pf = ivalue_unchecked (cadr (args));
4260 4652
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4653 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4654 {
4263 /* base is OK */ 4655 /* base is OK */
4264 } 4656 }
4265 else 4657 else
4266 pf = -1; 4658 pf = -1;
4267 } 4659 }
4268 4660
4269 if (pf < 0) 4661 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4662 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4663 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4664 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4665 else
4274 { 4666 {
4275 if (pf == 0 || pf == 10) 4667 if (pf == 0 || pf == 10)
… …
4286 } 4678 }
4287 } 4679 }
4288 } 4680 }
4289 4681
4290 case OP_SYM2STR: /* symbol->string */ 4682 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4683 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4684 setimmutable (x);
4293 s_return (x); 4685 s_return (x);
4294 4686
4295 case OP_ATOM2STR: /* atom->string */ 4687 case OP_ATOM2STR: /* atom->string */
4296 { 4688 {
4297 long pf = 0; 4689 long pf = 0;
4298 4690
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4691 if (cdr (args) != NIL)
4302 { 4692 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4693 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4694 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4695 pf = ivalue_unchecked (cadr (args));
4306 4696
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4697 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4698 {
4309 /* base is OK */ 4699 /* base is OK */
4310 } 4700 }
4311 else 4701 else
4312 pf = -1; 4702 pf = -1;
4313 } 4703 }
4314 4704
4315 if (pf < 0) 4705 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4706 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4707 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4708 {
4319 char *p; 4709 char *p;
4320 int len; 4710 int len;
4321 4711
… …
4326 Error_1 ("atom->string: not an atom:", x); 4716 Error_1 ("atom->string: not an atom:", x);
4327 } 4717 }
4328 4718
4329 case OP_MKSTRING: /* make-string */ 4719 case OP_MKSTRING: /* make-string */
4330 { 4720 {
4331 int fill = ' '; 4721 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4722 int len = ivalue_unchecked (x);
4333 4723
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4724 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4725 }
4341 4726
4342 case OP_STRLEN: /* string-length */ 4727 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4728 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4729
4345 case OP_STRREF: /* string-ref */ 4730 case OP_STRREF: /* string-ref */
4346 { 4731 {
4347 char *str; 4732 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4733 int index = ivalue_unchecked (cadr (args));
4353 4734
4354 if (index >= strlength (car (SCHEME_V->args))) 4735 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4736 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4737
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4738 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4739 }
4359 4740
4360 case OP_STRSET: /* string-set! */ 4741 case OP_STRSET: /* string-set! */
4361 { 4742 {
4362 char *str; 4743 char *str = strvalue (x);
4363 int index; 4744 int index = ivalue_unchecked (cadr (args));
4364 int c; 4745 int c;
4365 4746
4366 if (is_immutable (car (SCHEME_V->args))) 4747 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4748 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4749
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4750 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4751 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4752
4376 c = charvalue (caddr (SCHEME_V->args)); 4753 c = charvalue (caddr (args));
4377 4754
4378 str[index] = (char) c; 4755 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4756 s_return (car (args));
4380 } 4757 }
4381 4758
4382 case OP_STRAPPEND: /* string-append */ 4759 case OP_STRAPPEND: /* string-append */
4383 { 4760 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4761 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4762 int len = 0;
4386 pointer newstr; 4763 pointer newstr;
4387 char *pos; 4764 char *pos;
4388 4765
4389 /* compute needed length for new string */ 4766 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4767 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4768 len += strlength (car (x));
4392 4769
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4770 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4771
4395 /* store the contents of the argument strings into the new string */ 4772 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4773 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4774 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4775
4399 s_return (newstr); 4776 s_return (newstr);
4400 } 4777 }
4401 4778
4402 case OP_SUBSTR: /* substring */ 4779 case OP_STRING_COPY: /* substring/string-copy */
4403 { 4780 {
4404 char *str; 4781 char *str = strvalue (x);
4405 int index0; 4782 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4406 int index1; 4783 int index1;
4407 int len; 4784 int len;
4408 4785
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4786 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4787 Error_1 ("string->copy: start out of bounds:", cadr (args));
4415 4788
4416 if (cddr (SCHEME_V->args) != NIL) 4789 if (cddr (args) != NIL)
4417 { 4790 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4791 index1 = ivalue_unchecked (caddr (args));
4419 4792
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4793 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4794 Error_1 ("string->copy: end out of bounds:", caddr (args));
4422 } 4795 }
4423 else 4796 else
4424 index1 = strlength (car (SCHEME_V->args)); 4797 index1 = strlength (x);
4425 4798
4426 len = index1 - index0; 4799 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4800 x = mk_counted_string (SCHEME_A_ str + index0, len);
4428 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0;
4430 4801
4431 s_return (x); 4802 s_return (x);
4432 } 4803 }
4433 4804
4434 case OP_VECTOR: /* vector */ 4805 case OP_VECTOR: /* vector */
4435 { 4806 {
4436 int i; 4807 int i;
4437 pointer vec; 4808 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4809 int len = list_length (SCHEME_A_ args);
4439 4810
4440 if (len < 0) 4811 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4812 Error_1 ("vector: not a proper list:", args);
4442 4813
4443 vec = mk_vector (SCHEME_A_ len); 4814 vec = mk_vector (SCHEME_A_ len);
4444 4815
4445#if USE_ERROR_CHECKING 4816#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4817 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4818 s_return (S_SINK);
4448#endif 4819#endif
4449 4820
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4821 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4822 vector_set (vec, i, car (x));
4452 4823
4453 s_return (vec); 4824 s_return (vec);
4454 } 4825 }
4455 4826
4456 case OP_MKVECTOR: /* make-vector */ 4827 case OP_MKVECTOR: /* make-vector */
4457 { 4828 {
4458 pointer fill = NIL; 4829 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4830 pointer vec;
4831 int len = ivalue_unchecked (x);
4461 4832
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4833 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4834 fill = cadr (args);
4466 4835
4467 vec = mk_vector (SCHEME_A_ len); 4836 vec = mk_vector (SCHEME_A_ len);
4468 4837
4469#if USE_ERROR_CHECKING 4838#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4839 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4840 s_return (S_SINK);
4472#endif 4841#endif
4473 4842
4474 if (fill != NIL) 4843 if (fill != NIL)
4475 fill_vector (vec, fill); 4844 fill_vector (vec, 0, fill);
4476 4845
4477 s_return (vec); 4846 s_return (vec);
4478 } 4847 }
4479 4848
4480 case OP_VECLEN: /* vector-length */ 4849 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4850 s_return (mk_integer (SCHEME_A_ veclength (x)));
4851
4852 case OP_VECRESIZE:
4853 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4854 s_return (x);
4482 4855
4483 case OP_VECREF: /* vector-ref */ 4856 case OP_VECREF: /* vector-ref */
4484 { 4857 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4858 int index = ivalue_unchecked (cadr (args));
4488 4859
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4860 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4861 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4862
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4863 s_return (vector_get (x, index));
4493 } 4864 }
4494 4865
4495 case OP_VECSET: /* vector-set! */ 4866 case OP_VECSET: /* vector-set! */
4496 { 4867 {
4497 int index; 4868 int index = ivalue_unchecked (cadr (args));
4498 4869
4499 if (is_immutable (car (SCHEME_V->args))) 4870 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4871 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4872
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4873 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4874 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4875
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4876 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4877 s_return (x);
4509 } 4878 }
4510 } 4879 }
4511 4880
4512 return S_T; 4881 if (USE_ERROR_CHECKING) abort ();
4513} 4882}
4514 4883
4515INTERFACE int 4884/* relational ops */
4516is_list (SCHEME_P_ pointer a) 4885ecb_hot static int
4886opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4887{
4518 return list_length (SCHEME_A_ a) >= 0; 4888 pointer x = SCHEME_V->args;
4519}
4520 4889
4521/* Result is: 4890 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4891 {
4892 num v = nvalue (car (x));
4893 x = cdr (x);
4894
4537 if (fast == NIL) 4895 if (x == NIL)
4538 return i; 4896 break;
4539 4897
4540 if (!is_pair (fast)) 4898 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4899
4543 fast = cdr (fast); 4900 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4901 {
4561 /* the fast pointer has looped back around and caught up 4902 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4903 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4904 case OP_GRE: r = r > 0; break;
4564 return -1; 4905 case OP_LEQ: r = r <= 0; break;
4906 case OP_GEQ: r = r >= 0; break;
4565 } 4907 }
4566 }
4567}
4568 4908
4569static pointer 4909 if (!r)
4910 s_return (S_F);
4911 }
4912
4913 s_return (S_T);
4914}
4915
4916/* predicates */
4917ecb_hot static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4918opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4919{
4572 pointer x; 4920 pointer args = SCHEME_V->args;
4573 num v; 4921 pointer a = car (args);
4574 int (*comp_func) (num, num); 4922 pointer d = cdr (args);
4923 int r;
4575 4924
4576 switch (op) 4925 switch (op)
4577 { 4926 {
4578 case OP_NOT: /* not */ 4927 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4928 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4929 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4930 case OP_NULLP: /* null? */ r = a == NIL ; break;
4931 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4932 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4933 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4934 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4935 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4936 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4937 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4938
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4939#if USE_CHAR_CLASSIFIERS
4650 4940 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4941 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4942 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4943 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4944 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4945#endif
4946
4666#if USE_PORTS 4947#if USE_PORTS
4667 4948 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4949 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4950 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4951#endif
4677 4952
4678 case OP_PROCP: /* procedure? */ 4953 case OP_PROCP: /* procedure? */
4679 4954
4680 /*-- 4955 /*--
4681 * continuation should be procedure by the example 4956 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4957 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4958 * in R^3 report sec. 6.9
4684 */ 4959 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4960 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4961 break;
4687 4962
4688 case OP_PAIRP: /* pair? */ 4963 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4964 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4965 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4966 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4967 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4968 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4969 }
4706 4970
4707 return S_T; 4971 s_retbool (r);
4708} 4972}
4709 4973
4710static pointer 4974/* promises, list ops, ports */
4975ecb_hot static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4976opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4977{
4978 pointer args = SCHEME_V->args;
4979 pointer a = car (args);
4713 pointer x, y; 4980 pointer x, y;
4714 4981
4715 switch (op) 4982 switch (op)
4716 { 4983 {
4717 case OP_FORCE: /* force */ 4984 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4985 SCHEME_V->code = a;
4719 4986
4720 if (is_promise (SCHEME_V->code)) 4987 if (is_promise (SCHEME_V->code))
4721 { 4988 {
4722 /* Should change type to closure here */ 4989 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4990 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4726 } 4993 }
4727 else 4994 else
4728 s_return (SCHEME_V->code); 4995 s_return (SCHEME_V->code);
4729 4996
4730 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4997 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4731 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4998 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4732 s_return (SCHEME_V->value); 4999 s_return (SCHEME_V->value);
4733 5000
4734#if USE_PORTS 5001#if USE_PORTS
5002
5003 case OP_EOF_OBJECT: /* eof-object */
5004 s_return (S_EOF);
4735 5005
4736 case OP_WRITE: /* write */ 5006 case OP_WRITE: /* write */
4737 case OP_DISPLAY: /* display */ 5007 case OP_DISPLAY: /* display */
4738 case OP_WRITE_CHAR: /* write-char */ 5008 case OP_WRITE_CHAR: /* write-char */
4739 if (is_pair (cdr (SCHEME_V->args))) 5009 if (is_pair (cdr (SCHEME_V->args)))
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5014 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 5015 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 5016 }
4747 } 5017 }
4748 5018
4749 SCHEME_V->args = car (SCHEME_V->args); 5019 SCHEME_V->args = a;
4750 5020
4751 if (op == OP_WRITE) 5021 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 5022 SCHEME_V->print_flag = 1;
4753 else 5023 else
4754 SCHEME_V->print_flag = 0; 5024 SCHEME_V->print_flag = 0;
4755 5025
4756 s_goto (OP_P0LIST); 5026 s_goto (OP_P0LIST);
4757 5027
5028 //TODO: move to scheme
4758 case OP_NEWLINE: /* newline */ 5029 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 5030 if (is_pair (args))
4760 { 5031 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 5032 if (a != SCHEME_V->outport)
4762 { 5033 {
4763 x = cons (SCHEME_V->outport, NIL); 5034 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5035 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 5036 SCHEME_V->outport = a;
4766 } 5037 }
4767 } 5038 }
4768 5039
4769 putstr (SCHEME_A_ "\n"); 5040 putcharacter (SCHEME_A_ '\n');
4770 s_return (S_T); 5041 s_return (S_T);
4771#endif 5042#endif
4772 5043
4773 case OP_ERR0: /* error */ 5044 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 5045 SCHEME_V->retcode = -1;
4775 5046
4776 if (!is_string (car (SCHEME_V->args))) 5047 if (!is_string (a))
4777 { 5048 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 5049 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 5050 setimmutable (car (args));
4780 } 5051 }
4781 5052
4782 putstr (SCHEME_A_ "Error: "); 5053 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 5054 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 5055 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 5056 s_goto (OP_ERR1);
4786 5057
4787 case OP_ERR1: /* error */ 5058 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 5059 putcharacter (SCHEME_A_ ' ');
4789 5060
4790 if (SCHEME_V->args != NIL) 5061 if (args != NIL)
4791 { 5062 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 5063 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 5064 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 5065 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 5066 s_goto (OP_P0LIST);
4796 } 5067 }
4797 else 5068 else
4798 { 5069 {
4799 putstr (SCHEME_A_ "\n"); 5070 putcharacter (SCHEME_A_ '\n');
4800 5071
4801 if (SCHEME_V->interactive_repl) 5072 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 5073 s_goto (OP_T0LVL);
4803 else 5074 else
4804 return NIL; 5075 return -1;
4805 } 5076 }
4806 5077
4807 case OP_REVERSE: /* reverse */ 5078 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 5079 s_return (reverse (SCHEME_A_ a));
4809 5080
4810 case OP_LIST_STAR: /* list* */ 5081 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 5082 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 5083
4813 case OP_APPEND: /* append */ 5084 case OP_APPEND: /* append */
4814 x = NIL; 5085 x = NIL;
4815 y = SCHEME_V->args; 5086 y = args;
4816 5087
4817 if (y == x) 5088 if (y == x)
4818 s_return (x); 5089 s_return (x);
4819 5090
4820 /* cdr() in the while condition is not a typo. If car() */ 5091 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 5102 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 5103
4833#if USE_PLIST 5104#if USE_PLIST
4834 5105
4835 case OP_PUT: /* put */ 5106 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 5107 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 5108 Error_0 ("illegal use of put");
4838 5109
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 5110 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 5111 {
4841 if (caar (x) == y) 5112 if (caar (x) == y)
4842 break; 5113 break;
4843 } 5114 }
4844 5115
4845 if (x != NIL) 5116 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 5117 cdar (x) = caddr (args);
4847 else 5118 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 5119 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 5120
4850 s_return (S_T); 5121 s_return (S_T);
4851 5122
4852 case OP_GET: /* get */ 5123 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 5124 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 5125 Error_0 ("illegal use of get");
4855 5126
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 5127 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 5128 if (caar (x) == y)
4858 break; 5129 break;
4859 5130
4860 if (x != NIL) 5131 if (x != NIL)
4861 s_return (cdar (x)); 5132 s_return (cdar (x));
… …
4863 s_return (NIL); 5134 s_return (NIL);
4864 5135
4865#endif /* USE_PLIST */ 5136#endif /* USE_PLIST */
4866 5137
4867 case OP_QUIT: /* quit */ 5138 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 5139 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 5140 SCHEME_V->retcode = ivalue (a);
4870 5141
4871 return NIL; 5142 return -1;
4872 5143
4873 case OP_GC: /* gc */ 5144 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 5145 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 5146 s_return (S_T);
4876 5147
4877 case OP_GCVERB: /* gc-verbose */ 5148 case OP_GCVERB: /* gc-verbose */
4878 { 5149 {
4879 int was = SCHEME_V->gc_verbose; 5150 int was = SCHEME_V->gc_verbose;
4880 5151
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 5152 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 5153 s_retbool (was);
4883 } 5154 }
4884 5155
4885 case OP_NEWSEGMENT: /* new-segment */ 5156 case OP_NEWSEGMENT: /* new-segment */
5157#if 0
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 5158 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 5159 Error_0 ("new-segment: argument must be a number");
4888 5160#endif
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 5161 s_retbool (alloc_cellseg (SCHEME_A));
4890
4891 s_return (S_T);
4892 5162
4893 case OP_OBLIST: /* oblist */ 5163 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 5164 s_return (oblist_all_symbols (SCHEME_A));
4895 5165
4896#if USE_PORTS 5166#if USE_PORTS
… …
4921 case OP_OPEN_INOUTFILE: 5191 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 5192 prop = port_input | port_output;
4923 break; 5193 break;
4924 } 5194 }
4925 5195
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 5196 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 5197
4928 if (p == NIL) 5198 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 5199 }
4933 5200
4934# if USE_STRING_PORTS 5201# if USE_STRING_PORTS
4935 5202
4936 case OP_OPEN_INSTRING: /* open-input-string */ 5203 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 5215 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 5216 prop = port_input | port_output;
4950 break; 5217 break;
4951 } 5218 }
4952 5219
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 5220 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 5221 strvalue (a) + strlength (a), prop);
4955 5222
4956 if (p == NIL) 5223 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 5224 }
4961 5225
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 5226 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 5227 {
4964 pointer p; 5228 pointer p;
4965 5229
4966 if (car (SCHEME_V->args) == NIL) 5230 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 5231 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 5232 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 5233 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 5234 strvalue (a) + strlength (a), port_output);
4977 5235
4978 if (p == NIL) 5236 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 5237 }
4984 5238
4985 case OP_GET_OUTSTRING: /* get-output-string */ 5239 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 5240 {
4987 port *p; 5241 port *p = port (a);
4988 5242
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 5243 if (p->kind & port_string)
4990 { 5244 {
4991 off_t size; 5245 off_t size;
4992 char *str; 5246 char *str;
4993 5247
4994 size = p->rep.string.curr - p->rep.string.start + 1; 5248 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 5264 }
5011 5265
5012# endif 5266# endif
5013 5267
5014 case OP_CLOSE_INPORT: /* close-input-port */ 5268 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 5269 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 5270 s_return (S_T);
5017 5271
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 5272 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 5273 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 5274 s_return (S_T);
5021#endif 5275#endif
5022 5276
5023 case OP_INT_ENV: /* interaction-environment */ 5277 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 5278 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 5280 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 5281 s_return (SCHEME_V->envir);
5028 5282
5029 } 5283 }
5030 5284
5031 return S_T; 5285 if (USE_ERROR_CHECKING) abort ();
5032} 5286}
5033 5287
5034static pointer 5288/* reading */
5289ecb_cold static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5290opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 5291{
5292 pointer args = SCHEME_V->args;
5037 pointer x; 5293 pointer x;
5038 5294
5039 if (SCHEME_V->nesting != 0) 5295 if (SCHEME_V->nesting != 0)
5040 { 5296 {
5041 int n = SCHEME_V->nesting; 5297 int n = SCHEME_V->nesting;
… …
5048 switch (op) 5304 switch (op)
5049 { 5305 {
5050 /* ========== reading part ========== */ 5306 /* ========== reading part ========== */
5051#if USE_PORTS 5307#if USE_PORTS
5052 case OP_READ: 5308 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 5309 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 5310 s_goto (OP_READ_INTERNAL);
5055 5311
5056 if (!is_inport (car (SCHEME_V->args))) 5312 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 5313 Error_1 ("read: not an input port:", car (args));
5058 5314
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 5315 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 5316 s_goto (OP_READ_INTERNAL);
5061 5317
5062 x = SCHEME_V->inport; 5318 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 5319 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 5320 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 5321 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 5322 s_goto (OP_READ_INTERNAL);
5067 5323
5068 case OP_READ_CHAR: /* read-char */ 5324 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 5325 case OP_PEEK_CHAR: /* peek-char */
5070 { 5326 {
5071 int c; 5327 int c;
5072 5328
5073 if (is_pair (SCHEME_V->args)) 5329 if (is_pair (args))
5074 { 5330 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 5331 if (car (args) != SCHEME_V->inport)
5076 { 5332 {
5077 x = SCHEME_V->inport; 5333 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 5334 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 5335 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 5336 SCHEME_V->inport = car (args);
5081 } 5337 }
5082 } 5338 }
5083 5339
5084 c = inchar (SCHEME_A); 5340 c = inchar (SCHEME_A);
5085 5341
… …
5095 case OP_CHAR_READY: /* char-ready? */ 5351 case OP_CHAR_READY: /* char-ready? */
5096 { 5352 {
5097 pointer p = SCHEME_V->inport; 5353 pointer p = SCHEME_V->inport;
5098 int res; 5354 int res;
5099 5355
5100 if (is_pair (SCHEME_V->args)) 5356 if (is_pair (args))
5101 p = car (SCHEME_V->args); 5357 p = car (args);
5102 5358
5103 res = p->object.port->kind & port_string; 5359 res = port (p)->kind & port_string;
5104 5360
5105 s_retbool (res); 5361 s_retbool (res);
5106 } 5362 }
5107 5363
5108 case OP_SET_INPORT: /* set-input-port */ 5364 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 5365 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 5366 s_return (SCHEME_V->value);
5111 5367
5112 case OP_SET_OUTPORT: /* set-output-port */ 5368 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 5369 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 5370 s_return (SCHEME_V->value);
5115#endif 5371#endif
5116 5372
5117 case OP_RDSEXPR: 5373 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 5374 switch (SCHEME_V->tok)
5119 { 5375 {
5120 case TOK_EOF: 5376 case TOK_EOF:
5121 s_return (S_EOF); 5377 s_return (S_EOF);
5122 /* NOTREACHED */
5123 5378
5124 case TOK_VEC: 5379 case TOK_VEC:
5125 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5380 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5126 /* fall through */ 5381 /* fall through */
5127 5382
… …
5130 5385
5131 if (SCHEME_V->tok == TOK_RPAREN) 5386 if (SCHEME_V->tok == TOK_RPAREN)
5132 s_return (NIL); 5387 s_return (NIL);
5133 else if (SCHEME_V->tok == TOK_DOT) 5388 else if (SCHEME_V->tok == TOK_DOT)
5134 Error_0 ("syntax error: illegal dot expression"); 5389 Error_0 ("syntax error: illegal dot expression");
5135 else 5390
5136 {
5137 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5391 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
5138 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5392 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
5139 s_goto (OP_RDSEXPR); 5393 s_goto (OP_RDSEXPR);
5140 }
5141 5394
5142 case TOK_QUOTE: 5395 case TOK_QUOTE:
5143 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5396 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5144 SCHEME_V->tok = token (SCHEME_A); 5397 SCHEME_V->tok = token (SCHEME_A);
5145 s_goto (OP_RDSEXPR); 5398 s_goto (OP_RDSEXPR);
… …
5151 { 5404 {
5152 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5405 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5153 SCHEME_V->tok = TOK_LPAREN; 5406 SCHEME_V->tok = TOK_LPAREN;
5154 s_goto (OP_RDSEXPR); 5407 s_goto (OP_RDSEXPR);
5155 } 5408 }
5156 else 5409
5157 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5410 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5158
5159 s_goto (OP_RDSEXPR); 5411 s_goto (OP_RDSEXPR);
5160 5412
5161 case TOK_COMMA: 5413 case TOK_COMMA:
5162 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5414 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5163 SCHEME_V->tok = token (SCHEME_A); 5415 SCHEME_V->tok = token (SCHEME_A);
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5419 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5420 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5421 s_goto (OP_RDSEXPR);
5170 5422
5171 case TOK_ATOM: 5423 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5424 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5425
5426 case TOK_DOTATOM:
5427 SCHEME_V->strbuff[0] = '.';
5428 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5429
5430 case TOK_STRATOM:
5431 //TODO: haven't checked whether the garbage collector could interfere and free x
5432 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5433 x = readstrexp (SCHEME_A_ '|');
5434 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5435
5174 case TOK_DQUOTE: 5436 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5437 x = readstrexp (SCHEME_A_ '"');
5176 5438
5177 if (x == S_F) 5439 if (x == S_F)
5178 Error_0 ("Error reading string"); 5440 Error_0 ("Error reading string");
5179 5441
5180 setimmutable (x); 5442 setimmutable (x);
… …
5184 { 5446 {
5185 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5447 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5186 5448
5187 if (f == NIL) 5449 if (f == NIL)
5188 Error_0 ("undefined sharp expression"); 5450 Error_0 ("undefined sharp expression");
5189 else 5451
5190 {
5191 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5452 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5192 s_goto (OP_EVAL); 5453 s_goto (OP_EVAL);
5193 }
5194 } 5454 }
5195 5455
5196 case TOK_SHARP_CONST: 5456 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5457 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5458 Error_0 ("undefined sharp expression");
5199 else 5459
5200 s_return (x); 5460 s_return (x);
5201 5461
5202 default: 5462 default:
5203 Error_0 ("syntax error: illegal token"); 5463 Error_0 ("syntax error: illegal token");
5204 } 5464 }
5205 5465
5206 break; 5466 break;
5207 5467
5208 case OP_RDLIST: 5468 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5469 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5470 SCHEME_V->tok = token (SCHEME_A);
5211 5471
5212 switch (SCHEME_V->tok) 5472 switch (SCHEME_V->tok)
5213 { 5473 {
5214 case TOK_EOF: 5474 case TOK_EOF:
… …
5242 case OP_RDDOT: 5502 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5503 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5504 Error_0 ("syntax error: illegal dot expression");
5245 5505
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5506 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5507 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5508
5249 case OP_RDQUOTE: 5509 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5510 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5511
5252 case OP_RDQQUOTE: 5512 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5534 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5535 s_goto (OP_VECTOR);
5276 5536
5277 /* ========== printing part ========== */ 5537 /* ========== printing part ========== */
5278 case OP_P0LIST: 5538 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5539 if (is_vector (args))
5280 { 5540 {
5281 putstr (SCHEME_A_ "#("); 5541 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5542 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5543 s_goto (OP_PVECFROM);
5284 } 5544 }
5285 else if (is_environment (SCHEME_V->args)) 5545 else if (is_environment (args))
5286 { 5546 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5547 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5548 s_return (S_T);
5289 } 5549 }
5290 else if (!is_pair (SCHEME_V->args)) 5550 else if (!is_pair (args))
5291 { 5551 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5552 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5553 s_return (S_T);
5294 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5296 {
5297 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args);
5299 s_goto (OP_P0LIST);
5300 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5302 {
5303 putstr (SCHEME_A_ "`");
5304 SCHEME_V->args = cadr (SCHEME_V->args);
5305 s_goto (OP_P0LIST);
5306 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 } 5554 }
5319 else 5555 else
5320 { 5556 {
5557 pointer a = car (args);
5558 pointer b = cdr (args);
5559 int ok_abbr = ok_abbrev (b);
5560 SCHEME_V->args = car (b);
5561
5562 if (a == SCHEME_V->QUOTE && ok_abbr)
5563 putcharacter (SCHEME_A_ '\'');
5564 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5565 putcharacter (SCHEME_A_ '`');
5566 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5567 putcharacter (SCHEME_A_ ',');
5568 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5321 putstr (SCHEME_A_ "("); 5569 putstr (SCHEME_A_ ",@");
5570 else
5571 {
5572 putcharacter (SCHEME_A_ '(');
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL); 5573 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5323 SCHEME_V->args = car (SCHEME_V->args); 5574 SCHEME_V->args = a;
5575 }
5576
5324 s_goto (OP_P0LIST); 5577 s_goto (OP_P0LIST);
5325 } 5578 }
5326 5579
5327 case OP_P1LIST: 5580 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args)) 5581 if (is_pair (args))
5329 { 5582 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL); 5583 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5331 putstr (SCHEME_A_ " "); 5584 putcharacter (SCHEME_A_ ' ');
5332 SCHEME_V->args = car (SCHEME_V->args); 5585 SCHEME_V->args = car (args);
5333 s_goto (OP_P0LIST); 5586 s_goto (OP_P0LIST);
5334 } 5587 }
5335 else if (is_vector (SCHEME_V->args)) 5588 else if (is_vector (args))
5336 { 5589 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5590 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5591 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5592 s_goto (OP_P0LIST);
5340 } 5593 }
5341 else 5594 else
5342 { 5595 {
5343 if (SCHEME_V->args != NIL) 5596 if (args != NIL)
5344 { 5597 {
5345 putstr (SCHEME_A_ " . "); 5598 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5599 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5600 }
5348 5601
5349 putstr (SCHEME_A_ ")"); 5602 putcharacter (SCHEME_A_ ')');
5350 s_return (S_T); 5603 s_return (S_T);
5351 } 5604 }
5352 5605
5353 case OP_PVECFROM: 5606 case OP_PVECFROM:
5354 { 5607 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5608 IVALUE i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5609 pointer vec = car (args);
5357 int len = veclength (vec); 5610 uint32_t len = veclength (vec);
5358 5611
5359 if (i == len) 5612 if (i == len)
5360 { 5613 {
5361 putstr (SCHEME_A_ ")"); 5614 putcharacter (SCHEME_A_ ')');
5362 s_return (S_T); 5615 s_return (S_T);
5363 } 5616 }
5364 else 5617 else
5365 { 5618 {
5366 pointer elem = vector_elem (vec, i); 5619 pointer elem = vector_get (vec, i);
5367 5620
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5621 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5622 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5623 SCHEME_V->args = elem;
5371 5624
5372 if (i > 0) 5625 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5626 putcharacter (SCHEME_A_ ' ');
5374 5627
5375 s_goto (OP_P0LIST); 5628 s_goto (OP_P0LIST);
5376 } 5629 }
5377 } 5630 }
5378 } 5631 }
5379 5632
5380 return S_T; 5633 if (USE_ERROR_CHECKING) abort ();
5381} 5634}
5382 5635
5383static pointer 5636/* list ops */
5637ecb_hot static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5638opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5639{
5640 pointer args = SCHEME_V->args;
5641 pointer a = car (args);
5386 pointer x, y; 5642 pointer x, y;
5387 5643
5388 switch (op) 5644 switch (op)
5389 { 5645 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5646 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5647 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5648 long v = list_length (SCHEME_A_ a);
5393 5649
5394 if (v < 0) 5650 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5651 Error_1 ("length: not a list:", a);
5396 5652
5397 s_return (mk_integer (SCHEME_A_ v)); 5653 s_return (mk_integer (SCHEME_A_ v));
5398 } 5654 }
5399 5655
5400 case OP_ASSQ: /* assq *//* a.k */ 5656 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5657 x = a;
5402 5658
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5659 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5660 {
5405 if (!is_pair (car (y))) 5661 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5662 Error_0 ("unable to handle non pair element");
5407 5663
5408 if (x == caar (y)) 5664 if (x == caar (y))
5409 break; 5665 break;
5410 } 5666 }
5411 5667
5412 if (is_pair (y)) 5668 if (is_pair (y))
5413 s_return (car (y)); 5669 s_return (car (y));
5414 else 5670
5415 s_return (S_F); 5671 s_return (S_F);
5416
5417 5672
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5673 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5674 SCHEME_V->args = a;
5420 5675
5421 if (SCHEME_V->args == NIL) 5676 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5677 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5678 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5679 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5425 else if (is_macro (SCHEME_V->args)) 5680
5426 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5427 else
5428 s_return (S_F); 5681 s_return (S_F);
5429 5682
5430 case OP_CLOSUREP: /* closure? */ 5683 case OP_CLOSUREP: /* closure? */
5431 /* 5684 /*
5432 * Note, macro object is also a closure. 5685 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5686 * Therefore, (closure? <#MACRO>) ==> #t
5687 * (schmorp) well, obviously not, fix? TODO
5434 */ 5688 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5689 s_retbool (is_closure (a));
5436 5690
5437 case OP_MACROP: /* macro? */ 5691 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5692 s_retbool (is_macro (a));
5439 } 5693 }
5440 5694
5441 return S_T; /* NOTREACHED */ 5695 if (USE_ERROR_CHECKING) abort ();
5442} 5696}
5443 5697
5698/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5699typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5700
5446typedef int (*test_predicate) (pointer); 5701typedef int (*test_predicate)(pointer);
5447static int 5702
5703ecb_hot static int
5448is_any (pointer p) 5704tst_any (pointer p)
5449{ 5705{
5450 return 1; 5706 return 1;
5451} 5707}
5452 5708
5453static int 5709ecb_hot static int
5454is_nonneg (pointer p) 5710tst_inonneg (pointer p)
5455{ 5711{
5456 return ivalue (p) >= 0 && is_integer (p); 5712 return is_integer (p) && ivalue_unchecked (p) >= 0;
5713}
5714
5715ecb_hot static int
5716tst_is_list (SCHEME_P_ pointer p)
5717{
5718 return p == NIL || is_pair (p);
5457} 5719}
5458 5720
5459/* Correspond carefully with following defines! */ 5721/* Correspond carefully with following defines! */
5460static struct 5722static struct
5461{ 5723{
5462 test_predicate fct; 5724 test_predicate fct;
5463 const char *kind; 5725 const char *kind;
5464} tests[] = 5726} tests[] = {
5465{ 5727 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5728 { is_string , "string" },
5467 { is_any, 0}, 5729 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5730 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5731 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5732 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5733 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5734 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5735 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5736 { is_character , "character" },
5477 { is_vector, "vector" }, 5737 { is_vector , "vector" },
5478 { is_number, "number" }, 5738 { is_number , "number" },
5479 { is_integer, "integer" }, 5739 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5740 { tst_inonneg , "non-negative integer" }
5481}; 5741};
5482 5742
5483#define TST_NONE 0 5743#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5744#define TST_ANY "\001"
5485#define TST_STRING "\002" 5745#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5746#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5747#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5748#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5749#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5750#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5751#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5752#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5753#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5754#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5755#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5756#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5757#define TST_NATURAL "\016"
5758
5759#define INF_ARG 0xff
5760#define UNNAMED_OP ""
5761
5762static const char opnames[] =
5763#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5764#include "opdefines.h"
5765#undef OP_DEF
5766;
5767
5768ecb_cold static const char *
5769opname (int idx)
5770{
5771 const char *name = opnames;
5772
5773 /* should do this at compile time, but would require external program, right? */
5774 while (idx--)
5775 name += strlen (name) + 1;
5776
5777 return *name ? name : "ILLEGAL";
5778}
5779
5780ecb_cold static const char *
5781procname (pointer x)
5782{
5783 return opname (procnum (x));
5784}
5498 5785
5499typedef struct 5786typedef struct
5500{ 5787{
5501 dispatch_func func; 5788 uint8_t func;
5502 char *name; 5789 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5790 uint8_t builtin;
5791#if USE_ERROR_CHECKING
5503 int min_arity; 5792 uint8_t min_arity;
5504 int max_arity; 5793 uint8_t max_arity;
5505 char *arg_tests_encoding; 5794 char arg_tests_encoding[3];
5795#endif
5506} op_code_info; 5796} op_code_info;
5507 5797
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5798static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5799#if USE_ERROR_CHECKING
5800#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5801#else
5802#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5803#endif
5512#include "opdefines.h" 5804#include "opdefines.h"
5805#undef OP_DEF
5513 {0} 5806 {0}
5514}; 5807};
5515 5808
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5809/* kernel of this interpreter */
5529static void 5810ecb_hot static void
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5811Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5812{
5532 SCHEME_V->op = op; 5813 SCHEME_V->op = op;
5533 5814
5534 for (;;) 5815 for (;;)
5535 { 5816 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5817 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5818
5538#if USE_ERROR_CHECKING 5819#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5820 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5821 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5822 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5823 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5824
5545 /* Check number of arguments */ 5825 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5826 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5827 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5828 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5829 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5830 xError_1 (SCHEME_A_ msg, 0);
5831 continue;
5551 } 5832 }
5552 5833 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5834 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5835 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5836 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5837 xError_1 (SCHEME_A_ msg, 0);
5838 continue;
5558 } 5839 }
5559 5840 else
5560 if (ok)
5561 { 5841 {
5562 if (pcd->arg_tests_encoding) 5842 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5843 {
5564 int i = 0; 5844 int i = 0;
5565 int j; 5845 int j;
5566 const char *t = pcd->arg_tests_encoding; 5846 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5847 pointer arglist = SCHEME_V->args;
5568 5848
5569 do 5849 do
5570 { 5850 {
5571 pointer arg = car (arglist); 5851 pointer arg = car (arglist);
5572 5852
5573 j = (int) t[0]; 5853 j = t[0];
5574 5854
5855 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5856 if (j == TST_LIST[0])
5576 { 5857 {
5577 if (arg != NIL && !is_pair (arg)) 5858 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5859 break;
5579 } 5860 }
5580 else 5861 else
5581 { 5862 {
5582 if (!tests[j].fct (arg)) 5863 if (!tests[j - 1].fct (arg))
5583 break; 5864 break;
5584 } 5865 }
5585 5866
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5867 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5868 t++;
5588 5869
5589 arglist = cdr (arglist); 5870 arglist = cdr (arglist);
5590 i++; 5871 i++;
5591 } 5872 }
5592 while (i < n); 5873 while (i < n);
5593 5874
5594 if (i < n) 5875 if (i < n)
5595 { 5876 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5877 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5878 xError_1 (SCHEME_A_ msg, 0);
5879 continue;
5598 } 5880 }
5599 } 5881 }
5600 } 5882 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5883 }
5610#endif 5884#endif
5611 5885
5612 ok_to_freely_gc (SCHEME_A); 5886 ok_to_freely_gc (SCHEME_A);
5613 5887
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5888 static const dispatch_func dispatch_funcs[] = {
5889 opexe_0,
5890 opexe_1,
5891 opexe_2,
5892 opexe_3,
5893 opexe_4,
5894 opexe_5,
5895 opexe_6,
5896 };
5897
5898 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5899 return;
5616 5900
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5901 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5902 {
5619 xwrstr ("No memory!\n"); 5903 putstr (SCHEME_A_ "No memory!\n");
5620 return; 5904 return;
5621 } 5905 }
5622 } 5906 }
5623} 5907}
5624 5908
5625/* ========== Initialization of internal keywords ========== */ 5909/* ========== Initialization of internal keywords ========== */
5626 5910
5627static void 5911ecb_cold static void
5628assign_syntax (SCHEME_P_ const char *name) 5912assign_syntax (SCHEME_P_ const char *name)
5629{ 5913{
5630 pointer x = oblist_add_by_name (SCHEME_A_ name); 5914 pointer x = oblist_add_by_name (SCHEME_A_ name);
5631 set_typeflag (x, typeflag (x) | T_SYNTAX); 5915 set_typeflag (x, typeflag (x) | T_SYNTAX);
5632} 5916}
5633 5917
5634static void 5918ecb_cold static void
5635assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5919assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5636{ 5920{
5637 pointer x = mk_symbol (SCHEME_A_ name); 5921 pointer x = mk_symbol (SCHEME_A_ name);
5638 pointer y = mk_proc (SCHEME_A_ op); 5922 pointer y = mk_proc (SCHEME_A_ op);
5639 new_slot_in_env (SCHEME_A_ x, y); 5923 new_slot_in_env (SCHEME_A_ x, y);
… …
5642static pointer 5926static pointer
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5927mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5928{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5929 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5930 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5931 set_ivalue (y, op);
5648 set_num_integer (y);
5649 return y; 5932 return y;
5650} 5933}
5651 5934
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5935/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5936ecb_hot static int
5654syntaxnum (pointer p) 5937syntaxnum (pointer p)
5655{ 5938{
5656 const char *s = strvalue (car (p)); 5939 const char *s = strvalue (p);
5657 5940
5658 switch (strlength (car (p))) 5941 switch (strlength (p))
5659 { 5942 {
5660 case 2: 5943 case 2:
5661 if (s[0] == 'i') 5944 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5945 return OP_IF0; /* if */
5663 else 5946 else
… …
5677 5960
5678 case 'd': 5961 case 'd':
5679 return OP_COND0; /* cond */ 5962 return OP_COND0; /* cond */
5680 5963
5681 case '*': 5964 case '*':
5682 return OP_LET0AST; /* let* */ 5965 return OP_LET0AST;/* let* */
5683 5966
5684 default: 5967 default:
5685 return OP_SET0; /* set! */ 5968 return OP_SET0; /* set! */
5686 } 5969 }
5687 5970
… …
5709 5992
5710 case 'f': 5993 case 'f':
5711 return OP_DEF0; /* define */ 5994 return OP_DEF0; /* define */
5712 5995
5713 default: 5996 default:
5714 return OP_LET0REC; /* letrec */ 5997 return OP_LET0REC;/* letrec */
5715 } 5998 }
5716 5999
5717 default: 6000 default:
5718 return OP_C0STREAM; /* cons-stream */ 6001 return OP_C0STREAM; /* cons-stream */
5719 } 6002 }
5720} 6003}
5721 6004
5722#if USE_MULTIPLICITY 6005#if USE_MULTIPLICITY
5723scheme * 6006ecb_cold scheme *
5724scheme_init_new () 6007scheme_init_new ()
5725{ 6008{
5726 scheme *sc = malloc (sizeof (scheme)); 6009 scheme *sc = malloc (sizeof (scheme));
5727 6010
5728 if (!scheme_init (SCHEME_A)) 6011 if (!scheme_init (SCHEME_A))
… …
5733 else 6016 else
5734 return sc; 6017 return sc;
5735} 6018}
5736#endif 6019#endif
5737 6020
5738int 6021ecb_cold int
5739scheme_init (SCHEME_P) 6022scheme_init (SCHEME_P)
5740{ 6023{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6024 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 6025
6026 /* this memset is not strictly correct, as we assume (intcache)
6027 * that memset 0 will also set pointers to 0, but memset does
6028 * of course not guarantee that. screw such systems.
6029 */
6030 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5743 6031
5744 num_set_fixnum (num_zero, 1); 6032 num_set_fixnum (num_zero, 1);
5745 num_set_ivalue (num_zero, 0); 6033 num_set_ivalue (num_zero, 0);
5746 num_set_fixnum (num_one, 1); 6034 num_set_fixnum (num_one, 1);
5747 num_set_ivalue (num_one, 1); 6035 num_set_ivalue (num_one, 1);
… …
5759 SCHEME_V->save_inport = NIL; 6047 SCHEME_V->save_inport = NIL;
5760 SCHEME_V->loadport = NIL; 6048 SCHEME_V->loadport = NIL;
5761 SCHEME_V->nesting = 0; 6049 SCHEME_V->nesting = 0;
5762 SCHEME_V->interactive_repl = 0; 6050 SCHEME_V->interactive_repl = 0;
5763 6051
5764 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6052 if (!alloc_cellseg (SCHEME_A))
5765 { 6053 {
5766#if USE_ERROR_CHECKING 6054#if USE_ERROR_CHECKING
5767 SCHEME_V->no_memory = 1; 6055 SCHEME_V->no_memory = 1;
5768 return 0; 6056 return 0;
5769#endif 6057#endif
5770 } 6058 }
5771 6059
5772 SCHEME_V->gc_verbose = 0; 6060 SCHEME_V->gc_verbose = 0;
5773 dump_stack_initialize (SCHEME_A); 6061 dump_stack_initialize (SCHEME_A);
5774 SCHEME_V->code = NIL; 6062 SCHEME_V->code = NIL;
5775 SCHEME_V->args = NIL; 6063 SCHEME_V->args = NIL;
5776 SCHEME_V->envir = NIL; 6064 SCHEME_V->envir = NIL;
6065 SCHEME_V->value = NIL;
5777 SCHEME_V->tracing = 0; 6066 SCHEME_V->tracing = 0;
5778 6067
5779 /* init NIL */ 6068 /* init NIL */
5780 set_typeflag (NIL, T_ATOM | T_MARK); 6069 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5781 set_car (NIL, NIL); 6070 set_car (NIL, NIL);
5782 set_cdr (NIL, NIL); 6071 set_cdr (NIL, NIL);
5783 /* init T */ 6072 /* init T */
5784 set_typeflag (S_T, T_ATOM | T_MARK); 6073 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5785 set_car (S_T, S_T); 6074 set_car (S_T, S_T);
5786 set_cdr (S_T, S_T); 6075 set_cdr (S_T, S_T);
5787 /* init F */ 6076 /* init F */
5788 set_typeflag (S_F, T_ATOM | T_MARK); 6077 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5789 set_car (S_F, S_F); 6078 set_car (S_F, S_F);
5790 set_cdr (S_F, S_F); 6079 set_cdr (S_F, S_F);
5791 /* init EOF_OBJ */ 6080 /* init EOF_OBJ */
5792 set_typeflag (S_EOF, T_ATOM | T_MARK); 6081 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5793 set_car (S_EOF, S_EOF); 6082 set_car (S_EOF, S_EOF);
5794 set_cdr (S_EOF, S_EOF); 6083 set_cdr (S_EOF, S_EOF);
5795 /* init sink */ 6084 /* init sink */
5796 set_typeflag (S_SINK, T_PAIR | T_MARK); 6085 set_typeflag (S_SINK, T_PAIR);
5797 set_car (S_SINK, NIL); 6086 set_car (S_SINK, NIL);
5798 6087
5799 /* init c_nest */ 6088 /* init c_nest */
5800 SCHEME_V->c_nest = NIL; 6089 SCHEME_V->c_nest = NIL;
5801 6090
5802 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6091 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5803 /* init global_env */ 6092 /* init global_env */
5804 new_frame_in_env (SCHEME_A_ NIL); 6093 new_frame_in_env (SCHEME_A_ NIL);
5805 SCHEME_V->global_env = SCHEME_V->envir; 6094 SCHEME_V->global_env = SCHEME_V->envir;
5806 /* init else */ 6095 /* init else */
5807 x = mk_symbol (SCHEME_A_ "else"); 6096 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5808 new_slot_in_env (SCHEME_A_ x, S_T);
5809 6097
5810 { 6098 {
5811 static const char *syntax_names[] = { 6099 static const char *syntax_names[] = {
5812 "lambda", "quote", "define", "if", "begin", "set!", 6100 "lambda", "quote", "define", "if", "begin", "set!",
5813 "let", "let*", "letrec", "cond", "delay", "and", 6101 "let", "let*", "letrec", "cond", "delay", "and",
… …
5816 6104
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 6105 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 6106 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 6107 }
5820 6108
6109 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 6110 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 6111 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 6112 assign_proc (SCHEME_A_ i, opname (i));
5824 6113
5825 /* initialization of global pointers to special symbols */ 6114 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 6115 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 6116 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 6117 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5836 6125
5837 return !SCHEME_V->no_memory; 6126 return !SCHEME_V->no_memory;
5838} 6127}
5839 6128
5840#if USE_PORTS 6129#if USE_PORTS
5841void 6130ecb_cold void
5842scheme_set_input_port_file (SCHEME_P_ int fin) 6131scheme_set_input_port_file (SCHEME_P_ int fin)
5843{ 6132{
5844 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6133 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5845} 6134}
5846 6135
5847void 6136ecb_cold void
5848scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6137scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5849{ 6138{
5850 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6139 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5851} 6140}
5852 6141
5853void 6142ecb_cold void
5854scheme_set_output_port_file (SCHEME_P_ int fout) 6143scheme_set_output_port_file (SCHEME_P_ int fout)
5855{ 6144{
5856 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6145 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5857} 6146}
5858 6147
5859void 6148ecb_cold void
5860scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6149scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5861{ 6150{
5862 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6151 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5863} 6152}
5864#endif 6153#endif
5865 6154
5866void 6155ecb_cold void
5867scheme_set_external_data (SCHEME_P_ void *p) 6156scheme_set_external_data (SCHEME_P_ void *p)
5868{ 6157{
5869 SCHEME_V->ext_data = p; 6158 SCHEME_V->ext_data = p;
5870} 6159}
5871 6160
5872void 6161ecb_cold void
5873scheme_deinit (SCHEME_P) 6162scheme_deinit (SCHEME_P)
5874{ 6163{
5875 int i; 6164 int i;
5876 6165
5877#if SHOW_ERROR_LINE 6166#if SHOW_ERROR_LINE
… …
5903 SCHEME_V->loadport = NIL; 6192 SCHEME_V->loadport = NIL;
5904 SCHEME_V->gc_verbose = 0; 6193 SCHEME_V->gc_verbose = 0;
5905 gc (SCHEME_A_ NIL, NIL); 6194 gc (SCHEME_A_ NIL, NIL);
5906 6195
5907 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6196 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5908 free (SCHEME_V->alloc_seg[i]); 6197 free (SCHEME_V->cell_seg[i]);
5909 6198
5910#if SHOW_ERROR_LINE 6199#if SHOW_ERROR_LINE
5911 for (i = 0; i <= SCHEME_V->file_i; i++) 6200 for (i = 0; i <= SCHEME_V->file_i; i++)
5912 {
5913 if (SCHEME_V->load_stack[i].kind & port_file) 6201 if (SCHEME_V->load_stack[i].kind & port_file)
5914 { 6202 {
5915 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6203 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5916 6204
5917 if (fname) 6205 if (fname)
5918 free (fname); 6206 free (fname);
5919 } 6207 }
5920 }
5921#endif 6208#endif
5922} 6209}
5923 6210
5924void 6211ecb_cold void
5925scheme_load_file (SCHEME_P_ int fin) 6212scheme_load_file (SCHEME_P_ int fin)
5926{ 6213{
5927 scheme_load_named_file (SCHEME_A_ fin, 0); 6214 scheme_load_named_file (SCHEME_A_ fin, 0);
5928} 6215}
5929 6216
5930void 6217ecb_cold void
5931scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6218scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5932{ 6219{
5933 dump_stack_reset (SCHEME_A); 6220 dump_stack_reset (SCHEME_A);
5934 SCHEME_V->envir = SCHEME_V->global_env; 6221 SCHEME_V->envir = SCHEME_V->global_env;
5935 SCHEME_V->file_i = 0; 6222 SCHEME_V->file_i = 0;
5936 SCHEME_V->load_stack[0].unget = -1; 6223 SCHEME_V->load_stack[0].unget = -1;
5937 SCHEME_V->load_stack[0].kind = port_input | port_file; 6224 SCHEME_V->load_stack[0].kind = port_input | port_file;
5938 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6225 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5939#if USE_PORTS
5940 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6226 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5941#endif
5942 SCHEME_V->retcode = 0; 6227 SCHEME_V->retcode = 0;
5943 6228
5944#if USE_PORTS
5945 if (fin == STDIN_FILENO) 6229 if (fin == STDIN_FILENO)
5946 SCHEME_V->interactive_repl = 1; 6230 SCHEME_V->interactive_repl = 1;
5947#endif
5948 6231
5949#if USE_PORTS 6232#if USE_PORTS
5950#if SHOW_ERROR_LINE 6233#if SHOW_ERROR_LINE
5951 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6234 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5952 6235
… …
5956#endif 6239#endif
5957 6240
5958 SCHEME_V->inport = SCHEME_V->loadport; 6241 SCHEME_V->inport = SCHEME_V->loadport;
5959 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6242 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5960 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6243 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6244
5961 set_typeflag (SCHEME_V->loadport, T_ATOM); 6245 set_typeflag (SCHEME_V->loadport, T_ATOM);
5962 6246
5963 if (SCHEME_V->retcode == 0) 6247 if (SCHEME_V->retcode == 0)
5964 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6248 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5965} 6249}
5966 6250
5967void 6251ecb_cold void
5968scheme_load_string (SCHEME_P_ const char *cmd) 6252scheme_load_string (SCHEME_P_ const char *cmd)
5969{ 6253{
6254#if USE_PORTs
5970 dump_stack_reset (SCHEME_A); 6255 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 6256 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 6257 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 6258 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 6259 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 6260 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 6261 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6262 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif
5980 SCHEME_V->retcode = 0; 6263 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 6264 SCHEME_V->interactive_repl = 0;
5982 SCHEME_V->inport = SCHEME_V->loadport; 6265 SCHEME_V->inport = SCHEME_V->loadport;
5983 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5984 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6267 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5985 set_typeflag (SCHEME_V->loadport, T_ATOM); 6268 set_typeflag (SCHEME_V->loadport, T_ATOM);
5986 6269
5987 if (SCHEME_V->retcode == 0) 6270 if (SCHEME_V->retcode == 0)
5988 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6271 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6272#else
6273 abort ();
6274#endif
5989} 6275}
5990 6276
5991void 6277ecb_cold void
5992scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6278scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5993{ 6279{
5994 pointer x; 6280 pointer x;
5995 6281
5996 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6282 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
6001 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6287 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6002} 6288}
6003 6289
6004#if !STANDALONE 6290#if !STANDALONE
6005 6291
6006void 6292ecb_cold void
6007scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6293scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6008{ 6294{
6009 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6295 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6010} 6296}
6011 6297
6012void 6298ecb_cold void
6013scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6299scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6014{ 6300{
6015 int i; 6301 int i;
6016 6302
6017 for (i = 0; i < count; i++) 6303 for (i = 0; i < count; i++)
6018 scheme_register_foreign_func (SCHEME_A_ list + i); 6304 scheme_register_foreign_func (SCHEME_A_ list + i);
6019} 6305}
6020 6306
6021pointer 6307ecb_cold pointer
6022scheme_apply0 (SCHEME_P_ const char *procname) 6308scheme_apply0 (SCHEME_P_ const char *procname)
6023{ 6309{
6024 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6310 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
6025} 6311}
6026 6312
6027void 6313ecb_cold void
6028save_from_C_call (SCHEME_P) 6314save_from_C_call (SCHEME_P)
6029{ 6315{
6030 pointer saved_data = cons (car (S_SINK), 6316 pointer saved_data = cons (car (S_SINK),
6031 cons (SCHEME_V->envir, 6317 cons (SCHEME_V->envir,
6032 SCHEME_V->dump)); 6318 SCHEME_V->dump));
… …
6036 /* Truncate the dump stack so TS will return here when done, not 6322 /* Truncate the dump stack so TS will return here when done, not
6037 directly resume pre-C-call operations. */ 6323 directly resume pre-C-call operations. */
6038 dump_stack_reset (SCHEME_A); 6324 dump_stack_reset (SCHEME_A);
6039} 6325}
6040 6326
6041void 6327ecb_cold void
6042restore_from_C_call (SCHEME_P) 6328restore_from_C_call (SCHEME_P)
6043{ 6329{
6044 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6330 set_car (S_SINK, caar (SCHEME_V->c_nest));
6045 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6331 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
6046 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6332 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
6047 /* Pop */ 6333 /* Pop */
6048 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6334 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
6049} 6335}
6050 6336
6051/* "func" and "args" are assumed to be already eval'ed. */ 6337/* "func" and "args" are assumed to be already eval'ed. */
6052pointer 6338ecb_cold pointer
6053scheme_call (SCHEME_P_ pointer func, pointer args) 6339scheme_call (SCHEME_P_ pointer func, pointer args)
6054{ 6340{
6055 int old_repl = SCHEME_V->interactive_repl; 6341 int old_repl = SCHEME_V->interactive_repl;
6056 6342
6057 SCHEME_V->interactive_repl = 0; 6343 SCHEME_V->interactive_repl = 0;
… …
6064 SCHEME_V->interactive_repl = old_repl; 6350 SCHEME_V->interactive_repl = old_repl;
6065 restore_from_C_call (SCHEME_A); 6351 restore_from_C_call (SCHEME_A);
6066 return SCHEME_V->value; 6352 return SCHEME_V->value;
6067} 6353}
6068 6354
6069pointer 6355ecb_cold pointer
6070scheme_eval (SCHEME_P_ pointer obj) 6356scheme_eval (SCHEME_P_ pointer obj)
6071{ 6357{
6072 int old_repl = SCHEME_V->interactive_repl; 6358 int old_repl = SCHEME_V->interactive_repl;
6073 6359
6074 SCHEME_V->interactive_repl = 0; 6360 SCHEME_V->interactive_repl = 0;
… …
6086 6372
6087/* ========== Main ========== */ 6373/* ========== Main ========== */
6088 6374
6089#if STANDALONE 6375#if STANDALONE
6090 6376
6091int 6377ecb_cold int
6092main (int argc, char **argv) 6378main (int argc, char **argv)
6093{ 6379{
6094# if USE_MULTIPLICITY 6380# if USE_MULTIPLICITY
6095 scheme ssc; 6381 scheme ssc;
6096 scheme *const SCHEME_V = &ssc; 6382 scheme *const SCHEME_V = &ssc;
… …
6098# endif 6384# endif
6099 int fin; 6385 int fin;
6100 char *file_name = InitFile; 6386 char *file_name = InitFile;
6101 int retcode; 6387 int retcode;
6102 int isfile = 1; 6388 int isfile = 1;
6389#if EXPERIMENT
6390 system ("ps v $PPID");
6391#endif
6103 6392
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6393 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 6394 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 6395 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6396 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6108 xwrstr ("followed by\n"); 6397 putstr (SCHEME_A_ "followed by\n");
6109 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6398 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6110 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6399 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6111 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6400 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6112 xwrstr ("Use - as filename for stdin.\n"); 6401 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6113 return 1; 6402 return 1;
6114 } 6403 }
6115 6404
6116 if (!scheme_init (SCHEME_A)) 6405 if (!scheme_init (SCHEME_A))
6117 { 6406 {
6118 xwrstr ("Could not initialize!\n"); 6407 putstr (SCHEME_A_ "Could not initialize!\n");
6119 return 2; 6408 return 2;
6120 } 6409 }
6121 6410
6122# if USE_PORTS 6411# if USE_PORTS
6123 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6412 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6136 } 6425 }
6137#endif 6426#endif
6138 6427
6139 do 6428 do
6140 { 6429 {
6141#if USE_PORTS
6142 if (strcmp (file_name, "-") == 0) 6430 if (strcmp (file_name, "-") == 0)
6143 fin = STDIN_FILENO; 6431 fin = STDIN_FILENO;
6144 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6432 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6145 { 6433 {
6146 pointer args = NIL; 6434 pointer args = NIL;
… …
6164 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6452 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6165 6453
6166 } 6454 }
6167 else 6455 else
6168 fin = open (file_name, O_RDONLY); 6456 fin = open (file_name, O_RDONLY);
6169#endif
6170 6457
6171 if (isfile && fin < 0) 6458 if (isfile && fin < 0)
6172 { 6459 {
6173 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6460 putstr (SCHEME_A_ "Could not open file ");
6461 putstr (SCHEME_A_ file_name);
6462 putcharacter (SCHEME_A_ '\n');
6174 } 6463 }
6175 else 6464 else
6176 { 6465 {
6177 if (isfile) 6466 if (isfile)
6178 scheme_load_named_file (SCHEME_A_ fin, file_name); 6467 scheme_load_named_file (SCHEME_A_ fin, file_name);
6179 else 6468 else
6180 scheme_load_string (SCHEME_A_ file_name); 6469 scheme_load_string (SCHEME_A_ file_name);
6181 6470
6182#if USE_PORTS
6183 if (!isfile || fin != STDIN_FILENO) 6471 if (!isfile || fin != STDIN_FILENO)
6184 { 6472 {
6185 if (SCHEME_V->retcode != 0) 6473 if (SCHEME_V->retcode != 0)
6186 { 6474 {
6187 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6475 putstr (SCHEME_A_ "Errors encountered reading ");
6476 putstr (SCHEME_A_ file_name);
6477 putcharacter (SCHEME_A_ '\n');
6188 } 6478 }
6189 6479
6190 if (isfile) 6480 if (isfile)
6191 close (fin); 6481 close (fin);
6192 } 6482 }
6193#endif
6194 } 6483 }
6195 6484
6196 file_name = *argv++; 6485 file_name = *argv++;
6197 } 6486 }
6198 while (file_name != 0); 6487 while (file_name != 0);

Diff Legend

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