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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.18 by root, Thu Nov 26 21:32:16 2015 UTC vs.
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 84#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 85#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 86
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
80#if !USE_MULTIPLICITY 87#if !USE_MULTIPLICITY
81static scheme sc; 88static scheme sc;
82#endif 89#endif
83 90
84static void 91static void
… …
153 160
154#define toupper(c) xtoupper (c) 161#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 162#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 163#define isdigit(c) xisdigit (c)
157 164
158#if USE_STRLWR 165#if USE_IGNORECASE
159static const char * 166static const char *
160strlwr (char *s) 167xstrlwr (char *s)
161{ 168{
162 const char *p = s; 169 const char *p = s;
163 170
164 while (*s) 171 while (*s)
165 { 172 {
… …
167 s++; 174 s++;
168 } 175 }
169 176
170 return p; 177 return p;
171} 178}
172#endif
173 179
180#define stricmp(a,b) strcasecmp (a, b)
181#define strlwr(s) xstrlwr (s)
182
183#else
174#define stricmp(a,b) strcmp (a, b) 184# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 185# define strlwr(s) (s)
186#endif
176 187
177#ifndef prompt 188#ifndef prompt
178# define prompt "ts> " 189# define prompt "ts> "
179#endif 190#endif
180 191
… …
186# define FIRST_CELLSEGS 3 197# define FIRST_CELLSEGS 3
187#endif 198#endif
188 199
189enum scheme_types 200enum scheme_types
190{ 201{
202 T_INTEGER,
191 T_FREE, 203 T_REAL,
192 T_STRING, 204 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 205 T_SYMBOL,
195 T_PROC, 206 T_PROC,
196 T_PAIR, 207 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 208 T_CLOSURE,
198 T_CONTINUATION, 209 T_CONTINUATION,
199 T_FOREIGN, 210 T_FOREIGN,
200 T_CHARACTER, 211 T_CHARACTER,
201 T_PORT, 212 T_PORT,
… …
211#define T_SYNTAX 0x0010 222#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 223#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 224#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 225#define T_MARK 0x0080 /* only for gc */
215 226
227/* num, for generic arithmetic */
228struct num
229{
230 IVALUE ivalue;
231#if USE_REAL
232 RVALUE rvalue;
233 char is_fixnum;
234#endif
235};
236
237#if USE_REAL
238# define num_is_fixnum(n) (n).is_fixnum
239# define num_set_fixnum(n,f) (n).is_fixnum = (f)
240# define num_ivalue(n) (n).ivalue
241# define num_rvalue(n) (n).rvalue
242# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
243# define num_set_rvalue(n,r) (n).rvalue = (r)
244#else
245# define num_is_fixnum(n) 1
246# define num_set_fixnum(n,f) 0
247# define num_ivalue(n) (n).ivalue
248# define num_rvalue(n) (n).ivalue
249# define num_set_ivalue(n,i) (n).ivalue = (i)
250# define num_set_rvalue(n,r) (n).ivalue = (r)
251#endif
252
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 254
218static num num_op (enum num_op op, num a, num b); 255static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 257static num num_rem (num a, num b);
… …
223#if USE_MATH 260#if USE_MATH
224static double round_per_R5RS (double x); 261static double round_per_R5RS (double x);
225#endif 262#endif
226static int is_zero_rvalue (RVALUE x); 263static int is_zero_rvalue (RVALUE x);
227 264
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233
234static num num_zero; 265static num num_zero;
235static num num_one; 266static num num_one;
236 267
237/* macros for cell operations */ 268/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 269#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 270#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 271#define type(p) (typeflag (p) & T_MASKTYPE)
241 272
242INTERFACE INLINE int 273INTERFACE int
243is_string (pointer p) 274is_string (pointer p)
244{ 275{
245 return type (p) == T_STRING; 276 return type (p) == T_STRING;
246} 277}
247 278
248#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
250 281
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 282INTERFACE int
253is_vector (pointer p) 283is_vector (pointer p)
254{ 284{
255 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
256} 286}
257 287
258#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE 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); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 293
265INTERFACE uint32_t 294INTERFACE int
266vector_length (pointer vec) 295is_integer (pointer p)
267{ 296{
268 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
269} 298}
270 299
300/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
305}
306
307INTERFACE int
272is_number (pointer p) 308is_number (pointer p)
273{ 309{
274 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
275} 311}
276 312
277INTERFACE INLINE int 313INTERFACE 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) 314is_character (pointer p)
297{ 315{
298 return type (p) == T_CHARACTER; 316 return type (p) == T_CHARACTER;
299} 317}
300 318
301INTERFACE INLINE char * 319INTERFACE char *
302string_value (pointer p) 320string_value (pointer p)
303{ 321{
304 return strvalue (p); 322 return strvalue (p);
305} 323}
306 324
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) 325#define ivalue_unchecked(p) (p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v)
327
338#if USE_REAL 328#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 331#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
344# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 334#endif
335
347INTERFACE long 336INTERFACE long
348charvalue (pointer p) 337charvalue (pointer p)
349{ 338{
350 return ivalue_unchecked (p); 339 return ivalue_unchecked (p);
351} 340}
352 341
353INTERFACE INLINE int 342INTERFACE int
354is_port (pointer p) 343is_port (pointer p)
355{ 344{
356 return type (p) == T_PORT; 345 return type (p) == T_PORT;
357} 346}
358 347
359INTERFACE INLINE int 348INTERFACE int
360is_inport (pointer p) 349is_inport (pointer p)
361{ 350{
362 return is_port (p) && p->object.port->kind & port_input; 351 return is_port (p) && p->object.port->kind & port_input;
363} 352}
364 353
365INTERFACE INLINE int 354INTERFACE int
366is_outport (pointer p) 355is_outport (pointer p)
367{ 356{
368 return is_port (p) && p->object.port->kind & port_output; 357 return is_port (p) && p->object.port->kind & port_output;
369} 358}
370 359
371INTERFACE INLINE int 360INTERFACE int
372is_pair (pointer p) 361is_pair (pointer p)
373{ 362{
374 return type (p) == T_PAIR; 363 return type (p) == T_PAIR;
375} 364}
376 365
… …
408pair_cdr (pointer p) 397pair_cdr (pointer p)
409{ 398{
410 return cdr (p); 399 return cdr (p);
411} 400}
412 401
413INTERFACE INLINE int 402INTERFACE int
414is_symbol (pointer p) 403is_symbol (pointer p)
415{ 404{
416 return type (p) == T_SYMBOL; 405 return type (p) == T_SYMBOL;
417} 406}
418 407
419INTERFACE INLINE char * 408INTERFACE char *
420symname (pointer p) 409symname (pointer p)
421{ 410{
422 return strvalue (car (p)); 411 return strvalue (car (p));
423} 412}
424 413
425#if USE_PLIST 414#if USE_PLIST
426SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
427hasprop (pointer p) 416hasprop (pointer p)
428{ 417{
429 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
430} 419}
431 420
432# define symprop(p) cdr(p) 421# define symprop(p) cdr(p)
433#endif 422#endif
434 423
435INTERFACE INLINE int 424INTERFACE int
436is_syntax (pointer p) 425is_syntax (pointer p)
437{ 426{
438 return typeflag (p) & T_SYNTAX; 427 return typeflag (p) & T_SYNTAX;
439} 428}
440 429
441INTERFACE INLINE int 430INTERFACE int
442is_proc (pointer p) 431is_proc (pointer p)
443{ 432{
444 return type (p) == T_PROC; 433 return type (p) == T_PROC;
445} 434}
446 435
447INTERFACE INLINE int 436INTERFACE int
448is_foreign (pointer p) 437is_foreign (pointer p)
449{ 438{
450 return type (p) == T_FOREIGN; 439 return type (p) == T_FOREIGN;
451} 440}
452 441
453INTERFACE INLINE char * 442INTERFACE char *
454syntaxname (pointer p) 443syntaxname (pointer p)
455{ 444{
456 return strvalue (car (p)); 445 return strvalue (car (p));
457} 446}
458 447
459#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 449static const char *procname (pointer x);
461 450
462INTERFACE INLINE int 451INTERFACE int
463is_closure (pointer p) 452is_closure (pointer p)
464{ 453{
465 return type (p) == T_CLOSURE; 454 return type (p) == T_CLOSURE;
466} 455}
467 456
468INTERFACE INLINE int 457INTERFACE int
469is_macro (pointer p) 458is_macro (pointer p)
470{ 459{
471 return type (p) == T_MACRO; 460 return type (p) == T_MACRO;
472} 461}
473 462
474INTERFACE INLINE pointer 463INTERFACE pointer
475closure_code (pointer p) 464closure_code (pointer p)
476{ 465{
477 return car (p); 466 return car (p);
478} 467}
479 468
480INTERFACE INLINE pointer 469INTERFACE pointer
481closure_env (pointer p) 470closure_env (pointer p)
482{ 471{
483 return cdr (p); 472 return cdr (p);
484} 473}
485 474
486INTERFACE INLINE int 475INTERFACE int
487is_continuation (pointer p) 476is_continuation (pointer p)
488{ 477{
489 return type (p) == T_CONTINUATION; 478 return type (p) == T_CONTINUATION;
490} 479}
491 480
492#define cont_dump(p) cdr (p) 481#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 482#define set_cont_dump(p,v) set_cdr ((p), (v))
494 483
495/* To do: promise should be forced ONCE only */ 484/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 485INTERFACE int
497is_promise (pointer p) 486is_promise (pointer p)
498{ 487{
499 return type (p) == T_PROMISE; 488 return type (p) == T_PROMISE;
500} 489}
501 490
502INTERFACE INLINE int 491INTERFACE int
503is_environment (pointer p) 492is_environment (pointer p)
504{ 493{
505 return type (p) == T_ENVIRONMENT; 494 return type (p) == T_ENVIRONMENT;
506} 495}
507 496
… …
513 502
514#define is_mark(p) (typeflag (p) & T_MARK) 503#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 506
518INTERFACE INLINE int 507INTERFACE int
519is_immutable (pointer p) 508is_immutable (pointer p)
520{ 509{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 511}
523 512
524INTERFACE INLINE void 513INTERFACE void
525setimmutable (pointer p) 514setimmutable (pointer p)
526{ 515{
527#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 518#endif
530} 519}
531 520
521/* Result is:
522 proper list: length
523 circular list: -1
524 not even a pair: -2
525 dotted list: -2 minus length before dot
526*/
527INTERFACE int
528list_length (SCHEME_P_ pointer a)
529{
530 int i = 0;
531 pointer slow, fast;
532
533 slow = fast = a;
534
535 while (1)
536 {
537 if (fast == NIL)
538 return i;
539
540 if (!is_pair (fast))
541 return -2 - i;
542
543 fast = cdr (fast);
544 ++i;
545
546 if (fast == NIL)
547 return i;
548
549 if (!is_pair (fast))
550 return -2 - i;
551
552 ++i;
553 fast = cdr (fast);
554
555 /* Safe because we would have already returned if `fast'
556 encountered a non-pair. */
557 slow = cdr (slow);
558
559 if (fast == slow)
560 {
561 /* the fast pointer has looped back around and caught up
562 with the slow pointer, hence the structure is circular,
563 not of finite length, and therefore not a list */
564 return -1;
565 }
566 }
567}
568
569INTERFACE int
570is_list (SCHEME_P_ pointer a)
571{
572 return list_length (SCHEME_A_ a) >= 0;
573}
574
532#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
533static INLINE int 576ecb_inline int
534Cisalpha (int c) 577Cisalpha (int c)
535{ 578{
536 return isascii (c) && isalpha (c); 579 return isascii (c) && isalpha (c);
537} 580}
538 581
539static INLINE int 582ecb_inline int
540Cisdigit (int c) 583Cisdigit (int c)
541{ 584{
542 return isascii (c) && isdigit (c); 585 return isascii (c) && isdigit (c);
543} 586}
544 587
545static INLINE int 588ecb_inline int
546Cisspace (int c) 589Cisspace (int c)
547{ 590{
548 return isascii (c) && isspace (c); 591 return isascii (c) && isspace (c);
549} 592}
550 593
551static INLINE int 594ecb_inline int
552Cisupper (int c) 595Cisupper (int c)
553{ 596{
554 return isascii (c) && isupper (c); 597 return isascii (c) && isupper (c);
555} 598}
556 599
557static INLINE int 600ecb_inline int
558Cislower (int c) 601Cislower (int c)
559{ 602{
560 return isascii (c) && islower (c); 603 return isascii (c) && islower (c);
561} 604}
562#endif 605#endif
… …
623#endif 666#endif
624 667
625static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 677static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 678static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 693static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 701static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 709static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 710static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 711static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 712static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 713static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
715static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 716static 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); 717static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 725
726static IVALUE
727ivalue (pointer x)
728{
729 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
730}
731
732static RVALUE
733rvalue (pointer x)
734{
735 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
736}
737
738INTERFACE num
739nvalue (pointer x)
740{
741 num n;
742
743 num_set_fixnum (n, is_integer (x));
744
745 if (num_is_fixnum (n))
746 num_set_ivalue (n, ivalue_unchecked (x));
747 else
748 num_set_rvalue (n, rvalue_unchecked (x));
749
750 return n;
751}
752
683static num 753static num
684num_op (enum num_op op, num a, num b) 754num_op (enum num_op op, num a, num b)
685{ 755{
686 num ret; 756 num ret;
687 757
688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
689 759
690 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
691 { 761 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 762 switch (op)
696 { 763 {
697 case NUM_ADD: av += bv; break; 764 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 765 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 766 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 768 }
702 769
703 num_set_ivalue (ret, av); 770 num_set_ivalue (ret, a.ivalue);
704 } 771 }
772#if USE_REAL
705 else 773 else
706 { 774 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 775 switch (op)
711 { 776 {
712 case NUM_ADD: av += bv; break; 777 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 778 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 779 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 781 }
717 782
718 num_set_rvalue (ret, av); 783 num_set_rvalue (ret, a.rvalue);
719 } 784 }
785#endif
720 786
721 return ret; 787 return ret;
722} 788}
723 789
724static num 790static num
725num_div (num a, num b) 791num_div (num a, num b)
726{ 792{
727 num ret; 793 num ret;
728 794
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 795 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
730 796
731 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 799 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 801
736 return ret; 802 return ret;
737} 803}
738 804
739static num 805static num
… …
741{ 807{
742 num ret; 808 num ret;
743 long e1, e2, res; 809 long e1, e2, res;
744 810
745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 811 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
746 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
748 res = e1 % e2; 814 res = e1 % e2;
749 815
750 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
751 if (res > 0) 817 if (res > 0)
752 { 818 {
… …
768{ 834{
769 num ret; 835 num ret;
770 long e1, e2, res; 836 long e1, e2, res;
771 837
772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 838 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
773 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
775 res = e1 % e2; 841 res = e1 % e2;
776 842
777 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 844 if (res * e2 < 0)
779 res += e2; 845 res += e2;
780 846
781 num_set_ivalue (ret, res); 847 num_set_ivalue (ret, res);
782 return ret; 848 return ret;
783} 849}
784 850
785/* this completely disrespects NaNs */ 851/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 852static int
787num_cmp (num a, num b) 853num_cmp (num a, num b)
788{ 854{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 856 int ret;
791 857
792 if (is_fixnum) 858 if (is_fixnum)
793 { 859 {
794 IVALUE av = num_get_ivalue (a); 860 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 861 IVALUE bv = num_ivalue (b);
796 862
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 863 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 864 }
799 else 865 else
800 { 866 {
801 RVALUE av = num_get_rvalue (a); 867 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 868 RVALUE bv = num_rvalue (b);
803 869
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 870 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 871 }
806 872
807 return ret; 873 return ret;
… …
833#endif 899#endif
834 900
835static int 901static int
836is_zero_rvalue (RVALUE x) 902is_zero_rvalue (RVALUE x)
837{ 903{
904 return x == 0;
905#if 0
838#if USE_REAL 906#if USE_REAL
839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 907 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
840#else 908#else
841 return x == 0; 909 return x == 0;
910#endif
842#endif 911#endif
843} 912}
844 913
845/* allocate new cell segment */ 914/* allocate new cell segment */
846static int 915static int
… …
867 return k; 936 return k;
868 937
869 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
871 940
872 /* insert new segment in address order */
873 newp = (pointer)cp; 941 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 943 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; 944 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 945 last = newp + segsize - 1;
893 946
894 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
895 { 948 {
896 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
897 set_car (p, NIL); 950 set_car (p, NIL);
898 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
899 } 952 }
900 953
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); 954 set_cdr (last, SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
906 }
907 else
908 {
909 p = SCHEME_V->free_cell;
910
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 } 956 }
918 957
919 return n; 958 return n;
920} 959}
921 960
922/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 962ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 964{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 966 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1000 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1041
1003 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1043 v->object.vector.length = len;
1005 fill_vector (v, init); 1044 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1046
1008 return v; 1047 return v;
1009} 1048}
1010 1049
1011static INLINE void 1050ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1051ok_to_freely_gc (SCHEME_P)
1013{ 1052{
1014 set_car (S_SINK, NIL); 1053 set_car (S_SINK, NIL);
1015} 1054}
1016 1055
… …
1055 return x; 1094 return x;
1056} 1095}
1057 1096
1058/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1059 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL);
1106 return x;
1107}
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 = mk_string (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x)); 1206 setimmutable (x);
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1208 return x;
1157} 1209}
1158 1210
1159static pointer 1211static pointer
… …
1192mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1193{ 1245{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1247
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1197 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1250
1199 return x; 1251 return x;
1200} 1252}
1201 1253
1202/* get number atom (integer) */ 1254/* get number atom (integer) */
1203INTERFACE pointer 1255INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1205{ 1257{
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1259
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1209 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1210 set_num_integer (x); 1262
1211 return x; 1263 return x;
1212} 1264}
1213 1265
1214INTERFACE pointer 1266INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1216{ 1268{
1269#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1271
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1220 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1221 set_num_real (x); 1274
1222 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1223} 1279}
1224 1280
1225static pointer 1281static pointer
1226mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1227{ 1283{
1284#if USE_REAL
1228 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1290#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1291}
1233 1292
1234/* allocate name to string area */ 1293/* allocate name to string area */
1235static char * 1294static char *
1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1242 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1244 } 1303 }
1245 1304
1246 if (str) 1305 if (str)
1247 { 1306 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 1307 else
1257 {
1258 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1259 q[len_str] = 0; 1310 q[len_str] = 0;
1260 }
1261 1311
1262 return q; 1312 return q;
1263} 1313}
1264 1314
1265INTERFACE pointer 1315INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1330
1281 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1333 strlength (x) = len;
1334
1284 return x; 1335 return x;
1285} 1336}
1286 1337
1287INTERFACE pointer 1338INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1295{ 1346{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1348}
1298 1349
1299INTERFACE void 1350INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1352{
1302 int i; 1353 int i;
1303 1354
1304 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1306} 1357}
1307 1358
1308INTERFACE pointer 1359INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1360vector_get (pointer vec, uint32_t ielem)
1310{ 1361{
1311 return vecvalue(vec)[ielem]; 1362 return vecvalue(vec)[ielem];
1312} 1363}
1313 1364
1314INTERFACE void 1365INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1366vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1367{
1317 vecvalue(vec)[ielem] = a; 1368 vecvalue(vec)[ielem] = a;
1318} 1369}
1319 1370
1320/* get new symbol */ 1371/* get new symbol */
… …
1332 1383
1333INTERFACE pointer 1384INTERFACE pointer
1334gensym (SCHEME_P) 1385gensym (SCHEME_P)
1335{ 1386{
1336 pointer x; 1387 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1388 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1389 xnum (name + 7, SCHEME_V->gensym_cnt);
1342 1390
1343 /* first check oblist */ 1391 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name);
1345
1346 if (x == NIL)
1347 {
1348 x = oblist_add_by_name (SCHEME_A_ name);
1349 return x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1392}
1355 1393
1356/* make symbol or number atom from string */ 1394/* make symbol or number atom from string */
1357static pointer 1395static pointer
1358mk_atom (SCHEME_P_ char *q) 1396mk_atom (SCHEME_P_ char *q)
… …
1412 } 1450 }
1413 else if ((c == 'e') || (c == 'E')) 1451 else if ((c == 'e') || (c == 'E'))
1414 { 1452 {
1415 if (!has_fp_exp) 1453 if (!has_fp_exp)
1416 { 1454 {
1417 has_dec_point = 1; /* decimal point illegal 1455 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1456 p++;
1420 1457
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1458 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1459 continue;
1423 } 1460 }
… …
1511 1548
1512 if (ecb_expect_false (is_vector (p))) 1549 if (ecb_expect_false (is_vector (p)))
1513 { 1550 {
1514 int i; 1551 int i;
1515 1552
1516 for (i = 0; i < p->object.vector.length; i++) 1553 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1554 mark (vecvalue (p)[i]);
1518 } 1555 }
1519 1556
1520 if (is_atom (p)) 1557 if (is_atom (p))
1521 goto E6; 1558 goto E6;
… …
1619 if (is_mark (p)) 1656 if (is_mark (p))
1620 clrmark (p); 1657 clrmark (p);
1621 else 1658 else
1622 { 1659 {
1623 /* reclaim cell */ 1660 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1661 if (typeflag (p) != T_PAIR)
1625 { 1662 {
1626 finalize_cell (SCHEME_A_ p); 1663 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE); 1664 set_typeflag (p, T_PAIR);
1628 set_car (p, NIL); 1665 set_car (p, NIL);
1629 } 1666 }
1630 1667
1631 ++SCHEME_V->fcells; 1668 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1669 set_cdr (p, SCHEME_V->free_cell);
… …
1634 } 1671 }
1635 } 1672 }
1636 } 1673 }
1637 1674
1638 if (SCHEME_V->gc_verbose) 1675 if (SCHEME_V->gc_verbose)
1676 {
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1678 }
1640} 1679}
1641 1680
1642static void 1681static void
1643finalize_cell (SCHEME_P_ pointer a) 1682finalize_cell (SCHEME_P_ pointer a)
1644{ 1683{
… …
2073#endif 2112#endif
2074} 2113}
2075 2114
2076/* read characters up to delimiter, but cater to character constants */ 2115/* read characters up to delimiter, but cater to character constants */
2077static char * 2116static char *
2078readstr_upto (SCHEME_P_ char *delim) 2117readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2118{
2080 char *p = SCHEME_V->strbuff; 2119 char *p = SCHEME_V->strbuff + skip;
2081 2120
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2121 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2122
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2124 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2131 return SCHEME_V->strbuff;
2093} 2132}
2094 2133
2095/* read string expression "xxx...xxx" */ 2134/* read string expression "xxx...xxx" */
2096static pointer 2135static pointer
2097readstrexp (SCHEME_P) 2136readstrexp (SCHEME_P_ char delim)
2098{ 2137{
2099 char *p = SCHEME_V->strbuff; 2138 char *p = SCHEME_V->strbuff;
2100 int c; 2139 int c;
2101 int c1 = 0; 2140 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2141 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2142
2105 for (;;) 2143 for (;;)
2106 { 2144 {
2107 c = inchar (SCHEME_A); 2145 c = inchar (SCHEME_A);
2108 2146
… …
2110 return S_F; 2148 return S_F;
2111 2149
2112 switch (state) 2150 switch (state)
2113 { 2151 {
2114 case st_ok: 2152 case st_ok:
2115 switch (c) 2153 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); 2154 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2155
2125 default: 2156 if (ecb_expect_false (c == '\\'))
2157 state = st_bsl;
2158 else
2126 *p++ = c; 2159 *p++ = c;
2127 break;
2128 }
2129 2160
2130 break; 2161 break;
2131 2162
2132 case st_bsl: 2163 case st_bsl:
2133 switch (c) 2164 switch (c)
… …
2163 case 'r': 2194 case 'r':
2164 *p++ = '\r'; 2195 *p++ = '\r';
2165 state = st_ok; 2196 state = st_ok;
2166 break; 2197 break;
2167 2198
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2199 default:
2174 *p++ = c; 2200 *p++ = c;
2175 state = st_ok; 2201 state = st_ok;
2176 break; 2202 break;
2177 } 2203 }
2178 2204
2179 break; 2205 break;
2180 2206
2181 case st_x1: 2207 case st_x1:
2182 case st_x2: 2208 case st_x2:
2183 c = toupper (c); 2209 c = tolower (c);
2184 2210
2185 if (c >= '0' && c <= 'F') 2211 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2212 c1 = (c1 << 4) + c - '0';
2189 else 2213 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2214 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 2215 else
2201 return S_F; 2216 return S_F;
2217
2218 if (state == st_x1)
2219 state = st_x2;
2220 else
2221 {
2222 *p++ = c1;
2223 state = st_ok;
2224 }
2202 2225
2203 break; 2226 break;
2204 2227
2205 case st_oct1: 2228 case st_oct1:
2206 case st_oct2: 2229 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2233 backchar (SCHEME_A_ c);
2211 state = st_ok; 2234 state = st_ok;
2212 } 2235 }
2213 else 2236 else
2214 { 2237 {
2215 if (state == st_oct2 && c1 >= 32) 2238 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2239 return S_F;
2217 2240
2218 c1 = (c1 << 3) + (c - '0'); 2241 c1 = (c1 << 3) + (c - '0');
2219 2242
2220 if (state == st_oct1) 2243 if (state == st_oct1)
… …
2225 state = st_ok; 2248 state = st_ok;
2226 } 2249 }
2227 } 2250 }
2228 2251
2229 break; 2252 break;
2230
2231 } 2253 }
2232 } 2254 }
2233} 2255}
2234 2256
2235/* check c is in chars */ 2257/* check c is in chars */
2236static INLINE int 2258ecb_inline int
2237is_one_of (char *s, int c) 2259is_one_of (const char *s, int c)
2238{ 2260{
2239 if (c == EOF) 2261 if (c == EOF)
2240 return 1; 2262 return 1;
2241 2263
2242 return !!strchr (s, c); 2264 return !!strchr (s, c);
2243} 2265}
2244 2266
2245/* skip white characters */ 2267/* skip white characters */
2246static INLINE int 2268ecb_inline int
2247skipspace (SCHEME_P) 2269skipspace (SCHEME_P)
2248{ 2270{
2249 int c, curr_line = 0; 2271 int c, curr_line = 0;
2250 2272
2251 do 2273 do
… …
2298 2320
2299 if (is_one_of (" \n\t", c)) 2321 if (is_one_of (" \n\t", c))
2300 return TOK_DOT; 2322 return TOK_DOT;
2301 else 2323 else
2302 { 2324 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2325 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2326 return TOK_DOTATOM;
2307 } 2327 }
2328
2329 case '|':
2330 return TOK_STRATOM;
2308 2331
2309 case '\'': 2332 case '\'':
2310 return TOK_QUOTE; 2333 return TOK_QUOTE;
2311 2334
2312 case ';': 2335 case ';':
… …
2479 { 2502 {
2480 p = SCHEME_V->strbuff; 2503 p = SCHEME_V->strbuff;
2481 2504
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2505 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2506 {
2484 if (num_is_integer (l)) 2507 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2508 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2509#if USE_REAL
2487 else 2510 else
2488 { 2511 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2512 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2744 return 0; 2767 return 0;
2745 } 2768 }
2746 else if (is_number (a)) 2769 else if (is_number (a))
2747 { 2770 {
2748 if (is_number (b)) 2771 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2772 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2773
2752 return 0; 2774 return 0;
2753 } 2775 }
2754 else if (is_character (a)) 2776 else if (is_character (a))
2755 { 2777 {
… …
2781/* () is #t in R5RS */ 2803/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2804#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2805#define is_false(p) ((p) == S_F)
2784 2806
2785/* ========== Environment implementation ========== */ 2807/* ========== 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 2808
2802#ifndef USE_ALIST_ENV 2809#ifndef USE_ALIST_ENV
2803 2810
2804/* 2811/*
2805 * In this implementation, each frame of the environment may be 2812 * In this implementation, each frame of the environment may be
… …
2822 2829
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2830 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2831 setenvironment (SCHEME_V->envir);
2825} 2832}
2826 2833
2827static INLINE void 2834static uint32_t
2835sym_hash (pointer sym, uint32_t size)
2836{
2837 uintptr_t ptr = (uintptr_t)sym;
2838
2839#if 0
2840 /* table size is prime, so why mix */
2841 ptr += ptr >> 32;
2842 ptr += ptr >> 16;
2843 ptr += ptr >> 8;
2844#endif
2845
2846 return ptr % size;
2847}
2848
2849ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2850new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2851{
2830 pointer slot = immutable_cons (variable, value); 2852 pointer slot = immutable_cons (variable, value);
2831 2853
2832 if (is_vector (car (env))) 2854 if (is_vector (car (env)))
2833 { 2855 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2856 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2857 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2858 }
2838 else 2859 else
2839 set_car (env, immutable_cons (slot, car (env))); 2860 set_car (env, immutable_cons (slot, car (env)));
2840} 2861}
2841 2862
2842static pointer 2863static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2865{
2845 pointer x, y; 2866 pointer x, y;
2846 int location;
2847 2867
2848 for (x = env; x != NIL; x = cdr (x)) 2868 for (x = env; x != NIL; x = cdr (x))
2849 { 2869 {
2850 if (is_vector (car (x))) 2870 if (is_vector (car (x)))
2851 { 2871 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2872 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2873 y = vector_get (car (x), location);
2854 } 2874 }
2855 else 2875 else
2856 y = car (x); 2876 y = car (x);
2857 2877
2858 for (; y != NIL; y = cdr (y)) 2878 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2879 if (caar (y) == hdl)
2860 break; 2880 break;
2861 2881
2862 if (y != NIL) 2882 if (y != NIL)
2883 return car (y);
2884
2885 if (!all)
2863 break; 2886 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2887 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2888
2872 return NIL; 2889 return NIL;
2873} 2890}
2874 2891
2875#else /* USE_ALIST_ENV */ 2892#else /* USE_ALIST_ENV */
2876 2893
2877static INLINE void 2894ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2895new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2896{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2897 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2898 setenvironment (SCHEME_V->envir);
2882} 2899}
2883 2900
2884static INLINE void 2901ecb_inline void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2902new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2903{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2905}
2889 2906
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2914 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2915 if (caar (y) == hdl)
2899 break; 2916 break;
2900 2917
2901 if (y != NIL) 2918 if (y != NIL)
2919 return car (y);
2902 break; 2920 break;
2903 2921
2904 if (!all) 2922 if (!all)
2905 return NIL; 2923 break;
2906 } 2924 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2925
2911 return NIL; 2926 return NIL;
2912} 2927}
2913 2928
2914#endif /* USE_ALIST_ENV else */ 2929#endif /* USE_ALIST_ENV else */
2915 2930
2916static INLINE void 2931ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2933{
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2935}
2921 2936
2922static INLINE void 2937ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2939{
2925 set_cdr (slot, value); 2940 set_cdr (slot, value);
2926} 2941}
2927 2942
2928static INLINE pointer 2943ecb_inline pointer
2929slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2930{ 2945{
2931 return cdr (slot); 2946 return cdr (slot);
2932} 2947}
2933 2948
2934/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2935 2950
2936static pointer 2951static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2953{
2939#if USE_ERROR_HOOK 2954#if USE_ERROR_HOOK
2940 pointer x; 2955 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2956 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 2991 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 2992 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 2993 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 2994 SCHEME_V->op = OP_EVAL;
2980 2995
2981 return S_T; 2996 return 0;
2982 } 2997 }
2983#endif 2998#endif
2984 2999
2985 if (a) 3000 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3001 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3003 SCHEME_V->args = NIL;
2989 3004
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3005 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3006 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3007 SCHEME_V->op = OP_ERR0;
3008
2993 return S_T; 3009 return 0;
2994} 3010}
2995 3011
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3012#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3013#define Error_0(s) Error_1 (s, 0)
2998 3014
2999/* Too small to turn into function */ 3015/* Too small to turn into function */
3000#define BEGIN do { 3016#define BEGIN do {
3001#define END } while (0) 3017#define END } while (0)
3002#define s_goto(a) BEGIN \ 3018#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3019 SCHEME_V->op = a; \
3004 return S_T; END 3020 return 0; END
3005 3021
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3022#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3023
3008#ifndef USE_SCHEME_STACK 3024#ifndef USE_SCHEME_STACK
3009 3025
… …
3039 next_frame->code = code; 3055 next_frame->code = code;
3040 3056
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3058}
3043 3059
3044static pointer 3060static int
3045xs_return (SCHEME_P_ pointer a) 3061xs_return (SCHEME_P_ pointer a)
3046{ 3062{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3063 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3064 struct dump_stack_frame *frame;
3049 3065
3050 SCHEME_V->value = a; 3066 SCHEME_V->value = a;
3051 3067
3052 if (nframes <= 0) 3068 if (nframes <= 0)
3053 return NIL; 3069 return -1;
3054 3070
3055 frame = &SCHEME_V->dump_base[--nframes]; 3071 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3072 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3073 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3074 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3075 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3077
3062 return S_T; 3078 return 0;
3063} 3079}
3064 3080
3065static INLINE void 3081ecb_inline void
3066dump_stack_reset (SCHEME_P) 3082dump_stack_reset (SCHEME_P)
3067{ 3083{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3084 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3085 SCHEME_V->dump = (pointer)+0;
3070} 3086}
3071 3087
3072static INLINE void 3088ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3089dump_stack_initialize (SCHEME_P)
3074{ 3090{
3075 SCHEME_V->dump_size = 0; 3091 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3093 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3146 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3147 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3148
3133 while (cont != NIL) 3149 while (cont != NIL)
3134 { 3150 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3151 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3152 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3153 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3154 frame->code = car (cont) ; cont = cdr (cont);
3139 3155
3140 ++frame; 3156 ++frame;
3141 ++i; 3157 ++i;
3142 } 3158 }
3143 3159
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3160 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3161}
3146 3162
3147#else 3163#else
3148 3164
3149static INLINE void 3165ecb_inline void
3150dump_stack_reset (SCHEME_P) 3166dump_stack_reset (SCHEME_P)
3151{ 3167{
3152 SCHEME_V->dump = NIL; 3168 SCHEME_V->dump = NIL;
3153} 3169}
3154 3170
3155static INLINE void 3171ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3172dump_stack_initialize (SCHEME_P)
3157{ 3173{
3158 dump_stack_reset (SCHEME_A); 3174 dump_stack_reset (SCHEME_A);
3159} 3175}
3160 3176
… …
3162dump_stack_free (SCHEME_P) 3178dump_stack_free (SCHEME_P)
3163{ 3179{
3164 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3165} 3181}
3166 3182
3167static pointer 3183static int
3168xs_return (SCHEME_P_ pointer a) 3184xs_return (SCHEME_P_ pointer a)
3169{ 3185{
3170 pointer dump = SCHEME_V->dump; 3186 pointer dump = SCHEME_V->dump;
3171 3187
3172 SCHEME_V->value = a; 3188 SCHEME_V->value = a;
3173 3189
3174 if (dump == NIL) 3190 if (dump == NIL)
3175 return NIL; 3191 return -1;
3176 3192
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3193 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3194 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3195 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3196 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3197
3182 SCHEME_V->dump = dump; 3198 SCHEME_V->dump = dump;
3183 3199
3184 return S_T; 3200 return 0;
3185} 3201}
3186 3202
3187static void 3203static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3205{
… …
3214 3230
3215#endif 3231#endif
3216 3232
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3234
3219static pointer 3235static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3236opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3237{
3222 pointer args = SCHEME_V->args; 3238 pointer args = SCHEME_V->args;
3223 pointer x, y; 3239 pointer x, y;
3224 3240
… …
3391 3407
3392 case OP_TRACING: 3408 case OP_TRACING:
3393 { 3409 {
3394 int tr = SCHEME_V->tracing; 3410 int tr = SCHEME_V->tracing;
3395 3411
3396 SCHEME_V->tracing = ivalue (car (args)); 3412 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3413 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3414 }
3399 3415
3400#endif 3416#endif
3401 3417
… …
3910 SCHEME_V->code = car (args); 3926 SCHEME_V->code = car (args);
3911 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3927 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3912 s_goto (OP_APPLY); 3928 s_goto (OP_APPLY);
3913 } 3929 }
3914 3930
3915 abort (); 3931 if (USE_ERROR_CHECKING) abort ();
3916} 3932}
3917 3933
3918static pointer 3934static int
3919opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3935opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3920{ 3936{
3921 pointer args = SCHEME_V->args; 3937 pointer args = SCHEME_V->args;
3922 pointer x = car (args); 3938 pointer x = car (args);
3923 num v; 3939 num v;
3924 3940
3925#if USE_MATH
3926 RVALUE dd;
3927#endif
3928
3929 switch (op) 3941 switch (op)
3930 { 3942 {
3931#if USE_MATH 3943#if USE_MATH
3932 case OP_INEX2EX: /* inexact->exact */ 3944 case OP_INEX2EX: /* inexact->exact */
3945 {
3933 if (num_is_integer (x)) 3946 if (is_integer (x))
3934 s_return (x); 3947 s_return (x);
3935 else if (modf (rvalue_unchecked (x), &dd) == 0) 3948
3949 RVALUE r = rvalue_unchecked (x);
3950
3951 if (r == (RVALUE)(IVALUE)r)
3936 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3937 else 3953 else
3938 Error_1 ("inexact->exact: not integral:", x); 3954 Error_1 ("inexact->exact: not integral:", x);
3955 }
3939 3956
3940 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3957 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)))); 3958 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)))); 3959 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)))); 3960 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3961 { 3978 {
3962 RVALUE result; 3979 RVALUE result;
3963 int real_result = 1; 3980 int real_result = 1;
3964 pointer y = cadr (args); 3981 pointer y = cadr (args);
3965 3982
3966 if (num_is_integer (x) && num_is_integer (y)) 3983 if (is_integer (x) && is_integer (y))
3967 real_result = 0; 3984 real_result = 0;
3968 3985
3969 /* This 'if' is an R5RS compatibility fix. */ 3986 /* This 'if' is an R5RS compatibility fix. */
3970 /* NOTE: Remove this 'if' fix for R6RS. */ 3987 /* NOTE: Remove this 'if' fix for R6RS. */
3971 if (rvalue (x) == 0 && rvalue (y) < 0) 3988 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3977 /* If the test fails, result is too big for integer. */ 3994 /* If the test fails, result is too big for integer. */
3978 if (!real_result) 3995 if (!real_result)
3979 { 3996 {
3980 long result_as_long = result; 3997 long result_as_long = result;
3981 3998
3982 if (result != (RVALUE) result_as_long) 3999 if (result != result_as_long)
3983 real_result = 1; 4000 real_result = 1;
3984 } 4001 }
3985 4002
3986 if (real_result) 4003 if (real_result)
3987 s_return (mk_real (SCHEME_A_ result)); 4004 s_return (mk_real (SCHEME_A_ result));
… …
3992 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4009 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)))); 4010 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3994 4011
3995 case OP_TRUNCATE: 4012 case OP_TRUNCATE:
3996 { 4013 {
3997 RVALUE rvalue_of_x; 4014 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))); 4015 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 } 4016 }
4006 4017
4007 case OP_ROUND: 4018 case OP_ROUND:
4008 if (num_is_integer (x)) 4019 if (is_integer (x))
4009 s_return (x); 4020 s_return (x);
4010 4021
4011 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4022 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4012#endif 4023#endif
4013 4024
4014 case OP_ADD: /* + */ 4025 case OP_ADD: /* + */
4015 v = num_zero; 4026 v = num_zero;
4016 4027
4017 for (x = args; x != NIL; x = cdr (x)) 4028 for (x = args; x != NIL; x = cdr (x))
4018 v = num_op ('+', v, nvalue (car (x))); 4029 v = num_op (NUM_ADD, v, nvalue (car (x)));
4019 4030
4020 s_return (mk_number (SCHEME_A_ v)); 4031 s_return (mk_number (SCHEME_A_ v));
4021 4032
4022 case OP_MUL: /* * */ 4033 case OP_MUL: /* * */
4023 v = num_one; 4034 v = num_one;
4024 4035
4025 for (x = args; x != NIL; x = cdr (x)) 4036 for (x = args; x != NIL; x = cdr (x))
4026 v = num_op ('+', v, nvalue (car (x))); 4037 v = num_op (NUM_MUL, v, nvalue (car (x)));
4027 4038
4028 s_return (mk_number (SCHEME_A_ v)); 4039 s_return (mk_number (SCHEME_A_ v));
4029 4040
4030 case OP_SUB: /* - */ 4041 case OP_SUB: /* - */
4031 if (cdr (args) == NIL) 4042 if (cdr (args) == NIL)
… …
4038 x = cdr (args); 4049 x = cdr (args);
4039 v = nvalue (car (args)); 4050 v = nvalue (car (args));
4040 } 4051 }
4041 4052
4042 for (; x != NIL; x = cdr (x)) 4053 for (; x != NIL; x = cdr (x))
4043 v = num_op ('+', v, nvalue (car (x))); 4054 v = num_op (NUM_SUB, v, nvalue (car (x)));
4044 4055
4045 s_return (mk_number (SCHEME_A_ v)); 4056 s_return (mk_number (SCHEME_A_ v));
4046 4057
4047 case OP_DIV: /* / */ 4058 case OP_DIV: /* / */
4048 if (cdr (args) == NIL) 4059 if (cdr (args) == NIL)
… …
4055 x = cdr (args); 4066 x = cdr (args);
4056 v = nvalue (car (args)); 4067 v = nvalue (car (args));
4057 } 4068 }
4058 4069
4059 for (; x != NIL; x = cdr (x)) 4070 for (; x != NIL; x = cdr (x))
4060 {
4061 if (!is_zero_rvalue (rvalue (car (x)))) 4071 if (!is_zero_rvalue (rvalue (car (x))))
4062 v = num_div (v, nvalue (car (x))); 4072 v = num_div (v, nvalue (car (x)));
4063 else 4073 else
4064 Error_0 ("/: division by zero"); 4074 Error_0 ("/: division by zero");
4065 }
4066 4075
4067 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4068 4077
4069 case OP_INTDIV: /* quotient */ 4078 case OP_INTDIV: /* quotient */
4070 if (cdr (args) == NIL) 4079 if (cdr (args) == NIL)
… …
4079 } 4088 }
4080 4089
4081 for (; x != NIL; x = cdr (x)) 4090 for (; x != NIL; x = cdr (x))
4082 { 4091 {
4083 if (ivalue (car (x)) != 0) 4092 if (ivalue (car (x)) != 0)
4084 v = num_op ('/', v, nvalue (car (x))); 4093 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4085 else 4094 else
4086 Error_0 ("quotient: division by zero"); 4095 Error_0 ("quotient: division by zero");
4087 } 4096 }
4088 4097
4089 s_return (mk_number (SCHEME_A_ v)); 4098 s_return (mk_number (SCHEME_A_ v));
… …
4135 } 4144 }
4136 else 4145 else
4137 Error_0 ("set-cdr!: unable to alter immutable pair"); 4146 Error_0 ("set-cdr!: unable to alter immutable pair");
4138 4147
4139 case OP_CHAR2INT: /* char->integer */ 4148 case OP_CHAR2INT: /* char->integer */
4140 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4149 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141 4150
4142 case OP_INT2CHAR: /* integer->char */ 4151 case OP_INT2CHAR: /* integer->char */
4143 s_return (mk_character (SCHEME_A_ ivalue (x))); 4152 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144 4153
4145 case OP_CHARUPCASE: 4154 case OP_CHARUPCASE:
4146 { 4155 {
4147 unsigned char c = ivalue (x); 4156 unsigned char c = ivalue_unchecked (x);
4148 c = toupper (c); 4157 c = toupper (c);
4149 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4150 } 4159 }
4151 4160
4152 case OP_CHARDNCASE: 4161 case OP_CHARDNCASE:
4153 { 4162 {
4154 unsigned char c = ivalue (x); 4163 unsigned char c = ivalue_unchecked (x);
4155 c = tolower (c); 4164 c = tolower (c);
4156 s_return (mk_character (SCHEME_A_ c)); 4165 s_return (mk_character (SCHEME_A_ c));
4157 } 4166 }
4158 4167
4159 case OP_STR2SYM: /* string->symbol */ 4168 case OP_STR2SYM: /* string->symbol */
… …
4236 Error_1 ("atom->string: not an atom:", x); 4245 Error_1 ("atom->string: not an atom:", x);
4237 } 4246 }
4238 4247
4239 case OP_MKSTRING: /* make-string */ 4248 case OP_MKSTRING: /* make-string */
4240 { 4249 {
4241 int fill = ' '; 4250 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242 int len;
4243
4244 len = ivalue (x); 4251 int len = ivalue_unchecked (x);
4245
4246 if (cdr (args) != NIL)
4247 fill = charvalue (cadr (args));
4248 4252
4249 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4250 } 4254 }
4251 4255
4252 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4253 s_return (mk_integer (SCHEME_A_ strlength (x))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4254 4258
4255 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4256 { 4260 {
4257 char *str;
4258 int index;
4259
4260 str = strvalue (x); 4261 char *str = strvalue (x);
4261
4262 index = ivalue (cadr (args)); 4262 int index = ivalue_unchecked (cadr (args));
4263 4263
4264 if (index >= strlength (x)) 4264 if (index >= strlength (x))
4265 Error_1 ("string-ref: out of bounds:", cadr (args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4266 4266
4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268 } 4268 }
4269 4269
4270 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4271 { 4271 {
4272 char *str; 4272 char *str = strvalue (x);
4273 int index; 4273 int index = ivalue_unchecked (cadr (args));
4274 int c; 4274 int c;
4275 4275
4276 if (is_immutable (x)) 4276 if (is_immutable (x))
4277 Error_1 ("string-set!: unable to alter immutable string:", x); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279 str = strvalue (x);
4280
4281 index = ivalue (cadr (args));
4282 4278
4283 if (index >= strlength (x)) 4279 if (index >= strlength (x))
4284 Error_1 ("string-set!: out of bounds:", cadr (args)); 4280 Error_1 ("string-set!: out of bounds:", cadr (args));
4285 4281
4286 c = charvalue (caddr (args)); 4282 c = charvalue (caddr (args));
… …
4309 s_return (newstr); 4305 s_return (newstr);
4310 } 4306 }
4311 4307
4312 case OP_SUBSTR: /* substring */ 4308 case OP_SUBSTR: /* substring */
4313 { 4309 {
4314 char *str; 4310 char *str = strvalue (x);
4315 int index0; 4311 int index0 = ivalue_unchecked (cadr (args));
4316 int index1; 4312 int index1;
4317 int len; 4313 int len;
4318 4314
4319 str = strvalue (x);
4320
4321 index0 = ivalue (cadr (args));
4322
4323 if (index0 > strlength (x)) 4315 if (index0 > strlength (x))
4324 Error_1 ("substring: start out of bounds:", cadr (args)); 4316 Error_1 ("substring: start out of bounds:", cadr (args));
4325 4317
4326 if (cddr (args) != NIL) 4318 if (cddr (args) != NIL)
4327 { 4319 {
4328 index1 = ivalue (caddr (args)); 4320 index1 = ivalue_unchecked (caddr (args));
4329 4321
4330 if (index1 > strlength (x) || index1 < index0) 4322 if (index1 > strlength (x) || index1 < index0)
4331 Error_1 ("substring: end out of bounds:", caddr (args)); 4323 Error_1 ("substring: end out of bounds:", caddr (args));
4332 } 4324 }
4333 else 4325 else
… …
4356 if (SCHEME_V->no_memory) 4348 if (SCHEME_V->no_memory)
4357 s_return (S_SINK); 4349 s_return (S_SINK);
4358#endif 4350#endif
4359 4351
4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4352 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361 set_vector_elem (vec, i, car (x)); 4353 vector_set (vec, i, car (x));
4362 4354
4363 s_return (vec); 4355 s_return (vec);
4364 } 4356 }
4365 4357
4366 case OP_MKVECTOR: /* make-vector */ 4358 case OP_MKVECTOR: /* make-vector */
4367 { 4359 {
4368 pointer fill = NIL; 4360 pointer fill = NIL;
4369 int len;
4370 pointer vec; 4361 pointer vec;
4371
4372 len = ivalue (x); 4362 int len = ivalue_unchecked (x);
4373 4363
4374 if (cdr (args) != NIL) 4364 if (cdr (args) != NIL)
4375 fill = cadr (args); 4365 fill = cadr (args);
4376 4366
4377 vec = mk_vector (SCHEME_A_ len); 4367 vec = mk_vector (SCHEME_A_ len);
… …
4380 if (SCHEME_V->no_memory) 4370 if (SCHEME_V->no_memory)
4381 s_return (S_SINK); 4371 s_return (S_SINK);
4382#endif 4372#endif
4383 4373
4384 if (fill != NIL) 4374 if (fill != NIL)
4385 fill_vector (vec, fill); 4375 fill_vector (vec, 0, fill);
4386 4376
4387 s_return (vec); 4377 s_return (vec);
4388 } 4378 }
4389 4379
4390 case OP_VECLEN: /* vector-length */ 4380 case OP_VECLEN: /* vector-length */
4391 s_return (mk_integer (SCHEME_A_ veclength (x))); 4381 s_return (mk_integer (SCHEME_A_ veclength (x)));
4392 4382
4393 case OP_VECREF: /* vector-ref */ 4383 case OP_VECREF: /* vector-ref */
4394 { 4384 {
4395 int index;
4396
4397 index = ivalue (cadr (args)); 4385 int index = ivalue_unchecked (cadr (args));
4398 4386
4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4388 Error_1 ("vector-ref: out of bounds:", cadr (args));
4401 4389
4402 s_return (vector_elem (x, index)); 4390 s_return (vector_get (x, index));
4403 } 4391 }
4404 4392
4405 case OP_VECSET: /* vector-set! */ 4393 case OP_VECSET: /* vector-set! */
4406 { 4394 {
4407 int index; 4395 int index = ivalue_unchecked (cadr (args));
4408 4396
4409 if (is_immutable (x)) 4397 if (is_immutable (x))
4410 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4398 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411 4399
4412 index = ivalue (cadr (args));
4413
4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4401 Error_1 ("vector-set!: out of bounds:", cadr (args));
4416 4402
4417 set_vector_elem (x, index, caddr (args)); 4403 vector_set (x, index, caddr (args));
4418 s_return (x); 4404 s_return (x);
4419 } 4405 }
4420 } 4406 }
4421 4407
4422 return S_T; 4408 if (USE_ERROR_CHECKING) abort ();
4423} 4409}
4424 4410
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 4411static int
4480opexe_r (SCHEME_P_ enum scheme_opcodes op) 4412opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{ 4413{
4482 pointer x = SCHEME_V->args; 4414 pointer x = SCHEME_V->args;
4483 4415
4484 for (;;) 4416 for (;;)
4485 { 4417 {
… …
4505 } 4437 }
4506 4438
4507 s_return (S_T); 4439 s_return (S_T);
4508} 4440}
4509 4441
4510static pointer 4442static int
4511opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4443opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4512{ 4444{
4513 pointer args = SCHEME_V->args; 4445 pointer args = SCHEME_V->args;
4514 pointer a = car (args); 4446 pointer a = car (args);
4515 pointer d = cdr (args); 4447 pointer d = cdr (args);
… …
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4461 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530 4462
4531#if USE_CHAR_CLASSIFIERS 4463#if USE_CHAR_CLASSIFIERS
4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4467 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4468 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537#endif 4469#endif
4538 4470
4539#if USE_PORTS 4471#if USE_PORTS
4540 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4472 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4473 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4561 } 4493 }
4562 4494
4563 s_retbool (r); 4495 s_retbool (r);
4564} 4496}
4565 4497
4566static pointer 4498static int
4567opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4568{ 4500{
4569 pointer args = SCHEME_V->args; 4501 pointer args = SCHEME_V->args;
4570 pointer a = car (args); 4502 pointer a = car (args);
4571 pointer x, y; 4503 pointer x, y;
… …
4657 putstr (SCHEME_A_ "\n"); 4589 putstr (SCHEME_A_ "\n");
4658 4590
4659 if (SCHEME_V->interactive_repl) 4591 if (SCHEME_V->interactive_repl)
4660 s_goto (OP_T0LVL); 4592 s_goto (OP_T0LVL);
4661 else 4593 else
4662 return NIL; 4594 return -1;
4663 } 4595 }
4664 4596
4665 case OP_REVERSE: /* reverse */ 4597 case OP_REVERSE: /* reverse */
4666 s_return (reverse (SCHEME_A_ a)); 4598 s_return (reverse (SCHEME_A_ a));
4667 4599
… …
4724 4656
4725 case OP_QUIT: /* quit */ 4657 case OP_QUIT: /* quit */
4726 if (is_pair (args)) 4658 if (is_pair (args))
4727 SCHEME_V->retcode = ivalue (a); 4659 SCHEME_V->retcode = ivalue (a);
4728 4660
4729 return NIL; 4661 return -1;
4730 4662
4731 case OP_GC: /* gc */ 4663 case OP_GC: /* gc */
4732 gc (SCHEME_A_ NIL, NIL); 4664 gc (SCHEME_A_ NIL, NIL);
4733 s_return (S_T); 4665 s_return (S_T);
4734 4666
… …
4742 4674
4743 case OP_NEWSEGMENT: /* new-segment */ 4675 case OP_NEWSEGMENT: /* new-segment */
4744 if (!is_pair (args) || !is_number (a)) 4676 if (!is_pair (args) || !is_number (a))
4745 Error_0 ("new-segment: argument must be a number"); 4677 Error_0 ("new-segment: argument must be a number");
4746 4678
4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4679 alloc_cellseg (SCHEME_A_ ivalue (a));
4748 4680
4749 s_return (S_T); 4681 s_return (S_T);
4750 4682
4751 case OP_OBLIST: /* oblist */ 4683 case OP_OBLIST: /* oblist */
4752 s_return (oblist_all_symbols (SCHEME_A)); 4684 s_return (oblist_all_symbols (SCHEME_A));
… …
4781 break; 4713 break;
4782 } 4714 }
4783 4715
4784 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4716 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4785 4717
4786 if (p == NIL) 4718 s_return (p == NIL ? S_F : p);
4787 s_return (S_F);
4788
4789 s_return (p);
4790 } 4719 }
4791 4720
4792# if USE_STRING_PORTS 4721# if USE_STRING_PORTS
4793 4722
4794 case OP_OPEN_INSTRING: /* open-input-string */ 4723 case OP_OPEN_INSTRING: /* open-input-string */
… …
4809 } 4738 }
4810 4739
4811 p = port_from_string (SCHEME_A_ strvalue (a), 4740 p = port_from_string (SCHEME_A_ strvalue (a),
4812 strvalue (a) + strlength (a), prop); 4741 strvalue (a) + strlength (a), prop);
4813 4742
4814 if (p == NIL) 4743 s_return (p == NIL ? S_F : p);
4815 s_return (S_F);
4816
4817 s_return (p);
4818 } 4744 }
4819 4745
4820 case OP_OPEN_OUTSTRING: /* open-output-string */ 4746 case OP_OPEN_OUTSTRING: /* open-output-string */
4821 { 4747 {
4822 pointer p; 4748 pointer p;
4823 4749
4824 if (a == NIL) 4750 if (a == NIL)
4825 {
4826 p = port_from_scratch (SCHEME_A); 4751 p = port_from_scratch (SCHEME_A);
4827
4828 if (p == NIL)
4829 s_return (S_F);
4830 }
4831 else 4752 else
4832 {
4833 p = port_from_string (SCHEME_A_ strvalue (a), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4834 strvalue (a) + strlength (a), port_output); 4754 strvalue (a) + strlength (a), port_output);
4835 4755
4836 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4837 s_return (S_F);
4838 }
4839
4840 s_return (p);
4841 } 4757 }
4842 4758
4843 case OP_GET_OUTSTRING: /* get-output-string */ 4759 case OP_GET_OUTSTRING: /* get-output-string */
4844 { 4760 {
4845 port *p; 4761 port *p;
… …
4884 case OP_CURR_ENV: /* current-environment */ 4800 case OP_CURR_ENV: /* current-environment */
4885 s_return (SCHEME_V->envir); 4801 s_return (SCHEME_V->envir);
4886 4802
4887 } 4803 }
4888 4804
4889 abort (); 4805 if (USE_ERROR_CHECKING) abort ();
4890} 4806}
4891 4807
4892static pointer 4808static int
4893opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4809opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4894{ 4810{
4895 pointer args = SCHEME_V->args; 4811 pointer args = SCHEME_V->args;
4896 pointer x; 4812 pointer x;
4897 4813
… …
5026 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4942 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5027 SCHEME_V->tok = token (SCHEME_A); 4943 SCHEME_V->tok = token (SCHEME_A);
5028 s_goto (OP_RDSEXPR); 4944 s_goto (OP_RDSEXPR);
5029 4945
5030 case TOK_ATOM: 4946 case TOK_ATOM:
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948
4949 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032 4952
5033 case TOK_DQUOTE: 4953 case TOK_DQUOTE:
5034 x = readstrexp (SCHEME_A); 4954 x = readstrexp (SCHEME_A_ '"');
5035 4955
5036 if (x == S_F) 4956 if (x == S_F)
5037 Error_0 ("Error reading string"); 4957 Error_0 ("Error reading string");
5038 4958
5039 setimmutable (x); 4959 setimmutable (x);
… …
5051 s_goto (OP_EVAL); 4971 s_goto (OP_EVAL);
5052 } 4972 }
5053 } 4973 }
5054 4974
5055 case TOK_SHARP_CONST: 4975 case TOK_SHARP_CONST:
5056 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4976 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5057 Error_0 ("undefined sharp expression"); 4977 Error_0 ("undefined sharp expression");
5058 else 4978 else
5059 s_return (x); 4979 s_return (x);
5060 4980
5061 default: 4981 default:
… …
5213 putstr (SCHEME_A_ ")"); 5133 putstr (SCHEME_A_ ")");
5214 s_return (S_T); 5134 s_return (S_T);
5215 } 5135 }
5216 else 5136 else
5217 { 5137 {
5218 pointer elem = vector_elem (vec, i); 5138 pointer elem = vector_get (vec, i);
5219 5139
5220 ivalue_unchecked (cdr (args)) = i + 1; 5140 ivalue_unchecked (cdr (args)) = i + 1;
5221 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5141 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5222 SCHEME_V->args = elem; 5142 SCHEME_V->args = elem;
5223 5143
… …
5227 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5228 } 5148 }
5229 } 5149 }
5230 } 5150 }
5231 5151
5232 abort (); 5152 if (USE_ERROR_CHECKING) abort ();
5233} 5153}
5234 5154
5235static pointer 5155static int
5236opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5156opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5237{ 5157{
5238 pointer args = SCHEME_V->args; 5158 pointer args = SCHEME_V->args;
5239 pointer a = car (args); 5159 pointer a = car (args);
5240 pointer x, y; 5160 pointer x, y;
… …
5290 5210
5291 case OP_MACROP: /* macro? */ 5211 case OP_MACROP: /* macro? */
5292 s_retbool (is_macro (a)); 5212 s_retbool (is_macro (a));
5293 } 5213 }
5294 5214
5295 abort (); 5215 if (USE_ERROR_CHECKING) abort ();
5296} 5216}
5297 5217
5218/* 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); 5219typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5299 5220
5300typedef int (*test_predicate) (pointer); 5221typedef int (*test_predicate)(pointer);
5301static int 5222static int
5302is_any (pointer p) 5223tst_any (pointer p)
5303{ 5224{
5304 return 1; 5225 return 1;
5305} 5226}
5306 5227
5307static int 5228static int
5308is_nonneg (pointer p) 5229tst_inonneg (pointer p)
5309{ 5230{
5310 return ivalue (p) >= 0 && is_integer (p); 5231 return is_integer (p) && ivalue_unchecked (p) >= 0;
5232}
5233
5234static int
5235tst_is_list (SCHEME_P_ pointer p)
5236{
5237 return p == NIL || is_pair (p);
5311} 5238}
5312 5239
5313/* Correspond carefully with following defines! */ 5240/* Correspond carefully with following defines! */
5314static struct 5241static struct
5315{ 5242{
5316 test_predicate fct; 5243 test_predicate fct;
5317 const char *kind; 5244 const char *kind;
5318} tests[] = 5245} tests[] = {
5319{ 5246 { tst_any , 0 },
5320 { 0, 0}, /* unused */ 5247 { is_string , "string" },
5321 { is_any, 0}, 5248 { is_symbol , "symbol" },
5322 { is_string, "string" }, 5249 { is_port , "port" },
5323 { is_symbol, "symbol" },
5324 { is_port, "port" },
5325 { is_inport, "input port" }, 5250 { is_inport , "input port" },
5326 { is_outport, "output port" }, 5251 { is_outport , "output port" },
5327 { is_environment, "environment" }, 5252 { is_environment, "environment" },
5328 { is_pair, "pair" }, 5253 { is_pair , "pair" },
5329 { 0, "pair or '()" }, 5254 { 0 , "pair or '()" },
5330 { is_character, "character" }, 5255 { is_character , "character" },
5331 { is_vector, "vector" }, 5256 { is_vector , "vector" },
5332 { is_number, "number" }, 5257 { is_number , "number" },
5333 { is_integer, "integer" }, 5258 { is_integer , "integer" },
5334 { is_nonneg, "non-negative integer" } 5259 { tst_inonneg , "non-negative integer" }
5335}; 5260};
5336 5261
5337#define TST_NONE 0 /* TST_NONE used for standard procedures, for internal ops, 0 is used */ 5262#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5338#define TST_ANY "\001" 5263#define TST_ANY "\001"
5339#define TST_STRING "\002" 5264#define TST_STRING "\002"
5340#define TST_SYMBOL "\003" 5265#define TST_SYMBOL "\003"
5341#define TST_PORT "\004" 5266#define TST_PORT "\004"
5342#define TST_INPORT "\005" 5267#define TST_INPORT "\005"
… …
5348#define TST_VECTOR "\013" 5273#define TST_VECTOR "\013"
5349#define TST_NUMBER "\014" 5274#define TST_NUMBER "\014"
5350#define TST_INTEGER "\015" 5275#define TST_INTEGER "\015"
5351#define TST_NATURAL "\016" 5276#define TST_NATURAL "\016"
5352 5277
5278#define INF_ARG 0xff
5279#define UNNAMED_OP ""
5280
5281static const char opnames[] =
5282#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5283#include "opdefines.h"
5284#undef OP_DEF
5285;
5286
5287static const char *
5288opname (int idx)
5289{
5290 const char *name = opnames;
5291
5292 /* should do this at compile time, but would require external program, right? */
5293 while (idx--)
5294 name += strlen (name) + 1;
5295
5296 return *name ? name : "ILLEGAL";
5297}
5298
5299static const char *
5300procname (pointer x)
5301{
5302 return opname (procnum (x));
5303}
5304
5353typedef struct 5305typedef struct
5354{ 5306{
5355 dispatch_func func; 5307 uint8_t func;
5356 char *name; 5308 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5309 uint8_t builtin;
5310#if USE_ERROR_CHECKING
5357 int min_arity; 5311 uint8_t min_arity;
5358 int max_arity; 5312 uint8_t max_arity;
5359 char arg_tests_encoding[3]; 5313 char arg_tests_encoding[3];
5314#endif
5360} op_code_info; 5315} op_code_info;
5361 5316
5362#define INF_ARG 0xffff
5363
5364static op_code_info dispatch_table[] = { 5317static const op_code_info dispatch_table[] = {
5318#if USE_ERROR_CHECKING
5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) { opexe_ ## func, name, minarity, maxarity, argtest }, 5319#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5320#else
5321#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5322#endif
5366#include "opdefines.h" 5323#include "opdefines.h"
5367#undef OP_DEF 5324#undef OP_DEF
5368 {0} 5325 {0}
5369}; 5326};
5370 5327
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 */ 5328/* kernel of this interpreter */
5384static void 5329static void ecb_hot
5385Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5330Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5386{ 5331{
5387 SCHEME_V->op = op; 5332 SCHEME_V->op = op;
5388 5333
5389 for (;;) 5334 for (;;)
5390 { 5335 {
5391 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5336 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5392 5337
5393#if USE_ERROR_CHECKING 5338#if USE_ERROR_CHECKING
5394 if (pcd->name) /* if built-in function, check arguments */ 5339 if (pcd->builtin) /* if built-in function, check arguments */
5395 { 5340 {
5396 int ok = 1;
5397 char msg[STRBUFFSIZE]; 5341 char msg[STRBUFFSIZE];
5398 int n = list_length (SCHEME_A_ SCHEME_V->args); 5342 int n = list_length (SCHEME_A_ SCHEME_V->args);
5399 5343
5400 /* Check number of arguments */ 5344 /* Check number of arguments */
5401 if (ecb_expect_false (n < pcd->min_arity)) 5345 if (ecb_expect_false (n < pcd->min_arity))
5402 { 5346 {
5403 ok = 0;
5404 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5347 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5405 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5348 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5349 xError_1 (SCHEME_A_ msg, 0);
5350 continue;
5406 } 5351 }
5407 else if (ecb_expect_false (n > pcd->max_arity)) 5352 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5408 { 5353 {
5409 ok = 0;
5410 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5354 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5411 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5355 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5356 xError_1 (SCHEME_A_ msg, 0);
5357 continue;
5412 } 5358 }
5413 5359 else
5414 if (ecb_expect_false (ok))
5415 { 5360 {
5416 if (*pcd->arg_tests_encoding) 5361 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5417 { 5362 {
5418 int i = 0; 5363 int i = 0;
5419 int j; 5364 int j;
5420 const char *t = pcd->arg_tests_encoding; 5365 const char *t = pcd->arg_tests_encoding;
5421 pointer arglist = SCHEME_V->args; 5366 pointer arglist = SCHEME_V->args;
… …
5424 { 5369 {
5425 pointer arg = car (arglist); 5370 pointer arg = car (arglist);
5426 5371
5427 j = t[0]; 5372 j = t[0];
5428 5373
5374 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5429 if (j == TST_LIST[0]) 5375 if (j == TST_LIST[0])
5430 { 5376 {
5431 if (arg != NIL && !is_pair (arg)) 5377 if (!tst_is_list (SCHEME_A_ arg))
5432 break; 5378 break;
5433 } 5379 }
5434 else 5380 else
5435 { 5381 {
5436 if (!tests[j].fct (arg)) 5382 if (!tests[j - 1].fct (arg))
5437 break; 5383 break;
5438 } 5384 }
5439 5385
5440 if (t[1]) /* last test is replicated as necessary */ 5386 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5441 t++; 5387 t++;
5442 5388
5443 arglist = cdr (arglist); 5389 arglist = cdr (arglist);
5444 i++; 5390 i++;
5445 } 5391 }
5446 while (i < n); 5392 while (i < n);
5447 5393
5448 if (i < n) 5394 if (i < n)
5449 { 5395 {
5450 ok = 0;
5451 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5396 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5397 xError_1 (SCHEME_A_ msg, 0);
5398 continue;
5452 } 5399 }
5453 } 5400 }
5454 } 5401 }
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 } 5402 }
5464#endif 5403#endif
5465 5404
5466 ok_to_freely_gc (SCHEME_A); 5405 ok_to_freely_gc (SCHEME_A);
5467 5406
5407 static const dispatch_func dispatch_funcs[] = {
5408 opexe_0,
5409 opexe_1,
5410 opexe_2,
5411 opexe_3,
5412 opexe_4,
5413 opexe_5,
5414 opexe_6,
5415 };
5416
5468 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5417 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5469 return; 5418 return;
5470 5419
5471 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5472 { 5421 {
5473 xwrstr ("No memory!\n"); 5422 xwrstr ("No memory!\n");
… …
5497mk_proc (SCHEME_P_ enum scheme_opcodes op) 5446mk_proc (SCHEME_P_ enum scheme_opcodes op)
5498{ 5447{
5499 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5448 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5500 set_typeflag (y, (T_PROC | T_ATOM)); 5449 set_typeflag (y, (T_PROC | T_ATOM));
5501 ivalue_unchecked (y) = op; 5450 ivalue_unchecked (y) = op;
5502 set_num_integer (y);
5503 return y; 5451 return y;
5504} 5452}
5505 5453
5506/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5454/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5507static int 5455static int
… …
5572 return OP_C0STREAM; /* cons-stream */ 5520 return OP_C0STREAM; /* cons-stream */
5573 } 5521 }
5574} 5522}
5575 5523
5576#if USE_MULTIPLICITY 5524#if USE_MULTIPLICITY
5577scheme * 5525ecb_cold scheme *
5578scheme_init_new () 5526scheme_init_new ()
5579{ 5527{
5580 scheme *sc = malloc (sizeof (scheme)); 5528 scheme *sc = malloc (sizeof (scheme));
5581 5529
5582 if (!scheme_init (SCHEME_A)) 5530 if (!scheme_init (SCHEME_A))
… …
5587 else 5535 else
5588 return sc; 5536 return sc;
5589} 5537}
5590#endif 5538#endif
5591 5539
5592int 5540ecb_cold int
5593scheme_init (SCHEME_P) 5541scheme_init (SCHEME_P)
5594{ 5542{
5595 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5596 pointer x; 5544 pointer x;
5597 5545
… …
5670 5618
5671 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5619 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5672 assign_syntax (SCHEME_A_ syntax_names[i]); 5620 assign_syntax (SCHEME_A_ syntax_names[i]);
5673 } 5621 }
5674 5622
5623 // TODO: should iterate via strlen, to avoid n² complexity
5675 for (i = 0; i < n; i++) 5624 for (i = 0; i < n; i++)
5676 if (dispatch_table[i].name != 0) 5625 if (dispatch_table[i].builtin)
5677 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5626 assign_proc (SCHEME_A_ i, opname (i));
5678 5627
5679 /* initialization of global pointers to special symbols */ 5628 /* initialization of global pointers to special symbols */
5680 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5629 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5681 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5630 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5682 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5631 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5721scheme_set_external_data (SCHEME_P_ void *p) 5670scheme_set_external_data (SCHEME_P_ void *p)
5722{ 5671{
5723 SCHEME_V->ext_data = p; 5672 SCHEME_V->ext_data = p;
5724} 5673}
5725 5674
5726void 5675ecb_cold void
5727scheme_deinit (SCHEME_P) 5676scheme_deinit (SCHEME_P)
5728{ 5677{
5729 int i; 5678 int i;
5730 5679
5731#if SHOW_ERROR_LINE 5680#if SHOW_ERROR_LINE

Diff Legend

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