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.17 by root, Thu Nov 26 10:15:51 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#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79 91
80#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
81static scheme sc; 93static scheme sc;
82#endif 94#endif
83 95
… …
91 } 103 }
92 104
93 char *p = s; 105 char *p = s;
94 106
95 do { 107 do {
96 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
97 n /= base; 109 n /= base;
98 } while (n); 110 } while (n);
99 111
100 *p-- = 0; 112 *p-- = 0;
101 113
… …
111{ 123{
112 xbase (s, n, 10); 124 xbase (s, n, 10);
113} 125}
114 126
115static void 127static void
116xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
117{
118 write (1, s, strlen (s));
119}
120
121static void
122xwrnum (long n)
123{ 129{
124 char buf[64]; 130 char buf[64];
125 131
126 xnum (buf, n); 132 xnum (buf, n);
127 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
128} 134}
129 135
130static char 136static char
131xtoupper (char c) 137xtoupper (char c)
132{ 138{
… …
153 159
154#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
157 163
158#if USE_STRLWR 164#if USE_IGNORECASE
159static const char * 165static const char *
160strlwr (char *s) 166xstrlwr (char *s)
161{ 167{
162 const char *p = s; 168 const char *p = s;
163 169
164 while (*s) 170 while (*s)
165 { 171 {
… …
167 s++; 173 s++;
168 } 174 }
169 175
170 return p; 176 return p;
171} 177}
172#endif
173 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
174#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
176 186
177#ifndef prompt 187#ifndef prompt
178# define prompt "ts> " 188# define prompt "ts> "
179#endif 189#endif
180 190
181#ifndef InitFile 191#ifndef InitFile
182# define InitFile "init.scm" 192# define InitFile "init.scm"
183#endif 193#endif
184 194
185#ifndef FIRST_CELLSEGS
186# define FIRST_CELLSEGS 3
187#endif
188
189enum scheme_types 195enum scheme_types
190{ 196{
197 T_INTEGER,
191 T_FREE, 198 T_REAL,
192 T_STRING, 199 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 200 T_SYMBOL,
195 T_PROC, 201 T_PROC,
196 T_PAIR, 202 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 203 T_CLOSURE,
198 T_CONTINUATION, 204 T_CONTINUATION,
199 T_FOREIGN, 205 T_FOREIGN,
200 T_CHARACTER, 206 T_CHARACTER,
201 T_PORT, 207 T_PORT,
… …
211#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
215 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
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 249
218static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 252static num num_rem (num a, num b);
… …
223#if USE_MATH 255#if USE_MATH
224static double round_per_R5RS (double x); 256static double round_per_R5RS (double x);
225#endif 257#endif
226static int is_zero_rvalue (RVALUE x); 258static int is_zero_rvalue (RVALUE x);
227 259
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233
234static num num_zero; 260static num num_zero;
235static num num_one; 261static num num_one;
236 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
237/* macros for cell operations */ 267/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 268#define typeflag(p) (CELL(p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 269#define set_typeflag(p,v) (CELL(p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 270#define type(p) (typeflag (p) & T_MASKTYPE)
241 271
242INTERFACE INLINE int 272INTERFACE int
243is_string (pointer p) 273is_string (pointer p)
244{ 274{
245 return type (p) == T_STRING; 275 return type (p) == T_STRING;
246} 276}
247 277
248#define strvalue(p) ((p)->object.string.svalue) 278#define strvalue(p) (CELL(p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 279#define strlength(p) (CELL(p)->object.string.length)
250 280
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 281INTERFACE int
253is_vector (pointer p) 282is_vector (pointer p)
254{ 283{
255 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
256} 285}
257 286
258#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 289INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 292
265INTERFACE uint32_t 293INTERFACE int
266vector_length (pointer vec) 294is_integer (pointer p)
267{ 295{
268 return vec->object.vector.length; 296 return type (p) == T_INTEGER;
269} 297}
270 298
299/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 300INTERFACE int
301is_real (pointer p)
302{
303 return type (p) == T_REAL;
304}
305
306INTERFACE int
272is_number (pointer p) 307is_number (pointer p)
273{ 308{
274 return type (p) == T_NUMBER; 309 return is_integer (p) || is_real (p);
275} 310}
276 311
277INTERFACE INLINE int 312INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 313is_character (pointer p)
297{ 314{
298 return type (p) == T_CHARACTER; 315 return type (p) == T_CHARACTER;
299} 316}
300 317
301INTERFACE INLINE char * 318INTERFACE char *
302string_value (pointer p) 319string_value (pointer p)
303{ 320{
304 return strvalue (p); 321 return strvalue (p);
305} 322}
306 323
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#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
338#if USE_REAL 327#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 330#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
344# define set_num_integer(p) 0 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 333#endif
334
347INTERFACE long 335INTERFACE long
348charvalue (pointer p) 336charvalue (pointer p)
349{ 337{
350 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
351} 339}
352 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
353INTERFACE INLINE int 343INTERFACE int
354is_port (pointer p) 344is_port (pointer p)
355{ 345{
356 return type (p) == T_PORT; 346 return type (p) == T_PORT;
357} 347}
358 348
359INTERFACE INLINE int 349INTERFACE int
360is_inport (pointer p) 350is_inport (pointer p)
361{ 351{
362 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
363} 353}
364 354
365INTERFACE INLINE int 355INTERFACE int
366is_outport (pointer p) 356is_outport (pointer p)
367{ 357{
368 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
369} 359}
370 360
371INTERFACE INLINE int 361INTERFACE int
372is_pair (pointer p) 362is_pair (pointer p)
373{ 363{
374 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
375} 365}
376 366
377#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
378#define cdr(p) ((p)->object.cons.cdr + 0) 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
379 369
380static pointer caar (pointer p) { return car (car (p)); } 370static pointer caar (pointer p) { return car (car (p)); }
381static pointer cadr (pointer p) { return car (cdr (p)); } 371static pointer cadr (pointer p) { return car (cdr (p)); }
382static pointer cdar (pointer p) { return cdr (car (p)); } 372static pointer cdar (pointer p) { return cdr (car (p)); }
383static pointer cddr (pointer p) { return cdr (cdr (p)); } 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
387static pointer cdaar (pointer p) { return cdr (car (car (p))); } 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
388 378
389INTERFACE void 379INTERFACE void
390set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
391{ 381{
392 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
393} 383}
394 384
395INTERFACE void 385INTERFACE void
396set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
397{ 387{
398 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
399} 389}
400 390
401INTERFACE pointer 391INTERFACE pointer
402pair_car (pointer p) 392pair_car (pointer p)
403{ 393{
… …
408pair_cdr (pointer p) 398pair_cdr (pointer p)
409{ 399{
410 return cdr (p); 400 return cdr (p);
411} 401}
412 402
413INTERFACE INLINE int 403INTERFACE int
414is_symbol (pointer p) 404is_symbol (pointer p)
415{ 405{
416 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
417} 407}
418 408
419INTERFACE INLINE char * 409INTERFACE char *
420symname (pointer p) 410symname (pointer p)
421{ 411{
422 return strvalue (car (p)); 412 return strvalue (p);
423} 413}
424 414
425#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 418SCHEME_EXPORT int
427hasprop (pointer p) 419hasprop (pointer p)
428{ 420{
429 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
430} 422}
431
432# define symprop(p) cdr(p)
433#endif 423#endif
434 424
435INTERFACE INLINE int 425INTERFACE int
436is_syntax (pointer p) 426is_syntax (pointer p)
437{ 427{
438 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
439} 429}
440 430
441INTERFACE INLINE int 431INTERFACE int
442is_proc (pointer p) 432is_proc (pointer p)
443{ 433{
444 return type (p) == T_PROC; 434 return type (p) == T_PROC;
445} 435}
446 436
447INTERFACE INLINE int 437INTERFACE int
448is_foreign (pointer p) 438is_foreign (pointer p)
449{ 439{
450 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
451} 441}
452 442
453INTERFACE INLINE char * 443INTERFACE char *
454syntaxname (pointer p) 444syntaxname (pointer p)
455{ 445{
456 return strvalue (car (p)); 446 return strvalue (p);
457} 447}
458 448
459#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 450static const char *procname (pointer x);
461 451
462INTERFACE INLINE int 452INTERFACE int
463is_closure (pointer p) 453is_closure (pointer p)
464{ 454{
465 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
466} 456}
467 457
468INTERFACE INLINE int 458INTERFACE int
469is_macro (pointer p) 459is_macro (pointer p)
470{ 460{
471 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
472} 462}
473 463
474INTERFACE INLINE pointer 464INTERFACE pointer
475closure_code (pointer p) 465closure_code (pointer p)
476{ 466{
477 return car (p); 467 return car (p);
478} 468}
479 469
480INTERFACE INLINE pointer 470INTERFACE pointer
481closure_env (pointer p) 471closure_env (pointer p)
482{ 472{
483 return cdr (p); 473 return cdr (p);
484} 474}
485 475
486INTERFACE INLINE int 476INTERFACE int
487is_continuation (pointer p) 477is_continuation (pointer p)
488{ 478{
489 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
490} 480}
491 481
492#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
494 484
495/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 486INTERFACE int
497is_promise (pointer p) 487is_promise (pointer p)
498{ 488{
499 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
500} 490}
501 491
502INTERFACE INLINE int 492INTERFACE int
503is_environment (pointer p) 493is_environment (pointer p)
504{ 494{
505 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
506} 496}
507 497
… …
513 503
514#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 507
518INTERFACE INLINE int 508INTERFACE int
519is_immutable (pointer p) 509is_immutable (pointer p)
520{ 510{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 512}
523 513
524INTERFACE INLINE void 514INTERFACE void
525setimmutable (pointer p) 515setimmutable (pointer p)
526{ 516{
527#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 519#endif
530} 520}
531 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
532#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
533static INLINE int 577ecb_inline int
534Cisalpha (int c) 578Cisalpha (int c)
535{ 579{
536 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
537} 581}
538 582
539static INLINE int 583ecb_inline int
540Cisdigit (int c) 584Cisdigit (int c)
541{ 585{
542 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
543} 587}
544 588
545static INLINE int 589ecb_inline int
546Cisspace (int c) 590Cisspace (int c)
547{ 591{
548 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
549} 593}
550 594
551static INLINE int 595ecb_inline int
552Cisupper (int c) 596Cisupper (int c)
553{ 597{
554 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
555} 599}
556 600
557static INLINE int 601ecb_inline int
558Cislower (int c) 602Cislower (int c)
559{ 603{
560 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
561} 605}
562#endif 606#endif
… …
623#endif 667#endif
624 668
625static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
633static 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);
634static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
635static 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);
… …
650static void mark (pointer a); 694static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 702static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
660static 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);
661static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
671static 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);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 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
683static num 754static num
684num_op (enum num_op op, num a, num b) 755num_op (enum num_op op, num a, num b)
685{ 756{
686 num ret; 757 num ret;
687 758
688 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));
689 760
690 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
691 { 762 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 763 switch (op)
696 { 764 {
697 case NUM_ADD: av += bv; break; 765 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 766 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 767 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 769 }
702 770
703 num_set_ivalue (ret, av); 771 num_set_ivalue (ret, a.ivalue);
704 } 772 }
773#if USE_REAL
705 else 774 else
706 { 775 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 776 switch (op)
711 { 777 {
712 case NUM_ADD: av += bv; break; 778 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 779 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 780 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 782 }
717 783
718 num_set_rvalue (ret, av); 784 num_set_rvalue (ret, a.rvalue);
719 } 785 }
786#endif
720 787
721 return ret; 788 return ret;
722} 789}
723 790
724static num 791static num
725num_div (num a, num b) 792num_div (num a, num b)
726{ 793{
727 num ret; 794 num ret;
728 795
729 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);
730 797
731 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 800 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 802
736 return ret; 803 return ret;
737} 804}
738 805
739static num 806static num
… …
741{ 808{
742 num ret; 809 num ret;
743 long e1, e2, res; 810 long e1, e2, res;
744 811
745 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));
746 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
748 res = e1 % e2; 815 res = e1 % e2;
749 816
750 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
751 if (res > 0) 818 if (res > 0)
752 { 819 {
… …
768{ 835{
769 num ret; 836 num ret;
770 long e1, e2, res; 837 long e1, e2, res;
771 838
772 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));
773 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
775 res = e1 % e2; 842 res = e1 % e2;
776 843
777 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 845 if (res * e2 < 0)
779 res += e2; 846 res += e2;
780 847
781 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
782 return ret; 849 return ret;
783} 850}
784 851
785/* this completely disrespects NaNs */ 852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 853static int
787num_cmp (num a, num b) 854num_cmp (num a, num b)
788{ 855{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 857 int ret;
791 858
792 if (is_fixnum) 859 if (is_fixnum)
793 { 860 {
794 IVALUE av = num_get_ivalue (a); 861 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 862 IVALUE bv = num_ivalue (b);
796 863
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 864 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 865 }
799 else 866 else
800 { 867 {
801 RVALUE av = num_get_rvalue (a); 868 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 869 RVALUE bv = num_rvalue (b);
803 870
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 871 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 872 }
806 873
807 return ret; 874 return ret;
… …
833#endif 900#endif
834 901
835static int 902static int
836is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
837{ 904{
905 return x == 0;
906#if 0
838#if USE_REAL 907#if USE_REAL
839 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. */
840#else 909#else
841 return x == 0; 910 return x == 0;
842#endif 911#endif
912#endif
843} 913}
844 914
845/* allocate new cell segment */ 915/* allocate new cell segment */
846static int 916static int
847alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
848{ 918{
849 pointer newp; 919 struct cell *newp;
850 pointer last; 920 struct cell *last;
851 pointer p; 921 struct cell *p;
852 char *cp; 922 char *cp;
853 long i; 923 long i;
854 int k; 924 int k;
855 925
856 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
857 segsize <<= 1; 927 segsize <<= 1;
858 928
859 for (k = 0; k < n; k++)
860 {
861 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
862 return k;
863
864 cp = malloc (segsize * sizeof (struct cell)); 929 cp = malloc (segsize * sizeof (struct cell));
865 930
866 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
867 return k; 932 return k;
868 933
869 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
871 936
872 /* insert new segment in address order */ 937 newp = (struct cell *)cp;
873 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 939 SCHEME_V->cell_segsize[i] = segsize;
876
877 //TODO: insert, not swap
878 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
879 {
880 p = SCHEME_V->cell_seg[i];
881 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
882 SCHEME_V->cell_seg[i - 1] = p;
883
884 k = SCHEME_V->cell_segsize[i];
885 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
886 SCHEME_V->cell_segsize[i - 1] = k;
887
888 --i;
889 }
890
891 SCHEME_V->fcells += segsize; 940 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 941 last = newp + segsize - 1;
893 942
894 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
895 { 944 {
945 pointer cp = POINTER (p);
896 set_typeflag (p, T_FREE); 946 set_typeflag (cp, T_PAIR);
897 set_car (p, NIL); 947 set_car (cp, NIL);
898 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
899 } 949 }
900 950
901 /* insert new cells in address order on free list */
902 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
903 {
904 set_cdr (last, SCHEME_V->free_cell); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
906 }
907 else
908 {
909 p = SCHEME_V->free_cell;
910 953
911 while (cdr (p) != NIL && newp > cdr (p))
912 p = cdr (p);
913
914 set_cdr (last, cdr (p));
915 set_cdr (p, newp);
916 }
917 }
918
919 return n; 954 return 1;
920} 955}
921 956
922/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 958ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 960{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 961 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 962 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
929 return S_SINK; 964 return S_SINK;
930 965
931 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
932 { 967 {
933 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;
934 969
935 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
936 971
937 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)
938 { 973 {
939 /* 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 */
940 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
941 { 976 {
942#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
943 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
944 return S_SINK; 979 return S_SINK;
945#endif 980#endif
… …
957 } 992 }
958} 993}
959 994
960/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
961 Tehom */ 996 Tehom */
962
963static void 997static void
964push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
965{ 999{
966 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
967 1001
… …
989} 1023}
990 1024
991static pointer 1025static pointer
992get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
993{ 1027{
994 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
995 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
996 1030
997 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
998 return S_SINK; 1032 return S_SINK;
999 1033
1000 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1036
1003 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1005 fill_vector (v, init); 1039 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1041
1008 return v; 1042 return v;
1009} 1043}
1010 1044
1011static INLINE void 1045ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1046ok_to_freely_gc (SCHEME_P)
1013{ 1047{
1014 set_car (S_SINK, NIL); 1048 set_car (S_SINK, NIL);
1015} 1049}
1016 1050
… …
1018static void 1052static void
1019check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1020{ 1054{
1021 /* 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. */
1022 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1023 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1024 1058
1025 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1026 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1027} 1061}
1028 1062
1029static void 1063static void
1030check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1031{ 1065{
… …
1053 set_cdr (x, b); 1087 set_cdr (x, b);
1054 1088
1055 return x; 1089 return x;
1056} 1090}
1057 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
1058/* ========== oblist implementation ========== */ 1101/* ========== oblist implementation ========== */
1059 1102
1060#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1061 1104
1105static int
1062static 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}
1063 1116
1064static pointer 1117static pointer
1065oblist_initial_value (SCHEME_P) 1118oblist_initial_value (SCHEME_P)
1066{ 1119{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1069 1122
1070/* returns the new symbol */ 1123/* returns the new symbol */
1071static pointer 1124static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1125oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1126{
1074 int location; 1127 pointer x = generate_symbol (SCHEME_A_ name);
1075
1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1077 set_typeflag (x, T_SYMBOL);
1078 setimmutable (car (x));
1079
1080 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1128 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1081 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)));
1082 return x; 1130 return x;
1083} 1131}
1084 1132
1085static INLINE pointer 1133ecb_inline pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1134oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1135{
1088 int location; 1136 int location;
1089 pointer x; 1137 pointer x;
1090 char *s; 1138 char *s;
1091 1139
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1140 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1141
1094 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))
1095 { 1143 {
1096 s = symname (car (x)); 1144 s = symname (car (x));
1097 1145
1098 /* case-insensitive, per R5RS section 2 */ 1146 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1147 if (stricmp (name, s) == 0)
… …
1109 int i; 1157 int i;
1110 pointer x; 1158 pointer x;
1111 pointer ob_list = NIL; 1159 pointer ob_list = NIL;
1112 1160
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1161 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 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))
1115 ob_list = cons (x, ob_list); 1163 ob_list = cons (x, ob_list);
1116 1164
1117 return ob_list; 1165 return ob_list;
1118} 1166}
1119 1167
… …
1123oblist_initial_value (SCHEME_P) 1171oblist_initial_value (SCHEME_P)
1124{ 1172{
1125 return NIL; 1173 return NIL;
1126} 1174}
1127 1175
1128static INLINE pointer 1176ecb_inline pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1177oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1178{
1131 pointer x; 1179 pointer x;
1132 char *s; 1180 char *s;
1133 1181
… …
1145 1193
1146/* returns the new symbol */ 1194/* returns the new symbol */
1147static pointer 1195static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1197{
1150 pointer x; 1198 pointer x = generate_symbol (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x));
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1200 return x;
1157} 1201}
1158 1202
1159static pointer 1203static pointer
… …
1169mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1170{ 1214{
1171 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1172 1216
1173 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1174 x->object.port = p; 1218 set_port (x, p);
1175 1219
1176 return x; 1220 return x;
1177} 1221}
1178#endif 1222#endif
1179 1223
1180pointer 1224pointer
1181mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1182{ 1226{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1228
1185 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1186 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1187 1231
1188 return x; 1232 return x;
1189} 1233}
1190 1234
1191INTERFACE pointer 1235INTERFACE pointer
1192mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1193{ 1237{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1239
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1197 ivalue_unchecked (x) = c & 0xff; 1241 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1242
1199 return x; 1243 return x;
1200} 1244}
1201 1245
1202/* get number atom (integer) */ 1246/* get number atom (integer) */
1203INTERFACE pointer 1247INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1248mk_integer (SCHEME_P_ long n)
1205{ 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 {
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1261
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1209 ivalue_unchecked (x) = num; 1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1210 set_num_integer (x); 1264 set_ivalue (x, n);
1265
1266 *pp = x;
1267 }
1268
1211 return x; 1269 return *pp;
1212} 1270}
1213 1271
1214INTERFACE pointer 1272INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1216{ 1274{
1275#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1277
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1220 rvalue_unchecked (x) = n; 1279 set_rvalue (x, n);
1221 set_num_real (x); 1280
1222 return x; 1281 return x;
1282#else
1283 return mk_integer (SCHEME_A_ n);
1284#endif
1223} 1285}
1224 1286
1225static pointer 1287static pointer
1226mk_number (SCHEME_P_ const num n) 1288mk_number (SCHEME_P_ const num n)
1227{ 1289{
1290#if USE_REAL
1228 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
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1295 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1296#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1297}
1233 1298
1234/* allocate name to string area */ 1299/* allocate name to string area */
1235static char * 1300static char *
1236store_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)
… …
1242 SCHEME_V->no_memory = 1; 1307 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1308 return SCHEME_V->strbuff;
1244 } 1309 }
1245 1310
1246 if (str) 1311 if (str)
1247 { 1312 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1248 int l = strlen (str);
1249
1250 if (l > len_str)
1251 l = len_str;
1252
1253 memcpy (q, str, l);
1254 q[l] = 0;
1255 }
1256 else 1313 else
1257 {
1258 memset (q, fill, len_str); 1314 memset (q, fill, len_str);
1315
1259 q[len_str] = 0; 1316 q[len_str] = 0;
1260 }
1261 1317
1262 return q; 1318 return q;
1263} 1319}
1264 1320
1265INTERFACE pointer 1321INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1336
1281 set_typeflag (x, T_STRING | T_ATOM); 1337 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1339 strlength (x) = len;
1340
1284 return x; 1341 return x;
1285} 1342}
1286 1343
1287INTERFACE pointer 1344INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1345mk_string (SCHEME_P_ const char *str)
… …
1295{ 1352{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1353 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1354}
1298 1355
1299INTERFACE void 1356INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1357fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1358{
1302 int i; 1359 int i;
1303 1360
1304 for (i = 0; i < vec->object.vector.length; i++) 1361 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1306} 1363}
1307 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
1308INTERFACE pointer 1374INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1310{ 1376{
1311 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1312} 1378}
1313 1379
1314INTERFACE void 1380INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1381vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1382{
1317 vecvalue(vec)[ielem] = a; 1383 vecvalue(vec)[ielem] = a;
1318} 1384}
1319 1385
1320/* get new symbol */ 1386/* get new symbol */
… …
1332 1398
1333INTERFACE pointer 1399INTERFACE pointer
1334gensym (SCHEME_P) 1400gensym (SCHEME_P)
1335{ 1401{
1336 pointer x; 1402 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1403 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1342 1405
1343 /* first check oblist */ 1406 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name); 1407}
1345 1408
1346 if (x == NIL) 1409static int
1347 { 1410is_gensym (SCHEME_P_ pointer x)
1348 x = oblist_add_by_name (SCHEME_A_ name); 1411{
1349 return x; 1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1413}
1355 1414
1356/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1357static pointer 1416static pointer
1358mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
… …
1412 } 1471 }
1413 else if ((c == 'e') || (c == 'E')) 1472 else if ((c == 'e') || (c == 'E'))
1414 { 1473 {
1415 if (!has_fp_exp) 1474 if (!has_fp_exp)
1416 { 1475 {
1417 has_dec_point = 1; /* decimal point illegal 1476 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1477 p++;
1420 1478
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1479 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1480 continue;
1423 } 1481 }
… …
1511 1569
1512 if (ecb_expect_false (is_vector (p))) 1570 if (ecb_expect_false (is_vector (p)))
1513 { 1571 {
1514 int i; 1572 int i;
1515 1573
1516 for (i = 0; i < p->object.vector.length; i++) 1574 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1575 mark (vecvalue (p)[i]);
1518 } 1576 }
1519 1577
1520 if (is_atom (p)) 1578 if (is_atom (p))
1521 goto E6; 1579 goto E6;
… …
1568 1626
1569/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1570static void 1628static void
1571gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1572{ 1630{
1573 pointer p;
1574 int i; 1631 int i;
1575 1632
1576 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1577 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1578 1635
… …
1594 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1595 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1596 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1597 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1598 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
1599 /* mark variables a, b */ 1663 /* mark variables a, b */
1600 mark (a); 1664 mark (a);
1601 mark (b); 1665 mark (b);
1602 1666
1603 /* garbage collect */ 1667 /* garbage collect */
1604 clrmark (NIL); 1668 clrmark (NIL);
1605 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1606 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1607 1671
1608 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1609 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1610 (which are also kept sorted by address) downwards to build the 1674
1611 free-list in sorted order. 1675 uint32_t total = 0;
1612 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1613 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1614 { 1679 {
1615 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];
1616 1683
1617 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1618 { 1685 {
1686 pointer c = POINTER (p);
1687
1619 if (is_mark (p)) 1688 if (is_mark (c))
1620 clrmark (p); 1689 clrmark (c);
1621 else 1690 else
1622 { 1691 {
1623 /* reclaim cell */ 1692 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1693 if (typeflag (c) != T_PAIR)
1625 { 1694 {
1626 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1627 set_typeflag (p, T_FREE); 1696 set_typeflag (c, T_PAIR);
1628 set_car (p, NIL); 1697 set_car (c, NIL);
1629 } 1698 }
1630 1699
1631 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1633 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1634 } 1703 }
1635 } 1704 }
1636 } 1705 }
1637 1706
1638 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1639 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 }
1640} 1711}
1641 1712
1642static void 1713static void
1643finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1644{ 1715{
1645 /* TODO, fast bitmap check? */ 1716 /* TODO, fast bitmap check? */
1646 if (is_string (a)) 1717 if (is_string (a) || is_symbol (a))
1647 free (strvalue (a)); 1718 free (strvalue (a));
1648 else if (is_vector (a)) 1719 else if (is_vector (a))
1649 free (vecvalue (a)); 1720 free (vecvalue (a));
1650#if USE_PORTS 1721#if USE_PORTS
1651 else if (is_port (a)) 1722 else if (is_port (a))
1652 { 1723 {
1653 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)
1654 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1655 1726
1656 free (a->object.port); 1727 free (port (a));
1657 } 1728 }
1658#endif 1729#endif
1659} 1730}
1660 1731
1661/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
… …
1677 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1678 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;
1679 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;
1680 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;
1681 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1682 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);
1683 1754
1684#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1685 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;
1686 1757
1687 if (fname) 1758 if (fname)
… …
1704 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1705#if USE_PORTS 1776#if USE_PORTS
1706 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1707#endif 1778#endif
1708 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1709 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);
1710 } 1781 }
1711} 1782}
1712 1783
1713static int 1784static int
1714file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1715{ 1786{
1716#if USE_PORTS 1787#if USE_PORTS
1717 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1718 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1719 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1720#else 1791#else
1721 return 0; 1792 return 0;
1722#endif 1793#endif
1723} 1794}
1724 1795
… …
1858} 1929}
1859 1930
1860static void 1931static void
1861port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1862{ 1933{
1863 port *pt = p->object.port; 1934 port *pt = port (p);
1864 1935
1865 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1866 1937
1867 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1868 { 1939 {
… …
1889/* get new character from input file */ 1960/* get new character from input file */
1890static int 1961static int
1891inchar (SCHEME_P) 1962inchar (SCHEME_P)
1892{ 1963{
1893 int c; 1964 int c;
1894 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1895
1896 pt = SCHEME_V->inport->object.port;
1897 1966
1898 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1899 return EOF; 1968 return EOF;
1900 1969
1901 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
… …
1968 port *pt; 2037 port *pt;
1969 2038
1970 if (c == EOF) 2039 if (c == EOF)
1971 return; 2040 return;
1972 2041
1973 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
1974 pt->unget = c; 2043 pt->unget = c;
1975#else 2044#else
1976 if (c == EOF) 2045 if (c == EOF)
1977 return; 2046 return;
1978 2047
… …
2006 2075
2007INTERFACE void 2076INTERFACE void
2008putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2009{ 2078{
2010#if USE_PORTS 2079#if USE_PORTS
2011 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2012 2081
2013 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2014 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2015 else 2084 else
2016 for (; *s; s++) 2085 for (; *s; s++)
… …
2018 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2019 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))
2020 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2021 2090
2022#else 2091#else
2023 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2024#endif 2093#endif
2025} 2094}
2026 2095
2027static void 2096static void
2028putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2029{ 2098{
2030#if USE_PORTS 2099#if USE_PORTS
2031 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2032 2101
2033 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2034 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2035 else 2104 else
2036 { 2105 {
… …
2050 2119
2051INTERFACE void 2120INTERFACE void
2052putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2053{ 2122{
2054#if USE_PORTS 2123#if USE_PORTS
2055 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2056 2125
2057 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2058 { 2127 {
2059 char cc = c; 2128 char cc = c;
2060 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
… …
2073#endif 2142#endif
2074} 2143}
2075 2144
2076/* read characters up to delimiter, but cater to character constants */ 2145/* read characters up to delimiter, but cater to character constants */
2077static char * 2146static char *
2078readstr_upto (SCHEME_P_ char *delim) 2147readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2148{
2080 char *p = SCHEME_V->strbuff; 2149 char *p = SCHEME_V->strbuff + skip;
2081 2150
2082 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))));
2083 2152
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2154 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2161 return SCHEME_V->strbuff;
2093} 2162}
2094 2163
2095/* read string expression "xxx...xxx" */ 2164/* read string expression "xxx...xxx" */
2096static pointer 2165static pointer
2097readstrexp (SCHEME_P) 2166readstrexp (SCHEME_P_ char delim)
2098{ 2167{
2099 char *p = SCHEME_V->strbuff; 2168 char *p = SCHEME_V->strbuff;
2100 int c; 2169 int c;
2101 int c1 = 0; 2170 int c1 = 0;
2102 enum
2103 { 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;
2104 2172
2105 for (;;) 2173 for (;;)
2106 { 2174 {
2107 c = inchar (SCHEME_A); 2175 c = inchar (SCHEME_A);
2108 2176
… …
2110 return S_F; 2178 return S_F;
2111 2179
2112 switch (state) 2180 switch (state)
2113 { 2181 {
2114 case st_ok: 2182 case st_ok:
2115 switch (c) 2183 if (ecb_expect_false (c == delim))
2116 {
2117 case '\\':
2118 state = st_bsl;
2119 break;
2120
2121 case '"':
2122 *p = 0;
2123 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);
2124 2185
2125 default: 2186 if (ecb_expect_false (c == '\\'))
2187 state = st_bsl;
2188 else
2126 *p++ = c; 2189 *p++ = c;
2127 break;
2128 }
2129 2190
2130 break; 2191 break;
2131 2192
2132 case st_bsl: 2193 case st_bsl:
2133 switch (c) 2194 switch (c)
… …
2163 case 'r': 2224 case 'r':
2164 *p++ = '\r'; 2225 *p++ = '\r';
2165 state = st_ok; 2226 state = st_ok;
2166 break; 2227 break;
2167 2228
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2229 default:
2174 *p++ = c; 2230 *p++ = c;
2175 state = st_ok; 2231 state = st_ok;
2176 break; 2232 break;
2177 } 2233 }
2178 2234
2179 break; 2235 break;
2180 2236
2181 case st_x1: 2237 case st_x1:
2182 case st_x2: 2238 case st_x2:
2183 c = toupper (c); 2239 c = tolower (c);
2184 2240
2185 if (c >= '0' && c <= 'F') 2241 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2242 c1 = (c1 << 4) + c - '0';
2189 else 2243 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2244 c1 = (c1 << 4) + c - 'a' + 10;
2191
2192 if (state == st_x1)
2193 state = st_x2;
2194 else
2195 {
2196 *p++ = c1;
2197 state = st_ok;
2198 }
2199 }
2200 else 2245 else
2201 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 }
2202 2255
2203 break; 2256 break;
2204 2257
2205 case st_oct1: 2258 case st_oct1:
2206 case st_oct2: 2259 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2263 backchar (SCHEME_A_ c);
2211 state = st_ok; 2264 state = st_ok;
2212 } 2265 }
2213 else 2266 else
2214 { 2267 {
2215 if (state == st_oct2 && c1 >= 32) 2268 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2269 return S_F;
2217 2270
2218 c1 = (c1 << 3) + (c - '0'); 2271 c1 = (c1 << 3) + (c - '0');
2219 2272
2220 if (state == st_oct1) 2273 if (state == st_oct1)
… …
2225 state = st_ok; 2278 state = st_ok;
2226 } 2279 }
2227 } 2280 }
2228 2281
2229 break; 2282 break;
2230
2231 } 2283 }
2232 } 2284 }
2233} 2285}
2234 2286
2235/* check c is in chars */ 2287/* check c is in chars */
2236static INLINE int 2288ecb_inline int
2237is_one_of (char *s, int c) 2289is_one_of (const char *s, int c)
2238{ 2290{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2243} 2292}
2244 2293
2245/* skip white characters */ 2294/* skip white characters */
2246static INLINE int 2295ecb_inline int
2247skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2248{ 2297{
2249 int c, curr_line = 0; 2298 int c, curr_line = 0;
2250 2299
2251 do 2300 do
2252 { 2301 {
2253 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2254#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2255 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2256 curr_line++; 2306 curr_line++;
2257#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2258 } 2311 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2260 2313
2261 /* record it */ 2314 /* record it */
2262#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2263 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)
2264 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;
2265#endif 2318#endif
2266 2319
2267 if (c != EOF)
2268 {
2269 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2270 return 1; 2321 return 1;
2271 }
2272 else
2273 return EOF;
2274} 2322}
2275 2323
2276/* get token */ 2324/* get token */
2277static int 2325static int
2278token (SCHEME_P) 2326token (SCHEME_P)
… …
2294 return TOK_RPAREN; 2342 return TOK_RPAREN;
2295 2343
2296 case '.': 2344 case '.':
2297 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2298 2346
2299 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2348 return TOK_DOT;
2301 else 2349 else
2302 { 2350 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2352 return TOK_DOTATOM;
2307 } 2353 }
2354
2355 case '|':
2356 return TOK_STRATOM;
2308 2357
2309 case '\'': 2358 case '\'':
2310 return TOK_QUOTE; 2359 return TOK_QUOTE;
2311 2360
2312 case ';': 2361 case ';':
… …
2444 } 2493 }
2445 2494
2446 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2447} 2496}
2448 2497
2449
2450/* print atoms */ 2498/* print atoms */
2451static void 2499static void
2452printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2453{ 2501{
2454 char *p; 2502 char *p;
2455 int len; 2503 int len;
2456 2504
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2459} 2507}
2460
2461 2508
2462/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2463static void 2510static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2512{
… …
2479 { 2526 {
2480 p = SCHEME_V->strbuff; 2527 p = SCHEME_V->strbuff;
2481 2528
2482 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 */
2483 { 2530 {
2484 if (num_is_integer (l)) 2531 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2532 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2533#if USE_REAL
2487 else 2534 else
2488 { 2535 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2536 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2673#endif
2627 } 2674 }
2628 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2630 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2631 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2632 2686
2633 *pp = p; 2687 *pp = p;
2634 *plen = strlen (p); 2688 *plen = strlen (p);
2635} 2689}
2636 2690
… …
2744 return 0; 2798 return 0;
2745 } 2799 }
2746 else if (is_number (a)) 2800 else if (is_number (a))
2747 { 2801 {
2748 if (is_number (b)) 2802 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2803 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2804
2752 return 0; 2805 return 0;
2753 } 2806 }
2754 else if (is_character (a)) 2807 else if (is_character (a))
2755 { 2808 {
… …
2781/* () is #t in R5RS */ 2834/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2835#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2836#define is_false(p) ((p) == S_F)
2784 2837
2785/* ========== Environment implementation ========== */ 2838/* ========== Environment implementation ========== */
2786
2787#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2788
2789static int
2790hash_fn (const char *key, int table_size)
2791{
2792 const unsigned char *p = key;
2793 uint32_t hash = 2166136261;
2794
2795 while (*p)
2796 hash = (hash ^ *p++) * 16777619;
2797
2798 return hash % table_size;
2799}
2800#endif
2801 2839
2802#ifndef USE_ALIST_ENV 2840#ifndef USE_ALIST_ENV
2803 2841
2804/* 2842/*
2805 * In this implementation, each frame of the environment may be 2843 * In this implementation, each frame of the environment may be
… …
2822 2860
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2861 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2862 setenvironment (SCHEME_V->envir);
2825} 2863}
2826 2864
2827static 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
2828new_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)
2829{ 2882{
2830 pointer slot = immutable_cons (variable, value); 2883 pointer slot = immutable_cons (variable, value);
2831 2884
2832 if (is_vector (car (env))) 2885 if (is_vector (car (env)))
2833 { 2886 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2887 int location = sym_hash (variable, veclength (car (env)));
2835
2836 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)));
2837 } 2889 }
2838 else 2890 else
2839 set_car (env, immutable_cons (slot, car (env))); 2891 set_car (env, immutable_cons (slot, car (env)));
2840} 2892}
2841 2893
2842static pointer 2894static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2896{
2845 pointer x, y; 2897 pointer x, y;
2846 int location;
2847 2898
2848 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
2849 { 2900 {
2850 if (is_vector (car (x))) 2901 if (is_vector (car (x)))
2851 { 2902 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2903 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2904 y = vector_get (car (x), location);
2854 } 2905 }
2855 else 2906 else
2856 y = car (x); 2907 y = car (x);
2857 2908
2858 for (; y != NIL; y = cdr (y)) 2909 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2910 if (caar (y) == hdl)
2860 break; 2911 break;
2861 2912
2862 if (y != NIL) 2913 if (y != NIL)
2914 return car (y);
2915
2916 if (!all)
2863 break; 2917 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2918 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2919
2872 return NIL; 2920 return NIL;
2873} 2921}
2874 2922
2875#else /* USE_ALIST_ENV */ 2923#else /* USE_ALIST_ENV */
2876 2924
2877static INLINE void 2925ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2926new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2927{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2928 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2929 setenvironment (SCHEME_V->envir);
2882} 2930}
2883 2931
2884static INLINE void 2932ecb_inline void
2885new_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)
2886{ 2934{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2936}
2889 2937
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2945 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2946 if (caar (y) == hdl)
2899 break; 2947 break;
2900 2948
2901 if (y != NIL) 2949 if (y != NIL)
2950 return car (y);
2902 break; 2951 break;
2903 2952
2904 if (!all) 2953 if (!all)
2905 return NIL; 2954 break;
2906 } 2955 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2956
2911 return NIL; 2957 return NIL;
2912} 2958}
2913 2959
2914#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2915 2961
2916static INLINE void 2962ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 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);
2920} 2967}
2921 2968
2922static INLINE void 2969ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2971{
2925 set_cdr (slot, value); 2972 set_cdr (slot, value);
2926} 2973}
2927 2974
2928static INLINE pointer 2975ecb_inline pointer
2929slot_value_in_env (pointer slot) 2976slot_value_in_env (pointer slot)
2930{ 2977{
2931 return cdr (slot); 2978 return cdr (slot);
2932} 2979}
2933 2980
2934/* ========== Evaluation Cycle ========== */ 2981/* ========== Evaluation Cycle ========== */
2935 2982
2936static pointer 2983static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2984xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2985{
2939#if USE_ERROR_HOOK 2986#if USE_ERROR_HOOK
2940 pointer x; 2987 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2988 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3023 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3024 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3025 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3026 SCHEME_V->op = OP_EVAL;
2980 3027
2981 return S_T; 3028 return 0;
2982 } 3029 }
2983#endif 3030#endif
2984 3031
2985 if (a) 3032 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3033 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3035 SCHEME_V->args = NIL;
2989 3036
2990 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);
2991 setimmutable (car (SCHEME_V->args)); 3038 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3039 SCHEME_V->op = OP_ERR0;
3040
2993 return S_T; 3041 return 0;
2994} 3042}
2995 3043
2996#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)
2997#define Error_0(s) Error_1 (s, 0) 3045#define Error_0(s) Error_1 (s, 0)
2998 3046
2999/* Too small to turn into function */ 3047/* Too small to turn into function */
3000#define BEGIN do { 3048#define BEGIN do {
3001#define END } while (0) 3049#define END } while (0)
3002#define s_goto(a) BEGIN \ 3050#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3051 SCHEME_V->op = a; \
3004 return S_T; END 3052 return 0; END
3005 3053
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3054#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3055
3008#ifndef USE_SCHEME_STACK 3056#ifndef USE_SCHEME_STACK
3009 3057
… …
3023{ 3071{
3024 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3025 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3026 3074
3027 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3028 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3029 { 3077 {
3030 SCHEME_V->dump_size += STACK_GROWTH; 3078 SCHEME_V->dump_size += STACK_GROWTH;
3031 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);
3032 } 3080 }
3033 3081
… …
3039 next_frame->code = code; 3087 next_frame->code = code;
3040 3088
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3089 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3090}
3043 3091
3044static pointer 3092static int
3045xs_return (SCHEME_P_ pointer a) 3093xs_return (SCHEME_P_ pointer a)
3046{ 3094{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3096 struct dump_stack_frame *frame;
3049 3097
3050 SCHEME_V->value = a; 3098 SCHEME_V->value = a;
3051 3099
3052 if (nframes <= 0) 3100 if (nframes <= 0)
3053 return NIL; 3101 return -1;
3054 3102
3055 frame = &SCHEME_V->dump_base[--nframes]; 3103 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3104 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3105 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3106 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3107 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3109
3062 return S_T; 3110 return 0;
3063} 3111}
3064 3112
3065static INLINE void 3113ecb_inline void
3066dump_stack_reset (SCHEME_P) 3114dump_stack_reset (SCHEME_P)
3067{ 3115{
3068 /* 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 */
3069 SCHEME_V->dump = (pointer)+0; 3117 SCHEME_V->dump = (pointer)+0;
3070} 3118}
3071 3119
3072static INLINE void 3120ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3121dump_stack_initialize (SCHEME_P)
3074{ 3122{
3075 SCHEME_V->dump_size = 0; 3123 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3124 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3125 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3178 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3179 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3180
3133 while (cont != NIL) 3181 while (cont != NIL)
3134 { 3182 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3183 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3184 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3185 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3186 frame->code = car (cont) ; cont = cdr (cont);
3139 3187
3140 ++frame; 3188 ++frame;
3141 ++i; 3189 ++i;
3142 } 3190 }
3143 3191
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3192 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3193}
3146 3194
3147#else 3195#else
3148 3196
3149static INLINE void 3197ecb_inline void
3150dump_stack_reset (SCHEME_P) 3198dump_stack_reset (SCHEME_P)
3151{ 3199{
3152 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3153} 3201}
3154 3202
3155static INLINE void 3203ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3204dump_stack_initialize (SCHEME_P)
3157{ 3205{
3158 dump_stack_reset (SCHEME_A); 3206 dump_stack_reset (SCHEME_A);
3159} 3207}
3160 3208
… …
3162dump_stack_free (SCHEME_P) 3210dump_stack_free (SCHEME_P)
3163{ 3211{
3164 SCHEME_V->dump = NIL; 3212 SCHEME_V->dump = NIL;
3165} 3213}
3166 3214
3167static pointer 3215static int
3168xs_return (SCHEME_P_ pointer a) 3216xs_return (SCHEME_P_ pointer a)
3169{ 3217{
3170 pointer dump = SCHEME_V->dump; 3218 pointer dump = SCHEME_V->dump;
3171 3219
3172 SCHEME_V->value = a; 3220 SCHEME_V->value = a;
3173 3221
3174 if (dump == NIL) 3222 if (dump == NIL)
3175 return NIL; 3223 return -1;
3176 3224
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3225 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3226 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3227 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3228 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3229
3182 SCHEME_V->dump = dump; 3230 SCHEME_V->dump = dump;
3183 3231
3184 return S_T; 3232 return 0;
3185} 3233}
3186 3234
3187static void 3235static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3236s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3237{
… …
3214 3262
3215#endif 3263#endif
3216 3264
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3266
3267#if EXPERIMENT
3219static 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
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3327{
3222 pointer args = SCHEME_V->args; 3328 pointer args = SCHEME_V->args;
3223 pointer x, y; 3329 pointer x, y;
3224 3330
3225 switch (op) 3331 switch (op)
3226 { 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
3227 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3229 { 3341 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3342 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3343 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3232 } 3344 }
3233 3345
3234 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3235 Error_1 ("unable to open", car (args)); 3347 Error_1 ("unable to open", car (args));
3236 else 3348 else
… …
3240 } 3352 }
3241 3353
3242 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3243 3355
3244 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3245 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3246 { 3358 {
3247 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3248 { 3360 {
3249 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3250 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
… …
3328#endif 3440#endif
3329 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3330 { 3442 {
3331 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);
3332 3444
3333 if (x != NIL) 3445 if (x == NIL)
3334 s_return (slot_value_in_env (x));
3335 else
3336 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));
3337 } 3449 }
3338 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3339 { 3451 {
3340 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3341 3453
… …
3354 } 3466 }
3355 else 3467 else
3356 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3357 3469
3358 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3472 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
… …
3391 3503
3392 case OP_TRACING: 3504 case OP_TRACING:
3393 { 3505 {
3394 int tr = SCHEME_V->tracing; 3506 int tr = SCHEME_V->tracing;
3395 3507
3396 SCHEME_V->tracing = ivalue (car (args)); 3508 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3509 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3510 }
3399 3511
3400#endif 3512#endif
3401 3513
… …
3413 /* fall through */ 3525 /* fall through */
3414 3526
3415 case OP_REAL_APPLY: 3527 case OP_REAL_APPLY:
3416#endif 3528#endif
3417 if (is_proc (SCHEME_V->code)) 3529 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3531 else if (is_foreign (SCHEME_V->code))
3422 { 3532 {
3423 /* Keep nested calls from GC'ing the arglist */ 3533 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3534 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3535 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426 3536
3427 s_return (x); 3537 s_return (x);
3428 } 3538 }
3429 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 */
3430 { 3540 {
… …
3467 3577
3468 case OP_DOMACRO: /* do macro */ 3578 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3579 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3580 s_goto (OP_EVAL);
3471 3581
3472#if 1
3473
3474 case OP_LAMBDA: /* lambda */ 3582 case OP_LAMBDA: /* lambda */
3475 /* 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
3476 set SCHEME_V->value fall thru */ 3584 set SCHEME_V->value fall thru */
3477 { 3585 {
3478 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);
… …
3484 SCHEME_V->code = slot_value_in_env (f); 3592 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3593 s_goto (OP_APPLY);
3486 } 3594 }
3487 3595
3488 SCHEME_V->value = SCHEME_V->code; 3596 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3597 }
3598 /* Fallthru */
3491 3599
3492 case OP_LAMBDA1: 3600 case OP_LAMBDA1:
3493 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));
3494
3495#else
3496
3497 case OP_LAMBDA: /* lambda */
3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3499
3500#endif
3501 3602
3502 case OP_MKCLOSURE: /* make-closure */ 3603 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3604 x = car (args);
3504 3605
3505 if (car (x) == SCHEME_V->LAMBDA) 3606 if (car (x) == SCHEME_V->LAMBDA)
… …
3592 3693
3593 case OP_IF1: /* if */ 3694 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3695 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3696 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3697 else
3597 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 */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3699 s_goto (OP_EVAL);
3601 3700
3602 case OP_LET0: /* let */ 3701 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3702 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3703 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (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 args = SCHEME_V->args; 4024 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 4025 pointer x = car (args);
3927 num v; 4026 num v;
3928 4027
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 4028 switch (op)
3934 { 4029 {
3935#if USE_MATH 4030#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 4031 case OP_INEX2EX: /* inexact->exact */
4032 {
3937 if (num_is_integer (x)) 4033 if (is_integer (x))
3938 s_return (x); 4034 s_return (x);
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 4035
4036 RVALUE r = rvalue_unchecked (x);
4037
4038 if (r == (RVALUE)(IVALUE)r)
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3941 else 4040 else
3942 Error_1 ("inexact->exact: not integral:", x); 4041 Error_1 ("inexact->exact: not integral:", x);
4042 }
3943 4043
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4044 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4045 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4046 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4047 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3965 { 4065 {
3966 RVALUE result; 4066 RVALUE result;
3967 int real_result = 1; 4067 int real_result = 1;
3968 pointer y = cadr (args); 4068 pointer y = cadr (args);
3969 4069
3970 if (num_is_integer (x) && num_is_integer (y)) 4070 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 4071 real_result = 0;
3972 4072
3973 /* This 'if' is an R5RS compatibility fix. */ 4073 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 4074 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 4075 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4081 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4082 if (!real_result)
3983 { 4083 {
3984 long result_as_long = result; 4084 long result_as_long = result;
3985 4085
3986 if (result != (RVALUE) result_as_long) 4086 if (result != result_as_long)
3987 real_result = 1; 4087 real_result = 1;
3988 } 4088 }
3989 4089
3990 if (real_result) 4090 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4091 s_return (mk_real (SCHEME_A_ result));
… …
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4096 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4097 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998 4098
3999 case OP_TRUNCATE: 4099 case OP_TRUNCATE:
4000 { 4100 {
4001 RVALUE rvalue_of_x; 4101 RVALUE n = rvalue (x);
4002
4003 rvalue_of_x = rvalue (x);
4004
4005 if (rvalue_of_x > 0)
4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4007 else
4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4009 } 4103 }
4010 4104
4011 case OP_ROUND: 4105 case OP_ROUND:
4012 if (num_is_integer (x)) 4106 if (is_integer (x))
4013 s_return (x); 4107 s_return (x);
4014 4108
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4110#endif
4017 4111
4018 case OP_ADD: /* + */ 4112 case OP_ADD: /* + */
4019 v = num_zero; 4113 v = num_zero;
4020 4114
4021 for (x = args; x != NIL; x = cdr (x)) 4115 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4116 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4117
4024 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4025 4119
4026 case OP_MUL: /* * */ 4120 case OP_MUL: /* * */
4027 v = num_one; 4121 v = num_one;
4028 4122
4029 for (x = args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4124 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4125
4032 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4033 4127
4034 case OP_SUB: /* - */ 4128 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4129 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4136 x = cdr (args);
4043 v = nvalue (car (args)); 4137 v = nvalue (car (args));
4044 } 4138 }
4045 4139
4046 for (; x != NIL; x = cdr (x)) 4140 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4141 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4142
4049 s_return (mk_number (SCHEME_A_ v)); 4143 s_return (mk_number (SCHEME_A_ v));
4050 4144
4051 case OP_DIV: /* / */ 4145 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4146 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4153 x = cdr (args);
4060 v = nvalue (car (args)); 4154 v = nvalue (car (args));
4061 } 4155 }
4062 4156
4063 for (; x != NIL; x = cdr (x)) 4157 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4158 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4159 v = num_div (v, nvalue (car (x)));
4067 else 4160 else
4068 Error_0 ("/: division by zero"); 4161 Error_0 ("/: division by zero");
4069 }
4070 4162
4071 s_return (mk_number (SCHEME_A_ v)); 4163 s_return (mk_number (SCHEME_A_ v));
4072 4164
4073 case OP_INTDIV: /* quotient */ 4165 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4166 if (cdr (args) == NIL)
… …
4083 } 4175 }
4084 4176
4085 for (; x != NIL; x = cdr (x)) 4177 for (; x != NIL; x = cdr (x))
4086 { 4178 {
4087 if (ivalue (car (x)) != 0) 4179 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4180 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4181 else
4090 Error_0 ("quotient: division by zero"); 4182 Error_0 ("quotient: division by zero");
4091 } 4183 }
4092 4184
4093 s_return (mk_number (SCHEME_A_ v)); 4185 s_return (mk_number (SCHEME_A_ v));
… …
4110 else 4202 else
4111 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4112 4204
4113 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4114 4206
4115 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4116 s_return (caar (args)); 4208 case OP_CAR: op_car: s_return (car (x));
4117 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4118 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4119 s_return (cdar (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;
4120 4238
4121 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4122 set_cdr (args, cadr (args)); 4240 set_cdr (args, cadr (args));
4123 s_return (args); 4241 s_return (args);
4124 4242
… …
4139 } 4257 }
4140 else 4258 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4259 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4260
4143 case OP_CHAR2INT: /* char->integer */ 4261 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4262 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4263
4146 case OP_INT2CHAR: /* integer->char */ 4264 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4265 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4266
4149 case OP_CHARUPCASE: 4267 case OP_CHARUPCASE:
4150 { 4268 {
4151 unsigned char c = ivalue (x); 4269 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4270 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4271 s_return (mk_character (SCHEME_A_ c));
4154 } 4272 }
4155 4273
4156 case OP_CHARDNCASE: 4274 case OP_CHARDNCASE:
4157 { 4275 {
4158 unsigned char c = ivalue (x); 4276 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4277 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4278 s_return (mk_character (SCHEME_A_ c));
4161 } 4279 }
4162 4280
4163 case OP_STR2SYM: /* string->symbol */ 4281 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4358 Error_1 ("atom->string: not an atom:", x);
4241 } 4359 }
4242 4360
4243 case OP_MKSTRING: /* make-string */ 4361 case OP_MKSTRING: /* make-string */
4244 { 4362 {
4245 int fill = ' '; 4363 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4364 int len = ivalue_unchecked (x);
4249
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252 4365
4253 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4366 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4367 }
4255 4368
4256 case OP_STRLEN: /* string-length */ 4369 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4370 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4371
4259 case OP_STRREF: /* string-ref */ 4372 case OP_STRREF: /* string-ref */
4260 { 4373 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4374 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4375 int index = ivalue_unchecked (cadr (args));
4267 4376
4268 if (index >= strlength (x)) 4377 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4378 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4379
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4380 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4381 }
4273 4382
4274 case OP_STRSET: /* string-set! */ 4383 case OP_STRSET: /* string-set! */
4275 { 4384 {
4276 char *str; 4385 char *str = strvalue (x);
4277 int index; 4386 int index = ivalue_unchecked (cadr (args));
4278 int c; 4387 int c;
4279 4388
4280 if (is_immutable (x)) 4389 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4390 Error_1 ("string-set!: unable to alter immutable string:", x);
4282
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286 4391
4287 if (index >= strlength (x)) 4392 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4393 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4394
4290 c = charvalue (caddr (args)); 4395 c = charvalue (caddr (args));
… …
4313 s_return (newstr); 4418 s_return (newstr);
4314 } 4419 }
4315 4420
4316 case OP_SUBSTR: /* substring */ 4421 case OP_SUBSTR: /* substring */
4317 { 4422 {
4318 char *str; 4423 char *str = strvalue (x);
4319 int index0; 4424 int index0 = ivalue_unchecked (cadr (args));
4320 int index1; 4425 int index1;
4321 int len; 4426 int len;
4322 4427
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4428 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4429 Error_1 ("substring: start out of bounds:", cadr (args));
4329 4430
4330 if (cddr (args) != NIL) 4431 if (cddr (args) != NIL)
4331 { 4432 {
4332 index1 = ivalue (caddr (args)); 4433 index1 = ivalue_unchecked (caddr (args));
4333 4434
4334 if (index1 > strlength (x) || index1 < index0) 4435 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4436 Error_1 ("substring: end out of bounds:", caddr (args));
4336 } 4437 }
4337 else 4438 else
… …
4360 if (SCHEME_V->no_memory) 4461 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4462 s_return (S_SINK);
4362#endif 4463#endif
4363 4464
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4465 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4466 vector_set (vec, i, car (x));
4366 4467
4367 s_return (vec); 4468 s_return (vec);
4368 } 4469 }
4369 4470
4370 case OP_MKVECTOR: /* make-vector */ 4471 case OP_MKVECTOR: /* make-vector */
4371 { 4472 {
4372 pointer fill = NIL; 4473 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4474 pointer vec;
4375
4376 len = ivalue (x); 4475 int len = ivalue_unchecked (x);
4377 4476
4378 if (cdr (args) != NIL) 4477 if (cdr (args) != NIL)
4379 fill = cadr (args); 4478 fill = cadr (args);
4380 4479
4381 vec = mk_vector (SCHEME_A_ len); 4480 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4483 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4484 s_return (S_SINK);
4386#endif 4485#endif
4387 4486
4388 if (fill != NIL) 4487 if (fill != NIL)
4389 fill_vector (vec, fill); 4488 fill_vector (vec, 0, fill);
4390 4489
4391 s_return (vec); 4490 s_return (vec);
4392 } 4491 }
4393 4492
4394 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4494 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4495
4496 case OP_VECRESIZE:
4497 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4498 s_return (x);
4499
4397 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4398 { 4501 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4502 int index = ivalue_unchecked (cadr (args));
4402 4503
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4505 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4506
4406 s_return (vector_elem (x, index)); 4507 s_return (vector_get (x, index));
4407 } 4508 }
4408 4509
4409 case OP_VECSET: /* vector-set! */ 4510 case OP_VECSET: /* vector-set! */
4410 { 4511 {
4411 int index; 4512 int index = ivalue_unchecked (cadr (args));
4412 4513
4413 if (is_immutable (x)) 4514 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4515 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4516
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4517 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4518 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4519
4421 set_vector_elem (x, index, caddr (args)); 4520 vector_set (x, index, caddr (args));
4422 s_return (x); 4521 s_return (x);
4423 } 4522 }
4424 } 4523 }
4425 4524
4426 return S_T; 4525 if (USE_ERROR_CHECKING) abort ();
4427} 4526}
4428 4527
4429INTERFACE int
4430is_list (SCHEME_P_ pointer a)
4431{
4432 return list_length (SCHEME_A_ a) >= 0;
4433}
4434
4435/* Result is:
4436 proper list: length
4437 circular list: -1
4438 not even a pair: -2
4439 dotted list: -2 minus length before dot
4440*/
4441INTERFACE int
4442list_length (SCHEME_P_ pointer a)
4443{
4444 int i = 0;
4445 pointer slow, fast;
4446
4447 slow = fast = a;
4448
4449 while (1)
4450 {
4451 if (fast == NIL)
4452 return i;
4453
4454 if (!is_pair (fast))
4455 return -2 - i;
4456
4457 fast = cdr (fast);
4458 ++i;
4459
4460 if (fast == NIL)
4461 return i;
4462
4463 if (!is_pair (fast))
4464 return -2 - i;
4465
4466 ++i;
4467 fast = cdr (fast);
4468
4469 /* Safe because we would have already returned if `fast'
4470 encountered a non-pair. */
4471 slow = cdr (slow);
4472
4473 if (fast == slow)
4474 {
4475 /* the fast pointer has looped back around and caught up
4476 with the slow pointer, hence the structure is circular,
4477 not of finite length, and therefore not a list */
4478 return -1;
4479 }
4480 }
4481}
4482
4483static pointer 4528static int
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4529opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4530{
4486 pointer x = SCHEME_V->args; 4531 pointer x = SCHEME_V->args;
4487 4532
4488 for (;;) 4533 for (;;)
4489 { 4534 {
… …
4509 } 4554 }
4510 4555
4511 s_return (S_T); 4556 s_return (S_T);
4512} 4557}
4513 4558
4514static pointer 4559static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4560opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4561{
4517 pointer args = SCHEME_V->args; 4562 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4563 pointer a = car (args);
4519 pointer d = cdr (args); 4564 pointer d = cdr (args);
4520 int r; 4565 int r;
4521 4566
4522 switch (op) 4567 switch (op)
4523 { 4568 {
4524 case OP_NOT: /* not */ r = is_false (a) ; break; 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4570 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break; 4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4573 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4574 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4578 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4580
4535#if USE_CHAR_CLASSIFIERS 4581#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4585 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4586 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4587#endif
4542 4588
4543#if USE_PORTS 4589#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4590 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4591 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4611 }
4566 4612
4567 s_retbool (r); 4613 s_retbool (r);
4568} 4614}
4569 4615
4570static pointer 4616static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4617opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4618{
4573 pointer args = SCHEME_V->args; 4619 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4620 pointer a = car (args);
4575 pointer x, y; 4621 pointer x, y;
… …
4588 } 4634 }
4589 else 4635 else
4590 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4591 4637
4592 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4593 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4594 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4595 4641
4596#if USE_PORTS 4642#if USE_PORTS
4597 4643
4598 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
… …
4661 putstr (SCHEME_A_ "\n"); 4707 putstr (SCHEME_A_ "\n");
4662 4708
4663 if (SCHEME_V->interactive_repl) 4709 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4710 s_goto (OP_T0LVL);
4665 else 4711 else
4666 return NIL; 4712 return -1;
4667 } 4713 }
4668 4714
4669 case OP_REVERSE: /* reverse */ 4715 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4716 s_return (reverse (SCHEME_A_ a));
4671 4717
… …
4728 4774
4729 case OP_QUIT: /* quit */ 4775 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4776 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4777 SCHEME_V->retcode = ivalue (a);
4732 4778
4733 return NIL; 4779 return -1;
4734 4780
4735 case OP_GC: /* gc */ 4781 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4782 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4783 s_return (S_T);
4738 4784
… …
4743 SCHEME_V->gc_verbose = (a != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4744 s_retbool (was); 4790 s_retbool (was);
4745 } 4791 }
4746 4792
4747 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4748 if (!is_pair (args) || !is_number (a)) 4795 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4750 4797#endif
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4752
4753 s_return (S_T);
4754 4799
4755 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4757 4802
4758#if USE_PORTS 4803#if USE_PORTS
… …
4785 break; 4830 break;
4786 } 4831 }
4787 4832
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4833 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4834
4790 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4836 }
4795 4837
4796# if USE_STRING_PORTS 4838# if USE_STRING_PORTS
4797 4839
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4840 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4855 }
4814 4856
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4857 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4858 strvalue (a) + strlength (a), prop);
4817 4859
4818 if (p == NIL) 4860 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4861 }
4823 4862
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4863 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4864 {
4826 pointer p; 4865 pointer p;
4827 4866
4828 if (a == NIL) 4867 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4868 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4869 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4870 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4871 strvalue (a) + strlength (a), port_output);
4839 4872
4840 if (p == NIL) 4873 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4874 }
4846 4875
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4877 {
4849 port *p; 4878 port *p = port (a);
4850 4879
4851 if ((p = a->object.port)->kind & port_string) 4880 if (p->kind & port_string)
4852 { 4881 {
4853 off_t size; 4882 off_t size;
4854 char *str; 4883 char *str;
4855 4884
4856 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4917 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4918 s_return (SCHEME_V->envir);
4890 4919
4891 } 4920 }
4892 4921
4893 abort (); 4922 if (USE_ERROR_CHECKING) abort ();
4894} 4923}
4895 4924
4896static pointer 4925static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4926opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4927{
4928 pointer args = SCHEME_V->args;
4899 pointer x; 4929 pointer x;
4900 4930
4901 if (SCHEME_V->nesting != 0) 4931 if (SCHEME_V->nesting != 0)
4902 { 4932 {
4903 int n = SCHEME_V->nesting; 4933 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4940 switch (op)
4911 { 4941 {
4912 /* ========== reading part ========== */ 4942 /* ========== reading part ========== */
4913#if USE_PORTS 4943#if USE_PORTS
4914 case OP_READ: 4944 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4945 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4946 s_goto (OP_READ_INTERNAL);
4917 4947
4918 if (!is_inport (car (SCHEME_V->args))) 4948 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4949 Error_1 ("read: not an input port:", car (args));
4920 4950
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4951 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
4923 4953
4924 x = SCHEME_V->inport; 4954 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4955 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4956 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4957 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
4929 4959
4930 case OP_READ_CHAR: /* read-char */ 4960 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4961 case OP_PEEK_CHAR: /* peek-char */
4932 { 4962 {
4933 int c; 4963 int c;
4934 4964
4935 if (is_pair (SCHEME_V->args)) 4965 if (is_pair (args))
4936 { 4966 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4967 if (car (args) != SCHEME_V->inport)
4938 { 4968 {
4939 x = SCHEME_V->inport; 4969 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4970 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4971 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4972 SCHEME_V->inport = car (args);
4943 } 4973 }
4944 } 4974 }
4945 4975
4946 c = inchar (SCHEME_A); 4976 c = inchar (SCHEME_A);
4947 4977
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4987 case OP_CHAR_READY: /* char-ready? */
4958 { 4988 {
4959 pointer p = SCHEME_V->inport; 4989 pointer p = SCHEME_V->inport;
4960 int res; 4990 int res;
4961 4991
4962 if (is_pair (SCHEME_V->args)) 4992 if (is_pair (args))
4963 p = car (SCHEME_V->args); 4993 p = car (args);
4964 4994
4965 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
4966 4996
4967 s_retbool (res); 4997 s_retbool (res);
4968 } 4998 }
4969 4999
4970 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 5001 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 5002 s_return (SCHEME_V->value);
4973 5003
4974 case OP_SET_OUTPORT: /* set-output-port */ 5004 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 5005 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 5006 s_return (SCHEME_V->value);
4977#endif 5007#endif
4978 5008
4979 case OP_RDSEXPR: 5009 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 5010 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5059 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 5060 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 5061 s_goto (OP_RDSEXPR);
5032 5062
5033 case TOK_ATOM: 5063 case TOK_ATOM:
5034 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)));
5035 5074
5036 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 5076 x = readstrexp (SCHEME_A_ '"');
5038 5077
5039 if (x == S_F) 5078 if (x == S_F)
5040 Error_0 ("Error reading string"); 5079 Error_0 ("Error reading string");
5041 5080
5042 setimmutable (x); 5081 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 5093 s_goto (OP_EVAL);
5055 } 5094 }
5056 } 5095 }
5057 5096
5058 case TOK_SHARP_CONST: 5097 case TOK_SHARP_CONST:
5059 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)
5060 Error_0 ("undefined sharp expression"); 5099 Error_0 ("undefined sharp expression");
5061 else 5100 else
5062 s_return (x); 5101 s_return (x);
5063 5102
5064 default: 5103 default:
… …
5066 } 5105 }
5067 5106
5068 break; 5107 break;
5069 5108
5070 case OP_RDLIST: 5109 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5110 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5111 SCHEME_V->tok = token (SCHEME_A);
5073 5112
5074 switch (SCHEME_V->tok) 5113 switch (SCHEME_V->tok)
5075 { 5114 {
5076 case TOK_EOF: 5115 case TOK_EOF:
… …
5104 case OP_RDDOT: 5143 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5144 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5145 Error_0 ("syntax error: illegal dot expression");
5107 5146
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5147 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 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));
5110 5149
5111 case OP_RDQUOTE: 5150 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5151 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5152
5114 case OP_RDQQUOTE: 5153 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5175 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5176 s_goto (OP_VECTOR);
5138 5177
5139 /* ========== printing part ========== */ 5178 /* ========== printing part ========== */
5140 case OP_P0LIST: 5179 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5180 if (is_vector (args))
5142 { 5181 {
5143 putstr (SCHEME_A_ "#("); 5182 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5183 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5184 s_goto (OP_PVECFROM);
5146 } 5185 }
5147 else if (is_environment (SCHEME_V->args)) 5186 else if (is_environment (args))
5148 { 5187 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5188 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5189 s_return (S_T);
5151 } 5190 }
5152 else if (!is_pair (SCHEME_V->args)) 5191 else if (!is_pair (args))
5153 { 5192 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5193 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5194 s_return (S_T);
5156 } 5195 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5196 else
5158 { 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)
5159 putstr (SCHEME_A_ "'"); 5204 putstr (SCHEME_A_ "'");
5160 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
5161 s_goto (OP_P0LIST); 5218 s_goto (OP_P0LIST);
5162 } 5219 }
5163 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))
5164 { 5223 {
5224 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5225 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5226 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5168 } 5228 }
5169 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5170 {
5171 putstr (SCHEME_A_ ",");
5172 SCHEME_V->args = cadr (SCHEME_V->args);
5173 s_goto (OP_P0LIST);
5174 }
5175 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5176 {
5177 putstr (SCHEME_A_ ",@");
5178 SCHEME_V->args = cadr (SCHEME_V->args);
5179 s_goto (OP_P0LIST);
5180 }
5181 else
5182 {
5183 putstr (SCHEME_A_ "(");
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5185 SCHEME_V->args = car (SCHEME_V->args);
5186 s_goto (OP_P0LIST);
5187 }
5188
5189 case OP_P1LIST:
5190 if (is_pair (SCHEME_V->args))
5191 {
5192 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5193 putstr (SCHEME_A_ " ");
5194 SCHEME_V->args = car (SCHEME_V->args);
5195 s_goto (OP_P0LIST);
5196 }
5197 else if (is_vector (SCHEME_V->args)) 5229 else if (is_vector (args))
5198 { 5230 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5231 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5232 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5202 } 5234 }
5203 else 5235 else
5204 { 5236 {
5205 if (SCHEME_V->args != NIL) 5237 if (args != NIL)
5206 { 5238 {
5207 putstr (SCHEME_A_ " . "); 5239 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5240 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5241 }
5210 5242
5211 putstr (SCHEME_A_ ")"); 5243 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5244 s_return (S_T);
5213 } 5245 }
5214 5246
5215 case OP_PVECFROM: 5247 case OP_PVECFROM:
5216 { 5248 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5249 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5250 pointer vec = car (args);
5219 int len = veclength (vec); 5251 int len = veclength (vec);
5220 5252
5221 if (i == len) 5253 if (i == len)
5222 { 5254 {
5223 putstr (SCHEME_A_ ")"); 5255 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5256 s_return (S_T);
5225 } 5257 }
5226 else 5258 else
5227 { 5259 {
5228 pointer elem = vector_elem (vec, i); 5260 pointer elem = vector_get (vec, i);
5229 5261
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5262 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5264 SCHEME_V->args = elem;
5233 5265
5234 if (i > 0) 5266 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5267 putstr (SCHEME_A_ " ");
5236 5268
5237 s_goto (OP_P0LIST); 5269 s_goto (OP_P0LIST);
5238 } 5270 }
5239 } 5271 }
5240 } 5272 }
5241 5273
5242 abort (); 5274 if (USE_ERROR_CHECKING) abort ();
5243} 5275}
5244 5276
5245static pointer 5277static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5278opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5279{
5280 pointer args = SCHEME_V->args;
5281 pointer a = car (args);
5248 pointer x, y; 5282 pointer x, y;
5249 5283
5250 switch (op) 5284 switch (op)
5251 { 5285 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5286 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5287 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5288 long v = list_length (SCHEME_A_ a);
5255 5289
5256 if (v < 0) 5290 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5291 Error_1 ("length: not a list:", a);
5258 5292
5259 s_return (mk_integer (SCHEME_A_ v)); 5293 s_return (mk_integer (SCHEME_A_ v));
5260 } 5294 }
5261 5295
5262 case OP_ASSQ: /* assq *//* a.k */ 5296 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5297 x = a;
5264 5298
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5299 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5300 {
5267 if (!is_pair (car (y))) 5301 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5302 Error_0 ("unable to handle non pair element");
5269 5303
5270 if (x == caar (y)) 5304 if (x == caar (y))
… …
5276 else 5310 else
5277 s_return (S_F); 5311 s_return (S_F);
5278 5312
5279 5313
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5314 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5315 SCHEME_V->args = a;
5282 5316
5283 if (SCHEME_V->args == NIL) 5317 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5318 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5319 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5320 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5291 5325
5292 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5293 /* 5327 /*
5294 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5296 */ 5331 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5332 s_retbool (is_closure (a));
5298 5333
5299 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5335 s_retbool (is_macro (a));
5301 } 5336 }
5302 5337
5303 abort (); 5338 if (USE_ERROR_CHECKING) abort ();
5304} 5339}
5305 5340
5341/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5343
5308typedef int (*test_predicate) (pointer); 5344typedef int (*test_predicate)(pointer);
5309static int 5345static int
5310is_any (pointer p) 5346tst_any (pointer p)
5311{ 5347{
5312 return 1; 5348 return 1;
5313} 5349}
5314 5350
5315static int 5351static int
5316is_nonneg (pointer p) 5352tst_inonneg (pointer p)
5317{ 5353{
5318 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);
5319} 5361}
5320 5362
5321/* Correspond carefully with following defines! */ 5363/* Correspond carefully with following defines! */
5322static struct 5364static struct
5323{ 5365{
5324 test_predicate fct; 5366 test_predicate fct;
5325 const char *kind; 5367 const char *kind;
5326} tests[] = 5368} tests[] = {
5327{ 5369 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5370 { is_string , "string" },
5329 { is_any, 0}, 5371 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5372 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5373 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5374 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5375 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5376 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5377 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5378 { is_character , "character" },
5339 { is_vector, "vector" }, 5379 { is_vector , "vector" },
5340 { is_number, "number" }, 5380 { is_number , "number" },
5341 { is_integer, "integer" }, 5381 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5382 { tst_inonneg , "non-negative integer" }
5343}; 5383};
5344 5384
5345#define TST_NONE 0 5385#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5386#define TST_ANY "\001"
5347#define TST_STRING "\002" 5387#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5388#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5389#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5390#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5391#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5392#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5393#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5394#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5395#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5396#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5397#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5398#define TST_INTEGER "\015"
5359#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}
5360 5427
5361typedef struct 5428typedef struct
5362{ 5429{
5363 dispatch_func func; 5430 uint8_t func;
5364 char *name; 5431 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5432 uint8_t builtin;
5433#if USE_ERROR_CHECKING
5365 int min_arity; 5434 uint8_t min_arity;
5366 int max_arity; 5435 uint8_t max_arity;
5367 char *arg_tests_encoding; 5436 char arg_tests_encoding[3];
5437#endif
5368} op_code_info; 5438} op_code_info;
5369 5439
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5440static const op_code_info dispatch_table[] = {
5373#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
5374#include "opdefines.h" 5446#include "opdefines.h"
5447#undef OP_DEF
5375 {0} 5448 {0}
5376}; 5449};
5377 5450
5378static const char *
5379procname (pointer x)
5380{
5381 int n = procnum (x);
5382 const char *name = dispatch_table[n].name;
5383
5384 if (name == 0)
5385 name = "ILLEGAL!";
5386
5387 return name;
5388}
5389
5390/* kernel of this interpreter */ 5451/* kernel of this interpreter */
5391static void 5452static void ecb_hot
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5454{
5394 SCHEME_V->op = op; 5455 SCHEME_V->op = op;
5395 5456
5396 for (;;) 5457 for (;;)
5397 { 5458 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5459 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5460
5400#if USE_ERROR_CHECKING 5461#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5462 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5463 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5464 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5465 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5466
5407 /* Check number of arguments */ 5467 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5468 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5469 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5470 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 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;
5413 } 5474 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5475 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5476 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5477 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 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;
5419 } 5481 }
5420 5482 else
5421 if (ecb_expect_false (ok))
5422 { 5483 {
5423 if (pcd->arg_tests_encoding) 5484 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5485 {
5425 int i = 0; 5486 int i = 0;
5426 int j; 5487 int j;
5427 const char *t = pcd->arg_tests_encoding; 5488 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5489 pointer arglist = SCHEME_V->args;
5429 5490
5430 do 5491 do
5431 { 5492 {
5432 pointer arg = car (arglist); 5493 pointer arg = car (arglist);
5433 5494
5434 j = (int) t[0]; 5495 j = t[0];
5435 5496
5497 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5498 if (j == TST_LIST[0])
5437 { 5499 {
5438 if (arg != NIL && !is_pair (arg)) 5500 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5501 break;
5440 } 5502 }
5441 else 5503 else
5442 { 5504 {
5443 if (!tests[j].fct (arg)) 5505 if (!tests[j - 1].fct (arg))
5444 break; 5506 break;
5445 } 5507 }
5446 5508
5447 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 */
5448 t++; 5510 t++;
5449 5511
5450 arglist = cdr (arglist); 5512 arglist = cdr (arglist);
5451 i++; 5513 i++;
5452 } 5514 }
5453 while (i < n); 5515 while (i < n);
5454 5516
5455 if (i < n) 5517 if (i < n)
5456 { 5518 {
5457 ok = 0;
5458 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;
5459 } 5522 }
5460 } 5523 }
5461 } 5524 }
5462
5463 if (!ok)
5464 {
5465 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5466 return;
5467
5468 pcd = dispatch_table + SCHEME_V->op;
5469 }
5470 } 5525 }
5471#endif 5526#endif
5472 5527
5473 ok_to_freely_gc (SCHEME_A); 5528 ok_to_freely_gc (SCHEME_A);
5474 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
5475 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))
5476 return; 5541 return;
5477 5542
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5544 {
5480 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5481 return; 5546 return;
5482 } 5547 }
5483 } 5548 }
5484} 5549}
5485 5550
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5569mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5570{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5571 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5572 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5573 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5574 return y;
5511} 5575}
5512 5576
5513/* 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! */
5514static int 5578static int
5515syntaxnum (pointer p) 5579syntaxnum (pointer p)
5516{ 5580{
5517 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5518 5582
5519 switch (strlength (car (p))) 5583 switch (strlength (p))
5520 { 5584 {
5521 case 2: 5585 case 2:
5522 if (s[0] == 'i') 5586 if (s[0] == 'i')
5523 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5524 else 5588 else
… …
5579 return OP_C0STREAM; /* cons-stream */ 5643 return OP_C0STREAM; /* cons-stream */
5580 } 5644 }
5581} 5645}
5582 5646
5583#if USE_MULTIPLICITY 5647#if USE_MULTIPLICITY
5584scheme * 5648ecb_cold scheme *
5585scheme_init_new () 5649scheme_init_new ()
5586{ 5650{
5587 scheme *sc = malloc (sizeof (scheme)); 5651 scheme *sc = malloc (sizeof (scheme));
5588 5652
5589 if (!scheme_init (SCHEME_A)) 5653 if (!scheme_init (SCHEME_A))
… …
5594 else 5658 else
5595 return sc; 5659 return sc;
5596} 5660}
5597#endif 5661#endif
5598 5662
5599int 5663ecb_cold int
5600scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5601{ 5665{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 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));
5604 5674
5605 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5606 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5607 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5608 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
… …
5620 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5621 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5622 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5623 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5624 5694
5625 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5626 { 5696 {
5627#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5628 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5629 return 0; 5699 return 0;
5630#endif 5700#endif
… …
5677 5747
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5748 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5749 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5750 }
5681 5751
5752 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5753 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5754 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5755 assign_proc (SCHEME_A_ i, opname (i));
5685 5756
5686 /* initialization of global pointers to special symbols */ 5757 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5758 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5759 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5760 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5728scheme_set_external_data (SCHEME_P_ void *p) 5799scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5800{
5730 SCHEME_V->ext_data = p; 5801 SCHEME_V->ext_data = p;
5731} 5802}
5732 5803
5733void 5804ecb_cold void
5734scheme_deinit (SCHEME_P) 5805scheme_deinit (SCHEME_P)
5735{ 5806{
5736 int i; 5807 int i;
5737 5808
5738#if SHOW_ERROR_LINE 5809#if SHOW_ERROR_LINE
… …
5959# endif 6030# endif
5960 int fin; 6031 int fin;
5961 char *file_name = InitFile; 6032 char *file_name = InitFile;
5962 int retcode; 6033 int retcode;
5963 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
5964 6036
5965 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5966 { 6038 {
5967 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5969 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
5970 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5971 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5972 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5973 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5974 return 1; 6046 return 1;
5975 } 6047 }
5976 6048
5977 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
5978 { 6050 {
5979 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
5980 return 2; 6052 return 2;
5981 } 6053 }
5982 6054
5983# if USE_PORTS 6055# if USE_PORTS
5984 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6029 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
6030#endif 6102#endif
6031 6103
6032 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
6033 { 6105 {
6034 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");
6035 } 6107 }
6036 else 6108 else
6037 { 6109 {
6038 if (isfile) 6110 if (isfile)
6039 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6043#if USE_PORTS 6115#if USE_PORTS
6044 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
6045 { 6117 {
6046 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
6047 { 6119 {
6048 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");
6049 } 6121 }
6050 6122
6051 if (isfile) 6123 if (isfile)
6052 close (fin); 6124 close (fin);
6053 } 6125 }

Diff Legend

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