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.14 by root, Thu Nov 26 08:56:32 2015 UTC vs.
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 84#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 85#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 86
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76
77#if !USE_MULTIPLICITY 87#if !USE_MULTIPLICITY
78static scheme sc; 88static scheme sc;
79#endif 89#endif
80 90
81static void 91static void
… …
150 160
151#define toupper(c) xtoupper (c) 161#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 162#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 163#define isdigit(c) xisdigit (c)
154 164
155#if USE_STRLWR 165#if USE_IGNORECASE
156static const char * 166static const char *
157strlwr (char *s) 167xstrlwr (char *s)
158{ 168{
159 const char *p = s; 169 const char *p = s;
160 170
161 while (*s) 171 while (*s)
162 { 172 {
… …
164 s++; 174 s++;
165 } 175 }
166 176
167 return p; 177 return p;
168} 178}
169#endif
170 179
180#define stricmp(a,b) strcasecmp (a, b)
181#define strlwr(s) xstrlwr (s)
182
183#else
171#define stricmp(a,b) strcmp (a, b) 184# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 185# define strlwr(s) (s)
186#endif
173 187
174#ifndef prompt 188#ifndef prompt
175# define prompt "ts> " 189# define prompt "ts> "
176#endif 190#endif
177 191
… …
183# define FIRST_CELLSEGS 3 197# define FIRST_CELLSEGS 3
184#endif 198#endif
185 199
186enum scheme_types 200enum scheme_types
187{ 201{
202 T_INTEGER,
188 T_FREE, 203 T_REAL,
189 T_STRING, 204 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 205 T_SYMBOL,
192 T_PROC, 206 T_PROC,
193 T_PAIR, 207 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 208 T_CLOSURE,
195 T_CONTINUATION, 209 T_CONTINUATION,
196 T_FOREIGN, 210 T_FOREIGN,
197 T_CHARACTER, 211 T_CHARACTER,
198 T_PORT, 212 T_PORT,
… …
208#define T_SYNTAX 0x0010 222#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 223#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 224#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 225#define T_MARK 0x0080 /* only for gc */
212 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
213enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
214 254
215static num num_op (enum num_op op, num a, num b); 255static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
217static num num_rem (num a, num b); 257static num num_rem (num a, num b);
… …
220#if USE_MATH 260#if USE_MATH
221static double round_per_R5RS (double x); 261static double round_per_R5RS (double x);
222#endif 262#endif
223static int is_zero_rvalue (RVALUE x); 263static int is_zero_rvalue (RVALUE x);
224 264
225static INLINE int
226num_is_integer (pointer p)
227{
228 return num_is_fixnum (p->object.number);
229}
230
231static num num_zero; 265static num num_zero;
232static num num_one; 266static num num_one;
233 267
234/* macros for cell operations */ 268/* macros for cell operations */
235#define typeflag(p) ((p)->flag + 0) 269#define typeflag(p) ((p)->flag + 0)
236#define set_typeflag(p,v) ((p)->flag = (v)) 270#define set_typeflag(p,v) ((p)->flag = (v))
237#define type(p) (typeflag (p) & T_MASKTYPE) 271#define type(p) (typeflag (p) & T_MASKTYPE)
238 272
239INTERFACE INLINE int 273INTERFACE int
240is_string (pointer p) 274is_string (pointer p)
241{ 275{
242 return type (p) == T_STRING; 276 return type (p) == T_STRING;
243} 277}
244 278
245#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
246#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
247 281
248INTERFACE int is_list (SCHEME_P_ pointer p);
249INTERFACE INLINE int 282INTERFACE int
250is_vector (pointer p) 283is_vector (pointer p)
251{ 284{
252 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
253} 286}
254 287
255#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 293
262INTERFACE uint32_t 294INTERFACE int
263vector_length (pointer vec) 295is_integer (pointer p)
264{ 296{
265 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
266} 298}
267 299
300/* not the same as in scheme, where integers are (correctly :) reals */
268INTERFACE INLINE int 301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
305}
306
307INTERFACE int
269is_number (pointer p) 308is_number (pointer p)
270{ 309{
271 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
272} 311}
273 312
274INTERFACE INLINE int 313INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE INLINE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290}
291
292INTERFACE INLINE int
293is_character (pointer p) 314is_character (pointer p)
294{ 315{
295 return type (p) == T_CHARACTER; 316 return type (p) == T_CHARACTER;
296} 317}
297 318
298INTERFACE INLINE char * 319INTERFACE char *
299string_value (pointer p) 320string_value (pointer p)
300{ 321{
301 return strvalue (p); 322 return strvalue (p);
302} 323}
303 324
304INLINE num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#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
335#if USE_REAL 328#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 331#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
341# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 334#endif
335
344INTERFACE long 336INTERFACE long
345charvalue (pointer p) 337charvalue (pointer p)
346{ 338{
347 return ivalue_unchecked (p); 339 return ivalue_unchecked (p);
348} 340}
349 341
350INTERFACE INLINE int 342INTERFACE int
351is_port (pointer p) 343is_port (pointer p)
352{ 344{
353 return type (p) == T_PORT; 345 return type (p) == T_PORT;
354} 346}
355 347
356INTERFACE INLINE int 348INTERFACE int
357is_inport (pointer p) 349is_inport (pointer p)
358{ 350{
359 return is_port (p) && p->object.port->kind & port_input; 351 return is_port (p) && p->object.port->kind & port_input;
360} 352}
361 353
362INTERFACE INLINE int 354INTERFACE int
363is_outport (pointer p) 355is_outport (pointer p)
364{ 356{
365 return is_port (p) && p->object.port->kind & port_output; 357 return is_port (p) && p->object.port->kind & port_output;
366} 358}
367 359
368INTERFACE INLINE int 360INTERFACE int
369is_pair (pointer p) 361is_pair (pointer p)
370{ 362{
371 return type (p) == T_PAIR; 363 return type (p) == T_PAIR;
372} 364}
373 365
… …
405pair_cdr (pointer p) 397pair_cdr (pointer p)
406{ 398{
407 return cdr (p); 399 return cdr (p);
408} 400}
409 401
410INTERFACE INLINE int 402INTERFACE int
411is_symbol (pointer p) 403is_symbol (pointer p)
412{ 404{
413 return type (p) == T_SYMBOL; 405 return type (p) == T_SYMBOL;
414} 406}
415 407
416INTERFACE INLINE char * 408INTERFACE char *
417symname (pointer p) 409symname (pointer p)
418{ 410{
419 return strvalue (car (p)); 411 return strvalue (car (p));
420} 412}
421 413
422#if USE_PLIST 414#if USE_PLIST
423SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
424hasprop (pointer p) 416hasprop (pointer p)
425{ 417{
426 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
427} 419}
428 420
429# define symprop(p) cdr(p) 421# define symprop(p) cdr(p)
430#endif 422#endif
431 423
432INTERFACE INLINE int 424INTERFACE int
433is_syntax (pointer p) 425is_syntax (pointer p)
434{ 426{
435 return typeflag (p) & T_SYNTAX; 427 return typeflag (p) & T_SYNTAX;
436} 428}
437 429
438INTERFACE INLINE int 430INTERFACE int
439is_proc (pointer p) 431is_proc (pointer p)
440{ 432{
441 return type (p) == T_PROC; 433 return type (p) == T_PROC;
442} 434}
443 435
444INTERFACE INLINE int 436INTERFACE int
445is_foreign (pointer p) 437is_foreign (pointer p)
446{ 438{
447 return type (p) == T_FOREIGN; 439 return type (p) == T_FOREIGN;
448} 440}
449 441
450INTERFACE INLINE char * 442INTERFACE char *
451syntaxname (pointer p) 443syntaxname (pointer p)
452{ 444{
453 return strvalue (car (p)); 445 return strvalue (car (p));
454} 446}
455 447
456#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
457static const char *procname (pointer x); 449static const char *procname (pointer x);
458 450
459INTERFACE INLINE int 451INTERFACE int
460is_closure (pointer p) 452is_closure (pointer p)
461{ 453{
462 return type (p) == T_CLOSURE; 454 return type (p) == T_CLOSURE;
463} 455}
464 456
465INTERFACE INLINE int 457INTERFACE int
466is_macro (pointer p) 458is_macro (pointer p)
467{ 459{
468 return type (p) == T_MACRO; 460 return type (p) == T_MACRO;
469} 461}
470 462
471INTERFACE INLINE pointer 463INTERFACE pointer
472closure_code (pointer p) 464closure_code (pointer p)
473{ 465{
474 return car (p); 466 return car (p);
475} 467}
476 468
477INTERFACE INLINE pointer 469INTERFACE pointer
478closure_env (pointer p) 470closure_env (pointer p)
479{ 471{
480 return cdr (p); 472 return cdr (p);
481} 473}
482 474
483INTERFACE INLINE int 475INTERFACE int
484is_continuation (pointer p) 476is_continuation (pointer p)
485{ 477{
486 return type (p) == T_CONTINUATION; 478 return type (p) == T_CONTINUATION;
487} 479}
488 480
489#define cont_dump(p) cdr (p) 481#define cont_dump(p) cdr (p)
490#define set_cont_dump(p,v) set_cdr ((p), (v)) 482#define set_cont_dump(p,v) set_cdr ((p), (v))
491 483
492/* To do: promise should be forced ONCE only */ 484/* To do: promise should be forced ONCE only */
493INTERFACE INLINE int 485INTERFACE int
494is_promise (pointer p) 486is_promise (pointer p)
495{ 487{
496 return type (p) == T_PROMISE; 488 return type (p) == T_PROMISE;
497} 489}
498 490
499INTERFACE INLINE int 491INTERFACE int
500is_environment (pointer p) 492is_environment (pointer p)
501{ 493{
502 return type (p) == T_ENVIRONMENT; 494 return type (p) == T_ENVIRONMENT;
503} 495}
504 496
… …
510 502
511#define is_mark(p) (typeflag (p) & T_MARK) 503#define is_mark(p) (typeflag (p) & T_MARK)
512#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
513#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
514 506
515INTERFACE INLINE int 507INTERFACE int
516is_immutable (pointer p) 508is_immutable (pointer p)
517{ 509{
518 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
519} 511}
520 512
521INTERFACE INLINE void 513INTERFACE void
522setimmutable (pointer p) 514setimmutable (pointer p)
523{ 515{
524#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
525 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
526#endif 518#endif
527} 519}
528 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
529#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
530static INLINE int 576ecb_inline int
531Cisalpha (int c) 577Cisalpha (int c)
532{ 578{
533 return isascii (c) && isalpha (c); 579 return isascii (c) && isalpha (c);
534} 580}
535 581
536static INLINE int 582ecb_inline int
537Cisdigit (int c) 583Cisdigit (int c)
538{ 584{
539 return isascii (c) && isdigit (c); 585 return isascii (c) && isdigit (c);
540} 586}
541 587
542static INLINE int 588ecb_inline int
543Cisspace (int c) 589Cisspace (int c)
544{ 590{
545 return isascii (c) && isspace (c); 591 return isascii (c) && isspace (c);
546} 592}
547 593
548static INLINE int 594ecb_inline int
549Cisupper (int c) 595Cisupper (int c)
550{ 596{
551 return isascii (c) && isupper (c); 597 return isascii (c) && isupper (c);
552} 598}
553 599
554static INLINE int 600ecb_inline int
555Cislower (int c) 601Cislower (int c)
556{ 602{
557 return isascii (c) && islower (c); 603 return isascii (c) && islower (c);
558} 604}
559#endif 605#endif
… …
620#endif 666#endif
621 667
622static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
623static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
624static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
625static INLINE int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
626static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
630static 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);
631static pointer mk_number (SCHEME_P_ const num n); 677static pointer mk_number (SCHEME_P_ const num n);
632static 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);
… …
647static void mark (pointer a); 693static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 701static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
657static 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);
658static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 709static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 710static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 711static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 712static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 713static void dump_stack_mark (SCHEME_P);
668static 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);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
675static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
676static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
677static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
678static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
679 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
680static num 753static num
681num_op (enum num_op op, num a, num b) 754num_op (enum num_op op, num a, num b)
682{ 755{
683 num ret; 756 num ret;
684 757
685 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));
686 759
687 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
688 { 761 {
689 IVALUE av = num_get_ivalue (a);
690 IVALUE bv = num_get_ivalue (b);
691
692 switch (op) 762 switch (op)
693 { 763 {
694 case NUM_ADD: av += bv; break; 764 case NUM_ADD: a.ivalue += b.ivalue; break;
695 case NUM_SUB: av -= bv; break; 765 case NUM_SUB: a.ivalue -= b.ivalue; break;
696 case NUM_MUL: av *= bv; break; 766 case NUM_MUL: a.ivalue *= b.ivalue; break;
697 case NUM_INTDIV: av /= bv; break; 767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
698 } 768 }
699 769
700 num_set_ivalue (ret, av); 770 num_set_ivalue (ret, a.ivalue);
701 } 771 }
772#if USE_REAL
702 else 773 else
703 { 774 {
704 RVALUE av = num_get_rvalue (a);
705 RVALUE bv = num_get_rvalue (b);
706
707 switch (op) 775 switch (op)
708 { 776 {
709 case NUM_ADD: av += bv; break; 777 case NUM_ADD: a.rvalue += b.rvalue; break;
710 case NUM_SUB: av -= bv; break; 778 case NUM_SUB: a.rvalue -= b.rvalue; break;
711 case NUM_MUL: av *= bv; break; 779 case NUM_MUL: a.rvalue *= b.rvalue; break;
712 case NUM_INTDIV: av /= bv; break; 780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
713 } 781 }
714 782
715 num_set_rvalue (ret, av); 783 num_set_rvalue (ret, a.rvalue);
716 } 784 }
785#endif
717 786
718 return ret; 787 return ret;
719} 788}
720 789
721static num 790static num
722num_div (num a, num b) 791num_div (num a, num b)
723{ 792{
724 num ret; 793 num ret;
725 794
726 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);
727 796
728 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
730 else 799 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
732 801
733 return ret; 802 return ret;
734} 803}
735 804
736static num 805static num
… …
738{ 807{
739 num ret; 808 num ret;
740 long e1, e2, res; 809 long e1, e2, res;
741 810
742 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));
743 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
744 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
745 res = e1 % e2; 814 res = e1 % e2;
746 815
747 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
748 if (res > 0) 817 if (res > 0)
749 { 818 {
… …
765{ 834{
766 num ret; 835 num ret;
767 long e1, e2, res; 836 long e1, e2, res;
768 837
769 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));
770 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
771 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
772 res = e1 % e2; 841 res = e1 % e2;
773 842
774 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
775 if (res * e2 < 0) 844 if (res * e2 < 0)
776 res += e2; 845 res += e2;
777 846
778 num_set_ivalue (ret, res); 847 num_set_ivalue (ret, res);
779 return ret; 848 return ret;
780} 849}
781 850
782/* this completely disrespects NaNs */ 851/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
783static int 852static int
784num_cmp (num a, num b) 853num_cmp (num a, num b)
785{ 854{
786 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 856 int ret;
788 857
789 if (is_fixnum) 858 if (is_fixnum)
790 { 859 {
791 IVALUE av = num_get_ivalue (a); 860 IVALUE av = num_ivalue (a);
792 IVALUE bv = num_get_ivalue (b); 861 IVALUE bv = num_ivalue (b);
793 862
794 ret = av == bv ? 0 : av < bv ? -1 : +1; 863 ret = av == bv ? 0 : av < bv ? -1 : +1;
795 } 864 }
796 else 865 else
797 { 866 {
798 RVALUE av = num_get_rvalue (a); 867 RVALUE av = num_rvalue (a);
799 RVALUE bv = num_get_rvalue (b); 868 RVALUE bv = num_rvalue (b);
800 869
801 ret = av == bv ? 0 : av < bv ? -1 : +1; 870 ret = av == bv ? 0 : av < bv ? -1 : +1;
802 } 871 }
803 872
804 return ret; 873 return ret;
… …
819 return ce; 888 return ce;
820 else if (dfl < dce) 889 else if (dfl < dce)
821 return fl; 890 return fl;
822 else 891 else
823 { 892 {
824 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 893 if (fmod (fl, 2) == 0) /* I imagine this holds */
825 return fl; 894 return fl;
826 else 895 else
827 return ce; 896 return ce;
828 } 897 }
829} 898}
830#endif 899#endif
831 900
832static int 901static int
833is_zero_rvalue (RVALUE x) 902is_zero_rvalue (RVALUE x)
834{ 903{
904 return x == 0;
905#if 0
835#if USE_REAL 906#if USE_REAL
836 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. */
837#else 908#else
838 return x == 0; 909 return x == 0;
910#endif
839#endif 911#endif
840} 912}
841 913
842/* allocate new cell segment */ 914/* allocate new cell segment */
843static int 915static int
… …
864 return k; 936 return k;
865 937
866 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
867 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
868 940
869 /* insert new segment in address order */
870 newp = (pointer)cp; 941 newp = (pointer)cp;
871 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
872 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
873
874 //TODO: insert, not swap
875 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
876 {
877 p = SCHEME_V->cell_seg[i];
878 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
879 SCHEME_V->cell_seg[i - 1] = p;
880
881 k = SCHEME_V->cell_segsize[i];
882 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
883 SCHEME_V->cell_segsize[i - 1] = k;
884
885 --i;
886 }
887
888 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
889 last = newp + segsize - 1; 945 last = newp + segsize - 1;
890 946
891 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
892 { 948 {
893 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
894 set_car (p, NIL); 950 set_car (p, NIL);
895 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
896 } 952 }
897 953
898 /* insert new cells in address order on free list */
899 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
900 {
901 set_cdr (last, SCHEME_V->free_cell); 954 set_cdr (last, SCHEME_V->free_cell);
902 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
903 }
904 else
905 {
906 p = SCHEME_V->free_cell;
907
908 while (cdr (p) != NIL && newp > cdr (p))
909 p = cdr (p);
910
911 set_cdr (last, cdr (p));
912 set_cdr (p, newp);
913 }
914 } 956 }
915 957
916 return n; 958 return n;
917} 959}
918 960
919/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
920static INLINE pointer 962ecb_inline pointer
921get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
922{ 964{
923 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
924 { 966 {
925 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
997 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
998 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
999 1041
1000 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
1001 v->object.vector.length = len; 1043 v->object.vector.length = len;
1002 fill_vector (v, init); 1044 fill_vector (v, 0, init);
1003 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
1004 1046
1005 return v; 1047 return v;
1006} 1048}
1007 1049
1008static INLINE void 1050ecb_inline void
1009ok_to_freely_gc (SCHEME_P) 1051ok_to_freely_gc (SCHEME_P)
1010{ 1052{
1011 set_car (S_SINK, NIL); 1053 set_car (S_SINK, NIL);
1012} 1054}
1013 1055
… …
1052 return x; 1094 return x;
1053} 1095}
1054 1096
1055/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1056 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
1057#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1058 1110
1111static int
1059static 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}
1060 1122
1061static pointer 1123static pointer
1062oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1063{ 1125{
1064 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1066 1128
1067/* returns the new symbol */ 1129/* returns the new symbol */
1068static pointer 1130static pointer
1069oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1070{ 1132{
1071 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1072
1073 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1074 set_typeflag (x, T_SYMBOL);
1075 setimmutable (car (x));
1076
1077 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1078 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)));
1079 return x; 1136 return x;
1080} 1137}
1081 1138
1082static INLINE pointer 1139ecb_inline pointer
1083oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1084{ 1141{
1085 int location; 1142 int location;
1086 pointer x; 1143 pointer x;
1087 char *s; 1144 char *s;
1088 1145
1089 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1090 1147
1091 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))
1092 { 1149 {
1093 s = symname (car (x)); 1150 s = symname (car (x));
1094 1151
1095 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1096 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1106 int i; 1163 int i;
1107 pointer x; 1164 pointer x;
1108 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1109 1166
1110 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1111 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))
1112 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1113 1170
1114 return ob_list; 1171 return ob_list;
1115} 1172}
1116 1173
… …
1120oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1121{ 1178{
1122 return NIL; 1179 return NIL;
1123} 1180}
1124 1181
1125static INLINE pointer 1182ecb_inline pointer
1126oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1127{ 1184{
1128 pointer x; 1185 pointer x;
1129 char *s; 1186 char *s;
1130 1187
… …
1142 1199
1143/* returns the new symbol */ 1200/* returns the new symbol */
1144static pointer 1201static pointer
1145oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1146{ 1203{
1147 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1148
1149 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1150 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1151 setimmutable (car (x)); 1206 setimmutable (x);
1152 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1153 return x; 1208 return x;
1154} 1209}
1155 1210
1156static pointer 1211static pointer
… …
1189mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1190{ 1245{
1191 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1192 1247
1193 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1194 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1195 set_num_integer (x); 1250
1196 return x; 1251 return x;
1197} 1252}
1198 1253
1199/* get number atom (integer) */ 1254/* get number atom (integer) */
1200INTERFACE pointer 1255INTERFACE pointer
1201mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1202{ 1257{
1203 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1204 1259
1205 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1206 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1207 set_num_integer (x); 1262
1208 return x; 1263 return x;
1209} 1264}
1210 1265
1211INTERFACE pointer 1266INTERFACE pointer
1212mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1213{ 1268{
1269#if USE_REAL
1214 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1215 1271
1216 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1217 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1218 set_num_real (x); 1274
1219 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1220} 1279}
1221 1280
1222static pointer 1281static pointer
1223mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1224{ 1283{
1284#if USE_REAL
1225 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
1226 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1227 else 1290#endif
1228 return mk_real (SCHEME_A_ num_get_rvalue (n));
1229} 1291}
1230 1292
1231/* allocate name to string area */ 1293/* allocate name to string area */
1232static char * 1294static char *
1233store_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)
… …
1239 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1240 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1241 } 1303 }
1242 1304
1243 if (str) 1305 if (str)
1244 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1245 int l = strlen (str);
1246
1247 if (l > len_str)
1248 l = len_str;
1249
1250 memcpy (q, str, l);
1251 q[l] = 0;
1252 }
1253 else 1307 else
1254 {
1255 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1256 q[len_str] = 0; 1310 q[len_str] = 0;
1257 }
1258 1311
1259 return q; 1312 return q;
1260} 1313}
1261 1314
1262INTERFACE pointer 1315INTERFACE pointer
… …
1276 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1277 1330
1278 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1279 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1280 strlength (x) = len; 1333 strlength (x) = len;
1334
1281 return x; 1335 return x;
1282} 1336}
1283 1337
1284INTERFACE pointer 1338INTERFACE pointer
1285mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1292{ 1346{
1293 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1294} 1348}
1295 1349
1296INTERFACE void 1350INTERFACE void
1297fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1298{ 1352{
1299 int i; 1353 int i;
1300 1354
1301 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1302 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1303} 1357}
1304 1358
1305INTERFACE pointer 1359INTERFACE pointer
1306vector_elem (pointer vec, uint32_t ielem) 1360vector_get (pointer vec, uint32_t ielem)
1307{ 1361{
1308 return vecvalue(vec)[ielem]; 1362 return vecvalue(vec)[ielem];
1309} 1363}
1310 1364
1311INTERFACE void 1365INTERFACE void
1312set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1366vector_set (pointer vec, uint32_t ielem, pointer a)
1313{ 1367{
1314 vecvalue(vec)[ielem] = a; 1368 vecvalue(vec)[ielem] = a;
1315} 1369}
1316 1370
1317/* get new symbol */ 1371/* get new symbol */
… …
1329 1383
1330INTERFACE pointer 1384INTERFACE pointer
1331gensym (SCHEME_P) 1385gensym (SCHEME_P)
1332{ 1386{
1333 pointer x; 1387 pointer x;
1334
1335 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1336 {
1337 char name[40] = "gensym-"; 1388 char name[40] = "gensym-";
1338 xnum (name + 7, SCHEME_V->gensym_cnt); 1389 xnum (name + 7, SCHEME_V->gensym_cnt);
1339 1390
1340 /* first check oblist */ 1391 return generate_symbol (SCHEME_A_ name);
1341 x = oblist_find_by_name (SCHEME_A_ name);
1342
1343 if (x == NIL)
1344 {
1345 x = oblist_add_by_name (SCHEME_A_ name);
1346 return x;
1347 }
1348 }
1349
1350 return NIL;
1351} 1392}
1352 1393
1353/* make symbol or number atom from string */ 1394/* make symbol or number atom from string */
1354static pointer 1395static pointer
1355mk_atom (SCHEME_P_ char *q) 1396mk_atom (SCHEME_P_ char *q)
… …
1409 } 1450 }
1410 else if ((c == 'e') || (c == 'E')) 1451 else if ((c == 'e') || (c == 'E'))
1411 { 1452 {
1412 if (!has_fp_exp) 1453 if (!has_fp_exp)
1413 { 1454 {
1414 has_dec_point = 1; /* decimal point illegal 1455 has_dec_point = 1; /* decimal point illegal from now on */
1415 from now on */
1416 p++; 1456 p++;
1417 1457
1418 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1458 if ((*p == '-') || (*p == '+') || isdigit (*p))
1419 continue; 1459 continue;
1420 } 1460 }
… …
1508 1548
1509 if (ecb_expect_false (is_vector (p))) 1549 if (ecb_expect_false (is_vector (p)))
1510 { 1550 {
1511 int i; 1551 int i;
1512 1552
1513 for (i = 0; i < p->object.vector.length; i++) 1553 for (i = 0; i < veclength (p); i++)
1514 mark (vecvalue (p)[i]); 1554 mark (vecvalue (p)[i]);
1515 } 1555 }
1516 1556
1517 if (is_atom (p)) 1557 if (is_atom (p))
1518 goto E6; 1558 goto E6;
… …
1616 if (is_mark (p)) 1656 if (is_mark (p))
1617 clrmark (p); 1657 clrmark (p);
1618 else 1658 else
1619 { 1659 {
1620 /* reclaim cell */ 1660 /* reclaim cell */
1621 if (typeflag (p) != T_FREE) 1661 if (typeflag (p) != T_PAIR)
1622 { 1662 {
1623 finalize_cell (SCHEME_A_ p); 1663 finalize_cell (SCHEME_A_ p);
1624 set_typeflag (p, T_FREE); 1664 set_typeflag (p, T_PAIR);
1625 set_car (p, NIL); 1665 set_car (p, NIL);
1626 } 1666 }
1627 1667
1628 ++SCHEME_V->fcells; 1668 ++SCHEME_V->fcells;
1629 set_cdr (p, SCHEME_V->free_cell); 1669 set_cdr (p, SCHEME_V->free_cell);
… …
1631 } 1671 }
1632 } 1672 }
1633 } 1673 }
1634 1674
1635 if (SCHEME_V->gc_verbose) 1675 if (SCHEME_V->gc_verbose)
1676 {
1636 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1678 }
1637} 1679}
1638 1680
1639static void 1681static void
1640finalize_cell (SCHEME_P_ pointer a) 1682finalize_cell (SCHEME_P_ pointer a)
1641{ 1683{
… …
2070#endif 2112#endif
2071} 2113}
2072 2114
2073/* read characters up to delimiter, but cater to character constants */ 2115/* read characters up to delimiter, but cater to character constants */
2074static char * 2116static char *
2075readstr_upto (SCHEME_P_ char *delim) 2117readstr_upto (SCHEME_P_ int skip, const char *delim)
2076{ 2118{
2077 char *p = SCHEME_V->strbuff; 2119 char *p = SCHEME_V->strbuff + skip;
2078 2120
2079 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2121 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2080 2122
2081 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2082 *p = 0; 2124 *p = 0;
… …
2089 return SCHEME_V->strbuff; 2131 return SCHEME_V->strbuff;
2090} 2132}
2091 2133
2092/* read string expression "xxx...xxx" */ 2134/* read string expression "xxx...xxx" */
2093static pointer 2135static pointer
2094readstrexp (SCHEME_P) 2136readstrexp (SCHEME_P_ char delim)
2095{ 2137{
2096 char *p = SCHEME_V->strbuff; 2138 char *p = SCHEME_V->strbuff;
2097 int c; 2139 int c;
2098 int c1 = 0; 2140 int c1 = 0;
2099 enum
2100 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2141 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2101 2142
2102 for (;;) 2143 for (;;)
2103 { 2144 {
2104 c = inchar (SCHEME_A); 2145 c = inchar (SCHEME_A);
2105 2146
… …
2107 return S_F; 2148 return S_F;
2108 2149
2109 switch (state) 2150 switch (state)
2110 { 2151 {
2111 case st_ok: 2152 case st_ok:
2112 switch (c) 2153 if (ecb_expect_false (c == delim))
2113 {
2114 case '\\':
2115 state = st_bsl;
2116 break;
2117
2118 case '"':
2119 *p = 0;
2120 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2154 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2121 2155
2122 default: 2156 if (ecb_expect_false (c == '\\'))
2157 state = st_bsl;
2158 else
2123 *p++ = c; 2159 *p++ = c;
2124 break;
2125 }
2126 2160
2127 break; 2161 break;
2128 2162
2129 case st_bsl: 2163 case st_bsl:
2130 switch (c) 2164 switch (c)
… …
2160 case 'r': 2194 case 'r':
2161 *p++ = '\r'; 2195 *p++ = '\r';
2162 state = st_ok; 2196 state = st_ok;
2163 break; 2197 break;
2164 2198
2165 case '"':
2166 *p++ = '"';
2167 state = st_ok;
2168 break;
2169
2170 default: 2199 default:
2171 *p++ = c; 2200 *p++ = c;
2172 state = st_ok; 2201 state = st_ok;
2173 break; 2202 break;
2174 } 2203 }
2175 2204
2176 break; 2205 break;
2177 2206
2178 case st_x1: 2207 case st_x1:
2179 case st_x2: 2208 case st_x2:
2180 c = toupper (c); 2209 c = tolower (c);
2181 2210
2182 if (c >= '0' && c <= 'F') 2211 if (c >= '0' && c <= '9')
2183 {
2184 if (c <= '9')
2185 c1 = (c1 << 4) + c - '0'; 2212 c1 = (c1 << 4) + c - '0';
2186 else 2213 else if (c >= 'a' && c <= 'f')
2187 c1 = (c1 << 4) + c - 'A' + 10; 2214 c1 = (c1 << 4) + c - 'a' + 10;
2188
2189 if (state == st_x1)
2190 state = st_x2;
2191 else
2192 {
2193 *p++ = c1;
2194 state = st_ok;
2195 }
2196 }
2197 else 2215 else
2198 return S_F; 2216 return S_F;
2217
2218 if (state == st_x1)
2219 state = st_x2;
2220 else
2221 {
2222 *p++ = c1;
2223 state = st_ok;
2224 }
2199 2225
2200 break; 2226 break;
2201 2227
2202 case st_oct1: 2228 case st_oct1:
2203 case st_oct2: 2229 case st_oct2:
… …
2207 backchar (SCHEME_A_ c); 2233 backchar (SCHEME_A_ c);
2208 state = st_ok; 2234 state = st_ok;
2209 } 2235 }
2210 else 2236 else
2211 { 2237 {
2212 if (state == st_oct2 && c1 >= 32) 2238 if (state == st_oct2 && c1 >= ' ')
2213 return S_F; 2239 return S_F;
2214 2240
2215 c1 = (c1 << 3) + (c - '0'); 2241 c1 = (c1 << 3) + (c - '0');
2216 2242
2217 if (state == st_oct1) 2243 if (state == st_oct1)
… …
2222 state = st_ok; 2248 state = st_ok;
2223 } 2249 }
2224 } 2250 }
2225 2251
2226 break; 2252 break;
2227
2228 } 2253 }
2229 } 2254 }
2230} 2255}
2231 2256
2232/* check c is in chars */ 2257/* check c is in chars */
2233static INLINE int 2258ecb_inline int
2234is_one_of (char *s, int c) 2259is_one_of (const char *s, int c)
2235{ 2260{
2236 if (c == EOF) 2261 if (c == EOF)
2237 return 1; 2262 return 1;
2238 2263
2239 return !!strchr (s, c); 2264 return !!strchr (s, c);
2240} 2265}
2241 2266
2242/* skip white characters */ 2267/* skip white characters */
2243static INLINE int 2268ecb_inline int
2244skipspace (SCHEME_P) 2269skipspace (SCHEME_P)
2245{ 2270{
2246 int c, curr_line = 0; 2271 int c, curr_line = 0;
2247 2272
2248 do 2273 do
… …
2295 2320
2296 if (is_one_of (" \n\t", c)) 2321 if (is_one_of (" \n\t", c))
2297 return TOK_DOT; 2322 return TOK_DOT;
2298 else 2323 else
2299 { 2324 {
2300 //TODO: ungetc twice in a row is not supported in C
2301 backchar (SCHEME_A_ c); 2325 backchar (SCHEME_A_ c);
2302 backchar (SCHEME_A_ '.');
2303 return TOK_ATOM; 2326 return TOK_DOTATOM;
2304 } 2327 }
2328
2329 case '|':
2330 return TOK_STRATOM;
2305 2331
2306 case '\'': 2332 case '\'':
2307 return TOK_QUOTE; 2333 return TOK_QUOTE;
2308 2334
2309 case ';': 2335 case ';':
… …
2476 { 2502 {
2477 p = SCHEME_V->strbuff; 2503 p = SCHEME_V->strbuff;
2478 2504
2479 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2505 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2480 { 2506 {
2481 if (num_is_integer (l)) 2507 if (is_integer (l))
2482 xnum (p, ivalue_unchecked (l)); 2508 xnum (p, ivalue_unchecked (l));
2483#if USE_REAL 2509#if USE_REAL
2484 else 2510 else
2485 { 2511 {
2486 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2512 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2741 return 0; 2767 return 0;
2742 } 2768 }
2743 else if (is_number (a)) 2769 else if (is_number (a))
2744 { 2770 {
2745 if (is_number (b)) 2771 if (is_number (b))
2746 if (num_is_integer (a) == num_is_integer (b))
2747 return num_cmp (nvalue (a), nvalue (b)) == 0; 2772 return num_cmp (nvalue (a), nvalue (b)) == 0;
2748 2773
2749 return 0; 2774 return 0;
2750 } 2775 }
2751 else if (is_character (a)) 2776 else if (is_character (a))
2752 { 2777 {
… …
2778/* () is #t in R5RS */ 2803/* () is #t in R5RS */
2779#define is_true(p) ((p) != S_F) 2804#define is_true(p) ((p) != S_F)
2780#define is_false(p) ((p) == S_F) 2805#define is_false(p) ((p) == S_F)
2781 2806
2782/* ========== Environment implementation ========== */ 2807/* ========== Environment implementation ========== */
2783
2784#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2785
2786static int
2787hash_fn (const char *key, int table_size)
2788{
2789 const unsigned char *p = key;
2790 uint32_t hash = 2166136261;
2791
2792 while (*p)
2793 hash = (hash ^ *p++) * 16777619;
2794
2795 return hash % table_size;
2796}
2797#endif
2798 2808
2799#ifndef USE_ALIST_ENV 2809#ifndef USE_ALIST_ENV
2800 2810
2801/* 2811/*
2802 * In this implementation, each frame of the environment may be 2812 * In this implementation, each frame of the environment may be
… …
2819 2829
2820 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2830 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2821 setenvironment (SCHEME_V->envir); 2831 setenvironment (SCHEME_V->envir);
2822} 2832}
2823 2833
2824static INLINE void 2834static uint32_t
2835sym_hash (pointer sym, uint32_t size)
2836{
2837 uintptr_t ptr = (uintptr_t)sym;
2838
2839#if 0
2840 /* table size is prime, so why mix */
2841 ptr += ptr >> 32;
2842 ptr += ptr >> 16;
2843 ptr += ptr >> 8;
2844#endif
2845
2846 return ptr % size;
2847}
2848
2849ecb_inline void
2825new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2850new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2826{ 2851{
2827 pointer slot = immutable_cons (variable, value); 2852 pointer slot = immutable_cons (variable, value);
2828 2853
2829 if (is_vector (car (env))) 2854 if (is_vector (car (env)))
2830 { 2855 {
2831 int location = hash_fn (symname (variable), veclength (car (env))); 2856 int location = sym_hash (variable, veclength (car (env)));
2832
2833 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2857 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2834 } 2858 }
2835 else 2859 else
2836 set_car (env, immutable_cons (slot, car (env))); 2860 set_car (env, immutable_cons (slot, car (env)));
2837} 2861}
2838 2862
2839static pointer 2863static pointer
2840find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2841{ 2865{
2842 pointer x, y; 2866 pointer x, y;
2843 int location;
2844 2867
2845 for (x = env; x != NIL; x = cdr (x)) 2868 for (x = env; x != NIL; x = cdr (x))
2846 { 2869 {
2847 if (is_vector (car (x))) 2870 if (is_vector (car (x)))
2848 { 2871 {
2849 location = hash_fn (symname (hdl), veclength (car (x))); 2872 int location = sym_hash (hdl, veclength (car (x)));
2850 y = vector_elem (car (x), location); 2873 y = vector_get (car (x), location);
2851 } 2874 }
2852 else 2875 else
2853 y = car (x); 2876 y = car (x);
2854 2877
2855 for (; y != NIL; y = cdr (y)) 2878 for (; y != NIL; y = cdr (y))
2856 if (caar (y) == hdl) 2879 if (caar (y) == hdl)
2857 break; 2880 break;
2858 2881
2859 if (y != NIL) 2882 if (y != NIL)
2883 return car (y);
2884
2885 if (!all)
2860 break; 2886 break;
2861
2862 if (!all)
2863 return NIL;
2864 } 2887 }
2865
2866 if (x != NIL)
2867 return car (y);
2868 2888
2869 return NIL; 2889 return NIL;
2870} 2890}
2871 2891
2872#else /* USE_ALIST_ENV */ 2892#else /* USE_ALIST_ENV */
2873 2893
2874static INLINE void 2894ecb_inline void
2875new_frame_in_env (SCHEME_P_ pointer old_env) 2895new_frame_in_env (SCHEME_P_ pointer old_env)
2876{ 2896{
2877 SCHEME_V->envir = immutable_cons (NIL, old_env); 2897 SCHEME_V->envir = immutable_cons (NIL, old_env);
2878 setenvironment (SCHEME_V->envir); 2898 setenvironment (SCHEME_V->envir);
2879} 2899}
2880 2900
2881static INLINE void 2901ecb_inline void
2882new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2902new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2883{ 2903{
2884 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2885} 2905}
2886 2906
… …
2894 for (y = car (x); y != NIL; y = cdr (y)) 2914 for (y = car (x); y != NIL; y = cdr (y))
2895 if (caar (y) == hdl) 2915 if (caar (y) == hdl)
2896 break; 2916 break;
2897 2917
2898 if (y != NIL) 2918 if (y != NIL)
2919 return car (y);
2899 break; 2920 break;
2900 2921
2901 if (!all) 2922 if (!all)
2902 return NIL; 2923 break;
2903 } 2924 }
2904
2905 if (x != NIL)
2906 return car (y);
2907 2925
2908 return NIL; 2926 return NIL;
2909} 2927}
2910 2928
2911#endif /* USE_ALIST_ENV else */ 2929#endif /* USE_ALIST_ENV else */
2912 2930
2913static INLINE void 2931ecb_inline void
2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2915{ 2933{
2916 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2917} 2935}
2918 2936
2919static INLINE void 2937ecb_inline void
2920set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2921{ 2939{
2922 set_cdr (slot, value); 2940 set_cdr (slot, value);
2923} 2941}
2924 2942
2925static INLINE pointer 2943ecb_inline pointer
2926slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2927{ 2945{
2928 return cdr (slot); 2946 return cdr (slot);
2929} 2947}
2930 2948
2931/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2932 2950
2933static pointer 2951static int
2934xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2935{ 2953{
2936#if USE_ERROR_HOOK 2954#if USE_ERROR_HOOK
2937 pointer x; 2955 pointer x;
2938 pointer hdl = SCHEME_V->ERROR_HOOK; 2956 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2973 code = cons (mk_string (SCHEME_A_ s), code); 2991 code = cons (mk_string (SCHEME_A_ s), code);
2974 setimmutable (car (code)); 2992 setimmutable (car (code));
2975 SCHEME_V->code = cons (slot_value_in_env (x), code); 2993 SCHEME_V->code = cons (slot_value_in_env (x), code);
2976 SCHEME_V->op = OP_EVAL; 2994 SCHEME_V->op = OP_EVAL;
2977 2995
2978 return S_T; 2996 return 0;
2979 } 2997 }
2980#endif 2998#endif
2981 2999
2982 if (a) 3000 if (a)
2983 SCHEME_V->args = cons (a, NIL); 3001 SCHEME_V->args = cons (a, NIL);
… …
2985 SCHEME_V->args = NIL; 3003 SCHEME_V->args = NIL;
2986 3004
2987 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3005 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2988 setimmutable (car (SCHEME_V->args)); 3006 setimmutable (car (SCHEME_V->args));
2989 SCHEME_V->op = OP_ERR0; 3007 SCHEME_V->op = OP_ERR0;
3008
2990 return S_T; 3009 return 0;
2991} 3010}
2992 3011
2993#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3012#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2994#define Error_0(s) Error_1 (s, 0) 3013#define Error_0(s) Error_1 (s, 0)
2995 3014
2996/* Too small to turn into function */ 3015/* Too small to turn into function */
2997#define BEGIN do { 3016#define BEGIN do {
2998#define END } while (0) 3017#define END } while (0)
2999#define s_goto(a) BEGIN \ 3018#define s_goto(a) BEGIN \
3000 SCHEME_V->op = a; \ 3019 SCHEME_V->op = a; \
3001 return S_T; END 3020 return 0; END
3002 3021
3003#define s_return(a) return xs_return (SCHEME_A_ a) 3022#define s_return(a) return xs_return (SCHEME_A_ a)
3004 3023
3005#ifndef USE_SCHEME_STACK 3024#ifndef USE_SCHEME_STACK
3006 3025
… …
3031 next_frame = SCHEME_V->dump_base + nframes; 3050 next_frame = SCHEME_V->dump_base + nframes;
3032 3051
3033 next_frame->op = op; 3052 next_frame->op = op;
3034 next_frame->args = args; 3053 next_frame->args = args;
3035 next_frame->envir = SCHEME_V->envir; 3054 next_frame->envir = SCHEME_V->envir;
3036 next_frame->code = code; 3055 next_frame->code = code;
3037 3056
3038 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3039} 3058}
3040 3059
3041static pointer 3060static int
3042xs_return (SCHEME_P_ pointer a) 3061xs_return (SCHEME_P_ pointer a)
3043{ 3062{
3044 int nframes = (uintptr_t)SCHEME_V->dump; 3063 int nframes = (uintptr_t)SCHEME_V->dump;
3045 struct dump_stack_frame *frame; 3064 struct dump_stack_frame *frame;
3046 3065
3047 SCHEME_V->value = a; 3066 SCHEME_V->value = a;
3048 3067
3049 if (nframes <= 0) 3068 if (nframes <= 0)
3050 return NIL; 3069 return -1;
3051 3070
3052 frame = &SCHEME_V->dump_base[--nframes]; 3071 frame = &SCHEME_V->dump_base[--nframes];
3053 SCHEME_V->op = frame->op; 3072 SCHEME_V->op = frame->op;
3054 SCHEME_V->args = frame->args; 3073 SCHEME_V->args = frame->args;
3055 SCHEME_V->envir = frame->envir; 3074 SCHEME_V->envir = frame->envir;
3056 SCHEME_V->code = frame->code; 3075 SCHEME_V->code = frame->code;
3057 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3058 3077
3059 return S_T; 3078 return 0;
3060} 3079}
3061 3080
3062static INLINE void 3081ecb_inline void
3063dump_stack_reset (SCHEME_P) 3082dump_stack_reset (SCHEME_P)
3064{ 3083{
3065 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3084 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3066 SCHEME_V->dump = (pointer)+0; 3085 SCHEME_V->dump = (pointer)+0;
3067} 3086}
3068 3087
3069static INLINE void 3088ecb_inline void
3070dump_stack_initialize (SCHEME_P) 3089dump_stack_initialize (SCHEME_P)
3071{ 3090{
3072 SCHEME_V->dump_size = 0; 3091 SCHEME_V->dump_size = 0;
3073 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3074 dump_stack_reset (SCHEME_A); 3093 dump_stack_reset (SCHEME_A);
… …
3127 int i = 0; 3146 int i = 0;
3128 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3147 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3129 3148
3130 while (cont != NIL) 3149 while (cont != NIL)
3131 { 3150 {
3132 frame->op = ivalue (car (cont)); cont = cdr (cont); 3151 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3133 frame->args = car (cont) ; cont = cdr (cont); 3152 frame->args = car (cont) ; cont = cdr (cont);
3134 frame->envir = car (cont) ; cont = cdr (cont); 3153 frame->envir = car (cont) ; cont = cdr (cont);
3135 frame->code = car (cont) ; cont = cdr (cont); 3154 frame->code = car (cont) ; cont = cdr (cont);
3136 3155
3137 ++frame; 3156 ++frame;
3138 ++i; 3157 ++i;
3139 } 3158 }
3140 3159
3141 SCHEME_V->dump = (pointer)(uintptr_t)i; 3160 SCHEME_V->dump = (pointer)(uintptr_t)i;
3142} 3161}
3143 3162
3144#else 3163#else
3145 3164
3146static INLINE void 3165ecb_inline void
3147dump_stack_reset (SCHEME_P) 3166dump_stack_reset (SCHEME_P)
3148{ 3167{
3149 SCHEME_V->dump = NIL; 3168 SCHEME_V->dump = NIL;
3150} 3169}
3151 3170
3152static INLINE void 3171ecb_inline void
3153dump_stack_initialize (SCHEME_P) 3172dump_stack_initialize (SCHEME_P)
3154{ 3173{
3155 dump_stack_reset (SCHEME_A); 3174 dump_stack_reset (SCHEME_A);
3156} 3175}
3157 3176
… …
3159dump_stack_free (SCHEME_P) 3178dump_stack_free (SCHEME_P)
3160{ 3179{
3161 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3162} 3181}
3163 3182
3164static pointer 3183static int
3165xs_return (SCHEME_P_ pointer a) 3184xs_return (SCHEME_P_ pointer a)
3166{ 3185{
3167 pointer dump = SCHEME_V->dump; 3186 pointer dump = SCHEME_V->dump;
3168 3187
3169 SCHEME_V->value = a; 3188 SCHEME_V->value = a;
3170 3189
3171 if (dump == NIL) 3190 if (dump == NIL)
3172 return NIL; 3191 return -1;
3173 3192
3174 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3193 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3175 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3194 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3176 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3195 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3177 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3196 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3178 3197
3179 SCHEME_V->dump = dump; 3198 SCHEME_V->dump = dump;
3180 3199
3181 return S_T; 3200 return 0;
3182} 3201}
3183 3202
3184static void 3203static void
3185s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3186{ 3205{
… …
3211 3230
3212#endif 3231#endif
3213 3232
3214#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3215 3234
3216static pointer 3235static int
3217opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3236opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3218{ 3237{
3238 pointer args = SCHEME_V->args;
3219 pointer x, y; 3239 pointer x, y;
3220 3240
3221 switch (op) 3241 switch (op)
3222 { 3242 {
3223 case OP_LOAD: /* load */ 3243 case OP_LOAD: /* load */
3224 if (file_interactive (SCHEME_A)) 3244 if (file_interactive (SCHEME_A))
3225 { 3245 {
3226 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3227 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3247 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3228 } 3248 }
3229 3249
3230 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3250 if (!file_push (SCHEME_A_ strvalue (car (args))))
3231 Error_1 ("unable to open", car (SCHEME_V->args)); 3251 Error_1 ("unable to open", car (args));
3232 else 3252 else
3233 { 3253 {
3234 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3254 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3235 s_goto (OP_T0LVL); 3255 s_goto (OP_T0LVL);
3236 } 3256 }
… …
3310 case OP_EVAL: /* main part of evaluation */ 3330 case OP_EVAL: /* main part of evaluation */
3311#if USE_TRACING 3331#if USE_TRACING
3312 if (SCHEME_V->tracing) 3332 if (SCHEME_V->tracing)
3313 { 3333 {
3314 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3334 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3315 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3335 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3316 SCHEME_V->args = SCHEME_V->code; 3336 SCHEME_V->args = SCHEME_V->code;
3317 putstr (SCHEME_A_ "\nEval: "); 3337 putstr (SCHEME_A_ "\nEval: ");
3318 s_goto (OP_P0LIST); 3338 s_goto (OP_P0LIST);
3319 } 3339 }
3320 3340
… …
3364 SCHEME_V->code = cdr (SCHEME_V->code); 3384 SCHEME_V->code = cdr (SCHEME_V->code);
3365 s_goto (OP_E1ARGS); 3385 s_goto (OP_E1ARGS);
3366 } 3386 }
3367 3387
3368 case OP_E1ARGS: /* eval arguments */ 3388 case OP_E1ARGS: /* eval arguments */
3369 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3389 args = cons (SCHEME_V->value, args);
3370 3390
3371 if (is_pair (SCHEME_V->code)) /* continue */ 3391 if (is_pair (SCHEME_V->code)) /* continue */
3372 { 3392 {
3373 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3393 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3374 SCHEME_V->code = car (SCHEME_V->code); 3394 SCHEME_V->code = car (SCHEME_V->code);
3375 SCHEME_V->args = NIL; 3395 SCHEME_V->args = NIL;
3376 s_goto (OP_EVAL); 3396 s_goto (OP_EVAL);
3377 } 3397 }
3378 else /* end */ 3398 else /* end */
3379 { 3399 {
3380 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3400 args = reverse_in_place (SCHEME_A_ NIL, args);
3381 SCHEME_V->code = car (SCHEME_V->args); 3401 SCHEME_V->code = car (args);
3382 SCHEME_V->args = cdr (SCHEME_V->args); 3402 SCHEME_V->args = cdr (args);
3383 s_goto (OP_APPLY); 3403 s_goto (OP_APPLY);
3384 } 3404 }
3385 3405
3386#if USE_TRACING 3406#if USE_TRACING
3387 3407
3388 case OP_TRACING: 3408 case OP_TRACING:
3389 { 3409 {
3390 int tr = SCHEME_V->tracing; 3410 int tr = SCHEME_V->tracing;
3391 3411
3392 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3412 SCHEME_V->tracing = ivalue_unchecked (car (args));
3393 s_return (mk_integer (SCHEME_A_ tr)); 3413 s_return (mk_integer (SCHEME_A_ tr));
3394 } 3414 }
3395 3415
3396#endif 3416#endif
3397 3417
3398 case OP_APPLY: /* apply 'code' to 'args' */ 3418 case OP_APPLY: /* apply 'code' to 'args' */
3399#if USE_TRACING 3419#if USE_TRACING
3400 if (SCHEME_V->tracing) 3420 if (SCHEME_V->tracing)
3401 { 3421 {
3402 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3422 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3403 SCHEME_V->print_flag = 1; 3423 SCHEME_V->print_flag = 1;
3404 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3424 /* args=cons(SCHEME_V->code,args); */
3405 putstr (SCHEME_A_ "\nApply to: "); 3425 putstr (SCHEME_A_ "\nApply to: ");
3406 s_goto (OP_P0LIST); 3426 s_goto (OP_P0LIST);
3407 } 3427 }
3408 3428
3409 /* fall through */ 3429 /* fall through */
3410 3430
3411 case OP_REAL_APPLY: 3431 case OP_REAL_APPLY:
3412#endif 3432#endif
3413 if (is_proc (SCHEME_V->code)) 3433 if (is_proc (SCHEME_V->code))
3414 {
3415 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3416 }
3417 else if (is_foreign (SCHEME_V->code)) 3435 else if (is_foreign (SCHEME_V->code))
3418 { 3436 {
3419 /* Keep nested calls from GC'ing the arglist */ 3437 /* Keep nested calls from GC'ing the arglist */
3420 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3438 push_recent_alloc (SCHEME_A_ args, NIL);
3421 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3422 3440
3423 s_return (x); 3441 s_return (x);
3424 } 3442 }
3425 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3443 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3426 { 3444 {
3427 /* Should not accept promise */ 3445 /* Should not accept promise */
3428 /* make environment */ 3446 /* make environment */
3429 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3447 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3430 3448
3431 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3449 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3432 { 3450 {
3433 if (y == NIL) 3451 if (y == NIL)
3434 Error_0 ("not enough arguments"); 3452 Error_0 ("not enough arguments");
3435 else 3453 else
3436 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3454 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3454 s_goto (OP_BEGIN); 3472 s_goto (OP_BEGIN);
3455 } 3473 }
3456 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3474 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3457 { 3475 {
3458 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3476 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3459 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3477 s_return (args != NIL ? car (args) : NIL);
3460 } 3478 }
3461 else 3479 else
3462 Error_0 ("illegal function"); 3480 Error_0 ("illegal function");
3463 3481
3464 case OP_DOMACRO: /* do macro */ 3482 case OP_DOMACRO: /* do macro */
… …
3473 { 3491 {
3474 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3492 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3475 3493
3476 if (f != NIL) 3494 if (f != NIL)
3477 { 3495 {
3478 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3496 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3479 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3497 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3480 SCHEME_V->code = slot_value_in_env (f); 3498 SCHEME_V->code = slot_value_in_env (f);
3481 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3482 } 3500 }
3483 3501
… …
3494 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3512 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3495 3513
3496#endif 3514#endif
3497 3515
3498 case OP_MKCLOSURE: /* make-closure */ 3516 case OP_MKCLOSURE: /* make-closure */
3499 x = car (SCHEME_V->args); 3517 x = car (args);
3500 3518
3501 if (car (x) == SCHEME_V->LAMBDA) 3519 if (car (x) == SCHEME_V->LAMBDA)
3502 x = cdr (x); 3520 x = cdr (x);
3503 3521
3504 if (cdr (SCHEME_V->args) == NIL) 3522 if (cdr (args) == NIL)
3505 y = SCHEME_V->envir; 3523 y = SCHEME_V->envir;
3506 else 3524 else
3507 y = cadr (SCHEME_V->args); 3525 y = cadr (args);
3508 3526
3509 s_return (mk_closure (SCHEME_A_ x, y)); 3527 s_return (mk_closure (SCHEME_A_ x, y));
3510 3528
3511 case OP_QUOTE: /* quote */ 3529 case OP_QUOTE: /* quote */
3512 s_return (car (SCHEME_V->code)); 3530 s_return (car (SCHEME_V->code));
… …
3544 3562
3545 3563
3546 case OP_DEFP: /* defined? */ 3564 case OP_DEFP: /* defined? */
3547 x = SCHEME_V->envir; 3565 x = SCHEME_V->envir;
3548 3566
3549 if (cdr (SCHEME_V->args) != NIL) 3567 if (cdr (args) != NIL)
3550 x = cadr (SCHEME_V->args); 3568 x = cadr (args);
3551 3569
3552 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3570 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3553 3571
3554 case OP_SET0: /* set! */ 3572 case OP_SET0: /* set! */
3555 if (is_immutable (car (SCHEME_V->code))) 3573 if (is_immutable (car (SCHEME_V->code)))
3556 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3574 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3557 3575
… …
3588 3606
3589 case OP_IF1: /* if */ 3607 case OP_IF1: /* if */
3590 if (is_true (SCHEME_V->value)) 3608 if (is_true (SCHEME_V->value))
3591 SCHEME_V->code = car (SCHEME_V->code); 3609 SCHEME_V->code = car (SCHEME_V->code);
3592 else 3610 else
3593 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3611 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3594
3595 * car(NIL) = NIL */
3596 s_goto (OP_EVAL); 3612 s_goto (OP_EVAL);
3597 3613
3598 case OP_LET0: /* let */ 3614 case OP_LET0: /* let */
3599 SCHEME_V->args = NIL; 3615 SCHEME_V->args = NIL;
3600 SCHEME_V->value = SCHEME_V->code; 3616 SCHEME_V->value = SCHEME_V->code;
3601 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3617 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3602 s_goto (OP_LET1); 3618 s_goto (OP_LET1);
3603 3619
3604 case OP_LET1: /* let (calculate parameters) */ 3620 case OP_LET1: /* let (calculate parameters) */
3605 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3621 args = cons (SCHEME_V->value, args);
3606 3622
3607 if (is_pair (SCHEME_V->code)) /* continue */ 3623 if (is_pair (SCHEME_V->code)) /* continue */
3608 { 3624 {
3609 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3625 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3610 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3626 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3611 3627
3612 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3628 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3613 SCHEME_V->code = cadar (SCHEME_V->code); 3629 SCHEME_V->code = cadar (SCHEME_V->code);
3614 SCHEME_V->args = NIL; 3630 SCHEME_V->args = NIL;
3615 s_goto (OP_EVAL); 3631 s_goto (OP_EVAL);
3616 } 3632 }
3617 else /* end */ 3633 else /* end */
3618 { 3634 {
3619 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3635 args = reverse_in_place (SCHEME_A_ NIL, args);
3620 SCHEME_V->code = car (SCHEME_V->args); 3636 SCHEME_V->code = car (args);
3621 SCHEME_V->args = cdr (SCHEME_V->args); 3637 SCHEME_V->args = cdr (args);
3622 s_goto (OP_LET2); 3638 s_goto (OP_LET2);
3623 } 3639 }
3624 3640
3625 case OP_LET2: /* let */ 3641 case OP_LET2: /* let */
3626 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3642 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3627 3643
3628 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3644 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3629 y != NIL; x = cdr (x), y = cdr (y)) 3645 y != NIL; x = cdr (x), y = cdr (y))
3630 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3646 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3631 3647
3632 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3648 if (is_symbol (car (SCHEME_V->code))) /* named let */
3633 { 3649 {
3634 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3650 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3635 { 3651 {
3636 if (!is_pair (x)) 3652 if (!is_pair (x))
3637 Error_1 ("Bad syntax of binding in let :", x); 3653 Error_1 ("Bad syntax of binding in let :", x);
3638 3654
3639 if (!is_list (SCHEME_A_ car (x))) 3655 if (!is_list (SCHEME_A_ car (x)))
3640 Error_1 ("Bad syntax of binding in let :", car (x)); 3656 Error_1 ("Bad syntax of binding in let :", car (x));
3641 3657
3642 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3658 args = cons (caar (x), args);
3643 } 3659 }
3644 3660
3645 x =
3646 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3661 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3647 SCHEME_V->envir); 3662 SCHEME_V->envir);
3648 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3663 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3649 SCHEME_V->code = cddr (SCHEME_V->code); 3664 SCHEME_V->code = cddr (SCHEME_V->code);
3650 SCHEME_V->args = NIL;
3651 } 3665 }
3652 else 3666 else
3653 { 3667 {
3654 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3669 }
3670
3655 SCHEME_V->args = NIL; 3671 SCHEME_V->args = NIL;
3656 }
3657
3658 s_goto (OP_BEGIN); 3672 s_goto (OP_BEGIN);
3659 3673
3660 case OP_LET0AST: /* let* */ 3674 case OP_LET0AST: /* let* */
3661 if (car (SCHEME_V->code) == NIL) 3675 if (car (SCHEME_V->code) == NIL)
3662 { 3676 {
… …
3680 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3694 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3681 SCHEME_V->code = cdr (SCHEME_V->code); 3695 SCHEME_V->code = cdr (SCHEME_V->code);
3682 3696
3683 if (is_pair (SCHEME_V->code)) /* continue */ 3697 if (is_pair (SCHEME_V->code)) /* continue */
3684 { 3698 {
3685 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3699 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3686 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3687 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3688 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3689 } 3703 }
3690 else /* end */ 3704 else /* end */
3691 { 3705 {
3692 SCHEME_V->code = SCHEME_V->args; 3706 SCHEME_V->code = args;
3693 SCHEME_V->args = NIL; 3707 SCHEME_V->args = NIL;
3694 s_goto (OP_BEGIN); 3708 s_goto (OP_BEGIN);
3695 } 3709 }
3696 3710
3697 case OP_LET0REC: /* letrec */ 3711 case OP_LET0REC: /* letrec */
… …
3700 SCHEME_V->value = SCHEME_V->code; 3714 SCHEME_V->value = SCHEME_V->code;
3701 SCHEME_V->code = car (SCHEME_V->code); 3715 SCHEME_V->code = car (SCHEME_V->code);
3702 s_goto (OP_LET1REC); 3716 s_goto (OP_LET1REC);
3703 3717
3704 case OP_LET1REC: /* letrec (calculate parameters) */ 3718 case OP_LET1REC: /* letrec (calculate parameters) */
3705 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3719 args = cons (SCHEME_V->value, args);
3706 3720
3707 if (is_pair (SCHEME_V->code)) /* continue */ 3721 if (is_pair (SCHEME_V->code)) /* continue */
3708 { 3722 {
3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3723 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3710 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3724 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3711 3725
3712 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3726 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3713 SCHEME_V->code = cadar (SCHEME_V->code); 3727 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL; 3728 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL); 3729 s_goto (OP_EVAL);
3716 } 3730 }
3717 else /* end */ 3731 else /* end */
3718 { 3732 {
3719 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3733 args = reverse_in_place (SCHEME_A_ NIL, args);
3720 SCHEME_V->code = car (SCHEME_V->args); 3734 SCHEME_V->code = car (args);
3721 SCHEME_V->args = cdr (SCHEME_V->args); 3735 SCHEME_V->args = cdr (args);
3722 s_goto (OP_LET2REC); 3736 s_goto (OP_LET2REC);
3723 } 3737 }
3724 3738
3725 case OP_LET2REC: /* letrec */ 3739 case OP_LET2REC: /* letrec */
3726 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3740 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3727 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3741 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3728 3742
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3730 SCHEME_V->args = NIL; 3744 SCHEME_V->args = NIL;
3731 s_goto (OP_BEGIN); 3745 s_goto (OP_BEGIN);
… …
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3831 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 3832 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 3833 s_goto (OP_EVAL);
3820 3834
3821 case OP_C1STREAM: /* cons-stream */ 3835 case OP_C1STREAM: /* cons-stream */
3822 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3836 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3823 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3837 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3824 set_typeflag (x, T_PROMISE); 3838 set_typeflag (x, T_PROMISE);
3825 s_return (cons (SCHEME_V->args, x)); 3839 s_return (cons (args, x));
3826 3840
3827 case OP_MACRO0: /* macro */ 3841 case OP_MACRO0: /* macro */
3828 if (is_pair (car (SCHEME_V->code))) 3842 if (is_pair (car (SCHEME_V->code)))
3829 { 3843 {
3830 x = caar (SCHEME_V->code); 3844 x = caar (SCHEME_V->code);
… …
3863 { 3877 {
3864 if (!is_pair (y = caar (x))) 3878 if (!is_pair (y = caar (x)))
3865 break; 3879 break;
3866 3880
3867 for (; y != NIL; y = cdr (y)) 3881 for (; y != NIL; y = cdr (y))
3868 {
3869 if (eqv (car (y), SCHEME_V->value)) 3882 if (eqv (car (y), SCHEME_V->value))
3870 break; 3883 break;
3871 }
3872 3884
3873 if (y != NIL) 3885 if (y != NIL)
3874 break; 3886 break;
3875 } 3887 }
3876 3888
… …
3896 s_goto (OP_BEGIN); 3908 s_goto (OP_BEGIN);
3897 else 3909 else
3898 s_return (NIL); 3910 s_return (NIL);
3899 3911
3900 case OP_PAPPLY: /* apply */ 3912 case OP_PAPPLY: /* apply */
3901 SCHEME_V->code = car (SCHEME_V->args); 3913 SCHEME_V->code = car (args);
3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3914 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3903 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3915 /*SCHEME_V->args = cadr(args); */
3904 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3905 3917
3906 case OP_PEVAL: /* eval */ 3918 case OP_PEVAL: /* eval */
3907 if (cdr (SCHEME_V->args) != NIL) 3919 if (cdr (args) != NIL)
3908 SCHEME_V->envir = cadr (SCHEME_V->args); 3920 SCHEME_V->envir = cadr (args);
3909 3921
3910 SCHEME_V->code = car (SCHEME_V->args); 3922 SCHEME_V->code = car (args);
3911 s_goto (OP_EVAL); 3923 s_goto (OP_EVAL);
3912 3924
3913 case OP_CONTINUATION: /* call-with-current-continuation */ 3925 case OP_CONTINUATION: /* call-with-current-continuation */
3914 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3927 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 3928 s_goto (OP_APPLY);
3917 } 3929 }
3918 3930
3919 abort (); 3931 if (USE_ERROR_CHECKING) abort ();
3920} 3932}
3921 3933
3922static pointer 3934static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3935opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 3936{
3925 pointer x; 3937 pointer args = SCHEME_V->args;
3938 pointer x = car (args);
3926 num v; 3939 num v;
3927 3940
3941 switch (op)
3942 {
3928#if USE_MATH 3943#if USE_MATH
3929 RVALUE dd;
3930#endif
3931
3932 switch (op)
3933 {
3934#if USE_MATH
3935
3936 case OP_INEX2EX: /* inexact->exact */ 3944 case OP_INEX2EX: /* inexact->exact */
3937 x = car (SCHEME_V->args); 3945 {
3938
3939 if (num_is_integer (x)) 3946 if (is_integer (x))
3940 s_return (x); 3947 s_return (x);
3941 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3948
3949 RVALUE r = rvalue_unchecked (x);
3950
3951 if (r == (RVALUE)(IVALUE)r)
3942 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3943 else 3953 else
3944 Error_1 ("inexact->exact: not integral:", x); 3954 Error_1 ("inexact->exact: not integral:", x);
3955 }
3945 3956
3946 case OP_EXP:
3947 x = car (SCHEME_V->args);
3948 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3957 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3949
3950 case OP_LOG:
3951 x = car (SCHEME_V->args);
3952 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3958 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3953
3954 case OP_SIN:
3955 x = car (SCHEME_V->args);
3956 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3959 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3957
3958 case OP_COS:
3959 x = car (SCHEME_V->args);
3960 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3960 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3961
3962 case OP_TAN:
3963 x = car (SCHEME_V->args);
3964 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3961 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3965
3966 case OP_ASIN:
3967 x = car (SCHEME_V->args);
3968 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3962 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3969
3970 case OP_ACOS:
3971 x = car (SCHEME_V->args);
3972 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3963 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 3964
3974 case OP_ATAN: 3965 case OP_ATAN:
3975 x = car (SCHEME_V->args);
3976
3977 if (cdr (SCHEME_V->args) == NIL) 3966 if (cdr (args) == NIL)
3978 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3967 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
3979 else 3968 else
3980 { 3969 {
3981 pointer y = cadr (SCHEME_V->args); 3970 pointer y = cadr (args);
3982
3983 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3971 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3984 } 3972 }
3985 3973
3986 case OP_SQRT: 3974 case OP_SQRT:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3975 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 3976
3990 case OP_EXPT: 3977 case OP_EXPT:
3991 { 3978 {
3992 RVALUE result; 3979 RVALUE result;
3993 int real_result = 1; 3980 int real_result = 1;
3994 pointer y = cadr (SCHEME_V->args); 3981 pointer y = cadr (args);
3995 3982
3996 x = car (SCHEME_V->args);
3997
3998 if (num_is_integer (x) && num_is_integer (y)) 3983 if (is_integer (x) && is_integer (y))
3999 real_result = 0; 3984 real_result = 0;
4000 3985
4001 /* This 'if' is an R5RS compatibility fix. */ 3986 /* This 'if' is an R5RS compatibility fix. */
4002 /* NOTE: Remove this 'if' fix for R6RS. */ 3987 /* NOTE: Remove this 'if' fix for R6RS. */
4003 if (rvalue (x) == 0 && rvalue (y) < 0) 3988 if (rvalue (x) == 0 && rvalue (y) < 0)
4004 result = 0.0; 3989 result = 0;
4005 else 3990 else
4006 result = pow (rvalue (x), rvalue (y)); 3991 result = pow (rvalue (x), rvalue (y));
4007 3992
4008 /* Before returning integer result make sure we can. */ 3993 /* Before returning integer result make sure we can. */
4009 /* If the test fails, result is too big for integer. */ 3994 /* If the test fails, result is too big for integer. */
4010 if (!real_result) 3995 if (!real_result)
4011 { 3996 {
4012 long result_as_long = (long) result; 3997 long result_as_long = result;
4013 3998
4014 if (result != (RVALUE) result_as_long) 3999 if (result != result_as_long)
4015 real_result = 1; 4000 real_result = 1;
4016 } 4001 }
4017 4002
4018 if (real_result) 4003 if (real_result)
4019 s_return (mk_real (SCHEME_A_ result)); 4004 s_return (mk_real (SCHEME_A_ result));
4020 else 4005 else
4021 s_return (mk_integer (SCHEME_A_ result)); 4006 s_return (mk_integer (SCHEME_A_ result));
4022 } 4007 }
4023 4008
4024 case OP_FLOOR:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4009 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4027
4028 case OP_CEILING:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4010 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 4011
4032 case OP_TRUNCATE: 4012 case OP_TRUNCATE:
4033 { 4013 {
4034 RVALUE rvalue_of_x; 4014 RVALUE n = rvalue (x);
4035
4036 x = car (SCHEME_V->args);
4037 rvalue_of_x = rvalue (x);
4038
4039 if (rvalue_of_x > 0)
4040 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4015 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4041 else
4042 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4043 } 4016 }
4044 4017
4045 case OP_ROUND: 4018 case OP_ROUND:
4046 x = car (SCHEME_V->args);
4047
4048 if (num_is_integer (x)) 4019 if (is_integer (x))
4049 s_return (x); 4020 s_return (x);
4050 4021
4051 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4022 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4052#endif 4023#endif
4053 4024
4054 case OP_ADD: /* + */ 4025 case OP_ADD: /* + */
4055 v = num_zero; 4026 v = num_zero;
4056 4027
4057 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4028 for (x = args; x != NIL; x = cdr (x))
4058 v = num_op ('+', v, nvalue (car (x))); 4029 v = num_op (NUM_ADD, v, nvalue (car (x)));
4059 4030
4060 s_return (mk_number (SCHEME_A_ v)); 4031 s_return (mk_number (SCHEME_A_ v));
4061 4032
4062 case OP_MUL: /* * */ 4033 case OP_MUL: /* * */
4063 v = num_one; 4034 v = num_one;
4064 4035
4065 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4036 for (x = args; x != NIL; x = cdr (x))
4066 v = num_op ('+', v, nvalue (car (x))); 4037 v = num_op (NUM_MUL, v, nvalue (car (x)));
4067 4038
4068 s_return (mk_number (SCHEME_A_ v)); 4039 s_return (mk_number (SCHEME_A_ v));
4069 4040
4070 case OP_SUB: /* - */ 4041 case OP_SUB: /* - */
4071 if (cdr (SCHEME_V->args) == NIL) 4042 if (cdr (args) == NIL)
4072 { 4043 {
4073 x = SCHEME_V->args; 4044 x = args;
4074 v = num_zero; 4045 v = num_zero;
4075 } 4046 }
4076 else 4047 else
4077 { 4048 {
4078 x = cdr (SCHEME_V->args); 4049 x = cdr (args);
4079 v = nvalue (car (SCHEME_V->args)); 4050 v = nvalue (car (args));
4080 } 4051 }
4081 4052
4082 for (; x != NIL; x = cdr (x)) 4053 for (; x != NIL; x = cdr (x))
4083 v = num_op ('+', v, nvalue (car (x))); 4054 v = num_op (NUM_SUB, v, nvalue (car (x)));
4084 4055
4085 s_return (mk_number (SCHEME_A_ v)); 4056 s_return (mk_number (SCHEME_A_ v));
4086 4057
4087 case OP_DIV: /* / */ 4058 case OP_DIV: /* / */
4088 if (cdr (SCHEME_V->args) == NIL) 4059 if (cdr (args) == NIL)
4089 { 4060 {
4090 x = SCHEME_V->args; 4061 x = args;
4091 v = num_one; 4062 v = num_one;
4092 } 4063 }
4093 else 4064 else
4094 { 4065 {
4095 x = cdr (SCHEME_V->args); 4066 x = cdr (args);
4096 v = nvalue (car (SCHEME_V->args)); 4067 v = nvalue (car (args));
4097 } 4068 }
4098 4069
4099 for (; x != NIL; x = cdr (x)) 4070 for (; x != NIL; x = cdr (x))
4100 {
4101 if (!is_zero_rvalue (rvalue (car (x)))) 4071 if (!is_zero_rvalue (rvalue (car (x))))
4102 v = num_div (v, nvalue (car (x))); 4072 v = num_div (v, nvalue (car (x)));
4103 else 4073 else
4104 Error_0 ("/: division by zero"); 4074 Error_0 ("/: division by zero");
4105 }
4106 4075
4107 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4108 4077
4109 case OP_INTDIV: /* quotient */ 4078 case OP_INTDIV: /* quotient */
4110 if (cdr (SCHEME_V->args) == NIL) 4079 if (cdr (args) == NIL)
4111 { 4080 {
4112 x = SCHEME_V->args; 4081 x = args;
4113 v = num_one; 4082 v = num_one;
4114 } 4083 }
4115 else 4084 else
4116 { 4085 {
4117 x = cdr (SCHEME_V->args); 4086 x = cdr (args);
4118 v = nvalue (car (SCHEME_V->args)); 4087 v = nvalue (car (args));
4119 } 4088 }
4120 4089
4121 for (; x != NIL; x = cdr (x)) 4090 for (; x != NIL; x = cdr (x))
4122 { 4091 {
4123 if (ivalue (car (x)) != 0) 4092 if (ivalue (car (x)) != 0)
4124 v = num_op ('/', v, nvalue (car (x))); 4093 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4125 else 4094 else
4126 Error_0 ("quotient: division by zero"); 4095 Error_0 ("quotient: division by zero");
4127 } 4096 }
4128 4097
4129 s_return (mk_number (SCHEME_A_ v)); 4098 s_return (mk_number (SCHEME_A_ v));
4130 4099
4131 case OP_REM: /* remainder */ 4100 case OP_REM: /* remainder */
4132 v = nvalue (car (SCHEME_V->args)); 4101 v = nvalue (x);
4133 4102
4134 if (ivalue (cadr (SCHEME_V->args)) != 0) 4103 if (ivalue (cadr (args)) != 0)
4135 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4104 v = num_rem (v, nvalue (cadr (args)));
4136 else 4105 else
4137 Error_0 ("remainder: division by zero"); 4106 Error_0 ("remainder: division by zero");
4138 4107
4139 s_return (mk_number (SCHEME_A_ v)); 4108 s_return (mk_number (SCHEME_A_ v));
4140 4109
4141 case OP_MOD: /* modulo */ 4110 case OP_MOD: /* modulo */
4142 v = nvalue (car (SCHEME_V->args)); 4111 v = nvalue (x);
4143 4112
4144 if (ivalue (cadr (SCHEME_V->args)) != 0) 4113 if (ivalue (cadr (args)) != 0)
4145 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4114 v = num_mod (v, nvalue (cadr (args)));
4146 else 4115 else
4147 Error_0 ("modulo: division by zero"); 4116 Error_0 ("modulo: division by zero");
4148 4117
4149 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4150 4119
4151 case OP_CAR: /* car */ 4120 case OP_CAR: /* car */
4152 s_return (caar (SCHEME_V->args)); 4121 s_return (caar (args));
4153 4122
4154 case OP_CDR: /* cdr */ 4123 case OP_CDR: /* cdr */
4155 s_return (cdar (SCHEME_V->args)); 4124 s_return (cdar (args));
4156 4125
4157 case OP_CONS: /* cons */ 4126 case OP_CONS: /* cons */
4158 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4127 set_cdr (args, cadr (args));
4159 s_return (SCHEME_V->args); 4128 s_return (args);
4160 4129
4161 case OP_SETCAR: /* set-car! */ 4130 case OP_SETCAR: /* set-car! */
4162 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4163 { 4132 {
4164 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_car (x, cadr (args));
4165 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4166 } 4135 }
4167 else 4136 else
4168 Error_0 ("set-car!: unable to alter immutable pair"); 4137 Error_0 ("set-car!: unable to alter immutable pair");
4169 4138
4170 case OP_SETCDR: /* set-cdr! */ 4139 case OP_SETCDR: /* set-cdr! */
4171 if (!is_immutable (car (SCHEME_V->args))) 4140 if (!is_immutable (x))
4172 { 4141 {
4173 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4142 set_cdr (x, cadr (args));
4174 s_return (car (SCHEME_V->args)); 4143 s_return (car (args));
4175 } 4144 }
4176 else 4145 else
4177 Error_0 ("set-cdr!: unable to alter immutable pair"); 4146 Error_0 ("set-cdr!: unable to alter immutable pair");
4178 4147
4179 case OP_CHAR2INT: /* char->integer */ 4148 case OP_CHAR2INT: /* char->integer */
4180 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4149 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4181 4150
4182 case OP_INT2CHAR: /* integer->char */ 4151 case OP_INT2CHAR: /* integer->char */
4183 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4152 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4184 4153
4185 case OP_CHARUPCASE: 4154 case OP_CHARUPCASE:
4186 { 4155 {
4187 unsigned char c = ivalue (car (SCHEME_V->args)); 4156 unsigned char c = ivalue_unchecked (x);
4188 c = toupper (c); 4157 c = toupper (c);
4189 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4190 } 4159 }
4191 4160
4192 case OP_CHARDNCASE: 4161 case OP_CHARDNCASE:
4193 { 4162 {
4194 unsigned char c = ivalue (car (SCHEME_V->args)); 4163 unsigned char c = ivalue_unchecked (x);
4195 c = tolower (c); 4164 c = tolower (c);
4196 s_return (mk_character (SCHEME_A_ c)); 4165 s_return (mk_character (SCHEME_A_ c));
4197 } 4166 }
4198 4167
4199 case OP_STR2SYM: /* string->symbol */ 4168 case OP_STR2SYM: /* string->symbol */
4200 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4169 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4201 4170
4202 case OP_STR2ATOM: /* string->atom */ 4171 case OP_STR2ATOM: /* string->atom */
4203 { 4172 {
4204 char *s = strvalue (car (SCHEME_V->args)); 4173 char *s = strvalue (x);
4205 long pf = 0; 4174 long pf = 0;
4206 4175
4207 if (cdr (SCHEME_V->args) != NIL) 4176 if (cdr (args) != NIL)
4208 { 4177 {
4209 /* we know cadr(SCHEME_V->args) is a natural number */ 4178 /* we know cadr(args) is a natural number */
4210 /* see if it is 2, 8, 10, or 16, or error */ 4179 /* see if it is 2, 8, 10, or 16, or error */
4211 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4180 pf = ivalue_unchecked (cadr (args));
4212 4181
4213 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4182 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4214 { 4183 {
4215 /* base is OK */ 4184 /* base is OK */
4216 } 4185 }
4217 else 4186 else
4218 pf = -1; 4187 pf = -1;
4219 } 4188 }
4220 4189
4221 if (pf < 0) 4190 if (pf < 0)
4222 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4191 Error_1 ("string->atom: bad base:", cadr (args));
4223 else if (*s == '#') /* no use of base! */ 4192 else if (*s == '#') /* no use of base! */
4224 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4193 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4225 else 4194 else
4226 { 4195 {
4227 if (pf == 0 || pf == 10) 4196 if (pf == 0 || pf == 10)
… …
4238 } 4207 }
4239 } 4208 }
4240 } 4209 }
4241 4210
4242 case OP_SYM2STR: /* symbol->string */ 4211 case OP_SYM2STR: /* symbol->string */
4243 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4212 x = mk_string (SCHEME_A_ symname (x));
4244 setimmutable (x); 4213 setimmutable (x);
4245 s_return (x); 4214 s_return (x);
4246 4215
4247 case OP_ATOM2STR: /* atom->string */ 4216 case OP_ATOM2STR: /* atom->string */
4248 { 4217 {
4249 long pf = 0; 4218 long pf = 0;
4250 4219
4251 x = car (SCHEME_V->args);
4252
4253 if (cdr (SCHEME_V->args) != NIL) 4220 if (cdr (args) != NIL)
4254 { 4221 {
4255 /* we know cadr(SCHEME_V->args) is a natural number */ 4222 /* we know cadr(args) is a natural number */
4256 /* see if it is 2, 8, 10, or 16, or error */ 4223 /* see if it is 2, 8, 10, or 16, or error */
4257 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4224 pf = ivalue_unchecked (cadr (args));
4258 4225
4259 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4226 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4260 { 4227 {
4261 /* base is OK */ 4228 /* base is OK */
4262 } 4229 }
4263 else 4230 else
4264 pf = -1; 4231 pf = -1;
4265 } 4232 }
4266 4233
4267 if (pf < 0) 4234 if (pf < 0)
4268 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4235 Error_1 ("atom->string: bad base:", cadr (args));
4269 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4236 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4270 { 4237 {
4271 char *p; 4238 char *p;
4272 int len; 4239 int len;
4273 4240
… …
4278 Error_1 ("atom->string: not an atom:", x); 4245 Error_1 ("atom->string: not an atom:", x);
4279 } 4246 }
4280 4247
4281 case OP_MKSTRING: /* make-string */ 4248 case OP_MKSTRING: /* make-string */
4282 { 4249 {
4283 int fill = ' '; 4250 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4284 int len; 4251 int len = ivalue_unchecked (x);
4285 4252
4286 len = ivalue (car (SCHEME_V->args));
4287
4288 if (cdr (SCHEME_V->args) != NIL)
4289 fill = charvalue (cadr (SCHEME_V->args));
4290
4291 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4292 } 4254 }
4293 4255
4294 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4295 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4296 4258
4297 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4298 { 4260 {
4299 char *str; 4261 char *str = strvalue (x);
4300 int index;
4301
4302 str = strvalue (car (SCHEME_V->args));
4303
4304 index = ivalue (cadr (SCHEME_V->args)); 4262 int index = ivalue_unchecked (cadr (args));
4305 4263
4306 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4307 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4308 4266
4309 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4310 } 4268 }
4311 4269
4312 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4313 { 4271 {
4314 char *str; 4272 char *str = strvalue (x);
4315 int index; 4273 int index = ivalue_unchecked (cadr (args));
4316 int c; 4274 int c;
4317 4275
4318 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4319 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4320 4278
4321 str = strvalue (car (SCHEME_V->args));
4322
4323 index = ivalue (cadr (SCHEME_V->args));
4324
4325 if (index >= strlength (car (SCHEME_V->args))) 4279 if (index >= strlength (x))
4326 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4280 Error_1 ("string-set!: out of bounds:", cadr (args));
4327 4281
4328 c = charvalue (caddr (SCHEME_V->args)); 4282 c = charvalue (caddr (args));
4329 4283
4330 str[index] = (char) c; 4284 str[index] = c;
4331 s_return (car (SCHEME_V->args)); 4285 s_return (car (args));
4332 } 4286 }
4333 4287
4334 case OP_STRAPPEND: /* string-append */ 4288 case OP_STRAPPEND: /* string-append */
4335 { 4289 {
4336 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4290 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4337 int len = 0; 4291 int len = 0;
4338 pointer newstr; 4292 pointer newstr;
4339 char *pos; 4293 char *pos;
4340 4294
4341 /* compute needed length for new string */ 4295 /* compute needed length for new string */
4342 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4296 for (x = args; x != NIL; x = cdr (x))
4343 len += strlength (car (x)); 4297 len += strlength (car (x));
4344 4298
4345 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4299 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4346 4300
4347 /* store the contents of the argument strings into the new string */ 4301 /* store the contents of the argument strings into the new string */
4348 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4302 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4349 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4303 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4350 4304
4351 s_return (newstr); 4305 s_return (newstr);
4352 } 4306 }
4353 4307
4354 case OP_SUBSTR: /* substring */ 4308 case OP_SUBSTR: /* substring */
4355 { 4309 {
4356 char *str; 4310 char *str = strvalue (x);
4357 int index0; 4311 int index0 = ivalue_unchecked (cadr (args));
4358 int index1; 4312 int index1;
4359 int len; 4313 int len;
4360 4314
4361 str = strvalue (car (SCHEME_V->args));
4362
4363 index0 = ivalue (cadr (SCHEME_V->args));
4364
4365 if (index0 > strlength (car (SCHEME_V->args))) 4315 if (index0 > strlength (x))
4366 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4316 Error_1 ("substring: start out of bounds:", cadr (args));
4367 4317
4368 if (cddr (SCHEME_V->args) != NIL) 4318 if (cddr (args) != NIL)
4369 { 4319 {
4370 index1 = ivalue (caddr (SCHEME_V->args)); 4320 index1 = ivalue_unchecked (caddr (args));
4371 4321
4372 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4322 if (index1 > strlength (x) || index1 < index0)
4373 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4323 Error_1 ("substring: end out of bounds:", caddr (args));
4374 } 4324 }
4375 else 4325 else
4376 index1 = strlength (car (SCHEME_V->args)); 4326 index1 = strlength (x);
4377 4327
4378 len = index1 - index0; 4328 len = index1 - index0;
4379 x = mk_empty_string (SCHEME_A_ len, ' '); 4329 x = mk_empty_string (SCHEME_A_ len, ' ');
4380 memcpy (strvalue (x), str + index0, len); 4330 memcpy (strvalue (x), str + index0, len);
4381 strvalue (x)[len] = 0; 4331 strvalue (x)[len] = 0;
… …
4385 4335
4386 case OP_VECTOR: /* vector */ 4336 case OP_VECTOR: /* vector */
4387 { 4337 {
4388 int i; 4338 int i;
4389 pointer vec; 4339 pointer vec;
4390 int len = list_length (SCHEME_A_ SCHEME_V->args); 4340 int len = list_length (SCHEME_A_ args);
4391 4341
4392 if (len < 0) 4342 if (len < 0)
4393 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4343 Error_1 ("vector: not a proper list:", args);
4394 4344
4395 vec = mk_vector (SCHEME_A_ len); 4345 vec = mk_vector (SCHEME_A_ len);
4396 4346
4397#if USE_ERROR_CHECKING 4347#if USE_ERROR_CHECKING
4398 if (SCHEME_V->no_memory) 4348 if (SCHEME_V->no_memory)
4399 s_return (S_SINK); 4349 s_return (S_SINK);
4400#endif 4350#endif
4401 4351
4402 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4352 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4403 set_vector_elem (vec, i, car (x)); 4353 vector_set (vec, i, car (x));
4404 4354
4405 s_return (vec); 4355 s_return (vec);
4406 } 4356 }
4407 4357
4408 case OP_MKVECTOR: /* make-vector */ 4358 case OP_MKVECTOR: /* make-vector */
4409 { 4359 {
4410 pointer fill = NIL; 4360 pointer fill = NIL;
4411 int len;
4412 pointer vec; 4361 pointer vec;
4362 int len = ivalue_unchecked (x);
4413 4363
4414 len = ivalue (car (SCHEME_V->args));
4415
4416 if (cdr (SCHEME_V->args) != NIL) 4364 if (cdr (args) != NIL)
4417 fill = cadr (SCHEME_V->args); 4365 fill = cadr (args);
4418 4366
4419 vec = mk_vector (SCHEME_A_ len); 4367 vec = mk_vector (SCHEME_A_ len);
4420 4368
4421#if USE_ERROR_CHECKING 4369#if USE_ERROR_CHECKING
4422 if (SCHEME_V->no_memory) 4370 if (SCHEME_V->no_memory)
4423 s_return (S_SINK); 4371 s_return (S_SINK);
4424#endif 4372#endif
4425 4373
4426 if (fill != NIL) 4374 if (fill != NIL)
4427 fill_vector (vec, fill); 4375 fill_vector (vec, 0, fill);
4428 4376
4429 s_return (vec); 4377 s_return (vec);
4430 } 4378 }
4431 4379
4432 case OP_VECLEN: /* vector-length */ 4380 case OP_VECLEN: /* vector-length */
4433 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4381 s_return (mk_integer (SCHEME_A_ veclength (x)));
4434 4382
4435 case OP_VECREF: /* vector-ref */ 4383 case OP_VECREF: /* vector-ref */
4436 { 4384 {
4437 int index;
4438
4439 index = ivalue (cadr (SCHEME_V->args)); 4385 int index = ivalue_unchecked (cadr (args));
4440 4386
4441 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4442 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4388 Error_1 ("vector-ref: out of bounds:", cadr (args));
4443 4389
4444 s_return (vector_elem (car (SCHEME_V->args), index)); 4390 s_return (vector_get (x, index));
4445 } 4391 }
4446 4392
4447 case OP_VECSET: /* vector-set! */ 4393 case OP_VECSET: /* vector-set! */
4448 { 4394 {
4449 int index; 4395 int index = ivalue_unchecked (cadr (args));
4450 4396
4451 if (is_immutable (car (SCHEME_V->args))) 4397 if (is_immutable (x))
4452 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4398 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4453 4399
4454 index = ivalue (cadr (SCHEME_V->args));
4455
4456 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4457 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-set!: out of bounds:", cadr (args));
4458 4402
4459 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4403 vector_set (x, index, caddr (args));
4460 s_return (car (SCHEME_V->args)); 4404 s_return (x);
4461 } 4405 }
4462 } 4406 }
4463 4407
4464 return S_T; 4408 if (USE_ERROR_CHECKING) abort ();
4465} 4409}
4466 4410
4467INTERFACE int
4468is_list (SCHEME_P_ pointer a)
4469{
4470 return list_length (SCHEME_A_ a) >= 0;
4471}
4472
4473/* Result is:
4474 proper list: length
4475 circular list: -1
4476 not even a pair: -2
4477 dotted list: -2 minus length before dot
4478*/
4479INTERFACE int
4480list_length (SCHEME_P_ pointer a)
4481{
4482 int i = 0;
4483 pointer slow, fast;
4484
4485 slow = fast = a;
4486
4487 while (1)
4488 {
4489 if (fast == NIL)
4490 return i;
4491
4492 if (!is_pair (fast))
4493 return -2 - i;
4494
4495 fast = cdr (fast);
4496 ++i;
4497
4498 if (fast == NIL)
4499 return i;
4500
4501 if (!is_pair (fast))
4502 return -2 - i;
4503
4504 ++i;
4505 fast = cdr (fast);
4506
4507 /* Safe because we would have already returned if `fast'
4508 encountered a non-pair. */
4509 slow = cdr (slow);
4510
4511 if (fast == slow)
4512 {
4513 /* the fast pointer has looped back around and caught up
4514 with the slow pointer, hence the structure is circular,
4515 not of finite length, and therefore not a list */
4516 return -1;
4517 }
4518 }
4519}
4520
4521static pointer 4411static int
4522opexe_r (SCHEME_P_ enum scheme_opcodes op) 4412opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4413{
4524 pointer x = SCHEME_V->args; 4414 pointer x = SCHEME_V->args;
4525 4415
4526 for (;;) 4416 for (;;)
4527 { 4417 {
… …
4547 } 4437 }
4548 4438
4549 s_return (S_T); 4439 s_return (S_T);
4550} 4440}
4551 4441
4552static pointer 4442static int
4553opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4443opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4554{ 4444{
4555 pointer x = SCHEME_V->args; 4445 pointer args = SCHEME_V->args;
4556 pointer a = car (x); 4446 pointer a = car (args);
4557 pointer d = cdr (x); 4447 pointer d = cdr (args);
4558 int r; 4448 int r;
4559 4449
4560 switch (op) 4450 switch (op)
4561 { 4451 {
4562 case OP_NOT: /* not */ 4452 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 r = is_false (a); break; 4453 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4564 4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4565 case OP_BOOLP: /* boolean? */ 4455 case OP_NULLP: /* null? */ r = a == NIL ; break;
4566 r = a == S_F || a == S_T; break; 4456 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4567 4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4568 case OP_EOFOBJP: /* eof-object? */ 4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4569 r = a == S_EOF; break; 4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4570 4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4571 case OP_NULLP: /* null? */ 4461 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4572 r = a == NIL; break;
4573
4574 case OP_SYMBOLP: /* symbol? */
4575 r = is_symbol (a); break;
4576
4577 case OP_NUMBERP: /* number? */
4578 r = is_number (a); break;
4579
4580 case OP_STRINGP: /* string? */
4581 r = is_string (a); break;
4582
4583 case OP_INTEGERP: /* integer? */
4584 r = is_integer (a); break;
4585
4586 case OP_REALP: /* real? */
4587 r = is_number (a); break; /* all numbers are real */
4588
4589 case OP_CHARP: /* char? */
4590 r = is_character (a); break;
4591 4462
4592#if USE_CHAR_CLASSIFIERS 4463#if USE_CHAR_CLASSIFIERS
4593 case OP_CHARAP: /* char-alphabetic? */ 4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4594 r = Cisalpha (ivalue (a)); break; 4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4595 4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4596 case OP_CHARNP: /* char-numeric? */ 4467 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4597 r = Cisdigit (ivalue (a)); break; 4468 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4598
4599 case OP_CHARWP: /* char-whitespace? */
4600 r = Cisspace (ivalue (a)); break;
4601
4602 case OP_CHARUP: /* char-upper-case? */
4603 r = Cisupper (ivalue (a)); break;
4604
4605 case OP_CHARLP: /* char-lower-case? */
4606 r = Cislower (ivalue (a)); break;
4607#endif 4469#endif
4608 4470
4609#if USE_PORTS 4471#if USE_PORTS
4610 case OP_PORTP: /* port? */ 4472 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4611 r = is_port (a); break;
4612
4613 case OP_INPORTP: /* input-port? */ 4473 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4614 r = is_inport (a); break;
4615
4616 case OP_OUTPORTP: /* output-port? */ 4474 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4617 r = is_outport (a); break;
4618#endif 4475#endif
4619 4476
4620 case OP_PROCP: /* procedure? */ 4477 case OP_PROCP: /* procedure? */
4621 4478
4622 /*-- 4479 /*--
… …
4625 * in R^3 report sec. 6.9 4482 * in R^3 report sec. 6.9
4626 */ 4483 */
4627 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a); 4484 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4628 break; 4485 break;
4629 4486
4630 case OP_PAIRP: /* pair? */ 4487 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4631 r = is_pair (a); break; 4488 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4632 4489 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4633 case OP_LISTP: /* list? */ 4490 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4634 r = list_length (SCHEME_A_ a) >= 0; break; 4491 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4635 4492 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4636 case OP_ENVP: /* environment? */
4637 r = is_environment (a); break;
4638
4639 case OP_VECTORP: /* vector? */
4640 r = is_vector (a); break;
4641
4642 case OP_EQ: /* eq? */
4643 r = a == cadr (x); break;
4644
4645 case OP_EQV: /* eqv? */
4646 r = eqv (a, cadr (x)); break;
4647 } 4493 }
4648 4494
4649 s_retbool (r); 4495 s_retbool (r);
4650} 4496}
4651 4497
4652static pointer 4498static int
4653opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4654{ 4500{
4501 pointer args = SCHEME_V->args;
4502 pointer a = car (args);
4655 pointer x, y; 4503 pointer x, y;
4656 4504
4657 switch (op) 4505 switch (op)
4658 { 4506 {
4659 case OP_FORCE: /* force */ 4507 case OP_FORCE: /* force */
4660 SCHEME_V->code = car (SCHEME_V->args); 4508 SCHEME_V->code = a;
4661 4509
4662 if (is_promise (SCHEME_V->code)) 4510 if (is_promise (SCHEME_V->code))
4663 { 4511 {
4664 /* Should change type to closure here */ 4512 /* Should change type to closure here */
4665 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4513 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4686 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4534 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4687 SCHEME_V->outport = cadr (SCHEME_V->args); 4535 SCHEME_V->outport = cadr (SCHEME_V->args);
4688 } 4536 }
4689 } 4537 }
4690 4538
4691 SCHEME_V->args = car (SCHEME_V->args); 4539 SCHEME_V->args = a;
4692 4540
4693 if (op == OP_WRITE) 4541 if (op == OP_WRITE)
4694 SCHEME_V->print_flag = 1; 4542 SCHEME_V->print_flag = 1;
4695 else 4543 else
4696 SCHEME_V->print_flag = 0; 4544 SCHEME_V->print_flag = 0;
4697 4545
4698 s_goto (OP_P0LIST); 4546 s_goto (OP_P0LIST);
4699 4547
4700 case OP_NEWLINE: /* newline */ 4548 case OP_NEWLINE: /* newline */
4701 if (is_pair (SCHEME_V->args)) 4549 if (is_pair (args))
4702 { 4550 {
4703 if (car (SCHEME_V->args) != SCHEME_V->outport) 4551 if (a != SCHEME_V->outport)
4704 { 4552 {
4705 x = cons (SCHEME_V->outport, NIL); 4553 x = cons (SCHEME_V->outport, NIL);
4706 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4554 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4707 SCHEME_V->outport = car (SCHEME_V->args); 4555 SCHEME_V->outport = a;
4708 } 4556 }
4709 } 4557 }
4710 4558
4711 putstr (SCHEME_A_ "\n"); 4559 putstr (SCHEME_A_ "\n");
4712 s_return (S_T); 4560 s_return (S_T);
4713#endif 4561#endif
4714 4562
4715 case OP_ERR0: /* error */ 4563 case OP_ERR0: /* error */
4716 SCHEME_V->retcode = -1; 4564 SCHEME_V->retcode = -1;
4717 4565
4718 if (!is_string (car (SCHEME_V->args))) 4566 if (!is_string (a))
4719 { 4567 {
4720 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4568 args = cons (mk_string (SCHEME_A_ " -- "), args);
4721 setimmutable (car (SCHEME_V->args)); 4569 setimmutable (car (args));
4722 } 4570 }
4723 4571
4724 putstr (SCHEME_A_ "Error: "); 4572 putstr (SCHEME_A_ "Error: ");
4725 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4573 putstr (SCHEME_A_ strvalue (car (args)));
4726 SCHEME_V->args = cdr (SCHEME_V->args); 4574 SCHEME_V->args = cdr (args);
4727 s_goto (OP_ERR1); 4575 s_goto (OP_ERR1);
4728 4576
4729 case OP_ERR1: /* error */ 4577 case OP_ERR1: /* error */
4730 putstr (SCHEME_A_ " "); 4578 putstr (SCHEME_A_ " ");
4731 4579
4732 if (SCHEME_V->args != NIL) 4580 if (args != NIL)
4733 { 4581 {
4734 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4582 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4735 SCHEME_V->args = car (SCHEME_V->args); 4583 SCHEME_V->args = a;
4736 SCHEME_V->print_flag = 1; 4584 SCHEME_V->print_flag = 1;
4737 s_goto (OP_P0LIST); 4585 s_goto (OP_P0LIST);
4738 } 4586 }
4739 else 4587 else
4740 { 4588 {
4741 putstr (SCHEME_A_ "\n"); 4589 putstr (SCHEME_A_ "\n");
4742 4590
4743 if (SCHEME_V->interactive_repl) 4591 if (SCHEME_V->interactive_repl)
4744 s_goto (OP_T0LVL); 4592 s_goto (OP_T0LVL);
4745 else 4593 else
4746 return NIL; 4594 return -1;
4747 } 4595 }
4748 4596
4749 case OP_REVERSE: /* reverse */ 4597 case OP_REVERSE: /* reverse */
4750 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4598 s_return (reverse (SCHEME_A_ a));
4751 4599
4752 case OP_LIST_STAR: /* list* */ 4600 case OP_LIST_STAR: /* list* */
4753 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4601 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4754 4602
4755 case OP_APPEND: /* append */ 4603 case OP_APPEND: /* append */
4756 x = NIL; 4604 x = NIL;
4757 y = SCHEME_V->args; 4605 y = args;
4758 4606
4759 if (y == x) 4607 if (y == x)
4760 s_return (x); 4608 s_return (x);
4761 4609
4762 /* cdr() in the while condition is not a typo. If car() */ 4610 /* cdr() in the while condition is not a typo. If car() */
… …
4773 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4621 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4774 4622
4775#if USE_PLIST 4623#if USE_PLIST
4776 4624
4777 case OP_PUT: /* put */ 4625 case OP_PUT: /* put */
4778 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4626 if (!hasprop (a) || !hasprop (cadr (args)))
4779 Error_0 ("illegal use of put"); 4627 Error_0 ("illegal use of put");
4780 4628
4781 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4629 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4782 { 4630 {
4783 if (caar (x) == y) 4631 if (caar (x) == y)
4784 break; 4632 break;
4785 } 4633 }
4786 4634
4787 if (x != NIL) 4635 if (x != NIL)
4788 cdar (x) = caddr (SCHEME_V->args); 4636 cdar (x) = caddr (args);
4789 else 4637 else
4790 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4638 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4791 4639
4792 s_return (S_T); 4640 s_return (S_T);
4793 4641
4794 case OP_GET: /* get */ 4642 case OP_GET: /* get */
4795 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4643 if (!hasprop (a) || !hasprop (cadr (args)))
4796 Error_0 ("illegal use of get"); 4644 Error_0 ("illegal use of get");
4797 4645
4798 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4646 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4799 if (caar (x) == y) 4647 if (caar (x) == y)
4800 break; 4648 break;
4801 4649
4802 if (x != NIL) 4650 if (x != NIL)
4803 s_return (cdar (x)); 4651 s_return (cdar (x));
… …
4805 s_return (NIL); 4653 s_return (NIL);
4806 4654
4807#endif /* USE_PLIST */ 4655#endif /* USE_PLIST */
4808 4656
4809 case OP_QUIT: /* quit */ 4657 case OP_QUIT: /* quit */
4810 if (is_pair (SCHEME_V->args)) 4658 if (is_pair (args))
4811 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4659 SCHEME_V->retcode = ivalue (a);
4812 4660
4813 return NIL; 4661 return -1;
4814 4662
4815 case OP_GC: /* gc */ 4663 case OP_GC: /* gc */
4816 gc (SCHEME_A_ NIL, NIL); 4664 gc (SCHEME_A_ NIL, NIL);
4817 s_return (S_T); 4665 s_return (S_T);
4818 4666
4819 case OP_GCVERB: /* gc-verbose */ 4667 case OP_GCVERB: /* gc-verbose */
4820 { 4668 {
4821 int was = SCHEME_V->gc_verbose; 4669 int was = SCHEME_V->gc_verbose;
4822 4670
4823 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4671 SCHEME_V->gc_verbose = (a != S_F);
4824 s_retbool (was); 4672 s_retbool (was);
4825 } 4673 }
4826 4674
4827 case OP_NEWSEGMENT: /* new-segment */ 4675 case OP_NEWSEGMENT: /* new-segment */
4828 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4676 if (!is_pair (args) || !is_number (a))
4829 Error_0 ("new-segment: argument must be a number"); 4677 Error_0 ("new-segment: argument must be a number");
4830 4678
4831 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4679 alloc_cellseg (SCHEME_A_ ivalue (a));
4832 4680
4833 s_return (S_T); 4681 s_return (S_T);
4834 4682
4835 case OP_OBLIST: /* oblist */ 4683 case OP_OBLIST: /* oblist */
4836 s_return (oblist_all_symbols (SCHEME_A)); 4684 s_return (oblist_all_symbols (SCHEME_A));
… …
4863 case OP_OPEN_INOUTFILE: 4711 case OP_OPEN_INOUTFILE:
4864 prop = port_input | port_output; 4712 prop = port_input | port_output;
4865 break; 4713 break;
4866 } 4714 }
4867 4715
4868 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4716 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4869 4717
4870 if (p == NIL) 4718 s_return (p == NIL ? S_F : p);
4871 s_return (S_F);
4872
4873 s_return (p);
4874 } 4719 }
4875 4720
4876# if USE_STRING_PORTS 4721# if USE_STRING_PORTS
4877 4722
4878 case OP_OPEN_INSTRING: /* open-input-string */ 4723 case OP_OPEN_INSTRING: /* open-input-string */
… …
4890 case OP_OPEN_INOUTSTRING: 4735 case OP_OPEN_INOUTSTRING:
4891 prop = port_input | port_output; 4736 prop = port_input | port_output;
4892 break; 4737 break;
4893 } 4738 }
4894 4739
4895 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4740 p = port_from_string (SCHEME_A_ strvalue (a),
4896 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4741 strvalue (a) + strlength (a), prop);
4897 4742
4898 if (p == NIL) 4743 s_return (p == NIL ? S_F : p);
4899 s_return (S_F);
4900
4901 s_return (p);
4902 } 4744 }
4903 4745
4904 case OP_OPEN_OUTSTRING: /* open-output-string */ 4746 case OP_OPEN_OUTSTRING: /* open-output-string */
4905 { 4747 {
4906 pointer p; 4748 pointer p;
4907 4749
4908 if (car (SCHEME_V->args) == NIL) 4750 if (a == NIL)
4909 {
4910 p = port_from_scratch (SCHEME_A); 4751 p = port_from_scratch (SCHEME_A);
4911
4912 if (p == NIL)
4913 s_return (S_F);
4914 }
4915 else 4752 else
4916 {
4917 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4918 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4754 strvalue (a) + strlength (a), port_output);
4919 4755
4920 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4921 s_return (S_F);
4922 }
4923
4924 s_return (p);
4925 } 4757 }
4926 4758
4927 case OP_GET_OUTSTRING: /* get-output-string */ 4759 case OP_GET_OUTSTRING: /* get-output-string */
4928 { 4760 {
4929 port *p; 4761 port *p;
4930 4762
4931 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4763 if ((p = a->object.port)->kind & port_string)
4932 { 4764 {
4933 off_t size; 4765 off_t size;
4934 char *str; 4766 char *str;
4935 4767
4936 size = p->rep.string.curr - p->rep.string.start + 1; 4768 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4952 } 4784 }
4953 4785
4954# endif 4786# endif
4955 4787
4956 case OP_CLOSE_INPORT: /* close-input-port */ 4788 case OP_CLOSE_INPORT: /* close-input-port */
4957 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4789 port_close (SCHEME_A_ a, port_input);
4958 s_return (S_T); 4790 s_return (S_T);
4959 4791
4960 case OP_CLOSE_OUTPORT: /* close-output-port */ 4792 case OP_CLOSE_OUTPORT: /* close-output-port */
4961 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4793 port_close (SCHEME_A_ a, port_output);
4962 s_return (S_T); 4794 s_return (S_T);
4963#endif 4795#endif
4964 4796
4965 case OP_INT_ENV: /* interaction-environment */ 4797 case OP_INT_ENV: /* interaction-environment */
4966 s_return (SCHEME_V->global_env); 4798 s_return (SCHEME_V->global_env);
… …
4968 case OP_CURR_ENV: /* current-environment */ 4800 case OP_CURR_ENV: /* current-environment */
4969 s_return (SCHEME_V->envir); 4801 s_return (SCHEME_V->envir);
4970 4802
4971 } 4803 }
4972 4804
4973 abort (); 4805 if (USE_ERROR_CHECKING) abort ();
4974} 4806}
4975 4807
4976static pointer 4808static int
4977opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4809opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4978{ 4810{
4811 pointer args = SCHEME_V->args;
4979 pointer x; 4812 pointer x;
4980 4813
4981 if (SCHEME_V->nesting != 0) 4814 if (SCHEME_V->nesting != 0)
4982 { 4815 {
4983 int n = SCHEME_V->nesting; 4816 int n = SCHEME_V->nesting;
… …
4990 switch (op) 4823 switch (op)
4991 { 4824 {
4992 /* ========== reading part ========== */ 4825 /* ========== reading part ========== */
4993#if USE_PORTS 4826#if USE_PORTS
4994 case OP_READ: 4827 case OP_READ:
4995 if (!is_pair (SCHEME_V->args)) 4828 if (!is_pair (args))
4996 s_goto (OP_READ_INTERNAL); 4829 s_goto (OP_READ_INTERNAL);
4997 4830
4998 if (!is_inport (car (SCHEME_V->args))) 4831 if (!is_inport (car (args)))
4999 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4832 Error_1 ("read: not an input port:", car (args));
5000 4833
5001 if (car (SCHEME_V->args) == SCHEME_V->inport) 4834 if (car (args) == SCHEME_V->inport)
5002 s_goto (OP_READ_INTERNAL); 4835 s_goto (OP_READ_INTERNAL);
5003 4836
5004 x = SCHEME_V->inport; 4837 x = SCHEME_V->inport;
5005 SCHEME_V->inport = car (SCHEME_V->args); 4838 SCHEME_V->inport = car (args);
5006 x = cons (x, NIL); 4839 x = cons (x, NIL);
5007 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4840 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5008 s_goto (OP_READ_INTERNAL); 4841 s_goto (OP_READ_INTERNAL);
5009 4842
5010 case OP_READ_CHAR: /* read-char */ 4843 case OP_READ_CHAR: /* read-char */
5011 case OP_PEEK_CHAR: /* peek-char */ 4844 case OP_PEEK_CHAR: /* peek-char */
5012 { 4845 {
5013 int c; 4846 int c;
5014 4847
5015 if (is_pair (SCHEME_V->args)) 4848 if (is_pair (args))
5016 { 4849 {
5017 if (car (SCHEME_V->args) != SCHEME_V->inport) 4850 if (car (args) != SCHEME_V->inport)
5018 { 4851 {
5019 x = SCHEME_V->inport; 4852 x = SCHEME_V->inport;
5020 x = cons (x, NIL); 4853 x = cons (x, NIL);
5021 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4854 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5022 SCHEME_V->inport = car (SCHEME_V->args); 4855 SCHEME_V->inport = car (args);
5023 } 4856 }
5024 } 4857 }
5025 4858
5026 c = inchar (SCHEME_A); 4859 c = inchar (SCHEME_A);
5027 4860
… …
5037 case OP_CHAR_READY: /* char-ready? */ 4870 case OP_CHAR_READY: /* char-ready? */
5038 { 4871 {
5039 pointer p = SCHEME_V->inport; 4872 pointer p = SCHEME_V->inport;
5040 int res; 4873 int res;
5041 4874
5042 if (is_pair (SCHEME_V->args)) 4875 if (is_pair (args))
5043 p = car (SCHEME_V->args); 4876 p = car (args);
5044 4877
5045 res = p->object.port->kind & port_string; 4878 res = p->object.port->kind & port_string;
5046 4879
5047 s_retbool (res); 4880 s_retbool (res);
5048 } 4881 }
5049 4882
5050 case OP_SET_INPORT: /* set-input-port */ 4883 case OP_SET_INPORT: /* set-input-port */
5051 SCHEME_V->inport = car (SCHEME_V->args); 4884 SCHEME_V->inport = car (args);
5052 s_return (SCHEME_V->value); 4885 s_return (SCHEME_V->value);
5053 4886
5054 case OP_SET_OUTPORT: /* set-output-port */ 4887 case OP_SET_OUTPORT: /* set-output-port */
5055 SCHEME_V->outport = car (SCHEME_V->args); 4888 SCHEME_V->outport = car (args);
5056 s_return (SCHEME_V->value); 4889 s_return (SCHEME_V->value);
5057#endif 4890#endif
5058 4891
5059 case OP_RDSEXPR: 4892 case OP_RDSEXPR:
5060 switch (SCHEME_V->tok) 4893 switch (SCHEME_V->tok)
… …
5109 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4942 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5110 SCHEME_V->tok = token (SCHEME_A); 4943 SCHEME_V->tok = token (SCHEME_A);
5111 s_goto (OP_RDSEXPR); 4944 s_goto (OP_RDSEXPR);
5112 4945
5113 case TOK_ATOM: 4946 case TOK_ATOM:
5114 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948
4949 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5115 4952
5116 case TOK_DQUOTE: 4953 case TOK_DQUOTE:
5117 x = readstrexp (SCHEME_A); 4954 x = readstrexp (SCHEME_A_ '"');
5118 4955
5119 if (x == S_F) 4956 if (x == S_F)
5120 Error_0 ("Error reading string"); 4957 Error_0 ("Error reading string");
5121 4958
5122 setimmutable (x); 4959 setimmutable (x);
… …
5134 s_goto (OP_EVAL); 4971 s_goto (OP_EVAL);
5135 } 4972 }
5136 } 4973 }
5137 4974
5138 case TOK_SHARP_CONST: 4975 case TOK_SHARP_CONST:
5139 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4976 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5140 Error_0 ("undefined sharp expression"); 4977 Error_0 ("undefined sharp expression");
5141 else 4978 else
5142 s_return (x); 4979 s_return (x);
5143 4980
5144 default: 4981 default:
… …
5146 } 4983 }
5147 4984
5148 break; 4985 break;
5149 4986
5150 case OP_RDLIST: 4987 case OP_RDLIST:
5151 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4988 SCHEME_V->args = cons (SCHEME_V->value, args);
5152 SCHEME_V->tok = token (SCHEME_A); 4989 SCHEME_V->tok = token (SCHEME_A);
5153 4990
5154 switch (SCHEME_V->tok) 4991 switch (SCHEME_V->tok)
5155 { 4992 {
5156 case TOK_EOF: 4993 case TOK_EOF:
… …
5184 case OP_RDDOT: 5021 case OP_RDDOT:
5185 if (token (SCHEME_A) != TOK_RPAREN) 5022 if (token (SCHEME_A) != TOK_RPAREN)
5186 Error_0 ("syntax error: illegal dot expression"); 5023 Error_0 ("syntax error: illegal dot expression");
5187 5024
5188 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5025 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5189 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5026 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5190 5027
5191 case OP_RDQUOTE: 5028 case OP_RDQUOTE:
5192 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5029 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5193 5030
5194 case OP_RDQQUOTE: 5031 case OP_RDQQUOTE:
… …
5216 SCHEME_V->args = SCHEME_V->value; 5053 SCHEME_V->args = SCHEME_V->value;
5217 s_goto (OP_VECTOR); 5054 s_goto (OP_VECTOR);
5218 5055
5219 /* ========== printing part ========== */ 5056 /* ========== printing part ========== */
5220 case OP_P0LIST: 5057 case OP_P0LIST:
5221 if (is_vector (SCHEME_V->args)) 5058 if (is_vector (args))
5222 { 5059 {
5223 putstr (SCHEME_A_ "#("); 5060 putstr (SCHEME_A_ "#(");
5224 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5061 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5225 s_goto (OP_PVECFROM); 5062 s_goto (OP_PVECFROM);
5226 } 5063 }
5227 else if (is_environment (SCHEME_V->args)) 5064 else if (is_environment (args))
5228 { 5065 {
5229 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5066 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5230 s_return (S_T); 5067 s_return (S_T);
5231 } 5068 }
5232 else if (!is_pair (SCHEME_V->args)) 5069 else if (!is_pair (args))
5233 { 5070 {
5234 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5071 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5235 s_return (S_T); 5072 s_return (S_T);
5236 } 5073 }
5237 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5074 else
5238 { 5075 {
5076 pointer a = car (args);
5077 pointer b = cdr (args);
5078 int ok_abbr = ok_abbrev (b);
5079 SCHEME_V->args = car (b);
5080
5081 if (a == SCHEME_V->QUOTE && ok_abbr)
5239 putstr (SCHEME_A_ "'"); 5082 putstr (SCHEME_A_ "'");
5240 SCHEME_V->args = cadr (SCHEME_V->args); 5083 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5084 putstr (SCHEME_A_ "`");
5085 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5086 putstr (SCHEME_A_ ",");
5087 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5088 putstr (SCHEME_A_ ",@");
5089 else
5090 {
5091 putstr (SCHEME_A_ "(");
5092 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5093 SCHEME_V->args = a;
5094 }
5095
5241 s_goto (OP_P0LIST); 5096 s_goto (OP_P0LIST);
5242 } 5097 }
5243 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5098
5099 case OP_P1LIST:
5100 if (is_pair (args))
5244 { 5101 {
5102 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5245 putstr (SCHEME_A_ "`"); 5103 putstr (SCHEME_A_ " ");
5246 SCHEME_V->args = cadr (SCHEME_V->args); 5104 SCHEME_V->args = car (args);
5247 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5248 } 5106 }
5249 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5250 {
5251 putstr (SCHEME_A_ ",");
5252 SCHEME_V->args = cadr (SCHEME_V->args);
5253 s_goto (OP_P0LIST);
5254 }
5255 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5256 {
5257 putstr (SCHEME_A_ ",@");
5258 SCHEME_V->args = cadr (SCHEME_V->args);
5259 s_goto (OP_P0LIST);
5260 }
5261 else
5262 {
5263 putstr (SCHEME_A_ "(");
5264 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5265 SCHEME_V->args = car (SCHEME_V->args);
5266 s_goto (OP_P0LIST);
5267 }
5268
5269 case OP_P1LIST:
5270 if (is_pair (SCHEME_V->args))
5271 {
5272 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5273 putstr (SCHEME_A_ " ");
5274 SCHEME_V->args = car (SCHEME_V->args);
5275 s_goto (OP_P0LIST);
5276 }
5277 else if (is_vector (SCHEME_V->args)) 5107 else if (is_vector (args))
5278 { 5108 {
5279 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5109 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5280 putstr (SCHEME_A_ " . "); 5110 putstr (SCHEME_A_ " . ");
5281 s_goto (OP_P0LIST); 5111 s_goto (OP_P0LIST);
5282 } 5112 }
5283 else 5113 else
5284 { 5114 {
5285 if (SCHEME_V->args != NIL) 5115 if (args != NIL)
5286 { 5116 {
5287 putstr (SCHEME_A_ " . "); 5117 putstr (SCHEME_A_ " . ");
5288 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5118 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5289 } 5119 }
5290 5120
5291 putstr (SCHEME_A_ ")"); 5121 putstr (SCHEME_A_ ")");
5292 s_return (S_T); 5122 s_return (S_T);
5293 } 5123 }
5294 5124
5295 case OP_PVECFROM: 5125 case OP_PVECFROM:
5296 { 5126 {
5297 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5127 int i = ivalue_unchecked (cdr (args));
5298 pointer vec = car (SCHEME_V->args); 5128 pointer vec = car (args);
5299 int len = veclength (vec); 5129 int len = veclength (vec);
5300 5130
5301 if (i == len) 5131 if (i == len)
5302 { 5132 {
5303 putstr (SCHEME_A_ ")"); 5133 putstr (SCHEME_A_ ")");
5304 s_return (S_T); 5134 s_return (S_T);
5305 } 5135 }
5306 else 5136 else
5307 { 5137 {
5308 pointer elem = vector_elem (vec, i); 5138 pointer elem = vector_get (vec, i);
5309 5139
5310 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5140 ivalue_unchecked (cdr (args)) = i + 1;
5311 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5141 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5312 SCHEME_V->args = elem; 5142 SCHEME_V->args = elem;
5313 5143
5314 if (i > 0) 5144 if (i > 0)
5315 putstr (SCHEME_A_ " "); 5145 putstr (SCHEME_A_ " ");
5316 5146
5317 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5318 } 5148 }
5319 } 5149 }
5320 } 5150 }
5321 5151
5322 abort (); 5152 if (USE_ERROR_CHECKING) abort ();
5323} 5153}
5324 5154
5325static pointer 5155static int
5326opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5156opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5327{ 5157{
5158 pointer args = SCHEME_V->args;
5159 pointer a = car (args);
5328 pointer x, y; 5160 pointer x, y;
5329 5161
5330 switch (op) 5162 switch (op)
5331 { 5163 {
5332 case OP_LIST_LENGTH: /* length *//* a.k */ 5164 case OP_LIST_LENGTH: /* length *//* a.k */
5333 { 5165 {
5334 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5166 long v = list_length (SCHEME_A_ a);
5335 5167
5336 if (v < 0) 5168 if (v < 0)
5337 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5169 Error_1 ("length: not a list:", a);
5338 5170
5339 s_return (mk_integer (SCHEME_A_ v)); 5171 s_return (mk_integer (SCHEME_A_ v));
5340 } 5172 }
5341 5173
5342 case OP_ASSQ: /* assq *//* a.k */ 5174 case OP_ASSQ: /* assq *//* a.k */
5343 x = car (SCHEME_V->args); 5175 x = a;
5344 5176
5345 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5177 for (y = cadr (args); is_pair (y); y = cdr (y))
5346 { 5178 {
5347 if (!is_pair (car (y))) 5179 if (!is_pair (car (y)))
5348 Error_0 ("unable to handle non pair element"); 5180 Error_0 ("unable to handle non pair element");
5349 5181
5350 if (x == caar (y)) 5182 if (x == caar (y))
… …
5356 else 5188 else
5357 s_return (S_F); 5189 s_return (S_F);
5358 5190
5359 5191
5360 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5192 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5361 SCHEME_V->args = car (SCHEME_V->args); 5193 SCHEME_V->args = a;
5362 5194
5363 if (SCHEME_V->args == NIL) 5195 if (SCHEME_V->args == NIL)
5364 s_return (S_F); 5196 s_return (S_F);
5365 else if (is_closure (SCHEME_V->args)) 5197 else if (is_closure (SCHEME_V->args))
5366 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5198 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5372 case OP_CLOSUREP: /* closure? */ 5204 case OP_CLOSUREP: /* closure? */
5373 /* 5205 /*
5374 * Note, macro object is also a closure. 5206 * Note, macro object is also a closure.
5375 * Therefore, (closure? <#MACRO>) ==> #t 5207 * Therefore, (closure? <#MACRO>) ==> #t
5376 */ 5208 */
5377 s_retbool (is_closure (car (SCHEME_V->args))); 5209 s_retbool (is_closure (a));
5378 5210
5379 case OP_MACROP: /* macro? */ 5211 case OP_MACROP: /* macro? */
5380 s_retbool (is_macro (car (SCHEME_V->args))); 5212 s_retbool (is_macro (a));
5381 } 5213 }
5382 5214
5383 abort (); 5215 if (USE_ERROR_CHECKING) abort ();
5384} 5216}
5385 5217
5218/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5386typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5219typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5387 5220
5388typedef int (*test_predicate) (pointer); 5221typedef int (*test_predicate)(pointer);
5389static int 5222static int
5390is_any (pointer p) 5223tst_any (pointer p)
5391{ 5224{
5392 return 1; 5225 return 1;
5393} 5226}
5394 5227
5395static int 5228static int
5396is_nonneg (pointer p) 5229tst_inonneg (pointer p)
5397{ 5230{
5398 return ivalue (p) >= 0 && is_integer (p); 5231 return is_integer (p) && ivalue_unchecked (p) >= 0;
5232}
5233
5234static int
5235tst_is_list (SCHEME_P_ pointer p)
5236{
5237 return p == NIL || is_pair (p);
5399} 5238}
5400 5239
5401/* Correspond carefully with following defines! */ 5240/* Correspond carefully with following defines! */
5402static struct 5241static struct
5403{ 5242{
5404 test_predicate fct; 5243 test_predicate fct;
5405 const char *kind; 5244 const char *kind;
5406} tests[] = 5245} tests[] = {
5407{ 5246 { tst_any , 0 },
5408 { 0, 0}, /* unused */ 5247 { is_string , "string" },
5409 { is_any, 0}, 5248 { is_symbol , "symbol" },
5410 { is_string, "string" }, 5249 { is_port , "port" },
5411 { is_symbol, "symbol" },
5412 { is_port, "port" },
5413 { is_inport, "input port" }, 5250 { is_inport , "input port" },
5414 { is_outport, "output port" }, 5251 { is_outport , "output port" },
5415 { is_environment, "environment" }, 5252 { is_environment, "environment" },
5416 { is_pair, "pair" }, 5253 { is_pair , "pair" },
5417 { 0, "pair or '()" }, 5254 { 0 , "pair or '()" },
5418 { is_character, "character" }, 5255 { is_character , "character" },
5419 { is_vector, "vector" }, 5256 { is_vector , "vector" },
5420 { is_number, "number" }, 5257 { is_number , "number" },
5421 { is_integer, "integer" }, 5258 { is_integer , "integer" },
5422 { is_nonneg, "non-negative integer" } 5259 { tst_inonneg , "non-negative integer" }
5423}; 5260};
5424 5261
5425#define TST_NONE 0 5262#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5426#define TST_ANY "\001" 5263#define TST_ANY "\001"
5427#define TST_STRING "\002" 5264#define TST_STRING "\002"
5428#define TST_SYMBOL "\003" 5265#define TST_SYMBOL "\003"
5429#define TST_PORT "\004" 5266#define TST_PORT "\004"
5430#define TST_INPORT "\005" 5267#define TST_INPORT "\005"
5431#define TST_OUTPORT "\006" 5268#define TST_OUTPORT "\006"
5432#define TST_ENVIRONMENT "\007" 5269#define TST_ENVIRONMENT "\007"
5433#define TST_PAIR "\010" 5270#define TST_PAIR "\010"
5434#define TST_LIST "\011" 5271#define TST_LIST "\011"
5435#define TST_CHAR "\012" 5272#define TST_CHAR "\012"
5436#define TST_VECTOR "\013" 5273#define TST_VECTOR "\013"
5437#define TST_NUMBER "\014" 5274#define TST_NUMBER "\014"
5438#define TST_INTEGER "\015" 5275#define TST_INTEGER "\015"
5439#define TST_NATURAL "\016" 5276#define TST_NATURAL "\016"
5277
5278#define INF_ARG 0xff
5279#define UNNAMED_OP ""
5280
5281static const char opnames[] =
5282#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5283#include "opdefines.h"
5284#undef OP_DEF
5285;
5286
5287static const char *
5288opname (int idx)
5289{
5290 const char *name = opnames;
5291
5292 /* should do this at compile time, but would require external program, right? */
5293 while (idx--)
5294 name += strlen (name) + 1;
5295
5296 return *name ? name : "ILLEGAL";
5297}
5298
5299static const char *
5300procname (pointer x)
5301{
5302 return opname (procnum (x));
5303}
5440 5304
5441typedef struct 5305typedef struct
5442{ 5306{
5443 dispatch_func func; 5307 uint8_t func;
5444 char *name; 5308 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5309 uint8_t builtin;
5310#if USE_ERROR_CHECKING
5445 int min_arity; 5311 uint8_t min_arity;
5446 int max_arity; 5312 uint8_t max_arity;
5447 char *arg_tests_encoding; 5313 char arg_tests_encoding[3];
5314#endif
5448} op_code_info; 5315} op_code_info;
5449 5316
5450#define INF_ARG 0xffff
5451
5452static op_code_info dispatch_table[] = { 5317static const op_code_info dispatch_table[] = {
5453#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5318#if USE_ERROR_CHECKING
5319#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5320#else
5321#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5322#endif
5454#include "opdefines.h" 5323#include "opdefines.h"
5324#undef OP_DEF
5455 {0} 5325 {0}
5456}; 5326};
5457 5327
5458static const char *
5459procname (pointer x)
5460{
5461 int n = procnum (x);
5462 const char *name = dispatch_table[n].name;
5463
5464 if (name == 0)
5465 name = "ILLEGAL!";
5466
5467 return name;
5468}
5469
5470/* kernel of this interpreter */ 5328/* kernel of this interpreter */
5471static void 5329static void ecb_hot
5472Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5330Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5473{ 5331{
5474 SCHEME_V->op = op; 5332 SCHEME_V->op = op;
5475 5333
5476 for (;;) 5334 for (;;)
5477 { 5335 {
5478 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5336 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5479 5337
5480#if USE_ERROR_CHECKING 5338#if USE_ERROR_CHECKING
5481 if (pcd->name) /* if built-in function, check arguments */ 5339 if (pcd->builtin) /* if built-in function, check arguments */
5482 { 5340 {
5483 int ok = 1;
5484 char msg[STRBUFFSIZE]; 5341 char msg[STRBUFFSIZE];
5485 int n = list_length (SCHEME_A_ SCHEME_V->args); 5342 int n = list_length (SCHEME_A_ SCHEME_V->args);
5486 5343
5487 /* Check number of arguments */ 5344 /* Check number of arguments */
5488 if (ecb_expect_false (n < pcd->min_arity)) 5345 if (ecb_expect_false (n < pcd->min_arity))
5489 { 5346 {
5490 ok = 0;
5491 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5347 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5492 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5348 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5349 xError_1 (SCHEME_A_ msg, 0);
5350 continue;
5493 } 5351 }
5494 else if (ecb_excpect_false (n > pcd->max_arity)) 5352 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5495 { 5353 {
5496 ok = 0;
5497 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5354 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5498 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5355 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5356 xError_1 (SCHEME_A_ msg, 0);
5357 continue;
5499 } 5358 }
5500 5359 else
5501 if (ecb_expect_false (ok))
5502 { 5360 {
5503 if (pcd->arg_tests_encoding) 5361 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5504 { 5362 {
5505 int i = 0; 5363 int i = 0;
5506 int j; 5364 int j;
5507 const char *t = pcd->arg_tests_encoding; 5365 const char *t = pcd->arg_tests_encoding;
5508 pointer arglist = SCHEME_V->args; 5366 pointer arglist = SCHEME_V->args;
5509 5367
5510 do 5368 do
5511 { 5369 {
5512 pointer arg = car (arglist); 5370 pointer arg = car (arglist);
5513 5371
5514 j = (int) t[0]; 5372 j = t[0];
5515 5373
5374 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5516 if (j == TST_LIST[0]) 5375 if (j == TST_LIST[0])
5517 { 5376 {
5518 if (arg != NIL && !is_pair (arg)) 5377 if (!tst_is_list (SCHEME_A_ arg))
5519 break; 5378 break;
5520 } 5379 }
5521 else 5380 else
5522 { 5381 {
5523 if (!tests[j].fct (arg)) 5382 if (!tests[j - 1].fct (arg))
5524 break; 5383 break;
5525 } 5384 }
5526 5385
5527 if (t[1] != 0) /* last test is replicated as necessary */ 5386 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5528 t++; 5387 t++;
5529 5388
5530 arglist = cdr (arglist); 5389 arglist = cdr (arglist);
5531 i++; 5390 i++;
5532 } 5391 }
5533 while (i < n); 5392 while (i < n);
5534 5393
5535 if (i < n) 5394 if (i < n)
5536 { 5395 {
5537 ok = 0;
5538 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5396 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5397 xError_1 (SCHEME_A_ msg, 0);
5398 continue;
5539 } 5399 }
5540 } 5400 }
5541 } 5401 }
5542
5543 if (!ok)
5544 {
5545 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5546 return;
5547
5548 pcd = dispatch_table + SCHEME_V->op;
5549 }
5550 } 5402 }
5551#endif 5403#endif
5552 5404
5553 ok_to_freely_gc (SCHEME_A); 5405 ok_to_freely_gc (SCHEME_A);
5554 5406
5407 static const dispatch_func dispatch_funcs[] = {
5408 opexe_0,
5409 opexe_1,
5410 opexe_2,
5411 opexe_3,
5412 opexe_4,
5413 opexe_5,
5414 opexe_6,
5415 };
5416
5555 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5417 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5556 return; 5418 return;
5557 5419
5558 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5559 { 5421 {
5560 xwrstr ("No memory!\n"); 5422 xwrstr ("No memory!\n");
… …
5584mk_proc (SCHEME_P_ enum scheme_opcodes op) 5446mk_proc (SCHEME_P_ enum scheme_opcodes op)
5585{ 5447{
5586 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5448 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5587 set_typeflag (y, (T_PROC | T_ATOM)); 5449 set_typeflag (y, (T_PROC | T_ATOM));
5588 ivalue_unchecked (y) = op; 5450 ivalue_unchecked (y) = op;
5589 set_num_integer (y);
5590 return y; 5451 return y;
5591} 5452}
5592 5453
5593/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5454/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5594static int 5455static int
… …
5659 return OP_C0STREAM; /* cons-stream */ 5520 return OP_C0STREAM; /* cons-stream */
5660 } 5521 }
5661} 5522}
5662 5523
5663#if USE_MULTIPLICITY 5524#if USE_MULTIPLICITY
5664scheme * 5525ecb_cold scheme *
5665scheme_init_new () 5526scheme_init_new ()
5666{ 5527{
5667 scheme *sc = malloc (sizeof (scheme)); 5528 scheme *sc = malloc (sizeof (scheme));
5668 5529
5669 if (!scheme_init (SCHEME_A)) 5530 if (!scheme_init (SCHEME_A))
… …
5674 else 5535 else
5675 return sc; 5536 return sc;
5676} 5537}
5677#endif 5538#endif
5678 5539
5679int 5540ecb_cold int
5680scheme_init (SCHEME_P) 5541scheme_init (SCHEME_P)
5681{ 5542{
5682 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5683 pointer x; 5544 pointer x;
5684 5545
… …
5757 5618
5758 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5619 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5759 assign_syntax (SCHEME_A_ syntax_names[i]); 5620 assign_syntax (SCHEME_A_ syntax_names[i]);
5760 } 5621 }
5761 5622
5623 // TODO: should iterate via strlen, to avoid n² complexity
5762 for (i = 0; i < n; i++) 5624 for (i = 0; i < n; i++)
5763 if (dispatch_table[i].name != 0) 5625 if (dispatch_table[i].builtin)
5764 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5626 assign_proc (SCHEME_A_ i, opname (i));
5765 5627
5766 /* initialization of global pointers to special symbols */ 5628 /* initialization of global pointers to special symbols */
5767 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5629 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5768 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5630 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5769 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5631 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5808scheme_set_external_data (SCHEME_P_ void *p) 5670scheme_set_external_data (SCHEME_P_ void *p)
5809{ 5671{
5810 SCHEME_V->ext_data = p; 5672 SCHEME_V->ext_data = p;
5811} 5673}
5812 5674
5813void 5675ecb_cold void
5814scheme_deinit (SCHEME_P) 5676scheme_deinit (SCHEME_P)
5815{ 5677{
5816 int i; 5678 int i;
5817 5679
5818#if SHOW_ERROR_LINE 5680#if SHOW_ERROR_LINE
… …
5910{ 5772{
5911 dump_stack_reset (SCHEME_A); 5773 dump_stack_reset (SCHEME_A);
5912 SCHEME_V->envir = SCHEME_V->global_env; 5774 SCHEME_V->envir = SCHEME_V->global_env;
5913 SCHEME_V->file_i = 0; 5775 SCHEME_V->file_i = 0;
5914 SCHEME_V->load_stack[0].kind = port_input | port_string; 5776 SCHEME_V->load_stack[0].kind = port_input | port_string;
5915 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5777 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5916 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5778 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5917 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5779 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5918#if USE_PORTS 5780#if USE_PORTS
5919 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5781 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5920#endif 5782#endif
5921 SCHEME_V->retcode = 0; 5783 SCHEME_V->retcode = 0;
5922 SCHEME_V->interactive_repl = 0; 5784 SCHEME_V->interactive_repl = 0;

Diff Legend

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