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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC vs.
Revision 1.37 by root, Sun Nov 29 05:09:24 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
1359INTERFACE void
1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1366}
1367
1308INTERFACE pointer 1368INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1310{ 1370{
1311 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1312} 1372}
1313 1373
1314INTERFACE void 1374INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1376{
1317 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1318} 1378}
1319 1379
1320/* get new symbol */ 1380/* get new symbol */
… …
1332 1392
1333INTERFACE pointer 1393INTERFACE pointer
1334gensym (SCHEME_P) 1394gensym (SCHEME_P)
1335{ 1395{
1336 pointer x; 1396 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1397 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, SCHEME_V->gensym_cnt);
1342 1399
1343 /* first check oblist */ 1400 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} 1401}
1355 1402
1356/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1357static pointer 1404static pointer
1358mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1412 } 1459 }
1413 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1414 { 1461 {
1415 if (!has_fp_exp) 1462 if (!has_fp_exp)
1416 { 1463 {
1417 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1465 p++;
1420 1466
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1468 continue;
1423 } 1469 }
… …
1511 1557
1512 if (ecb_expect_false (is_vector (p))) 1558 if (ecb_expect_false (is_vector (p)))
1513 { 1559 {
1514 int i; 1560 int i;
1515 1561
1516 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1518 } 1564 }
1519 1565
1520 if (is_atom (p)) 1566 if (is_atom (p))
1521 goto E6; 1567 goto E6;
… …
1619 if (is_mark (p)) 1665 if (is_mark (p))
1620 clrmark (p); 1666 clrmark (p);
1621 else 1667 else
1622 { 1668 {
1623 /* reclaim cell */ 1669 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1625 { 1671 {
1626 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1628 set_car (p, NIL); 1674 set_car (p, NIL);
1629 } 1675 }
1630 1676
1631 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1634 } 1680 }
1635 } 1681 }
1636 } 1682 }
1637 1683
1638 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1640} 1688}
1641 1689
1642static void 1690static void
1643finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1644{ 1692{
… …
2073#endif 2121#endif
2074} 2122}
2075 2123
2076/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2077static char * 2125static char *
2078readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2127{
2080 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2081 2129
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2131
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2133 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2093} 2141}
2094 2142
2095/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2096static pointer 2144static pointer
2097readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2098{ 2146{
2099 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2100 int c; 2148 int c;
2101 int c1 = 0; 2149 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2150 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2151
2105 for (;;) 2152 for (;;)
2106 { 2153 {
2107 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2108 2155
… …
2110 return S_F; 2157 return S_F;
2111 2158
2112 switch (state) 2159 switch (state)
2113 { 2160 {
2114 case st_ok: 2161 case st_ok:
2115 switch (c) 2162 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); 2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2164
2125 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2126 *p++ = c; 2168 *p++ = c;
2127 break;
2128 }
2129 2169
2130 break; 2170 break;
2131 2171
2132 case st_bsl: 2172 case st_bsl:
2133 switch (c) 2173 switch (c)
… …
2163 case 'r': 2203 case 'r':
2164 *p++ = '\r'; 2204 *p++ = '\r';
2165 state = st_ok; 2205 state = st_ok;
2166 break; 2206 break;
2167 2207
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2208 default:
2174 *p++ = c; 2209 *p++ = c;
2175 state = st_ok; 2210 state = st_ok;
2176 break; 2211 break;
2177 } 2212 }
2178 2213
2179 break; 2214 break;
2180 2215
2181 case st_x1: 2216 case st_x1:
2182 case st_x2: 2217 case st_x2:
2183 c = toupper (c); 2218 c = tolower (c);
2184 2219
2185 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2189 else 2222 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2223 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 2224 else
2201 return S_F; 2225 return S_F;
2226
2227 if (state == st_x1)
2228 state = st_x2;
2229 else
2230 {
2231 *p++ = c1;
2232 state = st_ok;
2233 }
2202 2234
2203 break; 2235 break;
2204 2236
2205 case st_oct1: 2237 case st_oct1:
2206 case st_oct2: 2238 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2211 state = st_ok; 2243 state = st_ok;
2212 } 2244 }
2213 else 2245 else
2214 { 2246 {
2215 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2248 return S_F;
2217 2249
2218 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2219 2251
2220 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2225 state = st_ok; 2257 state = st_ok;
2226 } 2258 }
2227 } 2259 }
2228 2260
2229 break; 2261 break;
2230
2231 } 2262 }
2232 } 2263 }
2233} 2264}
2234 2265
2235/* check c is in chars */ 2266/* check c is in chars */
2236static INLINE int 2267ecb_inline int
2237is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2238{ 2269{
2239 if (c == EOF) 2270 if (c == EOF)
2240 return 1; 2271 return 1;
2241 2272
2242 return !!strchr (s, c); 2273 return !!strchr (s, c);
2243} 2274}
2244 2275
2245/* skip white characters */ 2276/* skip white characters */
2246static INLINE int 2277ecb_inline int
2247skipspace (SCHEME_P) 2278skipspace (SCHEME_P)
2248{ 2279{
2249 int c, curr_line = 0; 2280 int c, curr_line = 0;
2250 2281
2251 do 2282 do
… …
2298 2329
2299 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (" \n\t", c))
2300 return TOK_DOT; 2331 return TOK_DOT;
2301 else 2332 else
2302 { 2333 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2335 return TOK_DOTATOM;
2307 } 2336 }
2337
2338 case '|':
2339 return TOK_STRATOM;
2308 2340
2309 case '\'': 2341 case '\'':
2310 return TOK_QUOTE; 2342 return TOK_QUOTE;
2311 2343
2312 case ';': 2344 case ';':
… …
2479 { 2511 {
2480 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2481 2513
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2515 {
2484 if (num_is_integer (l)) 2516 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2518#if USE_REAL
2487 else 2519 else
2488 { 2520 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2744 return 0; 2776 return 0;
2745 } 2777 }
2746 else if (is_number (a)) 2778 else if (is_number (a))
2747 { 2779 {
2748 if (is_number (b)) 2780 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2782
2752 return 0; 2783 return 0;
2753 } 2784 }
2754 else if (is_character (a)) 2785 else if (is_character (a))
2755 { 2786 {
… …
2781/* () is #t in R5RS */ 2812/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2813#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2814#define is_false(p) ((p) == S_F)
2784 2815
2785/* ========== Environment implementation ========== */ 2816/* ========== 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 2817
2802#ifndef USE_ALIST_ENV 2818#ifndef USE_ALIST_ENV
2803 2819
2804/* 2820/*
2805 * In this implementation, each frame of the environment may be 2821 * In this implementation, each frame of the environment may be
… …
2822 2838
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2839 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2840 setenvironment (SCHEME_V->envir);
2825} 2841}
2826 2842
2827static INLINE void 2843static uint32_t
2844sym_hash (pointer sym, uint32_t size)
2845{
2846 uintptr_t ptr = (uintptr_t)sym;
2847
2848#if 0
2849 /* table size is prime, so why mix */
2850 ptr += ptr >> 32;
2851 ptr += ptr >> 16;
2852 ptr += ptr >> 8;
2853#endif
2854
2855 return ptr % size;
2856}
2857
2858ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2860{
2830 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
2831 2862
2832 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
2833 { 2864 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2865 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2866 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2867 }
2838 else 2868 else
2839 set_car (env, immutable_cons (slot, car (env))); 2869 set_car (env, immutable_cons (slot, car (env)));
2840} 2870}
2841 2871
2842static pointer 2872static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2873find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2874{
2845 pointer x, y; 2875 pointer x, y;
2846 int location;
2847 2876
2848 for (x = env; x != NIL; x = cdr (x)) 2877 for (x = env; x != NIL; x = cdr (x))
2849 { 2878 {
2850 if (is_vector (car (x))) 2879 if (is_vector (car (x)))
2851 { 2880 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2881 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2882 y = vector_get (car (x), location);
2854 } 2883 }
2855 else 2884 else
2856 y = car (x); 2885 y = car (x);
2857 2886
2858 for (; y != NIL; y = cdr (y)) 2887 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2888 if (caar (y) == hdl)
2860 break; 2889 break;
2861 2890
2862 if (y != NIL) 2891 if (y != NIL)
2892 return car (y);
2893
2894 if (!all)
2863 break; 2895 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2896 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2897
2872 return NIL; 2898 return NIL;
2873} 2899}
2874 2900
2875#else /* USE_ALIST_ENV */ 2901#else /* USE_ALIST_ENV */
2876 2902
2877static INLINE void 2903ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2904new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2905{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2906 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2907 setenvironment (SCHEME_V->envir);
2882} 2908}
2883 2909
2884static INLINE void 2910ecb_inline void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2911new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2912{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2913 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2914}
2889 2915
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2923 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2924 if (caar (y) == hdl)
2899 break; 2925 break;
2900 2926
2901 if (y != NIL) 2927 if (y != NIL)
2928 return car (y);
2902 break; 2929 break;
2903 2930
2904 if (!all) 2931 if (!all)
2905 return NIL; 2932 break;
2906 } 2933 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2934
2911 return NIL; 2935 return NIL;
2912} 2936}
2913 2937
2914#endif /* USE_ALIST_ENV else */ 2938#endif /* USE_ALIST_ENV else */
2915 2939
2916static INLINE void 2940ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2941new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2942{
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2943 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2944}
2921 2945
2922static INLINE void 2946ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2947set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2948{
2925 set_cdr (slot, value); 2949 set_cdr (slot, value);
2926} 2950}
2927 2951
2928static INLINE pointer 2952ecb_inline pointer
2929slot_value_in_env (pointer slot) 2953slot_value_in_env (pointer slot)
2930{ 2954{
2931 return cdr (slot); 2955 return cdr (slot);
2932} 2956}
2933 2957
2934/* ========== Evaluation Cycle ========== */ 2958/* ========== Evaluation Cycle ========== */
2935 2959
2936static pointer 2960static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2961xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2962{
2939#if USE_ERROR_HOOK 2963#if USE_ERROR_HOOK
2940 pointer x; 2964 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2965 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3000 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3001 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3002 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3003 SCHEME_V->op = OP_EVAL;
2980 3004
2981 return S_T; 3005 return 0;
2982 } 3006 }
2983#endif 3007#endif
2984 3008
2985 if (a) 3009 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3010 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3012 SCHEME_V->args = NIL;
2989 3013
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3014 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3015 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3016 SCHEME_V->op = OP_ERR0;
3017
2993 return S_T; 3018 return 0;
2994} 3019}
2995 3020
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3021#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3022#define Error_0(s) Error_1 (s, 0)
2998 3023
2999/* Too small to turn into function */ 3024/* Too small to turn into function */
3000#define BEGIN do { 3025#define BEGIN do {
3001#define END } while (0) 3026#define END } while (0)
3002#define s_goto(a) BEGIN \ 3027#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3028 SCHEME_V->op = a; \
3004 return S_T; END 3029 return 0; END
3005 3030
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3031#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3032
3008#ifndef USE_SCHEME_STACK 3033#ifndef USE_SCHEME_STACK
3009 3034
… …
3039 next_frame->code = code; 3064 next_frame->code = code;
3040 3065
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3066 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3067}
3043 3068
3044static pointer 3069static int
3045xs_return (SCHEME_P_ pointer a) 3070xs_return (SCHEME_P_ pointer a)
3046{ 3071{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3073 struct dump_stack_frame *frame;
3049 3074
3050 SCHEME_V->value = a; 3075 SCHEME_V->value = a;
3051 3076
3052 if (nframes <= 0) 3077 if (nframes <= 0)
3053 return NIL; 3078 return -1;
3054 3079
3055 frame = &SCHEME_V->dump_base[--nframes]; 3080 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3081 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3082 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3083 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3084 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3085 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3086
3062 return S_T; 3087 return 0;
3063} 3088}
3064 3089
3065static INLINE void 3090ecb_inline void
3066dump_stack_reset (SCHEME_P) 3091dump_stack_reset (SCHEME_P)
3067{ 3092{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3093 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3094 SCHEME_V->dump = (pointer)+0;
3070} 3095}
3071 3096
3072static INLINE void 3097ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3098dump_stack_initialize (SCHEME_P)
3074{ 3099{
3075 SCHEME_V->dump_size = 0; 3100 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3101 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3102 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3155 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3156 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3157
3133 while (cont != NIL) 3158 while (cont != NIL)
3134 { 3159 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3160 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3161 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3162 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3163 frame->code = car (cont) ; cont = cdr (cont);
3139 3164
3140 ++frame; 3165 ++frame;
3141 ++i; 3166 ++i;
3142 } 3167 }
3143 3168
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3169 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3170}
3146 3171
3147#else 3172#else
3148 3173
3149static INLINE void 3174ecb_inline void
3150dump_stack_reset (SCHEME_P) 3175dump_stack_reset (SCHEME_P)
3151{ 3176{
3152 SCHEME_V->dump = NIL; 3177 SCHEME_V->dump = NIL;
3153} 3178}
3154 3179
3155static INLINE void 3180ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3181dump_stack_initialize (SCHEME_P)
3157{ 3182{
3158 dump_stack_reset (SCHEME_A); 3183 dump_stack_reset (SCHEME_A);
3159} 3184}
3160 3185
… …
3162dump_stack_free (SCHEME_P) 3187dump_stack_free (SCHEME_P)
3163{ 3188{
3164 SCHEME_V->dump = NIL; 3189 SCHEME_V->dump = NIL;
3165} 3190}
3166 3191
3167static pointer 3192static int
3168xs_return (SCHEME_P_ pointer a) 3193xs_return (SCHEME_P_ pointer a)
3169{ 3194{
3170 pointer dump = SCHEME_V->dump; 3195 pointer dump = SCHEME_V->dump;
3171 3196
3172 SCHEME_V->value = a; 3197 SCHEME_V->value = a;
3173 3198
3174 if (dump == NIL) 3199 if (dump == NIL)
3175 return NIL; 3200 return -1;
3176 3201
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3202 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3203 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3204 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3205 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3206
3182 SCHEME_V->dump = dump; 3207 SCHEME_V->dump = dump;
3183 3208
3184 return S_T; 3209 return 0;
3185} 3210}
3186 3211
3187static void 3212static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3213s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3214{
… …
3214 3239
3215#endif 3240#endif
3216 3241
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3242#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3243
3219static pointer 3244static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3245opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3246{
3222 pointer args = SCHEME_V->args; 3247 pointer args = SCHEME_V->args;
3223 pointer x, y; 3248 pointer x, y;
3224 3249
… …
3391 3416
3392 case OP_TRACING: 3417 case OP_TRACING:
3393 { 3418 {
3394 int tr = SCHEME_V->tracing; 3419 int tr = SCHEME_V->tracing;
3395 3420
3396 SCHEME_V->tracing = ivalue (car (args)); 3421 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3422 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3423 }
3399 3424
3400#endif 3425#endif
3401 3426
… …
3413 /* fall through */ 3438 /* fall through */
3414 3439
3415 case OP_REAL_APPLY: 3440 case OP_REAL_APPLY:
3416#endif 3441#endif
3417 if (is_proc (SCHEME_V->code)) 3442 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3443 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3444 else if (is_foreign (SCHEME_V->code))
3422 { 3445 {
3423 /* Keep nested calls from GC'ing the arglist */ 3446 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3447 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3448 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
… …
3592 3615
3593 case OP_IF1: /* if */ 3616 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3617 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3618 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3619 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3620 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3621 s_goto (OP_EVAL);
3601 3622
3602 case OP_LET0: /* let */ 3623 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3624 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3625 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (args); 3935 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3936 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 3937 s_goto (OP_APPLY);
3917 } 3938 }
3918 3939
3919 abort (); 3940 if (USE_ERROR_CHECKING) abort ();
3920} 3941}
3921 3942
3922static pointer 3943static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3944opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 3945{
3925 pointer args = SCHEME_V->args; 3946 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 3947 pointer x = car (args);
3927 num v; 3948 num v;
3928 3949
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 3950 switch (op)
3934 { 3951 {
3935#if USE_MATH 3952#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 3953 case OP_INEX2EX: /* inexact->exact */
3954 {
3937 if (num_is_integer (x)) 3955 if (is_integer (x))
3938 s_return (x); 3956 s_return (x);
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 3957
3958 RVALUE r = rvalue_unchecked (x);
3959
3960 if (r == (RVALUE)(IVALUE)r)
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3961 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3941 else 3962 else
3942 Error_1 ("inexact->exact: not integral:", x); 3963 Error_1 ("inexact->exact: not integral:", x);
3964 }
3943 3965
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3966 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3967 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3968 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3969 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3965 { 3987 {
3966 RVALUE result; 3988 RVALUE result;
3967 int real_result = 1; 3989 int real_result = 1;
3968 pointer y = cadr (args); 3990 pointer y = cadr (args);
3969 3991
3970 if (num_is_integer (x) && num_is_integer (y)) 3992 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 3993 real_result = 0;
3972 3994
3973 /* This 'if' is an R5RS compatibility fix. */ 3995 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 3996 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 3997 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4003 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4004 if (!real_result)
3983 { 4005 {
3984 long result_as_long = result; 4006 long result_as_long = result;
3985 4007
3986 if (result != (RVALUE) result_as_long) 4008 if (result != result_as_long)
3987 real_result = 1; 4009 real_result = 1;
3988 } 4010 }
3989 4011
3990 if (real_result) 4012 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4013 s_return (mk_real (SCHEME_A_ result));
… …
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4018 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4019 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998 4020
3999 case OP_TRUNCATE: 4021 case OP_TRUNCATE:
4000 { 4022 {
4001 RVALUE rvalue_of_x; 4023 RVALUE n = rvalue (x);
4002
4003 rvalue_of_x = rvalue (x);
4004
4005 if (rvalue_of_x > 0)
4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4024 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4007 else
4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4009 } 4025 }
4010 4026
4011 case OP_ROUND: 4027 case OP_ROUND:
4012 if (num_is_integer (x)) 4028 if (is_integer (x))
4013 s_return (x); 4029 s_return (x);
4014 4030
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4031 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4032#endif
4017 4033
4018 case OP_ADD: /* + */ 4034 case OP_ADD: /* + */
4019 v = num_zero; 4035 v = num_zero;
4020 4036
4021 for (x = args; x != NIL; x = cdr (x)) 4037 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4038 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4039
4024 s_return (mk_number (SCHEME_A_ v)); 4040 s_return (mk_number (SCHEME_A_ v));
4025 4041
4026 case OP_MUL: /* * */ 4042 case OP_MUL: /* * */
4027 v = num_one; 4043 v = num_one;
4028 4044
4029 for (x = args; x != NIL; x = cdr (x)) 4045 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4046 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4047
4032 s_return (mk_number (SCHEME_A_ v)); 4048 s_return (mk_number (SCHEME_A_ v));
4033 4049
4034 case OP_SUB: /* - */ 4050 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4051 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4058 x = cdr (args);
4043 v = nvalue (car (args)); 4059 v = nvalue (car (args));
4044 } 4060 }
4045 4061
4046 for (; x != NIL; x = cdr (x)) 4062 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4063 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4064
4049 s_return (mk_number (SCHEME_A_ v)); 4065 s_return (mk_number (SCHEME_A_ v));
4050 4066
4051 case OP_DIV: /* / */ 4067 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4068 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4075 x = cdr (args);
4060 v = nvalue (car (args)); 4076 v = nvalue (car (args));
4061 } 4077 }
4062 4078
4063 for (; x != NIL; x = cdr (x)) 4079 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4080 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4081 v = num_div (v, nvalue (car (x)));
4067 else 4082 else
4068 Error_0 ("/: division by zero"); 4083 Error_0 ("/: division by zero");
4069 }
4070 4084
4071 s_return (mk_number (SCHEME_A_ v)); 4085 s_return (mk_number (SCHEME_A_ v));
4072 4086
4073 case OP_INTDIV: /* quotient */ 4087 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4088 if (cdr (args) == NIL)
… …
4083 } 4097 }
4084 4098
4085 for (; x != NIL; x = cdr (x)) 4099 for (; x != NIL; x = cdr (x))
4086 { 4100 {
4087 if (ivalue (car (x)) != 0) 4101 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4102 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4103 else
4090 Error_0 ("quotient: division by zero"); 4104 Error_0 ("quotient: division by zero");
4091 } 4105 }
4092 4106
4093 s_return (mk_number (SCHEME_A_ v)); 4107 s_return (mk_number (SCHEME_A_ v));
… …
4139 } 4153 }
4140 else 4154 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4155 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4156
4143 case OP_CHAR2INT: /* char->integer */ 4157 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4158 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4159
4146 case OP_INT2CHAR: /* integer->char */ 4160 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4161 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4162
4149 case OP_CHARUPCASE: 4163 case OP_CHARUPCASE:
4150 { 4164 {
4151 unsigned char c = ivalue (x); 4165 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4166 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4167 s_return (mk_character (SCHEME_A_ c));
4154 } 4168 }
4155 4169
4156 case OP_CHARDNCASE: 4170 case OP_CHARDNCASE:
4157 { 4171 {
4158 unsigned char c = ivalue (x); 4172 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4173 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4174 s_return (mk_character (SCHEME_A_ c));
4161 } 4175 }
4162 4176
4163 case OP_STR2SYM: /* string->symbol */ 4177 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4254 Error_1 ("atom->string: not an atom:", x);
4241 } 4255 }
4242 4256
4243 case OP_MKSTRING: /* make-string */ 4257 case OP_MKSTRING: /* make-string */
4244 { 4258 {
4245 int fill = ' '; 4259 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4260 int len = ivalue_unchecked (x);
4249
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252 4261
4253 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4262 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4263 }
4255 4264
4256 case OP_STRLEN: /* string-length */ 4265 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4266 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4267
4259 case OP_STRREF: /* string-ref */ 4268 case OP_STRREF: /* string-ref */
4260 { 4269 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4270 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4271 int index = ivalue_unchecked (cadr (args));
4267 4272
4268 if (index >= strlength (x)) 4273 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4274 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4275
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4276 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4277 }
4273 4278
4274 case OP_STRSET: /* string-set! */ 4279 case OP_STRSET: /* string-set! */
4275 { 4280 {
4276 char *str; 4281 char *str = strvalue (x);
4277 int index; 4282 int index = ivalue_unchecked (cadr (args));
4278 int c; 4283 int c;
4279 4284
4280 if (is_immutable (x)) 4285 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4286 Error_1 ("string-set!: unable to alter immutable string:", x);
4282
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286 4287
4287 if (index >= strlength (x)) 4288 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4289 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4290
4290 c = charvalue (caddr (args)); 4291 c = charvalue (caddr (args));
… …
4313 s_return (newstr); 4314 s_return (newstr);
4314 } 4315 }
4315 4316
4316 case OP_SUBSTR: /* substring */ 4317 case OP_SUBSTR: /* substring */
4317 { 4318 {
4318 char *str; 4319 char *str = strvalue (x);
4319 int index0; 4320 int index0 = ivalue_unchecked (cadr (args));
4320 int index1; 4321 int index1;
4321 int len; 4322 int len;
4322 4323
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4324 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4325 Error_1 ("substring: start out of bounds:", cadr (args));
4329 4326
4330 if (cddr (args) != NIL) 4327 if (cddr (args) != NIL)
4331 { 4328 {
4332 index1 = ivalue (caddr (args)); 4329 index1 = ivalue_unchecked (caddr (args));
4333 4330
4334 if (index1 > strlength (x) || index1 < index0) 4331 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4332 Error_1 ("substring: end out of bounds:", caddr (args));
4336 } 4333 }
4337 else 4334 else
… …
4360 if (SCHEME_V->no_memory) 4357 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4358 s_return (S_SINK);
4362#endif 4359#endif
4363 4360
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4361 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4362 vector_set (vec, i, car (x));
4366 4363
4367 s_return (vec); 4364 s_return (vec);
4368 } 4365 }
4369 4366
4370 case OP_MKVECTOR: /* make-vector */ 4367 case OP_MKVECTOR: /* make-vector */
4371 { 4368 {
4372 pointer fill = NIL; 4369 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4370 pointer vec;
4375
4376 len = ivalue (x); 4371 int len = ivalue_unchecked (x);
4377 4372
4378 if (cdr (args) != NIL) 4373 if (cdr (args) != NIL)
4379 fill = cadr (args); 4374 fill = cadr (args);
4380 4375
4381 vec = mk_vector (SCHEME_A_ len); 4376 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4379 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4380 s_return (S_SINK);
4386#endif 4381#endif
4387 4382
4388 if (fill != NIL) 4383 if (fill != NIL)
4389 fill_vector (vec, fill); 4384 fill_vector (vec, 0, fill);
4390 4385
4391 s_return (vec); 4386 s_return (vec);
4392 } 4387 }
4393 4388
4394 case OP_VECLEN: /* vector-length */ 4389 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4390 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4391
4392 case OP_VECRESIZE:
4393 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4394 s_return (x);
4395
4397 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4398 { 4397 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4398 int index = ivalue_unchecked (cadr (args));
4402 4399
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4402
4406 s_return (vector_elem (x, index)); 4403 s_return (vector_get (x, index));
4407 } 4404 }
4408 4405
4409 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4410 { 4407 {
4411 int index; 4408 int index = ivalue_unchecked (cadr (args));
4412 4409
4413 if (is_immutable (x)) 4410 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4412
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4415
4421 set_vector_elem (x, index, caddr (args)); 4416 vector_set (x, index, caddr (args));
4422 s_return (x); 4417 s_return (x);
4423 } 4418 }
4424 } 4419 }
4425 4420
4426 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4427} 4422}
4428 4423
4429INTERFACE int
4430is_list (SCHEME_P_ pointer a)
4431{
4432 return list_length (SCHEME_A_ a) >= 0;
4433}
4434
4435/* Result is:
4436 proper list: length
4437 circular list: -1
4438 not even a pair: -2
4439 dotted list: -2 minus length before dot
4440*/
4441INTERFACE int
4442list_length (SCHEME_P_ pointer a)
4443{
4444 int i = 0;
4445 pointer slow, fast;
4446
4447 slow = fast = a;
4448
4449 while (1)
4450 {
4451 if (fast == NIL)
4452 return i;
4453
4454 if (!is_pair (fast))
4455 return -2 - i;
4456
4457 fast = cdr (fast);
4458 ++i;
4459
4460 if (fast == NIL)
4461 return i;
4462
4463 if (!is_pair (fast))
4464 return -2 - i;
4465
4466 ++i;
4467 fast = cdr (fast);
4468
4469 /* Safe because we would have already returned if `fast'
4470 encountered a non-pair. */
4471 slow = cdr (slow);
4472
4473 if (fast == slow)
4474 {
4475 /* the fast pointer has looped back around and caught up
4476 with the slow pointer, hence the structure is circular,
4477 not of finite length, and therefore not a list */
4478 return -1;
4479 }
4480 }
4481}
4482
4483static pointer 4424static int
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4426{
4486 pointer x = SCHEME_V->args; 4427 pointer x = SCHEME_V->args;
4487 4428
4488 for (;;) 4429 for (;;)
4489 { 4430 {
… …
4509 } 4450 }
4510 4451
4511 s_return (S_T); 4452 s_return (S_T);
4512} 4453}
4513 4454
4514static pointer 4455static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4457{
4517 pointer args = SCHEME_V->args; 4458 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4459 pointer a = car (args);
4519 pointer d = cdr (args); 4460 pointer d = cdr (args);
… …
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4475
4535#if USE_CHAR_CLASSIFIERS 4476#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4481 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4482#endif
4542 4483
4543#if USE_PORTS 4484#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4485 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4486 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4506 }
4566 4507
4567 s_retbool (r); 4508 s_retbool (r);
4568} 4509}
4569 4510
4570static pointer 4511static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4513{
4573 pointer args = SCHEME_V->args; 4514 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4515 pointer a = car (args);
4575 pointer x, y; 4516 pointer x, y;
… …
4661 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4662 4603
4663 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4665 else 4606 else
4666 return NIL; 4607 return -1;
4667 } 4608 }
4668 4609
4669 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4611 s_return (reverse (SCHEME_A_ a));
4671 4612
… …
4728 4669
4729 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4671 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4672 SCHEME_V->retcode = ivalue (a);
4732 4673
4733 return NIL; 4674 return -1;
4734 4675
4735 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4678 s_return (S_T);
4738 4679
… …
4746 4687
4747 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
4748 if (!is_pair (args) || !is_number (a)) 4689 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
4750 4691
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
4752 4693
4753 s_return (S_T); 4694 s_return (S_T);
4754 4695
4755 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
4785 break; 4726 break;
4786 } 4727 }
4787 4728
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4730
4790 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4732 }
4795 4733
4796# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
4797 4735
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4751 }
4814 4752
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4754 strvalue (a) + strlength (a), prop);
4817 4755
4818 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4757 }
4823 4758
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4760 {
4826 pointer p; 4761 pointer p;
4827 4762
4828 if (a == NIL) 4763 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4765 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4767 strvalue (a) + strlength (a), port_output);
4839 4768
4840 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4770 }
4846 4771
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4773 {
4849 port *p; 4774 port *p;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
4890 4815
4891 } 4816 }
4892 4817
4893 abort (); 4818 if (USE_ERROR_CHECKING) abort ();
4894} 4819}
4895 4820
4896static pointer 4821static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4823{
4824 pointer args = SCHEME_V->args;
4899 pointer x; 4825 pointer x;
4900 4826
4901 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
4902 { 4828 {
4903 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4836 switch (op)
4911 { 4837 {
4912 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
4913#if USE_PORTS 4839#if USE_PORTS
4914 case OP_READ: 4840 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
4917 4843
4918 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
4920 4846
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
4923 4849
4924 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4852 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
4929 4855
4930 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
4932 { 4858 {
4933 int c; 4859 int c;
4934 4860
4935 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
4936 { 4862 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
4938 { 4864 {
4939 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4866 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
4943 } 4869 }
4944 } 4870 }
4945 4871
4946 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
4947 4873
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
4958 { 4884 {
4959 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
4960 int res; 4886 int res;
4961 4887
4962 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
4963 p = car (SCHEME_V->args); 4889 p = car (args);
4964 4890
4965 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
4966 4892
4967 s_retbool (res); 4893 s_retbool (res);
4968 } 4894 }
4969 4895
4970 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
4973 4899
4974 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
4977#endif 4903#endif
4978 4904
4979 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4955 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 4956 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 4957 s_goto (OP_RDSEXPR);
5032 4958
5033 case TOK_ATOM: 4959 case TOK_ATOM:
5034 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4960 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4961
4962 case TOK_DOTATOM:
4963 SCHEME_V->strbuff[0] = '.';
4964 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4965
4966 case TOK_STRATOM:
4967 x = readstrexp (SCHEME_A_ '|');
4968 //TODO: haven't checked whether the garbage collector could interfere
4969 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5035 4970
5036 case TOK_DQUOTE: 4971 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 4972 x = readstrexp (SCHEME_A_ '"');
5038 4973
5039 if (x == S_F) 4974 if (x == S_F)
5040 Error_0 ("Error reading string"); 4975 Error_0 ("Error reading string");
5041 4976
5042 setimmutable (x); 4977 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 4989 s_goto (OP_EVAL);
5055 } 4990 }
5056 } 4991 }
5057 4992
5058 case TOK_SHARP_CONST: 4993 case TOK_SHARP_CONST:
5059 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4994 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5060 Error_0 ("undefined sharp expression"); 4995 Error_0 ("undefined sharp expression");
5061 else 4996 else
5062 s_return (x); 4997 s_return (x);
5063 4998
5064 default: 4999 default:
… …
5066 } 5001 }
5067 5002
5068 break; 5003 break;
5069 5004
5070 case OP_RDLIST: 5005 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5006 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5007 SCHEME_V->tok = token (SCHEME_A);
5073 5008
5074 switch (SCHEME_V->tok) 5009 switch (SCHEME_V->tok)
5075 { 5010 {
5076 case TOK_EOF: 5011 case TOK_EOF:
… …
5104 case OP_RDDOT: 5039 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5040 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5041 Error_0 ("syntax error: illegal dot expression");
5107 5042
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5043 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5044 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5110 5045
5111 case OP_RDQUOTE: 5046 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5047 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5048
5114 case OP_RDQQUOTE: 5049 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5071 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5072 s_goto (OP_VECTOR);
5138 5073
5139 /* ========== printing part ========== */ 5074 /* ========== printing part ========== */
5140 case OP_P0LIST: 5075 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5076 if (is_vector (args))
5142 { 5077 {
5143 putstr (SCHEME_A_ "#("); 5078 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5079 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5080 s_goto (OP_PVECFROM);
5146 } 5081 }
5147 else if (is_environment (SCHEME_V->args)) 5082 else if (is_environment (args))
5148 { 5083 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5084 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5085 s_return (S_T);
5151 } 5086 }
5152 else if (!is_pair (SCHEME_V->args)) 5087 else if (!is_pair (args))
5153 { 5088 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5089 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5090 s_return (S_T);
5156 } 5091 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5092 else
5158 { 5093 {
5094 pointer a = car (args);
5095 pointer b = cdr (args);
5096 int ok_abbr = ok_abbrev (b);
5097 SCHEME_V->args = car (b);
5098
5099 if (a == SCHEME_V->QUOTE && ok_abbr)
5159 putstr (SCHEME_A_ "'"); 5100 putstr (SCHEME_A_ "'");
5160 SCHEME_V->args = cadr (SCHEME_V->args); 5101 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5102 putstr (SCHEME_A_ "`");
5103 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ ",");
5105 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5106 putstr (SCHEME_A_ ",@");
5107 else
5108 {
5109 putstr (SCHEME_A_ "(");
5110 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5111 SCHEME_V->args = a;
5112 }
5113
5161 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5162 } 5115 }
5163 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5116
5117 case OP_P1LIST:
5118 if (is_pair (args))
5164 { 5119 {
5120 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5121 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5122 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5123 s_goto (OP_P0LIST);
5168 } 5124 }
5169 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5170 {
5171 putstr (SCHEME_A_ ",");
5172 SCHEME_V->args = cadr (SCHEME_V->args);
5173 s_goto (OP_P0LIST);
5174 }
5175 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5176 {
5177 putstr (SCHEME_A_ ",@");
5178 SCHEME_V->args = cadr (SCHEME_V->args);
5179 s_goto (OP_P0LIST);
5180 }
5181 else
5182 {
5183 putstr (SCHEME_A_ "(");
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5185 SCHEME_V->args = car (SCHEME_V->args);
5186 s_goto (OP_P0LIST);
5187 }
5188
5189 case OP_P1LIST:
5190 if (is_pair (SCHEME_V->args))
5191 {
5192 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5193 putstr (SCHEME_A_ " ");
5194 SCHEME_V->args = car (SCHEME_V->args);
5195 s_goto (OP_P0LIST);
5196 }
5197 else if (is_vector (SCHEME_V->args)) 5125 else if (is_vector (args))
5198 { 5126 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5127 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5128 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5129 s_goto (OP_P0LIST);
5202 } 5130 }
5203 else 5131 else
5204 { 5132 {
5205 if (SCHEME_V->args != NIL) 5133 if (args != NIL)
5206 { 5134 {
5207 putstr (SCHEME_A_ " . "); 5135 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5136 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5137 }
5210 5138
5211 putstr (SCHEME_A_ ")"); 5139 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5140 s_return (S_T);
5213 } 5141 }
5214 5142
5215 case OP_PVECFROM: 5143 case OP_PVECFROM:
5216 { 5144 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5145 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5146 pointer vec = car (args);
5219 int len = veclength (vec); 5147 int len = veclength (vec);
5220 5148
5221 if (i == len) 5149 if (i == len)
5222 { 5150 {
5223 putstr (SCHEME_A_ ")"); 5151 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5152 s_return (S_T);
5225 } 5153 }
5226 else 5154 else
5227 { 5155 {
5228 pointer elem = vector_elem (vec, i); 5156 pointer elem = vector_get (vec, i);
5229 5157
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5158 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5159 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5160 SCHEME_V->args = elem;
5233 5161
5234 if (i > 0) 5162 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5163 putstr (SCHEME_A_ " ");
5236 5164
5237 s_goto (OP_P0LIST); 5165 s_goto (OP_P0LIST);
5238 } 5166 }
5239 } 5167 }
5240 } 5168 }
5241 5169
5242 abort (); 5170 if (USE_ERROR_CHECKING) abort ();
5243} 5171}
5244 5172
5245static pointer 5173static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5174opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5175{
5176 pointer args = SCHEME_V->args;
5177 pointer a = car (args);
5248 pointer x, y; 5178 pointer x, y;
5249 5179
5250 switch (op) 5180 switch (op)
5251 { 5181 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5182 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5183 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5184 long v = list_length (SCHEME_A_ a);
5255 5185
5256 if (v < 0) 5186 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5187 Error_1 ("length: not a list:", a);
5258 5188
5259 s_return (mk_integer (SCHEME_A_ v)); 5189 s_return (mk_integer (SCHEME_A_ v));
5260 } 5190 }
5261 5191
5262 case OP_ASSQ: /* assq *//* a.k */ 5192 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5193 x = a;
5264 5194
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5195 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5196 {
5267 if (!is_pair (car (y))) 5197 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5198 Error_0 ("unable to handle non pair element");
5269 5199
5270 if (x == caar (y)) 5200 if (x == caar (y))
… …
5276 else 5206 else
5277 s_return (S_F); 5207 s_return (S_F);
5278 5208
5279 5209
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5210 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5211 SCHEME_V->args = a;
5282 5212
5283 if (SCHEME_V->args == NIL) 5213 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5214 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5215 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5216 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5292 case OP_CLOSUREP: /* closure? */ 5222 case OP_CLOSUREP: /* closure? */
5293 /* 5223 /*
5294 * Note, macro object is also a closure. 5224 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5225 * Therefore, (closure? <#MACRO>) ==> #t
5296 */ 5226 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5227 s_retbool (is_closure (a));
5298 5228
5299 case OP_MACROP: /* macro? */ 5229 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5230 s_retbool (is_macro (a));
5301 } 5231 }
5302 5232
5303 abort (); 5233 if (USE_ERROR_CHECKING) abort ();
5304} 5234}
5305 5235
5236/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5238
5308typedef int (*test_predicate) (pointer); 5239typedef int (*test_predicate)(pointer);
5309static int 5240static int
5310is_any (pointer p) 5241tst_any (pointer p)
5311{ 5242{
5312 return 1; 5243 return 1;
5313} 5244}
5314 5245
5315static int 5246static int
5316is_nonneg (pointer p) 5247tst_inonneg (pointer p)
5317{ 5248{
5318 return ivalue (p) >= 0 && is_integer (p); 5249 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250}
5251
5252static int
5253tst_is_list (SCHEME_P_ pointer p)
5254{
5255 return p == NIL || is_pair (p);
5319} 5256}
5320 5257
5321/* Correspond carefully with following defines! */ 5258/* Correspond carefully with following defines! */
5322static struct 5259static struct
5323{ 5260{
5324 test_predicate fct; 5261 test_predicate fct;
5325 const char *kind; 5262 const char *kind;
5326} tests[] = 5263} tests[] = {
5327{ 5264 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5265 { is_string , "string" },
5329 { is_any, 0}, 5266 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5267 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5268 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5269 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5270 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5271 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5272 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5273 { is_character , "character" },
5339 { is_vector, "vector" }, 5274 { is_vector , "vector" },
5340 { is_number, "number" }, 5275 { is_number , "number" },
5341 { is_integer, "integer" }, 5276 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5277 { tst_inonneg , "non-negative integer" }
5343}; 5278};
5344 5279
5345#define TST_NONE 0 5280#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5281#define TST_ANY "\001"
5347#define TST_STRING "\002" 5282#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5283#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5284#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5285#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5286#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5287#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5288#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5289#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5290#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5291#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5292#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5293#define TST_INTEGER "\015"
5359#define TST_NATURAL "\016" 5294#define TST_NATURAL "\016"
5295
5296#define INF_ARG 0xff
5297#define UNNAMED_OP ""
5298
5299static const char opnames[] =
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h"
5302#undef OP_DEF
5303;
5304
5305static const char *
5306opname (int idx)
5307{
5308 const char *name = opnames;
5309
5310 /* should do this at compile time, but would require external program, right? */
5311 while (idx--)
5312 name += strlen (name) + 1;
5313
5314 return *name ? name : "ILLEGAL";
5315}
5316
5317static const char *
5318procname (pointer x)
5319{
5320 return opname (procnum (x));
5321}
5360 5322
5361typedef struct 5323typedef struct
5362{ 5324{
5363 dispatch_func func; 5325 uint8_t func;
5364 char *name; 5326 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5327 uint8_t builtin;
5328#if USE_ERROR_CHECKING
5365 int min_arity; 5329 uint8_t min_arity;
5366 int max_arity; 5330 uint8_t max_arity;
5367 char *arg_tests_encoding; 5331 char arg_tests_encoding[3];
5332#endif
5368} op_code_info; 5333} op_code_info;
5369 5334
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5335static const op_code_info dispatch_table[] = {
5373#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5336#if USE_ERROR_CHECKING
5337#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5338#else
5339#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5340#endif
5374#include "opdefines.h" 5341#include "opdefines.h"
5342#undef OP_DEF
5375 {0} 5343 {0}
5376}; 5344};
5377 5345
5378static const char *
5379procname (pointer x)
5380{
5381 int n = procnum (x);
5382 const char *name = dispatch_table[n].name;
5383
5384 if (name == 0)
5385 name = "ILLEGAL!";
5386
5387 return name;
5388}
5389
5390/* kernel of this interpreter */ 5346/* kernel of this interpreter */
5391static void 5347static void ecb_hot
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5349{
5394 SCHEME_V->op = op; 5350 SCHEME_V->op = op;
5395 5351
5396 for (;;) 5352 for (;;)
5397 { 5353 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5354 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5355
5400#if USE_ERROR_CHECKING 5356#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5357 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5358 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5359 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5360 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5361
5407 /* Check number of arguments */ 5362 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5363 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5364 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5365 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5366 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5367 xError_1 (SCHEME_A_ msg, 0);
5368 continue;
5413 } 5369 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5370 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5371 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5372 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5373 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5374 xError_1 (SCHEME_A_ msg, 0);
5375 continue;
5419 } 5376 }
5420 5377 else
5421 if (ecb_expect_false (ok))
5422 { 5378 {
5423 if (pcd->arg_tests_encoding) 5379 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5380 {
5425 int i = 0; 5381 int i = 0;
5426 int j; 5382 int j;
5427 const char *t = pcd->arg_tests_encoding; 5383 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5384 pointer arglist = SCHEME_V->args;
5429 5385
5430 do 5386 do
5431 { 5387 {
5432 pointer arg = car (arglist); 5388 pointer arg = car (arglist);
5433 5389
5434 j = (int) t[0]; 5390 j = t[0];
5435 5391
5392 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5393 if (j == TST_LIST[0])
5437 { 5394 {
5438 if (arg != NIL && !is_pair (arg)) 5395 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5396 break;
5440 } 5397 }
5441 else 5398 else
5442 { 5399 {
5443 if (!tests[j].fct (arg)) 5400 if (!tests[j - 1].fct (arg))
5444 break; 5401 break;
5445 } 5402 }
5446 5403
5447 if (t[1] != 0) /* last test is replicated as necessary */ 5404 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5448 t++; 5405 t++;
5449 5406
5450 arglist = cdr (arglist); 5407 arglist = cdr (arglist);
5451 i++; 5408 i++;
5452 } 5409 }
5453 while (i < n); 5410 while (i < n);
5454 5411
5455 if (i < n) 5412 if (i < n)
5456 { 5413 {
5457 ok = 0;
5458 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5414 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5415 xError_1 (SCHEME_A_ msg, 0);
5416 continue;
5459 } 5417 }
5460 } 5418 }
5461 } 5419 }
5462
5463 if (!ok)
5464 {
5465 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5466 return;
5467
5468 pcd = dispatch_table + SCHEME_V->op;
5469 }
5470 } 5420 }
5471#endif 5421#endif
5472 5422
5473 ok_to_freely_gc (SCHEME_A); 5423 ok_to_freely_gc (SCHEME_A);
5474 5424
5425 static const dispatch_func dispatch_funcs[] = {
5426 opexe_0,
5427 opexe_1,
5428 opexe_2,
5429 opexe_3,
5430 opexe_4,
5431 opexe_5,
5432 opexe_6,
5433 };
5434
5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5435 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5476 return; 5436 return;
5477 5437
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5439 {
5480 xwrstr ("No memory!\n"); 5440 xwrstr ("No memory!\n");
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5464mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5465{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5466 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5467 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5468 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5469 return y;
5511} 5470}
5512 5471
5513/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5472/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5514static int 5473static int
… …
5579 return OP_C0STREAM; /* cons-stream */ 5538 return OP_C0STREAM; /* cons-stream */
5580 } 5539 }
5581} 5540}
5582 5541
5583#if USE_MULTIPLICITY 5542#if USE_MULTIPLICITY
5584scheme * 5543ecb_cold scheme *
5585scheme_init_new () 5544scheme_init_new ()
5586{ 5545{
5587 scheme *sc = malloc (sizeof (scheme)); 5546 scheme *sc = malloc (sizeof (scheme));
5588 5547
5589 if (!scheme_init (SCHEME_A)) 5548 if (!scheme_init (SCHEME_A))
… …
5594 else 5553 else
5595 return sc; 5554 return sc;
5596} 5555}
5597#endif 5556#endif
5598 5557
5599int 5558ecb_cold int
5600scheme_init (SCHEME_P) 5559scheme_init (SCHEME_P)
5601{ 5560{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 pointer x; 5562 pointer x;
5604 5563
… …
5677 5636
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5637 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5638 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5639 }
5681 5640
5641 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5642 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5643 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5644 assign_proc (SCHEME_A_ i, opname (i));
5685 5645
5686 /* initialization of global pointers to special symbols */ 5646 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5647 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5648 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5649 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5728scheme_set_external_data (SCHEME_P_ void *p) 5688scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5689{
5730 SCHEME_V->ext_data = p; 5690 SCHEME_V->ext_data = p;
5731} 5691}
5732 5692
5733void 5693ecb_cold void
5734scheme_deinit (SCHEME_P) 5694scheme_deinit (SCHEME_P)
5735{ 5695{
5736 int i; 5696 int i;
5737 5697
5738#if SHOW_ERROR_LINE 5698#if SHOW_ERROR_LINE

Diff Legend

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