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

Comparing microscheme/scheme.c (file contents):
Revision 1.22 by root, Thu Nov 26 23:26:00 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);
252
253INTERFACE INLINE int 281INTERFACE int
254is_vector (pointer p) 282is_vector (pointer p)
255{ 283{
256 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
257} 285}
258 286
259#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
260#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
261INTERFACE void fill_vector (pointer vec, pointer obj); 289INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
262INTERFACE uint32_t vector_length (pointer vec);
263INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
264INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
265 292
266INTERFACE uint32_t 293INTERFACE int
267vector_length (pointer vec) 294is_integer (pointer p)
268{ 295{
269 return vec->object.vector.length; 296 return type (p) == T_INTEGER;
270} 297}
271 298
299/* not the same as in scheme, where integers are (correctly :) reals */
272INTERFACE INLINE int 300INTERFACE int
301is_real (pointer p)
302{
303 return type (p) == T_REAL;
304}
305
306INTERFACE int
273is_number (pointer p) 307is_number (pointer p)
274{ 308{
275 return type (p) == T_NUMBER; 309 return is_integer (p) || is_real (p);
276} 310}
277 311
278INTERFACE INLINE int 312INTERFACE int
279is_integer (pointer p)
280{
281 if (!is_number (p))
282 return 0;
283
284 if (num_is_integer (p) || ivalue (p) == rvalue (p))
285 return 1;
286
287 return 0;
288}
289
290INTERFACE INLINE int
291is_real (pointer p)
292{
293 return is_number (p) && !num_is_fixnum (p->object.number);
294}
295
296INTERFACE INLINE int
297is_character (pointer p) 313is_character (pointer p)
298{ 314{
299 return type (p) == T_CHARACTER; 315 return type (p) == T_CHARACTER;
300} 316}
301 317
302INTERFACE INLINE char * 318INTERFACE char *
303string_value (pointer p) 319string_value (pointer p)
304{ 320{
305 return strvalue (p); 321 return strvalue (p);
306} 322}
307 323
308INLINE num
309nvalue (pointer p)
310{
311 return (p)->object.number;
312}
313
314static IVALUE
315num_get_ivalue (const num n)
316{
317 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
318}
319
320static RVALUE
321num_get_rvalue (const num n)
322{
323 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
324}
325
326INTERFACE IVALUE
327ivalue (pointer p)
328{
329 return num_get_ivalue (p->object.number);
330}
331
332INTERFACE RVALUE
333rvalue (pointer p)
334{
335 return num_get_rvalue (p->object.number);
336}
337
338#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
339#if USE_REAL 327#if USE_REAL
340# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
341# define set_num_integer(p) (p)->object.number.is_fixnum=1; 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
342# define set_num_real(p) (p)->object.number.is_fixnum=0;
343#else 330#else
344# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
345# define set_num_integer(p) 0 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
346# define set_num_real(p) 0
347#endif 333#endif
334
348INTERFACE long 335INTERFACE long
349charvalue (pointer p) 336charvalue (pointer p)
350{ 337{
351 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
352} 339}
353 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
354INTERFACE INLINE int 343INTERFACE int
355is_port (pointer p) 344is_port (pointer p)
356{ 345{
357 return type (p) == T_PORT; 346 return type (p) == T_PORT;
358} 347}
359 348
360INTERFACE INLINE int 349INTERFACE int
361is_inport (pointer p) 350is_inport (pointer p)
362{ 351{
363 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
364} 353}
365 354
366INTERFACE INLINE int 355INTERFACE int
367is_outport (pointer p) 356is_outport (pointer p)
368{ 357{
369 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
370} 359}
371 360
372INTERFACE INLINE int 361INTERFACE int
373is_pair (pointer p) 362is_pair (pointer p)
374{ 363{
375 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
376} 365}
377 366
378#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
379#define cdr(p) ((p)->object.cons.cdr + 0) 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
380 369
381static pointer caar (pointer p) { return car (car (p)); } 370static pointer caar (pointer p) { return car (car (p)); }
382static pointer cadr (pointer p) { return car (cdr (p)); } 371static pointer cadr (pointer p) { return car (cdr (p)); }
383static pointer cdar (pointer p) { return cdr (car (p)); } 372static pointer cdar (pointer p) { return cdr (car (p)); }
384static pointer cddr (pointer p) { return cdr (cdr (p)); } 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
388static pointer cdaar (pointer p) { return cdr (car (car (p))); } 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
389 378
390INTERFACE void 379INTERFACE void
391set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
392{ 381{
393 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
394} 383}
395 384
396INTERFACE void 385INTERFACE void
397set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
398{ 387{
399 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
400} 389}
401 390
402INTERFACE pointer 391INTERFACE pointer
403pair_car (pointer p) 392pair_car (pointer p)
404{ 393{
… …
409pair_cdr (pointer p) 398pair_cdr (pointer p)
410{ 399{
411 return cdr (p); 400 return cdr (p);
412} 401}
413 402
414INTERFACE INLINE int 403INTERFACE int
415is_symbol (pointer p) 404is_symbol (pointer p)
416{ 405{
417 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
418} 407}
419 408
420INTERFACE INLINE char * 409INTERFACE char *
421symname (pointer p) 410symname (pointer p)
422{ 411{
423 return strvalue (car (p)); 412 return strvalue (p);
424} 413}
425 414
426#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
427SCHEME_EXPORT INLINE int 418SCHEME_EXPORT int
428hasprop (pointer p) 419hasprop (pointer p)
429{ 420{
430 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
431} 422}
432
433# define symprop(p) cdr(p)
434#endif 423#endif
435 424
436INTERFACE INLINE int 425INTERFACE int
437is_syntax (pointer p) 426is_syntax (pointer p)
438{ 427{
439 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
440} 429}
441 430
442INTERFACE INLINE int 431INTERFACE int
443is_proc (pointer p) 432is_proc (pointer p)
444{ 433{
445 return type (p) == T_PROC; 434 return type (p) == T_PROC;
446} 435}
447 436
448INTERFACE INLINE int 437INTERFACE int
449is_foreign (pointer p) 438is_foreign (pointer p)
450{ 439{
451 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
452} 441}
453 442
454INTERFACE INLINE char * 443INTERFACE char *
455syntaxname (pointer p) 444syntaxname (pointer p)
456{ 445{
457 return strvalue (car (p)); 446 return strvalue (p);
458} 447}
459 448
460#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
461static const char *procname (pointer x); 450static const char *procname (pointer x);
462 451
463INTERFACE INLINE int 452INTERFACE int
464is_closure (pointer p) 453is_closure (pointer p)
465{ 454{
466 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
467} 456}
468 457
469INTERFACE INLINE int 458INTERFACE int
470is_macro (pointer p) 459is_macro (pointer p)
471{ 460{
472 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
473} 462}
474 463
475INTERFACE INLINE pointer 464INTERFACE pointer
476closure_code (pointer p) 465closure_code (pointer p)
477{ 466{
478 return car (p); 467 return car (p);
479} 468}
480 469
481INTERFACE INLINE pointer 470INTERFACE pointer
482closure_env (pointer p) 471closure_env (pointer p)
483{ 472{
484 return cdr (p); 473 return cdr (p);
485} 474}
486 475
487INTERFACE INLINE int 476INTERFACE int
488is_continuation (pointer p) 477is_continuation (pointer p)
489{ 478{
490 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
491} 480}
492 481
493#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
494#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
495 484
496/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
497INTERFACE INLINE int 486INTERFACE int
498is_promise (pointer p) 487is_promise (pointer p)
499{ 488{
500 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
501} 490}
502 491
503INTERFACE INLINE int 492INTERFACE int
504is_environment (pointer p) 493is_environment (pointer p)
505{ 494{
506 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
507} 496}
508 497
… …
514 503
515#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
516#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
517#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
518 507
519INTERFACE INLINE int 508INTERFACE int
520is_immutable (pointer p) 509is_immutable (pointer p)
521{ 510{
522 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
523} 512}
524 513
525INTERFACE INLINE void 514INTERFACE void
526setimmutable (pointer p) 515setimmutable (pointer p)
527{ 516{
528#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
529 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
530#endif 519#endif
531} 520}
532 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
533#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
534static INLINE int 577ecb_inline int
535Cisalpha (int c) 578Cisalpha (int c)
536{ 579{
537 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
538} 581}
539 582
540static INLINE int 583ecb_inline int
541Cisdigit (int c) 584Cisdigit (int c)
542{ 585{
543 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
544} 587}
545 588
546static INLINE int 589ecb_inline int
547Cisspace (int c) 590Cisspace (int c)
548{ 591{
549 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
550} 593}
551 594
552static INLINE int 595ecb_inline int
553Cisupper (int c) 596Cisupper (int c)
554{ 597{
555 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
556} 599}
557 600
558static INLINE int 601ecb_inline int
559Cislower (int c) 602Cislower (int c)
560{ 603{
561 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
562} 605}
563#endif 606#endif
… …
624#endif 667#endif
625 668
626static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
627static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
628static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
629static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
630static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
631static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
632static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
633static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
634static 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);
635static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
636static 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);
… …
651static void mark (pointer a); 694static void mark (pointer a);
652static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
653static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
654static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
655static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
656static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
657static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
658static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
659static int token (SCHEME_P); 702static int token (SCHEME_P);
660static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
661static 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);
662static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
663static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
679static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
680static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
681static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
682static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
683 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
684static num 754static num
685num_op (enum num_op op, num a, num b) 755num_op (enum num_op op, num a, num b)
686{ 756{
687 num ret; 757 num ret;
688 758
689 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));
690 760
691 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
692 { 762 {
693 IVALUE av = num_get_ivalue (a);
694 IVALUE bv = num_get_ivalue (b);
695
696 switch (op) 763 switch (op)
697 { 764 {
698 case NUM_ADD: av += bv; break; 765 case NUM_ADD: a.ivalue += b.ivalue; break;
699 case NUM_SUB: av -= bv; break; 766 case NUM_SUB: a.ivalue -= b.ivalue; break;
700 case NUM_MUL: av *= bv; break; 767 case NUM_MUL: a.ivalue *= b.ivalue; break;
701 case NUM_INTDIV: av /= bv; break; 768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
702 } 769 }
703 770
704 num_set_ivalue (ret, av); 771 num_set_ivalue (ret, a.ivalue);
705 } 772 }
773#if USE_REAL
706 else 774 else
707 { 775 {
708 RVALUE av = num_get_rvalue (a);
709 RVALUE bv = num_get_rvalue (b);
710
711 switch (op) 776 switch (op)
712 { 777 {
713 case NUM_ADD: av += bv; break; 778 case NUM_ADD: a.rvalue += b.rvalue; break;
714 case NUM_SUB: av -= bv; break; 779 case NUM_SUB: a.rvalue -= b.rvalue; break;
715 case NUM_MUL: av *= bv; break; 780 case NUM_MUL: a.rvalue *= b.rvalue; break;
716 case NUM_INTDIV: av /= bv; break; 781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
717 } 782 }
718 783
719 num_set_rvalue (ret, av); 784 num_set_rvalue (ret, a.rvalue);
720 } 785 }
786#endif
721 787
722 return ret; 788 return ret;
723} 789}
724 790
725static num 791static num
726num_div (num a, num b) 792num_div (num a, num b)
727{ 793{
728 num ret; 794 num ret;
729 795
730 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);
731 797
732 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
733 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
734 else 800 else
735 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
736 802
737 return ret; 803 return ret;
738} 804}
739 805
740static num 806static num
… …
742{ 808{
743 num ret; 809 num ret;
744 long e1, e2, res; 810 long e1, e2, res;
745 811
746 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));
747 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
748 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
749 res = e1 % e2; 815 res = e1 % e2;
750 816
751 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
752 if (res > 0) 818 if (res > 0)
753 { 819 {
… …
769{ 835{
770 num ret; 836 num ret;
771 long e1, e2, res; 837 long e1, e2, res;
772 838
773 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));
774 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
775 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
776 res = e1 % e2; 842 res = e1 % e2;
777 843
778 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
779 if (res * e2 < 0) 845 if (res * e2 < 0)
780 res += e2; 846 res += e2;
781 847
782 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
783 return ret; 849 return ret;
784} 850}
785 851
786/* this completely disrespects NaNs */ 852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
787static int 853static int
788num_cmp (num a, num b) 854num_cmp (num a, num b)
789{ 855{
790 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
791 int ret; 857 int ret;
792 858
793 if (is_fixnum) 859 if (is_fixnum)
794 { 860 {
795 IVALUE av = num_get_ivalue (a); 861 IVALUE av = num_ivalue (a);
796 IVALUE bv = num_get_ivalue (b); 862 IVALUE bv = num_ivalue (b);
797 863
798 ret = av == bv ? 0 : av < bv ? -1 : +1; 864 ret = av == bv ? 0 : av < bv ? -1 : +1;
799 } 865 }
800 else 866 else
801 { 867 {
802 RVALUE av = num_get_rvalue (a); 868 RVALUE av = num_rvalue (a);
803 RVALUE bv = num_get_rvalue (b); 869 RVALUE bv = num_rvalue (b);
804 870
805 ret = av == bv ? 0 : av < bv ? -1 : +1; 871 ret = av == bv ? 0 : av < bv ? -1 : +1;
806 } 872 }
807 873
808 return ret; 874 return ret;
… …
834#endif 900#endif
835 901
836static int 902static int
837is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
838{ 904{
905 return x == 0;
906#if 0
839#if USE_REAL 907#if USE_REAL
840 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. */
841#else 909#else
842 return x == 0; 910 return x == 0;
843#endif 911#endif
912#endif
844} 913}
845 914
846/* allocate new cell segment */ 915/* allocate new cell segment */
847static int 916static int
848alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
849{ 918{
850 pointer newp; 919 struct cell *newp;
851 pointer last; 920 struct cell *last;
852 pointer p; 921 struct cell *p;
853 char *cp; 922 char *cp;
854 long i; 923 long i;
855 int k; 924 int k;
856 925
857 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
858 segsize <<= 1; 927 segsize <<= 1;
859 928
860 for (k = 0; k < n; k++)
861 {
862 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
863 return k;
864
865 cp = malloc (segsize * sizeof (struct cell)); 929 cp = malloc (segsize * sizeof (struct cell));
866 930
867 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
868 return k; 932 return k;
869 933
870 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
871 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
872 936
873 /* insert new segment in address order */ 937 newp = (struct cell *)cp;
874 newp = (pointer)cp;
875 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
876 SCHEME_V->cell_segsize[i] = segsize; 939 SCHEME_V->cell_segsize[i] = segsize;
877
878 //TODO: insert, not swap
879 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880 {
881 p = SCHEME_V->cell_seg[i];
882 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883 SCHEME_V->cell_seg[i - 1] = p;
884
885 k = SCHEME_V->cell_segsize[i];
886 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887 SCHEME_V->cell_segsize[i - 1] = k;
888
889 --i;
890 }
891
892 SCHEME_V->fcells += segsize; 940 SCHEME_V->fcells += segsize;
893 last = newp + segsize - 1; 941 last = newp + segsize - 1;
894 942
895 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
896 { 944 {
945 pointer cp = POINTER (p);
897 set_typeflag (p, T_FREE); 946 set_typeflag (cp, T_PAIR);
898 set_car (p, NIL); 947 set_car (cp, NIL);
899 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
900 } 949 }
901 950
902 /* insert new cells in address order on free list */
903 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
904 {
905 set_cdr (last, SCHEME_V->free_cell); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
906 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
907 }
908 else
909 {
910 p = SCHEME_V->free_cell;
911 953
912 while (cdr (p) != NIL && newp > cdr (p))
913 p = cdr (p);
914
915 set_cdr (last, cdr (p));
916 set_cdr (p, newp);
917 }
918 }
919
920 return n; 954 return 1;
921} 955}
922 956
923/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
924static INLINE pointer 958ecb_inline pointer
925get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
926{ 960{
927 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 961 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
928 { 962 {
929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
930 return S_SINK; 964 return S_SINK;
931 965
932 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
933 { 967 {
934 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;
935 969
936 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
937 971
938 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)
939 { 973 {
940 /* 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 */
941 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
942 { 976 {
943#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
944 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
945 return S_SINK; 979 return S_SINK;
946#endif 980#endif
… …
958 } 992 }
959} 993}
960 994
961/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
962 Tehom */ 996 Tehom */
963
964static void 997static void
965push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
966{ 999{
967 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
968 1001
… …
990} 1023}
991 1024
992static pointer 1025static pointer
993get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
994{ 1027{
995 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
996 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
997 1030
998 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
999 return S_SINK; 1032 return S_SINK;
1000 1033
1001 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
1002 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
1003 1036
1004 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1005 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1006 fill_vector (v, init); 1039 fill_vector (v, 0, init);
1007 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1008 1041
1009 return v; 1042 return v;
1010} 1043}
1011 1044
1012static INLINE void 1045ecb_inline void
1013ok_to_freely_gc (SCHEME_P) 1046ok_to_freely_gc (SCHEME_P)
1014{ 1047{
1015 set_car (S_SINK, NIL); 1048 set_car (S_SINK, NIL);
1016} 1049}
1017 1050
… …
1019static void 1052static void
1020check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1021{ 1054{
1022 /* 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. */
1023 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1024 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1025 1058
1026 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1027 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1028} 1061}
1029 1062
1030static void 1063static void
1031check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1032{ 1065{
… …
1054 set_cdr (x, b); 1087 set_cdr (x, b);
1055 1088
1056 return x; 1089 return x;
1057} 1090}
1058 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
1059/* ========== oblist implementation ========== */ 1101/* ========== oblist implementation ========== */
1060 1102
1061#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1062 1104
1105static int
1063static 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}
1064 1116
1065static pointer 1117static pointer
1066oblist_initial_value (SCHEME_P) 1118oblist_initial_value (SCHEME_P)
1067{ 1119{
1068 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1070 1122
1071/* returns the new symbol */ 1123/* returns the new symbol */
1072static pointer 1124static pointer
1073oblist_add_by_name (SCHEME_P_ const char *name) 1125oblist_add_by_name (SCHEME_P_ const char *name)
1074{ 1126{
1075 int location; 1127 pointer x = generate_symbol (SCHEME_A_ name);
1076
1077 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078 set_typeflag (x, T_SYMBOL);
1079 setimmutable (car (x));
1080
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1128 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 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)));
1083 return x; 1130 return x;
1084} 1131}
1085 1132
1086static INLINE pointer 1133ecb_inline pointer
1087oblist_find_by_name (SCHEME_P_ const char *name) 1134oblist_find_by_name (SCHEME_P_ const char *name)
1088{ 1135{
1089 int location; 1136 int location;
1090 pointer x; 1137 pointer x;
1091 char *s; 1138 char *s;
1092 1139
1093 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1140 location = hash_fn (name, veclength (SCHEME_V->oblist));
1094 1141
1095 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))
1096 { 1143 {
1097 s = symname (car (x)); 1144 s = symname (car (x));
1098 1145
1099 /* case-insensitive, per R5RS section 2 */ 1146 /* case-insensitive, per R5RS section 2 */
1100 if (stricmp (name, s) == 0) 1147 if (stricmp (name, s) == 0)
… …
1110 int i; 1157 int i;
1111 pointer x; 1158 pointer x;
1112 pointer ob_list = NIL; 1159 pointer ob_list = NIL;
1113 1160
1114 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1161 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115 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))
1116 ob_list = cons (x, ob_list); 1163 ob_list = cons (x, ob_list);
1117 1164
1118 return ob_list; 1165 return ob_list;
1119} 1166}
1120 1167
… …
1124oblist_initial_value (SCHEME_P) 1171oblist_initial_value (SCHEME_P)
1125{ 1172{
1126 return NIL; 1173 return NIL;
1127} 1174}
1128 1175
1129static INLINE pointer 1176ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1177oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1178{
1132 pointer x; 1179 pointer x;
1133 char *s; 1180 char *s;
1134 1181
… …
1146 1193
1147/* returns the new symbol */ 1194/* returns the new symbol */
1148static pointer 1195static pointer
1149oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1150{ 1197{
1151 pointer x; 1198 pointer x = generate_symbol (SCHEME_A_ name);
1152
1153 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154 set_typeflag (x, T_SYMBOL);
1155 setimmutable (car (x));
1156 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157 return x; 1200 return x;
1158} 1201}
1159 1202
1160static pointer 1203static pointer
… …
1170mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1171{ 1214{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1216
1174 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1175 x->object.port = p; 1218 set_port (x, p);
1176 1219
1177 return x; 1220 return x;
1178} 1221}
1179#endif 1222#endif
1180 1223
1181pointer 1224pointer
1182mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1183{ 1226{
1184 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1185 1228
1186 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1187 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1188 1231
1189 return x; 1232 return x;
1190} 1233}
1191 1234
1192INTERFACE pointer 1235INTERFACE pointer
1193mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1194{ 1237{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1239
1197 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1198 ivalue_unchecked (x) = c & 0xff; 1241 set_ivalue (x, c & 0xff);
1199 set_num_integer (x); 1242
1200 return x; 1243 return x;
1201} 1244}
1202 1245
1203/* get number atom (integer) */ 1246/* get number atom (integer) */
1204INTERFACE pointer 1247INTERFACE pointer
1205mk_integer (SCHEME_P_ long num) 1248mk_integer (SCHEME_P_ long n)
1206{ 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 {
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1261
1209 set_typeflag (x, (T_NUMBER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1210 ivalue_unchecked (x) = num; 1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1211 set_num_integer (x); 1264 set_ivalue (x, n);
1265
1266 *pp = x;
1267 }
1268
1212 return x; 1269 return *pp;
1213} 1270}
1214 1271
1215INTERFACE pointer 1272INTERFACE pointer
1216mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1217{ 1274{
1275#if USE_REAL
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1277
1220 set_typeflag (x, (T_NUMBER | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1221 rvalue_unchecked (x) = n; 1279 set_rvalue (x, n);
1222 set_num_real (x); 1280
1223 return x; 1281 return x;
1282#else
1283 return mk_integer (SCHEME_A_ n);
1284#endif
1224} 1285}
1225 1286
1226static pointer 1287static pointer
1227mk_number (SCHEME_P_ const num n) 1288mk_number (SCHEME_P_ const num n)
1228{ 1289{
1290#if USE_REAL
1229 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
1230 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1295 return mk_integer (SCHEME_A_ num_ivalue (n));
1231 else 1296#endif
1232 return mk_real (SCHEME_A_ num_get_rvalue (n));
1233} 1297}
1234 1298
1235/* allocate name to string area */ 1299/* allocate name to string area */
1236static char * 1300static char *
1237store_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)
… …
1243 SCHEME_V->no_memory = 1; 1307 SCHEME_V->no_memory = 1;
1244 return SCHEME_V->strbuff; 1308 return SCHEME_V->strbuff;
1245 } 1309 }
1246 1310
1247 if (str) 1311 if (str)
1248 { 1312 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249 int l = strlen (str);
1250
1251 if (l > len_str)
1252 l = len_str;
1253
1254 memcpy (q, str, l);
1255 q[l] = 0;
1256 }
1257 else 1313 else
1258 {
1259 memset (q, fill, len_str); 1314 memset (q, fill, len_str);
1315
1260 q[len_str] = 0; 1316 q[len_str] = 0;
1261 }
1262 1317
1263 return q; 1318 return q;
1264} 1319}
1265 1320
1266INTERFACE pointer 1321INTERFACE pointer
… …
1280 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281 1336
1282 set_typeflag (x, T_STRING | T_ATOM); 1337 set_typeflag (x, T_STRING | T_ATOM);
1283 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284 strlength (x) = len; 1339 strlength (x) = len;
1340
1285 return x; 1341 return x;
1286} 1342}
1287 1343
1288INTERFACE pointer 1344INTERFACE pointer
1289mk_string (SCHEME_P_ const char *str) 1345mk_string (SCHEME_P_ const char *str)
… …
1296{ 1352{
1297 return get_vector_object (SCHEME_A_ len, NIL); 1353 return get_vector_object (SCHEME_A_ len, NIL);
1298} 1354}
1299 1355
1300INTERFACE void 1356INTERFACE void
1301fill_vector (pointer vec, pointer obj) 1357fill_vector (pointer vec, uint32_t start, pointer obj)
1302{ 1358{
1303 int i; 1359 int i;
1304 1360
1305 for (i = 0; i < vec->object.vector.length; i++) 1361 for (i = start; i < veclength (vec); i++)
1306 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1307} 1363}
1308 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
1309INTERFACE pointer 1374INTERFACE pointer
1310vector_elem (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1311{ 1376{
1312 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1313} 1378}
1314 1379
1315INTERFACE void 1380INTERFACE void
1316set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1381vector_set (pointer vec, uint32_t ielem, pointer a)
1317{ 1382{
1318 vecvalue(vec)[ielem] = a; 1383 vecvalue(vec)[ielem] = a;
1319} 1384}
1320 1385
1321/* get new symbol */ 1386/* get new symbol */
… …
1333 1398
1334INTERFACE pointer 1399INTERFACE pointer
1335gensym (SCHEME_P) 1400gensym (SCHEME_P)
1336{ 1401{
1337 pointer x; 1402 pointer x;
1338
1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340 {
1341 char name[40] = "gensym-"; 1403 char name[40] = "gensym-";
1342 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343 1405
1344 /* first check oblist */ 1406 return generate_symbol (SCHEME_A_ name);
1345 x = oblist_find_by_name (SCHEME_A_ name); 1407}
1346 1408
1347 if (x == NIL) 1409static int
1348 { 1410is_gensym (SCHEME_P_ pointer x)
1349 x = oblist_add_by_name (SCHEME_A_ name); 1411{
1350 return x; 1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351 }
1352 }
1353
1354 return NIL;
1355} 1413}
1356 1414
1357/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1358static pointer 1416static pointer
1359mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
… …
1413 } 1471 }
1414 else if ((c == 'e') || (c == 'E')) 1472 else if ((c == 'e') || (c == 'E'))
1415 { 1473 {
1416 if (!has_fp_exp) 1474 if (!has_fp_exp)
1417 { 1475 {
1418 has_dec_point = 1; /* decimal point illegal 1476 has_dec_point = 1; /* decimal point illegal from now on */
1419 from now on */
1420 p++; 1477 p++;
1421 1478
1422 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1479 if ((*p == '-') || (*p == '+') || isdigit (*p))
1423 continue; 1480 continue;
1424 } 1481 }
… …
1512 1569
1513 if (ecb_expect_false (is_vector (p))) 1570 if (ecb_expect_false (is_vector (p)))
1514 { 1571 {
1515 int i; 1572 int i;
1516 1573
1517 for (i = 0; i < p->object.vector.length; i++) 1574 for (i = 0; i < veclength (p); i++)
1518 mark (vecvalue (p)[i]); 1575 mark (vecvalue (p)[i]);
1519 } 1576 }
1520 1577
1521 if (is_atom (p)) 1578 if (is_atom (p))
1522 goto E6; 1579 goto E6;
… …
1569 1626
1570/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1571static void 1628static void
1572gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1573{ 1630{
1574 pointer p;
1575 int i; 1631 int i;
1576 1632
1577 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1578 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1579 1635
… …
1595 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1596 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1597 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1598 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1599 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
1600 /* mark variables a, b */ 1663 /* mark variables a, b */
1601 mark (a); 1664 mark (a);
1602 mark (b); 1665 mark (b);
1603 1666
1604 /* garbage collect */ 1667 /* garbage collect */
1605 clrmark (NIL); 1668 clrmark (NIL);
1606 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1607 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1608 1671
1609 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1610 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1611 (which are also kept sorted by address) downwards to build the 1674
1612 free-list in sorted order. 1675 uint32_t total = 0;
1613 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1614 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615 { 1679 {
1616 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];
1617 1683
1618 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1619 { 1685 {
1686 pointer c = POINTER (p);
1687
1620 if (is_mark (p)) 1688 if (is_mark (c))
1621 clrmark (p); 1689 clrmark (c);
1622 else 1690 else
1623 { 1691 {
1624 /* reclaim cell */ 1692 /* reclaim cell */
1625 if (typeflag (p) != T_FREE) 1693 if (typeflag (c) != T_PAIR)
1626 { 1694 {
1627 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1628 set_typeflag (p, T_FREE); 1696 set_typeflag (c, T_PAIR);
1629 set_car (p, NIL); 1697 set_car (c, NIL);
1630 } 1698 }
1631 1699
1632 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1633 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1634 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1635 } 1703 }
1636 } 1704 }
1637 } 1705 }
1638 1706
1639 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1640 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 }
1641} 1711}
1642 1712
1643static void 1713static void
1644finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1645{ 1715{
1646 /* TODO, fast bitmap check? */ 1716 /* TODO, fast bitmap check? */
1647 if (is_string (a)) 1717 if (is_string (a) || is_symbol (a))
1648 free (strvalue (a)); 1718 free (strvalue (a));
1649 else if (is_vector (a)) 1719 else if (is_vector (a))
1650 free (vecvalue (a)); 1720 free (vecvalue (a));
1651#if USE_PORTS 1721#if USE_PORTS
1652 else if (is_port (a)) 1722 else if (is_port (a))
1653 { 1723 {
1654 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)
1655 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1656 1726
1657 free (a->object.port); 1727 free (port (a));
1658 } 1728 }
1659#endif 1729#endif
1660} 1730}
1661 1731
1662/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
… …
1678 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1679 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;
1680 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;
1681 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;
1682 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1683 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);
1684 1754
1685#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1686 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;
1687 1757
1688 if (fname) 1758 if (fname)
… …
1705 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1706#if USE_PORTS 1776#if USE_PORTS
1707 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1708#endif 1778#endif
1709 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1710 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);
1711 } 1781 }
1712} 1782}
1713 1783
1714static int 1784static int
1715file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1716{ 1786{
1717#if USE_PORTS 1787#if USE_PORTS
1718 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1719 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1720 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1721#else 1791#else
1722 return 0; 1792 return 0;
1723#endif 1793#endif
1724} 1794}
1725 1795
… …
1859} 1929}
1860 1930
1861static void 1931static void
1862port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1863{ 1933{
1864 port *pt = p->object.port; 1934 port *pt = port (p);
1865 1935
1866 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1867 1937
1868 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1869 { 1939 {
… …
1890/* get new character from input file */ 1960/* get new character from input file */
1891static int 1961static int
1892inchar (SCHEME_P) 1962inchar (SCHEME_P)
1893{ 1963{
1894 int c; 1964 int c;
1895 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1896
1897 pt = SCHEME_V->inport->object.port;
1898 1966
1899 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1900 return EOF; 1968 return EOF;
1901 1969
1902 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
… …
1969 port *pt; 2037 port *pt;
1970 2038
1971 if (c == EOF) 2039 if (c == EOF)
1972 return; 2040 return;
1973 2041
1974 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
1975 pt->unget = c; 2043 pt->unget = c;
1976#else 2044#else
1977 if (c == EOF) 2045 if (c == EOF)
1978 return; 2046 return;
1979 2047
… …
2007 2075
2008INTERFACE void 2076INTERFACE void
2009putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2010{ 2078{
2011#if USE_PORTS 2079#if USE_PORTS
2012 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2013 2081
2014 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2015 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2016 else 2084 else
2017 for (; *s; s++) 2085 for (; *s; s++)
… …
2019 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2020 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))
2021 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2022 2090
2023#else 2091#else
2024 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2025#endif 2093#endif
2026} 2094}
2027 2095
2028static void 2096static void
2029putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2030{ 2098{
2031#if USE_PORTS 2099#if USE_PORTS
2032 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2033 2101
2034 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2035 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2036 else 2104 else
2037 { 2105 {
… …
2051 2119
2052INTERFACE void 2120INTERFACE void
2053putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2054{ 2122{
2055#if USE_PORTS 2123#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2057 2125
2058 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2059 { 2127 {
2060 char cc = c; 2128 char cc = c;
2061 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
… …
2074#endif 2142#endif
2075} 2143}
2076 2144
2077/* read characters up to delimiter, but cater to character constants */ 2145/* read characters up to delimiter, but cater to character constants */
2078static char * 2146static char *
2079readstr_upto (SCHEME_P_ char *delim) 2147readstr_upto (SCHEME_P_ int skip, const char *delim)
2080{ 2148{
2081 char *p = SCHEME_V->strbuff; 2149 char *p = SCHEME_V->strbuff + skip;
2082 2150
2083 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))));
2084 2152
2085 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086 *p = 0; 2154 *p = 0;
… …
2093 return SCHEME_V->strbuff; 2161 return SCHEME_V->strbuff;
2094} 2162}
2095 2163
2096/* read string expression "xxx...xxx" */ 2164/* read string expression "xxx...xxx" */
2097static pointer 2165static pointer
2098readstrexp (SCHEME_P) 2166readstrexp (SCHEME_P_ char delim)
2099{ 2167{
2100 char *p = SCHEME_V->strbuff; 2168 char *p = SCHEME_V->strbuff;
2101 int c; 2169 int c;
2102 int c1 = 0; 2170 int c1 = 0;
2103 enum
2104 { 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;
2105 2172
2106 for (;;) 2173 for (;;)
2107 { 2174 {
2108 c = inchar (SCHEME_A); 2175 c = inchar (SCHEME_A);
2109 2176
… …
2111 return S_F; 2178 return S_F;
2112 2179
2113 switch (state) 2180 switch (state)
2114 { 2181 {
2115 case st_ok: 2182 case st_ok:
2116 switch (c) 2183 if (ecb_expect_false (c == delim))
2117 {
2118 case '\\':
2119 state = st_bsl;
2120 break;
2121
2122 case '"':
2123 *p = 0;
2124 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);
2125 2185
2126 default: 2186 if (ecb_expect_false (c == '\\'))
2187 state = st_bsl;
2188 else
2127 *p++ = c; 2189 *p++ = c;
2128 break;
2129 }
2130 2190
2131 break; 2191 break;
2132 2192
2133 case st_bsl: 2193 case st_bsl:
2134 switch (c) 2194 switch (c)
… …
2164 case 'r': 2224 case 'r':
2165 *p++ = '\r'; 2225 *p++ = '\r';
2166 state = st_ok; 2226 state = st_ok;
2167 break; 2227 break;
2168 2228
2169 case '"':
2170 *p++ = '"';
2171 state = st_ok;
2172 break;
2173
2174 default: 2229 default:
2175 *p++ = c; 2230 *p++ = c;
2176 state = st_ok; 2231 state = st_ok;
2177 break; 2232 break;
2178 } 2233 }
2179 2234
2180 break; 2235 break;
2181 2236
2182 case st_x1: 2237 case st_x1:
2183 case st_x2: 2238 case st_x2:
2184 c = toupper (c); 2239 c = tolower (c);
2185 2240
2186 if (c >= '0' && c <= 'F') 2241 if (c >= '0' && c <= '9')
2187 {
2188 if (c <= '9')
2189 c1 = (c1 << 4) + c - '0'; 2242 c1 = (c1 << 4) + c - '0';
2190 else 2243 else if (c >= 'a' && c <= 'f')
2191 c1 = (c1 << 4) + c - 'A' + 10; 2244 c1 = (c1 << 4) + c - 'a' + 10;
2192
2193 if (state == st_x1)
2194 state = st_x2;
2195 else
2196 {
2197 *p++ = c1;
2198 state = st_ok;
2199 }
2200 }
2201 else 2245 else
2202 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 }
2203 2255
2204 break; 2256 break;
2205 2257
2206 case st_oct1: 2258 case st_oct1:
2207 case st_oct2: 2259 case st_oct2:
… …
2211 backchar (SCHEME_A_ c); 2263 backchar (SCHEME_A_ c);
2212 state = st_ok; 2264 state = st_ok;
2213 } 2265 }
2214 else 2266 else
2215 { 2267 {
2216 if (state == st_oct2 && c1 >= 32) 2268 if (state == st_oct2 && c1 >= ' ')
2217 return S_F; 2269 return S_F;
2218 2270
2219 c1 = (c1 << 3) + (c - '0'); 2271 c1 = (c1 << 3) + (c - '0');
2220 2272
2221 if (state == st_oct1) 2273 if (state == st_oct1)
… …
2226 state = st_ok; 2278 state = st_ok;
2227 } 2279 }
2228 } 2280 }
2229 2281
2230 break; 2282 break;
2231
2232 } 2283 }
2233 } 2284 }
2234} 2285}
2235 2286
2236/* check c is in chars */ 2287/* check c is in chars */
2237static INLINE int 2288ecb_inline int
2238is_one_of (char *s, int c) 2289is_one_of (const char *s, int c)
2239{ 2290{
2240 if (c == EOF)
2241 return 1;
2242
2243 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2244} 2292}
2245 2293
2246/* skip white characters */ 2294/* skip white characters */
2247static INLINE int 2295ecb_inline int
2248skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2249{ 2297{
2250 int c, curr_line = 0; 2298 int c, curr_line = 0;
2251 2299
2252 do 2300 do
2253 { 2301 {
2254 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2255#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2256 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2257 curr_line++; 2306 curr_line++;
2258#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2259 } 2311 }
2260 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2261 2313
2262 /* record it */ 2314 /* record it */
2263#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2264 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)
2265 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;
2266#endif 2318#endif
2267 2319
2268 if (c != EOF)
2269 {
2270 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2271 return 1; 2321 return 1;
2272 }
2273 else
2274 return EOF;
2275} 2322}
2276 2323
2277/* get token */ 2324/* get token */
2278static int 2325static int
2279token (SCHEME_P) 2326token (SCHEME_P)
… …
2295 return TOK_RPAREN; 2342 return TOK_RPAREN;
2296 2343
2297 case '.': 2344 case '.':
2298 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2299 2346
2300 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2301 return TOK_DOT; 2348 return TOK_DOT;
2302 else 2349 else
2303 { 2350 {
2304 //TODO: ungetc twice in a row is not supported in C
2305 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2306 backchar (SCHEME_A_ '.');
2307 return TOK_ATOM; 2352 return TOK_DOTATOM;
2308 } 2353 }
2354
2355 case '|':
2356 return TOK_STRATOM;
2309 2357
2310 case '\'': 2358 case '\'':
2311 return TOK_QUOTE; 2359 return TOK_QUOTE;
2312 2360
2313 case ';': 2361 case ';':
… …
2445 } 2493 }
2446 2494
2447 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2448} 2496}
2449 2497
2450
2451/* print atoms */ 2498/* print atoms */
2452static void 2499static void
2453printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2454{ 2501{
2455 char *p; 2502 char *p;
2456 int len; 2503 int len;
2457 2504
2458 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2459 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2460} 2507}
2461
2462 2508
2463/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2464static void 2510static void
2465atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466{ 2512{
… …
2480 { 2526 {
2481 p = SCHEME_V->strbuff; 2527 p = SCHEME_V->strbuff;
2482 2528
2483 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 */
2484 { 2530 {
2485 if (num_is_integer (l)) 2531 if (is_integer (l))
2486 xnum (p, ivalue_unchecked (l)); 2532 xnum (p, ivalue_unchecked (l));
2487#if USE_REAL 2533#if USE_REAL
2488 else 2534 else
2489 { 2535 {
2490 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2536 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2627#endif 2673#endif
2628 } 2674 }
2629 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2630 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2631 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2632 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2633 2686
2634 *pp = p; 2687 *pp = p;
2635 *plen = strlen (p); 2688 *plen = strlen (p);
2636} 2689}
2637 2690
… …
2745 return 0; 2798 return 0;
2746 } 2799 }
2747 else if (is_number (a)) 2800 else if (is_number (a))
2748 { 2801 {
2749 if (is_number (b)) 2802 if (is_number (b))
2750 if (num_is_integer (a) == num_is_integer (b))
2751 return num_cmp (nvalue (a), nvalue (b)) == 0; 2803 return num_cmp (nvalue (a), nvalue (b)) == 0;
2752 2804
2753 return 0; 2805 return 0;
2754 } 2806 }
2755 else if (is_character (a)) 2807 else if (is_character (a))
2756 { 2808 {
… …
2782/* () is #t in R5RS */ 2834/* () is #t in R5RS */
2783#define is_true(p) ((p) != S_F) 2835#define is_true(p) ((p) != S_F)
2784#define is_false(p) ((p) == S_F) 2836#define is_false(p) ((p) == S_F)
2785 2837
2786/* ========== Environment implementation ========== */ 2838/* ========== Environment implementation ========== */
2787
2788#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790static int
2791hash_fn (const char *key, int table_size)
2792{
2793 const unsigned char *p = key;
2794 uint32_t hash = 2166136261;
2795
2796 while (*p)
2797 hash = (hash ^ *p++) * 16777619;
2798
2799 return hash % table_size;
2800}
2801#endif
2802 2839
2803#ifndef USE_ALIST_ENV 2840#ifndef USE_ALIST_ENV
2804 2841
2805/* 2842/*
2806 * In this implementation, each frame of the environment may be 2843 * In this implementation, each frame of the environment may be
… …
2823 2860
2824 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2861 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825 setenvironment (SCHEME_V->envir); 2862 setenvironment (SCHEME_V->envir);
2826} 2863}
2827 2864
2828static 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
2829new_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)
2830{ 2882{
2831 pointer slot = immutable_cons (variable, value); 2883 pointer slot = immutable_cons (variable, value);
2832 2884
2833 if (is_vector (car (env))) 2885 if (is_vector (car (env)))
2834 { 2886 {
2835 int location = hash_fn (symname (variable), veclength (car (env))); 2887 int location = sym_hash (variable, veclength (car (env)));
2836
2837 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)));
2838 } 2889 }
2839 else 2890 else
2840 set_car (env, immutable_cons (slot, car (env))); 2891 set_car (env, immutable_cons (slot, car (env)));
2841} 2892}
2842 2893
2843static pointer 2894static pointer
2844find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845{ 2896{
2846 pointer x, y; 2897 pointer x, y;
2847 int location;
2848 2898
2849 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
2850 { 2900 {
2851 if (is_vector (car (x))) 2901 if (is_vector (car (x)))
2852 { 2902 {
2853 location = hash_fn (symname (hdl), veclength (car (x))); 2903 int location = sym_hash (hdl, veclength (car (x)));
2854 y = vector_elem (car (x), location); 2904 y = vector_get (car (x), location);
2855 } 2905 }
2856 else 2906 else
2857 y = car (x); 2907 y = car (x);
2858 2908
2859 for (; y != NIL; y = cdr (y)) 2909 for (; y != NIL; y = cdr (y))
2860 if (caar (y) == hdl) 2910 if (caar (y) == hdl)
2861 break; 2911 break;
2862 2912
2863 if (y != NIL) 2913 if (y != NIL)
2914 return car (y);
2915
2916 if (!all)
2864 break; 2917 break;
2865
2866 if (!all)
2867 return NIL;
2868 } 2918 }
2869
2870 if (x != NIL)
2871 return car (y);
2872 2919
2873 return NIL; 2920 return NIL;
2874} 2921}
2875 2922
2876#else /* USE_ALIST_ENV */ 2923#else /* USE_ALIST_ENV */
2877 2924
2878static INLINE void 2925ecb_inline void
2879new_frame_in_env (SCHEME_P_ pointer old_env) 2926new_frame_in_env (SCHEME_P_ pointer old_env)
2880{ 2927{
2881 SCHEME_V->envir = immutable_cons (NIL, old_env); 2928 SCHEME_V->envir = immutable_cons (NIL, old_env);
2882 setenvironment (SCHEME_V->envir); 2929 setenvironment (SCHEME_V->envir);
2883} 2930}
2884 2931
2885static INLINE void 2932ecb_inline void
2886new_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)
2887{ 2934{
2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2889} 2936}
2890 2937
… …
2898 for (y = car (x); y != NIL; y = cdr (y)) 2945 for (y = car (x); y != NIL; y = cdr (y))
2899 if (caar (y) == hdl) 2946 if (caar (y) == hdl)
2900 break; 2947 break;
2901 2948
2902 if (y != NIL) 2949 if (y != NIL)
2950 return car (y);
2903 break; 2951 break;
2904 2952
2905 if (!all) 2953 if (!all)
2906 return NIL; 2954 break;
2907 } 2955 }
2908
2909 if (x != NIL)
2910 return car (y);
2911 2956
2912 return NIL; 2957 return NIL;
2913} 2958}
2914 2959
2915#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2916 2961
2917static INLINE void 2962ecb_inline void
2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920 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);
2921} 2967}
2922 2968
2923static INLINE void 2969ecb_inline void
2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2925{ 2971{
2926 set_cdr (slot, value); 2972 set_cdr (slot, value);
2927} 2973}
2928 2974
2929static INLINE pointer 2975ecb_inline pointer
2930slot_value_in_env (pointer slot) 2976slot_value_in_env (pointer slot)
2931{ 2977{
2932 return cdr (slot); 2978 return cdr (slot);
2933} 2979}
2934 2980
… …
3025{ 3071{
3026 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3027 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3028 3074
3029 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3030 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3031 { 3077 {
3032 SCHEME_V->dump_size += STACK_GROWTH; 3078 SCHEME_V->dump_size += STACK_GROWTH;
3033 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);
3034 } 3080 }
3035 3081
… …
3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3063 3109
3064 return 0; 3110 return 0;
3065} 3111}
3066 3112
3067static INLINE void 3113ecb_inline void
3068dump_stack_reset (SCHEME_P) 3114dump_stack_reset (SCHEME_P)
3069{ 3115{
3070 /* 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 */
3071 SCHEME_V->dump = (pointer)+0; 3117 SCHEME_V->dump = (pointer)+0;
3072} 3118}
3073 3119
3074static INLINE void 3120ecb_inline void
3075dump_stack_initialize (SCHEME_P) 3121dump_stack_initialize (SCHEME_P)
3076{ 3122{
3077 SCHEME_V->dump_size = 0; 3123 SCHEME_V->dump_size = 0;
3078 SCHEME_V->dump_base = 0; 3124 SCHEME_V->dump_base = 0;
3079 dump_stack_reset (SCHEME_A); 3125 dump_stack_reset (SCHEME_A);
… …
3132 int i = 0; 3178 int i = 0;
3133 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3179 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134 3180
3135 while (cont != NIL) 3181 while (cont != NIL)
3136 { 3182 {
3137 frame->op = ivalue (car (cont)); cont = cdr (cont); 3183 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138 frame->args = car (cont) ; cont = cdr (cont); 3184 frame->args = car (cont) ; cont = cdr (cont);
3139 frame->envir = car (cont) ; cont = cdr (cont); 3185 frame->envir = car (cont) ; cont = cdr (cont);
3140 frame->code = car (cont) ; cont = cdr (cont); 3186 frame->code = car (cont) ; cont = cdr (cont);
3141 3187
3142 ++frame; 3188 ++frame;
3143 ++i; 3189 ++i;
3144 } 3190 }
3145 3191
3146 SCHEME_V->dump = (pointer)(uintptr_t)i; 3192 SCHEME_V->dump = (pointer)(uintptr_t)i;
3147} 3193}
3148 3194
3149#else 3195#else
3150 3196
3151static INLINE void 3197ecb_inline void
3152dump_stack_reset (SCHEME_P) 3198dump_stack_reset (SCHEME_P)
3153{ 3199{
3154 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3155} 3201}
3156 3202
3157static INLINE void 3203ecb_inline void
3158dump_stack_initialize (SCHEME_P) 3204dump_stack_initialize (SCHEME_P)
3159{ 3205{
3160 dump_stack_reset (SCHEME_A); 3206 dump_stack_reset (SCHEME_A);
3161} 3207}
3162 3208
… …
3174 SCHEME_V->value = a; 3220 SCHEME_V->value = a;
3175 3221
3176 if (dump == NIL) 3222 if (dump == NIL)
3177 return -1; 3223 return -1;
3178 3224
3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3225 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3226 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3227 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3228 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183 3229
3184 SCHEME_V->dump = dump; 3230 SCHEME_V->dump = dump;
3185 3231
3186 return 0; 3232 return 0;
3187} 3233}
… …
3216 3262
3217#endif 3263#endif
3218 3264
3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3220 3266
3267#if EXPERIMENT
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
3221static int 3325static int
3222opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223{ 3327{
3224 pointer args = SCHEME_V->args; 3328 pointer args = SCHEME_V->args;
3225 pointer x, y; 3329 pointer x, y;
3226 3330
3227 switch (op) 3331 switch (op)
3228 { 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
3229 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3230 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3231 { 3341 {
3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3342 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3233 //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)));
3234 } 3344 }
3235 3345
3236 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3237 Error_1 ("unable to open", car (args)); 3347 Error_1 ("unable to open", car (args));
3238 else 3348 else
… …
3242 } 3352 }
3243 3353
3244 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3245 3355
3246 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3247 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3248 { 3358 {
3249 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3250 { 3360 {
3251 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3252 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
… …
3330#endif 3440#endif
3331 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3332 { 3442 {
3333 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);
3334 3444
3335 if (x != NIL) 3445 if (x == NIL)
3336 s_return (slot_value_in_env (x));
3337 else
3338 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));
3339 } 3449 }
3340 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3341 { 3451 {
3342 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3343 3453
… …
3356 } 3466 }
3357 else 3467 else
3358 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3359 3469
3360 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3361 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362 { 3472 {
3363 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3366 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
… …
3393 3503
3394 case OP_TRACING: 3504 case OP_TRACING:
3395 { 3505 {
3396 int tr = SCHEME_V->tracing; 3506 int tr = SCHEME_V->tracing;
3397 3507
3398 SCHEME_V->tracing = ivalue (car (args)); 3508 SCHEME_V->tracing = ivalue_unchecked (car (args));
3399 s_return (mk_integer (SCHEME_A_ tr)); 3509 s_return (mk_integer (SCHEME_A_ tr));
3400 } 3510 }
3401 3511
3402#endif 3512#endif
3403 3513
… …
3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
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)
… …
3912 SCHEME_V->code = car (args); 4013 SCHEME_V->code = car (args);
3913 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);
3914 s_goto (OP_APPLY); 4015 s_goto (OP_APPLY);
3915 } 4016 }
3916 4017
3917 abort (); 4018 if (USE_ERROR_CHECKING) abort ();
3918} 4019}
3919 4020
3920static int 4021static int
3921opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4022opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3922{ 4023{
3923 pointer args = SCHEME_V->args; 4024 pointer args = SCHEME_V->args;
3924 pointer x = car (args); 4025 pointer x = car (args);
3925 num v; 4026 num v;
3926 4027
3927#if USE_MATH
3928 RVALUE dd;
3929#endif
3930
3931 switch (op) 4028 switch (op)
3932 { 4029 {
3933#if USE_MATH 4030#if USE_MATH
3934 case OP_INEX2EX: /* inexact->exact */ 4031 case OP_INEX2EX: /* inexact->exact */
4032 {
3935 if (num_is_integer (x)) 4033 if (is_integer (x))
3936 s_return (x); 4034 s_return (x);
3937 else if (modf (rvalue_unchecked (x), &dd) == 0) 4035
4036 RVALUE r = rvalue_unchecked (x);
4037
4038 if (r == (RVALUE)(IVALUE)r)
3938 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3939 else 4040 else
3940 Error_1 ("inexact->exact: not integral:", x); 4041 Error_1 ("inexact->exact: not integral:", x);
4042 }
3941 4043
3942 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))));
3943 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))));
3944 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))));
3945 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))));
… …
3963 { 4065 {
3964 RVALUE result; 4066 RVALUE result;
3965 int real_result = 1; 4067 int real_result = 1;
3966 pointer y = cadr (args); 4068 pointer y = cadr (args);
3967 4069
3968 if (num_is_integer (x) && num_is_integer (y)) 4070 if (is_integer (x) && is_integer (y))
3969 real_result = 0; 4071 real_result = 0;
3970 4072
3971 /* This 'if' is an R5RS compatibility fix. */ 4073 /* This 'if' is an R5RS compatibility fix. */
3972 /* NOTE: Remove this 'if' fix for R6RS. */ 4074 /* NOTE: Remove this 'if' fix for R6RS. */
3973 if (rvalue (x) == 0 && rvalue (y) < 0) 4075 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3979 /* If the test fails, result is too big for integer. */ 4081 /* If the test fails, result is too big for integer. */
3980 if (!real_result) 4082 if (!real_result)
3981 { 4083 {
3982 long result_as_long = result; 4084 long result_as_long = result;
3983 4085
3984 if (result != (RVALUE) result_as_long) 4086 if (result != result_as_long)
3985 real_result = 1; 4087 real_result = 1;
3986 } 4088 }
3987 4089
3988 if (real_result) 4090 if (real_result)
3989 s_return (mk_real (SCHEME_A_ result)); 4091 s_return (mk_real (SCHEME_A_ result));
… …
3994 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))));
3995 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))));
3996 4098
3997 case OP_TRUNCATE: 4099 case OP_TRUNCATE:
3998 { 4100 {
3999 RVALUE rvalue_of_x; 4101 RVALUE n = rvalue (x);
4000
4001 rvalue_of_x = rvalue (x);
4002
4003 if (rvalue_of_x > 0)
4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4005 else
4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007 } 4103 }
4008 4104
4009 case OP_ROUND: 4105 case OP_ROUND:
4010 if (num_is_integer (x)) 4106 if (is_integer (x))
4011 s_return (x); 4107 s_return (x);
4012 4108
4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014#endif 4110#endif
4015 4111
4016 case OP_ADD: /* + */ 4112 case OP_ADD: /* + */
4017 v = num_zero; 4113 v = num_zero;
4018 4114
4019 for (x = args; x != NIL; x = cdr (x)) 4115 for (x = args; x != NIL; x = cdr (x))
4020 v = num_op ('+', v, nvalue (car (x))); 4116 v = num_op (NUM_ADD, v, nvalue (car (x)));
4021 4117
4022 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4023 4119
4024 case OP_MUL: /* * */ 4120 case OP_MUL: /* * */
4025 v = num_one; 4121 v = num_one;
4026 4122
4027 for (x = args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4028 v = num_op ('*', v, nvalue (car (x))); 4124 v = num_op (NUM_MUL, v, nvalue (car (x)));
4029 4125
4030 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4031 4127
4032 case OP_SUB: /* - */ 4128 case OP_SUB: /* - */
4033 if (cdr (args) == NIL) 4129 if (cdr (args) == NIL)
… …
4040 x = cdr (args); 4136 x = cdr (args);
4041 v = nvalue (car (args)); 4137 v = nvalue (car (args));
4042 } 4138 }
4043 4139
4044 for (; x != NIL; x = cdr (x)) 4140 for (; x != NIL; x = cdr (x))
4045 v = num_op ('-', v, nvalue (car (x))); 4141 v = num_op (NUM_SUB, v, nvalue (car (x)));
4046 4142
4047 s_return (mk_number (SCHEME_A_ v)); 4143 s_return (mk_number (SCHEME_A_ v));
4048 4144
4049 case OP_DIV: /* / */ 4145 case OP_DIV: /* / */
4050 if (cdr (args) == NIL) 4146 if (cdr (args) == NIL)
… …
4057 x = cdr (args); 4153 x = cdr (args);
4058 v = nvalue (car (args)); 4154 v = nvalue (car (args));
4059 } 4155 }
4060 4156
4061 for (; x != NIL; x = cdr (x)) 4157 for (; x != NIL; x = cdr (x))
4062 {
4063 if (!is_zero_rvalue (rvalue (car (x)))) 4158 if (!is_zero_rvalue (rvalue (car (x))))
4064 v = num_div (v, nvalue (car (x))); 4159 v = num_div (v, nvalue (car (x)));
4065 else 4160 else
4066 Error_0 ("/: division by zero"); 4161 Error_0 ("/: division by zero");
4067 }
4068 4162
4069 s_return (mk_number (SCHEME_A_ v)); 4163 s_return (mk_number (SCHEME_A_ v));
4070 4164
4071 case OP_INTDIV: /* quotient */ 4165 case OP_INTDIV: /* quotient */
4072 if (cdr (args) == NIL) 4166 if (cdr (args) == NIL)
… …
4081 } 4175 }
4082 4176
4083 for (; x != NIL; x = cdr (x)) 4177 for (; x != NIL; x = cdr (x))
4084 { 4178 {
4085 if (ivalue (car (x)) != 0) 4179 if (ivalue (car (x)) != 0)
4086 v = num_op ('/', v, nvalue (car (x))); 4180 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4087 else 4181 else
4088 Error_0 ("quotient: division by zero"); 4182 Error_0 ("quotient: division by zero");
4089 } 4183 }
4090 4184
4091 s_return (mk_number (SCHEME_A_ v)); 4185 s_return (mk_number (SCHEME_A_ v));
… …
4108 else 4202 else
4109 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4110 4204
4111 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4112 4206
4113 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4114 s_return (caar (args)); 4208 case OP_CAR: op_car: s_return (car (x));
4115 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4116 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4117 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;
4118 4238
4119 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4120 set_cdr (args, cadr (args)); 4240 set_cdr (args, cadr (args));
4121 s_return (args); 4241 s_return (args);
4122 4242
… …
4137 } 4257 }
4138 else 4258 else
4139 Error_0 ("set-cdr!: unable to alter immutable pair"); 4259 Error_0 ("set-cdr!: unable to alter immutable pair");
4140 4260
4141 case OP_CHAR2INT: /* char->integer */ 4261 case OP_CHAR2INT: /* char->integer */
4142 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4262 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4143 4263
4144 case OP_INT2CHAR: /* integer->char */ 4264 case OP_INT2CHAR: /* integer->char */
4145 s_return (mk_character (SCHEME_A_ ivalue (x))); 4265 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4146 4266
4147 case OP_CHARUPCASE: 4267 case OP_CHARUPCASE:
4148 { 4268 {
4149 unsigned char c = ivalue (x); 4269 unsigned char c = ivalue_unchecked (x);
4150 c = toupper (c); 4270 c = toupper (c);
4151 s_return (mk_character (SCHEME_A_ c)); 4271 s_return (mk_character (SCHEME_A_ c));
4152 } 4272 }
4153 4273
4154 case OP_CHARDNCASE: 4274 case OP_CHARDNCASE:
4155 { 4275 {
4156 unsigned char c = ivalue (x); 4276 unsigned char c = ivalue_unchecked (x);
4157 c = tolower (c); 4277 c = tolower (c);
4158 s_return (mk_character (SCHEME_A_ c)); 4278 s_return (mk_character (SCHEME_A_ c));
4159 } 4279 }
4160 4280
4161 case OP_STR2SYM: /* string->symbol */ 4281 case OP_STR2SYM: /* string->symbol */
… …
4238 Error_1 ("atom->string: not an atom:", x); 4358 Error_1 ("atom->string: not an atom:", x);
4239 } 4359 }
4240 4360
4241 case OP_MKSTRING: /* make-string */ 4361 case OP_MKSTRING: /* make-string */
4242 { 4362 {
4243 int fill = ' '; 4363 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4244 int len;
4245
4246 len = ivalue (x); 4364 int len = ivalue_unchecked (x);
4247
4248 if (cdr (args) != NIL)
4249 fill = charvalue (cadr (args));
4250 4365
4251 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4366 s_return (mk_empty_string (SCHEME_A_ len, fill));
4252 } 4367 }
4253 4368
4254 case OP_STRLEN: /* string-length */ 4369 case OP_STRLEN: /* string-length */
4255 s_return (mk_integer (SCHEME_A_ strlength (x))); 4370 s_return (mk_integer (SCHEME_A_ strlength (x)));
4256 4371
4257 case OP_STRREF: /* string-ref */ 4372 case OP_STRREF: /* string-ref */
4258 { 4373 {
4259 char *str;
4260 int index;
4261
4262 str = strvalue (x); 4374 char *str = strvalue (x);
4263
4264 index = ivalue (cadr (args)); 4375 int index = ivalue_unchecked (cadr (args));
4265 4376
4266 if (index >= strlength (x)) 4377 if (index >= strlength (x))
4267 Error_1 ("string-ref: out of bounds:", cadr (args)); 4378 Error_1 ("string-ref: out of bounds:", cadr (args));
4268 4379
4269 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4380 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4270 } 4381 }
4271 4382
4272 case OP_STRSET: /* string-set! */ 4383 case OP_STRSET: /* string-set! */
4273 { 4384 {
4274 char *str; 4385 char *str = strvalue (x);
4275 int index; 4386 int index = ivalue_unchecked (cadr (args));
4276 int c; 4387 int c;
4277 4388
4278 if (is_immutable (x)) 4389 if (is_immutable (x))
4279 Error_1 ("string-set!: unable to alter immutable string:", x); 4390 Error_1 ("string-set!: unable to alter immutable string:", x);
4280
4281 str = strvalue (x);
4282
4283 index = ivalue (cadr (args));
4284 4391
4285 if (index >= strlength (x)) 4392 if (index >= strlength (x))
4286 Error_1 ("string-set!: out of bounds:", cadr (args)); 4393 Error_1 ("string-set!: out of bounds:", cadr (args));
4287 4394
4288 c = charvalue (caddr (args)); 4395 c = charvalue (caddr (args));
… …
4311 s_return (newstr); 4418 s_return (newstr);
4312 } 4419 }
4313 4420
4314 case OP_SUBSTR: /* substring */ 4421 case OP_SUBSTR: /* substring */
4315 { 4422 {
4316 char *str; 4423 char *str = strvalue (x);
4317 int index0; 4424 int index0 = ivalue_unchecked (cadr (args));
4318 int index1; 4425 int index1;
4319 int len; 4426 int len;
4320 4427
4321 str = strvalue (x);
4322
4323 index0 = ivalue (cadr (args));
4324
4325 if (index0 > strlength (x)) 4428 if (index0 > strlength (x))
4326 Error_1 ("substring: start out of bounds:", cadr (args)); 4429 Error_1 ("substring: start out of bounds:", cadr (args));
4327 4430
4328 if (cddr (args) != NIL) 4431 if (cddr (args) != NIL)
4329 { 4432 {
4330 index1 = ivalue (caddr (args)); 4433 index1 = ivalue_unchecked (caddr (args));
4331 4434
4332 if (index1 > strlength (x) || index1 < index0) 4435 if (index1 > strlength (x) || index1 < index0)
4333 Error_1 ("substring: end out of bounds:", caddr (args)); 4436 Error_1 ("substring: end out of bounds:", caddr (args));
4334 } 4437 }
4335 else 4438 else
… …
4358 if (SCHEME_V->no_memory) 4461 if (SCHEME_V->no_memory)
4359 s_return (S_SINK); 4462 s_return (S_SINK);
4360#endif 4463#endif
4361 4464
4362 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++)
4363 set_vector_elem (vec, i, car (x)); 4466 vector_set (vec, i, car (x));
4364 4467
4365 s_return (vec); 4468 s_return (vec);
4366 } 4469 }
4367 4470
4368 case OP_MKVECTOR: /* make-vector */ 4471 case OP_MKVECTOR: /* make-vector */
4369 { 4472 {
4370 pointer fill = NIL; 4473 pointer fill = NIL;
4371 int len;
4372 pointer vec; 4474 pointer vec;
4373
4374 len = ivalue (x); 4475 int len = ivalue_unchecked (x);
4375 4476
4376 if (cdr (args) != NIL) 4477 if (cdr (args) != NIL)
4377 fill = cadr (args); 4478 fill = cadr (args);
4378 4479
4379 vec = mk_vector (SCHEME_A_ len); 4480 vec = mk_vector (SCHEME_A_ len);
… …
4382 if (SCHEME_V->no_memory) 4483 if (SCHEME_V->no_memory)
4383 s_return (S_SINK); 4484 s_return (S_SINK);
4384#endif 4485#endif
4385 4486
4386 if (fill != NIL) 4487 if (fill != NIL)
4387 fill_vector (vec, fill); 4488 fill_vector (vec, 0, fill);
4388 4489
4389 s_return (vec); 4490 s_return (vec);
4390 } 4491 }
4391 4492
4392 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4393 s_return (mk_integer (SCHEME_A_ veclength (x))); 4494 s_return (mk_integer (SCHEME_A_ veclength (x)));
4394 4495
4496 case OP_VECRESIZE:
4497 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4498 s_return (x);
4499
4395 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4396 { 4501 {
4397 int index;
4398
4399 index = ivalue (cadr (args)); 4502 int index = ivalue_unchecked (cadr (args));
4400 4503
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4505 Error_1 ("vector-ref: out of bounds:", cadr (args));
4403 4506
4404 s_return (vector_elem (x, index)); 4507 s_return (vector_get (x, index));
4405 } 4508 }
4406 4509
4407 case OP_VECSET: /* vector-set! */ 4510 case OP_VECSET: /* vector-set! */
4408 { 4511 {
4409 int index; 4512 int index = ivalue_unchecked (cadr (args));
4410 4513
4411 if (is_immutable (x)) 4514 if (is_immutable (x))
4412 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4515 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4413 4516
4414 index = ivalue (cadr (args));
4415
4416 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4517 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4417 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4518 Error_1 ("vector-set!: out of bounds:", cadr (args));
4418 4519
4419 set_vector_elem (x, index, caddr (args)); 4520 vector_set (x, index, caddr (args));
4420 s_return (x); 4521 s_return (x);
4421 } 4522 }
4422 } 4523 }
4423 4524
4424 abort (); 4525 if (USE_ERROR_CHECKING) abort ();
4425}
4426
4427INTERFACE int
4428is_list (SCHEME_P_ pointer a)
4429{
4430 return list_length (SCHEME_A_ a) >= 0;
4431}
4432
4433/* Result is:
4434 proper list: length
4435 circular list: -1
4436 not even a pair: -2
4437 dotted list: -2 minus length before dot
4438*/
4439INTERFACE int
4440list_length (SCHEME_P_ pointer a)
4441{
4442 int i = 0;
4443 pointer slow, fast;
4444
4445 slow = fast = a;
4446
4447 while (1)
4448 {
4449 if (fast == NIL)
4450 return i;
4451
4452 if (!is_pair (fast))
4453 return -2 - i;
4454
4455 fast = cdr (fast);
4456 ++i;
4457
4458 if (fast == NIL)
4459 return i;
4460
4461 if (!is_pair (fast))
4462 return -2 - i;
4463
4464 ++i;
4465 fast = cdr (fast);
4466
4467 /* Safe because we would have already returned if `fast'
4468 encountered a non-pair. */
4469 slow = cdr (slow);
4470
4471 if (fast == slow)
4472 {
4473 /* the fast pointer has looped back around and caught up
4474 with the slow pointer, hence the structure is circular,
4475 not of finite length, and therefore not a list */
4476 return -1;
4477 }
4478 }
4479} 4526}
4480 4527
4481static int 4528static int
4482opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4529opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4483{ 4530{
… …
4517 pointer d = cdr (args); 4564 pointer d = cdr (args);
4518 int r; 4565 int r;
4519 4566
4520 switch (op) 4567 switch (op)
4521 { 4568 {
4522 case OP_NOT: /* not */ r = is_false (a) ; break; 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4523 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;
4524 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4525 case OP_NULLP: /* null? */ r = a == NIL ; break; 4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4526 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;
4527 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4528 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4529 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4530 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 */
4531 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4532 4580
4533#if USE_CHAR_CLASSIFIERS 4581#if USE_CHAR_CLASSIFIERS
4534 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4535 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4536 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4537 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4585 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4538 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4586 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4539#endif 4587#endif
4540 4588
4541#if USE_PORTS 4589#if USE_PORTS
4542 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4590 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4543 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4591 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4586 } 4634 }
4587 else 4635 else
4588 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4589 4637
4590 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4591 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4592 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4593 4641
4594#if USE_PORTS 4642#if USE_PORTS
4595 4643
4596 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
… …
4741 SCHEME_V->gc_verbose = (a != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4742 s_retbool (was); 4790 s_retbool (was);
4743 } 4791 }
4744 4792
4745 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4746 if (!is_pair (args) || !is_number (a)) 4795 if (!is_pair (args) || !is_number (a))
4747 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4748 4797#endif
4749 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4750
4751 s_return (S_T);
4752 4799
4753 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4754 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4755 4802
4756#if USE_PORTS 4803#if USE_PORTS
… …
4783 break; 4830 break;
4784 } 4831 }
4785 4832
4786 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4833 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4787 4834
4788 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4789 s_return (S_F);
4790
4791 s_return (p);
4792 } 4836 }
4793 4837
4794# if USE_STRING_PORTS 4838# if USE_STRING_PORTS
4795 4839
4796 case OP_OPEN_INSTRING: /* open-input-string */ 4840 case OP_OPEN_INSTRING: /* open-input-string */
… …
4811 } 4855 }
4812 4856
4813 p = port_from_string (SCHEME_A_ strvalue (a), 4857 p = port_from_string (SCHEME_A_ strvalue (a),
4814 strvalue (a) + strlength (a), prop); 4858 strvalue (a) + strlength (a), prop);
4815 4859
4816 if (p == NIL) 4860 s_return (p == NIL ? S_F : p);
4817 s_return (S_F);
4818
4819 s_return (p);
4820 } 4861 }
4821 4862
4822 case OP_OPEN_OUTSTRING: /* open-output-string */ 4863 case OP_OPEN_OUTSTRING: /* open-output-string */
4823 { 4864 {
4824 pointer p; 4865 pointer p;
4825 4866
4826 if (a == NIL) 4867 if (a == NIL)
4827 {
4828 p = port_from_scratch (SCHEME_A); 4868 p = port_from_scratch (SCHEME_A);
4829
4830 if (p == NIL)
4831 s_return (S_F);
4832 }
4833 else 4869 else
4834 {
4835 p = port_from_string (SCHEME_A_ strvalue (a), 4870 p = port_from_string (SCHEME_A_ strvalue (a),
4836 strvalue (a) + strlength (a), port_output); 4871 strvalue (a) + strlength (a), port_output);
4837 4872
4838 if (p == NIL) 4873 s_return (p == NIL ? S_F : p);
4839 s_return (S_F);
4840 }
4841
4842 s_return (p);
4843 } 4874 }
4844 4875
4845 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
4846 { 4877 {
4847 port *p; 4878 port *p = port (a);
4848 4879
4849 if ((p = a->object.port)->kind & port_string) 4880 if (p->kind & port_string)
4850 { 4881 {
4851 off_t size; 4882 off_t size;
4852 char *str; 4883 char *str;
4853 4884
4854 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4886 case OP_CURR_ENV: /* current-environment */ 4917 case OP_CURR_ENV: /* current-environment */
4887 s_return (SCHEME_V->envir); 4918 s_return (SCHEME_V->envir);
4888 4919
4889 } 4920 }
4890 4921
4891 abort (); 4922 if (USE_ERROR_CHECKING) abort ();
4892} 4923}
4893 4924
4894static int 4925static int
4895opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4926opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4896{ 4927{
… …
4959 int res; 4990 int res;
4960 4991
4961 if (is_pair (args)) 4992 if (is_pair (args))
4962 p = car (args); 4993 p = car (args);
4963 4994
4964 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
4965 4996
4966 s_retbool (res); 4997 s_retbool (res);
4967 } 4998 }
4968 4999
4969 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
… …
5028 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5059 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5029 SCHEME_V->tok = token (SCHEME_A); 5060 SCHEME_V->tok = token (SCHEME_A);
5030 s_goto (OP_RDSEXPR); 5061 s_goto (OP_RDSEXPR);
5031 5062
5032 case TOK_ATOM: 5063 case TOK_ATOM:
5033 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)));
5034 5074
5035 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
5036 x = readstrexp (SCHEME_A); 5076 x = readstrexp (SCHEME_A_ '"');
5037 5077
5038 if (x == S_F) 5078 if (x == S_F)
5039 Error_0 ("Error reading string"); 5079 Error_0 ("Error reading string");
5040 5080
5041 setimmutable (x); 5081 setimmutable (x);
… …
5053 s_goto (OP_EVAL); 5093 s_goto (OP_EVAL);
5054 } 5094 }
5055 } 5095 }
5056 5096
5057 case TOK_SHARP_CONST: 5097 case TOK_SHARP_CONST:
5058 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)
5059 Error_0 ("undefined sharp expression"); 5099 Error_0 ("undefined sharp expression");
5060 else 5100 else
5061 s_return (x); 5101 s_return (x);
5062 5102
5063 default: 5103 default:
… …
5215 putstr (SCHEME_A_ ")"); 5255 putstr (SCHEME_A_ ")");
5216 s_return (S_T); 5256 s_return (S_T);
5217 } 5257 }
5218 else 5258 else
5219 { 5259 {
5220 pointer elem = vector_elem (vec, i); 5260 pointer elem = vector_get (vec, i);
5221 5261
5222 ivalue_unchecked (cdr (args)) = i + 1; 5262 ivalue_unchecked (cdr (args)) = i + 1;
5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5224 SCHEME_V->args = elem; 5264 SCHEME_V->args = elem;
5225 5265
… …
5229 s_goto (OP_P0LIST); 5269 s_goto (OP_P0LIST);
5230 } 5270 }
5231 } 5271 }
5232 } 5272 }
5233 5273
5234 abort (); 5274 if (USE_ERROR_CHECKING) abort ();
5235} 5275}
5236 5276
5237static int 5277static int
5238opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5278opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5239{ 5279{
… …
5285 5325
5286 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5287 /* 5327 /*
5288 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5289 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5290 */ 5331 */
5291 s_retbool (is_closure (a)); 5332 s_retbool (is_closure (a));
5292 5333
5293 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5294 s_retbool (is_macro (a)); 5335 s_retbool (is_macro (a));
5295 } 5336 }
5296 5337
5297 abort (); 5338 if (USE_ERROR_CHECKING) abort ();
5298} 5339}
5299 5340
5300/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5341/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5301typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5302 5343
5303typedef int (*test_predicate)(pointer); 5344typedef int (*test_predicate)(pointer);
5304static int 5345static int
5305is_any (pointer p) 5346tst_any (pointer p)
5306{ 5347{
5307 return 1; 5348 return 1;
5308} 5349}
5309 5350
5310static int 5351static int
5311is_nonneg (pointer p) 5352tst_inonneg (pointer p)
5312{ 5353{
5313 return ivalue (p) >= 0 && is_integer (p); 5354 return is_integer (p) && ivalue_unchecked (p) >= 0;
5314} 5355}
5315 5356
5316static int 5357static int
5317tst_is_list (pointer p) 5358tst_is_list (SCHEME_P_ pointer p)
5318{ 5359{
5319 return p == NIL || is_pair (p); 5360 return p == NIL || is_pair (p);
5320} 5361}
5321 5362
5322/* Correspond carefully with following defines! */ 5363/* Correspond carefully with following defines! */
5323static struct 5364static struct
5324{ 5365{
5325 test_predicate fct; 5366 test_predicate fct;
5326 const char *kind; 5367 const char *kind;
5327} tests[] = 5368} tests[] = {
5328{
5329 { is_any, 0 }, 5369 { tst_any , 0 },
5330 { is_string, "string" }, 5370 { is_string , "string" },
5331 { is_symbol, "symbol" }, 5371 { is_symbol , "symbol" },
5332 { is_port, "port" }, 5372 { 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 { tst_is_list, "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 /* TST_NONE used for built-ins, 0 for internal ops */ 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"
… …
5388typedef struct 5428typedef struct
5389{ 5429{
5390 uint8_t func; 5430 uint8_t func;
5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5431 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5392 uint8_t builtin; 5432 uint8_t builtin;
5433#if USE_ERROR_CHECKING
5393 uint8_t min_arity; 5434 uint8_t min_arity;
5394 uint8_t max_arity; 5435 uint8_t max_arity;
5395 char arg_tests_encoding[3]; 5436 char arg_tests_encoding[3];
5437#endif
5396} op_code_info; 5438} op_code_info;
5397 5439
5398static const op_code_info dispatch_table[] = { 5440static const op_code_info dispatch_table[] = {
5441#if USE_ERROR_CHECKING
5399#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 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
5400#include "opdefines.h" 5446#include "opdefines.h"
5401#undef OP_DEF 5447#undef OP_DEF
5402 {0} 5448 {0}
5403}; 5449};
5404 5450
5405/* kernel of this interpreter */ 5451/* kernel of this interpreter */
5406static void 5452static void ecb_hot
5407Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5408{ 5454{
5409 SCHEME_V->op = op; 5455 SCHEME_V->op = op;
5410 5456
5411 for (;;) 5457 for (;;)
… …
5446 { 5492 {
5447 pointer arg = car (arglist); 5493 pointer arg = car (arglist);
5448 5494
5449 j = t[0]; 5495 j = t[0];
5450 5496
5497 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5498 if (j == TST_LIST[0])
5499 {
5500 if (!tst_is_list (SCHEME_A_ arg))
5501 break;
5502 }
5503 else
5504 {
5451 if (!tests[j - 1].fct (arg)) 5505 if (!tests[j - 1].fct (arg))
5452 break; 5506 break;
5507 }
5453 5508
5454 if (t[1]) /* 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 */
5455 t++; 5510 t++;
5456 5511
5457 arglist = cdr (arglist); 5512 arglist = cdr (arglist);
5458 i++; 5513 i++;
5459 } 5514 }
… …
5485 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5540 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5486 return; 5541 return;
5487 5542
5488 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5489 { 5544 {
5490 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5491 return; 5546 return;
5492 } 5547 }
5493 } 5548 }
5494} 5549}
5495 5550
… …
5514mk_proc (SCHEME_P_ enum scheme_opcodes op) 5569mk_proc (SCHEME_P_ enum scheme_opcodes op)
5515{ 5570{
5516 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5571 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5517 set_typeflag (y, (T_PROC | T_ATOM)); 5572 set_typeflag (y, (T_PROC | T_ATOM));
5518 ivalue_unchecked (y) = op; 5573 ivalue_unchecked (y) = op;
5519 set_num_integer (y);
5520 return y; 5574 return y;
5521} 5575}
5522 5576
5523/* 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! */
5524static int 5578static int
5525syntaxnum (pointer p) 5579syntaxnum (pointer p)
5526{ 5580{
5527 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5528 5582
5529 switch (strlength (car (p))) 5583 switch (strlength (p))
5530 { 5584 {
5531 case 2: 5585 case 2:
5532 if (s[0] == 'i') 5586 if (s[0] == 'i')
5533 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5534 else 5588 else
… …
5589 return OP_C0STREAM; /* cons-stream */ 5643 return OP_C0STREAM; /* cons-stream */
5590 } 5644 }
5591} 5645}
5592 5646
5593#if USE_MULTIPLICITY 5647#if USE_MULTIPLICITY
5594scheme * 5648ecb_cold scheme *
5595scheme_init_new () 5649scheme_init_new ()
5596{ 5650{
5597 scheme *sc = malloc (sizeof (scheme)); 5651 scheme *sc = malloc (sizeof (scheme));
5598 5652
5599 if (!scheme_init (SCHEME_A)) 5653 if (!scheme_init (SCHEME_A))
… …
5604 else 5658 else
5605 return sc; 5659 return sc;
5606} 5660}
5607#endif 5661#endif
5608 5662
5609int 5663ecb_cold int
5610scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5611{ 5665{
5612 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5613 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));
5614 5674
5615 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5616 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5617 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5618 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
… …
5630 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5631 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5632 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5633 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5634 5694
5635 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5636 { 5696 {
5637#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5638 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5639 return 0; 5699 return 0;
5640#endif 5700#endif
… …
5739scheme_set_external_data (SCHEME_P_ void *p) 5799scheme_set_external_data (SCHEME_P_ void *p)
5740{ 5800{
5741 SCHEME_V->ext_data = p; 5801 SCHEME_V->ext_data = p;
5742} 5802}
5743 5803
5744void 5804ecb_cold void
5745scheme_deinit (SCHEME_P) 5805scheme_deinit (SCHEME_P)
5746{ 5806{
5747 int i; 5807 int i;
5748 5808
5749#if SHOW_ERROR_LINE 5809#if SHOW_ERROR_LINE
… …
5970# endif 6030# endif
5971 int fin; 6031 int fin;
5972 char *file_name = InitFile; 6032 char *file_name = InitFile;
5973 int retcode; 6033 int retcode;
5974 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
5975 6036
5976 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5977 { 6038 {
5978 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5979 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5980 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
5981 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5982 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5983 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5984 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5985 return 1; 6046 return 1;
5986 } 6047 }
5987 6048
5988 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
5989 { 6050 {
5990 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
5991 return 2; 6052 return 2;
5992 } 6053 }
5993 6054
5994# if USE_PORTS 6055# if USE_PORTS
5995 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6040 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
6041#endif 6102#endif
6042 6103
6043 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
6044 { 6105 {
6045 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");
6046 } 6107 }
6047 else 6108 else
6048 { 6109 {
6049 if (isfile) 6110 if (isfile)
6050 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6054#if USE_PORTS 6115#if USE_PORTS
6055 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
6056 { 6117 {
6057 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
6058 { 6119 {
6059 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");
6060 } 6121 }
6061 6122
6062 if (isfile) 6123 if (isfile)
6063 close (fin); 6124 close (fin);
6064 } 6125 }

Diff Legend

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