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

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

Diff Legend

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