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

Diff Legend

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