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

Comparing microscheme/scheme.c (file contents):
Revision 1.18 by root, Thu Nov 26 21:32:16 2015 UTC vs.
Revision 1.52 by root, Tue Dec 1 01:56:22 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
… …
153 165
154#define toupper(c) xtoupper (c) 166#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 167#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 168#define isdigit(c) xisdigit (c)
157 169
158#if USE_STRLWR 170#if USE_IGNORECASE
159static const char * 171static const char *
160strlwr (char *s) 172xstrlwr (char *s)
161{ 173{
162 const char *p = s; 174 const char *p = s;
163 175
164 while (*s) 176 while (*s)
165 { 177 {
… …
167 s++; 179 s++;
168 } 180 }
169 181
170 return p; 182 return p;
171} 183}
172#endif
173 184
185#define stricmp(a,b) strcasecmp (a, b)
186#define strlwr(s) xstrlwr (s)
187
188#else
174#define stricmp(a,b) strcmp (a, b) 189# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 190# define strlwr(s) (s)
191#endif
176 192
177#ifndef prompt 193#ifndef prompt
178# define prompt "ts> " 194# define prompt "ts> "
179#endif 195#endif
180 196
181#ifndef InitFile 197#ifndef InitFile
182# define InitFile "init.scm" 198# define InitFile "init.scm"
183#endif 199#endif
184 200
185#ifndef FIRST_CELLSEGS
186# define FIRST_CELLSEGS 3
187#endif
188
189enum scheme_types 201enum scheme_types
190{ 202{
203 T_INTEGER,
191 T_FREE, 204 T_REAL,
192 T_STRING, 205 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 206 T_SYMBOL,
195 T_PROC, 207 T_PROC,
196 T_PAIR, 208 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 209 T_CLOSURE,
198 T_CONTINUATION, 210 T_CONTINUATION,
199 T_FOREIGN, 211 T_FOREIGN,
200 T_CHARACTER, 212 T_CHARACTER,
201 T_PORT, 213 T_PORT,
… …
211#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
215 227
228/* num, for generic arithmetic */
229struct num
230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 255
218static num num_op (enum num_op op, num a, num b); 256static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 258static num num_rem (num a, num b);
… …
223#if USE_MATH 261#if USE_MATH
224static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
225#endif 263#endif
226static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
227 265
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233
234static num num_zero; 266static num num_zero;
235static num num_one; 267static num num_one;
236 268
269/* convert "pointer" to cell* / cell* to pointer */
270#define CELL(p) ((struct cell *)(p) + 0)
271#define POINTER(c) ((void *)((c) - 0))
272
237/* macros for cell operations */ 273/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 274#define typeflag(p) (CELL(p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 275#define set_typeflag(p,v) (CELL(p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 276#define type(p) (typeflag (p) & T_MASKTYPE)
241 277
242INTERFACE INLINE int 278INTERFACE int
243is_string (pointer p) 279is_string (pointer p)
244{ 280{
245 return type (p) == T_STRING; 281 return type (p) == T_STRING;
246} 282}
247 283
248#define strvalue(p) ((p)->object.string.svalue) 284#define strvalue(p) (CELL(p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 285#define strlength(p) (CELL(p)->object.string.length)
250 286
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 287INTERFACE int
253is_vector (pointer p) 288is_vector (pointer p)
254{ 289{
255 return type (p) == T_VECTOR; 290 return type (p) == T_VECTOR;
256} 291}
257 292
258#define vecvalue(p) ((p)->object.vector.vvalue) 293#define vecvalue(p) (CELL(p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 294#define veclength(p) (CELL(p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 295INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 296INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 297INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 298
265INTERFACE uint32_t 299INTERFACE int
266vector_length (pointer vec) 300is_integer (pointer p)
267{ 301{
268 return vec->object.vector.length; 302 return type (p) == T_INTEGER;
269} 303}
270 304
305/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 306INTERFACE int
307is_real (pointer p)
308{
309 return type (p) == T_REAL;
310}
311
312INTERFACE int
272is_number (pointer p) 313is_number (pointer p)
273{ 314{
274 return type (p) == T_NUMBER; 315 return is_integer (p) || is_real (p);
275} 316}
276 317
277INTERFACE INLINE int 318INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 319is_character (pointer p)
297{ 320{
298 return type (p) == T_CHARACTER; 321 return type (p) == T_CHARACTER;
299} 322}
300 323
301INTERFACE INLINE char * 324INTERFACE char *
302string_value (pointer p) 325string_value (pointer p)
303{ 326{
304 return strvalue (p); 327 return strvalue (p);
305} 328}
306 329
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 330#define ivalue_unchecked(p) CELL(p)->object.ivalue
331#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
332
338#if USE_REAL 333#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 334#define rvalue_unchecked(p) CELL(p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 335#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 336#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 337#define rvalue_unchecked(p) CELL(p)->object.ivalue
344# define set_num_integer(p) 0 338#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 339#endif
340
347INTERFACE long 341INTERFACE long
348charvalue (pointer p) 342charvalue (pointer p)
349{ 343{
350 return ivalue_unchecked (p); 344 return ivalue_unchecked (p);
351} 345}
352 346
347#define port(p) CELL(p)->object.port
348#define set_port(p,v) port(p) = (v)
353INTERFACE INLINE int 349INTERFACE int
354is_port (pointer p) 350is_port (pointer p)
355{ 351{
356 return type (p) == T_PORT; 352 return type (p) == T_PORT;
357} 353}
358 354
359INTERFACE INLINE int 355INTERFACE int
360is_inport (pointer p) 356is_inport (pointer p)
361{ 357{
362 return is_port (p) && p->object.port->kind & port_input; 358 return is_port (p) && port (p)->kind & port_input;
363} 359}
364 360
365INTERFACE INLINE int 361INTERFACE int
366is_outport (pointer p) 362is_outport (pointer p)
367{ 363{
368 return is_port (p) && p->object.port->kind & port_output; 364 return is_port (p) && port (p)->kind & port_output;
369} 365}
370 366
371INTERFACE INLINE int 367INTERFACE int
372is_pair (pointer p) 368is_pair (pointer p)
373{ 369{
374 return type (p) == T_PAIR; 370 return type (p) == T_PAIR;
375} 371}
376 372
377#define car(p) ((p)->object.cons.car + 0) 373#define car(p) (POINTER (CELL(p)->object.cons.car))
378#define cdr(p) ((p)->object.cons.cdr + 0) 374#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
379 375
380static pointer caar (pointer p) { return car (car (p)); } 376static pointer caar (pointer p) { return car (car (p)); }
381static pointer cadr (pointer p) { return car (cdr (p)); } 377static pointer cadr (pointer p) { return car (cdr (p)); }
382static pointer cdar (pointer p) { return cdr (car (p)); } 378static pointer cdar (pointer p) { return cdr (car (p)); }
383static pointer cddr (pointer p) { return cdr (cdr (p)); } 379static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
387static pointer cdaar (pointer p) { return cdr (car (car (p))); } 383static pointer cdaar (pointer p) { return cdr (car (car (p))); }
388 384
389INTERFACE void 385INTERFACE void
390set_car (pointer p, pointer q) 386set_car (pointer p, pointer q)
391{ 387{
392 p->object.cons.car = q; 388 CELL(p)->object.cons.car = CELL (q);
393} 389}
394 390
395INTERFACE void 391INTERFACE void
396set_cdr (pointer p, pointer q) 392set_cdr (pointer p, pointer q)
397{ 393{
398 p->object.cons.cdr = q; 394 CELL(p)->object.cons.cdr = CELL (q);
399} 395}
400 396
401INTERFACE pointer 397INTERFACE pointer
402pair_car (pointer p) 398pair_car (pointer p)
403{ 399{
… …
408pair_cdr (pointer p) 404pair_cdr (pointer p)
409{ 405{
410 return cdr (p); 406 return cdr (p);
411} 407}
412 408
413INTERFACE INLINE int 409INTERFACE int
414is_symbol (pointer p) 410is_symbol (pointer p)
415{ 411{
416 return type (p) == T_SYMBOL; 412 return type (p) == T_SYMBOL;
417} 413}
418 414
419INTERFACE INLINE char * 415INTERFACE char *
420symname (pointer p) 416symname (pointer p)
421{ 417{
422 return strvalue (car (p)); 418 return strvalue (p);
423} 419}
424 420
425#if USE_PLIST 421#if USE_PLIST
422#error plists are broken because symbols are no longer pairs
423#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 424SCHEME_EXPORT int
427hasprop (pointer p) 425hasprop (pointer p)
428{ 426{
429 return typeflag (p) & T_SYMBOL; 427 return typeflag (p) & T_SYMBOL;
430} 428}
431
432# define symprop(p) cdr(p)
433#endif 429#endif
434 430
435INTERFACE INLINE int 431INTERFACE int
436is_syntax (pointer p) 432is_syntax (pointer p)
437{ 433{
438 return typeflag (p) & T_SYNTAX; 434 return typeflag (p) & T_SYNTAX;
439} 435}
440 436
441INTERFACE INLINE int 437INTERFACE int
442is_proc (pointer p) 438is_proc (pointer p)
443{ 439{
444 return type (p) == T_PROC; 440 return type (p) == T_PROC;
445} 441}
446 442
447INTERFACE INLINE int 443INTERFACE int
448is_foreign (pointer p) 444is_foreign (pointer p)
449{ 445{
450 return type (p) == T_FOREIGN; 446 return type (p) == T_FOREIGN;
451} 447}
452 448
453INTERFACE INLINE char * 449INTERFACE char *
454syntaxname (pointer p) 450syntaxname (pointer p)
455{ 451{
456 return strvalue (car (p)); 452 return strvalue (p);
457} 453}
458 454
459#define procnum(p) ivalue (p) 455#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 456static const char *procname (pointer x);
461 457
462INTERFACE INLINE int 458INTERFACE int
463is_closure (pointer p) 459is_closure (pointer p)
464{ 460{
465 return type (p) == T_CLOSURE; 461 return type (p) == T_CLOSURE;
466} 462}
467 463
468INTERFACE INLINE int 464INTERFACE int
469is_macro (pointer p) 465is_macro (pointer p)
470{ 466{
471 return type (p) == T_MACRO; 467 return type (p) == T_MACRO;
472} 468}
473 469
474INTERFACE INLINE pointer 470INTERFACE pointer
475closure_code (pointer p) 471closure_code (pointer p)
476{ 472{
477 return car (p); 473 return car (p);
478} 474}
479 475
480INTERFACE INLINE pointer 476INTERFACE pointer
481closure_env (pointer p) 477closure_env (pointer p)
482{ 478{
483 return cdr (p); 479 return cdr (p);
484} 480}
485 481
486INTERFACE INLINE int 482INTERFACE int
487is_continuation (pointer p) 483is_continuation (pointer p)
488{ 484{
489 return type (p) == T_CONTINUATION; 485 return type (p) == T_CONTINUATION;
490} 486}
491 487
492#define cont_dump(p) cdr (p) 488#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 489#define set_cont_dump(p,v) set_cdr ((p), (v))
494 490
495/* To do: promise should be forced ONCE only */ 491/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 492INTERFACE int
497is_promise (pointer p) 493is_promise (pointer p)
498{ 494{
499 return type (p) == T_PROMISE; 495 return type (p) == T_PROMISE;
500} 496}
501 497
502INTERFACE INLINE int 498INTERFACE int
503is_environment (pointer p) 499is_environment (pointer p)
504{ 500{
505 return type (p) == T_ENVIRONMENT; 501 return type (p) == T_ENVIRONMENT;
506} 502}
507 503
… …
513 509
514#define is_mark(p) (typeflag (p) & T_MARK) 510#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 513
518INTERFACE INLINE int 514INTERFACE int
519is_immutable (pointer p) 515is_immutable (pointer p)
520{ 516{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 518}
523 519
524INTERFACE INLINE void 520INTERFACE void
525setimmutable (pointer p) 521setimmutable (pointer p)
526{ 522{
527#if USE_ERROR_CHECKING 523#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 524 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 525#endif
530} 526}
531 527
528/* Result is:
529 proper list: length
530 circular list: -1
531 not even a pair: -2
532 dotted list: -2 minus length before dot
533*/
534INTERFACE int
535list_length (SCHEME_P_ pointer a)
536{
537 int i = 0;
538 pointer slow, fast;
539
540 slow = fast = a;
541
542 while (1)
543 {
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 fast = cdr (fast);
551 ++i;
552
553 if (fast == NIL)
554 return i;
555
556 if (!is_pair (fast))
557 return -2 - i;
558
559 ++i;
560 fast = cdr (fast);
561
562 /* Safe because we would have already returned if `fast'
563 encountered a non-pair. */
564 slow = cdr (slow);
565
566 if (fast == slow)
567 {
568 /* the fast pointer has looped back around and caught up
569 with the slow pointer, hence the structure is circular,
570 not of finite length, and therefore not a list */
571 return -1;
572 }
573 }
574}
575
576INTERFACE int
577is_list (SCHEME_P_ pointer a)
578{
579 return list_length (SCHEME_A_ a) >= 0;
580}
581
532#if USE_CHAR_CLASSIFIERS 582#if USE_CHAR_CLASSIFIERS
533static INLINE int 583ecb_inline int
534Cisalpha (int c) 584Cisalpha (int c)
535{ 585{
536 return isascii (c) && isalpha (c); 586 return isascii (c) && isalpha (c);
537} 587}
538 588
539static INLINE int 589ecb_inline int
540Cisdigit (int c) 590Cisdigit (int c)
541{ 591{
542 return isascii (c) && isdigit (c); 592 return isascii (c) && isdigit (c);
543} 593}
544 594
545static INLINE int 595ecb_inline int
546Cisspace (int c) 596Cisspace (int c)
547{ 597{
548 return isascii (c) && isspace (c); 598 return isascii (c) && isspace (c);
549} 599}
550 600
551static INLINE int 601ecb_inline int
552Cisupper (int c) 602Cisupper (int c)
553{ 603{
554 return isascii (c) && isupper (c); 604 return isascii (c) && isupper (c);
555} 605}
556 606
557static INLINE int 607ecb_inline int
558Cislower (int c) 608Cislower (int c)
559{ 609{
560 return isascii (c) && islower (c); 610 return isascii (c) && islower (c);
561} 611}
562#endif 612#endif
… …
623#endif 673#endif
624 674
625static int file_push (SCHEME_P_ const char *fname); 675static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 676static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 677static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 678ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 679static int alloc_cellseg (SCHEME_P);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 680ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 681static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 682static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 683static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 684static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 685static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 700static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 701static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 702static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 703static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 704static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 705static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 706static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 707ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 708static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 709static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 710static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 711static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 712static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 716static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 717static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 718static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 719static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 720static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
722static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 724static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 725static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 726static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 727static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 728static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 729static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 730static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 731static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 732
733static IVALUE
734ivalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739static RVALUE
740rvalue (pointer x)
741{
742 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
743}
744
745INTERFACE num
746nvalue (pointer x)
747{
748 num n;
749
750 num_set_fixnum (n, is_integer (x));
751
752 if (num_is_fixnum (n))
753 num_set_ivalue (n, ivalue_unchecked (x));
754 else
755 num_set_rvalue (n, rvalue_unchecked (x));
756
757 return n;
758}
759
683static num 760static num
684num_op (enum num_op op, num a, num b) 761num_op (enum num_op op, num a, num b)
685{ 762{
686 num ret; 763 num ret;
687 764
688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 765 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
689 766
690 if (num_is_fixnum (ret)) 767 if (num_is_fixnum (ret))
691 { 768 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 769 switch (op)
696 { 770 {
697 case NUM_ADD: av += bv; break; 771 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 772 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 773 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 774 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 775 }
702 776
703 num_set_ivalue (ret, av); 777 num_set_ivalue (ret, a.ivalue);
704 } 778 }
779#if USE_REAL
705 else 780 else
706 { 781 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 782 switch (op)
711 { 783 {
712 case NUM_ADD: av += bv; break; 784 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 785 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 786 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 787 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 788 }
717 789
718 num_set_rvalue (ret, av); 790 num_set_rvalue (ret, a.rvalue);
719 } 791 }
792#endif
720 793
721 return ret; 794 return ret;
722} 795}
723 796
724static num 797static num
725num_div (num a, num b) 798num_div (num a, num b)
726{ 799{
727 num ret; 800 num ret;
728 801
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 802 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
730 803
731 if (num_is_fixnum (ret)) 804 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 805 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 806 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 807 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 808
736 return ret; 809 return ret;
737} 810}
738 811
739static num 812static num
… …
741{ 814{
742 num ret; 815 num ret;
743 long e1, e2, res; 816 long e1, e2, res;
744 817
745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 818 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
746 e1 = num_get_ivalue (a); 819 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 820 e2 = num_ivalue (b);
748 res = e1 % e2; 821 res = e1 % e2;
749 822
750 /* remainder should have same sign as second operand */ 823 /* remainder should have same sign as second operand */
751 if (res > 0) 824 if (res > 0)
752 { 825 {
… …
768{ 841{
769 num ret; 842 num ret;
770 long e1, e2, res; 843 long e1, e2, res;
771 844
772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 845 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
773 e1 = num_get_ivalue (a); 846 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 847 e2 = num_ivalue (b);
775 res = e1 % e2; 848 res = e1 % e2;
776 849
777 /* modulo should have same sign as second operand */ 850 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 851 if (res * e2 < 0)
779 res += e2; 852 res += e2;
780 853
781 num_set_ivalue (ret, res); 854 num_set_ivalue (ret, res);
782 return ret; 855 return ret;
783} 856}
784 857
785/* this completely disrespects NaNs */ 858/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 859static int
787num_cmp (num a, num b) 860num_cmp (num a, num b)
788{ 861{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 862 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 863 int ret;
791 864
792 if (is_fixnum) 865 if (is_fixnum)
793 { 866 {
794 IVALUE av = num_get_ivalue (a); 867 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 868 IVALUE bv = num_ivalue (b);
796 869
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 870 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 871 }
799 else 872 else
800 { 873 {
801 RVALUE av = num_get_rvalue (a); 874 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 875 RVALUE bv = num_rvalue (b);
803 876
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 877 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 878 }
806 879
807 return ret; 880 return ret;
… …
833#endif 906#endif
834 907
835static int 908static int
836is_zero_rvalue (RVALUE x) 909is_zero_rvalue (RVALUE x)
837{ 910{
911 return x == 0;
912#if 0
838#if USE_REAL 913#if USE_REAL
839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 914 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
840#else 915#else
841 return x == 0; 916 return x == 0;
842#endif 917#endif
918#endif
843} 919}
844 920
845/* allocate new cell segment */ 921/* allocate new cell segment */
846static int 922static int
847alloc_cellseg (SCHEME_P_ int n) 923alloc_cellseg (SCHEME_P)
848{ 924{
849 pointer newp; 925 struct cell *newp;
850 pointer last; 926 struct cell *last;
851 pointer p; 927 struct cell *p;
852 char *cp; 928 char *cp;
853 long i; 929 long i;
854 int k; 930 int k;
855 931
856 static int segsize = CELL_SEGSIZE >> 1; 932 static int segsize = CELL_SEGSIZE >> 1;
857 segsize <<= 1; 933 segsize <<= 1;
858 934
859 for (k = 0; k < n; k++)
860 {
861 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
862 return k;
863
864 cp = malloc (segsize * sizeof (struct cell)); 935 cp = malloc (segsize * sizeof (struct cell));
865 936
866 if (!cp && USE_ERROR_CHECKING) 937 if (!cp && USE_ERROR_CHECKING)
867 return k; 938 return k;
868 939
869 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
871 942
872 /* insert new segment in address order */ 943 newp = (struct cell *)cp;
873 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 945 SCHEME_V->cell_segsize[i] = segsize;
876
877 //TODO: insert, not swap
878 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
879 {
880 p = SCHEME_V->cell_seg[i];
881 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
882 SCHEME_V->cell_seg[i - 1] = p;
883
884 k = SCHEME_V->cell_segsize[i];
885 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
886 SCHEME_V->cell_segsize[i - 1] = k;
887
888 --i;
889 }
890
891 SCHEME_V->fcells += segsize; 946 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 947 last = newp + segsize - 1;
893 948
894 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
895 { 950 {
951 pointer cp = POINTER (p);
896 set_typeflag (p, T_FREE); 952 set_typeflag (cp, T_PAIR);
897 set_car (p, NIL); 953 set_car (cp, NIL);
898 set_cdr (p, p + 1); 954 set_cdr (cp, POINTER (p + 1));
899 } 955 }
900 956
901 /* insert new cells in address order on free list */
902 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
903 {
904 set_cdr (last, SCHEME_V->free_cell); 957 set_cdr (POINTER (last), SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 958 SCHEME_V->free_cell = POINTER (newp);
906 }
907 else
908 {
909 p = SCHEME_V->free_cell;
910 959
911 while (cdr (p) != NIL && newp > cdr (p))
912 p = cdr (p);
913
914 set_cdr (last, cdr (p));
915 set_cdr (p, newp);
916 }
917 }
918
919 return n; 960 return 1;
920} 961}
921 962
922/* get new cell. parameter a, b is marked by gc. */ 963/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 964ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 965get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 966{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 967 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 968 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 969 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
929 return S_SINK; 970 return S_SINK;
930 971
931 if (SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->free_cell == NIL)
932 { 973 {
933 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 974 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
934 975
935 gc (SCHEME_A_ a, b); 976 gc (SCHEME_A_ a, b);
936 977
937 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 978 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
938 { 979 {
939 /* if only a few recovered, get more to avoid fruitless gc's */ 980 /* if only a few recovered, get more to avoid fruitless gc's */
940 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 981 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
941 { 982 {
942#if USE_ERROR_CHECKING 983#if USE_ERROR_CHECKING
943 SCHEME_V->no_memory = 1; 984 SCHEME_V->no_memory = 1;
944 return S_SINK; 985 return S_SINK;
945#endif 986#endif
… …
957 } 998 }
958} 999}
959 1000
960/* To retain recent allocs before interpreter knows about them - 1001/* To retain recent allocs before interpreter knows about them -
961 Tehom */ 1002 Tehom */
962
963static void 1003static void
964push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
965{ 1005{
966 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
967 1007
… …
989} 1029}
990 1030
991static pointer 1031static pointer
992get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1032get_vector_object (SCHEME_P_ uint32_t len, pointer init)
993{ 1033{
994 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1034 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
995 pointer *e = malloc (len * sizeof (pointer)); 1035 pointer *e = malloc (len * sizeof (pointer));
996 1036
997 if (!e && USE_ERROR_CHECKING) 1037 if (!e && USE_ERROR_CHECKING)
998 return S_SINK; 1038 return S_SINK;
999 1039
1000 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1042
1003 v->object.vector.vvalue = e; 1043 CELL(v)->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1044 CELL(v)->object.vector.length = len;
1005 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1047
1008 return v; 1048 return v;
1009} 1049}
1010 1050
1011static INLINE void 1051ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1013{ 1053{
1014 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1015} 1055}
1016 1056
… …
1053 set_cdr (x, b); 1093 set_cdr (x, b);
1054 1094
1055 return x; 1095 return x;
1056} 1096}
1057 1097
1098static pointer
1099generate_symbol (SCHEME_P_ const char *name)
1100{
1101 pointer x = mk_string (SCHEME_A_ name);
1102 setimmutable (x);
1103 set_typeflag (x, T_SYMBOL | T_ATOM);
1104 return x;
1105}
1106
1058/* ========== oblist implementation ========== */ 1107/* ========== oblist implementation ========== */
1059 1108
1060#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1061 1110
1111static int
1062static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1063 1122
1064static pointer 1123static pointer
1065oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1066{ 1125{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1069 1128
1070/* returns the new symbol */ 1129/* returns the new symbol */
1071static pointer 1130static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1132{
1074 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1075
1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1077 set_typeflag (x, T_SYMBOL);
1078 setimmutable (car (x));
1079
1080 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1081 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1082 return x; 1136 return x;
1083} 1137}
1084 1138
1085static INLINE pointer 1139ecb_inline pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1141{
1088 int location; 1142 int location;
1089 pointer x; 1143 pointer x;
1090 char *s; 1144 char *s;
1091 1145
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1147
1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1095 { 1149 {
1096 s = symname (car (x)); 1150 s = symname (car (x));
1097 1151
1098 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1109 int i; 1163 int i;
1110 pointer x; 1164 pointer x;
1111 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1112 1166
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1115 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1116 1170
1117 return ob_list; 1171 return ob_list;
1118} 1172}
1119 1173
… …
1123oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1124{ 1178{
1125 return NIL; 1179 return NIL;
1126} 1180}
1127 1181
1128static INLINE pointer 1182ecb_inline pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1184{
1131 pointer x; 1185 pointer x;
1132 char *s; 1186 char *s;
1133 1187
… …
1145 1199
1146/* returns the new symbol */ 1200/* returns the new symbol */
1147static pointer 1201static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1203{
1150 pointer x; 1204 pointer x = generate_symbol (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x));
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1205 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1206 return x;
1157} 1207}
1158 1208
1159static pointer 1209static pointer
… …
1169mk_port (SCHEME_P_ port *p) 1219mk_port (SCHEME_P_ port *p)
1170{ 1220{
1171 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1221 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1172 1222
1173 set_typeflag (x, T_PORT | T_ATOM); 1223 set_typeflag (x, T_PORT | T_ATOM);
1174 x->object.port = p; 1224 set_port (x, p);
1175 1225
1176 return x; 1226 return x;
1177} 1227}
1178#endif 1228#endif
1179 1229
1180pointer 1230pointer
1181mk_foreign_func (SCHEME_P_ foreign_func f) 1231mk_foreign_func (SCHEME_P_ foreign_func f)
1182{ 1232{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1233 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1234
1185 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1235 set_typeflag (x, T_FOREIGN | T_ATOM);
1186 x->object.ff = f; 1236 CELL(x)->object.ff = f;
1187 1237
1188 return x; 1238 return x;
1189} 1239}
1190 1240
1191INTERFACE pointer 1241INTERFACE pointer
1192mk_character (SCHEME_P_ int c) 1242mk_character (SCHEME_P_ int c)
1193{ 1243{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1244 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1245
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1246 set_typeflag (x, T_CHARACTER | T_ATOM);
1197 ivalue_unchecked (x) = c & 0xff; 1247 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1248
1199 return x; 1249 return x;
1200} 1250}
1201 1251
1202/* get number atom (integer) */ 1252/* get number atom (integer) */
1203INTERFACE pointer 1253INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1254mk_integer (SCHEME_P_ long n)
1205{ 1255{
1256 pointer p = 0;
1257 pointer *pp = &p;
1258
1259#if USE_INTCACHE
1260 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1261 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1262#endif
1263
1264 if (!*pp)
1265 {
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1266 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1267
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1268 set_typeflag (x, T_INTEGER | T_ATOM);
1209 ivalue_unchecked (x) = num; 1269 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1210 set_num_integer (x); 1270 set_ivalue (x, n);
1271
1272 *pp = x;
1273 }
1274
1211 return x; 1275 return *pp;
1212} 1276}
1213 1277
1214INTERFACE pointer 1278INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1279mk_real (SCHEME_P_ RVALUE n)
1216{ 1280{
1281#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1282 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1283
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1284 set_typeflag (x, T_REAL | T_ATOM);
1220 rvalue_unchecked (x) = n; 1285 set_rvalue (x, n);
1221 set_num_real (x); 1286
1222 return x; 1287 return x;
1288#else
1289 return mk_integer (SCHEME_A_ n);
1290#endif
1223} 1291}
1224 1292
1225static pointer 1293static pointer
1226mk_number (SCHEME_P_ const num n) 1294mk_number (SCHEME_P_ const num n)
1227{ 1295{
1296#if USE_REAL
1228 if (num_is_fixnum (n)) 1297 return num_is_fixnum (n)
1298 ? mk_integer (SCHEME_A_ num_ivalue (n))
1299 : mk_real (SCHEME_A_ num_rvalue (n));
1300#else
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1301 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1302#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1303}
1233 1304
1234/* allocate name to string area */ 1305/* allocate name to string area */
1235static char * 1306static char *
1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1307store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1242 SCHEME_V->no_memory = 1; 1313 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1314 return SCHEME_V->strbuff;
1244 } 1315 }
1245 1316
1246 if (str) 1317 if (str)
1247 { 1318 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1248 int l = strlen (str);
1249
1250 if (l > len_str)
1251 l = len_str;
1252
1253 memcpy (q, str, l);
1254 q[l] = 0;
1255 }
1256 else 1319 else
1257 {
1258 memset (q, fill, len_str); 1320 memset (q, fill, len_str);
1321
1259 q[len_str] = 0; 1322 q[len_str] = 0;
1260 }
1261 1323
1262 return q; 1324 return q;
1263} 1325}
1264 1326
1265INTERFACE pointer 1327INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1341 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1342
1281 set_typeflag (x, T_STRING | T_ATOM); 1343 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1344 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1345 strlength (x) = len;
1346
1284 return x; 1347 return x;
1285} 1348}
1286 1349
1287INTERFACE pointer 1350INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1351mk_string (SCHEME_P_ const char *str)
… …
1295{ 1358{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1359 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1360}
1298 1361
1299INTERFACE void 1362INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1363fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1364{
1302 int i; 1365 int i;
1303 1366
1304 for (i = 0; i < vec->object.vector.length; i++) 1367 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1368 vecvalue (vec)[i] = obj;
1306} 1369}
1307 1370
1371INTERFACE void
1372vector_resize (pointer vec, uint32_t newsize, pointer fill)
1373{
1374 uint32_t oldsize = veclength (vec);
1375 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1376 veclength (vec) = newsize;
1377 fill_vector (vec, oldsize, fill);
1378}
1379
1308INTERFACE pointer 1380INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1381vector_get (pointer vec, uint32_t ielem)
1310{ 1382{
1311 return vecvalue(vec)[ielem]; 1383 return vecvalue(vec)[ielem];
1312} 1384}
1313 1385
1314INTERFACE void 1386INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1387vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1388{
1317 vecvalue(vec)[ielem] = a; 1389 vecvalue(vec)[ielem] = a;
1318} 1390}
1319 1391
1320/* get new symbol */ 1392/* get new symbol */
… …
1332 1404
1333INTERFACE pointer 1405INTERFACE pointer
1334gensym (SCHEME_P) 1406gensym (SCHEME_P)
1335{ 1407{
1336 pointer x; 1408 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1409 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1410 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1342 1411
1343 /* first check oblist */ 1412 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name); 1413}
1345 1414
1346 if (x == NIL) 1415static int
1347 { 1416is_gensym (SCHEME_P_ pointer x)
1348 x = oblist_add_by_name (SCHEME_A_ name); 1417{
1349 return x; 1418 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1419}
1355 1420
1356/* make symbol or number atom from string */ 1421/* make symbol or number atom from string */
1357static pointer 1422static pointer
1358mk_atom (SCHEME_P_ char *q) 1423mk_atom (SCHEME_P_ char *q)
… …
1412 } 1477 }
1413 else if ((c == 'e') || (c == 'E')) 1478 else if ((c == 'e') || (c == 'E'))
1414 { 1479 {
1415 if (!has_fp_exp) 1480 if (!has_fp_exp)
1416 { 1481 {
1417 has_dec_point = 1; /* decimal point illegal 1482 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1483 p++;
1420 1484
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1485 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1486 continue;
1423 } 1487 }
… …
1511 1575
1512 if (ecb_expect_false (is_vector (p))) 1576 if (ecb_expect_false (is_vector (p)))
1513 { 1577 {
1514 int i; 1578 int i;
1515 1579
1516 for (i = 0; i < p->object.vector.length; i++) 1580 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1581 mark (vecvalue (p)[i]);
1518 } 1582 }
1519 1583
1520 if (is_atom (p)) 1584 if (is_atom (p))
1521 goto E6; 1585 goto E6;
… …
1568 1632
1569/* garbage collection. parameter a, b is marked. */ 1633/* garbage collection. parameter a, b is marked. */
1570static void 1634static void
1571gc (SCHEME_P_ pointer a, pointer b) 1635gc (SCHEME_P_ pointer a, pointer b)
1572{ 1636{
1573 pointer p;
1574 int i; 1637 int i;
1575 1638
1576 if (SCHEME_V->gc_verbose) 1639 if (SCHEME_V->gc_verbose)
1577 putstr (SCHEME_A_ "gc..."); 1640 putstr (SCHEME_A_ "gc...");
1578 1641
… …
1594 /* Mark recent objects the interpreter doesn't know about yet. */ 1657 /* Mark recent objects the interpreter doesn't know about yet. */
1595 mark (car (S_SINK)); 1658 mark (car (S_SINK));
1596 /* Mark any older stuff above nested C calls */ 1659 /* Mark any older stuff above nested C calls */
1597 mark (SCHEME_V->c_nest); 1660 mark (SCHEME_V->c_nest);
1598 1661
1662#if USE_INTCACHE
1663 /* mark intcache */
1664 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1665 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1666 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1667#endif
1668
1599 /* mark variables a, b */ 1669 /* mark variables a, b */
1600 mark (a); 1670 mark (a);
1601 mark (b); 1671 mark (b);
1602 1672
1603 /* garbage collect */ 1673 /* garbage collect */
1604 clrmark (NIL); 1674 clrmark (NIL);
1605 SCHEME_V->fcells = 0; 1675 SCHEME_V->fcells = 0;
1606 SCHEME_V->free_cell = NIL; 1676 SCHEME_V->free_cell = NIL;
1607 1677
1608 /* free-list is kept sorted by address so as to maintain consecutive 1678 if (SCHEME_V->gc_verbose)
1609 ranges, if possible, for use with vectors. Here we scan the cells 1679 xwrstr ("freeing...");
1610 (which are also kept sorted by address) downwards to build the 1680
1611 free-list in sorted order. 1681 uint32_t total = 0;
1612 */ 1682
1683 /* Here we scan the cells to build the free-list. */
1613 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1684 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1614 { 1685 {
1615 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1686 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1687 struct cell *p;
1688 total += SCHEME_V->cell_segsize [i];
1616 1689
1617 while (--p >= SCHEME_V->cell_seg[i]) 1690 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1618 { 1691 {
1692 pointer c = POINTER (p);
1693
1619 if (is_mark (p)) 1694 if (is_mark (c))
1620 clrmark (p); 1695 clrmark (c);
1621 else 1696 else
1622 { 1697 {
1623 /* reclaim cell */ 1698 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1699 if (typeflag (c) != T_PAIR)
1625 { 1700 {
1626 finalize_cell (SCHEME_A_ p); 1701 finalize_cell (SCHEME_A_ c);
1627 set_typeflag (p, T_FREE); 1702 set_typeflag (c, T_PAIR);
1628 set_car (p, NIL); 1703 set_car (c, NIL);
1629 } 1704 }
1630 1705
1631 ++SCHEME_V->fcells; 1706 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1707 set_cdr (c, SCHEME_V->free_cell);
1633 SCHEME_V->free_cell = p; 1708 SCHEME_V->free_cell = c;
1634 } 1709 }
1635 } 1710 }
1636 } 1711 }
1637 1712
1638 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1714 {
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1716 }
1640} 1717}
1641 1718
1642static void 1719static void
1643finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1644{ 1721{
1645 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1646 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1647 free (strvalue (a)); 1724 free (strvalue (a));
1648 else if (is_vector (a)) 1725 else if (is_vector (a))
1649 free (vecvalue (a)); 1726 free (vecvalue (a));
1650#if USE_PORTS 1727#if USE_PORTS
1651 else if (is_port (a)) 1728 else if (is_port (a))
1652 { 1729 {
1653 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1730 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1654 port_close (SCHEME_A_ a, port_input | port_output); 1731 port_close (SCHEME_A_ a, port_input | port_output);
1655 1732
1656 free (a->object.port); 1733 free (port (a));
1657 } 1734 }
1658#endif 1735#endif
1659} 1736}
1660 1737
1661/* ========== Routines for Reading ========== */ 1738/* ========== Routines for Reading ========== */
… …
1677 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1754 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1678 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1755 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1679 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1680 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1681 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1758 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1682 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1759 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1683 1760
1684#if SHOW_ERROR_LINE 1761#if SHOW_ERROR_LINE
1685 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1762 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1686 1763
1687 if (fname) 1764 if (fname)
… …
1704 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1705#if USE_PORTS 1782#if USE_PORTS
1706 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1707#endif 1784#endif
1708 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1709 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1710 } 1787 }
1711} 1788}
1712 1789
1713static int 1790static int
1714file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1715{ 1792{
1716#if USE_PORTS 1793#if USE_PORTS
1717 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1718 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1719 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1720#else 1797#else
1721 return 0; 1798 return 0;
1722#endif 1799#endif
1723} 1800}
1724 1801
… …
1858} 1935}
1859 1936
1860static void 1937static void
1861port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1862{ 1939{
1863 port *pt = p->object.port; 1940 port *pt = port (p);
1864 1941
1865 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1866 1943
1867 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1868 { 1945 {
… …
1889/* get new character from input file */ 1966/* get new character from input file */
1890static int 1967static int
1891inchar (SCHEME_P) 1968inchar (SCHEME_P)
1892{ 1969{
1893 int c; 1970 int c;
1894 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1895
1896 pt = SCHEME_V->inport->object.port;
1897 1972
1898 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1899 return EOF; 1974 return EOF;
1900 1975
1901 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1968 port *pt; 2043 port *pt;
1969 2044
1970 if (c == EOF) 2045 if (c == EOF)
1971 return; 2046 return;
1972 2047
1973 pt = SCHEME_V->inport->object.port; 2048 pt = port (SCHEME_V->inport);
1974 pt->unget = c; 2049 pt->unget = c;
1975#else 2050#else
1976 if (c == EOF) 2051 if (c == EOF)
1977 return; 2052 return;
1978 2053
… …
2006 2081
2007INTERFACE void 2082INTERFACE void
2008putstr (SCHEME_P_ const char *s) 2083putstr (SCHEME_P_ const char *s)
2009{ 2084{
2010#if USE_PORTS 2085#if USE_PORTS
2011 port *pt = SCHEME_V->outport->object.port; 2086 port *pt = port (SCHEME_V->outport);
2012 2087
2013 if (pt->kind & port_file) 2088 if (pt->kind & port_file)
2014 write (pt->rep.stdio.file, s, strlen (s)); 2089 write (pt->rep.stdio.file, s, strlen (s));
2015 else 2090 else
2016 for (; *s; s++) 2091 for (; *s; s++)
… …
2026 2101
2027static void 2102static void
2028putchars (SCHEME_P_ const char *s, int len) 2103putchars (SCHEME_P_ const char *s, int len)
2029{ 2104{
2030#if USE_PORTS 2105#if USE_PORTS
2031 port *pt = SCHEME_V->outport->object.port; 2106 port *pt = port (SCHEME_V->outport);
2032 2107
2033 if (pt->kind & port_file) 2108 if (pt->kind & port_file)
2034 write (pt->rep.stdio.file, s, len); 2109 write (pt->rep.stdio.file, s, len);
2035 else 2110 else
2036 { 2111 {
… …
2050 2125
2051INTERFACE void 2126INTERFACE void
2052putcharacter (SCHEME_P_ int c) 2127putcharacter (SCHEME_P_ int c)
2053{ 2128{
2054#if USE_PORTS 2129#if USE_PORTS
2055 port *pt = SCHEME_V->outport->object.port; 2130 port *pt = port (SCHEME_V->outport);
2056 2131
2057 if (pt->kind & port_file) 2132 if (pt->kind & port_file)
2058 { 2133 {
2059 char cc = c; 2134 char cc = c;
2060 write (pt->rep.stdio.file, &cc, 1); 2135 write (pt->rep.stdio.file, &cc, 1);
… …
2073#endif 2148#endif
2074} 2149}
2075 2150
2076/* read characters up to delimiter, but cater to character constants */ 2151/* read characters up to delimiter, but cater to character constants */
2077static char * 2152static char *
2078readstr_upto (SCHEME_P_ char *delim) 2153readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2154{
2080 char *p = SCHEME_V->strbuff; 2155 char *p = SCHEME_V->strbuff + skip;
2081 2156
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2157 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2158
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2159 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2160 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2167 return SCHEME_V->strbuff;
2093} 2168}
2094 2169
2095/* read string expression "xxx...xxx" */ 2170/* read string expression "xxx...xxx" */
2096static pointer 2171static pointer
2097readstrexp (SCHEME_P) 2172readstrexp (SCHEME_P_ char delim)
2098{ 2173{
2099 char *p = SCHEME_V->strbuff; 2174 char *p = SCHEME_V->strbuff;
2100 int c; 2175 int c;
2101 int c1 = 0; 2176 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2177 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2178
2105 for (;;) 2179 for (;;)
2106 { 2180 {
2107 c = inchar (SCHEME_A); 2181 c = inchar (SCHEME_A);
2108 2182
… …
2110 return S_F; 2184 return S_F;
2111 2185
2112 switch (state) 2186 switch (state)
2113 { 2187 {
2114 case st_ok: 2188 case st_ok:
2115 switch (c) 2189 if (ecb_expect_false (c == delim))
2116 {
2117 case '\\':
2118 state = st_bsl;
2119 break;
2120
2121 case '"':
2122 *p = 0;
2123 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2190 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2191
2125 default: 2192 if (ecb_expect_false (c == '\\'))
2193 state = st_bsl;
2194 else
2126 *p++ = c; 2195 *p++ = c;
2127 break;
2128 }
2129 2196
2130 break; 2197 break;
2131 2198
2132 case st_bsl: 2199 case st_bsl:
2133 switch (c) 2200 switch (c)
… …
2163 case 'r': 2230 case 'r':
2164 *p++ = '\r'; 2231 *p++ = '\r';
2165 state = st_ok; 2232 state = st_ok;
2166 break; 2233 break;
2167 2234
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2235 default:
2174 *p++ = c; 2236 *p++ = c;
2175 state = st_ok; 2237 state = st_ok;
2176 break; 2238 break;
2177 } 2239 }
2178 2240
2179 break; 2241 break;
2180 2242
2181 case st_x1: 2243 case st_x1:
2182 case st_x2: 2244 case st_x2:
2183 c = toupper (c); 2245 c = tolower (c);
2184 2246
2185 if (c >= '0' && c <= 'F') 2247 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2248 c1 = (c1 << 4) + c - '0';
2189 else 2249 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2250 c1 = (c1 << 4) + c - 'a' + 10;
2191
2192 if (state == st_x1)
2193 state = st_x2;
2194 else
2195 {
2196 *p++ = c1;
2197 state = st_ok;
2198 }
2199 }
2200 else 2251 else
2201 return S_F; 2252 return S_F;
2253
2254 if (state == st_x1)
2255 state = st_x2;
2256 else
2257 {
2258 *p++ = c1;
2259 state = st_ok;
2260 }
2202 2261
2203 break; 2262 break;
2204 2263
2205 case st_oct1: 2264 case st_oct1:
2206 case st_oct2: 2265 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2269 backchar (SCHEME_A_ c);
2211 state = st_ok; 2270 state = st_ok;
2212 } 2271 }
2213 else 2272 else
2214 { 2273 {
2215 if (state == st_oct2 && c1 >= 32) 2274 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2275 return S_F;
2217 2276
2218 c1 = (c1 << 3) + (c - '0'); 2277 c1 = (c1 << 3) + (c - '0');
2219 2278
2220 if (state == st_oct1) 2279 if (state == st_oct1)
… …
2225 state = st_ok; 2284 state = st_ok;
2226 } 2285 }
2227 } 2286 }
2228 2287
2229 break; 2288 break;
2230
2231 } 2289 }
2232 } 2290 }
2233} 2291}
2234 2292
2235/* check c is in chars */ 2293/* check c is in chars */
2236static INLINE int 2294ecb_inline int
2237is_one_of (char *s, int c) 2295is_one_of (const char *s, int c)
2238{ 2296{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2297 return c == EOF || !!strchr (s, c);
2243} 2298}
2244 2299
2245/* skip white characters */ 2300/* skip white characters */
2246static INLINE int 2301ecb_inline int
2247skipspace (SCHEME_P) 2302skipspace (SCHEME_P)
2248{ 2303{
2249 int c, curr_line = 0; 2304 int c, curr_line = 0;
2250 2305
2251 do 2306 do
2252 { 2307 {
2253 c = inchar (SCHEME_A); 2308 c = inchar (SCHEME_A);
2309
2254#if SHOW_ERROR_LINE 2310#if SHOW_ERROR_LINE
2255 if (c == '\n') 2311 if (ecb_expect_false (c == '\n'))
2256 curr_line++; 2312 curr_line++;
2257#endif 2313#endif
2314
2315 if (ecb_expect_false (c == EOF))
2316 return c;
2258 } 2317 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2318 while (is_one_of (WHITESPACE, c));
2260 2319
2261 /* record it */ 2320 /* record it */
2262#if SHOW_ERROR_LINE 2321#if SHOW_ERROR_LINE
2263 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2322 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2264 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2323 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2265#endif 2324#endif
2266 2325
2267 if (c != EOF)
2268 {
2269 backchar (SCHEME_A_ c); 2326 backchar (SCHEME_A_ c);
2270 return 1; 2327 return 1;
2271 }
2272 else
2273 return EOF;
2274} 2328}
2275 2329
2276/* get token */ 2330/* get token */
2277static int 2331static int
2278token (SCHEME_P) 2332token (SCHEME_P)
… …
2294 return TOK_RPAREN; 2348 return TOK_RPAREN;
2295 2349
2296 case '.': 2350 case '.':
2297 c = inchar (SCHEME_A); 2351 c = inchar (SCHEME_A);
2298 2352
2299 if (is_one_of (" \n\t", c)) 2353 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2354 return TOK_DOT;
2301 else 2355 else
2302 { 2356 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2357 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2358 return TOK_DOTATOM;
2307 } 2359 }
2360
2361 case '|':
2362 return TOK_STRATOM;
2308 2363
2309 case '\'': 2364 case '\'':
2310 return TOK_QUOTE; 2365 return TOK_QUOTE;
2311 2366
2312 case ';': 2367 case ';':
… …
2444 } 2499 }
2445 2500
2446 putcharacter (SCHEME_A_ '"'); 2501 putcharacter (SCHEME_A_ '"');
2447} 2502}
2448 2503
2449
2450/* print atoms */ 2504/* print atoms */
2451static void 2505static void
2452printatom (SCHEME_P_ pointer l, int f) 2506printatom (SCHEME_P_ pointer l, int f)
2453{ 2507{
2454 char *p; 2508 char *p;
2455 int len; 2509 int len;
2456 2510
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2511 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2512 putchars (SCHEME_A_ p, len);
2459} 2513}
2460
2461 2514
2462/* Uses internal buffer unless string pointer is already available */ 2515/* Uses internal buffer unless string pointer is already available */
2463static void 2516static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2517atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2518{
… …
2479 { 2532 {
2480 p = SCHEME_V->strbuff; 2533 p = SCHEME_V->strbuff;
2481 2534
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2535 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2536 {
2484 if (num_is_integer (l)) 2537 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2538 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2539#if USE_REAL
2487 else 2540 else
2488 { 2541 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2542 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2679#endif
2627 } 2680 }
2628 else if (is_continuation (l)) 2681 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2682 p = "#<CONTINUATION>";
2630 else 2683 else
2684 {
2685#if USE_PRINTF
2686 p = SCHEME_V->strbuff;
2687 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2688#else
2631 p = "#<ERROR>"; 2689 p = "#<ERROR>";
2690#endif
2691 }
2632 2692
2633 *pp = p; 2693 *pp = p;
2634 *plen = strlen (p); 2694 *plen = strlen (p);
2635} 2695}
2636 2696
… …
2744 return 0; 2804 return 0;
2745 } 2805 }
2746 else if (is_number (a)) 2806 else if (is_number (a))
2747 { 2807 {
2748 if (is_number (b)) 2808 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2809 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2810
2752 return 0; 2811 return 0;
2753 } 2812 }
2754 else if (is_character (a)) 2813 else if (is_character (a))
2755 { 2814 {
… …
2781/* () is #t in R5RS */ 2840/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2841#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2842#define is_false(p) ((p) == S_F)
2784 2843
2785/* ========== Environment implementation ========== */ 2844/* ========== Environment implementation ========== */
2786
2787#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2788
2789static int
2790hash_fn (const char *key, int table_size)
2791{
2792 const unsigned char *p = key;
2793 uint32_t hash = 2166136261;
2794
2795 while (*p)
2796 hash = (hash ^ *p++) * 16777619;
2797
2798 return hash % table_size;
2799}
2800#endif
2801 2845
2802#ifndef USE_ALIST_ENV 2846#ifndef USE_ALIST_ENV
2803 2847
2804/* 2848/*
2805 * In this implementation, each frame of the environment may be 2849 * In this implementation, each frame of the environment may be
… …
2822 2866
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2867 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2868 setenvironment (SCHEME_V->envir);
2825} 2869}
2826 2870
2827static INLINE void 2871static uint32_t
2872sym_hash (pointer sym, uint32_t size)
2873{
2874 uintptr_t ptr = (uintptr_t)sym;
2875
2876#if 0
2877 /* table size is prime, so why mix */
2878 ptr += ptr >> 32;
2879 ptr += ptr >> 16;
2880 ptr += ptr >> 8;
2881#endif
2882
2883 return ptr % size;
2884}
2885
2886ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2887new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2888{
2830 pointer slot = immutable_cons (variable, value); 2889 pointer slot = immutable_cons (variable, value);
2831 2890
2832 if (is_vector (car (env))) 2891 if (is_vector (car (env)))
2833 { 2892 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2893 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2894 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2895 }
2838 else 2896 else
2839 set_car (env, immutable_cons (slot, car (env))); 2897 set_car (env, immutable_cons (slot, car (env)));
2840} 2898}
2841 2899
2842static pointer 2900static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2901find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2902{
2845 pointer x, y; 2903 pointer x, y;
2846 int location;
2847 2904
2848 for (x = env; x != NIL; x = cdr (x)) 2905 for (x = env; x != NIL; x = cdr (x))
2849 { 2906 {
2850 if (is_vector (car (x))) 2907 if (is_vector (car (x)))
2851 { 2908 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2909 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2910 y = vector_get (car (x), location);
2854 } 2911 }
2855 else 2912 else
2856 y = car (x); 2913 y = car (x);
2857 2914
2858 for (; y != NIL; y = cdr (y)) 2915 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2916 if (caar (y) == hdl)
2860 break; 2917 break;
2861 2918
2862 if (y != NIL) 2919 if (y != NIL)
2920 return car (y);
2921
2922 if (!all)
2863 break; 2923 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2924 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2925
2872 return NIL; 2926 return NIL;
2873} 2927}
2874 2928
2875#else /* USE_ALIST_ENV */ 2929#else /* USE_ALIST_ENV */
2876 2930
2877static INLINE void 2931ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2932new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2933{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2934 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2935 setenvironment (SCHEME_V->envir);
2882} 2936}
2883 2937
2884static INLINE void 2938ecb_inline void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2939new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2940{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2941 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2942}
2889 2943
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2951 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2952 if (caar (y) == hdl)
2899 break; 2953 break;
2900 2954
2901 if (y != NIL) 2955 if (y != NIL)
2956 return car (y);
2902 break; 2957 break;
2903 2958
2904 if (!all) 2959 if (!all)
2905 return NIL; 2960 break;
2906 } 2961 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2962
2911 return NIL; 2963 return NIL;
2912} 2964}
2913 2965
2914#endif /* USE_ALIST_ENV else */ 2966#endif /* USE_ALIST_ENV else */
2915 2967
2916static INLINE void 2968ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2969new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2970{
2971 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2972 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2973}
2921 2974
2922static INLINE void 2975ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2976set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2977{
2925 set_cdr (slot, value); 2978 set_cdr (slot, value);
2926} 2979}
2927 2980
2928static INLINE pointer 2981ecb_inline pointer
2929slot_value_in_env (pointer slot) 2982slot_value_in_env (pointer slot)
2930{ 2983{
2931 return cdr (slot); 2984 return cdr (slot);
2932} 2985}
2933 2986
2934/* ========== Evaluation Cycle ========== */ 2987/* ========== Evaluation Cycle ========== */
2935 2988
2936static pointer 2989static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2990xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2991{
2939#if USE_ERROR_HOOK 2992#if USE_ERROR_HOOK
2940 pointer x; 2993 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2994 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3029 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3030 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3031 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3032 SCHEME_V->op = OP_EVAL;
2980 3033
2981 return S_T; 3034 return 0;
2982 } 3035 }
2983#endif 3036#endif
2984 3037
2985 if (a) 3038 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3039 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3041 SCHEME_V->args = NIL;
2989 3042
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3043 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3044 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3045 SCHEME_V->op = OP_ERR0;
3046
2993 return S_T; 3047 return 0;
2994} 3048}
2995 3049
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3050#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3051#define Error_0(s) Error_1 (s, 0)
2998 3052
2999/* Too small to turn into function */ 3053/* Too small to turn into function */
3000#define BEGIN do { 3054#define BEGIN do {
3001#define END } while (0) 3055#define END } while (0)
3002#define s_goto(a) BEGIN \ 3056#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3057 SCHEME_V->op = a; \
3004 return S_T; END 3058 return 0; END
3005 3059
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3060#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3061
3008#ifndef USE_SCHEME_STACK 3062#ifndef USE_SCHEME_STACK
3009 3063
… …
3023{ 3077{
3024 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3025 struct dump_stack_frame *next_frame; 3079 struct dump_stack_frame *next_frame;
3026 3080
3027 /* enough room for the next frame? */ 3081 /* enough room for the next frame? */
3028 if (nframes >= SCHEME_V->dump_size) 3082 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3029 { 3083 {
3030 SCHEME_V->dump_size += STACK_GROWTH; 3084 SCHEME_V->dump_size += STACK_GROWTH;
3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3085 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3032 } 3086 }
3033 3087
… …
3039 next_frame->code = code; 3093 next_frame->code = code;
3040 3094
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3095 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3096}
3043 3097
3044static pointer 3098static int
3045xs_return (SCHEME_P_ pointer a) 3099xs_return (SCHEME_P_ pointer a)
3046{ 3100{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3101 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3102 struct dump_stack_frame *frame;
3049 3103
3050 SCHEME_V->value = a; 3104 SCHEME_V->value = a;
3051 3105
3052 if (nframes <= 0) 3106 if (nframes <= 0)
3053 return NIL; 3107 return -1;
3054 3108
3055 frame = &SCHEME_V->dump_base[--nframes]; 3109 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3110 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3111 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3112 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3113 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3114 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3115
3062 return S_T; 3116 return 0;
3063} 3117}
3064 3118
3065static INLINE void 3119ecb_inline void
3066dump_stack_reset (SCHEME_P) 3120dump_stack_reset (SCHEME_P)
3067{ 3121{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3122 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3123 SCHEME_V->dump = (pointer)+0;
3070} 3124}
3071 3125
3072static INLINE void 3126ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3127dump_stack_initialize (SCHEME_P)
3074{ 3128{
3075 SCHEME_V->dump_size = 0; 3129 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3130 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3131 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3184 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3185 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3186
3133 while (cont != NIL) 3187 while (cont != NIL)
3134 { 3188 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3189 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3190 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3191 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3192 frame->code = car (cont) ; cont = cdr (cont);
3139 3193
3140 ++frame; 3194 ++frame;
3141 ++i; 3195 ++i;
3142 } 3196 }
3143 3197
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3198 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3199}
3146 3200
3147#else 3201#else
3148 3202
3149static INLINE void 3203ecb_inline void
3150dump_stack_reset (SCHEME_P) 3204dump_stack_reset (SCHEME_P)
3151{ 3205{
3152 SCHEME_V->dump = NIL; 3206 SCHEME_V->dump = NIL;
3153} 3207}
3154 3208
3155static INLINE void 3209ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3210dump_stack_initialize (SCHEME_P)
3157{ 3211{
3158 dump_stack_reset (SCHEME_A); 3212 dump_stack_reset (SCHEME_A);
3159} 3213}
3160 3214
… …
3162dump_stack_free (SCHEME_P) 3216dump_stack_free (SCHEME_P)
3163{ 3217{
3164 SCHEME_V->dump = NIL; 3218 SCHEME_V->dump = NIL;
3165} 3219}
3166 3220
3167static pointer 3221static int
3168xs_return (SCHEME_P_ pointer a) 3222xs_return (SCHEME_P_ pointer a)
3169{ 3223{
3170 pointer dump = SCHEME_V->dump; 3224 pointer dump = SCHEME_V->dump;
3171 3225
3172 SCHEME_V->value = a; 3226 SCHEME_V->value = a;
3173 3227
3174 if (dump == NIL) 3228 if (dump == NIL)
3175 return NIL; 3229 return -1;
3176 3230
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3231 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3232 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3233 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3234 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3235
3182 SCHEME_V->dump = dump; 3236 SCHEME_V->dump = dump;
3183 3237
3184 return S_T; 3238 return 0;
3185} 3239}
3186 3240
3187static void 3241static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3242s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3243{
… …
3214 3268
3215#endif 3269#endif
3216 3270
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3271#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3272
3273#if EXPERIMENT
3219static pointer 3274static int
3275debug (SCHEME_P_ int indent, pointer x)
3276{
3277 int c;
3278
3279 if (is_syntax (x))
3280 {
3281 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3282 return 8 + 8;
3283 }
3284
3285 if (x == NIL)
3286 {
3287 printf ("%*sNIL\n", indent, "");
3288 return 3;
3289 }
3290
3291 switch (type (x))
3292 {
3293 case T_INTEGER:
3294 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3295 return 32+8;
3296
3297 case T_SYMBOL:
3298 printf ("%*sS<%s>\n", indent, "", symname (x));
3299 return 24+8;
3300
3301 case T_CLOSURE:
3302 printf ("%*sS<%s>\n", indent, "", "closure");
3303 debug (SCHEME_A_ indent + 3, cdr(x));
3304 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3305
3306 case T_PAIR:
3307 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3308 c = debug (SCHEME_A_ indent + 3, car (x));
3309 c += debug (SCHEME_A_ indent + 3, cdr (x));
3310 return c + 1;
3311
3312 case T_PORT:
3313 printf ("%*sS<%s>\n", indent, "", "port");
3314 return 24+8;
3315
3316 case T_VECTOR:
3317 printf ("%*sS<%s>\n", indent, "", "vector");
3318 return 24+8;
3319
3320 case T_ENVIRONMENT:
3321 printf ("%*sS<%s>\n", indent, "", "environment");
3322 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3323
3324 default:
3325 printf ("unhandled type %d\n", type (x));
3326 break;
3327 }
3328}
3329#endif
3330
3331static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3332opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3333{
3222 pointer args = SCHEME_V->args; 3334 pointer args = SCHEME_V->args;
3223 pointer x, y; 3335 pointer x, y;
3224 3336
3225 switch (op) 3337 switch (op)
3226 { 3338 {
3339#if EXPERIMENT //D
3340 case OP_DEBUG:
3341 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3342 printf ("\n");
3343 s_return (S_T);
3344#endif
3227 case OP_LOAD: /* load */ 3345 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3346 if (file_interactive (SCHEME_A))
3229 { 3347 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3348 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3349 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3232 } 3350 }
3233 3351
3234 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3352 if (!file_push (SCHEME_A_ strvalue (car (args))))
3235 Error_1 ("unable to open", car (args)); 3353 Error_1 ("unable to open", car (args));
3236 else 3354 else
… …
3240 } 3358 }
3241 3359
3242 case OP_T0LVL: /* top level */ 3360 case OP_T0LVL: /* top level */
3243 3361
3244 /* If we reached the end of file, this loop is done. */ 3362 /* If we reached the end of file, this loop is done. */
3245 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3363 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3246 { 3364 {
3247 if (SCHEME_V->file_i == 0) 3365 if (SCHEME_V->file_i == 0)
3248 { 3366 {
3249 SCHEME_V->args = NIL; 3367 SCHEME_V->args = NIL;
3250 s_goto (OP_QUIT); 3368 s_goto (OP_QUIT);
… …
3328#endif 3446#endif
3329 if (is_symbol (SCHEME_V->code)) /* symbol */ 3447 if (is_symbol (SCHEME_V->code)) /* symbol */
3330 { 3448 {
3331 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3449 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3332 3450
3333 if (x != NIL) 3451 if (x == NIL)
3334 s_return (slot_value_in_env (x));
3335 else
3336 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3452 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3453
3454 s_return (slot_value_in_env (x));
3337 } 3455 }
3338 else if (is_pair (SCHEME_V->code)) 3456 else if (is_pair (SCHEME_V->code))
3339 { 3457 {
3340 x = car (SCHEME_V->code); 3458 x = car (SCHEME_V->code);
3341 3459
… …
3354 } 3472 }
3355 else 3473 else
3356 s_return (SCHEME_V->code); 3474 s_return (SCHEME_V->code);
3357 3475
3358 case OP_E0ARGS: /* eval arguments */ 3476 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3477 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3478 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3479 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3480 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3481 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3482 s_goto (OP_APPLY);
… …
3391 3509
3392 case OP_TRACING: 3510 case OP_TRACING:
3393 { 3511 {
3394 int tr = SCHEME_V->tracing; 3512 int tr = SCHEME_V->tracing;
3395 3513
3396 SCHEME_V->tracing = ivalue (car (args)); 3514 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3515 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3516 }
3399 3517
3400#endif 3518#endif
3401 3519
… …
3418 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3536 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3419 else if (is_foreign (SCHEME_V->code)) 3537 else if (is_foreign (SCHEME_V->code))
3420 { 3538 {
3421 /* Keep nested calls from GC'ing the arglist */ 3539 /* Keep nested calls from GC'ing the arglist */
3422 push_recent_alloc (SCHEME_A_ args, NIL); 3540 push_recent_alloc (SCHEME_A_ args, NIL);
3423 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3541 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3424 3542
3425 s_return (x); 3543 s_return (x);
3426 } 3544 }
3427 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3545 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3428 { 3546 {
… …
3465 3583
3466 case OP_DOMACRO: /* do macro */ 3584 case OP_DOMACRO: /* do macro */
3467 SCHEME_V->code = SCHEME_V->value; 3585 SCHEME_V->code = SCHEME_V->value;
3468 s_goto (OP_EVAL); 3586 s_goto (OP_EVAL);
3469 3587
3470#if 1
3471
3472 case OP_LAMBDA: /* lambda */ 3588 case OP_LAMBDA: /* lambda */
3473 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3589 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3474 set SCHEME_V->value fall thru */ 3590 set SCHEME_V->value fall thru */
3475 { 3591 {
3476 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3592 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3482 SCHEME_V->code = slot_value_in_env (f); 3598 SCHEME_V->code = slot_value_in_env (f);
3483 s_goto (OP_APPLY); 3599 s_goto (OP_APPLY);
3484 } 3600 }
3485 3601
3486 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3487 /* Fallthru */
3488 } 3603 }
3604 /* Fallthru */
3489 3605
3490 case OP_LAMBDA1: 3606 case OP_LAMBDA1:
3491 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3607 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3492
3493#else
3494
3495 case OP_LAMBDA: /* lambda */
3496 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3497
3498#endif
3499 3608
3500 case OP_MKCLOSURE: /* make-closure */ 3609 case OP_MKCLOSURE: /* make-closure */
3501 x = car (args); 3610 x = car (args);
3502 3611
3503 if (car (x) == SCHEME_V->LAMBDA) 3612 if (car (x) == SCHEME_V->LAMBDA)
… …
3910 SCHEME_V->code = car (args); 4019 SCHEME_V->code = car (args);
3911 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4020 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3912 s_goto (OP_APPLY); 4021 s_goto (OP_APPLY);
3913 } 4022 }
3914 4023
3915 abort (); 4024 if (USE_ERROR_CHECKING) abort ();
3916} 4025}
3917 4026
3918static pointer 4027static int
3919opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4028opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3920{ 4029{
3921 pointer args = SCHEME_V->args; 4030 pointer args = SCHEME_V->args;
3922 pointer x = car (args); 4031 pointer x = car (args);
3923 num v; 4032 num v;
3924 4033
3925#if USE_MATH
3926 RVALUE dd;
3927#endif
3928
3929 switch (op) 4034 switch (op)
3930 { 4035 {
3931#if USE_MATH 4036#if USE_MATH
3932 case OP_INEX2EX: /* inexact->exact */ 4037 case OP_INEX2EX: /* inexact->exact */
4038 {
3933 if (num_is_integer (x)) 4039 if (is_integer (x))
3934 s_return (x); 4040 s_return (x);
3935 else if (modf (rvalue_unchecked (x), &dd) == 0) 4041
4042 RVALUE r = rvalue_unchecked (x);
4043
4044 if (r == (RVALUE)(IVALUE)r)
3936 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4045 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3937 else 4046 else
3938 Error_1 ("inexact->exact: not integral:", x); 4047 Error_1 ("inexact->exact: not integral:", x);
4048 }
3939 4049
3940 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4050 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3941 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4051 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3942 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4052 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3943 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4053 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3961 { 4071 {
3962 RVALUE result; 4072 RVALUE result;
3963 int real_result = 1; 4073 int real_result = 1;
3964 pointer y = cadr (args); 4074 pointer y = cadr (args);
3965 4075
3966 if (num_is_integer (x) && num_is_integer (y)) 4076 if (is_integer (x) && is_integer (y))
3967 real_result = 0; 4077 real_result = 0;
3968 4078
3969 /* This 'if' is an R5RS compatibility fix. */ 4079 /* This 'if' is an R5RS compatibility fix. */
3970 /* NOTE: Remove this 'if' fix for R6RS. */ 4080 /* NOTE: Remove this 'if' fix for R6RS. */
3971 if (rvalue (x) == 0 && rvalue (y) < 0) 4081 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3977 /* If the test fails, result is too big for integer. */ 4087 /* If the test fails, result is too big for integer. */
3978 if (!real_result) 4088 if (!real_result)
3979 { 4089 {
3980 long result_as_long = result; 4090 long result_as_long = result;
3981 4091
3982 if (result != (RVALUE) result_as_long) 4092 if (result != result_as_long)
3983 real_result = 1; 4093 real_result = 1;
3984 } 4094 }
3985 4095
3986 if (real_result) 4096 if (real_result)
3987 s_return (mk_real (SCHEME_A_ result)); 4097 s_return (mk_real (SCHEME_A_ result));
… …
3992 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4102 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3993 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4103 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3994 4104
3995 case OP_TRUNCATE: 4105 case OP_TRUNCATE:
3996 { 4106 {
3997 RVALUE rvalue_of_x; 4107 RVALUE n = rvalue (x);
3998
3999 rvalue_of_x = rvalue (x);
4000
4001 if (rvalue_of_x > 0)
4002 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4108 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4003 else
4004 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4005 } 4109 }
4006 4110
4007 case OP_ROUND: 4111 case OP_ROUND:
4008 if (num_is_integer (x)) 4112 if (is_integer (x))
4009 s_return (x); 4113 s_return (x);
4010 4114
4011 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4115 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4012#endif 4116#endif
4013 4117
4014 case OP_ADD: /* + */ 4118 case OP_ADD: /* + */
4015 v = num_zero; 4119 v = num_zero;
4016 4120
4017 for (x = args; x != NIL; x = cdr (x)) 4121 for (x = args; x != NIL; x = cdr (x))
4018 v = num_op ('+', v, nvalue (car (x))); 4122 v = num_op (NUM_ADD, v, nvalue (car (x)));
4019 4123
4020 s_return (mk_number (SCHEME_A_ v)); 4124 s_return (mk_number (SCHEME_A_ v));
4021 4125
4022 case OP_MUL: /* * */ 4126 case OP_MUL: /* * */
4023 v = num_one; 4127 v = num_one;
4024 4128
4025 for (x = args; x != NIL; x = cdr (x)) 4129 for (x = args; x != NIL; x = cdr (x))
4026 v = num_op ('+', v, nvalue (car (x))); 4130 v = num_op (NUM_MUL, v, nvalue (car (x)));
4027 4131
4028 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4029 4133
4030 case OP_SUB: /* - */ 4134 case OP_SUB: /* - */
4031 if (cdr (args) == NIL) 4135 if (cdr (args) == NIL)
… …
4038 x = cdr (args); 4142 x = cdr (args);
4039 v = nvalue (car (args)); 4143 v = nvalue (car (args));
4040 } 4144 }
4041 4145
4042 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4043 v = num_op ('+', v, nvalue (car (x))); 4147 v = num_op (NUM_SUB, v, nvalue (car (x)));
4044 4148
4045 s_return (mk_number (SCHEME_A_ v)); 4149 s_return (mk_number (SCHEME_A_ v));
4046 4150
4047 case OP_DIV: /* / */ 4151 case OP_DIV: /* / */
4048 if (cdr (args) == NIL) 4152 if (cdr (args) == NIL)
… …
4055 x = cdr (args); 4159 x = cdr (args);
4056 v = nvalue (car (args)); 4160 v = nvalue (car (args));
4057 } 4161 }
4058 4162
4059 for (; x != NIL; x = cdr (x)) 4163 for (; x != NIL; x = cdr (x))
4060 {
4061 if (!is_zero_rvalue (rvalue (car (x)))) 4164 if (!is_zero_rvalue (rvalue (car (x))))
4062 v = num_div (v, nvalue (car (x))); 4165 v = num_div (v, nvalue (car (x)));
4063 else 4166 else
4064 Error_0 ("/: division by zero"); 4167 Error_0 ("/: division by zero");
4065 }
4066 4168
4067 s_return (mk_number (SCHEME_A_ v)); 4169 s_return (mk_number (SCHEME_A_ v));
4068 4170
4069 case OP_INTDIV: /* quotient */ 4171 case OP_INTDIV: /* quotient */
4070 if (cdr (args) == NIL) 4172 if (cdr (args) == NIL)
… …
4079 } 4181 }
4080 4182
4081 for (; x != NIL; x = cdr (x)) 4183 for (; x != NIL; x = cdr (x))
4082 { 4184 {
4083 if (ivalue (car (x)) != 0) 4185 if (ivalue (car (x)) != 0)
4084 v = num_op ('/', v, nvalue (car (x))); 4186 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4085 else 4187 else
4086 Error_0 ("quotient: division by zero"); 4188 Error_0 ("quotient: division by zero");
4087 } 4189 }
4088 4190
4089 s_return (mk_number (SCHEME_A_ v)); 4191 s_return (mk_number (SCHEME_A_ v));
… …
4106 else 4208 else
4107 Error_0 ("modulo: division by zero"); 4209 Error_0 ("modulo: division by zero");
4108 4210
4109 s_return (mk_number (SCHEME_A_ v)); 4211 s_return (mk_number (SCHEME_A_ v));
4110 4212
4111 case OP_CAR: /* car */ 4213 /* the compiler will optimize this mess... */
4112 s_return (caar (args)); 4214 case OP_CAR: op_car: s_return (car (x));
4113 4215 case OP_CDR: op_cdr: s_return (cdr (x));
4114 case OP_CDR: /* cdr */ 4216 case OP_CAAR: op_caar: x = car (x); goto op_car;
4115 s_return (cdar (args)); 4217 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4218 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4219 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4220 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4221 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4222 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4223 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4224 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4225 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4226 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4227 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4228 case OP_CAAAAR: x = car (x); goto op_caaar;
4229 case OP_CAAADR: x = cdr (x); goto op_caaar;
4230 case OP_CAADAR: x = car (x); goto op_caadr;
4231 case OP_CAADDR: x = cdr (x); goto op_caadr;
4232 case OP_CADAAR: x = car (x); goto op_cadar;
4233 case OP_CADADR: x = cdr (x); goto op_cadar;
4234 case OP_CADDAR: x = car (x); goto op_caddr;
4235 case OP_CADDDR: x = cdr (x); goto op_caddr;
4236 case OP_CDAAAR: x = car (x); goto op_cdaar;
4237 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4238 case OP_CDADAR: x = car (x); goto op_cdadr;
4239 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4240 case OP_CDDAAR: x = car (x); goto op_cddar;
4241 case OP_CDDADR: x = cdr (x); goto op_cddar;
4242 case OP_CDDDAR: x = car (x); goto op_cdddr;
4243 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4116 4244
4117 case OP_CONS: /* cons */ 4245 case OP_CONS: /* cons */
4118 set_cdr (args, cadr (args)); 4246 set_cdr (args, cadr (args));
4119 s_return (args); 4247 s_return (args);
4120 4248
… …
4135 } 4263 }
4136 else 4264 else
4137 Error_0 ("set-cdr!: unable to alter immutable pair"); 4265 Error_0 ("set-cdr!: unable to alter immutable pair");
4138 4266
4139 case OP_CHAR2INT: /* char->integer */ 4267 case OP_CHAR2INT: /* char->integer */
4140 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4268 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141 4269
4142 case OP_INT2CHAR: /* integer->char */ 4270 case OP_INT2CHAR: /* integer->char */
4143 s_return (mk_character (SCHEME_A_ ivalue (x))); 4271 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144 4272
4145 case OP_CHARUPCASE: 4273 case OP_CHARUPCASE:
4146 { 4274 {
4147 unsigned char c = ivalue (x); 4275 unsigned char c = ivalue_unchecked (x);
4148 c = toupper (c); 4276 c = toupper (c);
4149 s_return (mk_character (SCHEME_A_ c)); 4277 s_return (mk_character (SCHEME_A_ c));
4150 } 4278 }
4151 4279
4152 case OP_CHARDNCASE: 4280 case OP_CHARDNCASE:
4153 { 4281 {
4154 unsigned char c = ivalue (x); 4282 unsigned char c = ivalue_unchecked (x);
4155 c = tolower (c); 4283 c = tolower (c);
4156 s_return (mk_character (SCHEME_A_ c)); 4284 s_return (mk_character (SCHEME_A_ c));
4157 } 4285 }
4158 4286
4159 case OP_STR2SYM: /* string->symbol */ 4287 case OP_STR2SYM: /* string->symbol */
… …
4236 Error_1 ("atom->string: not an atom:", x); 4364 Error_1 ("atom->string: not an atom:", x);
4237 } 4365 }
4238 4366
4239 case OP_MKSTRING: /* make-string */ 4367 case OP_MKSTRING: /* make-string */
4240 { 4368 {
4241 int fill = ' '; 4369 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242 int len;
4243
4244 len = ivalue (x); 4370 int len = ivalue_unchecked (x);
4245
4246 if (cdr (args) != NIL)
4247 fill = charvalue (cadr (args));
4248 4371
4249 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4372 s_return (mk_empty_string (SCHEME_A_ len, fill));
4250 } 4373 }
4251 4374
4252 case OP_STRLEN: /* string-length */ 4375 case OP_STRLEN: /* string-length */
4253 s_return (mk_integer (SCHEME_A_ strlength (x))); 4376 s_return (mk_integer (SCHEME_A_ strlength (x)));
4254 4377
4255 case OP_STRREF: /* string-ref */ 4378 case OP_STRREF: /* string-ref */
4256 { 4379 {
4257 char *str;
4258 int index;
4259
4260 str = strvalue (x); 4380 char *str = strvalue (x);
4261
4262 index = ivalue (cadr (args)); 4381 int index = ivalue_unchecked (cadr (args));
4263 4382
4264 if (index >= strlength (x)) 4383 if (index >= strlength (x))
4265 Error_1 ("string-ref: out of bounds:", cadr (args)); 4384 Error_1 ("string-ref: out of bounds:", cadr (args));
4266 4385
4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4386 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268 } 4387 }
4269 4388
4270 case OP_STRSET: /* string-set! */ 4389 case OP_STRSET: /* string-set! */
4271 { 4390 {
4272 char *str; 4391 char *str = strvalue (x);
4273 int index; 4392 int index = ivalue_unchecked (cadr (args));
4274 int c; 4393 int c;
4275 4394
4276 if (is_immutable (x)) 4395 if (is_immutable (x))
4277 Error_1 ("string-set!: unable to alter immutable string:", x); 4396 Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279 str = strvalue (x);
4280
4281 index = ivalue (cadr (args));
4282 4397
4283 if (index >= strlength (x)) 4398 if (index >= strlength (x))
4284 Error_1 ("string-set!: out of bounds:", cadr (args)); 4399 Error_1 ("string-set!: out of bounds:", cadr (args));
4285 4400
4286 c = charvalue (caddr (args)); 4401 c = charvalue (caddr (args));
… …
4309 s_return (newstr); 4424 s_return (newstr);
4310 } 4425 }
4311 4426
4312 case OP_SUBSTR: /* substring */ 4427 case OP_SUBSTR: /* substring */
4313 { 4428 {
4314 char *str; 4429 char *str = strvalue (x);
4315 int index0; 4430 int index0 = ivalue_unchecked (cadr (args));
4316 int index1; 4431 int index1;
4317 int len; 4432 int len;
4318 4433
4319 str = strvalue (x);
4320
4321 index0 = ivalue (cadr (args));
4322
4323 if (index0 > strlength (x)) 4434 if (index0 > strlength (x))
4324 Error_1 ("substring: start out of bounds:", cadr (args)); 4435 Error_1 ("substring: start out of bounds:", cadr (args));
4325 4436
4326 if (cddr (args) != NIL) 4437 if (cddr (args) != NIL)
4327 { 4438 {
4328 index1 = ivalue (caddr (args)); 4439 index1 = ivalue_unchecked (caddr (args));
4329 4440
4330 if (index1 > strlength (x) || index1 < index0) 4441 if (index1 > strlength (x) || index1 < index0)
4331 Error_1 ("substring: end out of bounds:", caddr (args)); 4442 Error_1 ("substring: end out of bounds:", caddr (args));
4332 } 4443 }
4333 else 4444 else
… …
4356 if (SCHEME_V->no_memory) 4467 if (SCHEME_V->no_memory)
4357 s_return (S_SINK); 4468 s_return (S_SINK);
4358#endif 4469#endif
4359 4470
4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4471 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361 set_vector_elem (vec, i, car (x)); 4472 vector_set (vec, i, car (x));
4362 4473
4363 s_return (vec); 4474 s_return (vec);
4364 } 4475 }
4365 4476
4366 case OP_MKVECTOR: /* make-vector */ 4477 case OP_MKVECTOR: /* make-vector */
4367 { 4478 {
4368 pointer fill = NIL; 4479 pointer fill = NIL;
4369 int len;
4370 pointer vec; 4480 pointer vec;
4371
4372 len = ivalue (x); 4481 int len = ivalue_unchecked (x);
4373 4482
4374 if (cdr (args) != NIL) 4483 if (cdr (args) != NIL)
4375 fill = cadr (args); 4484 fill = cadr (args);
4376 4485
4377 vec = mk_vector (SCHEME_A_ len); 4486 vec = mk_vector (SCHEME_A_ len);
… …
4380 if (SCHEME_V->no_memory) 4489 if (SCHEME_V->no_memory)
4381 s_return (S_SINK); 4490 s_return (S_SINK);
4382#endif 4491#endif
4383 4492
4384 if (fill != NIL) 4493 if (fill != NIL)
4385 fill_vector (vec, fill); 4494 fill_vector (vec, 0, fill);
4386 4495
4387 s_return (vec); 4496 s_return (vec);
4388 } 4497 }
4389 4498
4390 case OP_VECLEN: /* vector-length */ 4499 case OP_VECLEN: /* vector-length */
4391 s_return (mk_integer (SCHEME_A_ veclength (x))); 4500 s_return (mk_integer (SCHEME_A_ veclength (x)));
4392 4501
4502 case OP_VECRESIZE:
4503 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4504 s_return (x);
4505
4393 case OP_VECREF: /* vector-ref */ 4506 case OP_VECREF: /* vector-ref */
4394 { 4507 {
4395 int index;
4396
4397 index = ivalue (cadr (args)); 4508 int index = ivalue_unchecked (cadr (args));
4398 4509
4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4510 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4511 Error_1 ("vector-ref: out of bounds:", cadr (args));
4401 4512
4402 s_return (vector_elem (x, index)); 4513 s_return (vector_get (x, index));
4403 } 4514 }
4404 4515
4405 case OP_VECSET: /* vector-set! */ 4516 case OP_VECSET: /* vector-set! */
4406 { 4517 {
4407 int index; 4518 int index = ivalue_unchecked (cadr (args));
4408 4519
4409 if (is_immutable (x)) 4520 if (is_immutable (x))
4410 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4521 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411 4522
4412 index = ivalue (cadr (args));
4413
4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4523 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4524 Error_1 ("vector-set!: out of bounds:", cadr (args));
4416 4525
4417 set_vector_elem (x, index, caddr (args)); 4526 vector_set (x, index, caddr (args));
4418 s_return (x); 4527 s_return (x);
4419 } 4528 }
4420 } 4529 }
4421 4530
4422 return S_T; 4531 if (USE_ERROR_CHECKING) abort ();
4423} 4532}
4424 4533
4425INTERFACE int
4426is_list (SCHEME_P_ pointer a)
4427{
4428 return list_length (SCHEME_A_ a) >= 0;
4429}
4430
4431/* Result is:
4432 proper list: length
4433 circular list: -1
4434 not even a pair: -2
4435 dotted list: -2 minus length before dot
4436*/
4437INTERFACE int
4438list_length (SCHEME_P_ pointer a)
4439{
4440 int i = 0;
4441 pointer slow, fast;
4442
4443 slow = fast = a;
4444
4445 while (1)
4446 {
4447 if (fast == NIL)
4448 return i;
4449
4450 if (!is_pair (fast))
4451 return -2 - i;
4452
4453 fast = cdr (fast);
4454 ++i;
4455
4456 if (fast == NIL)
4457 return i;
4458
4459 if (!is_pair (fast))
4460 return -2 - i;
4461
4462 ++i;
4463 fast = cdr (fast);
4464
4465 /* Safe because we would have already returned if `fast'
4466 encountered a non-pair. */
4467 slow = cdr (slow);
4468
4469 if (fast == slow)
4470 {
4471 /* the fast pointer has looped back around and caught up
4472 with the slow pointer, hence the structure is circular,
4473 not of finite length, and therefore not a list */
4474 return -1;
4475 }
4476 }
4477}
4478
4479static pointer 4534static int
4480opexe_r (SCHEME_P_ enum scheme_opcodes op) 4535opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{ 4536{
4482 pointer x = SCHEME_V->args; 4537 pointer x = SCHEME_V->args;
4483 4538
4484 for (;;) 4539 for (;;)
4485 { 4540 {
… …
4505 } 4560 }
4506 4561
4507 s_return (S_T); 4562 s_return (S_T);
4508} 4563}
4509 4564
4510static pointer 4565static int
4511opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4566opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4512{ 4567{
4513 pointer args = SCHEME_V->args; 4568 pointer args = SCHEME_V->args;
4514 pointer a = car (args); 4569 pointer a = car (args);
4515 pointer d = cdr (args); 4570 pointer d = cdr (args);
4516 int r; 4571 int r;
4517 4572
4518 switch (op) 4573 switch (op)
4519 { 4574 {
4520 case OP_NOT: /* not */ r = is_false (a) ; break; 4575 case OP_NOT: /* not */ r = is_false (a) ; break;
4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4576 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4577 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break; 4578 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4579 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4580 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4581 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4582 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4583 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4584 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4585 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530 4586
4531#if USE_CHAR_CLASSIFIERS 4587#if USE_CHAR_CLASSIFIERS
4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4588 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4589 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4590 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4591 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4592 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537#endif 4593#endif
4538 4594
4539#if USE_PORTS 4595#if USE_PORTS
4540 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4596 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4597 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4561 } 4617 }
4562 4618
4563 s_retbool (r); 4619 s_retbool (r);
4564} 4620}
4565 4621
4566static pointer 4622static int
4567opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4623opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4568{ 4624{
4569 pointer args = SCHEME_V->args; 4625 pointer args = SCHEME_V->args;
4570 pointer a = car (args); 4626 pointer a = car (args);
4571 pointer x, y; 4627 pointer x, y;
… …
4584 } 4640 }
4585 else 4641 else
4586 s_return (SCHEME_V->code); 4642 s_return (SCHEME_V->code);
4587 4643
4588 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4644 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4589 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4645 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4590 s_return (SCHEME_V->value); 4646 s_return (SCHEME_V->value);
4591 4647
4592#if USE_PORTS 4648#if USE_PORTS
4593 4649
4594 case OP_WRITE: /* write */ 4650 case OP_WRITE: /* write */
… …
4657 putstr (SCHEME_A_ "\n"); 4713 putstr (SCHEME_A_ "\n");
4658 4714
4659 if (SCHEME_V->interactive_repl) 4715 if (SCHEME_V->interactive_repl)
4660 s_goto (OP_T0LVL); 4716 s_goto (OP_T0LVL);
4661 else 4717 else
4662 return NIL; 4718 return -1;
4663 } 4719 }
4664 4720
4665 case OP_REVERSE: /* reverse */ 4721 case OP_REVERSE: /* reverse */
4666 s_return (reverse (SCHEME_A_ a)); 4722 s_return (reverse (SCHEME_A_ a));
4667 4723
… …
4724 4780
4725 case OP_QUIT: /* quit */ 4781 case OP_QUIT: /* quit */
4726 if (is_pair (args)) 4782 if (is_pair (args))
4727 SCHEME_V->retcode = ivalue (a); 4783 SCHEME_V->retcode = ivalue (a);
4728 4784
4729 return NIL; 4785 return -1;
4730 4786
4731 case OP_GC: /* gc */ 4787 case OP_GC: /* gc */
4732 gc (SCHEME_A_ NIL, NIL); 4788 gc (SCHEME_A_ NIL, NIL);
4733 s_return (S_T); 4789 s_return (S_T);
4734 4790
… …
4739 SCHEME_V->gc_verbose = (a != S_F); 4795 SCHEME_V->gc_verbose = (a != S_F);
4740 s_retbool (was); 4796 s_retbool (was);
4741 } 4797 }
4742 4798
4743 case OP_NEWSEGMENT: /* new-segment */ 4799 case OP_NEWSEGMENT: /* new-segment */
4800#if 0
4744 if (!is_pair (args) || !is_number (a)) 4801 if (!is_pair (args) || !is_number (a))
4745 Error_0 ("new-segment: argument must be a number"); 4802 Error_0 ("new-segment: argument must be a number");
4746 4803#endif
4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4804 s_retbool (alloc_cellseg (SCHEME_A));
4748
4749 s_return (S_T);
4750 4805
4751 case OP_OBLIST: /* oblist */ 4806 case OP_OBLIST: /* oblist */
4752 s_return (oblist_all_symbols (SCHEME_A)); 4807 s_return (oblist_all_symbols (SCHEME_A));
4753 4808
4754#if USE_PORTS 4809#if USE_PORTS
… …
4781 break; 4836 break;
4782 } 4837 }
4783 4838
4784 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4839 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4785 4840
4786 if (p == NIL) 4841 s_return (p == NIL ? S_F : p);
4787 s_return (S_F);
4788
4789 s_return (p);
4790 } 4842 }
4791 4843
4792# if USE_STRING_PORTS 4844# if USE_STRING_PORTS
4793 4845
4794 case OP_OPEN_INSTRING: /* open-input-string */ 4846 case OP_OPEN_INSTRING: /* open-input-string */
… …
4809 } 4861 }
4810 4862
4811 p = port_from_string (SCHEME_A_ strvalue (a), 4863 p = port_from_string (SCHEME_A_ strvalue (a),
4812 strvalue (a) + strlength (a), prop); 4864 strvalue (a) + strlength (a), prop);
4813 4865
4814 if (p == NIL) 4866 s_return (p == NIL ? S_F : p);
4815 s_return (S_F);
4816
4817 s_return (p);
4818 } 4867 }
4819 4868
4820 case OP_OPEN_OUTSTRING: /* open-output-string */ 4869 case OP_OPEN_OUTSTRING: /* open-output-string */
4821 { 4870 {
4822 pointer p; 4871 pointer p;
4823 4872
4824 if (a == NIL) 4873 if (a == NIL)
4825 {
4826 p = port_from_scratch (SCHEME_A); 4874 p = port_from_scratch (SCHEME_A);
4827
4828 if (p == NIL)
4829 s_return (S_F);
4830 }
4831 else 4875 else
4832 {
4833 p = port_from_string (SCHEME_A_ strvalue (a), 4876 p = port_from_string (SCHEME_A_ strvalue (a),
4834 strvalue (a) + strlength (a), port_output); 4877 strvalue (a) + strlength (a), port_output);
4835 4878
4836 if (p == NIL) 4879 s_return (p == NIL ? S_F : p);
4837 s_return (S_F);
4838 }
4839
4840 s_return (p);
4841 } 4880 }
4842 4881
4843 case OP_GET_OUTSTRING: /* get-output-string */ 4882 case OP_GET_OUTSTRING: /* get-output-string */
4844 { 4883 {
4845 port *p; 4884 port *p = port (a);
4846 4885
4847 if ((p = a->object.port)->kind & port_string) 4886 if (p->kind & port_string)
4848 { 4887 {
4849 off_t size; 4888 off_t size;
4850 char *str; 4889 char *str;
4851 4890
4852 size = p->rep.string.curr - p->rep.string.start + 1; 4891 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4884 case OP_CURR_ENV: /* current-environment */ 4923 case OP_CURR_ENV: /* current-environment */
4885 s_return (SCHEME_V->envir); 4924 s_return (SCHEME_V->envir);
4886 4925
4887 } 4926 }
4888 4927
4889 abort (); 4928 if (USE_ERROR_CHECKING) abort ();
4890} 4929}
4891 4930
4892static pointer 4931static int
4893opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4932opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4894{ 4933{
4895 pointer args = SCHEME_V->args; 4934 pointer args = SCHEME_V->args;
4896 pointer x; 4935 pointer x;
4897 4936
… …
4957 int res; 4996 int res;
4958 4997
4959 if (is_pair (args)) 4998 if (is_pair (args))
4960 p = car (args); 4999 p = car (args);
4961 5000
4962 res = p->object.port->kind & port_string; 5001 res = port (p)->kind & port_string;
4963 5002
4964 s_retbool (res); 5003 s_retbool (res);
4965 } 5004 }
4966 5005
4967 case OP_SET_INPORT: /* set-input-port */ 5006 case OP_SET_INPORT: /* set-input-port */
… …
5026 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5065 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5027 SCHEME_V->tok = token (SCHEME_A); 5066 SCHEME_V->tok = token (SCHEME_A);
5028 s_goto (OP_RDSEXPR); 5067 s_goto (OP_RDSEXPR);
5029 5068
5030 case TOK_ATOM: 5069 case TOK_ATOM:
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5070 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5071
5072 case TOK_DOTATOM:
5073 SCHEME_V->strbuff[0] = '.';
5074 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5075
5076 case TOK_STRATOM:
5077 x = readstrexp (SCHEME_A_ '|');
5078 //TODO: haven't checked whether the garbage collector could interfere
5079 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5032 5080
5033 case TOK_DQUOTE: 5081 case TOK_DQUOTE:
5034 x = readstrexp (SCHEME_A); 5082 x = readstrexp (SCHEME_A_ '"');
5035 5083
5036 if (x == S_F) 5084 if (x == S_F)
5037 Error_0 ("Error reading string"); 5085 Error_0 ("Error reading string");
5038 5086
5039 setimmutable (x); 5087 setimmutable (x);
… …
5051 s_goto (OP_EVAL); 5099 s_goto (OP_EVAL);
5052 } 5100 }
5053 } 5101 }
5054 5102
5055 case TOK_SHARP_CONST: 5103 case TOK_SHARP_CONST:
5056 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5104 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5057 Error_0 ("undefined sharp expression"); 5105 Error_0 ("undefined sharp expression");
5058 else 5106 else
5059 s_return (x); 5107 s_return (x);
5060 5108
5061 default: 5109 default:
… …
5213 putstr (SCHEME_A_ ")"); 5261 putstr (SCHEME_A_ ")");
5214 s_return (S_T); 5262 s_return (S_T);
5215 } 5263 }
5216 else 5264 else
5217 { 5265 {
5218 pointer elem = vector_elem (vec, i); 5266 pointer elem = vector_get (vec, i);
5219 5267
5220 ivalue_unchecked (cdr (args)) = i + 1; 5268 ivalue_unchecked (cdr (args)) = i + 1;
5221 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5269 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5222 SCHEME_V->args = elem; 5270 SCHEME_V->args = elem;
5223 5271
… …
5227 s_goto (OP_P0LIST); 5275 s_goto (OP_P0LIST);
5228 } 5276 }
5229 } 5277 }
5230 } 5278 }
5231 5279
5232 abort (); 5280 if (USE_ERROR_CHECKING) abort ();
5233} 5281}
5234 5282
5235static pointer 5283static int
5236opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5237{ 5285{
5238 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
5239 pointer a = car (args); 5287 pointer a = car (args);
5240 pointer x, y; 5288 pointer x, y;
… …
5283 5331
5284 case OP_CLOSUREP: /* closure? */ 5332 case OP_CLOSUREP: /* closure? */
5285 /* 5333 /*
5286 * Note, macro object is also a closure. 5334 * Note, macro object is also a closure.
5287 * Therefore, (closure? <#MACRO>) ==> #t 5335 * Therefore, (closure? <#MACRO>) ==> #t
5336 * (schmorp) well, obviously not, fix? TODO
5288 */ 5337 */
5289 s_retbool (is_closure (a)); 5338 s_retbool (is_closure (a));
5290 5339
5291 case OP_MACROP: /* macro? */ 5340 case OP_MACROP: /* macro? */
5292 s_retbool (is_macro (a)); 5341 s_retbool (is_macro (a));
5293 } 5342 }
5294 5343
5295 abort (); 5344 if (USE_ERROR_CHECKING) abort ();
5296} 5345}
5297 5346
5347/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5298typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5348typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5299 5349
5300typedef int (*test_predicate) (pointer); 5350typedef int (*test_predicate)(pointer);
5301static int 5351static int
5302is_any (pointer p) 5352tst_any (pointer p)
5303{ 5353{
5304 return 1; 5354 return 1;
5305} 5355}
5306 5356
5307static int 5357static int
5308is_nonneg (pointer p) 5358tst_inonneg (pointer p)
5309{ 5359{
5310 return ivalue (p) >= 0 && is_integer (p); 5360 return is_integer (p) && ivalue_unchecked (p) >= 0;
5361}
5362
5363static int
5364tst_is_list (SCHEME_P_ pointer p)
5365{
5366 return p == NIL || is_pair (p);
5311} 5367}
5312 5368
5313/* Correspond carefully with following defines! */ 5369/* Correspond carefully with following defines! */
5314static struct 5370static struct
5315{ 5371{
5316 test_predicate fct; 5372 test_predicate fct;
5317 const char *kind; 5373 const char *kind;
5318} tests[] = 5374} tests[] = {
5319{ 5375 { tst_any , 0 },
5320 { 0, 0}, /* unused */ 5376 { is_string , "string" },
5321 { is_any, 0}, 5377 { is_symbol , "symbol" },
5322 { is_string, "string" }, 5378 { is_port , "port" },
5323 { is_symbol, "symbol" },
5324 { is_port, "port" },
5325 { is_inport, "input port" }, 5379 { is_inport , "input port" },
5326 { is_outport, "output port" }, 5380 { is_outport , "output port" },
5327 { is_environment, "environment" }, 5381 { is_environment, "environment" },
5328 { is_pair, "pair" }, 5382 { is_pair , "pair" },
5329 { 0, "pair or '()" }, 5383 { 0 , "pair or '()" },
5330 { is_character, "character" }, 5384 { is_character , "character" },
5331 { is_vector, "vector" }, 5385 { is_vector , "vector" },
5332 { is_number, "number" }, 5386 { is_number , "number" },
5333 { is_integer, "integer" }, 5387 { is_integer , "integer" },
5334 { is_nonneg, "non-negative integer" } 5388 { tst_inonneg , "non-negative integer" }
5335}; 5389};
5336 5390
5337#define TST_NONE 0 /* TST_NONE used for standard procedures, for internal ops, 0 is used */ 5391#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5338#define TST_ANY "\001" 5392#define TST_ANY "\001"
5339#define TST_STRING "\002" 5393#define TST_STRING "\002"
5340#define TST_SYMBOL "\003" 5394#define TST_SYMBOL "\003"
5341#define TST_PORT "\004" 5395#define TST_PORT "\004"
5342#define TST_INPORT "\005" 5396#define TST_INPORT "\005"
… …
5348#define TST_VECTOR "\013" 5402#define TST_VECTOR "\013"
5349#define TST_NUMBER "\014" 5403#define TST_NUMBER "\014"
5350#define TST_INTEGER "\015" 5404#define TST_INTEGER "\015"
5351#define TST_NATURAL "\016" 5405#define TST_NATURAL "\016"
5352 5406
5407#define INF_ARG 0xff
5408#define UNNAMED_OP ""
5409
5410static const char opnames[] =
5411#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5412#include "opdefines.h"
5413#undef OP_DEF
5414;
5415
5416static const char *
5417opname (int idx)
5418{
5419 const char *name = opnames;
5420
5421 /* should do this at compile time, but would require external program, right? */
5422 while (idx--)
5423 name += strlen (name) + 1;
5424
5425 return *name ? name : "ILLEGAL";
5426}
5427
5428static const char *
5429procname (pointer x)
5430{
5431 return opname (procnum (x));
5432}
5433
5353typedef struct 5434typedef struct
5354{ 5435{
5355 dispatch_func func; 5436 uint8_t func;
5356 char *name; 5437 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5438 uint8_t builtin;
5439#if USE_ERROR_CHECKING
5357 int min_arity; 5440 uint8_t min_arity;
5358 int max_arity; 5441 uint8_t max_arity;
5359 char arg_tests_encoding[3]; 5442 char arg_tests_encoding[3];
5443#endif
5360} op_code_info; 5444} op_code_info;
5361 5445
5362#define INF_ARG 0xffff
5363
5364static op_code_info dispatch_table[] = { 5446static const op_code_info dispatch_table[] = {
5447#if USE_ERROR_CHECKING
5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) { opexe_ ## func, name, minarity, maxarity, argtest }, 5448#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5449#else
5450#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5451#endif
5366#include "opdefines.h" 5452#include "opdefines.h"
5367#undef OP_DEF 5453#undef OP_DEF
5368 {0} 5454 {0}
5369}; 5455};
5370 5456
5371static const char *
5372procname (pointer x)
5373{
5374 int n = procnum (x);
5375 const char *name = dispatch_table[n].name;
5376
5377 if (name == 0)
5378 name = "ILLEGAL!";
5379
5380 return name;
5381}
5382
5383/* kernel of this interpreter */ 5457/* kernel of this interpreter */
5384static void 5458static void ecb_hot
5385Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5459Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5386{ 5460{
5387 SCHEME_V->op = op; 5461 SCHEME_V->op = op;
5388 5462
5389 for (;;) 5463 for (;;)
5390 { 5464 {
5391 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5465 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5392 5466
5393#if USE_ERROR_CHECKING 5467#if USE_ERROR_CHECKING
5394 if (pcd->name) /* if built-in function, check arguments */ 5468 if (pcd->builtin) /* if built-in function, check arguments */
5395 { 5469 {
5396 int ok = 1;
5397 char msg[STRBUFFSIZE]; 5470 char msg[STRBUFFSIZE];
5398 int n = list_length (SCHEME_A_ SCHEME_V->args); 5471 int n = list_length (SCHEME_A_ SCHEME_V->args);
5399 5472
5400 /* Check number of arguments */ 5473 /* Check number of arguments */
5401 if (ecb_expect_false (n < pcd->min_arity)) 5474 if (ecb_expect_false (n < pcd->min_arity))
5402 { 5475 {
5403 ok = 0;
5404 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5476 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5405 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5477 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5478 xError_1 (SCHEME_A_ msg, 0);
5479 continue;
5406 } 5480 }
5407 else if (ecb_expect_false (n > pcd->max_arity)) 5481 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5408 { 5482 {
5409 ok = 0;
5410 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5483 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5411 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5484 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5485 xError_1 (SCHEME_A_ msg, 0);
5486 continue;
5412 } 5487 }
5413 5488 else
5414 if (ecb_expect_false (ok))
5415 { 5489 {
5416 if (*pcd->arg_tests_encoding) 5490 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5417 { 5491 {
5418 int i = 0; 5492 int i = 0;
5419 int j; 5493 int j;
5420 const char *t = pcd->arg_tests_encoding; 5494 const char *t = pcd->arg_tests_encoding;
5421 pointer arglist = SCHEME_V->args; 5495 pointer arglist = SCHEME_V->args;
… …
5424 { 5498 {
5425 pointer arg = car (arglist); 5499 pointer arg = car (arglist);
5426 5500
5427 j = t[0]; 5501 j = t[0];
5428 5502
5503 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5429 if (j == TST_LIST[0]) 5504 if (j == TST_LIST[0])
5430 { 5505 {
5431 if (arg != NIL && !is_pair (arg)) 5506 if (!tst_is_list (SCHEME_A_ arg))
5432 break; 5507 break;
5433 } 5508 }
5434 else 5509 else
5435 { 5510 {
5436 if (!tests[j].fct (arg)) 5511 if (!tests[j - 1].fct (arg))
5437 break; 5512 break;
5438 } 5513 }
5439 5514
5440 if (t[1]) /* last test is replicated as necessary */ 5515 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5441 t++; 5516 t++;
5442 5517
5443 arglist = cdr (arglist); 5518 arglist = cdr (arglist);
5444 i++; 5519 i++;
5445 } 5520 }
5446 while (i < n); 5521 while (i < n);
5447 5522
5448 if (i < n) 5523 if (i < n)
5449 { 5524 {
5450 ok = 0;
5451 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5525 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5526 xError_1 (SCHEME_A_ msg, 0);
5527 continue;
5452 } 5528 }
5453 } 5529 }
5454 } 5530 }
5455
5456 if (!ok)
5457 {
5458 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5459 return;
5460
5461 pcd = dispatch_table + SCHEME_V->op;
5462 }
5463 } 5531 }
5464#endif 5532#endif
5465 5533
5466 ok_to_freely_gc (SCHEME_A); 5534 ok_to_freely_gc (SCHEME_A);
5467 5535
5536 static const dispatch_func dispatch_funcs[] = {
5537 opexe_0,
5538 opexe_1,
5539 opexe_2,
5540 opexe_3,
5541 opexe_4,
5542 opexe_5,
5543 opexe_6,
5544 };
5545
5468 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5546 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5469 return; 5547 return;
5470 5548
5471 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5549 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5472 { 5550 {
5473 xwrstr ("No memory!\n"); 5551 xwrstr ("No memory!\n");
… …
5497mk_proc (SCHEME_P_ enum scheme_opcodes op) 5575mk_proc (SCHEME_P_ enum scheme_opcodes op)
5498{ 5576{
5499 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5577 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5500 set_typeflag (y, (T_PROC | T_ATOM)); 5578 set_typeflag (y, (T_PROC | T_ATOM));
5501 ivalue_unchecked (y) = op; 5579 ivalue_unchecked (y) = op;
5502 set_num_integer (y);
5503 return y; 5580 return y;
5504} 5581}
5505 5582
5506/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5583/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5507static int 5584static int
5508syntaxnum (pointer p) 5585syntaxnum (pointer p)
5509{ 5586{
5510 const char *s = strvalue (car (p)); 5587 const char *s = strvalue (p);
5511 5588
5512 switch (strlength (car (p))) 5589 switch (strlength (p))
5513 { 5590 {
5514 case 2: 5591 case 2:
5515 if (s[0] == 'i') 5592 if (s[0] == 'i')
5516 return OP_IF0; /* if */ 5593 return OP_IF0; /* if */
5517 else 5594 else
… …
5572 return OP_C0STREAM; /* cons-stream */ 5649 return OP_C0STREAM; /* cons-stream */
5573 } 5650 }
5574} 5651}
5575 5652
5576#if USE_MULTIPLICITY 5653#if USE_MULTIPLICITY
5577scheme * 5654ecb_cold scheme *
5578scheme_init_new () 5655scheme_init_new ()
5579{ 5656{
5580 scheme *sc = malloc (sizeof (scheme)); 5657 scheme *sc = malloc (sizeof (scheme));
5581 5658
5582 if (!scheme_init (SCHEME_A)) 5659 if (!scheme_init (SCHEME_A))
… …
5587 else 5664 else
5588 return sc; 5665 return sc;
5589} 5666}
5590#endif 5667#endif
5591 5668
5592int 5669ecb_cold int
5593scheme_init (SCHEME_P) 5670scheme_init (SCHEME_P)
5594{ 5671{
5595 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5672 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5596 pointer x; 5673 pointer x;
5674
5675 /* this memset is not strictly correct, as we assume (intcache)
5676 * that memset 0 will also set pointers to 0, but memset does
5677 * of course not guarantee that. screw such systems.
5678 */
5679 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5597 5680
5598 num_set_fixnum (num_zero, 1); 5681 num_set_fixnum (num_zero, 1);
5599 num_set_ivalue (num_zero, 0); 5682 num_set_ivalue (num_zero, 0);
5600 num_set_fixnum (num_one, 1); 5683 num_set_fixnum (num_one, 1);
5601 num_set_ivalue (num_one, 1); 5684 num_set_ivalue (num_one, 1);
… …
5613 SCHEME_V->save_inport = NIL; 5696 SCHEME_V->save_inport = NIL;
5614 SCHEME_V->loadport = NIL; 5697 SCHEME_V->loadport = NIL;
5615 SCHEME_V->nesting = 0; 5698 SCHEME_V->nesting = 0;
5616 SCHEME_V->interactive_repl = 0; 5699 SCHEME_V->interactive_repl = 0;
5617 5700
5618 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5701 if (!alloc_cellseg (SCHEME_A))
5619 { 5702 {
5620#if USE_ERROR_CHECKING 5703#if USE_ERROR_CHECKING
5621 SCHEME_V->no_memory = 1; 5704 SCHEME_V->no_memory = 1;
5622 return 0; 5705 return 0;
5623#endif 5706#endif
… …
5670 5753
5671 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5754 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5672 assign_syntax (SCHEME_A_ syntax_names[i]); 5755 assign_syntax (SCHEME_A_ syntax_names[i]);
5673 } 5756 }
5674 5757
5758 // TODO: should iterate via strlen, to avoid n² complexity
5675 for (i = 0; i < n; i++) 5759 for (i = 0; i < n; i++)
5676 if (dispatch_table[i].name != 0) 5760 if (dispatch_table[i].builtin)
5677 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5761 assign_proc (SCHEME_A_ i, opname (i));
5678 5762
5679 /* initialization of global pointers to special symbols */ 5763 /* initialization of global pointers to special symbols */
5680 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5764 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5681 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5765 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5682 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5766 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5721scheme_set_external_data (SCHEME_P_ void *p) 5805scheme_set_external_data (SCHEME_P_ void *p)
5722{ 5806{
5723 SCHEME_V->ext_data = p; 5807 SCHEME_V->ext_data = p;
5724} 5808}
5725 5809
5726void 5810ecb_cold void
5727scheme_deinit (SCHEME_P) 5811scheme_deinit (SCHEME_P)
5728{ 5812{
5729 int i; 5813 int i;
5730 5814
5731#if SHOW_ERROR_LINE 5815#if SHOW_ERROR_LINE
… …
5952# endif 6036# endif
5953 int fin; 6037 int fin;
5954 char *file_name = InitFile; 6038 char *file_name = InitFile;
5955 int retcode; 6039 int retcode;
5956 int isfile = 1; 6040 int isfile = 1;
6041 system ("ps v $PPID");//D
5957 6042
5958 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6043 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959 { 6044 {
5960 xwrstr ("Usage: tinyscheme -?\n"); 6045 xwrstr ("Usage: tinyscheme -?\n");
5961 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6046 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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