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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.53 by root, Tue Dec 1 02:21:49 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 EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69 91
70#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
71static scheme sc; 93static scheme sc;
72#endif 94#endif
73 95
… …
81 } 103 }
82 104
83 char *p = s; 105 char *p = s;
84 106
85 do { 107 do {
86 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
87 n /= base; 109 n /= base;
88 } while (n); 110 } while (n);
89 111
90 *p-- = 0; 112 *p-- = 0;
91 113
… …
101{ 123{
102 xbase (s, n, 10); 124 xbase (s, n, 10);
103} 125}
104 126
105static void 127static void
106xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
107{
108 write (1, s, strlen (s));
109}
110
111static void
112xwrnum (long n)
113{ 129{
114 char buf[64]; 130 char buf[64];
115 131
116 xnum (buf, n); 132 xnum (buf, n);
117 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
118} 134}
119 135
120static char 136static char
121xtoupper (char c) 137xtoupper (char c)
122{ 138{
… …
143 159
144#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
147 163
148#if USE_STRLWR 164#if USE_IGNORECASE
149static const char * 165static const char *
150strlwr (char *s) 166xstrlwr (char *s)
151{ 167{
152 const char *p = s; 168 const char *p = s;
153 169
154 while (*s) 170 while (*s)
155 { 171 {
… …
157 s++; 173 s++;
158 } 174 }
159 175
160 return p; 176 return p;
161} 177}
162#endif
163 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
164#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
166 186
167#ifndef prompt 187#ifndef prompt
168# define prompt "ts> " 188# define prompt "ts> "
169#endif 189#endif
170 190
171#ifndef InitFile 191#ifndef InitFile
172# define InitFile "init.scm" 192# define InitFile "init.scm"
173#endif 193#endif
174 194
175#ifndef FIRST_CELLSEGS
176# define FIRST_CELLSEGS 3
177#endif
178
179enum scheme_types 195enum scheme_types
180{ 196{
197 T_INTEGER,
181 T_FREE, 198 T_REAL,
182 T_STRING, 199 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 200 T_SYMBOL,
185 T_PROC, 201 T_PROC,
186 T_PAIR, 202 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 203 T_CLOSURE,
188 T_CONTINUATION, 204 T_CONTINUATION,
189 T_FOREIGN, 205 T_FOREIGN,
190 T_CHARACTER, 206 T_CHARACTER,
191 T_PORT, 207 T_PORT,
… …
201#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
205 221
206static num num_add (num a, num b); 222/* num, for generic arithmetic */
207static num num_mul (num a, num b); 223struct num
208static num num_div (num a, num b); 224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
249
250static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 252static num num_rem (num a, num b);
212static num num_mod (num a, num b); 253static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 254
219#if USE_MATH 255#if USE_MATH
220static double round_per_R5RS (double x); 256static double round_per_R5RS (double x);
221#endif 257#endif
222static int is_zero_rvalue (RVALUE x); 258static int is_zero_rvalue (RVALUE x);
223 259
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229
230static num num_zero; 260static num num_zero;
231static num num_one; 261static num num_one;
232 262
263/* convert "pointer" to cell* / cell* to pointer */
264#define CELL(p) ((struct cell *)(p) + 0)
265#define POINTER(c) ((void *)((c) - 0))
266
233/* macros for cell operations */ 267/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 268#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 269#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 270#define type(p) (typeflag (p) & T_MASKTYPE)
237 271
238INTERFACE INLINE int 272INTERFACE int
239is_string (pointer p) 273is_string (pointer p)
240{ 274{
241 return type (p) == T_STRING; 275 return type (p) == T_STRING;
242} 276}
243 277
244#define strvalue(p) ((p)->object.string.svalue) 278#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 279#define strlength(p) (CELL(p)->object.string.length)
246 280
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 281INTERFACE int
249is_vector (pointer p) 282is_vector (pointer p)
250{ 283{
251 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
252} 285}
253 286
254#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 289INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 292
261INTERFACE uint32_t 293INTERFACE int
262vector_length (pointer vec) 294is_integer (pointer p)
263{ 295{
264 return vec->object.vector.length; 296 return type (p) == T_INTEGER;
265} 297}
266 298
299/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 300INTERFACE int
301is_real (pointer p)
302{
303 return type (p) == T_REAL;
304}
305
306INTERFACE int
268is_number (pointer p) 307is_number (pointer p)
269{ 308{
270 return type (p) == T_NUMBER; 309 return is_integer (p) || is_real (p);
271} 310}
272 311
273INTERFACE INLINE int 312INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 313is_character (pointer p)
293{ 314{
294 return type (p) == T_CHARACTER; 315 return type (p) == T_CHARACTER;
295} 316}
296 317
297INTERFACE INLINE char * 318INTERFACE char *
298string_value (pointer p) 319string_value (pointer p)
299{ 320{
300 return strvalue (p); 321 return strvalue (p);
301} 322}
302 323
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 324#define ivalue_unchecked(p) CELL(p)->object.ivalue
325#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
326
334#if USE_REAL 327#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 330#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
340# define set_num_integer(p) 0 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 333#endif
334
343INTERFACE long 335INTERFACE long
344charvalue (pointer p) 336charvalue (pointer p)
345{ 337{
346 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
347} 339}
348 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
349INTERFACE INLINE int 343INTERFACE int
350is_port (pointer p) 344is_port (pointer p)
351{ 345{
352 return type (p) == T_PORT; 346 return type (p) == T_PORT;
353} 347}
354 348
355INTERFACE INLINE int 349INTERFACE int
356is_inport (pointer p) 350is_inport (pointer p)
357{ 351{
358 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
359} 353}
360 354
361INTERFACE INLINE int 355INTERFACE int
362is_outport (pointer p) 356is_outport (pointer p)
363{ 357{
364 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
365} 359}
366 360
367INTERFACE INLINE int 361INTERFACE int
368is_pair (pointer p) 362is_pair (pointer p)
369{ 363{
370 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
371} 365}
372 366
373#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
375 369
376#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 374
381#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 378
385INTERFACE void 379INTERFACE void
386set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
387{ 381{
388 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
389} 383}
390 384
391INTERFACE void 385INTERFACE void
392set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
393{ 387{
394 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
395} 389}
396 390
397INTERFACE pointer 391INTERFACE pointer
398pair_car (pointer p) 392pair_car (pointer p)
399{ 393{
… …
404pair_cdr (pointer p) 398pair_cdr (pointer p)
405{ 399{
406 return cdr (p); 400 return cdr (p);
407} 401}
408 402
409INTERFACE INLINE int 403INTERFACE int
410is_symbol (pointer p) 404is_symbol (pointer p)
411{ 405{
412 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
413} 407}
414 408
415INTERFACE INLINE char * 409INTERFACE char *
416symname (pointer p) 410symname (pointer p)
417{ 411{
418 return strvalue (car (p)); 412 return strvalue (p);
419} 413}
420 414
421#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 418SCHEME_EXPORT int
423hasprop (pointer p) 419hasprop (pointer p)
424{ 420{
425 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
426} 422}
427
428# define symprop(p) cdr(p)
429#endif 423#endif
430 424
431INTERFACE INLINE int 425INTERFACE int
432is_syntax (pointer p) 426is_syntax (pointer p)
433{ 427{
434 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
435} 429}
436 430
437INTERFACE INLINE int 431INTERFACE int
438is_proc (pointer p) 432is_proc (pointer p)
439{ 433{
440 return type (p) == T_PROC; 434 return type (p) == T_PROC;
441} 435}
442 436
443INTERFACE INLINE int 437INTERFACE int
444is_foreign (pointer p) 438is_foreign (pointer p)
445{ 439{
446 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
447} 441}
448 442
449INTERFACE INLINE char * 443INTERFACE char *
450syntaxname (pointer p) 444syntaxname (pointer p)
451{ 445{
452 return strvalue (car (p)); 446 return strvalue (p);
453} 447}
454 448
455#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 450static const char *procname (pointer x);
457 451
458INTERFACE INLINE int 452INTERFACE int
459is_closure (pointer p) 453is_closure (pointer p)
460{ 454{
461 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
462} 456}
463 457
464INTERFACE INLINE int 458INTERFACE int
465is_macro (pointer p) 459is_macro (pointer p)
466{ 460{
467 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
468} 462}
469 463
470INTERFACE INLINE pointer 464INTERFACE pointer
471closure_code (pointer p) 465closure_code (pointer p)
472{ 466{
473 return car (p); 467 return car (p);
474} 468}
475 469
476INTERFACE INLINE pointer 470INTERFACE pointer
477closure_env (pointer p) 471closure_env (pointer p)
478{ 472{
479 return cdr (p); 473 return cdr (p);
480} 474}
481 475
482INTERFACE INLINE int 476INTERFACE int
483is_continuation (pointer p) 477is_continuation (pointer p)
484{ 478{
485 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
486} 480}
487 481
488#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
490 484
491/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 486INTERFACE int
493is_promise (pointer p) 487is_promise (pointer p)
494{ 488{
495 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
496} 490}
497 491
498INTERFACE INLINE int 492INTERFACE int
499is_environment (pointer p) 493is_environment (pointer p)
500{ 494{
501 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
502} 496}
503 497
… …
509 503
510#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 507
514INTERFACE INLINE int 508INTERFACE int
515is_immutable (pointer p) 509is_immutable (pointer p)
516{ 510{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 512}
519 513
520INTERFACE INLINE void 514INTERFACE void
521setimmutable (pointer p) 515setimmutable (pointer p)
522{ 516{
523#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 519#endif
526} 520}
527 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
528#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
529static INLINE int 577ecb_inline int
530Cisalpha (int c) 578Cisalpha (int c)
531{ 579{
532 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
533} 581}
534 582
535static INLINE int 583ecb_inline int
536Cisdigit (int c) 584Cisdigit (int c)
537{ 585{
538 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
539} 587}
540 588
541static INLINE int 589ecb_inline int
542Cisspace (int c) 590Cisspace (int c)
543{ 591{
544 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
545} 593}
546 594
547static INLINE int 595ecb_inline int
548Cisupper (int c) 596Cisupper (int c)
549{ 597{
550 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
551} 599}
552 600
553static INLINE int 601ecb_inline int
554Cislower (int c) 602Cislower (int c)
555{ 603{
556 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
557} 605}
558#endif 606#endif
… …
619#endif 667#endif
620 668
621static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
647static void mark (pointer a); 694static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 702static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
753
679static num 754static num
680num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
681{ 756{
682 num ret; 757 num ret;
683 758
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 760
686 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 762 {
763 switch (op)
764 {
765 case NUM_ADD: a.ivalue += b.ivalue; break;
766 case NUM_SUB: a.ivalue -= b.ivalue; break;
767 case NUM_MUL: a.ivalue *= b.ivalue; break;
768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
769 }
770
771 num_set_ivalue (ret, a.ivalue);
772 }
773#if USE_REAL
688 else 774 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 775 {
776 switch (op)
777 {
778 case NUM_ADD: a.rvalue += b.rvalue; break;
779 case NUM_SUB: a.rvalue -= b.rvalue; break;
780 case NUM_MUL: a.rvalue *= b.rvalue; break;
781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
782 }
690 783
691 return ret; 784 num_set_rvalue (ret, a.rvalue);
692} 785 }
693 786#endif
694static num
695num_mul (num a, num b)
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 787
706 return ret; 788 return ret;
707} 789}
708 790
709static num 791static num
710num_div (num a, num b) 792num_div (num a, num b)
711{ 793{
712 num ret; 794 num ret;
713 795
714 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
715 797
716 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
717 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
718 else 800 else
719 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
720
721 return ret;
722}
723
724static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750 802
751 return ret; 803 return ret;
752} 804}
753 805
754static num 806static num
… …
756{ 808{
757 num ret; 809 num ret;
758 long e1, e2, res; 810 long e1, e2, res;
759 811
760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 812 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
761 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
762 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
763 res = e1 % e2; 815 res = e1 % e2;
764 816
765 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
766 if (res > 0) 818 if (res > 0)
767 { 819 {
… …
783{ 835{
784 num ret; 836 num ret;
785 long e1, e2, res; 837 long e1, e2, res;
786 838
787 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 839 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
788 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
789 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
790 res = e1 % e2; 842 res = e1 % e2;
791 843
792 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
793 if (res * e2 < 0) 845 if (res * e2 < 0)
794 res += e2; 846 res += e2;
795 847
796 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
797 return ret; 849 return ret;
798} 850}
799 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 853static int
801num_eq (num a, num b) 854num_cmp (num a, num b)
802{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 857 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 858
806 if (is_fixnum) 859 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 860 {
861 IVALUE av = num_ivalue (a);
862 IVALUE bv = num_ivalue (b);
863
864 ret = av == bv ? 0 : av < bv ? -1 : +1;
865 }
808 else 866 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 867 {
868 RVALUE av = num_rvalue (a);
869 RVALUE bv = num_rvalue (b);
870
871 ret = av == bv ? 0 : av < bv ? -1 : +1;
872 }
810 873
811 return ret; 874 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 875}
854 876
855#if USE_MATH 877#if USE_MATH
856 878
857/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
867 return ce; 889 return ce;
868 else if (dfl < dce) 890 else if (dfl < dce)
869 return fl; 891 return fl;
870 else 892 else
871 { 893 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 895 return fl;
874 else 896 else
875 return ce; 897 return ce;
876 } 898 }
877} 899}
878#endif 900#endif
879 901
880static int 902static int
881is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
882{ 904{
905 return x == 0;
906#if 0
883#if USE_REAL 907#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 909#else
886 return x == 0; 910 return x == 0;
887#endif 911#endif
888} 912#endif
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 913}
904 914
905/* allocate new cell segment */ 915/* allocate new cell segment */
906static int 916static int
907alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
908{ 918{
909 pointer newp; 919 struct cell *newp;
910 pointer last; 920 struct cell *last;
911 pointer p; 921 struct cell *p;
912 char *cp; 922 char *cp;
913 long i; 923 long i;
914 int k; 924 int k;
915 925
916 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
917 segsize <<= 1; 927 segsize <<= 1;
918 928
919 for (k = 0; k < n; k++)
920 {
921 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
922 return k;
923
924 cp = malloc (segsize * sizeof (struct cell)); 929 cp = malloc (segsize * sizeof (struct cell));
925 930
926 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
927 return k; 932 return k;
928 933
929 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
930 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
931 936
932 /* insert new segment in address order */ 937 newp = (struct cell *)cp;
933 newp = (pointer)cp;
934 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
935 SCHEME_V->cell_segsize[i] = segsize; 939 SCHEME_V->cell_segsize[i] = segsize;
936
937 //TODO: insert, not swap
938 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
939 {
940 p = SCHEME_V->cell_seg[i];
941 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
942 SCHEME_V->cell_seg[i - 1] = p;
943
944 k = SCHEME_V->cell_segsize[i];
945 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
946 SCHEME_V->cell_segsize[i - 1] = k;
947
948 --i;
949 }
950
951 SCHEME_V->fcells += segsize; 940 SCHEME_V->fcells += segsize;
952 last = newp + segsize - 1; 941 last = newp + segsize - 1;
953 942
954 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
955 { 944 {
945 pointer cp = POINTER (p);
956 set_typeflag (p, T_FREE); 946 set_typeflag (cp, T_PAIR);
957 set_car (p, NIL); 947 set_car (cp, NIL);
958 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
959 } 949 }
960 950
961 /* insert new cells in address order on free list */
962 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
963 {
964 set_cdr (last, SCHEME_V->free_cell); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
965 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
966 }
967 else
968 {
969 p = SCHEME_V->free_cell;
970 953
971 while (cdr (p) != NIL && newp > cdr (p))
972 p = cdr (p);
973
974 set_cdr (last, cdr (p));
975 set_cdr (p, newp);
976 }
977 }
978
979 return n; 954 return 1;
980} 955}
981 956
982/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 958ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 960{
986 if (SCHEME_V->free_cell == NIL) 961 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 962 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 964 return S_SINK;
990 965
991 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
992 { 967 {
993 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 968 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
994 969
995 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
996 971
997 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
998 { 973 {
999 /* if only a few recovered, get more to avoid fruitless gc's */ 974 /* if only a few recovered, get more to avoid fruitless gc's */
1000 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
1001 { 976 {
1002#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
1003 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
1004 return S_SINK; 979 return S_SINK;
1005#endif 980#endif
… …
1017 } 992 }
1018} 993}
1019 994
1020/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
1021 Tehom */ 996 Tehom */
1022
1023static void 997static void
1024push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1025{ 999{
1026 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1027 1001
… …
1049} 1023}
1050 1024
1051static pointer 1025static pointer
1052get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1053{ 1027{
1054 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1055 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
1056 1030
1057 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
1058 return S_SINK; 1032 return S_SINK;
1059 1033
1060 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
1061 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
1062 1036
1063 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1064 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1065 fill_vector (v, init); 1039 fill_vector (v, 0, init);
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1041
1068 return v; 1042 return v;
1069} 1043}
1070 1044
1071static INLINE void 1045ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1046ok_to_freely_gc (SCHEME_P)
1073{ 1047{
1074 set_car (S_SINK, NIL); 1048 set_car (S_SINK, NIL);
1075} 1049}
1076 1050
… …
1078static void 1052static void
1079check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1080{ 1054{
1081 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1055 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1082 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1083 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1084 1058
1085 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1086 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1087} 1061}
1088 1062
1089static void 1063static void
1090check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1091{ 1065{
… …
1113 set_cdr (x, b); 1087 set_cdr (x, b);
1114 1088
1115 return x; 1089 return x;
1116} 1090}
1117 1091
1092static pointer
1093generate_symbol (SCHEME_P_ const char *name)
1094{
1095 pointer x = mk_string (SCHEME_A_ name);
1096 setimmutable (x);
1097 set_typeflag (x, T_SYMBOL | T_ATOM);
1098 return x;
1099}
1100
1118/* ========== oblist implementation ========== */ 1101/* ========== oblist implementation ========== */
1119 1102
1120#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1121 1104
1105static int
1122static int hash_fn (const char *key, int table_size); 1106hash_fn (const char *key, int table_size)
1107{
1108 const unsigned char *p = key;
1109 uint32_t hash = 2166136261;
1110
1111 while (*p)
1112 hash = (hash ^ *p++) * 16777619;
1113
1114 return hash % table_size;
1115}
1123 1116
1124static pointer 1117static pointer
1125oblist_initial_value (SCHEME_P) 1118oblist_initial_value (SCHEME_P)
1126{ 1119{
1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1129 1122
1130/* returns the new symbol */ 1123/* returns the new symbol */
1131static pointer 1124static pointer
1132oblist_add_by_name (SCHEME_P_ const char *name) 1125oblist_add_by_name (SCHEME_P_ const char *name)
1133{ 1126{
1134 int location; 1127 pointer x = generate_symbol (SCHEME_A_ name);
1135
1136 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1137 set_typeflag (x, T_SYMBOL);
1138 setimmutable (car (x));
1139
1140 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1128 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1141 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1129 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1142 return x; 1130 return x;
1143} 1131}
1144 1132
1145static INLINE pointer 1133ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1134oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1135{
1148 int location; 1136 int location;
1149 pointer x; 1137 pointer x;
1150 char *s; 1138 char *s;
1151 1139
1152 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1140 location = hash_fn (name, veclength (SCHEME_V->oblist));
1153 1141
1154 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1142 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1155 { 1143 {
1156 s = symname (car (x)); 1144 s = symname (car (x));
1157 1145
1158 /* case-insensitive, per R5RS section 2 */ 1146 /* case-insensitive, per R5RS section 2 */
1159 if (stricmp (name, s) == 0) 1147 if (stricmp (name, s) == 0)
… …
1169 int i; 1157 int i;
1170 pointer x; 1158 pointer x;
1171 pointer ob_list = NIL; 1159 pointer ob_list = NIL;
1172 1160
1173 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1161 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1174 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1162 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1175 ob_list = cons (x, ob_list); 1163 ob_list = cons (x, ob_list);
1176 1164
1177 return ob_list; 1165 return ob_list;
1178} 1166}
1179 1167
… …
1183oblist_initial_value (SCHEME_P) 1171oblist_initial_value (SCHEME_P)
1184{ 1172{
1185 return NIL; 1173 return NIL;
1186} 1174}
1187 1175
1188static INLINE pointer 1176ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1177oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1178{
1191 pointer x; 1179 pointer x;
1192 char *s; 1180 char *s;
1193 1181
… …
1205 1193
1206/* returns the new symbol */ 1194/* returns the new symbol */
1207static pointer 1195static pointer
1208oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1209{ 1197{
1210 pointer x; 1198 pointer x = generate_symbol (SCHEME_A_ name);
1211
1212 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1213 set_typeflag (x, T_SYMBOL);
1214 setimmutable (car (x));
1215 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1216 return x; 1200 return x;
1217} 1201}
1218 1202
1219static pointer 1203static pointer
… …
1229mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1230{ 1214{
1231 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1232 1216
1233 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1234 x->object.port = p; 1218 set_port (x, p);
1235 1219
1236 return x; 1220 return x;
1237} 1221}
1238#endif 1222#endif
1239 1223
1240pointer 1224pointer
1241mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1242{ 1226{
1243 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1244 1228
1245 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1246 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1247 1231
1248 return x; 1232 return x;
1249} 1233}
1250 1234
1251INTERFACE pointer 1235INTERFACE pointer
1252mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1253{ 1237{
1254 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1255 1239
1256 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1257 ivalue_unchecked (x) = c & 0xff; 1241 set_ivalue (x, c & 0xff);
1258 set_num_integer (x); 1242
1259 return x; 1243 return x;
1260} 1244}
1261 1245
1262/* get number atom (integer) */ 1246/* get number atom (integer) */
1263INTERFACE pointer 1247INTERFACE pointer
1264mk_integer (SCHEME_P_ long num) 1248mk_integer (SCHEME_P_ long n)
1265{ 1249{
1250 pointer p = 0;
1251 pointer *pp = &p;
1252
1253#if USE_INTCACHE
1254 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1255 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1256#endif
1257
1258 if (!*pp)
1259 {
1266 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1267 1261
1268 set_typeflag (x, (T_NUMBER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1269 ivalue_unchecked (x) = num; 1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1270 set_num_integer (x); 1264 set_ivalue (x, n);
1265
1266 *pp = x;
1267 }
1268
1271 return x; 1269 return *pp;
1272} 1270}
1273 1271
1274INTERFACE pointer 1272INTERFACE pointer
1275mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1276{ 1274{
1275#if USE_REAL
1277 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1278 1277
1279 set_typeflag (x, (T_NUMBER | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1280 rvalue_unchecked (x) = n; 1279 set_rvalue (x, n);
1281 set_num_real (x); 1280
1282 return x; 1281 return x;
1282#else
1283 return mk_integer (SCHEME_A_ n);
1284#endif
1283} 1285}
1284 1286
1285static pointer 1287static pointer
1286mk_number (SCHEME_P_ const num n) 1288mk_number (SCHEME_P_ const num n)
1287{ 1289{
1290#if USE_REAL
1288 if (num_is_fixnum (n)) 1291 return num_is_fixnum (n)
1292 ? mk_integer (SCHEME_A_ num_ivalue (n))
1293 : mk_real (SCHEME_A_ num_rvalue (n));
1294#else
1289 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1295 return mk_integer (SCHEME_A_ num_ivalue (n));
1290 else 1296#endif
1291 return mk_real (SCHEME_A_ num_get_rvalue (n));
1292} 1297}
1293 1298
1294/* allocate name to string area */ 1299/* allocate name to string area */
1295static char * 1300static char *
1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1301store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1302 SCHEME_V->no_memory = 1; 1307 SCHEME_V->no_memory = 1;
1303 return SCHEME_V->strbuff; 1308 return SCHEME_V->strbuff;
1304 } 1309 }
1305 1310
1306 if (str) 1311 if (str)
1307 { 1312 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1308 int l = strlen (str);
1309
1310 if (l > len_str)
1311 l = len_str;
1312
1313 memcpy (q, str, l);
1314 q[l] = 0;
1315 }
1316 else 1313 else
1317 {
1318 memset (q, fill, len_str); 1314 memset (q, fill, len_str);
1315
1319 q[len_str] = 0; 1316 q[len_str] = 0;
1320 }
1321 1317
1322 return q; 1318 return q;
1323}
1324
1325/* get new string */
1326INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str)
1328{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str));
1330}
1331
1332INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{
1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1336
1337 set_typeflag (x, T_STRING | T_ATOM);
1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1339 strlength (x) = len;
1340 return x;
1341} 1319}
1342 1320
1343INTERFACE pointer 1321INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1322mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1345{ 1323{
… …
1350 strlength (x) = len; 1328 strlength (x) = len;
1351 return x; 1329 return x;
1352} 1330}
1353 1331
1354INTERFACE pointer 1332INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{
1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1336
1337 set_typeflag (x, T_STRING | T_ATOM);
1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1339 strlength (x) = len;
1340
1341 return x;
1342}
1343
1344INTERFACE pointer
1345mk_string (SCHEME_P_ const char *str)
1346{
1347 return mk_counted_string (SCHEME_A_ str, strlen (str));
1348}
1349
1350INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1351mk_vector (SCHEME_P_ uint32_t len)
1356{ 1352{
1357 return get_vector_object (SCHEME_A_ len, NIL); 1353 return get_vector_object (SCHEME_A_ len, NIL);
1358} 1354}
1359 1355
1360INTERFACE void 1356INTERFACE void
1361fill_vector (pointer vec, pointer obj) 1357fill_vector (pointer vec, uint32_t start, pointer obj)
1362{ 1358{
1363 int i; 1359 int i;
1364 1360
1365 for (i = 0; i < vec->object.vector.length; i++) 1361 for (i = start; i < veclength (vec); i++)
1366 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1367} 1363}
1368 1364
1365INTERFACE void
1366vector_resize (pointer vec, uint32_t newsize, pointer fill)
1367{
1368 uint32_t oldsize = veclength (vec);
1369 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1370 veclength (vec) = newsize;
1371 fill_vector (vec, oldsize, fill);
1372}
1373
1369INTERFACE pointer 1374INTERFACE pointer
1370vector_elem (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1371{ 1376{
1372 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1373} 1378}
1374 1379
1375INTERFACE void 1380INTERFACE void
1376set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1381vector_set (pointer vec, uint32_t ielem, pointer a)
1377{ 1382{
1378 vecvalue(vec)[ielem] = a; 1383 vecvalue(vec)[ielem] = a;
1379} 1384}
1380 1385
1381/* get new symbol */ 1386/* get new symbol */
… …
1393 1398
1394INTERFACE pointer 1399INTERFACE pointer
1395gensym (SCHEME_P) 1400gensym (SCHEME_P)
1396{ 1401{
1397 pointer x; 1402 pointer x;
1398 char name[40]; 1403 char name[40] = "gensym-";
1399
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 {
1402 strcpy (name, "gensym-");
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1404 1405
1405 /* first check oblist */ 1406 return generate_symbol (SCHEME_A_ name);
1406 x = oblist_find_by_name (SCHEME_A_ name); 1407}
1407 1408
1408 if (x != NIL) 1409static int
1409 continue; 1410is_gensym (SCHEME_P_ pointer x)
1410 else 1411{
1411 { 1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1412 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x;
1414 }
1415 }
1416
1417 return NIL;
1418} 1413}
1419 1414
1420/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1421static pointer 1416static pointer
1422mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
… …
1424 char c, *p; 1419 char c, *p;
1425 int has_dec_point = 0; 1420 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1421 int has_fp_exp = 0;
1427 1422
1428#if USE_COLON_HOOK 1423#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1424 if ((p = strstr (q, "::")) != 0)
1431 { 1425 {
1432 *p = 0; 1426 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1427 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1428 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1429 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1430 }
1437
1438#endif 1431#endif
1439 1432
1440 p = q; 1433 p = q;
1441 c = *p++; 1434 c = *p++;
1442 1435
… …
1478 } 1471 }
1479 else if ((c == 'e') || (c == 'E')) 1472 else if ((c == 'e') || (c == 'E'))
1480 { 1473 {
1481 if (!has_fp_exp) 1474 if (!has_fp_exp)
1482 { 1475 {
1483 has_dec_point = 1; /* decimal point illegal 1476 has_dec_point = 1; /* decimal point illegal from now on */
1484 from now on */
1485 p++; 1477 p++;
1486 1478
1487 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1479 if ((*p == '-') || (*p == '+') || isdigit (*p))
1488 continue; 1480 continue;
1489 } 1481 }
… …
1503 1495
1504/* make constant */ 1496/* make constant */
1505static pointer 1497static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1498mk_sharp_const (SCHEME_P_ char *name)
1507{ 1499{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1500 if (!strcmp (name, "t"))
1512 return S_T; 1501 return S_T;
1513 else if (!strcmp (name, "f")) 1502 else if (!strcmp (name, "f"))
1514 return S_F; 1503 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1504 else if (*name == '\\') /* #\w (character) */
1536 { 1505 {
1537 int c = 0; 1506 int c;
1538 1507
1539 if (stricmp (name + 1, "space") == 0) 1508 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1509 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1510 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1511 c = '\n';
… …
1544 c = '\r'; 1513 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1514 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1515 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1516 else if (name[1] == 'x' && name[2] != 0)
1548 { 1517 {
1549 int c1 = strtol (name + 2, 0, 16); 1518 long c1 = strtol (name + 2, 0, 16);
1550 1519
1551 if (c1 <= UCHAR_MAX) 1520 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1521 c = c1;
1553 else 1522 else
1554 return NIL; 1523 return NIL;
1555 1524 }
1556#if USE_ASCII_NAMES 1525#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1526 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1527 /* nothing */;
1561#endif 1528#endif
1562 }
1563 else if (name[2] == 0) 1529 else if (name[2] == 0)
1564 c = name[1]; 1530 c = name[1];
1565 else 1531 else
1566 return NIL; 1532 return NIL;
1567 1533
1568 return mk_character (SCHEME_A_ c); 1534 return mk_character (SCHEME_A_ c);
1569 } 1535 }
1570 else 1536 else
1537 {
1538 /* identify base by string index */
1539 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1540 char *base = strchr (baseidx, *name);
1541
1542 if (base)
1543 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1544
1571 return NIL; 1545 return NIL;
1546 }
1572} 1547}
1573 1548
1574/* ========== garbage collector ========== */ 1549/* ========== garbage collector ========== */
1575 1550
1576/*-- 1551/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1552 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1553 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1554 * for marking.
1555 *
1556 * The exception is vectors - vectors are currently marked recursively,
1557 * which is inherited form tinyscheme and could be fixed by having another
1558 * word of context in the vector
1580 */ 1559 */
1581static void 1560static void
1582mark (pointer a) 1561mark (pointer a)
1583{ 1562{
1584 pointer t, q, p; 1563 pointer t, q, p;
… …
1586 t = 0; 1565 t = 0;
1587 p = a; 1566 p = a;
1588E2: 1567E2:
1589 setmark (p); 1568 setmark (p);
1590 1569
1591 if (is_vector (p)) 1570 if (ecb_expect_false (is_vector (p)))
1592 { 1571 {
1593 int i; 1572 int i;
1594 1573
1595 for (i = 0; i < p->object.vector.length; i++) 1574 for (i = 0; i < veclength (p); i++)
1596 mark (vecvalue (p)[i]); 1575 mark (vecvalue (p)[i]);
1597 } 1576 }
1598 1577
1599 if (is_atom (p)) 1578 if (is_atom (p))
1600 goto E6; 1579 goto E6;
… …
1647 1626
1648/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1649static void 1628static void
1650gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1651{ 1630{
1652 pointer p;
1653 int i; 1631 int i;
1654 1632
1655 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1656 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1657 1635
… …
1673 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1674 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1675 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1676 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1677 1655
1656#if USE_INTCACHE
1657 /* mark intcache */
1658 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1659 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1660 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1661#endif
1662
1678 /* mark variables a, b */ 1663 /* mark variables a, b */
1679 mark (a); 1664 mark (a);
1680 mark (b); 1665 mark (b);
1681 1666
1682 /* garbage collect */ 1667 /* garbage collect */
1683 clrmark (NIL); 1668 clrmark (NIL);
1684 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1685 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1686 1671
1687 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1688 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1689 (which are also kept sorted by address) downwards to build the 1674
1690 free-list in sorted order. 1675 uint32_t total = 0;
1691 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1692 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1693 { 1679 {
1694 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1680 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1681 struct cell *p;
1682 total += SCHEME_V->cell_segsize [i];
1695 1683
1696 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1697 { 1685 {
1686 pointer c = POINTER (p);
1687
1698 if (is_mark (p)) 1688 if (is_mark (c))
1699 clrmark (p); 1689 clrmark (c);
1700 else 1690 else
1701 { 1691 {
1702 /* reclaim cell */ 1692 /* reclaim cell */
1703 if (typeflag (p) != T_FREE) 1693 if (typeflag (c) != T_PAIR)
1704 { 1694 {
1705 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1706 set_typeflag (p, T_FREE); 1696 set_typeflag (c, T_PAIR);
1707 set_car (p, NIL); 1697 set_car (c, NIL);
1708 } 1698 }
1709 1699
1710 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1711 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1712 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1713 } 1703 }
1714 } 1704 }
1715 } 1705 }
1716 1706
1717 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1718 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1708 {
1709 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");
1710 }
1719} 1711}
1720 1712
1721static void 1713static void
1722finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1723{ 1715{
1724 if (is_string (a)) 1716 /* TODO, fast bitmap check? */
1717 if (is_string (a) || is_symbol (a))
1725 free (strvalue (a)); 1718 free (strvalue (a));
1726 else if (is_vector (a)) 1719 else if (is_vector (a))
1727 free (vecvalue (a)); 1720 free (vecvalue (a));
1728#if USE_PORTS 1721#if USE_PORTS
1729 else if (is_port (a)) 1722 else if (is_port (a))
1730 { 1723 {
1731 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1724 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1732 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1733 1726
1734 free (a->object.port); 1727 free (port (a));
1735 } 1728 }
1736#endif 1729#endif
1737} 1730}
1738 1731
1739/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
… …
1755 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1756 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1749 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1750 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1758 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1751 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1759 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1760 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1753 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1761 1754
1762#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1763 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1764 1757
1765 if (fname) 1758 if (fname)
… …
1782 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1783#if USE_PORTS 1776#if USE_PORTS
1784 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1785#endif 1778#endif
1786 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1787 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1780 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1788 } 1781 }
1789} 1782}
1790 1783
1791static int 1784static int
1792file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1793{ 1786{
1794#if USE_PORTS 1787#if USE_PORTS
1795 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1796 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1797 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1798#else 1791#else
1799 return 0; 1792 return 0;
1800#endif 1793#endif
1801} 1794}
1802 1795
… …
1936} 1929}
1937 1930
1938static void 1931static void
1939port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1940{ 1933{
1941 port *pt = p->object.port; 1934 port *pt = port (p);
1942 1935
1943 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1944 1937
1945 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1946 { 1939 {
… …
1967/* get new character from input file */ 1960/* get new character from input file */
1968static int 1961static int
1969inchar (SCHEME_P) 1962inchar (SCHEME_P)
1970{ 1963{
1971 int c; 1964 int c;
1972 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1973
1974 pt = SCHEME_V->inport->object.port;
1975 1966
1976 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1977 return EOF; 1968 return EOF;
1978 1969
1979 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
… …
2046 port *pt; 2037 port *pt;
2047 2038
2048 if (c == EOF) 2039 if (c == EOF)
2049 return; 2040 return;
2050 2041
2051 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
2052 pt->unget = c; 2043 pt->unget = c;
2053#else 2044#else
2054 if (c == EOF) 2045 if (c == EOF)
2055 return; 2046 return;
2056 2047
… …
2084 2075
2085INTERFACE void 2076INTERFACE void
2086putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2087{ 2078{
2088#if USE_PORTS 2079#if USE_PORTS
2089 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2090 2081
2091 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2092 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2093 else 2084 else
2094 for (; *s; s++) 2085 for (; *s; s++)
… …
2096 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2097 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2098 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2099 2090
2100#else 2091#else
2101 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2102#endif 2093#endif
2103} 2094}
2104 2095
2105static void 2096static void
2106putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2107{ 2098{
2108#if USE_PORTS 2099#if USE_PORTS
2109 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2110 2101
2111 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2112 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2113 else 2104 else
2114 { 2105 {
… …
2128 2119
2129INTERFACE void 2120INTERFACE void
2130putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2131{ 2122{
2132#if USE_PORTS 2123#if USE_PORTS
2133 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2134 2125
2135 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2136 { 2127 {
2137 char cc = c; 2128 char cc = c;
2138 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
… …
2151#endif 2142#endif
2152} 2143}
2153 2144
2154/* read characters up to delimiter, but cater to character constants */ 2145/* read characters up to delimiter, but cater to character constants */
2155static char * 2146static char *
2156readstr_upto (SCHEME_P_ char *delim) 2147readstr_upto (SCHEME_P_ int skip, const char *delim)
2157{ 2148{
2158 char *p = SCHEME_V->strbuff; 2149 char *p = SCHEME_V->strbuff + skip;
2159 2150
2160 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2151 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2161 2152
2162 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2163 *p = 0; 2154 *p = 0;
… …
2170 return SCHEME_V->strbuff; 2161 return SCHEME_V->strbuff;
2171} 2162}
2172 2163
2173/* read string expression "xxx...xxx" */ 2164/* read string expression "xxx...xxx" */
2174static pointer 2165static pointer
2175readstrexp (SCHEME_P) 2166readstrexp (SCHEME_P_ char delim)
2176{ 2167{
2177 char *p = SCHEME_V->strbuff; 2168 char *p = SCHEME_V->strbuff;
2178 int c; 2169 int c;
2179 int c1 = 0; 2170 int c1 = 0;
2180 enum
2181 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2171 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2182 2172
2183 for (;;) 2173 for (;;)
2184 { 2174 {
2185 c = inchar (SCHEME_A); 2175 c = inchar (SCHEME_A);
2186 2176
… …
2188 return S_F; 2178 return S_F;
2189 2179
2190 switch (state) 2180 switch (state)
2191 { 2181 {
2192 case st_ok: 2182 case st_ok:
2193 switch (c) 2183 if (ecb_expect_false (c == delim))
2194 {
2195 case '\\':
2196 state = st_bsl;
2197 break;
2198
2199 case '"':
2200 *p = 0;
2201 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2184 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2202 2185
2203 default: 2186 if (ecb_expect_false (c == '\\'))
2187 state = st_bsl;
2188 else
2204 *p++ = c; 2189 *p++ = c;
2205 break;
2206 }
2207 2190
2208 break; 2191 break;
2209 2192
2210 case st_bsl: 2193 case st_bsl:
2211 switch (c) 2194 switch (c)
… …
2241 case 'r': 2224 case 'r':
2242 *p++ = '\r'; 2225 *p++ = '\r';
2243 state = st_ok; 2226 state = st_ok;
2244 break; 2227 break;
2245 2228
2246 case '"':
2247 *p++ = '"';
2248 state = st_ok;
2249 break;
2250
2251 default: 2229 default:
2252 *p++ = c; 2230 *p++ = c;
2253 state = st_ok; 2231 state = st_ok;
2254 break; 2232 break;
2255 } 2233 }
2256 2234
2257 break; 2235 break;
2258 2236
2259 case st_x1: 2237 case st_x1:
2260 case st_x2: 2238 case st_x2:
2261 c = toupper (c); 2239 c = tolower (c);
2262 2240
2263 if (c >= '0' && c <= 'F') 2241 if (c >= '0' && c <= '9')
2264 {
2265 if (c <= '9')
2266 c1 = (c1 << 4) + c - '0'; 2242 c1 = (c1 << 4) + c - '0';
2267 else 2243 else if (c >= 'a' && c <= 'f')
2268 c1 = (c1 << 4) + c - 'A' + 10; 2244 c1 = (c1 << 4) + c - 'a' + 10;
2269
2270 if (state == st_x1)
2271 state = st_x2;
2272 else
2273 {
2274 *p++ = c1;
2275 state = st_ok;
2276 }
2277 }
2278 else 2245 else
2279 return S_F; 2246 return S_F;
2247
2248 if (state == st_x1)
2249 state = st_x2;
2250 else
2251 {
2252 *p++ = c1;
2253 state = st_ok;
2254 }
2280 2255
2281 break; 2256 break;
2282 2257
2283 case st_oct1: 2258 case st_oct1:
2284 case st_oct2: 2259 case st_oct2:
… …
2288 backchar (SCHEME_A_ c); 2263 backchar (SCHEME_A_ c);
2289 state = st_ok; 2264 state = st_ok;
2290 } 2265 }
2291 else 2266 else
2292 { 2267 {
2293 if (state == st_oct2 && c1 >= 32) 2268 if (state == st_oct2 && c1 >= ' ')
2294 return S_F; 2269 return S_F;
2295 2270
2296 c1 = (c1 << 3) + (c - '0'); 2271 c1 = (c1 << 3) + (c - '0');
2297 2272
2298 if (state == st_oct1) 2273 if (state == st_oct1)
… …
2303 state = st_ok; 2278 state = st_ok;
2304 } 2279 }
2305 } 2280 }
2306 2281
2307 break; 2282 break;
2308
2309 } 2283 }
2310 } 2284 }
2311} 2285}
2312 2286
2313/* check c is in chars */ 2287/* check c is in chars */
2314static INLINE int 2288ecb_inline int
2315is_one_of (char *s, int c) 2289is_one_of (const char *s, int c)
2316{ 2290{
2317 if (c == EOF)
2318 return 1;
2319
2320 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2321} 2292}
2322 2293
2323/* skip white characters */ 2294/* skip white characters */
2324static INLINE int 2295ecb_inline int
2325skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2326{ 2297{
2327 int c, curr_line = 0; 2298 int c, curr_line = 0;
2328 2299
2329 do 2300 do
2330 { 2301 {
2331 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2332#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2333 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2334 curr_line++; 2306 curr_line++;
2335#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2336 } 2311 }
2337 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2338 2313
2339 /* record it */ 2314 /* record it */
2340#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2341 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2316 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2342 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2317 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2343#endif 2318#endif
2344 2319
2345 if (c != EOF)
2346 {
2347 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2348 return 1; 2321 return 1;
2349 }
2350 else
2351 return EOF;
2352} 2322}
2353 2323
2354/* get token */ 2324/* get token */
2355static int 2325static int
2356token (SCHEME_P) 2326token (SCHEME_P)
… …
2372 return TOK_RPAREN; 2342 return TOK_RPAREN;
2373 2343
2374 case '.': 2344 case '.':
2375 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2376 2346
2377 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2378 return TOK_DOT; 2348 return TOK_DOT;
2379 else 2349 else
2380 { 2350 {
2381 //TODO: ungetc twice in a row is not supported in C
2382 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2383 backchar (SCHEME_A_ '.');
2384 return TOK_ATOM; 2352 return TOK_DOTATOM;
2385 } 2353 }
2354
2355 case '|':
2356 return TOK_STRATOM;
2386 2357
2387 case '\'': 2358 case '\'':
2388 return TOK_QUOTE; 2359 return TOK_QUOTE;
2389 2360
2390 case ';': 2361 case ';':
… …
2522 } 2493 }
2523 2494
2524 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2525} 2496}
2526 2497
2527
2528/* print atoms */ 2498/* print atoms */
2529static void 2499static void
2530printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2531{ 2501{
2532 char *p; 2502 char *p;
2533 int len; 2503 int len;
2534 2504
2535 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2536 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2537} 2507}
2538
2539 2508
2540/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2541static void 2510static void
2542atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2543{ 2512{
… …
2557 { 2526 {
2558 p = SCHEME_V->strbuff; 2527 p = SCHEME_V->strbuff;
2559 2528
2560 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2529 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2561 { 2530 {
2562 if (num_is_integer (l)) 2531 if (is_integer (l))
2563 xnum (p, ivalue_unchecked (l)); 2532 xnum (p, ivalue_unchecked (l));
2564#if USE_REAL 2533#if USE_REAL
2565 else 2534 else
2566 { 2535 {
2567 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2536 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2704#endif 2673#endif
2705 } 2674 }
2706 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2707 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2708 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2709 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2710 2686
2711 *pp = p; 2687 *pp = p;
2712 *plen = strlen (p); 2688 *plen = strlen (p);
2713} 2689}
2714 2690
… …
2822 return 0; 2798 return 0;
2823 } 2799 }
2824 else if (is_number (a)) 2800 else if (is_number (a))
2825 { 2801 {
2826 if (is_number (b)) 2802 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2803 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2804
2830 return 0; 2805 return 0;
2831 } 2806 }
2832 else if (is_character (a)) 2807 else if (is_character (a))
2833 { 2808 {
… …
2859/* () is #t in R5RS */ 2834/* () is #t in R5RS */
2860#define is_true(p) ((p) != S_F) 2835#define is_true(p) ((p) != S_F)
2861#define is_false(p) ((p) == S_F) 2836#define is_false(p) ((p) == S_F)
2862 2837
2863/* ========== Environment implementation ========== */ 2838/* ========== Environment implementation ========== */
2864
2865#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2866
2867static int
2868hash_fn (const char *key, int table_size)
2869{
2870 const unsigned char *p = key;
2871 uint32_t hash = 2166136261;
2872
2873 while (*p)
2874 hash = (hash ^ *p++) * 16777619;
2875
2876 return hash % table_size;
2877}
2878#endif
2879 2839
2880#ifndef USE_ALIST_ENV 2840#ifndef USE_ALIST_ENV
2881 2841
2882/* 2842/*
2883 * In this implementation, each frame of the environment may be 2843 * In this implementation, each frame of the environment may be
… …
2900 2860
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2861 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2862 setenvironment (SCHEME_V->envir);
2903} 2863}
2904 2864
2905static INLINE void 2865static uint32_t
2866sym_hash (pointer sym, uint32_t size)
2867{
2868 uintptr_t ptr = (uintptr_t)sym;
2869
2870#if 0
2871 /* table size is prime, so why mix */
2872 ptr += ptr >> 32;
2873 ptr += ptr >> 16;
2874 ptr += ptr >> 8;
2875#endif
2876
2877 return ptr % size;
2878}
2879
2880ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2881new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2882{
2908 pointer slot = immutable_cons (variable, value); 2883 pointer slot = immutable_cons (variable, value);
2909 2884
2910 if (is_vector (car (env))) 2885 if (is_vector (car (env)))
2911 { 2886 {
2912 int location = hash_fn (symname (variable), veclength (car (env))); 2887 int location = sym_hash (variable, veclength (car (env)));
2913
2914 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2888 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2915 } 2889 }
2916 else 2890 else
2917 set_car (env, immutable_cons (slot, car (env))); 2891 set_car (env, immutable_cons (slot, car (env)));
2918} 2892}
2919 2893
2920static pointer 2894static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2896{
2923 pointer x, y; 2897 pointer x, y;
2924 int location;
2925 2898
2926 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
2927 { 2900 {
2928 if (is_vector (car (x))) 2901 if (is_vector (car (x)))
2929 { 2902 {
2930 location = hash_fn (symname (hdl), veclength (car (x))); 2903 int location = sym_hash (hdl, veclength (car (x)));
2931 y = vector_elem (car (x), location); 2904 y = vector_get (car (x), location);
2932 } 2905 }
2933 else 2906 else
2934 y = car (x); 2907 y = car (x);
2935 2908
2936 for (; y != NIL; y = cdr (y)) 2909 for (; y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2910 if (caar (y) == hdl)
2938 break; 2911 break;
2939 2912
2940 if (y != NIL) 2913 if (y != NIL)
2914 return car (y);
2915
2916 if (!all)
2941 break; 2917 break;
2942
2943 if (!all)
2944 return NIL;
2945 } 2918 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2919
2950 return NIL; 2920 return NIL;
2951} 2921}
2952 2922
2953#else /* USE_ALIST_ENV */ 2923#else /* USE_ALIST_ENV */
2954 2924
2955static INLINE void 2925ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2926new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2927{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2928 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2929 setenvironment (SCHEME_V->envir);
2960} 2930}
2961 2931
2962static INLINE void 2932ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2933new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2934{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2936}
2967 2937
… …
2975 for (y = car (x); y != NIL; y = cdr (y)) 2945 for (y = car (x); y != NIL; y = cdr (y))
2976 if (caar (y) == hdl) 2946 if (caar (y) == hdl)
2977 break; 2947 break;
2978 2948
2979 if (y != NIL) 2949 if (y != NIL)
2950 return car (y);
2980 break; 2951 break;
2981 2952
2982 if (!all) 2953 if (!all)
2983 return NIL; 2954 break;
2984 } 2955 }
2985
2986 if (x != NIL)
2987 return car (y);
2988 2956
2989 return NIL; 2957 return NIL;
2990} 2958}
2991 2959
2992#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2993 2961
2994static INLINE void 2962ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2966 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2967}
2999 2968
3000static INLINE void 2969ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2971{
3003 set_cdr (slot, value); 2972 set_cdr (slot, value);
3004} 2973}
3005 2974
3006static INLINE pointer 2975ecb_inline pointer
3007slot_value_in_env (pointer slot) 2976slot_value_in_env (pointer slot)
3008{ 2977{
3009 return cdr (slot); 2978 return cdr (slot);
3010} 2979}
3011 2980
3012/* ========== Evaluation Cycle ========== */ 2981/* ========== Evaluation Cycle ========== */
3013 2982
3014static pointer 2983static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2984xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2985{
3017#if USE_ERROR_HOOK 2986#if USE_ERROR_HOOK
3018 pointer x; 2987 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2988 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 3023 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 3024 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 3025 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 3026 SCHEME_V->op = OP_EVAL;
3058 3027
3059 return S_T; 3028 return 0;
3060 } 3029 }
3061#endif 3030#endif
3062 3031
3063 if (a) 3032 if (a)
3064 SCHEME_V->args = cons (a, NIL); 3033 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 3035 SCHEME_V->args = NIL;
3067 3036
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3037 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 3038 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 3039 SCHEME_V->op = OP_ERR0;
3040
3071 return S_T; 3041 return 0;
3072} 3042}
3073 3043
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3044#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 3045#define Error_0(s) Error_1 (s, 0)
3076 3046
3077/* Too small to turn into function */ 3047/* Too small to turn into function */
3078#define BEGIN do { 3048#define BEGIN do {
3079#define END } while (0) 3049#define END } while (0)
3080#define s_goto(a) BEGIN \ 3050#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3051 SCHEME_V->op = a; \
3082 return S_T; END 3052 return 0; END
3083 3053
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3054#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3055
3086#ifndef USE_SCHEME_STACK 3056#ifndef USE_SCHEME_STACK
3087 3057
… …
3101{ 3071{
3102 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3103 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3104 3074
3105 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3106 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3107 { 3077 {
3108 SCHEME_V->dump_size += STACK_GROWTH; 3078 SCHEME_V->dump_size += STACK_GROWTH;
3109 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3079 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3110 } 3080 }
3111 3081
3112 next_frame = SCHEME_V->dump_base + nframes; 3082 next_frame = SCHEME_V->dump_base + nframes;
3113 3083
3114 next_frame->op = op; 3084 next_frame->op = op;
3115 next_frame->args = args; 3085 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3086 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3087 next_frame->code = code;
3118 3088
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3089 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3090}
3121 3091
3122static pointer 3092static int
3123xs_return (SCHEME_P_ pointer a) 3093xs_return (SCHEME_P_ pointer a)
3124{ 3094{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3096 struct dump_stack_frame *frame;
3127 3097
3128 SCHEME_V->value = a; 3098 SCHEME_V->value = a;
3129 3099
3130 if (nframes <= 0) 3100 if (nframes <= 0)
3131 return NIL; 3101 return -1;
3132 3102
3133 frame = &SCHEME_V->dump_base[--nframes]; 3103 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3104 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3105 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3106 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3107 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3109
3140 return S_T; 3110 return 0;
3141} 3111}
3142 3112
3143static INLINE void 3113ecb_inline void
3144dump_stack_reset (SCHEME_P) 3114dump_stack_reset (SCHEME_P)
3145{ 3115{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3116 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3117 SCHEME_V->dump = (pointer)+0;
3148} 3118}
3149 3119
3150static INLINE void 3120ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3121dump_stack_initialize (SCHEME_P)
3152{ 3122{
3153 SCHEME_V->dump_size = 0; 3123 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3124 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3125 dump_stack_reset (SCHEME_A);
… …
3208 int i = 0; 3178 int i = 0;
3209 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3179 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3210 3180
3211 while (cont != NIL) 3181 while (cont != NIL)
3212 { 3182 {
3213 frame->op = ivalue (car (cont)); cont = cdr (cont); 3183 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3214 frame->args = car (cont) ; cont = cdr (cont); 3184 frame->args = car (cont) ; cont = cdr (cont);
3215 frame->envir = car (cont) ; cont = cdr (cont); 3185 frame->envir = car (cont) ; cont = cdr (cont);
3216 frame->code = car (cont) ; cont = cdr (cont); 3186 frame->code = car (cont) ; cont = cdr (cont);
3217 3187
3218 ++frame; 3188 ++frame;
3219 ++i; 3189 ++i;
3220 } 3190 }
3221 3191
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3192 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3193}
3224 3194
3225#else 3195#else
3226 3196
3227static INLINE void 3197ecb_inline void
3228dump_stack_reset (SCHEME_P) 3198dump_stack_reset (SCHEME_P)
3229{ 3199{
3230 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3231} 3201}
3232 3202
3233static INLINE void 3203ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3204dump_stack_initialize (SCHEME_P)
3235{ 3205{
3236 dump_stack_reset (SCHEME_A); 3206 dump_stack_reset (SCHEME_A);
3237} 3207}
3238 3208
… …
3240dump_stack_free (SCHEME_P) 3210dump_stack_free (SCHEME_P)
3241{ 3211{
3242 SCHEME_V->dump = NIL; 3212 SCHEME_V->dump = NIL;
3243} 3213}
3244 3214
3245static pointer 3215static int
3246xs_return (SCHEME_P_ pointer a) 3216xs_return (SCHEME_P_ pointer a)
3247{ 3217{
3248 pointer dump = SCHEME_V->dump; 3218 pointer dump = SCHEME_V->dump;
3249 3219
3250 SCHEME_V->value = a; 3220 SCHEME_V->value = a;
3251 3221
3252 if (dump == NIL) 3222 if (dump == NIL)
3253 return NIL; 3223 return -1;
3254 3224
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3225 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3226 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3227 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3228 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3229
3260 SCHEME_V->dump = dump; 3230 SCHEME_V->dump = dump;
3261 3231
3262 return S_T; 3232 return 0;
3263} 3233}
3264 3234
3265static void 3235static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3236s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3237{
… …
3292 3262
3293#endif 3263#endif
3294 3264
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3266
3267#if EXPERIMENT
3297static pointer 3268static int
3269debug (SCHEME_P_ int indent, pointer x)
3270{
3271 int c;
3272
3273 if (is_syntax (x))
3274 {
3275 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3276 return 8 + 8;
3277 }
3278
3279 if (x == NIL)
3280 {
3281 printf ("%*sNIL\n", indent, "");
3282 return 3;
3283 }
3284
3285 switch (type (x))
3286 {
3287 case T_INTEGER:
3288 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3289 return 32+8;
3290
3291 case T_SYMBOL:
3292 printf ("%*sS<%s>\n", indent, "", symname (x));
3293 return 24+8;
3294
3295 case T_CLOSURE:
3296 printf ("%*sS<%s>\n", indent, "", "closure");
3297 debug (SCHEME_A_ indent + 3, cdr(x));
3298 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3299
3300 case T_PAIR:
3301 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3302 c = debug (SCHEME_A_ indent + 3, car (x));
3303 c += debug (SCHEME_A_ indent + 3, cdr (x));
3304 return c + 1;
3305
3306 case T_PORT:
3307 printf ("%*sS<%s>\n", indent, "", "port");
3308 return 24+8;
3309
3310 case T_VECTOR:
3311 printf ("%*sS<%s>\n", indent, "", "vector");
3312 return 24+8;
3313
3314 case T_ENVIRONMENT:
3315 printf ("%*sS<%s>\n", indent, "", "environment");
3316 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3317
3318 default:
3319 printf ("unhandled type %d\n", type (x));
3320 break;
3321 }
3322}
3323#endif
3324
3325static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3327{
3328 pointer args = SCHEME_V->args;
3300 pointer x, y; 3329 pointer x, y;
3301 3330
3302 switch (op) 3331 switch (op)
3303 { 3332 {
3333#if EXPERIMENT //D
3334 case OP_DEBUG:
3335 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3336 printf ("\n");
3337 s_return (S_T);
3338#endif
3304 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3306 { 3341 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3342 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3343 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3344 }
3310 3345
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3347 Error_1 ("unable to open", car (args));
3313 else 3348 else
3314 { 3349 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3350 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3351 s_goto (OP_T0LVL);
3317 } 3352 }
3318 3353
3319 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3320 3355
3321 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3322 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3323 { 3358 {
3324 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3325 { 3360 {
3326 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3327 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
… …
3391 case OP_EVAL: /* main part of evaluation */ 3426 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3427#if USE_TRACING
3393 if (SCHEME_V->tracing) 3428 if (SCHEME_V->tracing)
3394 { 3429 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3430 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3431 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3432 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3433 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3434 s_goto (OP_P0LIST);
3400 } 3435 }
3401 3436
… …
3405#endif 3440#endif
3406 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3407 { 3442 {
3408 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3443 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3409 3444
3410 if (x != NIL) 3445 if (x == NIL)
3411 s_return (slot_value_in_env (x));
3412 else
3413 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3446 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3447
3448 s_return (slot_value_in_env (x));
3414 } 3449 }
3415 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3416 { 3451 {
3417 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3418 3453
… …
3431 } 3466 }
3432 else 3467 else
3433 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3434 3469
3435 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3436 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3437 { 3472 {
3438 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3439 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3440 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3441 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3480 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3481 s_goto (OP_E1ARGS);
3447 } 3482 }
3448 3483
3449 case OP_E1ARGS: /* eval arguments */ 3484 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3485 args = cons (SCHEME_V->value, args);
3451 3486
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3487 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3488 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3489 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3490 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3491 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3492 s_goto (OP_EVAL);
3458 } 3493 }
3459 else /* end */ 3494 else /* end */
3460 { 3495 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3496 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3497 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3498 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3465 } 3500 }
3466 3501
3467#if USE_TRACING 3502#if USE_TRACING
3468 3503
3469 case OP_TRACING: 3504 case OP_TRACING:
3470 { 3505 {
3471 int tr = SCHEME_V->tracing; 3506 int tr = SCHEME_V->tracing;
3472 3507
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3508 SCHEME_V->tracing = ivalue_unchecked (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3509 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3510 }
3476 3511
3477#endif 3512#endif
3478 3513
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3514 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3515#if USE_TRACING
3481 if (SCHEME_V->tracing) 3516 if (SCHEME_V->tracing)
3482 { 3517 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3518 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3519 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3520 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3521 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3522 s_goto (OP_P0LIST);
3488 } 3523 }
3489 3524
3490 /* fall through */ 3525 /* fall through */
3491 3526
3492 case OP_REAL_APPLY: 3527 case OP_REAL_APPLY:
3493#endif 3528#endif
3494 if (is_proc (SCHEME_V->code)) 3529 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3531 else if (is_foreign (SCHEME_V->code))
3499 { 3532 {
3500 /* Keep nested calls from GC'ing the arglist */ 3533 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3534 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3535 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3503 3536
3504 s_return (x); 3537 s_return (x);
3505 } 3538 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3539 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3540 {
3508 /* Should not accept promise */ 3541 /* Should not accept promise */
3509 /* make environment */ 3542 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3543 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3544
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3545 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3546 {
3514 if (y == NIL) 3547 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3548 Error_0 ("not enough arguments");
3516 else 3549 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3550 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3568 s_goto (OP_BEGIN);
3536 } 3569 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3570 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3571 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3572 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3573 s_return (args != NIL ? car (args) : NIL);
3541 } 3574 }
3542 else 3575 else
3543 Error_0 ("illegal function"); 3576 Error_0 ("illegal function");
3544 3577
3545 case OP_DOMACRO: /* do macro */ 3578 case OP_DOMACRO: /* do macro */
3546 SCHEME_V->code = SCHEME_V->value; 3579 SCHEME_V->code = SCHEME_V->value;
3547 s_goto (OP_EVAL); 3580 s_goto (OP_EVAL);
3548
3549#if 1
3550 3581
3551 case OP_LAMBDA: /* lambda */ 3582 case OP_LAMBDA: /* lambda */
3552 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3583 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3553 set SCHEME_V->value fall thru */ 3584 set SCHEME_V->value fall thru */
3554 { 3585 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3586 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3587
3557 if (f != NIL) 3588 if (f != NIL)
3558 { 3589 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3590 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3591 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3592 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3593 s_goto (OP_APPLY);
3563 } 3594 }
3564 3595
3565 SCHEME_V->value = SCHEME_V->code; 3596 SCHEME_V->value = SCHEME_V->code;
3566 /* Fallthru */
3567 } 3597 }
3598 /* Fallthru */
3568 3599
3569 case OP_LAMBDA1: 3600 case OP_LAMBDA1:
3570 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3601 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3571 3602
3572#else
3573
3574 case OP_LAMBDA: /* lambda */
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576
3577#endif
3578
3579 case OP_MKCLOSURE: /* make-closure */ 3603 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3604 x = car (args);
3581 3605
3582 if (car (x) == SCHEME_V->LAMBDA) 3606 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3607 x = cdr (x);
3584 3608
3585 if (cdr (SCHEME_V->args) == NIL) 3609 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3610 y = SCHEME_V->envir;
3587 else 3611 else
3588 y = cadr (SCHEME_V->args); 3612 y = cadr (args);
3589 3613
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3614 s_return (mk_closure (SCHEME_A_ x, y));
3591 3615
3592 case OP_QUOTE: /* quote */ 3616 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3617 s_return (car (SCHEME_V->code));
… …
3625 3649
3626 3650
3627 case OP_DEFP: /* defined? */ 3651 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3652 x = SCHEME_V->envir;
3629 3653
3630 if (cdr (SCHEME_V->args) != NIL) 3654 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3655 x = cadr (args);
3632 3656
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3657 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3658
3635 case OP_SET0: /* set! */ 3659 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3660 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3661 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3662
… …
3669 3693
3670 case OP_IF1: /* if */ 3694 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3695 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3696 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3697 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3698 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3699 s_goto (OP_EVAL);
3678 3700
3679 case OP_LET0: /* let */ 3701 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3702 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3703 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3704 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3705 s_goto (OP_LET1);
3684 3706
3685 case OP_LET1: /* let (calculate parameters) */ 3707 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3708 args = cons (SCHEME_V->value, args);
3687 3709
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3711 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3712 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3713 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3714
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3715 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3716 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3718 s_goto (OP_EVAL);
3697 } 3719 }
3698 else /* end */ 3720 else /* end */
3699 { 3721 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3722 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3723 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3724 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3725 s_goto (OP_LET2);
3704 } 3726 }
3705 3727
3706 case OP_LET2: /* let */ 3728 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3729 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3730
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3731 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3732 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3733 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3734
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3735 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3736 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3737 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3738 {
3717 if (!is_pair (x)) 3739 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3740 Error_1 ("Bad syntax of binding in let :", x);
3719 3741
3720 if (!is_list (SCHEME_A_ car (x))) 3742 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3743 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3744
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3745 args = cons (caar (x), args);
3724 } 3746 }
3725 3747
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3748 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3749 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3750 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3751 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3752 }
3733 else 3753 else
3734 { 3754 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3755 SCHEME_V->code = cdr (SCHEME_V->code);
3756 }
3757
3736 SCHEME_V->args = NIL; 3758 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3759 s_goto (OP_BEGIN);
3740 3760
3741 case OP_LET0AST: /* let* */ 3761 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3762 if (car (SCHEME_V->code) == NIL)
3743 { 3763 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3781 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3782 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3783
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3784 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3785 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3786 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3787 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3788 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3789 s_goto (OP_EVAL);
3770 } 3790 }
3771 else /* end */ 3791 else /* end */
3772 { 3792 {
3773 SCHEME_V->code = SCHEME_V->args; 3793 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3794 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3795 s_goto (OP_BEGIN);
3776 } 3796 }
3777 3797
3778 case OP_LET0REC: /* letrec */ 3798 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3801 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3802 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3803 s_goto (OP_LET1REC);
3784 3804
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3805 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3806 args = cons (SCHEME_V->value, args);
3787 3807
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3808 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3809 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3810 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3811 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3812
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3813 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3814 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3815 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3816 s_goto (OP_EVAL);
3797 } 3817 }
3798 else /* end */ 3818 else /* end */
3799 { 3819 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3820 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3821 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3822 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3823 s_goto (OP_LET2REC);
3804 } 3824 }
3805 3825
3806 case OP_LET2REC: /* letrec */ 3826 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3827 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3828 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3829
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3830 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3831 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3832 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3918 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3919 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3920 s_goto (OP_EVAL);
3901 3921
3902 case OP_C1STREAM: /* cons-stream */ 3922 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3923 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3924 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3925 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3926 s_return (cons (args, x));
3907 3927
3908 case OP_MACRO0: /* macro */ 3928 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3929 if (is_pair (car (SCHEME_V->code)))
3910 { 3930 {
3911 x = caar (SCHEME_V->code); 3931 x = caar (SCHEME_V->code);
… …
3944 { 3964 {
3945 if (!is_pair (y = caar (x))) 3965 if (!is_pair (y = caar (x)))
3946 break; 3966 break;
3947 3967
3948 for (; y != NIL; y = cdr (y)) 3968 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3969 if (eqv (car (y), SCHEME_V->value))
3951 break; 3970 break;
3952 }
3953 3971
3954 if (y != NIL) 3972 if (y != NIL)
3955 break; 3973 break;
3956 } 3974 }
3957 3975
… …
3977 s_goto (OP_BEGIN); 3995 s_goto (OP_BEGIN);
3978 else 3996 else
3979 s_return (NIL); 3997 s_return (NIL);
3980 3998
3981 case OP_PAPPLY: /* apply */ 3999 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 4000 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4001 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4002 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
3986 4004
3987 case OP_PEVAL: /* eval */ 4005 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 4006 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 4007 SCHEME_V->envir = cadr (args);
3990 4008
3991 SCHEME_V->code = car (SCHEME_V->args); 4009 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 4010 s_goto (OP_EVAL);
3993 4011
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 4012 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 4013 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4014 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 4015 s_goto (OP_APPLY);
3998 } 4016 }
3999 4017
4000 return S_T; 4018 if (USE_ERROR_CHECKING) abort ();
4001} 4019}
4002 4020
4003static pointer 4021static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4022opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 4023{
4006 pointer x; 4024 pointer args = SCHEME_V->args;
4025 pointer x = car (args);
4007 num v; 4026 num v;
4008 4027
4028 switch (op)
4029 {
4009#if USE_MATH 4030#if USE_MATH
4010 RVALUE dd;
4011#endif
4012
4013 switch (op)
4014 {
4015#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 4031 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args); 4032 {
4019
4020 if (num_is_integer (x)) 4033 if (is_integer (x))
4021 s_return (x); 4034 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4035
4036 RVALUE r = rvalue_unchecked (x);
4037
4038 if (r == (RVALUE)(IVALUE)r)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4024 else 4040 else
4025 Error_1 ("inexact->exact: not integral:", x); 4041 Error_1 ("inexact->exact: not integral:", x);
4042 }
4026 4043
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4044 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4045 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4046 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4047 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4048 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4049 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4050 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 4051
4055 case OP_ATAN: 4052 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 4053 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4054 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 4055 else
4061 { 4056 {
4062 pointer y = cadr (SCHEME_V->args); 4057 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4058 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 4059 }
4066 4060
4067 case OP_SQRT: 4061 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4062 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 4063
4071 case OP_EXPT: 4064 case OP_EXPT:
4072 { 4065 {
4073 RVALUE result; 4066 RVALUE result;
4074 int real_result = 1; 4067 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 4068 pointer y = cadr (args);
4076 4069
4077 x = car (SCHEME_V->args);
4078
4079 if (num_is_integer (x) && num_is_integer (y)) 4070 if (is_integer (x) && is_integer (y))
4080 real_result = 0; 4071 real_result = 0;
4081 4072
4082 /* This 'if' is an R5RS compatibility fix. */ 4073 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 4074 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 4075 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 4076 result = 0;
4086 else 4077 else
4087 result = pow (rvalue (x), rvalue (y)); 4078 result = pow (rvalue (x), rvalue (y));
4088 4079
4089 /* Before returning integer result make sure we can. */ 4080 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 4081 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 4082 if (!real_result)
4092 { 4083 {
4093 long result_as_long = (long) result; 4084 long result_as_long = result;
4094 4085
4095 if (result != (RVALUE) result_as_long) 4086 if (result != result_as_long)
4096 real_result = 1; 4087 real_result = 1;
4097 } 4088 }
4098 4089
4099 if (real_result) 4090 if (real_result)
4100 s_return (mk_real (SCHEME_A_ result)); 4091 s_return (mk_real (SCHEME_A_ result));
4101 else 4092 else
4102 s_return (mk_integer (SCHEME_A_ result)); 4093 s_return (mk_integer (SCHEME_A_ result));
4103 } 4094 }
4104 4095
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4096 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4097 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 4098
4113 case OP_TRUNCATE: 4099 case OP_TRUNCATE:
4114 { 4100 {
4115 RVALUE rvalue_of_x; 4101 RVALUE n = rvalue (x);
4116
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x);
4119
4120 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4122 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4103 }
4125 4104
4126 case OP_ROUND: 4105 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4106 if (is_integer (x))
4130 s_return (x); 4107 s_return (x);
4131 4108
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4110#endif
4134 4111
4135 case OP_ADD: /* + */ 4112 case OP_ADD: /* + */
4136 v = num_zero; 4113 v = num_zero;
4137 4114
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4115 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4116 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4117
4141 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4142 4119
4143 case OP_MUL: /* * */ 4120 case OP_MUL: /* * */
4144 v = num_one; 4121 v = num_one;
4145 4122
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4124 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4125
4149 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4150 4127
4151 case OP_SUB: /* - */ 4128 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4129 if (cdr (args) == NIL)
4153 { 4130 {
4154 x = SCHEME_V->args; 4131 x = args;
4155 v = num_zero; 4132 v = num_zero;
4156 } 4133 }
4157 else 4134 else
4158 { 4135 {
4159 x = cdr (SCHEME_V->args); 4136 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4137 v = nvalue (car (args));
4161 } 4138 }
4162 4139
4163 for (; x != NIL; x = cdr (x)) 4140 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4141 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4142
4166 s_return (mk_number (SCHEME_A_ v)); 4143 s_return (mk_number (SCHEME_A_ v));
4167 4144
4168 case OP_DIV: /* / */ 4145 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4146 if (cdr (args) == NIL)
4170 { 4147 {
4171 x = SCHEME_V->args; 4148 x = args;
4172 v = num_one; 4149 v = num_one;
4173 } 4150 }
4174 else 4151 else
4175 { 4152 {
4176 x = cdr (SCHEME_V->args); 4153 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4154 v = nvalue (car (args));
4178 } 4155 }
4179 4156
4180 for (; x != NIL; x = cdr (x)) 4157 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4158 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4159 v = num_div (v, nvalue (car (x)));
4184 else 4160 else
4185 Error_0 ("/: division by zero"); 4161 Error_0 ("/: division by zero");
4186 }
4187 4162
4188 s_return (mk_number (SCHEME_A_ v)); 4163 s_return (mk_number (SCHEME_A_ v));
4189 4164
4190 case OP_INTDIV: /* quotient */ 4165 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4166 if (cdr (args) == NIL)
4192 { 4167 {
4193 x = SCHEME_V->args; 4168 x = args;
4194 v = num_one; 4169 v = num_one;
4195 } 4170 }
4196 else 4171 else
4197 { 4172 {
4198 x = cdr (SCHEME_V->args); 4173 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4174 v = nvalue (car (args));
4200 } 4175 }
4201 4176
4202 for (; x != NIL; x = cdr (x)) 4177 for (; x != NIL; x = cdr (x))
4203 { 4178 {
4204 if (ivalue (car (x)) != 0) 4179 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4180 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4181 else
4207 Error_0 ("quotient: division by zero"); 4182 Error_0 ("quotient: division by zero");
4208 } 4183 }
4209 4184
4210 s_return (mk_number (SCHEME_A_ v)); 4185 s_return (mk_number (SCHEME_A_ v));
4211 4186
4212 case OP_REM: /* remainder */ 4187 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4188 v = nvalue (x);
4214 4189
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4190 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4191 v = num_rem (v, nvalue (cadr (args)));
4217 else 4192 else
4218 Error_0 ("remainder: division by zero"); 4193 Error_0 ("remainder: division by zero");
4219 4194
4220 s_return (mk_number (SCHEME_A_ v)); 4195 s_return (mk_number (SCHEME_A_ v));
4221 4196
4222 case OP_MOD: /* modulo */ 4197 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4198 v = nvalue (x);
4224 4199
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4200 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4201 v = num_mod (v, nvalue (cadr (args)));
4227 else 4202 else
4228 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4229 4204
4230 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4231 4206
4232 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4233 s_return (caar (SCHEME_V->args)); 4208 case OP_CAR: op_car: s_return (car (x));
4234 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4235 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4236 s_return (cdar (SCHEME_V->args)); 4211 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4212 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4213 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4214 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4215 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4216 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4217 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4218 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4219 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4220 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4221 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4222 case OP_CAAAAR: x = car (x); goto op_caaar;
4223 case OP_CAAADR: x = cdr (x); goto op_caaar;
4224 case OP_CAADAR: x = car (x); goto op_caadr;
4225 case OP_CAADDR: x = cdr (x); goto op_caadr;
4226 case OP_CADAAR: x = car (x); goto op_cadar;
4227 case OP_CADADR: x = cdr (x); goto op_cadar;
4228 case OP_CADDAR: x = car (x); goto op_caddr;
4229 case OP_CADDDR: x = cdr (x); goto op_caddr;
4230 case OP_CDAAAR: x = car (x); goto op_cdaar;
4231 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4232 case OP_CDADAR: x = car (x); goto op_cdadr;
4233 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4234 case OP_CDDAAR: x = car (x); goto op_cddar;
4235 case OP_CDDADR: x = cdr (x); goto op_cddar;
4236 case OP_CDDDAR: x = car (x); goto op_cdddr;
4237 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4237 4238
4238 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4240 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4241 s_return (args);
4241 4242
4242 case OP_SETCAR: /* set-car! */ 4243 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4244 if (!is_immutable (x))
4244 { 4245 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4246 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4247 s_return (car (args));
4247 } 4248 }
4248 else 4249 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4250 Error_0 ("set-car!: unable to alter immutable pair");
4250 4251
4251 case OP_SETCDR: /* set-cdr! */ 4252 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4253 if (!is_immutable (x))
4253 { 4254 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4255 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4256 s_return (car (args));
4256 } 4257 }
4257 else 4258 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4259 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4260
4260 case OP_CHAR2INT: /* char->integer */ 4261 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4262 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4262 4263
4263 case OP_INT2CHAR: /* integer->char */ 4264 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4265 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4265 4266
4266 case OP_CHARUPCASE: 4267 case OP_CHARUPCASE:
4267 { 4268 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4269 unsigned char c = ivalue_unchecked (x);
4269 c = toupper (c); 4270 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4271 s_return (mk_character (SCHEME_A_ c));
4271 } 4272 }
4272 4273
4273 case OP_CHARDNCASE: 4274 case OP_CHARDNCASE:
4274 { 4275 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4276 unsigned char c = ivalue_unchecked (x);
4276 c = tolower (c); 4277 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4278 s_return (mk_character (SCHEME_A_ c));
4278 } 4279 }
4279 4280
4280 case OP_STR2SYM: /* string->symbol */ 4281 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4282 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4283
4283 case OP_STR2ATOM: /* string->atom */ 4284 case OP_STR2ATOM: /* string->atom */
4284 { 4285 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4286 char *s = strvalue (x);
4286 long pf = 0; 4287 long pf = 0;
4287 4288
4288 if (cdr (SCHEME_V->args) != NIL) 4289 if (cdr (args) != NIL)
4289 { 4290 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4291 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4292 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4293 pf = ivalue_unchecked (cadr (args));
4293 4294
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4295 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4296 {
4296 /* base is OK */ 4297 /* base is OK */
4297 } 4298 }
4298 else 4299 else
4299 pf = -1; 4300 pf = -1;
4300 } 4301 }
4301 4302
4302 if (pf < 0) 4303 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4304 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4305 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4306 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4307 else
4307 { 4308 {
4308 if (pf == 0 || pf == 10) 4309 if (pf == 0 || pf == 10)
… …
4319 } 4320 }
4320 } 4321 }
4321 } 4322 }
4322 4323
4323 case OP_SYM2STR: /* symbol->string */ 4324 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4325 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4326 setimmutable (x);
4326 s_return (x); 4327 s_return (x);
4327 4328
4328 case OP_ATOM2STR: /* atom->string */ 4329 case OP_ATOM2STR: /* atom->string */
4329 { 4330 {
4330 long pf = 0; 4331 long pf = 0;
4331 4332
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4333 if (cdr (args) != NIL)
4335 { 4334 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4335 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4336 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4337 pf = ivalue_unchecked (cadr (args));
4339 4338
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4339 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4340 {
4342 /* base is OK */ 4341 /* base is OK */
4343 } 4342 }
4344 else 4343 else
4345 pf = -1; 4344 pf = -1;
4346 } 4345 }
4347 4346
4348 if (pf < 0) 4347 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4348 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4349 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4350 {
4352 char *p; 4351 char *p;
4353 int len; 4352 int len;
4354 4353
… …
4359 Error_1 ("atom->string: not an atom:", x); 4358 Error_1 ("atom->string: not an atom:", x);
4360 } 4359 }
4361 4360
4362 case OP_MKSTRING: /* make-string */ 4361 case OP_MKSTRING: /* make-string */
4363 { 4362 {
4364 int fill = ' '; 4363 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4365 int len; 4364 int len = ivalue_unchecked (x);
4366 4365
4367 len = ivalue (car (SCHEME_V->args));
4368
4369 if (cdr (SCHEME_V->args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args));
4371
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4366 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4367 }
4374 4368
4375 case OP_STRLEN: /* string-length */ 4369 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4370 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4371
4378 case OP_STRREF: /* string-ref */ 4372 case OP_STRREF: /* string-ref */
4379 { 4373 {
4380 char *str; 4374 char *str = strvalue (x);
4381 int index;
4382
4383 str = strvalue (car (SCHEME_V->args));
4384
4385 index = ivalue (cadr (SCHEME_V->args)); 4375 int index = ivalue_unchecked (cadr (args));
4386 4376
4387 if (index >= strlength (car (SCHEME_V->args))) 4377 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4378 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4379
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4380 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4381 }
4392 4382
4393 case OP_STRSET: /* string-set! */ 4383 case OP_STRSET: /* string-set! */
4394 { 4384 {
4395 char *str; 4385 char *str = strvalue (x);
4396 int index; 4386 int index = ivalue_unchecked (cadr (args));
4397 int c; 4387 int c;
4398 4388
4399 if (is_immutable (car (SCHEME_V->args))) 4389 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4390 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4391
4402 str = strvalue (car (SCHEME_V->args));
4403
4404 index = ivalue (cadr (SCHEME_V->args));
4405
4406 if (index >= strlength (car (SCHEME_V->args))) 4392 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4393 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4394
4409 c = charvalue (caddr (SCHEME_V->args)); 4395 c = charvalue (caddr (args));
4410 4396
4411 str[index] = (char) c; 4397 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4398 s_return (car (args));
4413 } 4399 }
4414 4400
4415 case OP_STRAPPEND: /* string-append */ 4401 case OP_STRAPPEND: /* string-append */
4416 { 4402 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4403 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4404 int len = 0;
4419 pointer newstr; 4405 pointer newstr;
4420 char *pos; 4406 char *pos;
4421 4407
4422 /* compute needed length for new string */ 4408 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4409 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4410 len += strlength (car (x));
4425 4411
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4412 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4413
4428 /* store the contents of the argument strings into the new string */ 4414 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4415 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4416 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4417
4432 s_return (newstr); 4418 s_return (newstr);
4433 } 4419 }
4434 4420
4435 case OP_SUBSTR: /* substring */ 4421 case OP_SUBSTR: /* substring */
4436 { 4422 {
4437 char *str; 4423 char *str = strvalue (x);
4438 int index0; 4424 int index0 = ivalue_unchecked (cadr (args));
4439 int index1; 4425 int index1;
4440 int len; 4426 int len;
4441 4427
4442 str = strvalue (car (SCHEME_V->args));
4443
4444 index0 = ivalue (cadr (SCHEME_V->args));
4445
4446 if (index0 > strlength (car (SCHEME_V->args))) 4428 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4429 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4430
4449 if (cddr (SCHEME_V->args) != NIL) 4431 if (cddr (args) != NIL)
4450 { 4432 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4433 index1 = ivalue_unchecked (caddr (args));
4452 4434
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4435 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4436 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4437 }
4456 else 4438 else
4457 index1 = strlength (car (SCHEME_V->args)); 4439 index1 = strlength (x);
4458 4440
4459 len = index1 - index0; 4441 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4442 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4443 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4444 strvalue (x)[len] = 0;
… …
4466 4448
4467 case OP_VECTOR: /* vector */ 4449 case OP_VECTOR: /* vector */
4468 { 4450 {
4469 int i; 4451 int i;
4470 pointer vec; 4452 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4453 int len = list_length (SCHEME_A_ args);
4472 4454
4473 if (len < 0) 4455 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4456 Error_1 ("vector: not a proper list:", args);
4475 4457
4476 vec = mk_vector (SCHEME_A_ len); 4458 vec = mk_vector (SCHEME_A_ len);
4477 4459
4478#if USE_ERROR_CHECKING 4460#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4461 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4462 s_return (S_SINK);
4481#endif 4463#endif
4482 4464
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4465 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4466 vector_set (vec, i, car (x));
4485 4467
4486 s_return (vec); 4468 s_return (vec);
4487 } 4469 }
4488 4470
4489 case OP_MKVECTOR: /* make-vector */ 4471 case OP_MKVECTOR: /* make-vector */
4490 { 4472 {
4491 pointer fill = NIL; 4473 pointer fill = NIL;
4492 int len;
4493 pointer vec; 4474 pointer vec;
4475 int len = ivalue_unchecked (x);
4494 4476
4495 len = ivalue (car (SCHEME_V->args));
4496
4497 if (cdr (SCHEME_V->args) != NIL) 4477 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4478 fill = cadr (args);
4499 4479
4500 vec = mk_vector (SCHEME_A_ len); 4480 vec = mk_vector (SCHEME_A_ len);
4501 4481
4502#if USE_ERROR_CHECKING 4482#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4483 if (SCHEME_V->no_memory)
4504 s_return (S_SINK); 4484 s_return (S_SINK);
4505#endif 4485#endif
4506 4486
4507 if (fill != NIL) 4487 if (fill != NIL)
4508 fill_vector (vec, fill); 4488 fill_vector (vec, 0, fill);
4509 4489
4510 s_return (vec); 4490 s_return (vec);
4511 } 4491 }
4512 4492
4513 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4494 s_return (mk_integer (SCHEME_A_ veclength (x)));
4495
4496 case OP_VECRESIZE:
4497 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4498 s_return (x);
4515 4499
4516 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4517 { 4501 {
4518 int index;
4519
4520 index = ivalue (cadr (SCHEME_V->args)); 4502 int index = ivalue_unchecked (cadr (args));
4521 4503
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4505 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4506
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4507 s_return (vector_get (x, index));
4526 } 4508 }
4527 4509
4528 case OP_VECSET: /* vector-set! */ 4510 case OP_VECSET: /* vector-set! */
4529 { 4511 {
4530 int index; 4512 int index = ivalue_unchecked (cadr (args));
4531 4513
4532 if (is_immutable (car (SCHEME_V->args))) 4514 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4515 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4516
4535 index = ivalue (cadr (SCHEME_V->args));
4536
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4517 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4518 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4519
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4520 vector_set (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4521 s_return (x);
4542 } 4522 }
4543 } 4523 }
4544 4524
4545 return S_T; 4525 if (USE_ERROR_CHECKING) abort ();
4546} 4526}
4547 4527
4548INTERFACE int 4528static int
4549is_list (SCHEME_P_ pointer a) 4529opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4550{ 4530{
4551 return list_length (SCHEME_A_ a) >= 0; 4531 pointer x = SCHEME_V->args;
4552}
4553 4532
4554/* Result is: 4533 for (;;)
4555 proper list: length
4556 circular list: -1
4557 not even a pair: -2
4558 dotted list: -2 minus length before dot
4559*/
4560INTERFACE int
4561list_length (SCHEME_P_ pointer a)
4562{
4563 int i = 0;
4564 pointer slow, fast;
4565
4566 slow = fast = a;
4567
4568 while (1)
4569 { 4534 {
4535 num v = nvalue (car (x));
4536 x = cdr (x);
4537
4570 if (fast == NIL) 4538 if (x == NIL)
4571 return i; 4539 break;
4572 4540
4573 if (!is_pair (fast)) 4541 int r = num_cmp (v, nvalue (car (x)));
4574 return -2 - i;
4575 4542
4576 fast = cdr (fast); 4543 switch (op)
4577 ++i;
4578
4579 if (fast == NIL)
4580 return i;
4581
4582 if (!is_pair (fast))
4583 return -2 - i;
4584
4585 ++i;
4586 fast = cdr (fast);
4587
4588 /* Safe because we would have already returned if `fast'
4589 encountered a non-pair. */
4590 slow = cdr (slow);
4591
4592 if (fast == slow)
4593 { 4544 {
4594 /* the fast pointer has looped back around and caught up 4545 case OP_NUMEQ: r = r == 0; break;
4595 with the slow pointer, hence the structure is circular, 4546 case OP_LESS: r = r < 0; break;
4596 not of finite length, and therefore not a list */ 4547 case OP_GRE: r = r > 0; break;
4597 return -1; 4548 case OP_LEQ: r = r <= 0; break;
4549 case OP_GEQ: r = r >= 0; break;
4598 } 4550 }
4599 }
4600}
4601 4551
4552 if (!r)
4553 s_return (S_F);
4554 }
4555
4556 s_return (S_T);
4557}
4558
4602static pointer 4559static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4560opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4561{
4605 pointer x; 4562 pointer args = SCHEME_V->args;
4606 num v; 4563 pointer a = car (args);
4607 int (*comp_func) (num, num); 4564 pointer d = cdr (args);
4565 int r;
4608 4566
4609 switch (op) 4567 switch (op)
4610 { 4568 {
4611 case OP_NOT: /* not */ 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4570 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4573 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4574 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4578 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4580
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4581#if USE_CHAR_CLASSIFIERS
4683 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4684 case OP_CHARAP: /* char-alphabetic? */ 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4686 4585 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4687 case OP_CHARNP: /* char-numeric? */ 4586 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4587#endif
4588
4699#if USE_PORTS 4589#if USE_PORTS
4700 4590 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4591 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4592 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4593#endif
4710 4594
4711 case OP_PROCP: /* procedure? */ 4595 case OP_PROCP: /* procedure? */
4712 4596
4713 /*-- 4597 /*--
4714 * continuation should be procedure by the example 4598 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4599 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4600 * in R^3 report sec. 6.9
4717 */ 4601 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4602 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4603 break;
4720 4604
4721 case OP_PAIRP: /* pair? */ 4605 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4606 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4607 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4608 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4609 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4610 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4611 }
4739 4612
4740 return S_T; 4613 s_retbool (r);
4741} 4614}
4742 4615
4743static pointer 4616static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4617opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4618{
4619 pointer args = SCHEME_V->args;
4620 pointer a = car (args);
4746 pointer x, y; 4621 pointer x, y;
4747 4622
4748 switch (op) 4623 switch (op)
4749 { 4624 {
4750 case OP_FORCE: /* force */ 4625 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4626 SCHEME_V->code = a;
4752 4627
4753 if (is_promise (SCHEME_V->code)) 4628 if (is_promise (SCHEME_V->code))
4754 { 4629 {
4755 /* Should change type to closure here */ 4630 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4631 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4759 } 4634 }
4760 else 4635 else
4761 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4762 4637
4763 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4764 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4765 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4766 4641
4767#if USE_PORTS 4642#if USE_PORTS
4768 4643
4769 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4652 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4653 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4654 }
4780 } 4655 }
4781 4656
4782 SCHEME_V->args = car (SCHEME_V->args); 4657 SCHEME_V->args = a;
4783 4658
4784 if (op == OP_WRITE) 4659 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4660 SCHEME_V->print_flag = 1;
4786 else 4661 else
4787 SCHEME_V->print_flag = 0; 4662 SCHEME_V->print_flag = 0;
4788 4663
4789 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
4790 4665
4791 case OP_NEWLINE: /* newline */ 4666 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4667 if (is_pair (args))
4793 { 4668 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4669 if (a != SCHEME_V->outport)
4795 { 4670 {
4796 x = cons (SCHEME_V->outport, NIL); 4671 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4672 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4673 SCHEME_V->outport = a;
4799 } 4674 }
4800 } 4675 }
4801 4676
4802 putstr (SCHEME_A_ "\n"); 4677 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4678 s_return (S_T);
4804#endif 4679#endif
4805 4680
4806 case OP_ERR0: /* error */ 4681 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4682 SCHEME_V->retcode = -1;
4808 4683
4809 if (!is_string (car (SCHEME_V->args))) 4684 if (!is_string (a))
4810 { 4685 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4686 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4687 setimmutable (car (args));
4813 } 4688 }
4814 4689
4815 putstr (SCHEME_A_ "Error: "); 4690 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4691 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4692 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4693 s_goto (OP_ERR1);
4819 4694
4820 case OP_ERR1: /* error */ 4695 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4696 putstr (SCHEME_A_ " ");
4822 4697
4823 if (SCHEME_V->args != NIL) 4698 if (args != NIL)
4824 { 4699 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4700 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4701 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4702 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4703 s_goto (OP_P0LIST);
4829 } 4704 }
4830 else 4705 else
4831 { 4706 {
4832 putstr (SCHEME_A_ "\n"); 4707 putstr (SCHEME_A_ "\n");
4833 4708
4834 if (SCHEME_V->interactive_repl) 4709 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4710 s_goto (OP_T0LVL);
4836 else 4711 else
4837 return NIL; 4712 return -1;
4838 } 4713 }
4839 4714
4840 case OP_REVERSE: /* reverse */ 4715 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4716 s_return (reverse (SCHEME_A_ a));
4842 4717
4843 case OP_LIST_STAR: /* list* */ 4718 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4719 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4720
4846 case OP_APPEND: /* append */ 4721 case OP_APPEND: /* append */
4847 x = NIL; 4722 x = NIL;
4848 y = SCHEME_V->args; 4723 y = args;
4849 4724
4850 if (y == x) 4725 if (y == x)
4851 s_return (x); 4726 s_return (x);
4852 4727
4853 /* cdr() in the while condition is not a typo. If car() */ 4728 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4739 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4740
4866#if USE_PLIST 4741#if USE_PLIST
4867 4742
4868 case OP_PUT: /* put */ 4743 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4744 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4745 Error_0 ("illegal use of put");
4871 4746
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4747 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4748 {
4874 if (caar (x) == y) 4749 if (caar (x) == y)
4875 break; 4750 break;
4876 } 4751 }
4877 4752
4878 if (x != NIL) 4753 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4754 cdar (x) = caddr (args);
4880 else 4755 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4756 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4757
4883 s_return (S_T); 4758 s_return (S_T);
4884 4759
4885 case OP_GET: /* get */ 4760 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4761 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4762 Error_0 ("illegal use of get");
4888 4763
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4764 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4765 if (caar (x) == y)
4891 break; 4766 break;
4892 4767
4893 if (x != NIL) 4768 if (x != NIL)
4894 s_return (cdar (x)); 4769 s_return (cdar (x));
… …
4896 s_return (NIL); 4771 s_return (NIL);
4897 4772
4898#endif /* USE_PLIST */ 4773#endif /* USE_PLIST */
4899 4774
4900 case OP_QUIT: /* quit */ 4775 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4776 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4777 SCHEME_V->retcode = ivalue (a);
4903 4778
4904 return NIL; 4779 return -1;
4905 4780
4906 case OP_GC: /* gc */ 4781 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4782 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4783 s_return (S_T);
4909 4784
4910 case OP_GCVERB: /* gc-verbose */ 4785 case OP_GCVERB: /* gc-verbose */
4911 { 4786 {
4912 int was = SCHEME_V->gc_verbose; 4787 int was = SCHEME_V->gc_verbose;
4913 4788
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4790 s_retbool (was);
4916 } 4791 }
4917 4792
4918 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4795 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4921 4797#endif
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4923
4924 s_return (S_T);
4925 4799
4926 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4928 4802
4929#if USE_PORTS 4803#if USE_PORTS
… …
4954 case OP_OPEN_INOUTFILE: 4828 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4829 prop = port_input | port_output;
4956 break; 4830 break;
4957 } 4831 }
4958 4832
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4833 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4834
4961 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4836 }
4966 4837
4967# if USE_STRING_PORTS 4838# if USE_STRING_PORTS
4968 4839
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4840 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4852 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4853 prop = port_input | port_output;
4983 break; 4854 break;
4984 } 4855 }
4985 4856
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4857 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4858 strvalue (a) + strlength (a), prop);
4988 4859
4989 if (p == NIL) 4860 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4861 }
4994 4862
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4863 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4864 {
4997 pointer p; 4865 pointer p;
4998 4866
4999 if (car (SCHEME_V->args) == NIL) 4867 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4868 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4869 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4870 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4871 strvalue (a) + strlength (a), port_output);
5010 4872
5011 if (p == NIL) 4873 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4874 }
5017 4875
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4877 {
5020 port *p; 4878 port *p = port (a);
5021 4879
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4880 if (p->kind & port_string)
5023 { 4881 {
5024 off_t size; 4882 off_t size;
5025 char *str; 4883 char *str;
5026 4884
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4901 }
5044 4902
5045# endif 4903# endif
5046 4904
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4905 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4906 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4907 s_return (S_T);
5050 4908
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4909 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4910 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4911 s_return (S_T);
5054#endif 4912#endif
5055 4913
5056 case OP_INT_ENV: /* interaction-environment */ 4914 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4915 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4917 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4918 s_return (SCHEME_V->envir);
5061 4919
5062 } 4920 }
5063 4921
5064 return S_T; 4922 if (USE_ERROR_CHECKING) abort ();
5065} 4923}
5066 4924
5067static pointer 4925static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4926opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4927{
4928 pointer args = SCHEME_V->args;
5070 pointer x; 4929 pointer x;
5071 4930
5072 if (SCHEME_V->nesting != 0) 4931 if (SCHEME_V->nesting != 0)
5073 { 4932 {
5074 int n = SCHEME_V->nesting; 4933 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4940 switch (op)
5082 { 4941 {
5083 /* ========== reading part ========== */ 4942 /* ========== reading part ========== */
5084#if USE_PORTS 4943#if USE_PORTS
5085 case OP_READ: 4944 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4945 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4946 s_goto (OP_READ_INTERNAL);
5088 4947
5089 if (!is_inport (car (SCHEME_V->args))) 4948 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4949 Error_1 ("read: not an input port:", car (args));
5091 4950
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4951 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
5094 4953
5095 x = SCHEME_V->inport; 4954 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4955 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4956 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4957 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
5100 4959
5101 case OP_READ_CHAR: /* read-char */ 4960 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4961 case OP_PEEK_CHAR: /* peek-char */
5103 { 4962 {
5104 int c; 4963 int c;
5105 4964
5106 if (is_pair (SCHEME_V->args)) 4965 if (is_pair (args))
5107 { 4966 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4967 if (car (args) != SCHEME_V->inport)
5109 { 4968 {
5110 x = SCHEME_V->inport; 4969 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4970 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4971 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4972 SCHEME_V->inport = car (args);
5114 } 4973 }
5115 } 4974 }
5116 4975
5117 c = inchar (SCHEME_A); 4976 c = inchar (SCHEME_A);
5118 4977
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4987 case OP_CHAR_READY: /* char-ready? */
5129 { 4988 {
5130 pointer p = SCHEME_V->inport; 4989 pointer p = SCHEME_V->inport;
5131 int res; 4990 int res;
5132 4991
5133 if (is_pair (SCHEME_V->args)) 4992 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4993 p = car (args);
5135 4994
5136 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
5137 4996
5138 s_retbool (res); 4997 s_retbool (res);
5139 } 4998 }
5140 4999
5141 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 5001 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 5002 s_return (SCHEME_V->value);
5144 5003
5145 case OP_SET_OUTPORT: /* set-output-port */ 5004 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 5005 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 5006 s_return (SCHEME_V->value);
5148#endif 5007#endif
5149 5008
5150 case OP_RDSEXPR: 5009 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 5010 switch (SCHEME_V->tok)
… …
5200 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5059 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5201 SCHEME_V->tok = token (SCHEME_A); 5060 SCHEME_V->tok = token (SCHEME_A);
5202 s_goto (OP_RDSEXPR); 5061 s_goto (OP_RDSEXPR);
5203 5062
5204 case TOK_ATOM: 5063 case TOK_ATOM:
5205 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5064 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5065
5066 case TOK_DOTATOM:
5067 SCHEME_V->strbuff[0] = '.';
5068 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5069
5070 case TOK_STRATOM:
5071 x = readstrexp (SCHEME_A_ '|');
5072 //TODO: haven't checked whether the garbage collector could interfere
5073 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5206 5074
5207 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
5208 x = readstrexp (SCHEME_A); 5076 x = readstrexp (SCHEME_A_ '"');
5209 5077
5210 if (x == S_F) 5078 if (x == S_F)
5211 Error_0 ("Error reading string"); 5079 Error_0 ("Error reading string");
5212 5080
5213 setimmutable (x); 5081 setimmutable (x);
… …
5225 s_goto (OP_EVAL); 5093 s_goto (OP_EVAL);
5226 } 5094 }
5227 } 5095 }
5228 5096
5229 case TOK_SHARP_CONST: 5097 case TOK_SHARP_CONST:
5230 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5098 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5231 Error_0 ("undefined sharp expression"); 5099 Error_0 ("undefined sharp expression");
5232 else 5100 else
5233 s_return (x); 5101 s_return (x);
5234 5102
5235 default: 5103 default:
… …
5237 } 5105 }
5238 5106
5239 break; 5107 break;
5240 5108
5241 case OP_RDLIST: 5109 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5110 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5111 SCHEME_V->tok = token (SCHEME_A);
5244 5112
5245 switch (SCHEME_V->tok) 5113 switch (SCHEME_V->tok)
5246 { 5114 {
5247 case TOK_EOF: 5115 case TOK_EOF:
… …
5275 case OP_RDDOT: 5143 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5144 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5145 Error_0 ("syntax error: illegal dot expression");
5278 5146
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5147 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5148 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5149
5282 case OP_RDQUOTE: 5150 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5151 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5152
5285 case OP_RDQQUOTE: 5153 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5175 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5176 s_goto (OP_VECTOR);
5309 5177
5310 /* ========== printing part ========== */ 5178 /* ========== printing part ========== */
5311 case OP_P0LIST: 5179 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5180 if (is_vector (args))
5313 { 5181 {
5314 putstr (SCHEME_A_ "#("); 5182 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5183 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5184 s_goto (OP_PVECFROM);
5317 } 5185 }
5318 else if (is_environment (SCHEME_V->args)) 5186 else if (is_environment (args))
5319 { 5187 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5188 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5189 s_return (S_T);
5322 } 5190 }
5323 else if (!is_pair (SCHEME_V->args)) 5191 else if (!is_pair (args))
5324 { 5192 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5193 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5194 s_return (S_T);
5327 } 5195 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5196 else
5329 { 5197 {
5198 pointer a = car (args);
5199 pointer b = cdr (args);
5200 int ok_abbr = ok_abbrev (b);
5201 SCHEME_V->args = car (b);
5202
5203 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5204 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5205 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5206 putstr (SCHEME_A_ "`");
5207 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5208 putstr (SCHEME_A_ ",");
5209 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5210 putstr (SCHEME_A_ ",@");
5211 else
5212 {
5213 putstr (SCHEME_A_ "(");
5214 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5215 SCHEME_V->args = a;
5216 }
5217
5332 s_goto (OP_P0LIST); 5218 s_goto (OP_P0LIST);
5333 } 5219 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5220
5221 case OP_P1LIST:
5222 if (is_pair (args))
5335 { 5223 {
5224 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5225 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5226 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5339 } 5228 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5229 else if (is_vector (args))
5369 { 5230 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5231 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5232 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5373 } 5234 }
5374 else 5235 else
5375 { 5236 {
5376 if (SCHEME_V->args != NIL) 5237 if (args != NIL)
5377 { 5238 {
5378 putstr (SCHEME_A_ " . "); 5239 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5240 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5241 }
5381 5242
5382 putstr (SCHEME_A_ ")"); 5243 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5244 s_return (S_T);
5384 } 5245 }
5385 5246
5386 case OP_PVECFROM: 5247 case OP_PVECFROM:
5387 { 5248 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5249 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5250 pointer vec = car (args);
5390 int len = veclength (vec); 5251 int len = veclength (vec);
5391 5252
5392 if (i == len) 5253 if (i == len)
5393 { 5254 {
5394 putstr (SCHEME_A_ ")"); 5255 putstr (SCHEME_A_ ")");
5395 s_return (S_T); 5256 s_return (S_T);
5396 } 5257 }
5397 else 5258 else
5398 { 5259 {
5399 pointer elem = vector_elem (vec, i); 5260 pointer elem = vector_get (vec, i);
5400 5261
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5262 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5264 SCHEME_V->args = elem;
5404 5265
5405 if (i > 0) 5266 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5267 putstr (SCHEME_A_ " ");
5407 5268
5408 s_goto (OP_P0LIST); 5269 s_goto (OP_P0LIST);
5409 } 5270 }
5410 } 5271 }
5411 } 5272 }
5412 5273
5413 return S_T; 5274 if (USE_ERROR_CHECKING) abort ();
5414} 5275}
5415 5276
5416static pointer 5277static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5278opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5279{
5280 pointer args = SCHEME_V->args;
5281 pointer a = car (args);
5419 pointer x, y; 5282 pointer x, y;
5420 5283
5421 switch (op) 5284 switch (op)
5422 { 5285 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5286 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5287 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5288 long v = list_length (SCHEME_A_ a);
5426 5289
5427 if (v < 0) 5290 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5291 Error_1 ("length: not a list:", a);
5429 5292
5430 s_return (mk_integer (SCHEME_A_ v)); 5293 s_return (mk_integer (SCHEME_A_ v));
5431 } 5294 }
5432 5295
5433 case OP_ASSQ: /* assq *//* a.k */ 5296 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5297 x = a;
5435 5298
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5299 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5300 {
5438 if (!is_pair (car (y))) 5301 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5302 Error_0 ("unable to handle non pair element");
5440 5303
5441 if (x == caar (y)) 5304 if (x == caar (y))
… …
5447 else 5310 else
5448 s_return (S_F); 5311 s_return (S_F);
5449 5312
5450 5313
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5314 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5315 SCHEME_V->args = a;
5453 5316
5454 if (SCHEME_V->args == NIL) 5317 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5318 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5319 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5320 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5462 5325
5463 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5464 /* 5327 /*
5465 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5467 */ 5331 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5332 s_retbool (is_closure (a));
5469 5333
5470 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5335 s_retbool (is_macro (a));
5472 } 5336 }
5473 5337
5474 return S_T; /* NOTREACHED */ 5338 if (USE_ERROR_CHECKING) abort ();
5475} 5339}
5476 5340
5341/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5343
5479typedef int (*test_predicate) (pointer); 5344typedef int (*test_predicate)(pointer);
5480static int 5345static int
5481is_any (pointer p) 5346tst_any (pointer p)
5482{ 5347{
5483 return 1; 5348 return 1;
5484} 5349}
5485 5350
5486static int 5351static int
5487is_nonneg (pointer p) 5352tst_inonneg (pointer p)
5488{ 5353{
5489 return ivalue (p) >= 0 && is_integer (p); 5354 return is_integer (p) && ivalue_unchecked (p) >= 0;
5355}
5356
5357static int
5358tst_is_list (SCHEME_P_ pointer p)
5359{
5360 return p == NIL || is_pair (p);
5490} 5361}
5491 5362
5492/* Correspond carefully with following defines! */ 5363/* Correspond carefully with following defines! */
5493static struct 5364static struct
5494{ 5365{
5495 test_predicate fct; 5366 test_predicate fct;
5496 const char *kind; 5367 const char *kind;
5497} tests[] = 5368} tests[] = {
5498{ 5369 { tst_any , 0 },
5499 { 0, 0}, /* unused */ 5370 { is_string , "string" },
5500 { is_any, 0}, 5371 { is_symbol , "symbol" },
5501 { is_string, "string" }, 5372 { is_port , "port" },
5502 { is_symbol, "symbol" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5373 { is_inport , "input port" },
5505 { is_outport, "output port" }, 5374 { is_outport , "output port" },
5506 { is_environment, "environment" }, 5375 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5376 { is_pair , "pair" },
5508 { 0, "pair or '()" }, 5377 { 0 , "pair or '()" },
5509 { is_character, "character" }, 5378 { is_character , "character" },
5510 { is_vector, "vector" }, 5379 { is_vector , "vector" },
5511 { is_number, "number" }, 5380 { is_number , "number" },
5512 { is_integer, "integer" }, 5381 { is_integer , "integer" },
5513 { is_nonneg, "non-negative integer" } 5382 { tst_inonneg , "non-negative integer" }
5514}; 5383};
5515 5384
5516#define TST_NONE 0 5385#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5386#define TST_ANY "\001"
5518#define TST_STRING "\002" 5387#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5388#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5389#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5390#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5391#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5392#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5393#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5394#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5395#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5396#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5397#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5398#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5399#define TST_NATURAL "\016"
5400
5401#define INF_ARG 0xff
5402#define UNNAMED_OP ""
5403
5404static const char opnames[] =
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5406#include "opdefines.h"
5407#undef OP_DEF
5408;
5409
5410static const char *
5411opname (int idx)
5412{
5413 const char *name = opnames;
5414
5415 /* should do this at compile time, but would require external program, right? */
5416 while (idx--)
5417 name += strlen (name) + 1;
5418
5419 return *name ? name : "ILLEGAL";
5420}
5421
5422static const char *
5423procname (pointer x)
5424{
5425 return opname (procnum (x));
5426}
5531 5427
5532typedef struct 5428typedef struct
5533{ 5429{
5534 dispatch_func func; 5430 uint8_t func;
5535 char *name; 5431 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5432 uint8_t builtin;
5433#if USE_ERROR_CHECKING
5536 int min_arity; 5434 uint8_t min_arity;
5537 int max_arity; 5435 uint8_t max_arity;
5538 char *arg_tests_encoding; 5436 char arg_tests_encoding[3];
5437#endif
5539} op_code_info; 5438} op_code_info;
5540 5439
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5440static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5441#if USE_ERROR_CHECKING
5442#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5443#else
5444#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5445#endif
5545#include "opdefines.h" 5446#include "opdefines.h"
5447#undef OP_DEF
5546 {0} 5448 {0}
5547}; 5449};
5548 5450
5549static const char *
5550procname (pointer x)
5551{
5552 int n = procnum (x);
5553 const char *name = dispatch_table[n].name;
5554
5555 if (name == 0)
5556 name = "ILLEGAL!";
5557
5558 return name;
5559}
5560
5561/* kernel of this interpreter */ 5451/* kernel of this interpreter */
5562static void 5452static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5454{
5565 SCHEME_V->op = op; 5455 SCHEME_V->op = op;
5566 5456
5567 for (;;) 5457 for (;;)
5568 { 5458 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5459 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5460
5571#if USE_ERROR_CHECKING 5461#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5462 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5463 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5464 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5465 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5466
5578 /* Check number of arguments */ 5467 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5468 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5469 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5470 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5471 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5472 xError_1 (SCHEME_A_ msg, 0);
5473 continue;
5584 } 5474 }
5585 5475 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5476 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5477 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5478 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5479 xError_1 (SCHEME_A_ msg, 0);
5480 continue;
5591 } 5481 }
5592 5482 else
5593 if (ok)
5594 { 5483 {
5595 if (pcd->arg_tests_encoding) 5484 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5485 {
5597 int i = 0; 5486 int i = 0;
5598 int j; 5487 int j;
5599 const char *t = pcd->arg_tests_encoding; 5488 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5489 pointer arglist = SCHEME_V->args;
5601 5490
5602 do 5491 do
5603 { 5492 {
5604 pointer arg = car (arglist); 5493 pointer arg = car (arglist);
5605 5494
5606 j = (int) t[0]; 5495 j = t[0];
5607 5496
5497 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5608 if (j == TST_LIST[0]) 5498 if (j == TST_LIST[0])
5609 { 5499 {
5610 if (arg != NIL && !is_pair (arg)) 5500 if (!tst_is_list (SCHEME_A_ arg))
5611 break; 5501 break;
5612 } 5502 }
5613 else 5503 else
5614 { 5504 {
5615 if (!tests[j].fct (arg)) 5505 if (!tests[j - 1].fct (arg))
5616 break; 5506 break;
5617 } 5507 }
5618 5508
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5509 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5620 t++; 5510 t++;
5621 5511
5622 arglist = cdr (arglist); 5512 arglist = cdr (arglist);
5623 i++; 5513 i++;
5624 } 5514 }
5625 while (i < n); 5515 while (i < n);
5626 5516
5627 if (i < n) 5517 if (i < n)
5628 { 5518 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5519 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5520 xError_1 (SCHEME_A_ msg, 0);
5521 continue;
5631 } 5522 }
5632 } 5523 }
5633 } 5524 }
5634
5635 if (!ok)
5636 {
5637 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5638 return;
5639
5640 pcd = dispatch_table + SCHEME_V->op;
5641 }
5642 } 5525 }
5643#endif 5526#endif
5644 5527
5645 ok_to_freely_gc (SCHEME_A); 5528 ok_to_freely_gc (SCHEME_A);
5646 5529
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5530 static const dispatch_func dispatch_funcs[] = {
5531 opexe_0,
5532 opexe_1,
5533 opexe_2,
5534 opexe_3,
5535 opexe_4,
5536 opexe_5,
5537 opexe_6,
5538 };
5539
5540 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5541 return;
5649 5542
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5544 {
5652 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5653 return; 5546 return;
5654 } 5547 }
5655 } 5548 }
5656} 5549}
5657 5550
… …
5676mk_proc (SCHEME_P_ enum scheme_opcodes op) 5569mk_proc (SCHEME_P_ enum scheme_opcodes op)
5677{ 5570{
5678 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5571 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5679 set_typeflag (y, (T_PROC | T_ATOM)); 5572 set_typeflag (y, (T_PROC | T_ATOM));
5680 ivalue_unchecked (y) = op; 5573 ivalue_unchecked (y) = op;
5681 set_num_integer (y);
5682 return y; 5574 return y;
5683} 5575}
5684 5576
5685/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5577/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5686static int 5578static int
5687syntaxnum (pointer p) 5579syntaxnum (pointer p)
5688{ 5580{
5689 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5690 5582
5691 switch (strlength (car (p))) 5583 switch (strlength (p))
5692 { 5584 {
5693 case 2: 5585 case 2:
5694 if (s[0] == 'i') 5586 if (s[0] == 'i')
5695 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5696 else 5588 else
… …
5710 5602
5711 case 'd': 5603 case 'd':
5712 return OP_COND0; /* cond */ 5604 return OP_COND0; /* cond */
5713 5605
5714 case '*': 5606 case '*':
5715 return OP_LET0AST; /* let* */ 5607 return OP_LET0AST;/* let* */
5716 5608
5717 default: 5609 default:
5718 return OP_SET0; /* set! */ 5610 return OP_SET0; /* set! */
5719 } 5611 }
5720 5612
… …
5742 5634
5743 case 'f': 5635 case 'f':
5744 return OP_DEF0; /* define */ 5636 return OP_DEF0; /* define */
5745 5637
5746 default: 5638 default:
5747 return OP_LET0REC; /* letrec */ 5639 return OP_LET0REC;/* letrec */
5748 } 5640 }
5749 5641
5750 default: 5642 default:
5751 return OP_C0STREAM; /* cons-stream */ 5643 return OP_C0STREAM; /* cons-stream */
5752 } 5644 }
5753} 5645}
5754 5646
5755#if USE_MULTIPLICITY 5647#if USE_MULTIPLICITY
5756scheme * 5648ecb_cold scheme *
5757scheme_init_new () 5649scheme_init_new ()
5758{ 5650{
5759 scheme *sc = malloc (sizeof (scheme)); 5651 scheme *sc = malloc (sizeof (scheme));
5760 5652
5761 if (!scheme_init (SCHEME_A)) 5653 if (!scheme_init (SCHEME_A))
… …
5766 else 5658 else
5767 return sc; 5659 return sc;
5768} 5660}
5769#endif 5661#endif
5770 5662
5771int 5663ecb_cold int
5772scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5773{ 5665{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5667 pointer x;
5668
5669 /* this memset is not strictly correct, as we assume (intcache)
5670 * that memset 0 will also set pointers to 0, but memset does
5671 * of course not guarantee that. screw such systems.
5672 */
5673 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5776 5674
5777 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5778 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5779 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5780 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
… …
5792 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5793 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5794 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5795 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5796 5694
5797 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5798 { 5696 {
5799#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5800 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5801 return 0; 5699 return 0;
5802#endif 5700#endif
… …
5849 5747
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5748 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5749 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5750 }
5853 5751
5752 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5753 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5754 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5755 assign_proc (SCHEME_A_ i, opname (i));
5857 5756
5858 /* initialization of global pointers to special symbols */ 5757 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5758 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5759 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5760 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5799scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5800{
5902 SCHEME_V->ext_data = p; 5801 SCHEME_V->ext_data = p;
5903} 5802}
5904 5803
5905void 5804ecb_cold void
5906scheme_deinit (SCHEME_P) 5805scheme_deinit (SCHEME_P)
5907{ 5806{
5908 int i; 5807 int i;
5909 5808
5910#if SHOW_ERROR_LINE 5809#if SHOW_ERROR_LINE
… …
6002{ 5901{
6003 dump_stack_reset (SCHEME_A); 5902 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5903 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5904 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5905 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5906 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5907 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5908 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5909#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5910 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5911#endif
6013 SCHEME_V->retcode = 0; 5912 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5913 SCHEME_V->interactive_repl = 0;
… …
6131# endif 6030# endif
6132 int fin; 6031 int fin;
6133 char *file_name = InitFile; 6032 char *file_name = InitFile;
6134 int retcode; 6033 int retcode;
6135 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
6136 6036
6137 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6138 { 6038 {
6139 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6140 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6141 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
6142 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6143 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6144 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6145 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6146 return 1; 6046 return 1;
6147 } 6047 }
6148 6048
6149 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
6150 { 6050 {
6151 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
6152 return 2; 6052 return 2;
6153 } 6053 }
6154 6054
6155# if USE_PORTS 6055# if USE_PORTS
6156 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6201 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
6202#endif 6102#endif
6203 6103
6204 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
6205 { 6105 {
6206 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6106 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6207 } 6107 }
6208 else 6108 else
6209 { 6109 {
6210 if (isfile) 6110 if (isfile)
6211 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6215#if USE_PORTS 6115#if USE_PORTS
6216 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
6217 { 6117 {
6218 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
6219 { 6119 {
6220 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6120 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6221 } 6121 }
6222 6122
6223 if (isfile) 6123 if (isfile)
6224 close (fin); 6124 close (fin);
6225 } 6125 }

Diff Legend

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