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.14 by root, Thu Nov 26 08:56:32 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
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76 91
77#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
78static scheme sc; 93static scheme sc;
79#endif 94#endif
80 95
… …
88 } 103 }
89 104
90 char *p = s; 105 char *p = s;
91 106
92 do { 107 do {
93 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
94 n /= base; 109 n /= base;
95 } while (n); 110 } while (n);
96 111
97 *p-- = 0; 112 *p-- = 0;
98 113
… …
108{ 123{
109 xbase (s, n, 10); 124 xbase (s, n, 10);
110} 125}
111 126
112static void 127static void
113xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
114{
115 write (1, s, strlen (s));
116}
117
118static void
119xwrnum (long n)
120{ 129{
121 char buf[64]; 130 char buf[64];
122 131
123 xnum (buf, n); 132 xnum (buf, n);
124 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
125} 134}
126 135
127static char 136static char
128xtoupper (char c) 137xtoupper (char c)
129{ 138{
… …
150 159
151#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
154 163
155#if USE_STRLWR 164#if USE_IGNORECASE
156static const char * 165static const char *
157strlwr (char *s) 166xstrlwr (char *s)
158{ 167{
159 const char *p = s; 168 const char *p = s;
160 169
161 while (*s) 170 while (*s)
162 { 171 {
… …
164 s++; 173 s++;
165 } 174 }
166 175
167 return p; 176 return p;
168} 177}
169#endif
170 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
171#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
173 186
174#ifndef prompt 187#ifndef prompt
175# define prompt "ts> " 188# define prompt "ts> "
176#endif 189#endif
177 190
178#ifndef InitFile 191#ifndef InitFile
179# define InitFile "init.scm" 192# define InitFile "init.scm"
180#endif 193#endif
181 194
182#ifndef FIRST_CELLSEGS
183# define FIRST_CELLSEGS 3
184#endif
185
186enum scheme_types 195enum scheme_types
187{ 196{
197 T_INTEGER,
188 T_FREE, 198 T_REAL,
189 T_STRING, 199 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 200 T_SYMBOL,
192 T_PROC, 201 T_PROC,
193 T_PAIR, 202 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 203 T_CLOSURE,
195 T_CONTINUATION, 204 T_CONTINUATION,
196 T_FOREIGN, 205 T_FOREIGN,
197 T_CHARACTER, 206 T_CHARACTER,
198 T_PORT, 207 T_PORT,
… …
208#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
212 221
222/* num, for generic arithmetic */
223struct num
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
213enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
214 249
215static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
217static num num_rem (num a, num b); 252static num num_rem (num a, num b);
… …
220#if USE_MATH 255#if USE_MATH
221static double round_per_R5RS (double x); 256static double round_per_R5RS (double x);
222#endif 257#endif
223static int is_zero_rvalue (RVALUE x); 258static int is_zero_rvalue (RVALUE x);
224 259
225static INLINE int
226num_is_integer (pointer p)
227{
228 return num_is_fixnum (p->object.number);
229}
230
231static num num_zero; 260static num num_zero;
232static num num_one; 261static num num_one;
233 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
234/* macros for cell operations */ 267/* macros for cell operations */
235#define typeflag(p) ((p)->flag + 0) 268#define typeflag(p) (CELL(p)->flag + 0)
236#define set_typeflag(p,v) ((p)->flag = (v)) 269#define set_typeflag(p,v) (CELL(p)->flag = (v))
237#define type(p) (typeflag (p) & T_MASKTYPE) 270#define type(p) (typeflag (p) & T_MASKTYPE)
238 271
239INTERFACE INLINE int 272INTERFACE int
240is_string (pointer p) 273is_string (pointer p)
241{ 274{
242 return type (p) == T_STRING; 275 return type (p) == T_STRING;
243} 276}
244 277
245#define strvalue(p) ((p)->object.string.svalue) 278#define strvalue(p) (CELL(p)->object.string.svalue)
246#define strlength(p) ((p)->object.string.length) 279#define strlength(p) (CELL(p)->object.string.length)
247 280
248INTERFACE int is_list (SCHEME_P_ pointer p);
249INTERFACE INLINE int 281INTERFACE int
250is_vector (pointer p) 282is_vector (pointer p)
251{ 283{
252 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
253} 285}
254 286
255#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 289INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 292
262INTERFACE uint32_t 293INTERFACE int
263vector_length (pointer vec) 294is_integer (pointer p)
264{ 295{
265 return vec->object.vector.length; 296 return type (p) == T_INTEGER;
266} 297}
267 298
299/* not the same as in scheme, where integers are (correctly :) reals */
268INTERFACE INLINE int 300INTERFACE int
301is_real (pointer p)
302{
303 return type (p) == T_REAL;
304}
305
306INTERFACE int
269is_number (pointer p) 307is_number (pointer p)
270{ 308{
271 return type (p) == T_NUMBER; 309 return is_integer (p) || is_real (p);
272} 310}
273 311
274INTERFACE INLINE int 312INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE INLINE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290}
291
292INTERFACE INLINE int
293is_character (pointer p) 313is_character (pointer p)
294{ 314{
295 return type (p) == T_CHARACTER; 315 return type (p) == T_CHARACTER;
296} 316}
297 317
298INTERFACE INLINE char * 318INTERFACE char *
299string_value (pointer p) 319string_value (pointer p)
300{ 320{
301 return strvalue (p); 321 return strvalue (p);
302} 322}
303 323
304INLINE num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#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
335#if USE_REAL 327#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 330#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
341# define set_num_integer(p) 0 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 333#endif
334
344INTERFACE long 335INTERFACE long
345charvalue (pointer p) 336charvalue (pointer p)
346{ 337{
347 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
348} 339}
349 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
350INTERFACE INLINE int 343INTERFACE int
351is_port (pointer p) 344is_port (pointer p)
352{ 345{
353 return type (p) == T_PORT; 346 return type (p) == T_PORT;
354} 347}
355 348
356INTERFACE INLINE int 349INTERFACE int
357is_inport (pointer p) 350is_inport (pointer p)
358{ 351{
359 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
360} 353}
361 354
362INTERFACE INLINE int 355INTERFACE int
363is_outport (pointer p) 356is_outport (pointer p)
364{ 357{
365 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
366} 359}
367 360
368INTERFACE INLINE int 361INTERFACE int
369is_pair (pointer p) 362is_pair (pointer p)
370{ 363{
371 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
372} 365}
373 366
374#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
375#define cdr(p) ((p)->object.cons.cdr + 0) 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
376 369
377static pointer caar (pointer p) { return car (car (p)); } 370static pointer caar (pointer p) { return car (car (p)); }
378static pointer cadr (pointer p) { return car (cdr (p)); } 371static pointer cadr (pointer p) { return car (cdr (p)); }
379static pointer cdar (pointer p) { return cdr (car (p)); } 372static pointer cdar (pointer p) { return cdr (car (p)); }
380static pointer cddr (pointer p) { return cdr (cdr (p)); } 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
384static pointer cdaar (pointer p) { return cdr (car (car (p))); } 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
385 378
386INTERFACE void 379INTERFACE void
387set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
388{ 381{
389 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
390} 383}
391 384
392INTERFACE void 385INTERFACE void
393set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
394{ 387{
395 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
396} 389}
397 390
398INTERFACE pointer 391INTERFACE pointer
399pair_car (pointer p) 392pair_car (pointer p)
400{ 393{
… …
405pair_cdr (pointer p) 398pair_cdr (pointer p)
406{ 399{
407 return cdr (p); 400 return cdr (p);
408} 401}
409 402
410INTERFACE INLINE int 403INTERFACE int
411is_symbol (pointer p) 404is_symbol (pointer p)
412{ 405{
413 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
414} 407}
415 408
416INTERFACE INLINE char * 409INTERFACE char *
417symname (pointer p) 410symname (pointer p)
418{ 411{
419 return strvalue (car (p)); 412 return strvalue (p);
420} 413}
421 414
422#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
423SCHEME_EXPORT INLINE int 418SCHEME_EXPORT int
424hasprop (pointer p) 419hasprop (pointer p)
425{ 420{
426 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
427} 422}
428
429# define symprop(p) cdr(p)
430#endif 423#endif
431 424
432INTERFACE INLINE int 425INTERFACE int
433is_syntax (pointer p) 426is_syntax (pointer p)
434{ 427{
435 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
436} 429}
437 430
438INTERFACE INLINE int 431INTERFACE int
439is_proc (pointer p) 432is_proc (pointer p)
440{ 433{
441 return type (p) == T_PROC; 434 return type (p) == T_PROC;
442} 435}
443 436
444INTERFACE INLINE int 437INTERFACE int
445is_foreign (pointer p) 438is_foreign (pointer p)
446{ 439{
447 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
448} 441}
449 442
450INTERFACE INLINE char * 443INTERFACE char *
451syntaxname (pointer p) 444syntaxname (pointer p)
452{ 445{
453 return strvalue (car (p)); 446 return strvalue (p);
454} 447}
455 448
456#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
457static const char *procname (pointer x); 450static const char *procname (pointer x);
458 451
459INTERFACE INLINE int 452INTERFACE int
460is_closure (pointer p) 453is_closure (pointer p)
461{ 454{
462 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
463} 456}
464 457
465INTERFACE INLINE int 458INTERFACE int
466is_macro (pointer p) 459is_macro (pointer p)
467{ 460{
468 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
469} 462}
470 463
471INTERFACE INLINE pointer 464INTERFACE pointer
472closure_code (pointer p) 465closure_code (pointer p)
473{ 466{
474 return car (p); 467 return car (p);
475} 468}
476 469
477INTERFACE INLINE pointer 470INTERFACE pointer
478closure_env (pointer p) 471closure_env (pointer p)
479{ 472{
480 return cdr (p); 473 return cdr (p);
481} 474}
482 475
483INTERFACE INLINE int 476INTERFACE int
484is_continuation (pointer p) 477is_continuation (pointer p)
485{ 478{
486 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
487} 480}
488 481
489#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
490#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
491 484
492/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
493INTERFACE INLINE int 486INTERFACE int
494is_promise (pointer p) 487is_promise (pointer p)
495{ 488{
496 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
497} 490}
498 491
499INTERFACE INLINE int 492INTERFACE int
500is_environment (pointer p) 493is_environment (pointer p)
501{ 494{
502 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
503} 496}
504 497
… …
510 503
511#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
512#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
513#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
514 507
515INTERFACE INLINE int 508INTERFACE int
516is_immutable (pointer p) 509is_immutable (pointer p)
517{ 510{
518 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
519} 512}
520 513
521INTERFACE INLINE void 514INTERFACE void
522setimmutable (pointer p) 515setimmutable (pointer p)
523{ 516{
524#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
525 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
526#endif 519#endif
527} 520}
528 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
529#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
530static INLINE int 577ecb_inline int
531Cisalpha (int c) 578Cisalpha (int c)
532{ 579{
533 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
534} 581}
535 582
536static INLINE int 583ecb_inline int
537Cisdigit (int c) 584Cisdigit (int c)
538{ 585{
539 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
540} 587}
541 588
542static INLINE int 589ecb_inline int
543Cisspace (int c) 590Cisspace (int c)
544{ 591{
545 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
546} 593}
547 594
548static INLINE int 595ecb_inline int
549Cisupper (int c) 596Cisupper (int c)
550{ 597{
551 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
552} 599}
553 600
554static INLINE int 601ecb_inline int
555Cislower (int c) 602Cislower (int c)
556{ 603{
557 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
558} 605}
559#endif 606#endif
… …
620#endif 667#endif
621 668
622static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
623static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
624static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
625static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
626static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
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_r (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
675static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
676static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
677static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
678static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
679 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
680static num 754static num
681num_op (enum num_op op, num a, num b) 755num_op (enum num_op op, num a, num b)
682{ 756{
683 num ret; 757 num ret;
684 758
685 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));
686 760
687 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
688 { 762 {
689 IVALUE av = num_get_ivalue (a);
690 IVALUE bv = num_get_ivalue (b);
691
692 switch (op) 763 switch (op)
693 { 764 {
694 case NUM_ADD: av += bv; break; 765 case NUM_ADD: a.ivalue += b.ivalue; break;
695 case NUM_SUB: av -= bv; break; 766 case NUM_SUB: a.ivalue -= b.ivalue; break;
696 case NUM_MUL: av *= bv; break; 767 case NUM_MUL: a.ivalue *= b.ivalue; break;
697 case NUM_INTDIV: av /= bv; break; 768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
698 } 769 }
699 770
700 num_set_ivalue (ret, av); 771 num_set_ivalue (ret, a.ivalue);
701 } 772 }
773#if USE_REAL
702 else 774 else
703 { 775 {
704 RVALUE av = num_get_rvalue (a);
705 RVALUE bv = num_get_rvalue (b);
706
707 switch (op) 776 switch (op)
708 { 777 {
709 case NUM_ADD: av += bv; break; 778 case NUM_ADD: a.rvalue += b.rvalue; break;
710 case NUM_SUB: av -= bv; break; 779 case NUM_SUB: a.rvalue -= b.rvalue; break;
711 case NUM_MUL: av *= bv; break; 780 case NUM_MUL: a.rvalue *= b.rvalue; break;
712 case NUM_INTDIV: av /= bv; break; 781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
713 } 782 }
714 783
715 num_set_rvalue (ret, av); 784 num_set_rvalue (ret, a.rvalue);
716 } 785 }
786#endif
717 787
718 return ret; 788 return ret;
719} 789}
720 790
721static num 791static num
722num_div (num a, num b) 792num_div (num a, num b)
723{ 793{
724 num ret; 794 num ret;
725 795
726 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);
727 797
728 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
730 else 800 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
732 802
733 return ret; 803 return ret;
734} 804}
735 805
736static num 806static num
… …
738{ 808{
739 num ret; 809 num ret;
740 long e1, e2, res; 810 long e1, e2, res;
741 811
742 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));
743 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
744 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
745 res = e1 % e2; 815 res = e1 % e2;
746 816
747 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
748 if (res > 0) 818 if (res > 0)
749 { 819 {
… …
765{ 835{
766 num ret; 836 num ret;
767 long e1, e2, res; 837 long e1, e2, res;
768 838
769 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));
770 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
771 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
772 res = e1 % e2; 842 res = e1 % e2;
773 843
774 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
775 if (res * e2 < 0) 845 if (res * e2 < 0)
776 res += e2; 846 res += e2;
777 847
778 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
779 return ret; 849 return ret;
780} 850}
781 851
782/* this completely disrespects NaNs */ 852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
783static int 853static int
784num_cmp (num a, num b) 854num_cmp (num a, num b)
785{ 855{
786 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 857 int ret;
788 858
789 if (is_fixnum) 859 if (is_fixnum)
790 { 860 {
791 IVALUE av = num_get_ivalue (a); 861 IVALUE av = num_ivalue (a);
792 IVALUE bv = num_get_ivalue (b); 862 IVALUE bv = num_ivalue (b);
793 863
794 ret = av == bv ? 0 : av < bv ? -1 : +1; 864 ret = av == bv ? 0 : av < bv ? -1 : +1;
795 } 865 }
796 else 866 else
797 { 867 {
798 RVALUE av = num_get_rvalue (a); 868 RVALUE av = num_rvalue (a);
799 RVALUE bv = num_get_rvalue (b); 869 RVALUE bv = num_rvalue (b);
800 870
801 ret = av == bv ? 0 : av < bv ? -1 : +1; 871 ret = av == bv ? 0 : av < bv ? -1 : +1;
802 } 872 }
803 873
804 return ret; 874 return ret;
… …
819 return ce; 889 return ce;
820 else if (dfl < dce) 890 else if (dfl < dce)
821 return fl; 891 return fl;
822 else 892 else
823 { 893 {
824 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
825 return fl; 895 return fl;
826 else 896 else
827 return ce; 897 return ce;
828 } 898 }
829} 899}
830#endif 900#endif
831 901
832static int 902static int
833is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
834{ 904{
905 return x == 0;
906#if 0
835#if USE_REAL 907#if USE_REAL
836 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. */
837#else 909#else
838 return x == 0; 910 return x == 0;
839#endif 911#endif
912#endif
840} 913}
841 914
842/* allocate new cell segment */ 915/* allocate new cell segment */
843static int 916static int
844alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
845{ 918{
846 pointer newp; 919 struct cell *newp;
847 pointer last; 920 struct cell *last;
848 pointer p; 921 struct cell *p;
849 char *cp; 922 char *cp;
850 long i; 923 long i;
851 int k; 924 int k;
852 925
853 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
854 segsize <<= 1; 927 segsize <<= 1;
855 928
856 for (k = 0; k < n; k++)
857 {
858 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
859 return k;
860
861 cp = malloc (segsize * sizeof (struct cell)); 929 cp = malloc (segsize * sizeof (struct cell));
862 930
863 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
864 return k; 932 return k;
865 933
866 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
867 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
868 936
869 /* insert new segment in address order */ 937 newp = (struct cell *)cp;
870 newp = (pointer)cp;
871 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
872 SCHEME_V->cell_segsize[i] = segsize; 939 SCHEME_V->cell_segsize[i] = segsize;
873
874 //TODO: insert, not swap
875 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
876 {
877 p = SCHEME_V->cell_seg[i];
878 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
879 SCHEME_V->cell_seg[i - 1] = p;
880
881 k = SCHEME_V->cell_segsize[i];
882 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
883 SCHEME_V->cell_segsize[i - 1] = k;
884
885 --i;
886 }
887
888 SCHEME_V->fcells += segsize; 940 SCHEME_V->fcells += segsize;
889 last = newp + segsize - 1; 941 last = newp + segsize - 1;
890 942
891 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
892 { 944 {
945 pointer cp = POINTER (p);
893 set_typeflag (p, T_FREE); 946 set_typeflag (cp, T_PAIR);
894 set_car (p, NIL); 947 set_car (cp, NIL);
895 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
896 } 949 }
897 950
898 /* insert new cells in address order on free list */
899 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
900 {
901 set_cdr (last, SCHEME_V->free_cell); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
902 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
903 }
904 else
905 {
906 p = SCHEME_V->free_cell;
907 953
908 while (cdr (p) != NIL && newp > cdr (p))
909 p = cdr (p);
910
911 set_cdr (last, cdr (p));
912 set_cdr (p, newp);
913 }
914 }
915
916 return n; 954 return 1;
917} 955}
918 956
919/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
920static INLINE pointer 958ecb_inline pointer
921get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
922{ 960{
923 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 961 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
924 { 962 {
925 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
926 return S_SINK; 964 return S_SINK;
927 965
928 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
929 { 967 {
930 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;
931 969
932 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
933 971
934 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)
935 { 973 {
936 /* 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 */
937 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
938 { 976 {
939#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
940 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
941 return S_SINK; 979 return S_SINK;
942#endif 980#endif
… …
954 } 992 }
955} 993}
956 994
957/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
958 Tehom */ 996 Tehom */
959
960static void 997static void
961push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
962{ 999{
963 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
964 1001
… …
986} 1023}
987 1024
988static pointer 1025static pointer
989get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
990{ 1027{
991 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
992 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
993 1030
994 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
995 return S_SINK; 1032 return S_SINK;
996 1033
997 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
998 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
999 1036
1000 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1001 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1002 fill_vector (v, init); 1039 fill_vector (v, 0, init);
1003 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1004 1041
1005 return v; 1042 return v;
1006} 1043}
1007 1044
1008static INLINE void 1045ecb_inline void
1009ok_to_freely_gc (SCHEME_P) 1046ok_to_freely_gc (SCHEME_P)
1010{ 1047{
1011 set_car (S_SINK, NIL); 1048 set_car (S_SINK, NIL);
1012} 1049}
1013 1050
… …
1015static void 1052static void
1016check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1017{ 1054{
1018 /* 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. */
1019 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1020 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1021 1058
1022 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1023 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1024} 1061}
1025 1062
1026static void 1063static void
1027check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1028{ 1065{
… …
1050 set_cdr (x, b); 1087 set_cdr (x, b);
1051 1088
1052 return x; 1089 return x;
1053} 1090}
1054 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
1055/* ========== oblist implementation ========== */ 1101/* ========== oblist implementation ========== */
1056 1102
1057#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1058 1104
1105static int
1059static 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}
1060 1116
1061static pointer 1117static pointer
1062oblist_initial_value (SCHEME_P) 1118oblist_initial_value (SCHEME_P)
1063{ 1119{
1064 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1066 1122
1067/* returns the new symbol */ 1123/* returns the new symbol */
1068static pointer 1124static pointer
1069oblist_add_by_name (SCHEME_P_ const char *name) 1125oblist_add_by_name (SCHEME_P_ const char *name)
1070{ 1126{
1071 int location; 1127 pointer x = generate_symbol (SCHEME_A_ name);
1072
1073 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1074 set_typeflag (x, T_SYMBOL);
1075 setimmutable (car (x));
1076
1077 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1128 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1078 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)));
1079 return x; 1130 return x;
1080} 1131}
1081 1132
1082static INLINE pointer 1133ecb_inline pointer
1083oblist_find_by_name (SCHEME_P_ const char *name) 1134oblist_find_by_name (SCHEME_P_ const char *name)
1084{ 1135{
1085 int location; 1136 int location;
1086 pointer x; 1137 pointer x;
1087 char *s; 1138 char *s;
1088 1139
1089 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1140 location = hash_fn (name, veclength (SCHEME_V->oblist));
1090 1141
1091 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))
1092 { 1143 {
1093 s = symname (car (x)); 1144 s = symname (car (x));
1094 1145
1095 /* case-insensitive, per R5RS section 2 */ 1146 /* case-insensitive, per R5RS section 2 */
1096 if (stricmp (name, s) == 0) 1147 if (stricmp (name, s) == 0)
… …
1106 int i; 1157 int i;
1107 pointer x; 1158 pointer x;
1108 pointer ob_list = NIL; 1159 pointer ob_list = NIL;
1109 1160
1110 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1161 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1111 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))
1112 ob_list = cons (x, ob_list); 1163 ob_list = cons (x, ob_list);
1113 1164
1114 return ob_list; 1165 return ob_list;
1115} 1166}
1116 1167
… …
1120oblist_initial_value (SCHEME_P) 1171oblist_initial_value (SCHEME_P)
1121{ 1172{
1122 return NIL; 1173 return NIL;
1123} 1174}
1124 1175
1125static INLINE pointer 1176ecb_inline pointer
1126oblist_find_by_name (SCHEME_P_ const char *name) 1177oblist_find_by_name (SCHEME_P_ const char *name)
1127{ 1178{
1128 pointer x; 1179 pointer x;
1129 char *s; 1180 char *s;
1130 1181
… …
1142 1193
1143/* returns the new symbol */ 1194/* returns the new symbol */
1144static pointer 1195static pointer
1145oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1146{ 1197{
1147 pointer x; 1198 pointer x = generate_symbol (SCHEME_A_ name);
1148
1149 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1150 set_typeflag (x, T_SYMBOL);
1151 setimmutable (car (x));
1152 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1153 return x; 1200 return x;
1154} 1201}
1155 1202
1156static pointer 1203static pointer
… …
1166mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1167{ 1214{
1168 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1169 1216
1170 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1171 x->object.port = p; 1218 set_port (x, p);
1172 1219
1173 return x; 1220 return x;
1174} 1221}
1175#endif 1222#endif
1176 1223
1177pointer 1224pointer
1178mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1179{ 1226{
1180 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1181 1228
1182 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1183 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1184 1231
1185 return x; 1232 return x;
1186} 1233}
1187 1234
1188INTERFACE pointer 1235INTERFACE pointer
1189mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1190{ 1237{
1191 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1192 1239
1193 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1194 ivalue_unchecked (x) = c & 0xff; 1241 set_ivalue (x, c & 0xff);
1195 set_num_integer (x); 1242
1196 return x; 1243 return x;
1197} 1244}
1198 1245
1199/* get number atom (integer) */ 1246/* get number atom (integer) */
1200INTERFACE pointer 1247INTERFACE pointer
1201mk_integer (SCHEME_P_ long num) 1248mk_integer (SCHEME_P_ long n)
1202{ 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 {
1203 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1204 1261
1205 set_typeflag (x, (T_NUMBER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1206 ivalue_unchecked (x) = num; 1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1207 set_num_integer (x); 1264 set_ivalue (x, n);
1265
1266 *pp = x;
1267 }
1268
1208 return x; 1269 return *pp;
1209} 1270}
1210 1271
1211INTERFACE pointer 1272INTERFACE pointer
1212mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1213{ 1274{
1275#if USE_REAL
1214 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1215 1277
1216 set_typeflag (x, (T_NUMBER | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1217 rvalue_unchecked (x) = n; 1279 set_rvalue (x, n);
1218 set_num_real (x); 1280
1219 return x; 1281 return x;
1282#else
1283 return mk_integer (SCHEME_A_ n);
1284#endif
1220} 1285}
1221 1286
1222static pointer 1287static pointer
1223mk_number (SCHEME_P_ const num n) 1288mk_number (SCHEME_P_ const num n)
1224{ 1289{
1290#if USE_REAL
1225 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
1226 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1295 return mk_integer (SCHEME_A_ num_ivalue (n));
1227 else 1296#endif
1228 return mk_real (SCHEME_A_ num_get_rvalue (n));
1229} 1297}
1230 1298
1231/* allocate name to string area */ 1299/* allocate name to string area */
1232static char * 1300static char *
1233store_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)
… …
1239 SCHEME_V->no_memory = 1; 1307 SCHEME_V->no_memory = 1;
1240 return SCHEME_V->strbuff; 1308 return SCHEME_V->strbuff;
1241 } 1309 }
1242 1310
1243 if (str) 1311 if (str)
1244 { 1312 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1245 int l = strlen (str);
1246
1247 if (l > len_str)
1248 l = len_str;
1249
1250 memcpy (q, str, l);
1251 q[l] = 0;
1252 }
1253 else 1313 else
1254 {
1255 memset (q, fill, len_str); 1314 memset (q, fill, len_str);
1315
1256 q[len_str] = 0; 1316 q[len_str] = 0;
1257 }
1258 1317
1259 return q; 1318 return q;
1260} 1319}
1261 1320
1262INTERFACE pointer 1321INTERFACE pointer
… …
1276 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1277 1336
1278 set_typeflag (x, T_STRING | T_ATOM); 1337 set_typeflag (x, T_STRING | T_ATOM);
1279 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1280 strlength (x) = len; 1339 strlength (x) = len;
1340
1281 return x; 1341 return x;
1282} 1342}
1283 1343
1284INTERFACE pointer 1344INTERFACE pointer
1285mk_string (SCHEME_P_ const char *str) 1345mk_string (SCHEME_P_ const char *str)
… …
1292{ 1352{
1293 return get_vector_object (SCHEME_A_ len, NIL); 1353 return get_vector_object (SCHEME_A_ len, NIL);
1294} 1354}
1295 1355
1296INTERFACE void 1356INTERFACE void
1297fill_vector (pointer vec, pointer obj) 1357fill_vector (pointer vec, uint32_t start, pointer obj)
1298{ 1358{
1299 int i; 1359 int i;
1300 1360
1301 for (i = 0; i < vec->object.vector.length; i++) 1361 for (i = start; i < veclength (vec); i++)
1302 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1303} 1363}
1304 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
1305INTERFACE pointer 1374INTERFACE pointer
1306vector_elem (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1307{ 1376{
1308 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1309} 1378}
1310 1379
1311INTERFACE void 1380INTERFACE void
1312set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1381vector_set (pointer vec, uint32_t ielem, pointer a)
1313{ 1382{
1314 vecvalue(vec)[ielem] = a; 1383 vecvalue(vec)[ielem] = a;
1315} 1384}
1316 1385
1317/* get new symbol */ 1386/* get new symbol */
… …
1329 1398
1330INTERFACE pointer 1399INTERFACE pointer
1331gensym (SCHEME_P) 1400gensym (SCHEME_P)
1332{ 1401{
1333 pointer x; 1402 pointer x;
1334
1335 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1336 {
1337 char name[40] = "gensym-"; 1403 char name[40] = "gensym-";
1338 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1339 1405
1340 /* first check oblist */ 1406 return generate_symbol (SCHEME_A_ name);
1341 x = oblist_find_by_name (SCHEME_A_ name); 1407}
1342 1408
1343 if (x == NIL) 1409static int
1344 { 1410is_gensym (SCHEME_P_ pointer x)
1345 x = oblist_add_by_name (SCHEME_A_ name); 1411{
1346 return x; 1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1347 }
1348 }
1349
1350 return NIL;
1351} 1413}
1352 1414
1353/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1354static pointer 1416static pointer
1355mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
… …
1409 } 1471 }
1410 else if ((c == 'e') || (c == 'E')) 1472 else if ((c == 'e') || (c == 'E'))
1411 { 1473 {
1412 if (!has_fp_exp) 1474 if (!has_fp_exp)
1413 { 1475 {
1414 has_dec_point = 1; /* decimal point illegal 1476 has_dec_point = 1; /* decimal point illegal from now on */
1415 from now on */
1416 p++; 1477 p++;
1417 1478
1418 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1479 if ((*p == '-') || (*p == '+') || isdigit (*p))
1419 continue; 1480 continue;
1420 } 1481 }
… …
1508 1569
1509 if (ecb_expect_false (is_vector (p))) 1570 if (ecb_expect_false (is_vector (p)))
1510 { 1571 {
1511 int i; 1572 int i;
1512 1573
1513 for (i = 0; i < p->object.vector.length; i++) 1574 for (i = 0; i < veclength (p); i++)
1514 mark (vecvalue (p)[i]); 1575 mark (vecvalue (p)[i]);
1515 } 1576 }
1516 1577
1517 if (is_atom (p)) 1578 if (is_atom (p))
1518 goto E6; 1579 goto E6;
… …
1565 1626
1566/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1567static void 1628static void
1568gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1569{ 1630{
1570 pointer p;
1571 int i; 1631 int i;
1572 1632
1573 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1574 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1575 1635
… …
1591 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1592 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1593 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1594 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1595 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
1596 /* mark variables a, b */ 1663 /* mark variables a, b */
1597 mark (a); 1664 mark (a);
1598 mark (b); 1665 mark (b);
1599 1666
1600 /* garbage collect */ 1667 /* garbage collect */
1601 clrmark (NIL); 1668 clrmark (NIL);
1602 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1603 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1604 1671
1605 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1606 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1607 (which are also kept sorted by address) downwards to build the 1674
1608 free-list in sorted order. 1675 uint32_t total = 0;
1609 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1610 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1611 { 1679 {
1612 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];
1613 1683
1614 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1615 { 1685 {
1686 pointer c = POINTER (p);
1687
1616 if (is_mark (p)) 1688 if (is_mark (c))
1617 clrmark (p); 1689 clrmark (c);
1618 else 1690 else
1619 { 1691 {
1620 /* reclaim cell */ 1692 /* reclaim cell */
1621 if (typeflag (p) != T_FREE) 1693 if (typeflag (c) != T_PAIR)
1622 { 1694 {
1623 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1624 set_typeflag (p, T_FREE); 1696 set_typeflag (c, T_PAIR);
1625 set_car (p, NIL); 1697 set_car (c, NIL);
1626 } 1698 }
1627 1699
1628 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1629 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1630 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1631 } 1703 }
1632 } 1704 }
1633 } 1705 }
1634 1706
1635 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1636 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 }
1637} 1711}
1638 1712
1639static void 1713static void
1640finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1641{ 1715{
1642 /* TODO, fast bitmap check? */ 1716 /* TODO, fast bitmap check? */
1643 if (is_string (a)) 1717 if (is_string (a) || is_symbol (a))
1644 free (strvalue (a)); 1718 free (strvalue (a));
1645 else if (is_vector (a)) 1719 else if (is_vector (a))
1646 free (vecvalue (a)); 1720 free (vecvalue (a));
1647#if USE_PORTS 1721#if USE_PORTS
1648 else if (is_port (a)) 1722 else if (is_port (a))
1649 { 1723 {
1650 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)
1651 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1652 1726
1653 free (a->object.port); 1727 free (port (a));
1654 } 1728 }
1655#endif 1729#endif
1656} 1730}
1657 1731
1658/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
… …
1674 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1675 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;
1676 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;
1677 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;
1678 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1679 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);
1680 1754
1681#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1682 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;
1683 1757
1684 if (fname) 1758 if (fname)
… …
1701 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1702#if USE_PORTS 1776#if USE_PORTS
1703 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1704#endif 1778#endif
1705 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1706 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);
1707 } 1781 }
1708} 1782}
1709 1783
1710static int 1784static int
1711file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1712{ 1786{
1713#if USE_PORTS 1787#if USE_PORTS
1714 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1715 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1716 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1717#else 1791#else
1718 return 0; 1792 return 0;
1719#endif 1793#endif
1720} 1794}
1721 1795
… …
1855} 1929}
1856 1930
1857static void 1931static void
1858port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1859{ 1933{
1860 port *pt = p->object.port; 1934 port *pt = port (p);
1861 1935
1862 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1863 1937
1864 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1865 { 1939 {
… …
1886/* get new character from input file */ 1960/* get new character from input file */
1887static int 1961static int
1888inchar (SCHEME_P) 1962inchar (SCHEME_P)
1889{ 1963{
1890 int c; 1964 int c;
1891 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1892
1893 pt = SCHEME_V->inport->object.port;
1894 1966
1895 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1896 return EOF; 1968 return EOF;
1897 1969
1898 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
… …
1965 port *pt; 2037 port *pt;
1966 2038
1967 if (c == EOF) 2039 if (c == EOF)
1968 return; 2040 return;
1969 2041
1970 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
1971 pt->unget = c; 2043 pt->unget = c;
1972#else 2044#else
1973 if (c == EOF) 2045 if (c == EOF)
1974 return; 2046 return;
1975 2047
… …
2003 2075
2004INTERFACE void 2076INTERFACE void
2005putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2006{ 2078{
2007#if USE_PORTS 2079#if USE_PORTS
2008 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2009 2081
2010 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2011 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2012 else 2084 else
2013 for (; *s; s++) 2085 for (; *s; s++)
… …
2015 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2016 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))
2017 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2018 2090
2019#else 2091#else
2020 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2021#endif 2093#endif
2022} 2094}
2023 2095
2024static void 2096static void
2025putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2026{ 2098{
2027#if USE_PORTS 2099#if USE_PORTS
2028 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2029 2101
2030 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2031 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2032 else 2104 else
2033 { 2105 {
… …
2047 2119
2048INTERFACE void 2120INTERFACE void
2049putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2050{ 2122{
2051#if USE_PORTS 2123#if USE_PORTS
2052 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2053 2125
2054 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2055 { 2127 {
2056 char cc = c; 2128 char cc = c;
2057 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
… …
2070#endif 2142#endif
2071} 2143}
2072 2144
2073/* read characters up to delimiter, but cater to character constants */ 2145/* read characters up to delimiter, but cater to character constants */
2074static char * 2146static char *
2075readstr_upto (SCHEME_P_ char *delim) 2147readstr_upto (SCHEME_P_ int skip, const char *delim)
2076{ 2148{
2077 char *p = SCHEME_V->strbuff; 2149 char *p = SCHEME_V->strbuff + skip;
2078 2150
2079 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))));
2080 2152
2081 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2082 *p = 0; 2154 *p = 0;
… …
2089 return SCHEME_V->strbuff; 2161 return SCHEME_V->strbuff;
2090} 2162}
2091 2163
2092/* read string expression "xxx...xxx" */ 2164/* read string expression "xxx...xxx" */
2093static pointer 2165static pointer
2094readstrexp (SCHEME_P) 2166readstrexp (SCHEME_P_ char delim)
2095{ 2167{
2096 char *p = SCHEME_V->strbuff; 2168 char *p = SCHEME_V->strbuff;
2097 int c; 2169 int c;
2098 int c1 = 0; 2170 int c1 = 0;
2099 enum
2100 { 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;
2101 2172
2102 for (;;) 2173 for (;;)
2103 { 2174 {
2104 c = inchar (SCHEME_A); 2175 c = inchar (SCHEME_A);
2105 2176
… …
2107 return S_F; 2178 return S_F;
2108 2179
2109 switch (state) 2180 switch (state)
2110 { 2181 {
2111 case st_ok: 2182 case st_ok:
2112 switch (c) 2183 if (ecb_expect_false (c == delim))
2113 {
2114 case '\\':
2115 state = st_bsl;
2116 break;
2117
2118 case '"':
2119 *p = 0;
2120 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);
2121 2185
2122 default: 2186 if (ecb_expect_false (c == '\\'))
2187 state = st_bsl;
2188 else
2123 *p++ = c; 2189 *p++ = c;
2124 break;
2125 }
2126 2190
2127 break; 2191 break;
2128 2192
2129 case st_bsl: 2193 case st_bsl:
2130 switch (c) 2194 switch (c)
… …
2160 case 'r': 2224 case 'r':
2161 *p++ = '\r'; 2225 *p++ = '\r';
2162 state = st_ok; 2226 state = st_ok;
2163 break; 2227 break;
2164 2228
2165 case '"':
2166 *p++ = '"';
2167 state = st_ok;
2168 break;
2169
2170 default: 2229 default:
2171 *p++ = c; 2230 *p++ = c;
2172 state = st_ok; 2231 state = st_ok;
2173 break; 2232 break;
2174 } 2233 }
2175 2234
2176 break; 2235 break;
2177 2236
2178 case st_x1: 2237 case st_x1:
2179 case st_x2: 2238 case st_x2:
2180 c = toupper (c); 2239 c = tolower (c);
2181 2240
2182 if (c >= '0' && c <= 'F') 2241 if (c >= '0' && c <= '9')
2183 {
2184 if (c <= '9')
2185 c1 = (c1 << 4) + c - '0'; 2242 c1 = (c1 << 4) + c - '0';
2186 else 2243 else if (c >= 'a' && c <= 'f')
2187 c1 = (c1 << 4) + c - 'A' + 10; 2244 c1 = (c1 << 4) + c - 'a' + 10;
2188
2189 if (state == st_x1)
2190 state = st_x2;
2191 else
2192 {
2193 *p++ = c1;
2194 state = st_ok;
2195 }
2196 }
2197 else 2245 else
2198 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 }
2199 2255
2200 break; 2256 break;
2201 2257
2202 case st_oct1: 2258 case st_oct1:
2203 case st_oct2: 2259 case st_oct2:
… …
2207 backchar (SCHEME_A_ c); 2263 backchar (SCHEME_A_ c);
2208 state = st_ok; 2264 state = st_ok;
2209 } 2265 }
2210 else 2266 else
2211 { 2267 {
2212 if (state == st_oct2 && c1 >= 32) 2268 if (state == st_oct2 && c1 >= ' ')
2213 return S_F; 2269 return S_F;
2214 2270
2215 c1 = (c1 << 3) + (c - '0'); 2271 c1 = (c1 << 3) + (c - '0');
2216 2272
2217 if (state == st_oct1) 2273 if (state == st_oct1)
… …
2222 state = st_ok; 2278 state = st_ok;
2223 } 2279 }
2224 } 2280 }
2225 2281
2226 break; 2282 break;
2227
2228 } 2283 }
2229 } 2284 }
2230} 2285}
2231 2286
2232/* check c is in chars */ 2287/* check c is in chars */
2233static INLINE int 2288ecb_inline int
2234is_one_of (char *s, int c) 2289is_one_of (const char *s, int c)
2235{ 2290{
2236 if (c == EOF)
2237 return 1;
2238
2239 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2240} 2292}
2241 2293
2242/* skip white characters */ 2294/* skip white characters */
2243static INLINE int 2295ecb_inline int
2244skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2245{ 2297{
2246 int c, curr_line = 0; 2298 int c, curr_line = 0;
2247 2299
2248 do 2300 do
2249 { 2301 {
2250 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2251#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2252 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2253 curr_line++; 2306 curr_line++;
2254#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2255 } 2311 }
2256 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2257 2313
2258 /* record it */ 2314 /* record it */
2259#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2260 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)
2261 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;
2262#endif 2318#endif
2263 2319
2264 if (c != EOF)
2265 {
2266 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2267 return 1; 2321 return 1;
2268 }
2269 else
2270 return EOF;
2271} 2322}
2272 2323
2273/* get token */ 2324/* get token */
2274static int 2325static int
2275token (SCHEME_P) 2326token (SCHEME_P)
… …
2291 return TOK_RPAREN; 2342 return TOK_RPAREN;
2292 2343
2293 case '.': 2344 case '.':
2294 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2295 2346
2296 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2297 return TOK_DOT; 2348 return TOK_DOT;
2298 else 2349 else
2299 { 2350 {
2300 //TODO: ungetc twice in a row is not supported in C
2301 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2302 backchar (SCHEME_A_ '.');
2303 return TOK_ATOM; 2352 return TOK_DOTATOM;
2304 } 2353 }
2354
2355 case '|':
2356 return TOK_STRATOM;
2305 2357
2306 case '\'': 2358 case '\'':
2307 return TOK_QUOTE; 2359 return TOK_QUOTE;
2308 2360
2309 case ';': 2361 case ';':
… …
2441 } 2493 }
2442 2494
2443 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2444} 2496}
2445 2497
2446
2447/* print atoms */ 2498/* print atoms */
2448static void 2499static void
2449printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2450{ 2501{
2451 char *p; 2502 char *p;
2452 int len; 2503 int len;
2453 2504
2454 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2455 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2456} 2507}
2457
2458 2508
2459/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2460static void 2510static void
2461atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2462{ 2512{
… …
2476 { 2526 {
2477 p = SCHEME_V->strbuff; 2527 p = SCHEME_V->strbuff;
2478 2528
2479 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 */
2480 { 2530 {
2481 if (num_is_integer (l)) 2531 if (is_integer (l))
2482 xnum (p, ivalue_unchecked (l)); 2532 xnum (p, ivalue_unchecked (l));
2483#if USE_REAL 2533#if USE_REAL
2484 else 2534 else
2485 { 2535 {
2486 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2536 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2623#endif 2673#endif
2624 } 2674 }
2625 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2626 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2627 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2628 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2629 2686
2630 *pp = p; 2687 *pp = p;
2631 *plen = strlen (p); 2688 *plen = strlen (p);
2632} 2689}
2633 2690
… …
2741 return 0; 2798 return 0;
2742 } 2799 }
2743 else if (is_number (a)) 2800 else if (is_number (a))
2744 { 2801 {
2745 if (is_number (b)) 2802 if (is_number (b))
2746 if (num_is_integer (a) == num_is_integer (b))
2747 return num_cmp (nvalue (a), nvalue (b)) == 0; 2803 return num_cmp (nvalue (a), nvalue (b)) == 0;
2748 2804
2749 return 0; 2805 return 0;
2750 } 2806 }
2751 else if (is_character (a)) 2807 else if (is_character (a))
2752 { 2808 {
… …
2778/* () is #t in R5RS */ 2834/* () is #t in R5RS */
2779#define is_true(p) ((p) != S_F) 2835#define is_true(p) ((p) != S_F)
2780#define is_false(p) ((p) == S_F) 2836#define is_false(p) ((p) == S_F)
2781 2837
2782/* ========== Environment implementation ========== */ 2838/* ========== Environment implementation ========== */
2783
2784#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2785
2786static int
2787hash_fn (const char *key, int table_size)
2788{
2789 const unsigned char *p = key;
2790 uint32_t hash = 2166136261;
2791
2792 while (*p)
2793 hash = (hash ^ *p++) * 16777619;
2794
2795 return hash % table_size;
2796}
2797#endif
2798 2839
2799#ifndef USE_ALIST_ENV 2840#ifndef USE_ALIST_ENV
2800 2841
2801/* 2842/*
2802 * In this implementation, each frame of the environment may be 2843 * In this implementation, each frame of the environment may be
… …
2819 2860
2820 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2861 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2821 setenvironment (SCHEME_V->envir); 2862 setenvironment (SCHEME_V->envir);
2822} 2863}
2823 2864
2824static 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
2825new_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)
2826{ 2882{
2827 pointer slot = immutable_cons (variable, value); 2883 pointer slot = immutable_cons (variable, value);
2828 2884
2829 if (is_vector (car (env))) 2885 if (is_vector (car (env)))
2830 { 2886 {
2831 int location = hash_fn (symname (variable), veclength (car (env))); 2887 int location = sym_hash (variable, veclength (car (env)));
2832
2833 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)));
2834 } 2889 }
2835 else 2890 else
2836 set_car (env, immutable_cons (slot, car (env))); 2891 set_car (env, immutable_cons (slot, car (env)));
2837} 2892}
2838 2893
2839static pointer 2894static pointer
2840find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2841{ 2896{
2842 pointer x, y; 2897 pointer x, y;
2843 int location;
2844 2898
2845 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
2846 { 2900 {
2847 if (is_vector (car (x))) 2901 if (is_vector (car (x)))
2848 { 2902 {
2849 location = hash_fn (symname (hdl), veclength (car (x))); 2903 int location = sym_hash (hdl, veclength (car (x)));
2850 y = vector_elem (car (x), location); 2904 y = vector_get (car (x), location);
2851 } 2905 }
2852 else 2906 else
2853 y = car (x); 2907 y = car (x);
2854 2908
2855 for (; y != NIL; y = cdr (y)) 2909 for (; y != NIL; y = cdr (y))
2856 if (caar (y) == hdl) 2910 if (caar (y) == hdl)
2857 break; 2911 break;
2858 2912
2859 if (y != NIL) 2913 if (y != NIL)
2914 return car (y);
2915
2916 if (!all)
2860 break; 2917 break;
2861
2862 if (!all)
2863 return NIL;
2864 } 2918 }
2865
2866 if (x != NIL)
2867 return car (y);
2868 2919
2869 return NIL; 2920 return NIL;
2870} 2921}
2871 2922
2872#else /* USE_ALIST_ENV */ 2923#else /* USE_ALIST_ENV */
2873 2924
2874static INLINE void 2925ecb_inline void
2875new_frame_in_env (SCHEME_P_ pointer old_env) 2926new_frame_in_env (SCHEME_P_ pointer old_env)
2876{ 2927{
2877 SCHEME_V->envir = immutable_cons (NIL, old_env); 2928 SCHEME_V->envir = immutable_cons (NIL, old_env);
2878 setenvironment (SCHEME_V->envir); 2929 setenvironment (SCHEME_V->envir);
2879} 2930}
2880 2931
2881static INLINE void 2932ecb_inline void
2882new_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)
2883{ 2934{
2884 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2885} 2936}
2886 2937
… …
2894 for (y = car (x); y != NIL; y = cdr (y)) 2945 for (y = car (x); y != NIL; y = cdr (y))
2895 if (caar (y) == hdl) 2946 if (caar (y) == hdl)
2896 break; 2947 break;
2897 2948
2898 if (y != NIL) 2949 if (y != NIL)
2950 return car (y);
2899 break; 2951 break;
2900 2952
2901 if (!all) 2953 if (!all)
2902 return NIL; 2954 break;
2903 } 2955 }
2904
2905 if (x != NIL)
2906 return car (y);
2907 2956
2908 return NIL; 2957 return NIL;
2909} 2958}
2910 2959
2911#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2912 2961
2913static INLINE void 2962ecb_inline void
2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2915{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2916 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);
2917} 2967}
2918 2968
2919static INLINE void 2969ecb_inline void
2920set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2921{ 2971{
2922 set_cdr (slot, value); 2972 set_cdr (slot, value);
2923} 2973}
2924 2974
2925static INLINE pointer 2975ecb_inline pointer
2926slot_value_in_env (pointer slot) 2976slot_value_in_env (pointer slot)
2927{ 2977{
2928 return cdr (slot); 2978 return cdr (slot);
2929} 2979}
2930 2980
2931/* ========== Evaluation Cycle ========== */ 2981/* ========== Evaluation Cycle ========== */
2932 2982
2933static pointer 2983static int
2934xError_1 (SCHEME_P_ const char *s, pointer a) 2984xError_1 (SCHEME_P_ const char *s, pointer a)
2935{ 2985{
2936#if USE_ERROR_HOOK 2986#if USE_ERROR_HOOK
2937 pointer x; 2987 pointer x;
2938 pointer hdl = SCHEME_V->ERROR_HOOK; 2988 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2973 code = cons (mk_string (SCHEME_A_ s), code); 3023 code = cons (mk_string (SCHEME_A_ s), code);
2974 setimmutable (car (code)); 3024 setimmutable (car (code));
2975 SCHEME_V->code = cons (slot_value_in_env (x), code); 3025 SCHEME_V->code = cons (slot_value_in_env (x), code);
2976 SCHEME_V->op = OP_EVAL; 3026 SCHEME_V->op = OP_EVAL;
2977 3027
2978 return S_T; 3028 return 0;
2979 } 3029 }
2980#endif 3030#endif
2981 3031
2982 if (a) 3032 if (a)
2983 SCHEME_V->args = cons (a, NIL); 3033 SCHEME_V->args = cons (a, NIL);
… …
2985 SCHEME_V->args = NIL; 3035 SCHEME_V->args = NIL;
2986 3036
2987 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);
2988 setimmutable (car (SCHEME_V->args)); 3038 setimmutable (car (SCHEME_V->args));
2989 SCHEME_V->op = OP_ERR0; 3039 SCHEME_V->op = OP_ERR0;
3040
2990 return S_T; 3041 return 0;
2991} 3042}
2992 3043
2993#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)
2994#define Error_0(s) Error_1 (s, 0) 3045#define Error_0(s) Error_1 (s, 0)
2995 3046
2996/* Too small to turn into function */ 3047/* Too small to turn into function */
2997#define BEGIN do { 3048#define BEGIN do {
2998#define END } while (0) 3049#define END } while (0)
2999#define s_goto(a) BEGIN \ 3050#define s_goto(a) BEGIN \
3000 SCHEME_V->op = a; \ 3051 SCHEME_V->op = a; \
3001 return S_T; END 3052 return 0; END
3002 3053
3003#define s_return(a) return xs_return (SCHEME_A_ a) 3054#define s_return(a) return xs_return (SCHEME_A_ a)
3004 3055
3005#ifndef USE_SCHEME_STACK 3056#ifndef USE_SCHEME_STACK
3006 3057
… …
3020{ 3071{
3021 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3022 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3023 3074
3024 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3025 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3026 { 3077 {
3027 SCHEME_V->dump_size += STACK_GROWTH; 3078 SCHEME_V->dump_size += STACK_GROWTH;
3028 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);
3029 } 3080 }
3030 3081
3031 next_frame = SCHEME_V->dump_base + nframes; 3082 next_frame = SCHEME_V->dump_base + nframes;
3032 3083
3033 next_frame->op = op; 3084 next_frame->op = op;
3034 next_frame->args = args; 3085 next_frame->args = args;
3035 next_frame->envir = SCHEME_V->envir; 3086 next_frame->envir = SCHEME_V->envir;
3036 next_frame->code = code; 3087 next_frame->code = code;
3037 3088
3038 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3089 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3039} 3090}
3040 3091
3041static pointer 3092static int
3042xs_return (SCHEME_P_ pointer a) 3093xs_return (SCHEME_P_ pointer a)
3043{ 3094{
3044 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3045 struct dump_stack_frame *frame; 3096 struct dump_stack_frame *frame;
3046 3097
3047 SCHEME_V->value = a; 3098 SCHEME_V->value = a;
3048 3099
3049 if (nframes <= 0) 3100 if (nframes <= 0)
3050 return NIL; 3101 return -1;
3051 3102
3052 frame = &SCHEME_V->dump_base[--nframes]; 3103 frame = &SCHEME_V->dump_base[--nframes];
3053 SCHEME_V->op = frame->op; 3104 SCHEME_V->op = frame->op;
3054 SCHEME_V->args = frame->args; 3105 SCHEME_V->args = frame->args;
3055 SCHEME_V->envir = frame->envir; 3106 SCHEME_V->envir = frame->envir;
3056 SCHEME_V->code = frame->code; 3107 SCHEME_V->code = frame->code;
3057 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3058 3109
3059 return S_T; 3110 return 0;
3060} 3111}
3061 3112
3062static INLINE void 3113ecb_inline void
3063dump_stack_reset (SCHEME_P) 3114dump_stack_reset (SCHEME_P)
3064{ 3115{
3065 /* 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 */
3066 SCHEME_V->dump = (pointer)+0; 3117 SCHEME_V->dump = (pointer)+0;
3067} 3118}
3068 3119
3069static INLINE void 3120ecb_inline void
3070dump_stack_initialize (SCHEME_P) 3121dump_stack_initialize (SCHEME_P)
3071{ 3122{
3072 SCHEME_V->dump_size = 0; 3123 SCHEME_V->dump_size = 0;
3073 SCHEME_V->dump_base = 0; 3124 SCHEME_V->dump_base = 0;
3074 dump_stack_reset (SCHEME_A); 3125 dump_stack_reset (SCHEME_A);
… …
3127 int i = 0; 3178 int i = 0;
3128 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3179 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3129 3180
3130 while (cont != NIL) 3181 while (cont != NIL)
3131 { 3182 {
3132 frame->op = ivalue (car (cont)); cont = cdr (cont); 3183 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3133 frame->args = car (cont) ; cont = cdr (cont); 3184 frame->args = car (cont) ; cont = cdr (cont);
3134 frame->envir = car (cont) ; cont = cdr (cont); 3185 frame->envir = car (cont) ; cont = cdr (cont);
3135 frame->code = car (cont) ; cont = cdr (cont); 3186 frame->code = car (cont) ; cont = cdr (cont);
3136 3187
3137 ++frame; 3188 ++frame;
3138 ++i; 3189 ++i;
3139 } 3190 }
3140 3191
3141 SCHEME_V->dump = (pointer)(uintptr_t)i; 3192 SCHEME_V->dump = (pointer)(uintptr_t)i;
3142} 3193}
3143 3194
3144#else 3195#else
3145 3196
3146static INLINE void 3197ecb_inline void
3147dump_stack_reset (SCHEME_P) 3198dump_stack_reset (SCHEME_P)
3148{ 3199{
3149 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3150} 3201}
3151 3202
3152static INLINE void 3203ecb_inline void
3153dump_stack_initialize (SCHEME_P) 3204dump_stack_initialize (SCHEME_P)
3154{ 3205{
3155 dump_stack_reset (SCHEME_A); 3206 dump_stack_reset (SCHEME_A);
3156} 3207}
3157 3208
… …
3159dump_stack_free (SCHEME_P) 3210dump_stack_free (SCHEME_P)
3160{ 3211{
3161 SCHEME_V->dump = NIL; 3212 SCHEME_V->dump = NIL;
3162} 3213}
3163 3214
3164static pointer 3215static int
3165xs_return (SCHEME_P_ pointer a) 3216xs_return (SCHEME_P_ pointer a)
3166{ 3217{
3167 pointer dump = SCHEME_V->dump; 3218 pointer dump = SCHEME_V->dump;
3168 3219
3169 SCHEME_V->value = a; 3220 SCHEME_V->value = a;
3170 3221
3171 if (dump == NIL) 3222 if (dump == NIL)
3172 return NIL; 3223 return -1;
3173 3224
3174 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3225 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3175 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3226 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3176 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3227 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3177 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3228 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3178 3229
3179 SCHEME_V->dump = dump; 3230 SCHEME_V->dump = dump;
3180 3231
3181 return S_T; 3232 return 0;
3182} 3233}
3183 3234
3184static void 3235static void
3185s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3236s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3186{ 3237{
… …
3211 3262
3212#endif 3263#endif
3213 3264
3214#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3215 3266
3267#if EXPERIMENT
3216static 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
3217opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3218{ 3327{
3328 pointer args = SCHEME_V->args;
3219 pointer x, y; 3329 pointer x, y;
3220 3330
3221 switch (op) 3331 switch (op)
3222 { 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
3223 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3224 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3225 { 3341 {
3226 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");
3227 //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)));
3228 } 3344 }
3229 3345
3230 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3231 Error_1 ("unable to open", car (SCHEME_V->args)); 3347 Error_1 ("unable to open", car (args));
3232 else 3348 else
3233 { 3349 {
3234 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3350 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3235 s_goto (OP_T0LVL); 3351 s_goto (OP_T0LVL);
3236 } 3352 }
3237 3353
3238 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3239 3355
3240 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3241 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3242 { 3358 {
3243 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3244 { 3360 {
3245 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3246 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
… …
3310 case OP_EVAL: /* main part of evaluation */ 3426 case OP_EVAL: /* main part of evaluation */
3311#if USE_TRACING 3427#if USE_TRACING
3312 if (SCHEME_V->tracing) 3428 if (SCHEME_V->tracing)
3313 { 3429 {
3314 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3430 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3315 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);
3316 SCHEME_V->args = SCHEME_V->code; 3432 SCHEME_V->args = SCHEME_V->code;
3317 putstr (SCHEME_A_ "\nEval: "); 3433 putstr (SCHEME_A_ "\nEval: ");
3318 s_goto (OP_P0LIST); 3434 s_goto (OP_P0LIST);
3319 } 3435 }
3320 3436
… …
3324#endif 3440#endif
3325 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3326 { 3442 {
3327 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);
3328 3444
3329 if (x != NIL) 3445 if (x == NIL)
3330 s_return (slot_value_in_env (x));
3331 else
3332 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));
3333 } 3449 }
3334 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3335 { 3451 {
3336 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3337 3453
… …
3350 } 3466 }
3351 else 3467 else
3352 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3353 3469
3354 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3355 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3356 { 3472 {
3357 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3358 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3359 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3360 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
… …
3364 SCHEME_V->code = cdr (SCHEME_V->code); 3480 SCHEME_V->code = cdr (SCHEME_V->code);
3365 s_goto (OP_E1ARGS); 3481 s_goto (OP_E1ARGS);
3366 } 3482 }
3367 3483
3368 case OP_E1ARGS: /* eval arguments */ 3484 case OP_E1ARGS: /* eval arguments */
3369 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3485 args = cons (SCHEME_V->value, args);
3370 3486
3371 if (is_pair (SCHEME_V->code)) /* continue */ 3487 if (is_pair (SCHEME_V->code)) /* continue */
3372 { 3488 {
3373 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));
3374 SCHEME_V->code = car (SCHEME_V->code); 3490 SCHEME_V->code = car (SCHEME_V->code);
3375 SCHEME_V->args = NIL; 3491 SCHEME_V->args = NIL;
3376 s_goto (OP_EVAL); 3492 s_goto (OP_EVAL);
3377 } 3493 }
3378 else /* end */ 3494 else /* end */
3379 { 3495 {
3380 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3496 args = reverse_in_place (SCHEME_A_ NIL, args);
3381 SCHEME_V->code = car (SCHEME_V->args); 3497 SCHEME_V->code = car (args);
3382 SCHEME_V->args = cdr (SCHEME_V->args); 3498 SCHEME_V->args = cdr (args);
3383 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3384 } 3500 }
3385 3501
3386#if USE_TRACING 3502#if USE_TRACING
3387 3503
3388 case OP_TRACING: 3504 case OP_TRACING:
3389 { 3505 {
3390 int tr = SCHEME_V->tracing; 3506 int tr = SCHEME_V->tracing;
3391 3507
3392 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3508 SCHEME_V->tracing = ivalue_unchecked (car (args));
3393 s_return (mk_integer (SCHEME_A_ tr)); 3509 s_return (mk_integer (SCHEME_A_ tr));
3394 } 3510 }
3395 3511
3396#endif 3512#endif
3397 3513
3398 case OP_APPLY: /* apply 'code' to 'args' */ 3514 case OP_APPLY: /* apply 'code' to 'args' */
3399#if USE_TRACING 3515#if USE_TRACING
3400 if (SCHEME_V->tracing) 3516 if (SCHEME_V->tracing)
3401 { 3517 {
3402 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);
3403 SCHEME_V->print_flag = 1; 3519 SCHEME_V->print_flag = 1;
3404 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3520 /* args=cons(SCHEME_V->code,args); */
3405 putstr (SCHEME_A_ "\nApply to: "); 3521 putstr (SCHEME_A_ "\nApply to: ");
3406 s_goto (OP_P0LIST); 3522 s_goto (OP_P0LIST);
3407 } 3523 }
3408 3524
3409 /* fall through */ 3525 /* fall through */
3410 3526
3411 case OP_REAL_APPLY: 3527 case OP_REAL_APPLY:
3412#endif 3528#endif
3413 if (is_proc (SCHEME_V->code)) 3529 if (is_proc (SCHEME_V->code))
3414 {
3415 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3416 }
3417 else if (is_foreign (SCHEME_V->code)) 3531 else if (is_foreign (SCHEME_V->code))
3418 { 3532 {
3419 /* Keep nested calls from GC'ing the arglist */ 3533 /* Keep nested calls from GC'ing the arglist */
3420 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3534 push_recent_alloc (SCHEME_A_ args, NIL);
3421 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3535 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3422 3536
3423 s_return (x); 3537 s_return (x);
3424 } 3538 }
3425 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 */
3426 { 3540 {
3427 /* Should not accept promise */ 3541 /* Should not accept promise */
3428 /* make environment */ 3542 /* make environment */
3429 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3543 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3430 3544
3431 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))
3432 { 3546 {
3433 if (y == NIL) 3547 if (y == NIL)
3434 Error_0 ("not enough arguments"); 3548 Error_0 ("not enough arguments");
3435 else 3549 else
3436 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3550 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3454 s_goto (OP_BEGIN); 3568 s_goto (OP_BEGIN);
3455 } 3569 }
3456 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3570 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3457 { 3571 {
3458 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3572 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3459 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3573 s_return (args != NIL ? car (args) : NIL);
3460 } 3574 }
3461 else 3575 else
3462 Error_0 ("illegal function"); 3576 Error_0 ("illegal function");
3463 3577
3464 case OP_DOMACRO: /* do macro */ 3578 case OP_DOMACRO: /* do macro */
3465 SCHEME_V->code = SCHEME_V->value; 3579 SCHEME_V->code = SCHEME_V->value;
3466 s_goto (OP_EVAL); 3580 s_goto (OP_EVAL);
3467
3468#if 1
3469 3581
3470 case OP_LAMBDA: /* lambda */ 3582 case OP_LAMBDA: /* lambda */
3471 /* 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
3472 set SCHEME_V->value fall thru */ 3584 set SCHEME_V->value fall thru */
3473 { 3585 {
3474 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);
3475 3587
3476 if (f != NIL) 3588 if (f != NIL)
3477 { 3589 {
3478 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3590 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3479 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3591 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3480 SCHEME_V->code = slot_value_in_env (f); 3592 SCHEME_V->code = slot_value_in_env (f);
3481 s_goto (OP_APPLY); 3593 s_goto (OP_APPLY);
3482 } 3594 }
3483 3595
3484 SCHEME_V->value = SCHEME_V->code; 3596 SCHEME_V->value = SCHEME_V->code;
3485 /* Fallthru */
3486 } 3597 }
3598 /* Fallthru */
3487 3599
3488 case OP_LAMBDA1: 3600 case OP_LAMBDA1:
3489 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));
3490 3602
3491#else
3492
3493 case OP_LAMBDA: /* lambda */
3494 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3495
3496#endif
3497
3498 case OP_MKCLOSURE: /* make-closure */ 3603 case OP_MKCLOSURE: /* make-closure */
3499 x = car (SCHEME_V->args); 3604 x = car (args);
3500 3605
3501 if (car (x) == SCHEME_V->LAMBDA) 3606 if (car (x) == SCHEME_V->LAMBDA)
3502 x = cdr (x); 3607 x = cdr (x);
3503 3608
3504 if (cdr (SCHEME_V->args) == NIL) 3609 if (cdr (args) == NIL)
3505 y = SCHEME_V->envir; 3610 y = SCHEME_V->envir;
3506 else 3611 else
3507 y = cadr (SCHEME_V->args); 3612 y = cadr (args);
3508 3613
3509 s_return (mk_closure (SCHEME_A_ x, y)); 3614 s_return (mk_closure (SCHEME_A_ x, y));
3510 3615
3511 case OP_QUOTE: /* quote */ 3616 case OP_QUOTE: /* quote */
3512 s_return (car (SCHEME_V->code)); 3617 s_return (car (SCHEME_V->code));
… …
3544 3649
3545 3650
3546 case OP_DEFP: /* defined? */ 3651 case OP_DEFP: /* defined? */
3547 x = SCHEME_V->envir; 3652 x = SCHEME_V->envir;
3548 3653
3549 if (cdr (SCHEME_V->args) != NIL) 3654 if (cdr (args) != NIL)
3550 x = cadr (SCHEME_V->args); 3655 x = cadr (args);
3551 3656
3552 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);
3553 3658
3554 case OP_SET0: /* set! */ 3659 case OP_SET0: /* set! */
3555 if (is_immutable (car (SCHEME_V->code))) 3660 if (is_immutable (car (SCHEME_V->code)))
3556 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));
3557 3662
… …
3588 3693
3589 case OP_IF1: /* if */ 3694 case OP_IF1: /* if */
3590 if (is_true (SCHEME_V->value)) 3695 if (is_true (SCHEME_V->value))
3591 SCHEME_V->code = car (SCHEME_V->code); 3696 SCHEME_V->code = car (SCHEME_V->code);
3592 else 3697 else
3593 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 */
3594
3595 * car(NIL) = NIL */
3596 s_goto (OP_EVAL); 3699 s_goto (OP_EVAL);
3597 3700
3598 case OP_LET0: /* let */ 3701 case OP_LET0: /* let */
3599 SCHEME_V->args = NIL; 3702 SCHEME_V->args = NIL;
3600 SCHEME_V->value = SCHEME_V->code; 3703 SCHEME_V->value = SCHEME_V->code;
3601 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);
3602 s_goto (OP_LET1); 3705 s_goto (OP_LET1);
3603 3706
3604 case OP_LET1: /* let (calculate parameters) */ 3707 case OP_LET1: /* let (calculate parameters) */
3605 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3708 args = cons (SCHEME_V->value, args);
3606 3709
3607 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3608 { 3711 {
3609 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)))
3610 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));
3611 3714
3612 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));
3613 SCHEME_V->code = cadar (SCHEME_V->code); 3716 SCHEME_V->code = cadar (SCHEME_V->code);
3614 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3615 s_goto (OP_EVAL); 3718 s_goto (OP_EVAL);
3616 } 3719 }
3617 else /* end */ 3720 else /* end */
3618 { 3721 {
3619 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3722 args = reverse_in_place (SCHEME_A_ NIL, args);
3620 SCHEME_V->code = car (SCHEME_V->args); 3723 SCHEME_V->code = car (args);
3621 SCHEME_V->args = cdr (SCHEME_V->args); 3724 SCHEME_V->args = cdr (args);
3622 s_goto (OP_LET2); 3725 s_goto (OP_LET2);
3623 } 3726 }
3624 3727
3625 case OP_LET2: /* let */ 3728 case OP_LET2: /* let */
3626 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3729 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3627 3730
3628 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;
3629 y != NIL; x = cdr (x), y = cdr (y)) 3732 y != NIL; x = cdr (x), y = cdr (y))
3630 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3733 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3631 3734
3632 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3735 if (is_symbol (car (SCHEME_V->code))) /* named let */
3633 { 3736 {
3634 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))
3635 { 3738 {
3636 if (!is_pair (x)) 3739 if (!is_pair (x))
3637 Error_1 ("Bad syntax of binding in let :", x); 3740 Error_1 ("Bad syntax of binding in let :", x);
3638 3741
3639 if (!is_list (SCHEME_A_ car (x))) 3742 if (!is_list (SCHEME_A_ car (x)))
3640 Error_1 ("Bad syntax of binding in let :", car (x)); 3743 Error_1 ("Bad syntax of binding in let :", car (x));
3641 3744
3642 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3745 args = cons (caar (x), args);
3643 } 3746 }
3644 3747
3645 x =
3646 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)),
3647 SCHEME_V->envir); 3749 SCHEME_V->envir);
3648 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3750 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3649 SCHEME_V->code = cddr (SCHEME_V->code); 3751 SCHEME_V->code = cddr (SCHEME_V->code);
3650 SCHEME_V->args = NIL;
3651 } 3752 }
3652 else 3753 else
3653 { 3754 {
3654 SCHEME_V->code = cdr (SCHEME_V->code); 3755 SCHEME_V->code = cdr (SCHEME_V->code);
3756 }
3757
3655 SCHEME_V->args = NIL; 3758 SCHEME_V->args = NIL;
3656 }
3657
3658 s_goto (OP_BEGIN); 3759 s_goto (OP_BEGIN);
3659 3760
3660 case OP_LET0AST: /* let* */ 3761 case OP_LET0AST: /* let* */
3661 if (car (SCHEME_V->code) == NIL) 3762 if (car (SCHEME_V->code) == NIL)
3662 { 3763 {
… …
3680 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);
3681 SCHEME_V->code = cdr (SCHEME_V->code); 3782 SCHEME_V->code = cdr (SCHEME_V->code);
3682 3783
3683 if (is_pair (SCHEME_V->code)) /* continue */ 3784 if (is_pair (SCHEME_V->code)) /* continue */
3684 { 3785 {
3685 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3786 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3686 SCHEME_V->code = cadar (SCHEME_V->code); 3787 SCHEME_V->code = cadar (SCHEME_V->code);
3687 SCHEME_V->args = NIL; 3788 SCHEME_V->args = NIL;
3688 s_goto (OP_EVAL); 3789 s_goto (OP_EVAL);
3689 } 3790 }
3690 else /* end */ 3791 else /* end */
3691 { 3792 {
3692 SCHEME_V->code = SCHEME_V->args; 3793 SCHEME_V->code = args;
3693 SCHEME_V->args = NIL; 3794 SCHEME_V->args = NIL;
3694 s_goto (OP_BEGIN); 3795 s_goto (OP_BEGIN);
3695 } 3796 }
3696 3797
3697 case OP_LET0REC: /* letrec */ 3798 case OP_LET0REC: /* letrec */
… …
3700 SCHEME_V->value = SCHEME_V->code; 3801 SCHEME_V->value = SCHEME_V->code;
3701 SCHEME_V->code = car (SCHEME_V->code); 3802 SCHEME_V->code = car (SCHEME_V->code);
3702 s_goto (OP_LET1REC); 3803 s_goto (OP_LET1REC);
3703 3804
3704 case OP_LET1REC: /* letrec (calculate parameters) */ 3805 case OP_LET1REC: /* letrec (calculate parameters) */
3705 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3806 args = cons (SCHEME_V->value, args);
3706 3807
3707 if (is_pair (SCHEME_V->code)) /* continue */ 3808 if (is_pair (SCHEME_V->code)) /* continue */
3708 { 3809 {
3709 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)))
3710 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));
3711 3812
3712 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));
3713 SCHEME_V->code = cadar (SCHEME_V->code); 3814 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL; 3815 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL); 3816 s_goto (OP_EVAL);
3716 } 3817 }
3717 else /* end */ 3818 else /* end */
3718 { 3819 {
3719 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3820 args = reverse_in_place (SCHEME_A_ NIL, args);
3720 SCHEME_V->code = car (SCHEME_V->args); 3821 SCHEME_V->code = car (args);
3721 SCHEME_V->args = cdr (SCHEME_V->args); 3822 SCHEME_V->args = cdr (args);
3722 s_goto (OP_LET2REC); 3823 s_goto (OP_LET2REC);
3723 } 3824 }
3724 3825
3725 case OP_LET2REC: /* letrec */ 3826 case OP_LET2REC: /* letrec */
3726 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))
3727 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3828 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3728 3829
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3830 SCHEME_V->code = cdr (SCHEME_V->code);
3730 SCHEME_V->args = NIL; 3831 SCHEME_V->args = NIL;
3731 s_goto (OP_BEGIN); 3832 s_goto (OP_BEGIN);
… …
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3918 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 3919 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 3920 s_goto (OP_EVAL);
3820 3921
3821 case OP_C1STREAM: /* cons-stream */ 3922 case OP_C1STREAM: /* cons-stream */
3822 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 */
3823 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);
3824 set_typeflag (x, T_PROMISE); 3925 set_typeflag (x, T_PROMISE);
3825 s_return (cons (SCHEME_V->args, x)); 3926 s_return (cons (args, x));
3826 3927
3827 case OP_MACRO0: /* macro */ 3928 case OP_MACRO0: /* macro */
3828 if (is_pair (car (SCHEME_V->code))) 3929 if (is_pair (car (SCHEME_V->code)))
3829 { 3930 {
3830 x = caar (SCHEME_V->code); 3931 x = caar (SCHEME_V->code);
… …
3863 { 3964 {
3864 if (!is_pair (y = caar (x))) 3965 if (!is_pair (y = caar (x)))
3865 break; 3966 break;
3866 3967
3867 for (; y != NIL; y = cdr (y)) 3968 for (; y != NIL; y = cdr (y))
3868 {
3869 if (eqv (car (y), SCHEME_V->value)) 3969 if (eqv (car (y), SCHEME_V->value))
3870 break; 3970 break;
3871 }
3872 3971
3873 if (y != NIL) 3972 if (y != NIL)
3874 break; 3973 break;
3875 } 3974 }
3876 3975
… …
3896 s_goto (OP_BEGIN); 3995 s_goto (OP_BEGIN);
3897 else 3996 else
3898 s_return (NIL); 3997 s_return (NIL);
3899 3998
3900 case OP_PAPPLY: /* apply */ 3999 case OP_PAPPLY: /* apply */
3901 SCHEME_V->code = car (SCHEME_V->args); 4000 SCHEME_V->code = car (args);
3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4001 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3903 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4002 /*SCHEME_V->args = cadr(args); */
3904 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
3905 4004
3906 case OP_PEVAL: /* eval */ 4005 case OP_PEVAL: /* eval */
3907 if (cdr (SCHEME_V->args) != NIL) 4006 if (cdr (args) != NIL)
3908 SCHEME_V->envir = cadr (SCHEME_V->args); 4007 SCHEME_V->envir = cadr (args);
3909 4008
3910 SCHEME_V->code = car (SCHEME_V->args); 4009 SCHEME_V->code = car (args);
3911 s_goto (OP_EVAL); 4010 s_goto (OP_EVAL);
3912 4011
3913 case OP_CONTINUATION: /* call-with-current-continuation */ 4012 case OP_CONTINUATION: /* call-with-current-continuation */
3914 SCHEME_V->code = car (SCHEME_V->args); 4013 SCHEME_V->code = car (args);
3915 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);
3916 s_goto (OP_APPLY); 4015 s_goto (OP_APPLY);
3917 } 4016 }
3918 4017
3919 abort (); 4018 if (USE_ERROR_CHECKING) abort ();
3920} 4019}
3921 4020
3922static pointer 4021static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4022opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 4023{
3925 pointer x; 4024 pointer args = SCHEME_V->args;
4025 pointer x = car (args);
3926 num v; 4026 num v;
3927 4027
4028 switch (op)
4029 {
3928#if USE_MATH 4030#if USE_MATH
3929 RVALUE dd;
3930#endif
3931
3932 switch (op)
3933 {
3934#if USE_MATH
3935
3936 case OP_INEX2EX: /* inexact->exact */ 4031 case OP_INEX2EX: /* inexact->exact */
3937 x = car (SCHEME_V->args); 4032 {
3938
3939 if (num_is_integer (x)) 4033 if (is_integer (x))
3940 s_return (x); 4034 s_return (x);
3941 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4035
4036 RVALUE r = rvalue_unchecked (x);
4037
4038 if (r == (RVALUE)(IVALUE)r)
3942 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3943 else 4040 else
3944 Error_1 ("inexact->exact: not integral:", x); 4041 Error_1 ("inexact->exact: not integral:", x);
4042 }
3945 4043
3946 case OP_EXP:
3947 x = car (SCHEME_V->args);
3948 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4044 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3949
3950 case OP_LOG:
3951 x = car (SCHEME_V->args);
3952 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4045 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3953
3954 case OP_SIN:
3955 x = car (SCHEME_V->args);
3956 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4046 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3957
3958 case OP_COS:
3959 x = car (SCHEME_V->args);
3960 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4047 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3961
3962 case OP_TAN:
3963 x = car (SCHEME_V->args);
3964 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4048 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3965
3966 case OP_ASIN:
3967 x = car (SCHEME_V->args);
3968 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4049 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3969
3970 case OP_ACOS:
3971 x = car (SCHEME_V->args);
3972 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4050 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 4051
3974 case OP_ATAN: 4052 case OP_ATAN:
3975 x = car (SCHEME_V->args);
3976
3977 if (cdr (SCHEME_V->args) == NIL) 4053 if (cdr (args) == NIL)
3978 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4054 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
3979 else 4055 else
3980 { 4056 {
3981 pointer y = cadr (SCHEME_V->args); 4057 pointer y = cadr (args);
3982
3983 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4058 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3984 } 4059 }
3985 4060
3986 case OP_SQRT: 4061 case OP_SQRT:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4062 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 4063
3990 case OP_EXPT: 4064 case OP_EXPT:
3991 { 4065 {
3992 RVALUE result; 4066 RVALUE result;
3993 int real_result = 1; 4067 int real_result = 1;
3994 pointer y = cadr (SCHEME_V->args); 4068 pointer y = cadr (args);
3995 4069
3996 x = car (SCHEME_V->args);
3997
3998 if (num_is_integer (x) && num_is_integer (y)) 4070 if (is_integer (x) && is_integer (y))
3999 real_result = 0; 4071 real_result = 0;
4000 4072
4001 /* This 'if' is an R5RS compatibility fix. */ 4073 /* This 'if' is an R5RS compatibility fix. */
4002 /* NOTE: Remove this 'if' fix for R6RS. */ 4074 /* NOTE: Remove this 'if' fix for R6RS. */
4003 if (rvalue (x) == 0 && rvalue (y) < 0) 4075 if (rvalue (x) == 0 && rvalue (y) < 0)
4004 result = 0.0; 4076 result = 0;
4005 else 4077 else
4006 result = pow (rvalue (x), rvalue (y)); 4078 result = pow (rvalue (x), rvalue (y));
4007 4079
4008 /* Before returning integer result make sure we can. */ 4080 /* Before returning integer result make sure we can. */
4009 /* If the test fails, result is too big for integer. */ 4081 /* If the test fails, result is too big for integer. */
4010 if (!real_result) 4082 if (!real_result)
4011 { 4083 {
4012 long result_as_long = (long) result; 4084 long result_as_long = result;
4013 4085
4014 if (result != (RVALUE) result_as_long) 4086 if (result != result_as_long)
4015 real_result = 1; 4087 real_result = 1;
4016 } 4088 }
4017 4089
4018 if (real_result) 4090 if (real_result)
4019 s_return (mk_real (SCHEME_A_ result)); 4091 s_return (mk_real (SCHEME_A_ result));
4020 else 4092 else
4021 s_return (mk_integer (SCHEME_A_ result)); 4093 s_return (mk_integer (SCHEME_A_ result));
4022 } 4094 }
4023 4095
4024 case OP_FLOOR:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4096 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4027
4028 case OP_CEILING:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4097 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 4098
4032 case OP_TRUNCATE: 4099 case OP_TRUNCATE:
4033 { 4100 {
4034 RVALUE rvalue_of_x; 4101 RVALUE n = rvalue (x);
4035
4036 x = car (SCHEME_V->args);
4037 rvalue_of_x = rvalue (x);
4038
4039 if (rvalue_of_x > 0)
4040 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4041 else
4042 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4043 } 4103 }
4044 4104
4045 case OP_ROUND: 4105 case OP_ROUND:
4046 x = car (SCHEME_V->args);
4047
4048 if (num_is_integer (x)) 4106 if (is_integer (x))
4049 s_return (x); 4107 s_return (x);
4050 4108
4051 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4052#endif 4110#endif
4053 4111
4054 case OP_ADD: /* + */ 4112 case OP_ADD: /* + */
4055 v = num_zero; 4113 v = num_zero;
4056 4114
4057 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4115 for (x = args; x != NIL; x = cdr (x))
4058 v = num_op ('+', v, nvalue (car (x))); 4116 v = num_op (NUM_ADD, v, nvalue (car (x)));
4059 4117
4060 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4061 4119
4062 case OP_MUL: /* * */ 4120 case OP_MUL: /* * */
4063 v = num_one; 4121 v = num_one;
4064 4122
4065 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4066 v = num_op ('+', v, nvalue (car (x))); 4124 v = num_op (NUM_MUL, v, nvalue (car (x)));
4067 4125
4068 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4069 4127
4070 case OP_SUB: /* - */ 4128 case OP_SUB: /* - */
4071 if (cdr (SCHEME_V->args) == NIL) 4129 if (cdr (args) == NIL)
4072 { 4130 {
4073 x = SCHEME_V->args; 4131 x = args;
4074 v = num_zero; 4132 v = num_zero;
4075 } 4133 }
4076 else 4134 else
4077 { 4135 {
4078 x = cdr (SCHEME_V->args); 4136 x = cdr (args);
4079 v = nvalue (car (SCHEME_V->args)); 4137 v = nvalue (car (args));
4080 } 4138 }
4081 4139
4082 for (; x != NIL; x = cdr (x)) 4140 for (; x != NIL; x = cdr (x))
4083 v = num_op ('+', v, nvalue (car (x))); 4141 v = num_op (NUM_SUB, v, nvalue (car (x)));
4084 4142
4085 s_return (mk_number (SCHEME_A_ v)); 4143 s_return (mk_number (SCHEME_A_ v));
4086 4144
4087 case OP_DIV: /* / */ 4145 case OP_DIV: /* / */
4088 if (cdr (SCHEME_V->args) == NIL) 4146 if (cdr (args) == NIL)
4089 { 4147 {
4090 x = SCHEME_V->args; 4148 x = args;
4091 v = num_one; 4149 v = num_one;
4092 } 4150 }
4093 else 4151 else
4094 { 4152 {
4095 x = cdr (SCHEME_V->args); 4153 x = cdr (args);
4096 v = nvalue (car (SCHEME_V->args)); 4154 v = nvalue (car (args));
4097 } 4155 }
4098 4156
4099 for (; x != NIL; x = cdr (x)) 4157 for (; x != NIL; x = cdr (x))
4100 {
4101 if (!is_zero_rvalue (rvalue (car (x)))) 4158 if (!is_zero_rvalue (rvalue (car (x))))
4102 v = num_div (v, nvalue (car (x))); 4159 v = num_div (v, nvalue (car (x)));
4103 else 4160 else
4104 Error_0 ("/: division by zero"); 4161 Error_0 ("/: division by zero");
4105 }
4106 4162
4107 s_return (mk_number (SCHEME_A_ v)); 4163 s_return (mk_number (SCHEME_A_ v));
4108 4164
4109 case OP_INTDIV: /* quotient */ 4165 case OP_INTDIV: /* quotient */
4110 if (cdr (SCHEME_V->args) == NIL) 4166 if (cdr (args) == NIL)
4111 { 4167 {
4112 x = SCHEME_V->args; 4168 x = args;
4113 v = num_one; 4169 v = num_one;
4114 } 4170 }
4115 else 4171 else
4116 { 4172 {
4117 x = cdr (SCHEME_V->args); 4173 x = cdr (args);
4118 v = nvalue (car (SCHEME_V->args)); 4174 v = nvalue (car (args));
4119 } 4175 }
4120 4176
4121 for (; x != NIL; x = cdr (x)) 4177 for (; x != NIL; x = cdr (x))
4122 { 4178 {
4123 if (ivalue (car (x)) != 0) 4179 if (ivalue (car (x)) != 0)
4124 v = num_op ('/', v, nvalue (car (x))); 4180 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4125 else 4181 else
4126 Error_0 ("quotient: division by zero"); 4182 Error_0 ("quotient: division by zero");
4127 } 4183 }
4128 4184
4129 s_return (mk_number (SCHEME_A_ v)); 4185 s_return (mk_number (SCHEME_A_ v));
4130 4186
4131 case OP_REM: /* remainder */ 4187 case OP_REM: /* remainder */
4132 v = nvalue (car (SCHEME_V->args)); 4188 v = nvalue (x);
4133 4189
4134 if (ivalue (cadr (SCHEME_V->args)) != 0) 4190 if (ivalue (cadr (args)) != 0)
4135 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4191 v = num_rem (v, nvalue (cadr (args)));
4136 else 4192 else
4137 Error_0 ("remainder: division by zero"); 4193 Error_0 ("remainder: division by zero");
4138 4194
4139 s_return (mk_number (SCHEME_A_ v)); 4195 s_return (mk_number (SCHEME_A_ v));
4140 4196
4141 case OP_MOD: /* modulo */ 4197 case OP_MOD: /* modulo */
4142 v = nvalue (car (SCHEME_V->args)); 4198 v = nvalue (x);
4143 4199
4144 if (ivalue (cadr (SCHEME_V->args)) != 0) 4200 if (ivalue (cadr (args)) != 0)
4145 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4201 v = num_mod (v, nvalue (cadr (args)));
4146 else 4202 else
4147 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4148 4204
4149 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4150 4206
4151 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4152 s_return (caar (SCHEME_V->args)); 4208 case OP_CAR: op_car: s_return (car (x));
4153 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4154 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4155 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;
4156 4238
4157 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4158 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4240 set_cdr (args, cadr (args));
4159 s_return (SCHEME_V->args); 4241 s_return (args);
4160 4242
4161 case OP_SETCAR: /* set-car! */ 4243 case OP_SETCAR: /* set-car! */
4162 if (!is_immutable (car (SCHEME_V->args))) 4244 if (!is_immutable (x))
4163 { 4245 {
4164 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4246 set_car (x, cadr (args));
4165 s_return (car (SCHEME_V->args)); 4247 s_return (car (args));
4166 } 4248 }
4167 else 4249 else
4168 Error_0 ("set-car!: unable to alter immutable pair"); 4250 Error_0 ("set-car!: unable to alter immutable pair");
4169 4251
4170 case OP_SETCDR: /* set-cdr! */ 4252 case OP_SETCDR: /* set-cdr! */
4171 if (!is_immutable (car (SCHEME_V->args))) 4253 if (!is_immutable (x))
4172 { 4254 {
4173 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4255 set_cdr (x, cadr (args));
4174 s_return (car (SCHEME_V->args)); 4256 s_return (car (args));
4175 } 4257 }
4176 else 4258 else
4177 Error_0 ("set-cdr!: unable to alter immutable pair"); 4259 Error_0 ("set-cdr!: unable to alter immutable pair");
4178 4260
4179 case OP_CHAR2INT: /* char->integer */ 4261 case OP_CHAR2INT: /* char->integer */
4180 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4262 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4181 4263
4182 case OP_INT2CHAR: /* integer->char */ 4264 case OP_INT2CHAR: /* integer->char */
4183 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4265 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4184 4266
4185 case OP_CHARUPCASE: 4267 case OP_CHARUPCASE:
4186 { 4268 {
4187 unsigned char c = ivalue (car (SCHEME_V->args)); 4269 unsigned char c = ivalue_unchecked (x);
4188 c = toupper (c); 4270 c = toupper (c);
4189 s_return (mk_character (SCHEME_A_ c)); 4271 s_return (mk_character (SCHEME_A_ c));
4190 } 4272 }
4191 4273
4192 case OP_CHARDNCASE: 4274 case OP_CHARDNCASE:
4193 { 4275 {
4194 unsigned char c = ivalue (car (SCHEME_V->args)); 4276 unsigned char c = ivalue_unchecked (x);
4195 c = tolower (c); 4277 c = tolower (c);
4196 s_return (mk_character (SCHEME_A_ c)); 4278 s_return (mk_character (SCHEME_A_ c));
4197 } 4279 }
4198 4280
4199 case OP_STR2SYM: /* string->symbol */ 4281 case OP_STR2SYM: /* string->symbol */
4200 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4282 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4201 4283
4202 case OP_STR2ATOM: /* string->atom */ 4284 case OP_STR2ATOM: /* string->atom */
4203 { 4285 {
4204 char *s = strvalue (car (SCHEME_V->args)); 4286 char *s = strvalue (x);
4205 long pf = 0; 4287 long pf = 0;
4206 4288
4207 if (cdr (SCHEME_V->args) != NIL) 4289 if (cdr (args) != NIL)
4208 { 4290 {
4209 /* we know cadr(SCHEME_V->args) is a natural number */ 4291 /* we know cadr(args) is a natural number */
4210 /* see if it is 2, 8, 10, or 16, or error */ 4292 /* see if it is 2, 8, 10, or 16, or error */
4211 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4293 pf = ivalue_unchecked (cadr (args));
4212 4294
4213 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4295 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4214 { 4296 {
4215 /* base is OK */ 4297 /* base is OK */
4216 } 4298 }
4217 else 4299 else
4218 pf = -1; 4300 pf = -1;
4219 } 4301 }
4220 4302
4221 if (pf < 0) 4303 if (pf < 0)
4222 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4304 Error_1 ("string->atom: bad base:", cadr (args));
4223 else if (*s == '#') /* no use of base! */ 4305 else if (*s == '#') /* no use of base! */
4224 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4306 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4225 else 4307 else
4226 { 4308 {
4227 if (pf == 0 || pf == 10) 4309 if (pf == 0 || pf == 10)
… …
4238 } 4320 }
4239 } 4321 }
4240 } 4322 }
4241 4323
4242 case OP_SYM2STR: /* symbol->string */ 4324 case OP_SYM2STR: /* symbol->string */
4243 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4325 x = mk_string (SCHEME_A_ symname (x));
4244 setimmutable (x); 4326 setimmutable (x);
4245 s_return (x); 4327 s_return (x);
4246 4328
4247 case OP_ATOM2STR: /* atom->string */ 4329 case OP_ATOM2STR: /* atom->string */
4248 { 4330 {
4249 long pf = 0; 4331 long pf = 0;
4250 4332
4251 x = car (SCHEME_V->args);
4252
4253 if (cdr (SCHEME_V->args) != NIL) 4333 if (cdr (args) != NIL)
4254 { 4334 {
4255 /* we know cadr(SCHEME_V->args) is a natural number */ 4335 /* we know cadr(args) is a natural number */
4256 /* see if it is 2, 8, 10, or 16, or error */ 4336 /* see if it is 2, 8, 10, or 16, or error */
4257 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4337 pf = ivalue_unchecked (cadr (args));
4258 4338
4259 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))
4260 { 4340 {
4261 /* base is OK */ 4341 /* base is OK */
4262 } 4342 }
4263 else 4343 else
4264 pf = -1; 4344 pf = -1;
4265 } 4345 }
4266 4346
4267 if (pf < 0) 4347 if (pf < 0)
4268 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4348 Error_1 ("atom->string: bad base:", cadr (args));
4269 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))
4270 { 4350 {
4271 char *p; 4351 char *p;
4272 int len; 4352 int len;
4273 4353
… …
4278 Error_1 ("atom->string: not an atom:", x); 4358 Error_1 ("atom->string: not an atom:", x);
4279 } 4359 }
4280 4360
4281 case OP_MKSTRING: /* make-string */ 4361 case OP_MKSTRING: /* make-string */
4282 { 4362 {
4283 int fill = ' '; 4363 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4284 int len; 4364 int len = ivalue_unchecked (x);
4285 4365
4286 len = ivalue (car (SCHEME_V->args));
4287
4288 if (cdr (SCHEME_V->args) != NIL)
4289 fill = charvalue (cadr (SCHEME_V->args));
4290
4291 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4366 s_return (mk_empty_string (SCHEME_A_ len, fill));
4292 } 4367 }
4293 4368
4294 case OP_STRLEN: /* string-length */ 4369 case OP_STRLEN: /* string-length */
4295 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4370 s_return (mk_integer (SCHEME_A_ strlength (x)));
4296 4371
4297 case OP_STRREF: /* string-ref */ 4372 case OP_STRREF: /* string-ref */
4298 { 4373 {
4299 char *str; 4374 char *str = strvalue (x);
4300 int index;
4301
4302 str = strvalue (car (SCHEME_V->args));
4303
4304 index = ivalue (cadr (SCHEME_V->args)); 4375 int index = ivalue_unchecked (cadr (args));
4305 4376
4306 if (index >= strlength (car (SCHEME_V->args))) 4377 if (index >= strlength (x))
4307 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4378 Error_1 ("string-ref: out of bounds:", cadr (args));
4308 4379
4309 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4380 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4310 } 4381 }
4311 4382
4312 case OP_STRSET: /* string-set! */ 4383 case OP_STRSET: /* string-set! */
4313 { 4384 {
4314 char *str; 4385 char *str = strvalue (x);
4315 int index; 4386 int index = ivalue_unchecked (cadr (args));
4316 int c; 4387 int c;
4317 4388
4318 if (is_immutable (car (SCHEME_V->args))) 4389 if (is_immutable (x))
4319 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4390 Error_1 ("string-set!: unable to alter immutable string:", x);
4320 4391
4321 str = strvalue (car (SCHEME_V->args));
4322
4323 index = ivalue (cadr (SCHEME_V->args));
4324
4325 if (index >= strlength (car (SCHEME_V->args))) 4392 if (index >= strlength (x))
4326 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4393 Error_1 ("string-set!: out of bounds:", cadr (args));
4327 4394
4328 c = charvalue (caddr (SCHEME_V->args)); 4395 c = charvalue (caddr (args));
4329 4396
4330 str[index] = (char) c; 4397 str[index] = c;
4331 s_return (car (SCHEME_V->args)); 4398 s_return (car (args));
4332 } 4399 }
4333 4400
4334 case OP_STRAPPEND: /* string-append */ 4401 case OP_STRAPPEND: /* string-append */
4335 { 4402 {
4336 /* 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 */
4337 int len = 0; 4404 int len = 0;
4338 pointer newstr; 4405 pointer newstr;
4339 char *pos; 4406 char *pos;
4340 4407
4341 /* compute needed length for new string */ 4408 /* compute needed length for new string */
4342 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4409 for (x = args; x != NIL; x = cdr (x))
4343 len += strlength (car (x)); 4410 len += strlength (car (x));
4344 4411
4345 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4412 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4346 4413
4347 /* store the contents of the argument strings into the new string */ 4414 /* store the contents of the argument strings into the new string */
4348 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))
4349 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4416 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4350 4417
4351 s_return (newstr); 4418 s_return (newstr);
4352 } 4419 }
4353 4420
4354 case OP_SUBSTR: /* substring */ 4421 case OP_SUBSTR: /* substring */
4355 { 4422 {
4356 char *str; 4423 char *str = strvalue (x);
4357 int index0; 4424 int index0 = ivalue_unchecked (cadr (args));
4358 int index1; 4425 int index1;
4359 int len; 4426 int len;
4360 4427
4361 str = strvalue (car (SCHEME_V->args));
4362
4363 index0 = ivalue (cadr (SCHEME_V->args));
4364
4365 if (index0 > strlength (car (SCHEME_V->args))) 4428 if (index0 > strlength (x))
4366 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4429 Error_1 ("substring: start out of bounds:", cadr (args));
4367 4430
4368 if (cddr (SCHEME_V->args) != NIL) 4431 if (cddr (args) != NIL)
4369 { 4432 {
4370 index1 = ivalue (caddr (SCHEME_V->args)); 4433 index1 = ivalue_unchecked (caddr (args));
4371 4434
4372 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4435 if (index1 > strlength (x) || index1 < index0)
4373 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4436 Error_1 ("substring: end out of bounds:", caddr (args));
4374 } 4437 }
4375 else 4438 else
4376 index1 = strlength (car (SCHEME_V->args)); 4439 index1 = strlength (x);
4377 4440
4378 len = index1 - index0; 4441 len = index1 - index0;
4379 x = mk_empty_string (SCHEME_A_ len, ' '); 4442 x = mk_empty_string (SCHEME_A_ len, ' ');
4380 memcpy (strvalue (x), str + index0, len); 4443 memcpy (strvalue (x), str + index0, len);
4381 strvalue (x)[len] = 0; 4444 strvalue (x)[len] = 0;
… …
4385 4448
4386 case OP_VECTOR: /* vector */ 4449 case OP_VECTOR: /* vector */
4387 { 4450 {
4388 int i; 4451 int i;
4389 pointer vec; 4452 pointer vec;
4390 int len = list_length (SCHEME_A_ SCHEME_V->args); 4453 int len = list_length (SCHEME_A_ args);
4391 4454
4392 if (len < 0) 4455 if (len < 0)
4393 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4456 Error_1 ("vector: not a proper list:", args);
4394 4457
4395 vec = mk_vector (SCHEME_A_ len); 4458 vec = mk_vector (SCHEME_A_ len);
4396 4459
4397#if USE_ERROR_CHECKING 4460#if USE_ERROR_CHECKING
4398 if (SCHEME_V->no_memory) 4461 if (SCHEME_V->no_memory)
4399 s_return (S_SINK); 4462 s_return (S_SINK);
4400#endif 4463#endif
4401 4464
4402 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++)
4403 set_vector_elem (vec, i, car (x)); 4466 vector_set (vec, i, car (x));
4404 4467
4405 s_return (vec); 4468 s_return (vec);
4406 } 4469 }
4407 4470
4408 case OP_MKVECTOR: /* make-vector */ 4471 case OP_MKVECTOR: /* make-vector */
4409 { 4472 {
4410 pointer fill = NIL; 4473 pointer fill = NIL;
4411 int len;
4412 pointer vec; 4474 pointer vec;
4475 int len = ivalue_unchecked (x);
4413 4476
4414 len = ivalue (car (SCHEME_V->args));
4415
4416 if (cdr (SCHEME_V->args) != NIL) 4477 if (cdr (args) != NIL)
4417 fill = cadr (SCHEME_V->args); 4478 fill = cadr (args);
4418 4479
4419 vec = mk_vector (SCHEME_A_ len); 4480 vec = mk_vector (SCHEME_A_ len);
4420 4481
4421#if USE_ERROR_CHECKING 4482#if USE_ERROR_CHECKING
4422 if (SCHEME_V->no_memory) 4483 if (SCHEME_V->no_memory)
4423 s_return (S_SINK); 4484 s_return (S_SINK);
4424#endif 4485#endif
4425 4486
4426 if (fill != NIL) 4487 if (fill != NIL)
4427 fill_vector (vec, fill); 4488 fill_vector (vec, 0, fill);
4428 4489
4429 s_return (vec); 4490 s_return (vec);
4430 } 4491 }
4431 4492
4432 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4433 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);
4434 4499
4435 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4436 { 4501 {
4437 int index;
4438
4439 index = ivalue (cadr (SCHEME_V->args)); 4502 int index = ivalue_unchecked (cadr (args));
4440 4503
4441 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4442 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4505 Error_1 ("vector-ref: out of bounds:", cadr (args));
4443 4506
4444 s_return (vector_elem (car (SCHEME_V->args), index)); 4507 s_return (vector_get (x, index));
4445 } 4508 }
4446 4509
4447 case OP_VECSET: /* vector-set! */ 4510 case OP_VECSET: /* vector-set! */
4448 { 4511 {
4449 int index; 4512 int index = ivalue_unchecked (cadr (args));
4450 4513
4451 if (is_immutable (car (SCHEME_V->args))) 4514 if (is_immutable (x))
4452 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4515 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4453 4516
4454 index = ivalue (cadr (SCHEME_V->args));
4455
4456 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4517 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4457 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4518 Error_1 ("vector-set!: out of bounds:", cadr (args));
4458 4519
4459 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4520 vector_set (x, index, caddr (args));
4460 s_return (car (SCHEME_V->args)); 4521 s_return (x);
4461 } 4522 }
4462 } 4523 }
4463 4524
4464 return S_T; 4525 if (USE_ERROR_CHECKING) abort ();
4465} 4526}
4466 4527
4467INTERFACE int
4468is_list (SCHEME_P_ pointer a)
4469{
4470 return list_length (SCHEME_A_ a) >= 0;
4471}
4472
4473/* Result is:
4474 proper list: length
4475 circular list: -1
4476 not even a pair: -2
4477 dotted list: -2 minus length before dot
4478*/
4479INTERFACE int
4480list_length (SCHEME_P_ pointer a)
4481{
4482 int i = 0;
4483 pointer slow, fast;
4484
4485 slow = fast = a;
4486
4487 while (1)
4488 {
4489 if (fast == NIL)
4490 return i;
4491
4492 if (!is_pair (fast))
4493 return -2 - i;
4494
4495 fast = cdr (fast);
4496 ++i;
4497
4498 if (fast == NIL)
4499 return i;
4500
4501 if (!is_pair (fast))
4502 return -2 - i;
4503
4504 ++i;
4505 fast = cdr (fast);
4506
4507 /* Safe because we would have already returned if `fast'
4508 encountered a non-pair. */
4509 slow = cdr (slow);
4510
4511 if (fast == slow)
4512 {
4513 /* the fast pointer has looped back around and caught up
4514 with the slow pointer, hence the structure is circular,
4515 not of finite length, and therefore not a list */
4516 return -1;
4517 }
4518 }
4519}
4520
4521static pointer 4528static int
4522opexe_r (SCHEME_P_ enum scheme_opcodes op) 4529opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4530{
4524 pointer x = SCHEME_V->args; 4531 pointer x = SCHEME_V->args;
4525 4532
4526 for (;;) 4533 for (;;)
4527 { 4534 {
… …
4547 } 4554 }
4548 4555
4549 s_return (S_T); 4556 s_return (S_T);
4550} 4557}
4551 4558
4552static pointer 4559static int
4553opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4560opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4554{ 4561{
4555 pointer x = SCHEME_V->args; 4562 pointer args = SCHEME_V->args;
4556 pointer a = car (x); 4563 pointer a = car (args);
4557 pointer d = cdr (x); 4564 pointer d = cdr (args);
4558 int r; 4565 int r;
4559 4566
4560 switch (op) 4567 switch (op)
4561 { 4568 {
4562 case OP_NOT: /* not */ 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 r = is_false (a); break; 4570 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4564 4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4565 case OP_BOOLP: /* boolean? */ 4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4566 r = a == S_F || a == S_T; break; 4573 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4567 4574 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4568 case OP_EOFOBJP: /* eof-object? */ 4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4569 r = a == S_EOF; break; 4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4570 4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4571 case OP_NULLP: /* null? */ 4578 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4572 r = a == NIL; break; 4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4573
4574 case OP_SYMBOLP: /* symbol? */
4575 r = is_symbol (a); break;
4576
4577 case OP_NUMBERP: /* number? */
4578 r = is_number (a); break;
4579
4580 case OP_STRINGP: /* string? */
4581 r = is_string (a); break;
4582
4583 case OP_INTEGERP: /* integer? */
4584 r = is_integer (a); break;
4585
4586 case OP_REALP: /* real? */
4587 r = is_number (a); break; /* all numbers are real */
4588
4589 case OP_CHARP: /* char? */
4590 r = is_character (a); break;
4591 4580
4592#if USE_CHAR_CLASSIFIERS 4581#if USE_CHAR_CLASSIFIERS
4593 case OP_CHARAP: /* char-alphabetic? */ 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4594 r = Cisalpha (ivalue (a)); break; 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4595 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4596 case OP_CHARNP: /* char-numeric? */ 4585 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4597 r = Cisdigit (ivalue (a)); break; 4586 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4598
4599 case OP_CHARWP: /* char-whitespace? */
4600 r = Cisspace (ivalue (a)); break;
4601
4602 case OP_CHARUP: /* char-upper-case? */
4603 r = Cisupper (ivalue (a)); break;
4604
4605 case OP_CHARLP: /* char-lower-case? */
4606 r = Cislower (ivalue (a)); break;
4607#endif 4587#endif
4608 4588
4609#if USE_PORTS 4589#if USE_PORTS
4610 case OP_PORTP: /* port? */ 4590 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4611 r = is_port (a); break;
4612
4613 case OP_INPORTP: /* input-port? */ 4591 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4614 r = is_inport (a); break;
4615
4616 case OP_OUTPORTP: /* output-port? */ 4592 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4617 r = is_outport (a); break;
4618#endif 4593#endif
4619 4594
4620 case OP_PROCP: /* procedure? */ 4595 case OP_PROCP: /* procedure? */
4621 4596
4622 /*-- 4597 /*--
… …
4625 * in R^3 report sec. 6.9 4600 * in R^3 report sec. 6.9
4626 */ 4601 */
4627 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a); 4602 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4628 break; 4603 break;
4629 4604
4630 case OP_PAIRP: /* pair? */ 4605 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4631 r = is_pair (a); break; 4606 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4632 4607 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4633 case OP_LISTP: /* list? */ 4608 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4634 r = list_length (SCHEME_A_ a) >= 0; break; 4609 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4635 4610 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4636 case OP_ENVP: /* environment? */
4637 r = is_environment (a); break;
4638
4639 case OP_VECTORP: /* vector? */
4640 r = is_vector (a); break;
4641
4642 case OP_EQ: /* eq? */
4643 r = a == cadr (x); break;
4644
4645 case OP_EQV: /* eqv? */
4646 r = eqv (a, cadr (x)); break;
4647 } 4611 }
4648 4612
4649 s_retbool (r); 4613 s_retbool (r);
4650} 4614}
4651 4615
4652static pointer 4616static int
4653opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4617opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4654{ 4618{
4619 pointer args = SCHEME_V->args;
4620 pointer a = car (args);
4655 pointer x, y; 4621 pointer x, y;
4656 4622
4657 switch (op) 4623 switch (op)
4658 { 4624 {
4659 case OP_FORCE: /* force */ 4625 case OP_FORCE: /* force */
4660 SCHEME_V->code = car (SCHEME_V->args); 4626 SCHEME_V->code = a;
4661 4627
4662 if (is_promise (SCHEME_V->code)) 4628 if (is_promise (SCHEME_V->code))
4663 { 4629 {
4664 /* Should change type to closure here */ 4630 /* Should change type to closure here */
4665 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4631 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4668 } 4634 }
4669 else 4635 else
4670 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4671 4637
4672 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4673 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4674 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4675 4641
4676#if USE_PORTS 4642#if USE_PORTS
4677 4643
4678 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
… …
4686 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4652 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4687 SCHEME_V->outport = cadr (SCHEME_V->args); 4653 SCHEME_V->outport = cadr (SCHEME_V->args);
4688 } 4654 }
4689 } 4655 }
4690 4656
4691 SCHEME_V->args = car (SCHEME_V->args); 4657 SCHEME_V->args = a;
4692 4658
4693 if (op == OP_WRITE) 4659 if (op == OP_WRITE)
4694 SCHEME_V->print_flag = 1; 4660 SCHEME_V->print_flag = 1;
4695 else 4661 else
4696 SCHEME_V->print_flag = 0; 4662 SCHEME_V->print_flag = 0;
4697 4663
4698 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
4699 4665
4700 case OP_NEWLINE: /* newline */ 4666 case OP_NEWLINE: /* newline */
4701 if (is_pair (SCHEME_V->args)) 4667 if (is_pair (args))
4702 { 4668 {
4703 if (car (SCHEME_V->args) != SCHEME_V->outport) 4669 if (a != SCHEME_V->outport)
4704 { 4670 {
4705 x = cons (SCHEME_V->outport, NIL); 4671 x = cons (SCHEME_V->outport, NIL);
4706 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4672 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4707 SCHEME_V->outport = car (SCHEME_V->args); 4673 SCHEME_V->outport = a;
4708 } 4674 }
4709 } 4675 }
4710 4676
4711 putstr (SCHEME_A_ "\n"); 4677 putstr (SCHEME_A_ "\n");
4712 s_return (S_T); 4678 s_return (S_T);
4713#endif 4679#endif
4714 4680
4715 case OP_ERR0: /* error */ 4681 case OP_ERR0: /* error */
4716 SCHEME_V->retcode = -1; 4682 SCHEME_V->retcode = -1;
4717 4683
4718 if (!is_string (car (SCHEME_V->args))) 4684 if (!is_string (a))
4719 { 4685 {
4720 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4686 args = cons (mk_string (SCHEME_A_ " -- "), args);
4721 setimmutable (car (SCHEME_V->args)); 4687 setimmutable (car (args));
4722 } 4688 }
4723 4689
4724 putstr (SCHEME_A_ "Error: "); 4690 putstr (SCHEME_A_ "Error: ");
4725 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4691 putstr (SCHEME_A_ strvalue (car (args)));
4726 SCHEME_V->args = cdr (SCHEME_V->args); 4692 SCHEME_V->args = cdr (args);
4727 s_goto (OP_ERR1); 4693 s_goto (OP_ERR1);
4728 4694
4729 case OP_ERR1: /* error */ 4695 case OP_ERR1: /* error */
4730 putstr (SCHEME_A_ " "); 4696 putstr (SCHEME_A_ " ");
4731 4697
4732 if (SCHEME_V->args != NIL) 4698 if (args != NIL)
4733 { 4699 {
4734 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4700 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4735 SCHEME_V->args = car (SCHEME_V->args); 4701 SCHEME_V->args = a;
4736 SCHEME_V->print_flag = 1; 4702 SCHEME_V->print_flag = 1;
4737 s_goto (OP_P0LIST); 4703 s_goto (OP_P0LIST);
4738 } 4704 }
4739 else 4705 else
4740 { 4706 {
4741 putstr (SCHEME_A_ "\n"); 4707 putstr (SCHEME_A_ "\n");
4742 4708
4743 if (SCHEME_V->interactive_repl) 4709 if (SCHEME_V->interactive_repl)
4744 s_goto (OP_T0LVL); 4710 s_goto (OP_T0LVL);
4745 else 4711 else
4746 return NIL; 4712 return -1;
4747 } 4713 }
4748 4714
4749 case OP_REVERSE: /* reverse */ 4715 case OP_REVERSE: /* reverse */
4750 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4716 s_return (reverse (SCHEME_A_ a));
4751 4717
4752 case OP_LIST_STAR: /* list* */ 4718 case OP_LIST_STAR: /* list* */
4753 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4719 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4754 4720
4755 case OP_APPEND: /* append */ 4721 case OP_APPEND: /* append */
4756 x = NIL; 4722 x = NIL;
4757 y = SCHEME_V->args; 4723 y = args;
4758 4724
4759 if (y == x) 4725 if (y == x)
4760 s_return (x); 4726 s_return (x);
4761 4727
4762 /* cdr() in the while condition is not a typo. If car() */ 4728 /* cdr() in the while condition is not a typo. If car() */
… …
4773 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4739 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4774 4740
4775#if USE_PLIST 4741#if USE_PLIST
4776 4742
4777 case OP_PUT: /* put */ 4743 case OP_PUT: /* put */
4778 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4744 if (!hasprop (a) || !hasprop (cadr (args)))
4779 Error_0 ("illegal use of put"); 4745 Error_0 ("illegal use of put");
4780 4746
4781 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))
4782 { 4748 {
4783 if (caar (x) == y) 4749 if (caar (x) == y)
4784 break; 4750 break;
4785 } 4751 }
4786 4752
4787 if (x != NIL) 4753 if (x != NIL)
4788 cdar (x) = caddr (SCHEME_V->args); 4754 cdar (x) = caddr (args);
4789 else 4755 else
4790 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));
4791 4757
4792 s_return (S_T); 4758 s_return (S_T);
4793 4759
4794 case OP_GET: /* get */ 4760 case OP_GET: /* get */
4795 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4761 if (!hasprop (a) || !hasprop (cadr (args)))
4796 Error_0 ("illegal use of get"); 4762 Error_0 ("illegal use of get");
4797 4763
4798 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))
4799 if (caar (x) == y) 4765 if (caar (x) == y)
4800 break; 4766 break;
4801 4767
4802 if (x != NIL) 4768 if (x != NIL)
4803 s_return (cdar (x)); 4769 s_return (cdar (x));
… …
4805 s_return (NIL); 4771 s_return (NIL);
4806 4772
4807#endif /* USE_PLIST */ 4773#endif /* USE_PLIST */
4808 4774
4809 case OP_QUIT: /* quit */ 4775 case OP_QUIT: /* quit */
4810 if (is_pair (SCHEME_V->args)) 4776 if (is_pair (args))
4811 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4777 SCHEME_V->retcode = ivalue (a);
4812 4778
4813 return NIL; 4779 return -1;
4814 4780
4815 case OP_GC: /* gc */ 4781 case OP_GC: /* gc */
4816 gc (SCHEME_A_ NIL, NIL); 4782 gc (SCHEME_A_ NIL, NIL);
4817 s_return (S_T); 4783 s_return (S_T);
4818 4784
4819 case OP_GCVERB: /* gc-verbose */ 4785 case OP_GCVERB: /* gc-verbose */
4820 { 4786 {
4821 int was = SCHEME_V->gc_verbose; 4787 int was = SCHEME_V->gc_verbose;
4822 4788
4823 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4824 s_retbool (was); 4790 s_retbool (was);
4825 } 4791 }
4826 4792
4827 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4828 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4795 if (!is_pair (args) || !is_number (a))
4829 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4830 4797#endif
4831 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4832
4833 s_return (S_T);
4834 4799
4835 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4836 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4837 4802
4838#if USE_PORTS 4803#if USE_PORTS
… …
4863 case OP_OPEN_INOUTFILE: 4828 case OP_OPEN_INOUTFILE:
4864 prop = port_input | port_output; 4829 prop = port_input | port_output;
4865 break; 4830 break;
4866 } 4831 }
4867 4832
4868 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4833 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4869 4834
4870 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4871 s_return (S_F);
4872
4873 s_return (p);
4874 } 4836 }
4875 4837
4876# if USE_STRING_PORTS 4838# if USE_STRING_PORTS
4877 4839
4878 case OP_OPEN_INSTRING: /* open-input-string */ 4840 case OP_OPEN_INSTRING: /* open-input-string */
… …
4890 case OP_OPEN_INOUTSTRING: 4852 case OP_OPEN_INOUTSTRING:
4891 prop = port_input | port_output; 4853 prop = port_input | port_output;
4892 break; 4854 break;
4893 } 4855 }
4894 4856
4895 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4857 p = port_from_string (SCHEME_A_ strvalue (a),
4896 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4858 strvalue (a) + strlength (a), prop);
4897 4859
4898 if (p == NIL) 4860 s_return (p == NIL ? S_F : p);
4899 s_return (S_F);
4900
4901 s_return (p);
4902 } 4861 }
4903 4862
4904 case OP_OPEN_OUTSTRING: /* open-output-string */ 4863 case OP_OPEN_OUTSTRING: /* open-output-string */
4905 { 4864 {
4906 pointer p; 4865 pointer p;
4907 4866
4908 if (car (SCHEME_V->args) == NIL) 4867 if (a == NIL)
4909 {
4910 p = port_from_scratch (SCHEME_A); 4868 p = port_from_scratch (SCHEME_A);
4911
4912 if (p == NIL)
4913 s_return (S_F);
4914 }
4915 else 4869 else
4916 {
4917 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4870 p = port_from_string (SCHEME_A_ strvalue (a),
4918 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4871 strvalue (a) + strlength (a), port_output);
4919 4872
4920 if (p == NIL) 4873 s_return (p == NIL ? S_F : p);
4921 s_return (S_F);
4922 }
4923
4924 s_return (p);
4925 } 4874 }
4926 4875
4927 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
4928 { 4877 {
4929 port *p; 4878 port *p = port (a);
4930 4879
4931 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4880 if (p->kind & port_string)
4932 { 4881 {
4933 off_t size; 4882 off_t size;
4934 char *str; 4883 char *str;
4935 4884
4936 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4952 } 4901 }
4953 4902
4954# endif 4903# endif
4955 4904
4956 case OP_CLOSE_INPORT: /* close-input-port */ 4905 case OP_CLOSE_INPORT: /* close-input-port */
4957 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4906 port_close (SCHEME_A_ a, port_input);
4958 s_return (S_T); 4907 s_return (S_T);
4959 4908
4960 case OP_CLOSE_OUTPORT: /* close-output-port */ 4909 case OP_CLOSE_OUTPORT: /* close-output-port */
4961 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4910 port_close (SCHEME_A_ a, port_output);
4962 s_return (S_T); 4911 s_return (S_T);
4963#endif 4912#endif
4964 4913
4965 case OP_INT_ENV: /* interaction-environment */ 4914 case OP_INT_ENV: /* interaction-environment */
4966 s_return (SCHEME_V->global_env); 4915 s_return (SCHEME_V->global_env);
… …
4968 case OP_CURR_ENV: /* current-environment */ 4917 case OP_CURR_ENV: /* current-environment */
4969 s_return (SCHEME_V->envir); 4918 s_return (SCHEME_V->envir);
4970 4919
4971 } 4920 }
4972 4921
4973 abort (); 4922 if (USE_ERROR_CHECKING) abort ();
4974} 4923}
4975 4924
4976static pointer 4925static int
4977opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4926opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4978{ 4927{
4928 pointer args = SCHEME_V->args;
4979 pointer x; 4929 pointer x;
4980 4930
4981 if (SCHEME_V->nesting != 0) 4931 if (SCHEME_V->nesting != 0)
4982 { 4932 {
4983 int n = SCHEME_V->nesting; 4933 int n = SCHEME_V->nesting;
… …
4990 switch (op) 4940 switch (op)
4991 { 4941 {
4992 /* ========== reading part ========== */ 4942 /* ========== reading part ========== */
4993#if USE_PORTS 4943#if USE_PORTS
4994 case OP_READ: 4944 case OP_READ:
4995 if (!is_pair (SCHEME_V->args)) 4945 if (!is_pair (args))
4996 s_goto (OP_READ_INTERNAL); 4946 s_goto (OP_READ_INTERNAL);
4997 4947
4998 if (!is_inport (car (SCHEME_V->args))) 4948 if (!is_inport (car (args)))
4999 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4949 Error_1 ("read: not an input port:", car (args));
5000 4950
5001 if (car (SCHEME_V->args) == SCHEME_V->inport) 4951 if (car (args) == SCHEME_V->inport)
5002 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
5003 4953
5004 x = SCHEME_V->inport; 4954 x = SCHEME_V->inport;
5005 SCHEME_V->inport = car (SCHEME_V->args); 4955 SCHEME_V->inport = car (args);
5006 x = cons (x, NIL); 4956 x = cons (x, NIL);
5007 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4957 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5008 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
5009 4959
5010 case OP_READ_CHAR: /* read-char */ 4960 case OP_READ_CHAR: /* read-char */
5011 case OP_PEEK_CHAR: /* peek-char */ 4961 case OP_PEEK_CHAR: /* peek-char */
5012 { 4962 {
5013 int c; 4963 int c;
5014 4964
5015 if (is_pair (SCHEME_V->args)) 4965 if (is_pair (args))
5016 { 4966 {
5017 if (car (SCHEME_V->args) != SCHEME_V->inport) 4967 if (car (args) != SCHEME_V->inport)
5018 { 4968 {
5019 x = SCHEME_V->inport; 4969 x = SCHEME_V->inport;
5020 x = cons (x, NIL); 4970 x = cons (x, NIL);
5021 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4971 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5022 SCHEME_V->inport = car (SCHEME_V->args); 4972 SCHEME_V->inport = car (args);
5023 } 4973 }
5024 } 4974 }
5025 4975
5026 c = inchar (SCHEME_A); 4976 c = inchar (SCHEME_A);
5027 4977
… …
5037 case OP_CHAR_READY: /* char-ready? */ 4987 case OP_CHAR_READY: /* char-ready? */
5038 { 4988 {
5039 pointer p = SCHEME_V->inport; 4989 pointer p = SCHEME_V->inport;
5040 int res; 4990 int res;
5041 4991
5042 if (is_pair (SCHEME_V->args)) 4992 if (is_pair (args))
5043 p = car (SCHEME_V->args); 4993 p = car (args);
5044 4994
5045 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
5046 4996
5047 s_retbool (res); 4997 s_retbool (res);
5048 } 4998 }
5049 4999
5050 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
5051 SCHEME_V->inport = car (SCHEME_V->args); 5001 SCHEME_V->inport = car (args);
5052 s_return (SCHEME_V->value); 5002 s_return (SCHEME_V->value);
5053 5003
5054 case OP_SET_OUTPORT: /* set-output-port */ 5004 case OP_SET_OUTPORT: /* set-output-port */
5055 SCHEME_V->outport = car (SCHEME_V->args); 5005 SCHEME_V->outport = car (args);
5056 s_return (SCHEME_V->value); 5006 s_return (SCHEME_V->value);
5057#endif 5007#endif
5058 5008
5059 case OP_RDSEXPR: 5009 case OP_RDSEXPR:
5060 switch (SCHEME_V->tok) 5010 switch (SCHEME_V->tok)
… …
5109 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5059 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5110 SCHEME_V->tok = token (SCHEME_A); 5060 SCHEME_V->tok = token (SCHEME_A);
5111 s_goto (OP_RDSEXPR); 5061 s_goto (OP_RDSEXPR);
5112 5062
5113 case TOK_ATOM: 5063 case TOK_ATOM:
5114 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)));
5115 5074
5116 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
5117 x = readstrexp (SCHEME_A); 5076 x = readstrexp (SCHEME_A_ '"');
5118 5077
5119 if (x == S_F) 5078 if (x == S_F)
5120 Error_0 ("Error reading string"); 5079 Error_0 ("Error reading string");
5121 5080
5122 setimmutable (x); 5081 setimmutable (x);
… …
5134 s_goto (OP_EVAL); 5093 s_goto (OP_EVAL);
5135 } 5094 }
5136 } 5095 }
5137 5096
5138 case TOK_SHARP_CONST: 5097 case TOK_SHARP_CONST:
5139 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)
5140 Error_0 ("undefined sharp expression"); 5099 Error_0 ("undefined sharp expression");
5141 else 5100 else
5142 s_return (x); 5101 s_return (x);
5143 5102
5144 default: 5103 default:
… …
5146 } 5105 }
5147 5106
5148 break; 5107 break;
5149 5108
5150 case OP_RDLIST: 5109 case OP_RDLIST:
5151 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5110 SCHEME_V->args = cons (SCHEME_V->value, args);
5152 SCHEME_V->tok = token (SCHEME_A); 5111 SCHEME_V->tok = token (SCHEME_A);
5153 5112
5154 switch (SCHEME_V->tok) 5113 switch (SCHEME_V->tok)
5155 { 5114 {
5156 case TOK_EOF: 5115 case TOK_EOF:
… …
5184 case OP_RDDOT: 5143 case OP_RDDOT:
5185 if (token (SCHEME_A) != TOK_RPAREN) 5144 if (token (SCHEME_A) != TOK_RPAREN)
5186 Error_0 ("syntax error: illegal dot expression"); 5145 Error_0 ("syntax error: illegal dot expression");
5187 5146
5188 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5147 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5189 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));
5190 5149
5191 case OP_RDQUOTE: 5150 case OP_RDQUOTE:
5192 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5151 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5193 5152
5194 case OP_RDQQUOTE: 5153 case OP_RDQQUOTE:
… …
5216 SCHEME_V->args = SCHEME_V->value; 5175 SCHEME_V->args = SCHEME_V->value;
5217 s_goto (OP_VECTOR); 5176 s_goto (OP_VECTOR);
5218 5177
5219 /* ========== printing part ========== */ 5178 /* ========== printing part ========== */
5220 case OP_P0LIST: 5179 case OP_P0LIST:
5221 if (is_vector (SCHEME_V->args)) 5180 if (is_vector (args))
5222 { 5181 {
5223 putstr (SCHEME_A_ "#("); 5182 putstr (SCHEME_A_ "#(");
5224 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5183 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5225 s_goto (OP_PVECFROM); 5184 s_goto (OP_PVECFROM);
5226 } 5185 }
5227 else if (is_environment (SCHEME_V->args)) 5186 else if (is_environment (args))
5228 { 5187 {
5229 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5188 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5230 s_return (S_T); 5189 s_return (S_T);
5231 } 5190 }
5232 else if (!is_pair (SCHEME_V->args)) 5191 else if (!is_pair (args))
5233 { 5192 {
5234 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5193 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5235 s_return (S_T); 5194 s_return (S_T);
5236 } 5195 }
5237 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5196 else
5238 { 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)
5239 putstr (SCHEME_A_ "'"); 5204 putstr (SCHEME_A_ "'");
5240 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
5241 s_goto (OP_P0LIST); 5218 s_goto (OP_P0LIST);
5242 } 5219 }
5243 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))
5244 { 5223 {
5224 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5245 putstr (SCHEME_A_ "`"); 5225 putstr (SCHEME_A_ " ");
5246 SCHEME_V->args = cadr (SCHEME_V->args); 5226 SCHEME_V->args = car (args);
5247 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5248 } 5228 }
5249 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5250 {
5251 putstr (SCHEME_A_ ",");
5252 SCHEME_V->args = cadr (SCHEME_V->args);
5253 s_goto (OP_P0LIST);
5254 }
5255 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5256 {
5257 putstr (SCHEME_A_ ",@");
5258 SCHEME_V->args = cadr (SCHEME_V->args);
5259 s_goto (OP_P0LIST);
5260 }
5261 else
5262 {
5263 putstr (SCHEME_A_ "(");
5264 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5265 SCHEME_V->args = car (SCHEME_V->args);
5266 s_goto (OP_P0LIST);
5267 }
5268
5269 case OP_P1LIST:
5270 if (is_pair (SCHEME_V->args))
5271 {
5272 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5273 putstr (SCHEME_A_ " ");
5274 SCHEME_V->args = car (SCHEME_V->args);
5275 s_goto (OP_P0LIST);
5276 }
5277 else if (is_vector (SCHEME_V->args)) 5229 else if (is_vector (args))
5278 { 5230 {
5279 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5231 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5280 putstr (SCHEME_A_ " . "); 5232 putstr (SCHEME_A_ " . ");
5281 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5282 } 5234 }
5283 else 5235 else
5284 { 5236 {
5285 if (SCHEME_V->args != NIL) 5237 if (args != NIL)
5286 { 5238 {
5287 putstr (SCHEME_A_ " . "); 5239 putstr (SCHEME_A_ " . ");
5288 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5240 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5289 } 5241 }
5290 5242
5291 putstr (SCHEME_A_ ")"); 5243 putstr (SCHEME_A_ ")");
5292 s_return (S_T); 5244 s_return (S_T);
5293 } 5245 }
5294 5246
5295 case OP_PVECFROM: 5247 case OP_PVECFROM:
5296 { 5248 {
5297 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5249 int i = ivalue_unchecked (cdr (args));
5298 pointer vec = car (SCHEME_V->args); 5250 pointer vec = car (args);
5299 int len = veclength (vec); 5251 int len = veclength (vec);
5300 5252
5301 if (i == len) 5253 if (i == len)
5302 { 5254 {
5303 putstr (SCHEME_A_ ")"); 5255 putstr (SCHEME_A_ ")");
5304 s_return (S_T); 5256 s_return (S_T);
5305 } 5257 }
5306 else 5258 else
5307 { 5259 {
5308 pointer elem = vector_elem (vec, i); 5260 pointer elem = vector_get (vec, i);
5309 5261
5310 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5262 ivalue_unchecked (cdr (args)) = i + 1;
5311 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5312 SCHEME_V->args = elem; 5264 SCHEME_V->args = elem;
5313 5265
5314 if (i > 0) 5266 if (i > 0)
5315 putstr (SCHEME_A_ " "); 5267 putstr (SCHEME_A_ " ");
5316 5268
5317 s_goto (OP_P0LIST); 5269 s_goto (OP_P0LIST);
5318 } 5270 }
5319 } 5271 }
5320 } 5272 }
5321 5273
5322 abort (); 5274 if (USE_ERROR_CHECKING) abort ();
5323} 5275}
5324 5276
5325static pointer 5277static int
5326opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5278opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5327{ 5279{
5280 pointer args = SCHEME_V->args;
5281 pointer a = car (args);
5328 pointer x, y; 5282 pointer x, y;
5329 5283
5330 switch (op) 5284 switch (op)
5331 { 5285 {
5332 case OP_LIST_LENGTH: /* length *//* a.k */ 5286 case OP_LIST_LENGTH: /* length *//* a.k */
5333 { 5287 {
5334 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5288 long v = list_length (SCHEME_A_ a);
5335 5289
5336 if (v < 0) 5290 if (v < 0)
5337 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5291 Error_1 ("length: not a list:", a);
5338 5292
5339 s_return (mk_integer (SCHEME_A_ v)); 5293 s_return (mk_integer (SCHEME_A_ v));
5340 } 5294 }
5341 5295
5342 case OP_ASSQ: /* assq *//* a.k */ 5296 case OP_ASSQ: /* assq *//* a.k */
5343 x = car (SCHEME_V->args); 5297 x = a;
5344 5298
5345 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5299 for (y = cadr (args); is_pair (y); y = cdr (y))
5346 { 5300 {
5347 if (!is_pair (car (y))) 5301 if (!is_pair (car (y)))
5348 Error_0 ("unable to handle non pair element"); 5302 Error_0 ("unable to handle non pair element");
5349 5303
5350 if (x == caar (y)) 5304 if (x == caar (y))
… …
5356 else 5310 else
5357 s_return (S_F); 5311 s_return (S_F);
5358 5312
5359 5313
5360 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5314 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5361 SCHEME_V->args = car (SCHEME_V->args); 5315 SCHEME_V->args = a;
5362 5316
5363 if (SCHEME_V->args == NIL) 5317 if (SCHEME_V->args == NIL)
5364 s_return (S_F); 5318 s_return (S_F);
5365 else if (is_closure (SCHEME_V->args)) 5319 else if (is_closure (SCHEME_V->args))
5366 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5320 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5371 5325
5372 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5373 /* 5327 /*
5374 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5375 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5376 */ 5331 */
5377 s_retbool (is_closure (car (SCHEME_V->args))); 5332 s_retbool (is_closure (a));
5378 5333
5379 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5380 s_retbool (is_macro (car (SCHEME_V->args))); 5335 s_retbool (is_macro (a));
5381 } 5336 }
5382 5337
5383 abort (); 5338 if (USE_ERROR_CHECKING) abort ();
5384} 5339}
5385 5340
5341/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5386typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5387 5343
5388typedef int (*test_predicate) (pointer); 5344typedef int (*test_predicate)(pointer);
5389static int 5345static int
5390is_any (pointer p) 5346tst_any (pointer p)
5391{ 5347{
5392 return 1; 5348 return 1;
5393} 5349}
5394 5350
5395static int 5351static int
5396is_nonneg (pointer p) 5352tst_inonneg (pointer p)
5397{ 5353{
5398 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);
5399} 5361}
5400 5362
5401/* Correspond carefully with following defines! */ 5363/* Correspond carefully with following defines! */
5402static struct 5364static struct
5403{ 5365{
5404 test_predicate fct; 5366 test_predicate fct;
5405 const char *kind; 5367 const char *kind;
5406} tests[] = 5368} tests[] = {
5407{ 5369 { tst_any , 0 },
5408 { 0, 0}, /* unused */ 5370 { is_string , "string" },
5409 { is_any, 0}, 5371 { is_symbol , "symbol" },
5410 { is_string, "string" }, 5372 { is_port , "port" },
5411 { is_symbol, "symbol" },
5412 { is_port, "port" },
5413 { is_inport, "input port" }, 5373 { is_inport , "input port" },
5414 { is_outport, "output port" }, 5374 { is_outport , "output port" },
5415 { is_environment, "environment" }, 5375 { is_environment, "environment" },
5416 { is_pair, "pair" }, 5376 { is_pair , "pair" },
5417 { 0, "pair or '()" }, 5377 { 0 , "pair or '()" },
5418 { is_character, "character" }, 5378 { is_character , "character" },
5419 { is_vector, "vector" }, 5379 { is_vector , "vector" },
5420 { is_number, "number" }, 5380 { is_number , "number" },
5421 { is_integer, "integer" }, 5381 { is_integer , "integer" },
5422 { is_nonneg, "non-negative integer" } 5382 { tst_inonneg , "non-negative integer" }
5423}; 5383};
5424 5384
5425#define TST_NONE 0 5385#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5426#define TST_ANY "\001" 5386#define TST_ANY "\001"
5427#define TST_STRING "\002" 5387#define TST_STRING "\002"
5428#define TST_SYMBOL "\003" 5388#define TST_SYMBOL "\003"
5429#define TST_PORT "\004" 5389#define TST_PORT "\004"
5430#define TST_INPORT "\005" 5390#define TST_INPORT "\005"
5431#define TST_OUTPORT "\006" 5391#define TST_OUTPORT "\006"
5432#define TST_ENVIRONMENT "\007" 5392#define TST_ENVIRONMENT "\007"
5433#define TST_PAIR "\010" 5393#define TST_PAIR "\010"
5434#define TST_LIST "\011" 5394#define TST_LIST "\011"
5435#define TST_CHAR "\012" 5395#define TST_CHAR "\012"
5436#define TST_VECTOR "\013" 5396#define TST_VECTOR "\013"
5437#define TST_NUMBER "\014" 5397#define TST_NUMBER "\014"
5438#define TST_INTEGER "\015" 5398#define TST_INTEGER "\015"
5439#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}
5440 5427
5441typedef struct 5428typedef struct
5442{ 5429{
5443 dispatch_func func; 5430 uint8_t func;
5444 char *name; 5431 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5432 uint8_t builtin;
5433#if USE_ERROR_CHECKING
5445 int min_arity; 5434 uint8_t min_arity;
5446 int max_arity; 5435 uint8_t max_arity;
5447 char *arg_tests_encoding; 5436 char arg_tests_encoding[3];
5437#endif
5448} op_code_info; 5438} op_code_info;
5449 5439
5450#define INF_ARG 0xffff
5451
5452static op_code_info dispatch_table[] = { 5440static const op_code_info dispatch_table[] = {
5453#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
5454#include "opdefines.h" 5446#include "opdefines.h"
5447#undef OP_DEF
5455 {0} 5448 {0}
5456}; 5449};
5457 5450
5458static const char *
5459procname (pointer x)
5460{
5461 int n = procnum (x);
5462 const char *name = dispatch_table[n].name;
5463
5464 if (name == 0)
5465 name = "ILLEGAL!";
5466
5467 return name;
5468}
5469
5470/* kernel of this interpreter */ 5451/* kernel of this interpreter */
5471static void 5452static void ecb_hot
5472Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5473{ 5454{
5474 SCHEME_V->op = op; 5455 SCHEME_V->op = op;
5475 5456
5476 for (;;) 5457 for (;;)
5477 { 5458 {
5478 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5459 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5479 5460
5480#if USE_ERROR_CHECKING 5461#if USE_ERROR_CHECKING
5481 if (pcd->name) /* if built-in function, check arguments */ 5462 if (pcd->builtin) /* if built-in function, check arguments */
5482 { 5463 {
5483 int ok = 1;
5484 char msg[STRBUFFSIZE]; 5464 char msg[STRBUFFSIZE];
5485 int n = list_length (SCHEME_A_ SCHEME_V->args); 5465 int n = list_length (SCHEME_A_ SCHEME_V->args);
5486 5466
5487 /* Check number of arguments */ 5467 /* Check number of arguments */
5488 if (ecb_expect_false (n < pcd->min_arity)) 5468 if (ecb_expect_false (n < pcd->min_arity))
5489 { 5469 {
5490 ok = 0;
5491 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5470 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5492 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;
5493 } 5474 }
5494 else if (ecb_excpect_false (n > pcd->max_arity)) 5475 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5495 { 5476 {
5496 ok = 0;
5497 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5477 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5498 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;
5499 } 5481 }
5500 5482 else
5501 if (ecb_expect_false (ok))
5502 { 5483 {
5503 if (pcd->arg_tests_encoding) 5484 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5504 { 5485 {
5505 int i = 0; 5486 int i = 0;
5506 int j; 5487 int j;
5507 const char *t = pcd->arg_tests_encoding; 5488 const char *t = pcd->arg_tests_encoding;
5508 pointer arglist = SCHEME_V->args; 5489 pointer arglist = SCHEME_V->args;
5509 5490
5510 do 5491 do
5511 { 5492 {
5512 pointer arg = car (arglist); 5493 pointer arg = car (arglist);
5513 5494
5514 j = (int) t[0]; 5495 j = t[0];
5515 5496
5497 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5516 if (j == TST_LIST[0]) 5498 if (j == TST_LIST[0])
5517 { 5499 {
5518 if (arg != NIL && !is_pair (arg)) 5500 if (!tst_is_list (SCHEME_A_ arg))
5519 break; 5501 break;
5520 } 5502 }
5521 else 5503 else
5522 { 5504 {
5523 if (!tests[j].fct (arg)) 5505 if (!tests[j - 1].fct (arg))
5524 break; 5506 break;
5525 } 5507 }
5526 5508
5527 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 */
5528 t++; 5510 t++;
5529 5511
5530 arglist = cdr (arglist); 5512 arglist = cdr (arglist);
5531 i++; 5513 i++;
5532 } 5514 }
5533 while (i < n); 5515 while (i < n);
5534 5516
5535 if (i < n) 5517 if (i < n)
5536 { 5518 {
5537 ok = 0;
5538 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;
5539 } 5522 }
5540 } 5523 }
5541 } 5524 }
5542
5543 if (!ok)
5544 {
5545 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5546 return;
5547
5548 pcd = dispatch_table + SCHEME_V->op;
5549 }
5550 } 5525 }
5551#endif 5526#endif
5552 5527
5553 ok_to_freely_gc (SCHEME_A); 5528 ok_to_freely_gc (SCHEME_A);
5554 5529
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
5555 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5540 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5556 return; 5541 return;
5557 5542
5558 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5559 { 5544 {
5560 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5561 return; 5546 return;
5562 } 5547 }
5563 } 5548 }
5564} 5549}
5565 5550
… …
5584mk_proc (SCHEME_P_ enum scheme_opcodes op) 5569mk_proc (SCHEME_P_ enum scheme_opcodes op)
5585{ 5570{
5586 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5571 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5587 set_typeflag (y, (T_PROC | T_ATOM)); 5572 set_typeflag (y, (T_PROC | T_ATOM));
5588 ivalue_unchecked (y) = op; 5573 ivalue_unchecked (y) = op;
5589 set_num_integer (y);
5590 return y; 5574 return y;
5591} 5575}
5592 5576
5593/* 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! */
5594static int 5578static int
5595syntaxnum (pointer p) 5579syntaxnum (pointer p)
5596{ 5580{
5597 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5598 5582
5599 switch (strlength (car (p))) 5583 switch (strlength (p))
5600 { 5584 {
5601 case 2: 5585 case 2:
5602 if (s[0] == 'i') 5586 if (s[0] == 'i')
5603 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5604 else 5588 else
… …
5659 return OP_C0STREAM; /* cons-stream */ 5643 return OP_C0STREAM; /* cons-stream */
5660 } 5644 }
5661} 5645}
5662 5646
5663#if USE_MULTIPLICITY 5647#if USE_MULTIPLICITY
5664scheme * 5648ecb_cold scheme *
5665scheme_init_new () 5649scheme_init_new ()
5666{ 5650{
5667 scheme *sc = malloc (sizeof (scheme)); 5651 scheme *sc = malloc (sizeof (scheme));
5668 5652
5669 if (!scheme_init (SCHEME_A)) 5653 if (!scheme_init (SCHEME_A))
… …
5674 else 5658 else
5675 return sc; 5659 return sc;
5676} 5660}
5677#endif 5661#endif
5678 5662
5679int 5663ecb_cold int
5680scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5681{ 5665{
5682 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5683 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));
5684 5674
5685 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5686 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5687 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5688 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
… …
5700 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5701 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5702 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5703 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5704 5694
5705 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5706 { 5696 {
5707#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5708 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5709 return 0; 5699 return 0;
5710#endif 5700#endif
… …
5757 5747
5758 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5748 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5759 assign_syntax (SCHEME_A_ syntax_names[i]); 5749 assign_syntax (SCHEME_A_ syntax_names[i]);
5760 } 5750 }
5761 5751
5752 // TODO: should iterate via strlen, to avoid n² complexity
5762 for (i = 0; i < n; i++) 5753 for (i = 0; i < n; i++)
5763 if (dispatch_table[i].name != 0) 5754 if (dispatch_table[i].builtin)
5764 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5755 assign_proc (SCHEME_A_ i, opname (i));
5765 5756
5766 /* initialization of global pointers to special symbols */ 5757 /* initialization of global pointers to special symbols */
5767 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5758 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5768 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5759 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5769 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5760 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5808scheme_set_external_data (SCHEME_P_ void *p) 5799scheme_set_external_data (SCHEME_P_ void *p)
5809{ 5800{
5810 SCHEME_V->ext_data = p; 5801 SCHEME_V->ext_data = p;
5811} 5802}
5812 5803
5813void 5804ecb_cold void
5814scheme_deinit (SCHEME_P) 5805scheme_deinit (SCHEME_P)
5815{ 5806{
5816 int i; 5807 int i;
5817 5808
5818#if SHOW_ERROR_LINE 5809#if SHOW_ERROR_LINE
… …
5910{ 5901{
5911 dump_stack_reset (SCHEME_A); 5902 dump_stack_reset (SCHEME_A);
5912 SCHEME_V->envir = SCHEME_V->global_env; 5903 SCHEME_V->envir = SCHEME_V->global_env;
5913 SCHEME_V->file_i = 0; 5904 SCHEME_V->file_i = 0;
5914 SCHEME_V->load_stack[0].kind = port_input | port_string; 5905 SCHEME_V->load_stack[0].kind = port_input | port_string;
5915 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 */
5916 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);
5917 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5908 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5918#if USE_PORTS 5909#if USE_PORTS
5919 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5910 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5920#endif 5911#endif
5921 SCHEME_V->retcode = 0; 5912 SCHEME_V->retcode = 0;
5922 SCHEME_V->interactive_repl = 0; 5913 SCHEME_V->interactive_repl = 0;
… …
6039# endif 6030# endif
6040 int fin; 6031 int fin;
6041 char *file_name = InitFile; 6032 char *file_name = InitFile;
6042 int retcode; 6033 int retcode;
6043 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
6044 6036
6045 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6046 { 6038 {
6047 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6048 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6049 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
6050 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6051 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6052 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6053 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6054 return 1; 6046 return 1;
6055 } 6047 }
6056 6048
6057 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
6058 { 6050 {
6059 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
6060 return 2; 6052 return 2;
6061 } 6053 }
6062 6054
6063# if USE_PORTS 6055# if USE_PORTS
6064 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6109 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
6110#endif 6102#endif
6111 6103
6112 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
6113 { 6105 {
6114 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");
6115 } 6107 }
6116 else 6108 else
6117 { 6109 {
6118 if (isfile) 6110 if (isfile)
6119 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6123#if USE_PORTS 6115#if USE_PORTS
6124 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
6125 { 6117 {
6126 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
6127 { 6119 {
6128 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");
6129 } 6121 }
6130 6122
6131 if (isfile) 6123 if (isfile)
6132 close (fin); 6124 close (fin);
6133 } 6125 }

Diff Legend

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