ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

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

Diff Legend

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