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

Diff Legend

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