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.13 by root, Thu Nov 26 07:59:42 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
253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
254
213static num num_op (char op, num a, num b); 255static num num_op (enum num_op op, num a, num b);
214static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
215static num num_rem (num a, num b); 257static num num_rem (num a, num b);
216static num num_mod (num a, num b); 258static num num_mod (num a, num b);
217static int num_eq (num a, num b);
218static int num_gt (num a, num b);
219static int num_ge (num a, num b);
220static int num_lt (num a, num b);
221static int num_le (num a, num b);
222 259
223#if USE_MATH 260#if USE_MATH
224static double round_per_R5RS (double x); 261static double round_per_R5RS (double x);
225#endif 262#endif
226static int is_zero_rvalue (RVALUE x); 263static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 264
234static num num_zero; 265static num num_zero;
235static num num_one; 266static num num_one;
236 267
237/* macros for cell operations */ 268/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 269#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 270#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 271#define type(p) (typeflag (p) & T_MASKTYPE)
241 272
242INTERFACE INLINE int 273INTERFACE int
243is_string (pointer p) 274is_string (pointer p)
244{ 275{
245 return type (p) == T_STRING; 276 return type (p) == T_STRING;
246} 277}
247 278
248#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
250 281
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 282INTERFACE int
253is_vector (pointer p) 283is_vector (pointer p)
254{ 284{
255 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
256} 286}
257 287
258#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 293
265INTERFACE uint32_t 294INTERFACE int
266vector_length (pointer vec) 295is_integer (pointer p)
267{ 296{
268 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
269} 298}
270 299
300/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
305}
306
307INTERFACE int
272is_number (pointer p) 308is_number (pointer p)
273{ 309{
274 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
275} 311}
276 312
277INTERFACE INLINE int 313INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 314is_character (pointer p)
297{ 315{
298 return type (p) == T_CHARACTER; 316 return type (p) == T_CHARACTER;
299} 317}
300 318
301INTERFACE INLINE char * 319INTERFACE char *
302string_value (pointer p) 320string_value (pointer p)
303{ 321{
304 return strvalue (p); 322 return strvalue (p);
305} 323}
306 324
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 325#define ivalue_unchecked(p) (p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v)
327
338#if USE_REAL 328#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 331#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
344# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 334#endif
335
347INTERFACE long 336INTERFACE long
348charvalue (pointer p) 337charvalue (pointer p)
349{ 338{
350 return ivalue_unchecked (p); 339 return ivalue_unchecked (p);
351} 340}
352 341
353INTERFACE INLINE int 342INTERFACE int
354is_port (pointer p) 343is_port (pointer p)
355{ 344{
356 return type (p) == T_PORT; 345 return type (p) == T_PORT;
357} 346}
358 347
359INTERFACE INLINE int 348INTERFACE int
360is_inport (pointer p) 349is_inport (pointer p)
361{ 350{
362 return is_port (p) && p->object.port->kind & port_input; 351 return is_port (p) && p->object.port->kind & port_input;
363} 352}
364 353
365INTERFACE INLINE int 354INTERFACE int
366is_outport (pointer p) 355is_outport (pointer p)
367{ 356{
368 return is_port (p) && p->object.port->kind & port_output; 357 return is_port (p) && p->object.port->kind & port_output;
369} 358}
370 359
371INTERFACE INLINE int 360INTERFACE int
372is_pair (pointer p) 361is_pair (pointer p)
373{ 362{
374 return type (p) == T_PAIR; 363 return type (p) == T_PAIR;
375} 364}
376 365
… …
408pair_cdr (pointer p) 397pair_cdr (pointer p)
409{ 398{
410 return cdr (p); 399 return cdr (p);
411} 400}
412 401
413INTERFACE INLINE int 402INTERFACE int
414is_symbol (pointer p) 403is_symbol (pointer p)
415{ 404{
416 return type (p) == T_SYMBOL; 405 return type (p) == T_SYMBOL;
417} 406}
418 407
419INTERFACE INLINE char * 408INTERFACE char *
420symname (pointer p) 409symname (pointer p)
421{ 410{
422 return strvalue (car (p)); 411 return strvalue (car (p));
423} 412}
424 413
425#if USE_PLIST 414#if USE_PLIST
426SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
427hasprop (pointer p) 416hasprop (pointer p)
428{ 417{
429 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
430} 419}
431 420
432# define symprop(p) cdr(p) 421# define symprop(p) cdr(p)
433#endif 422#endif
434 423
435INTERFACE INLINE int 424INTERFACE int
436is_syntax (pointer p) 425is_syntax (pointer p)
437{ 426{
438 return typeflag (p) & T_SYNTAX; 427 return typeflag (p) & T_SYNTAX;
439} 428}
440 429
441INTERFACE INLINE int 430INTERFACE int
442is_proc (pointer p) 431is_proc (pointer p)
443{ 432{
444 return type (p) == T_PROC; 433 return type (p) == T_PROC;
445} 434}
446 435
447INTERFACE INLINE int 436INTERFACE int
448is_foreign (pointer p) 437is_foreign (pointer p)
449{ 438{
450 return type (p) == T_FOREIGN; 439 return type (p) == T_FOREIGN;
451} 440}
452 441
453INTERFACE INLINE char * 442INTERFACE char *
454syntaxname (pointer p) 443syntaxname (pointer p)
455{ 444{
456 return strvalue (car (p)); 445 return strvalue (car (p));
457} 446}
458 447
459#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 449static const char *procname (pointer x);
461 450
462INTERFACE INLINE int 451INTERFACE int
463is_closure (pointer p) 452is_closure (pointer p)
464{ 453{
465 return type (p) == T_CLOSURE; 454 return type (p) == T_CLOSURE;
466} 455}
467 456
468INTERFACE INLINE int 457INTERFACE int
469is_macro (pointer p) 458is_macro (pointer p)
470{ 459{
471 return type (p) == T_MACRO; 460 return type (p) == T_MACRO;
472} 461}
473 462
474INTERFACE INLINE pointer 463INTERFACE pointer
475closure_code (pointer p) 464closure_code (pointer p)
476{ 465{
477 return car (p); 466 return car (p);
478} 467}
479 468
480INTERFACE INLINE pointer 469INTERFACE pointer
481closure_env (pointer p) 470closure_env (pointer p)
482{ 471{
483 return cdr (p); 472 return cdr (p);
484} 473}
485 474
486INTERFACE INLINE int 475INTERFACE int
487is_continuation (pointer p) 476is_continuation (pointer p)
488{ 477{
489 return type (p) == T_CONTINUATION; 478 return type (p) == T_CONTINUATION;
490} 479}
491 480
492#define cont_dump(p) cdr (p) 481#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 482#define set_cont_dump(p,v) set_cdr ((p), (v))
494 483
495/* To do: promise should be forced ONCE only */ 484/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 485INTERFACE int
497is_promise (pointer p) 486is_promise (pointer p)
498{ 487{
499 return type (p) == T_PROMISE; 488 return type (p) == T_PROMISE;
500} 489}
501 490
502INTERFACE INLINE int 491INTERFACE int
503is_environment (pointer p) 492is_environment (pointer p)
504{ 493{
505 return type (p) == T_ENVIRONMENT; 494 return type (p) == T_ENVIRONMENT;
506} 495}
507 496
… …
513 502
514#define is_mark(p) (typeflag (p) & T_MARK) 503#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 506
518INTERFACE INLINE int 507INTERFACE int
519is_immutable (pointer p) 508is_immutable (pointer p)
520{ 509{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 511}
523 512
524INTERFACE INLINE void 513INTERFACE void
525setimmutable (pointer p) 514setimmutable (pointer p)
526{ 515{
527#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 518#endif
530} 519}
531 520
521/* Result is:
522 proper list: length
523 circular list: -1
524 not even a pair: -2
525 dotted list: -2 minus length before dot
526*/
527INTERFACE int
528list_length (SCHEME_P_ pointer a)
529{
530 int i = 0;
531 pointer slow, fast;
532
533 slow = fast = a;
534
535 while (1)
536 {
537 if (fast == NIL)
538 return i;
539
540 if (!is_pair (fast))
541 return -2 - i;
542
543 fast = cdr (fast);
544 ++i;
545
546 if (fast == NIL)
547 return i;
548
549 if (!is_pair (fast))
550 return -2 - i;
551
552 ++i;
553 fast = cdr (fast);
554
555 /* Safe because we would have already returned if `fast'
556 encountered a non-pair. */
557 slow = cdr (slow);
558
559 if (fast == slow)
560 {
561 /* the fast pointer has looped back around and caught up
562 with the slow pointer, hence the structure is circular,
563 not of finite length, and therefore not a list */
564 return -1;
565 }
566 }
567}
568
569INTERFACE int
570is_list (SCHEME_P_ pointer a)
571{
572 return list_length (SCHEME_A_ a) >= 0;
573}
574
532#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
533static INLINE int 576ecb_inline int
534Cisalpha (int c) 577Cisalpha (int c)
535{ 578{
536 return isascii (c) && isalpha (c); 579 return isascii (c) && isalpha (c);
537} 580}
538 581
539static INLINE int 582ecb_inline int
540Cisdigit (int c) 583Cisdigit (int c)
541{ 584{
542 return isascii (c) && isdigit (c); 585 return isascii (c) && isdigit (c);
543} 586}
544 587
545static INLINE int 588ecb_inline int
546Cisspace (int c) 589Cisspace (int c)
547{ 590{
548 return isascii (c) && isspace (c); 591 return isascii (c) && isspace (c);
549} 592}
550 593
551static INLINE int 594ecb_inline int
552Cisupper (int c) 595Cisupper (int c)
553{ 596{
554 return isascii (c) && isupper (c); 597 return isascii (c) && isupper (c);
555} 598}
556 599
557static INLINE int 600ecb_inline int
558Cislower (int c) 601Cislower (int c)
559{ 602{
560 return isascii (c) && islower (c); 603 return isascii (c) && islower (c);
561} 604}
562#endif 605#endif
… …
623#endif 666#endif
624 667
625static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 677static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 678static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 693static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 701static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 709static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 710static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 711static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 712static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 713static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
715static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
677static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
678static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
679static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
680static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
681 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
682static num 753static num
683num_op (char op, num a, num b) 754num_op (enum num_op op, num a, num b)
684{ 755{
685 num ret; 756 num ret;
686 757
687 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));
688 759
689 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
690 { 761 {
691 IVALUE av = num_get_ivalue (a);
692 IVALUE bv = num_get_ivalue (b);
693
694 switch (op) 762 switch (op)
695 { 763 {
696 case '+': av += bv; break; 764 case NUM_ADD: a.ivalue += b.ivalue; break;
697 case '-': av -= bv; break; 765 case NUM_SUB: a.ivalue -= b.ivalue; break;
698 case '*': av *= bv; break; 766 case NUM_MUL: a.ivalue *= b.ivalue; break;
699 case '/': av /= bv; break; 767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
700 } 768 }
701 769
702 num_set_ivalue (ret, av); 770 num_set_ivalue (ret, a.ivalue);
703 } 771 }
772#if USE_REAL
704 else 773 else
705 { 774 {
706 RVALUE av = num_get_rvalue (a);
707 RVALUE bv = num_get_rvalue (b);
708
709 switch (op) 775 switch (op)
710 { 776 {
711 case '+': av += bv; break; 777 case NUM_ADD: a.rvalue += b.rvalue; break;
712 case '-': av -= bv; break; 778 case NUM_SUB: a.rvalue -= b.rvalue; break;
713 case '*': av *= bv; break; 779 case NUM_MUL: a.rvalue *= b.rvalue; break;
714 case '/': av /= bv; break; 780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
715 } 781 }
716 782
717 num_set_rvalue (ret, av); 783 num_set_rvalue (ret, a.rvalue);
718 } 784 }
785#endif
719 786
720 return ret; 787 return ret;
721} 788}
722 789
723static num 790static num
724num_div (num a, num b) 791num_div (num a, num b)
725{ 792{
726 num ret; 793 num ret;
727 794
728 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);
729 796
730 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
732 else 799 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
734 801
735 return ret; 802 return ret;
736} 803}
737 804
738static num 805static num
… …
740{ 807{
741 num ret; 808 num ret;
742 long e1, e2, res; 809 long e1, e2, res;
743 810
744 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));
745 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
746 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
747 res = e1 % e2; 814 res = e1 % e2;
748 815
749 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
750 if (res > 0) 817 if (res > 0)
751 { 818 {
… …
767{ 834{
768 num ret; 835 num ret;
769 long e1, e2, res; 836 long e1, e2, res;
770 837
771 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));
772 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
773 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
774 res = e1 % e2; 841 res = e1 % e2;
775 842
776 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
777 if (res * e2 < 0) 844 if (res * e2 < 0)
778 res += e2; 845 res += e2;
779 846
780 num_set_ivalue (ret, res); 847 num_set_ivalue (ret, res);
781 return ret; 848 return ret;
782} 849}
783 850
851/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
784static int 852static int
785num_eq (num a, num b) 853num_cmp (num a, num b)
786{ 854{
855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 856 int ret;
788 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
789 857
790 if (is_fixnum) 858 if (is_fixnum)
791 ret = num_get_ivalue (a) == num_get_ivalue (b); 859 {
860 IVALUE av = num_ivalue (a);
861 IVALUE bv = num_ivalue (b);
862
863 ret = av == bv ? 0 : av < bv ? -1 : +1;
864 }
792 else 865 else
793 ret = num_get_rvalue (a) == num_get_rvalue (b); 866 {
867 RVALUE av = num_rvalue (a);
868 RVALUE bv = num_rvalue (b);
869
870 ret = av == bv ? 0 : av < bv ? -1 : +1;
871 }
794 872
795 return ret; 873 return ret;
796}
797
798
799static int
800num_gt (num a, num b)
801{
802 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804
805 if (is_fixnum)
806 ret = num_get_ivalue (a) > num_get_ivalue (b);
807 else
808 ret = num_get_rvalue (a) > num_get_rvalue (b);
809
810 return ret;
811}
812
813static int
814num_ge (num a, num b)
815{
816 return !num_lt (a, b);
817}
818
819static int
820num_lt (num a, num b)
821{
822 int ret;
823 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
824
825 if (is_fixnum)
826 ret = num_get_ivalue (a) < num_get_ivalue (b);
827 else
828 ret = num_get_rvalue (a) < num_get_rvalue (b);
829
830 return ret;
831}
832
833static int
834num_le (num a, num b)
835{
836 return !num_gt (a, b);
837} 874}
838 875
839#if USE_MATH 876#if USE_MATH
840 877
841/* Round to nearest. Round to even if midway */ 878/* Round to nearest. Round to even if midway */
… …
851 return ce; 888 return ce;
852 else if (dfl < dce) 889 else if (dfl < dce)
853 return fl; 890 return fl;
854 else 891 else
855 { 892 {
856 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 893 if (fmod (fl, 2) == 0) /* I imagine this holds */
857 return fl; 894 return fl;
858 else 895 else
859 return ce; 896 return ce;
860 } 897 }
861} 898}
862#endif 899#endif
863 900
864static int 901static int
865is_zero_rvalue (RVALUE x) 902is_zero_rvalue (RVALUE x)
866{ 903{
904 return x == 0;
905#if 0
867#if USE_REAL 906#if USE_REAL
868 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. */
869#else 908#else
870 return x == 0; 909 return x == 0;
910#endif
871#endif 911#endif
872} 912}
873 913
874/* allocate new cell segment */ 914/* allocate new cell segment */
875static int 915static int
… …
896 return k; 936 return k;
897 937
898 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
899 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
900 940
901 /* insert new segment in address order */
902 newp = (pointer)cp; 941 newp = (pointer)cp;
903 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
904 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
905
906 //TODO: insert, not swap
907 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
908 {
909 p = SCHEME_V->cell_seg[i];
910 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
911 SCHEME_V->cell_seg[i - 1] = p;
912
913 k = SCHEME_V->cell_segsize[i];
914 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
915 SCHEME_V->cell_segsize[i - 1] = k;
916
917 --i;
918 }
919
920 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
921 last = newp + segsize - 1; 945 last = newp + segsize - 1;
922 946
923 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
924 { 948 {
925 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
926 set_car (p, NIL); 950 set_car (p, NIL);
927 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
928 } 952 }
929 953
930 /* insert new cells in address order on free list */
931 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
932 {
933 set_cdr (last, SCHEME_V->free_cell); 954 set_cdr (last, SCHEME_V->free_cell);
934 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
935 }
936 else
937 {
938 p = SCHEME_V->free_cell;
939
940 while (cdr (p) != NIL && newp > cdr (p))
941 p = cdr (p);
942
943 set_cdr (last, cdr (p));
944 set_cdr (p, newp);
945 }
946 } 956 }
947 957
948 return n; 958 return n;
949} 959}
950 960
951/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
952static INLINE pointer 962ecb_inline pointer
953get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
954{ 964{
955 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
956 { 966 {
957 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1029 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
1030 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
1031 1041
1032 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
1033 v->object.vector.length = len; 1043 v->object.vector.length = len;
1034 fill_vector (v, init); 1044 fill_vector (v, 0, init);
1035 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
1036 1046
1037 return v; 1047 return v;
1038} 1048}
1039 1049
1040static INLINE void 1050ecb_inline void
1041ok_to_freely_gc (SCHEME_P) 1051ok_to_freely_gc (SCHEME_P)
1042{ 1052{
1043 set_car (S_SINK, NIL); 1053 set_car (S_SINK, NIL);
1044} 1054}
1045 1055
… …
1084 return x; 1094 return x;
1085} 1095}
1086 1096
1087/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1088 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
1089#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1090 1110
1111static int
1091static 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}
1092 1122
1093static pointer 1123static pointer
1094oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1095{ 1125{
1096 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1098 1128
1099/* returns the new symbol */ 1129/* returns the new symbol */
1100static pointer 1130static pointer
1101oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1102{ 1132{
1103 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1104
1105 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1106 set_typeflag (x, T_SYMBOL);
1107 setimmutable (car (x));
1108
1109 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1110 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)));
1111 return x; 1136 return x;
1112} 1137}
1113 1138
1114static INLINE pointer 1139ecb_inline pointer
1115oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1116{ 1141{
1117 int location; 1142 int location;
1118 pointer x; 1143 pointer x;
1119 char *s; 1144 char *s;
1120 1145
1121 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1122 1147
1123 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))
1124 { 1149 {
1125 s = symname (car (x)); 1150 s = symname (car (x));
1126 1151
1127 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1128 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1138 int i; 1163 int i;
1139 pointer x; 1164 pointer x;
1140 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1141 1166
1142 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1143 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))
1144 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1145 1170
1146 return ob_list; 1171 return ob_list;
1147} 1172}
1148 1173
… …
1152oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1153{ 1178{
1154 return NIL; 1179 return NIL;
1155} 1180}
1156 1181
1157static INLINE pointer 1182ecb_inline pointer
1158oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1159{ 1184{
1160 pointer x; 1185 pointer x;
1161 char *s; 1186 char *s;
1162 1187
… …
1174 1199
1175/* returns the new symbol */ 1200/* returns the new symbol */
1176static pointer 1201static pointer
1177oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1178{ 1203{
1179 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1180
1181 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1182 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1183 setimmutable (car (x)); 1206 setimmutable (x);
1184 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1185 return x; 1208 return x;
1186} 1209}
1187 1210
1188static pointer 1211static pointer
… …
1221mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1222{ 1245{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1247
1225 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1226 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1227 set_num_integer (x); 1250
1228 return x; 1251 return x;
1229} 1252}
1230 1253
1231/* get number atom (integer) */ 1254/* get number atom (integer) */
1232INTERFACE pointer 1255INTERFACE pointer
1233mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1234{ 1257{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1259
1237 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1238 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1239 set_num_integer (x); 1262
1240 return x; 1263 return x;
1241} 1264}
1242 1265
1243INTERFACE pointer 1266INTERFACE pointer
1244mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1245{ 1268{
1269#if USE_REAL
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1271
1248 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1249 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1250 set_num_real (x); 1274
1251 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1252} 1279}
1253 1280
1254static pointer 1281static pointer
1255mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1256{ 1283{
1284#if USE_REAL
1257 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
1258 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1259 else 1290#endif
1260 return mk_real (SCHEME_A_ num_get_rvalue (n));
1261} 1291}
1262 1292
1263/* allocate name to string area */ 1293/* allocate name to string area */
1264static char * 1294static char *
1265store_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)
… …
1271 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1272 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1273 } 1303 }
1274 1304
1275 if (str) 1305 if (str)
1276 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1277 int l = strlen (str);
1278
1279 if (l > len_str)
1280 l = len_str;
1281
1282 memcpy (q, str, l);
1283 q[l] = 0;
1284 }
1285 else 1307 else
1286 {
1287 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1288 q[len_str] = 0; 1310 q[len_str] = 0;
1289 }
1290 1311
1291 return q; 1312 return q;
1292} 1313}
1293 1314
1294INTERFACE pointer 1315INTERFACE pointer
… …
1308 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1309 1330
1310 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1311 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1312 strlength (x) = len; 1333 strlength (x) = len;
1334
1313 return x; 1335 return x;
1314} 1336}
1315 1337
1316INTERFACE pointer 1338INTERFACE pointer
1317mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1324{ 1346{
1325 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1326} 1348}
1327 1349
1328INTERFACE void 1350INTERFACE void
1329fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1330{ 1352{
1331 int i; 1353 int i;
1332 1354
1333 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1334 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1335} 1357}
1336 1358
1337INTERFACE pointer 1359INTERFACE pointer
1338vector_elem (pointer vec, uint32_t ielem) 1360vector_get (pointer vec, uint32_t ielem)
1339{ 1361{
1340 return vecvalue(vec)[ielem]; 1362 return vecvalue(vec)[ielem];
1341} 1363}
1342 1364
1343INTERFACE void 1365INTERFACE void
1344set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1366vector_set (pointer vec, uint32_t ielem, pointer a)
1345{ 1367{
1346 vecvalue(vec)[ielem] = a; 1368 vecvalue(vec)[ielem] = a;
1347} 1369}
1348 1370
1349/* get new symbol */ 1371/* get new symbol */
… …
1361 1383
1362INTERFACE pointer 1384INTERFACE pointer
1363gensym (SCHEME_P) 1385gensym (SCHEME_P)
1364{ 1386{
1365 pointer x; 1387 pointer x;
1366
1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1368 {
1369 char name[40] = "gensym-"; 1388 char name[40] = "gensym-";
1370 xnum (name + 7, SCHEME_V->gensym_cnt); 1389 xnum (name + 7, SCHEME_V->gensym_cnt);
1371 1390
1372 /* first check oblist */ 1391 return generate_symbol (SCHEME_A_ name);
1373 x = oblist_find_by_name (SCHEME_A_ name);
1374
1375 if (x == NIL)
1376 {
1377 x = oblist_add_by_name (SCHEME_A_ name);
1378 return x;
1379 }
1380 }
1381
1382 return NIL;
1383} 1392}
1384 1393
1385/* make symbol or number atom from string */ 1394/* make symbol or number atom from string */
1386static pointer 1395static pointer
1387mk_atom (SCHEME_P_ char *q) 1396mk_atom (SCHEME_P_ char *q)
… …
1441 } 1450 }
1442 else if ((c == 'e') || (c == 'E')) 1451 else if ((c == 'e') || (c == 'E'))
1443 { 1452 {
1444 if (!has_fp_exp) 1453 if (!has_fp_exp)
1445 { 1454 {
1446 has_dec_point = 1; /* decimal point illegal 1455 has_dec_point = 1; /* decimal point illegal from now on */
1447 from now on */
1448 p++; 1456 p++;
1449 1457
1450 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1458 if ((*p == '-') || (*p == '+') || isdigit (*p))
1451 continue; 1459 continue;
1452 } 1460 }
… …
1540 1548
1541 if (ecb_expect_false (is_vector (p))) 1549 if (ecb_expect_false (is_vector (p)))
1542 { 1550 {
1543 int i; 1551 int i;
1544 1552
1545 for (i = 0; i < p->object.vector.length; i++) 1553 for (i = 0; i < veclength (p); i++)
1546 mark (vecvalue (p)[i]); 1554 mark (vecvalue (p)[i]);
1547 } 1555 }
1548 1556
1549 if (is_atom (p)) 1557 if (is_atom (p))
1550 goto E6; 1558 goto E6;
… …
1648 if (is_mark (p)) 1656 if (is_mark (p))
1649 clrmark (p); 1657 clrmark (p);
1650 else 1658 else
1651 { 1659 {
1652 /* reclaim cell */ 1660 /* reclaim cell */
1653 if (typeflag (p) != T_FREE) 1661 if (typeflag (p) != T_PAIR)
1654 { 1662 {
1655 finalize_cell (SCHEME_A_ p); 1663 finalize_cell (SCHEME_A_ p);
1656 set_typeflag (p, T_FREE); 1664 set_typeflag (p, T_PAIR);
1657 set_car (p, NIL); 1665 set_car (p, NIL);
1658 } 1666 }
1659 1667
1660 ++SCHEME_V->fcells; 1668 ++SCHEME_V->fcells;
1661 set_cdr (p, SCHEME_V->free_cell); 1669 set_cdr (p, SCHEME_V->free_cell);
… …
1663 } 1671 }
1664 } 1672 }
1665 } 1673 }
1666 1674
1667 if (SCHEME_V->gc_verbose) 1675 if (SCHEME_V->gc_verbose)
1676 {
1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1678 }
1669} 1679}
1670 1680
1671static void 1681static void
1672finalize_cell (SCHEME_P_ pointer a) 1682finalize_cell (SCHEME_P_ pointer a)
1673{ 1683{
… …
2102#endif 2112#endif
2103} 2113}
2104 2114
2105/* read characters up to delimiter, but cater to character constants */ 2115/* read characters up to delimiter, but cater to character constants */
2106static char * 2116static char *
2107readstr_upto (SCHEME_P_ char *delim) 2117readstr_upto (SCHEME_P_ int skip, const char *delim)
2108{ 2118{
2109 char *p = SCHEME_V->strbuff; 2119 char *p = SCHEME_V->strbuff + skip;
2110 2120
2111 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))));
2112 2122
2113 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2114 *p = 0; 2124 *p = 0;
… …
2121 return SCHEME_V->strbuff; 2131 return SCHEME_V->strbuff;
2122} 2132}
2123 2133
2124/* read string expression "xxx...xxx" */ 2134/* read string expression "xxx...xxx" */
2125static pointer 2135static pointer
2126readstrexp (SCHEME_P) 2136readstrexp (SCHEME_P_ char delim)
2127{ 2137{
2128 char *p = SCHEME_V->strbuff; 2138 char *p = SCHEME_V->strbuff;
2129 int c; 2139 int c;
2130 int c1 = 0; 2140 int c1 = 0;
2131 enum
2132 { 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;
2133 2142
2134 for (;;) 2143 for (;;)
2135 { 2144 {
2136 c = inchar (SCHEME_A); 2145 c = inchar (SCHEME_A);
2137 2146
… …
2139 return S_F; 2148 return S_F;
2140 2149
2141 switch (state) 2150 switch (state)
2142 { 2151 {
2143 case st_ok: 2152 case st_ok:
2144 switch (c) 2153 if (ecb_expect_false (c == delim))
2145 {
2146 case '\\':
2147 state = st_bsl;
2148 break;
2149
2150 case '"':
2151 *p = 0;
2152 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);
2153 2155
2154 default: 2156 if (ecb_expect_false (c == '\\'))
2157 state = st_bsl;
2158 else
2155 *p++ = c; 2159 *p++ = c;
2156 break;
2157 }
2158 2160
2159 break; 2161 break;
2160 2162
2161 case st_bsl: 2163 case st_bsl:
2162 switch (c) 2164 switch (c)
… …
2192 case 'r': 2194 case 'r':
2193 *p++ = '\r'; 2195 *p++ = '\r';
2194 state = st_ok; 2196 state = st_ok;
2195 break; 2197 break;
2196 2198
2197 case '"':
2198 *p++ = '"';
2199 state = st_ok;
2200 break;
2201
2202 default: 2199 default:
2203 *p++ = c; 2200 *p++ = c;
2204 state = st_ok; 2201 state = st_ok;
2205 break; 2202 break;
2206 } 2203 }
2207 2204
2208 break; 2205 break;
2209 2206
2210 case st_x1: 2207 case st_x1:
2211 case st_x2: 2208 case st_x2:
2212 c = toupper (c); 2209 c = tolower (c);
2213 2210
2214 if (c >= '0' && c <= 'F') 2211 if (c >= '0' && c <= '9')
2215 {
2216 if (c <= '9')
2217 c1 = (c1 << 4) + c - '0'; 2212 c1 = (c1 << 4) + c - '0';
2218 else 2213 else if (c >= 'a' && c <= 'f')
2219 c1 = (c1 << 4) + c - 'A' + 10; 2214 c1 = (c1 << 4) + c - 'a' + 10;
2220
2221 if (state == st_x1)
2222 state = st_x2;
2223 else
2224 {
2225 *p++ = c1;
2226 state = st_ok;
2227 }
2228 }
2229 else 2215 else
2230 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 }
2231 2225
2232 break; 2226 break;
2233 2227
2234 case st_oct1: 2228 case st_oct1:
2235 case st_oct2: 2229 case st_oct2:
… …
2239 backchar (SCHEME_A_ c); 2233 backchar (SCHEME_A_ c);
2240 state = st_ok; 2234 state = st_ok;
2241 } 2235 }
2242 else 2236 else
2243 { 2237 {
2244 if (state == st_oct2 && c1 >= 32) 2238 if (state == st_oct2 && c1 >= ' ')
2245 return S_F; 2239 return S_F;
2246 2240
2247 c1 = (c1 << 3) + (c - '0'); 2241 c1 = (c1 << 3) + (c - '0');
2248 2242
2249 if (state == st_oct1) 2243 if (state == st_oct1)
… …
2254 state = st_ok; 2248 state = st_ok;
2255 } 2249 }
2256 } 2250 }
2257 2251
2258 break; 2252 break;
2259
2260 } 2253 }
2261 } 2254 }
2262} 2255}
2263 2256
2264/* check c is in chars */ 2257/* check c is in chars */
2265static INLINE int 2258ecb_inline int
2266is_one_of (char *s, int c) 2259is_one_of (const char *s, int c)
2267{ 2260{
2268 if (c == EOF) 2261 if (c == EOF)
2269 return 1; 2262 return 1;
2270 2263
2271 return !!strchr (s, c); 2264 return !!strchr (s, c);
2272} 2265}
2273 2266
2274/* skip white characters */ 2267/* skip white characters */
2275static INLINE int 2268ecb_inline int
2276skipspace (SCHEME_P) 2269skipspace (SCHEME_P)
2277{ 2270{
2278 int c, curr_line = 0; 2271 int c, curr_line = 0;
2279 2272
2280 do 2273 do
… …
2327 2320
2328 if (is_one_of (" \n\t", c)) 2321 if (is_one_of (" \n\t", c))
2329 return TOK_DOT; 2322 return TOK_DOT;
2330 else 2323 else
2331 { 2324 {
2332 //TODO: ungetc twice in a row is not supported in C
2333 backchar (SCHEME_A_ c); 2325 backchar (SCHEME_A_ c);
2334 backchar (SCHEME_A_ '.');
2335 return TOK_ATOM; 2326 return TOK_DOTATOM;
2336 } 2327 }
2328
2329 case '|':
2330 return TOK_STRATOM;
2337 2331
2338 case '\'': 2332 case '\'':
2339 return TOK_QUOTE; 2333 return TOK_QUOTE;
2340 2334
2341 case ';': 2335 case ';':
… …
2508 { 2502 {
2509 p = SCHEME_V->strbuff; 2503 p = SCHEME_V->strbuff;
2510 2504
2511 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 */
2512 { 2506 {
2513 if (num_is_integer (l)) 2507 if (is_integer (l))
2514 xnum (p, ivalue_unchecked (l)); 2508 xnum (p, ivalue_unchecked (l));
2515#if USE_REAL 2509#if USE_REAL
2516 else 2510 else
2517 { 2511 {
2518 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2512 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2773 return 0; 2767 return 0;
2774 } 2768 }
2775 else if (is_number (a)) 2769 else if (is_number (a))
2776 { 2770 {
2777 if (is_number (b)) 2771 if (is_number (b))
2778 if (num_is_integer (a) == num_is_integer (b))
2779 return num_eq (nvalue (a), nvalue (b)); 2772 return num_cmp (nvalue (a), nvalue (b)) == 0;
2780 2773
2781 return 0; 2774 return 0;
2782 } 2775 }
2783 else if (is_character (a)) 2776 else if (is_character (a))
2784 { 2777 {
… …
2810/* () is #t in R5RS */ 2803/* () is #t in R5RS */
2811#define is_true(p) ((p) != S_F) 2804#define is_true(p) ((p) != S_F)
2812#define is_false(p) ((p) == S_F) 2805#define is_false(p) ((p) == S_F)
2813 2806
2814/* ========== Environment implementation ========== */ 2807/* ========== Environment implementation ========== */
2815
2816#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2817
2818static int
2819hash_fn (const char *key, int table_size)
2820{
2821 const unsigned char *p = key;
2822 uint32_t hash = 2166136261;
2823
2824 while (*p)
2825 hash = (hash ^ *p++) * 16777619;
2826
2827 return hash % table_size;
2828}
2829#endif
2830 2808
2831#ifndef USE_ALIST_ENV 2809#ifndef USE_ALIST_ENV
2832 2810
2833/* 2811/*
2834 * In this implementation, each frame of the environment may be 2812 * In this implementation, each frame of the environment may be
… …
2851 2829
2852 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2830 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2853 setenvironment (SCHEME_V->envir); 2831 setenvironment (SCHEME_V->envir);
2854} 2832}
2855 2833
2856static 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
2857new_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)
2858{ 2851{
2859 pointer slot = immutable_cons (variable, value); 2852 pointer slot = immutable_cons (variable, value);
2860 2853
2861 if (is_vector (car (env))) 2854 if (is_vector (car (env)))
2862 { 2855 {
2863 int location = hash_fn (symname (variable), veclength (car (env))); 2856 int location = sym_hash (variable, veclength (car (env)));
2864
2865 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)));
2866 } 2858 }
2867 else 2859 else
2868 set_car (env, immutable_cons (slot, car (env))); 2860 set_car (env, immutable_cons (slot, car (env)));
2869} 2861}
2870 2862
2871static pointer 2863static pointer
2872find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2873{ 2865{
2874 pointer x, y; 2866 pointer x, y;
2875 int location;
2876 2867
2877 for (x = env; x != NIL; x = cdr (x)) 2868 for (x = env; x != NIL; x = cdr (x))
2878 { 2869 {
2879 if (is_vector (car (x))) 2870 if (is_vector (car (x)))
2880 { 2871 {
2881 location = hash_fn (symname (hdl), veclength (car (x))); 2872 int location = sym_hash (hdl, veclength (car (x)));
2882 y = vector_elem (car (x), location); 2873 y = vector_get (car (x), location);
2883 } 2874 }
2884 else 2875 else
2885 y = car (x); 2876 y = car (x);
2886 2877
2887 for (; y != NIL; y = cdr (y)) 2878 for (; y != NIL; y = cdr (y))
2888 if (caar (y) == hdl) 2879 if (caar (y) == hdl)
2889 break; 2880 break;
2890 2881
2891 if (y != NIL) 2882 if (y != NIL)
2883 return car (y);
2884
2885 if (!all)
2892 break; 2886 break;
2893
2894 if (!all)
2895 return NIL;
2896 } 2887 }
2897
2898 if (x != NIL)
2899 return car (y);
2900 2888
2901 return NIL; 2889 return NIL;
2902} 2890}
2903 2891
2904#else /* USE_ALIST_ENV */ 2892#else /* USE_ALIST_ENV */
2905 2893
2906static INLINE void 2894ecb_inline void
2907new_frame_in_env (SCHEME_P_ pointer old_env) 2895new_frame_in_env (SCHEME_P_ pointer old_env)
2908{ 2896{
2909 SCHEME_V->envir = immutable_cons (NIL, old_env); 2897 SCHEME_V->envir = immutable_cons (NIL, old_env);
2910 setenvironment (SCHEME_V->envir); 2898 setenvironment (SCHEME_V->envir);
2911} 2899}
2912 2900
2913static INLINE void 2901ecb_inline void
2914new_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)
2915{ 2903{
2916 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2917} 2905}
2918 2906
… …
2926 for (y = car (x); y != NIL; y = cdr (y)) 2914 for (y = car (x); y != NIL; y = cdr (y))
2927 if (caar (y) == hdl) 2915 if (caar (y) == hdl)
2928 break; 2916 break;
2929 2917
2930 if (y != NIL) 2918 if (y != NIL)
2919 return car (y);
2931 break; 2920 break;
2932 2921
2933 if (!all) 2922 if (!all)
2934 return NIL; 2923 break;
2935 } 2924 }
2936
2937 if (x != NIL)
2938 return car (y);
2939 2925
2940 return NIL; 2926 return NIL;
2941} 2927}
2942 2928
2943#endif /* USE_ALIST_ENV else */ 2929#endif /* USE_ALIST_ENV else */
2944 2930
2945static INLINE void 2931ecb_inline void
2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2947{ 2933{
2948 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);
2949} 2935}
2950 2936
2951static INLINE void 2937ecb_inline void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2939{
2954 set_cdr (slot, value); 2940 set_cdr (slot, value);
2955} 2941}
2956 2942
2957static INLINE pointer 2943ecb_inline pointer
2958slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2959{ 2945{
2960 return cdr (slot); 2946 return cdr (slot);
2961} 2947}
2962 2948
2963/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2964 2950
2965static pointer 2951static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2953{
2968#if USE_ERROR_HOOK 2954#if USE_ERROR_HOOK
2969 pointer x; 2955 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK; 2956 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3005 code = cons (mk_string (SCHEME_A_ s), code); 2991 code = cons (mk_string (SCHEME_A_ s), code);
3006 setimmutable (car (code)); 2992 setimmutable (car (code));
3007 SCHEME_V->code = cons (slot_value_in_env (x), code); 2993 SCHEME_V->code = cons (slot_value_in_env (x), code);
3008 SCHEME_V->op = OP_EVAL; 2994 SCHEME_V->op = OP_EVAL;
3009 2995
3010 return S_T; 2996 return 0;
3011 } 2997 }
3012#endif 2998#endif
3013 2999
3014 if (a) 3000 if (a)
3015 SCHEME_V->args = cons (a, NIL); 3001 SCHEME_V->args = cons (a, NIL);
… …
3017 SCHEME_V->args = NIL; 3003 SCHEME_V->args = NIL;
3018 3004
3019 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);
3020 setimmutable (car (SCHEME_V->args)); 3006 setimmutable (car (SCHEME_V->args));
3021 SCHEME_V->op = OP_ERR0; 3007 SCHEME_V->op = OP_ERR0;
3008
3022 return S_T; 3009 return 0;
3023} 3010}
3024 3011
3025#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)
3026#define Error_0(s) Error_1 (s, 0) 3013#define Error_0(s) Error_1 (s, 0)
3027 3014
3028/* Too small to turn into function */ 3015/* Too small to turn into function */
3029#define BEGIN do { 3016#define BEGIN do {
3030#define END } while (0) 3017#define END } while (0)
3031#define s_goto(a) BEGIN \ 3018#define s_goto(a) BEGIN \
3032 SCHEME_V->op = a; \ 3019 SCHEME_V->op = a; \
3033 return S_T; END 3020 return 0; END
3034 3021
3035#define s_return(a) return xs_return (SCHEME_A_ a) 3022#define s_return(a) return xs_return (SCHEME_A_ a)
3036 3023
3037#ifndef USE_SCHEME_STACK 3024#ifndef USE_SCHEME_STACK
3038 3025
… …
3063 next_frame = SCHEME_V->dump_base + nframes; 3050 next_frame = SCHEME_V->dump_base + nframes;
3064 3051
3065 next_frame->op = op; 3052 next_frame->op = op;
3066 next_frame->args = args; 3053 next_frame->args = args;
3067 next_frame->envir = SCHEME_V->envir; 3054 next_frame->envir = SCHEME_V->envir;
3068 next_frame->code = code; 3055 next_frame->code = code;
3069 3056
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3058}
3072 3059
3073static pointer 3060static int
3074xs_return (SCHEME_P_ pointer a) 3061xs_return (SCHEME_P_ pointer a)
3075{ 3062{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3063 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3064 struct dump_stack_frame *frame;
3078 3065
3079 SCHEME_V->value = a; 3066 SCHEME_V->value = a;
3080 3067
3081 if (nframes <= 0) 3068 if (nframes <= 0)
3082 return NIL; 3069 return -1;
3083 3070
3084 frame = &SCHEME_V->dump_base[--nframes]; 3071 frame = &SCHEME_V->dump_base[--nframes];
3085 SCHEME_V->op = frame->op; 3072 SCHEME_V->op = frame->op;
3086 SCHEME_V->args = frame->args; 3073 SCHEME_V->args = frame->args;
3087 SCHEME_V->envir = frame->envir; 3074 SCHEME_V->envir = frame->envir;
3088 SCHEME_V->code = frame->code; 3075 SCHEME_V->code = frame->code;
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3077
3091 return S_T; 3078 return 0;
3092} 3079}
3093 3080
3094static INLINE void 3081ecb_inline void
3095dump_stack_reset (SCHEME_P) 3082dump_stack_reset (SCHEME_P)
3096{ 3083{
3097 /* 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 */
3098 SCHEME_V->dump = (pointer)+0; 3085 SCHEME_V->dump = (pointer)+0;
3099} 3086}
3100 3087
3101static INLINE void 3088ecb_inline void
3102dump_stack_initialize (SCHEME_P) 3089dump_stack_initialize (SCHEME_P)
3103{ 3090{
3104 SCHEME_V->dump_size = 0; 3091 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3093 dump_stack_reset (SCHEME_A);
… …
3159 int i = 0; 3146 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3147 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3148
3162 while (cont != NIL) 3149 while (cont != NIL)
3163 { 3150 {
3164 frame->op = ivalue (car (cont)); cont = cdr (cont); 3151 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3165 frame->args = car (cont) ; cont = cdr (cont); 3152 frame->args = car (cont) ; cont = cdr (cont);
3166 frame->envir = car (cont) ; cont = cdr (cont); 3153 frame->envir = car (cont) ; cont = cdr (cont);
3167 frame->code = car (cont) ; cont = cdr (cont); 3154 frame->code = car (cont) ; cont = cdr (cont);
3168 3155
3169 ++frame; 3156 ++frame;
3170 ++i; 3157 ++i;
3171 } 3158 }
3172 3159
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3160 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3161}
3175 3162
3176#else 3163#else
3177 3164
3178static INLINE void 3165ecb_inline void
3179dump_stack_reset (SCHEME_P) 3166dump_stack_reset (SCHEME_P)
3180{ 3167{
3181 SCHEME_V->dump = NIL; 3168 SCHEME_V->dump = NIL;
3182} 3169}
3183 3170
3184static INLINE void 3171ecb_inline void
3185dump_stack_initialize (SCHEME_P) 3172dump_stack_initialize (SCHEME_P)
3186{ 3173{
3187 dump_stack_reset (SCHEME_A); 3174 dump_stack_reset (SCHEME_A);
3188} 3175}
3189 3176
… …
3191dump_stack_free (SCHEME_P) 3178dump_stack_free (SCHEME_P)
3192{ 3179{
3193 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3194} 3181}
3195 3182
3196static pointer 3183static int
3197xs_return (SCHEME_P_ pointer a) 3184xs_return (SCHEME_P_ pointer a)
3198{ 3185{
3199 pointer dump = SCHEME_V->dump; 3186 pointer dump = SCHEME_V->dump;
3200 3187
3201 SCHEME_V->value = a; 3188 SCHEME_V->value = a;
3202 3189
3203 if (dump == NIL) 3190 if (dump == NIL)
3204 return NIL; 3191 return -1;
3205 3192
3206 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3193 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3207 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3194 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3195 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3209 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3196 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3210 3197
3211 SCHEME_V->dump = dump; 3198 SCHEME_V->dump = dump;
3212 3199
3213 return S_T; 3200 return 0;
3214} 3201}
3215 3202
3216static void 3203static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3205{
… …
3243 3230
3244#endif 3231#endif
3245 3232
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3234
3248static pointer 3235static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3236opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3237{
3238 pointer args = SCHEME_V->args;
3251 pointer x, y; 3239 pointer x, y;
3252 3240
3253 switch (op) 3241 switch (op)
3254 { 3242 {
3255 case OP_LOAD: /* load */ 3243 case OP_LOAD: /* load */
3256 if (file_interactive (SCHEME_A)) 3244 if (file_interactive (SCHEME_A))
3257 { 3245 {
3258 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3259 //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)));
3260 } 3248 }
3261 3249
3262 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3250 if (!file_push (SCHEME_A_ strvalue (car (args))))
3263 Error_1 ("unable to open", car (SCHEME_V->args)); 3251 Error_1 ("unable to open", car (args));
3264 else 3252 else
3265 { 3253 {
3266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3254 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3267 s_goto (OP_T0LVL); 3255 s_goto (OP_T0LVL);
3268 } 3256 }
… …
3342 case OP_EVAL: /* main part of evaluation */ 3330 case OP_EVAL: /* main part of evaluation */
3343#if USE_TRACING 3331#if USE_TRACING
3344 if (SCHEME_V->tracing) 3332 if (SCHEME_V->tracing)
3345 { 3333 {
3346 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3334 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3347 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);
3348 SCHEME_V->args = SCHEME_V->code; 3336 SCHEME_V->args = SCHEME_V->code;
3349 putstr (SCHEME_A_ "\nEval: "); 3337 putstr (SCHEME_A_ "\nEval: ");
3350 s_goto (OP_P0LIST); 3338 s_goto (OP_P0LIST);
3351 } 3339 }
3352 3340
… …
3396 SCHEME_V->code = cdr (SCHEME_V->code); 3384 SCHEME_V->code = cdr (SCHEME_V->code);
3397 s_goto (OP_E1ARGS); 3385 s_goto (OP_E1ARGS);
3398 } 3386 }
3399 3387
3400 case OP_E1ARGS: /* eval arguments */ 3388 case OP_E1ARGS: /* eval arguments */
3401 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3389 args = cons (SCHEME_V->value, args);
3402 3390
3403 if (is_pair (SCHEME_V->code)) /* continue */ 3391 if (is_pair (SCHEME_V->code)) /* continue */
3404 { 3392 {
3405 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));
3406 SCHEME_V->code = car (SCHEME_V->code); 3394 SCHEME_V->code = car (SCHEME_V->code);
3407 SCHEME_V->args = NIL; 3395 SCHEME_V->args = NIL;
3408 s_goto (OP_EVAL); 3396 s_goto (OP_EVAL);
3409 } 3397 }
3410 else /* end */ 3398 else /* end */
3411 { 3399 {
3412 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3400 args = reverse_in_place (SCHEME_A_ NIL, args);
3413 SCHEME_V->code = car (SCHEME_V->args); 3401 SCHEME_V->code = car (args);
3414 SCHEME_V->args = cdr (SCHEME_V->args); 3402 SCHEME_V->args = cdr (args);
3415 s_goto (OP_APPLY); 3403 s_goto (OP_APPLY);
3416 } 3404 }
3417 3405
3418#if USE_TRACING 3406#if USE_TRACING
3419 3407
3420 case OP_TRACING: 3408 case OP_TRACING:
3421 { 3409 {
3422 int tr = SCHEME_V->tracing; 3410 int tr = SCHEME_V->tracing;
3423 3411
3424 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3412 SCHEME_V->tracing = ivalue_unchecked (car (args));
3425 s_return (mk_integer (SCHEME_A_ tr)); 3413 s_return (mk_integer (SCHEME_A_ tr));
3426 } 3414 }
3427 3415
3428#endif 3416#endif
3429 3417
3430 case OP_APPLY: /* apply 'code' to 'args' */ 3418 case OP_APPLY: /* apply 'code' to 'args' */
3431#if USE_TRACING 3419#if USE_TRACING
3432 if (SCHEME_V->tracing) 3420 if (SCHEME_V->tracing)
3433 { 3421 {
3434 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);
3435 SCHEME_V->print_flag = 1; 3423 SCHEME_V->print_flag = 1;
3436 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3424 /* args=cons(SCHEME_V->code,args); */
3437 putstr (SCHEME_A_ "\nApply to: "); 3425 putstr (SCHEME_A_ "\nApply to: ");
3438 s_goto (OP_P0LIST); 3426 s_goto (OP_P0LIST);
3439 } 3427 }
3440 3428
3441 /* fall through */ 3429 /* fall through */
3442 3430
3443 case OP_REAL_APPLY: 3431 case OP_REAL_APPLY:
3444#endif 3432#endif
3445 if (is_proc (SCHEME_V->code)) 3433 if (is_proc (SCHEME_V->code))
3446 {
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 }
3449 else if (is_foreign (SCHEME_V->code)) 3435 else if (is_foreign (SCHEME_V->code))
3450 { 3436 {
3451 /* Keep nested calls from GC'ing the arglist */ 3437 /* Keep nested calls from GC'ing the arglist */
3452 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3438 push_recent_alloc (SCHEME_A_ args, NIL);
3453 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3454 3440
3455 s_return (x); 3441 s_return (x);
3456 } 3442 }
3457 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 */
3458 { 3444 {
3459 /* Should not accept promise */ 3445 /* Should not accept promise */
3460 /* make environment */ 3446 /* make environment */
3461 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3447 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3462 3448
3463 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))
3464 { 3450 {
3465 if (y == NIL) 3451 if (y == NIL)
3466 Error_0 ("not enough arguments"); 3452 Error_0 ("not enough arguments");
3467 else 3453 else
3468 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3454 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3486 s_goto (OP_BEGIN); 3472 s_goto (OP_BEGIN);
3487 } 3473 }
3488 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3474 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3489 { 3475 {
3490 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3476 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3491 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3477 s_return (args != NIL ? car (args) : NIL);
3492 } 3478 }
3493 else 3479 else
3494 Error_0 ("illegal function"); 3480 Error_0 ("illegal function");
3495 3481
3496 case OP_DOMACRO: /* do macro */ 3482 case OP_DOMACRO: /* do macro */
… …
3505 { 3491 {
3506 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);
3507 3493
3508 if (f != NIL) 3494 if (f != NIL)
3509 { 3495 {
3510 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3496 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3511 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3497 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3512 SCHEME_V->code = slot_value_in_env (f); 3498 SCHEME_V->code = slot_value_in_env (f);
3513 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3514 } 3500 }
3515 3501
… …
3526 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));
3527 3513
3528#endif 3514#endif
3529 3515
3530 case OP_MKCLOSURE: /* make-closure */ 3516 case OP_MKCLOSURE: /* make-closure */
3531 x = car (SCHEME_V->args); 3517 x = car (args);
3532 3518
3533 if (car (x) == SCHEME_V->LAMBDA) 3519 if (car (x) == SCHEME_V->LAMBDA)
3534 x = cdr (x); 3520 x = cdr (x);
3535 3521
3536 if (cdr (SCHEME_V->args) == NIL) 3522 if (cdr (args) == NIL)
3537 y = SCHEME_V->envir; 3523 y = SCHEME_V->envir;
3538 else 3524 else
3539 y = cadr (SCHEME_V->args); 3525 y = cadr (args);
3540 3526
3541 s_return (mk_closure (SCHEME_A_ x, y)); 3527 s_return (mk_closure (SCHEME_A_ x, y));
3542 3528
3543 case OP_QUOTE: /* quote */ 3529 case OP_QUOTE: /* quote */
3544 s_return (car (SCHEME_V->code)); 3530 s_return (car (SCHEME_V->code));
… …
3576 3562
3577 3563
3578 case OP_DEFP: /* defined? */ 3564 case OP_DEFP: /* defined? */
3579 x = SCHEME_V->envir; 3565 x = SCHEME_V->envir;
3580 3566
3581 if (cdr (SCHEME_V->args) != NIL) 3567 if (cdr (args) != NIL)
3582 x = cadr (SCHEME_V->args); 3568 x = cadr (args);
3583 3569
3584 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);
3585 3571
3586 case OP_SET0: /* set! */ 3572 case OP_SET0: /* set! */
3587 if (is_immutable (car (SCHEME_V->code))) 3573 if (is_immutable (car (SCHEME_V->code)))
3588 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));
3589 3575
… …
3620 3606
3621 case OP_IF1: /* if */ 3607 case OP_IF1: /* if */
3622 if (is_true (SCHEME_V->value)) 3608 if (is_true (SCHEME_V->value))
3623 SCHEME_V->code = car (SCHEME_V->code); 3609 SCHEME_V->code = car (SCHEME_V->code);
3624 else 3610 else
3625 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 */
3626
3627 * car(NIL) = NIL */
3628 s_goto (OP_EVAL); 3612 s_goto (OP_EVAL);
3629 3613
3630 case OP_LET0: /* let */ 3614 case OP_LET0: /* let */
3631 SCHEME_V->args = NIL; 3615 SCHEME_V->args = NIL;
3632 SCHEME_V->value = SCHEME_V->code; 3616 SCHEME_V->value = SCHEME_V->code;
3633 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);
3634 s_goto (OP_LET1); 3618 s_goto (OP_LET1);
3635 3619
3636 case OP_LET1: /* let (calculate parameters) */ 3620 case OP_LET1: /* let (calculate parameters) */
3637 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3621 args = cons (SCHEME_V->value, args);
3638 3622
3639 if (is_pair (SCHEME_V->code)) /* continue */ 3623 if (is_pair (SCHEME_V->code)) /* continue */
3640 { 3624 {
3641 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)))
3642 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));
3643 3627
3644 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));
3645 SCHEME_V->code = cadar (SCHEME_V->code); 3629 SCHEME_V->code = cadar (SCHEME_V->code);
3646 SCHEME_V->args = NIL; 3630 SCHEME_V->args = NIL;
3647 s_goto (OP_EVAL); 3631 s_goto (OP_EVAL);
3648 } 3632 }
3649 else /* end */ 3633 else /* end */
3650 { 3634 {
3651 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3635 args = reverse_in_place (SCHEME_A_ NIL, args);
3652 SCHEME_V->code = car (SCHEME_V->args); 3636 SCHEME_V->code = car (args);
3653 SCHEME_V->args = cdr (SCHEME_V->args); 3637 SCHEME_V->args = cdr (args);
3654 s_goto (OP_LET2); 3638 s_goto (OP_LET2);
3655 } 3639 }
3656 3640
3657 case OP_LET2: /* let */ 3641 case OP_LET2: /* let */
3658 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3642 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3659 3643
3660 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;
3661 y != NIL; x = cdr (x), y = cdr (y)) 3645 y != NIL; x = cdr (x), y = cdr (y))
3662 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3646 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3663 3647
3664 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3648 if (is_symbol (car (SCHEME_V->code))) /* named let */
3665 { 3649 {
3666 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))
3667 { 3651 {
3668 if (!is_pair (x)) 3652 if (!is_pair (x))
3669 Error_1 ("Bad syntax of binding in let :", x); 3653 Error_1 ("Bad syntax of binding in let :", x);
3670 3654
3671 if (!is_list (SCHEME_A_ car (x))) 3655 if (!is_list (SCHEME_A_ car (x)))
3672 Error_1 ("Bad syntax of binding in let :", car (x)); 3656 Error_1 ("Bad syntax of binding in let :", car (x));
3673 3657
3674 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3658 args = cons (caar (x), args);
3675 } 3659 }
3676 3660
3677 x =
3678 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)),
3679 SCHEME_V->envir); 3662 SCHEME_V->envir);
3680 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3663 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3681 SCHEME_V->code = cddr (SCHEME_V->code); 3664 SCHEME_V->code = cddr (SCHEME_V->code);
3682 SCHEME_V->args = NIL;
3683 } 3665 }
3684 else 3666 else
3685 { 3667 {
3686 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3669 }
3670
3687 SCHEME_V->args = NIL; 3671 SCHEME_V->args = NIL;
3688 }
3689
3690 s_goto (OP_BEGIN); 3672 s_goto (OP_BEGIN);
3691 3673
3692 case OP_LET0AST: /* let* */ 3674 case OP_LET0AST: /* let* */
3693 if (car (SCHEME_V->code) == NIL) 3675 if (car (SCHEME_V->code) == NIL)
3694 { 3676 {
… …
3712 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);
3713 SCHEME_V->code = cdr (SCHEME_V->code); 3695 SCHEME_V->code = cdr (SCHEME_V->code);
3714 3696
3715 if (is_pair (SCHEME_V->code)) /* continue */ 3697 if (is_pair (SCHEME_V->code)) /* continue */
3716 { 3698 {
3717 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3699 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3718 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3719 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3720 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3721 } 3703 }
3722 else /* end */ 3704 else /* end */
3723 { 3705 {
3724 SCHEME_V->code = SCHEME_V->args; 3706 SCHEME_V->code = args;
3725 SCHEME_V->args = NIL; 3707 SCHEME_V->args = NIL;
3726 s_goto (OP_BEGIN); 3708 s_goto (OP_BEGIN);
3727 } 3709 }
3728 3710
3729 case OP_LET0REC: /* letrec */ 3711 case OP_LET0REC: /* letrec */
… …
3732 SCHEME_V->value = SCHEME_V->code; 3714 SCHEME_V->value = SCHEME_V->code;
3733 SCHEME_V->code = car (SCHEME_V->code); 3715 SCHEME_V->code = car (SCHEME_V->code);
3734 s_goto (OP_LET1REC); 3716 s_goto (OP_LET1REC);
3735 3717
3736 case OP_LET1REC: /* letrec (calculate parameters) */ 3718 case OP_LET1REC: /* letrec (calculate parameters) */
3737 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3719 args = cons (SCHEME_V->value, args);
3738 3720
3739 if (is_pair (SCHEME_V->code)) /* continue */ 3721 if (is_pair (SCHEME_V->code)) /* continue */
3740 { 3722 {
3741 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)))
3742 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));
3743 3725
3744 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));
3745 SCHEME_V->code = cadar (SCHEME_V->code); 3727 SCHEME_V->code = cadar (SCHEME_V->code);
3746 SCHEME_V->args = NIL; 3728 SCHEME_V->args = NIL;
3747 s_goto (OP_EVAL); 3729 s_goto (OP_EVAL);
3748 } 3730 }
3749 else /* end */ 3731 else /* end */
3750 { 3732 {
3751 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3733 args = reverse_in_place (SCHEME_A_ NIL, args);
3752 SCHEME_V->code = car (SCHEME_V->args); 3734 SCHEME_V->code = car (args);
3753 SCHEME_V->args = cdr (SCHEME_V->args); 3735 SCHEME_V->args = cdr (args);
3754 s_goto (OP_LET2REC); 3736 s_goto (OP_LET2REC);
3755 } 3737 }
3756 3738
3757 case OP_LET2REC: /* letrec */ 3739 case OP_LET2REC: /* letrec */
3758 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))
3759 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3741 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3760 3742
3761 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3744 SCHEME_V->args = NIL;
3763 s_goto (OP_BEGIN); 3745 s_goto (OP_BEGIN);
… …
3849 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3831 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3850 SCHEME_V->code = car (SCHEME_V->code); 3832 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3833 s_goto (OP_EVAL);
3852 3834
3853 case OP_C1STREAM: /* cons-stream */ 3835 case OP_C1STREAM: /* cons-stream */
3854 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 */
3855 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);
3856 set_typeflag (x, T_PROMISE); 3838 set_typeflag (x, T_PROMISE);
3857 s_return (cons (SCHEME_V->args, x)); 3839 s_return (cons (args, x));
3858 3840
3859 case OP_MACRO0: /* macro */ 3841 case OP_MACRO0: /* macro */
3860 if (is_pair (car (SCHEME_V->code))) 3842 if (is_pair (car (SCHEME_V->code)))
3861 { 3843 {
3862 x = caar (SCHEME_V->code); 3844 x = caar (SCHEME_V->code);
… …
3895 { 3877 {
3896 if (!is_pair (y = caar (x))) 3878 if (!is_pair (y = caar (x)))
3897 break; 3879 break;
3898 3880
3899 for (; y != NIL; y = cdr (y)) 3881 for (; y != NIL; y = cdr (y))
3900 {
3901 if (eqv (car (y), SCHEME_V->value)) 3882 if (eqv (car (y), SCHEME_V->value))
3902 break; 3883 break;
3903 }
3904 3884
3905 if (y != NIL) 3885 if (y != NIL)
3906 break; 3886 break;
3907 } 3887 }
3908 3888
… …
3928 s_goto (OP_BEGIN); 3908 s_goto (OP_BEGIN);
3929 else 3909 else
3930 s_return (NIL); 3910 s_return (NIL);
3931 3911
3932 case OP_PAPPLY: /* apply */ 3912 case OP_PAPPLY: /* apply */
3933 SCHEME_V->code = car (SCHEME_V->args); 3913 SCHEME_V->code = car (args);
3934 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3914 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3935 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3915 /*SCHEME_V->args = cadr(args); */
3936 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3937 3917
3938 case OP_PEVAL: /* eval */ 3918 case OP_PEVAL: /* eval */
3939 if (cdr (SCHEME_V->args) != NIL) 3919 if (cdr (args) != NIL)
3940 SCHEME_V->envir = cadr (SCHEME_V->args); 3920 SCHEME_V->envir = cadr (args);
3941 3921
3942 SCHEME_V->code = car (SCHEME_V->args); 3922 SCHEME_V->code = car (args);
3943 s_goto (OP_EVAL); 3923 s_goto (OP_EVAL);
3944 3924
3945 case OP_CONTINUATION: /* call-with-current-continuation */ 3925 case OP_CONTINUATION: /* call-with-current-continuation */
3946 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3947 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);
3948 s_goto (OP_APPLY); 3928 s_goto (OP_APPLY);
3949 } 3929 }
3950 3930
3951 return S_T; 3931 if (USE_ERROR_CHECKING) abort ();
3952} 3932}
3953 3933
3954static pointer 3934static int
3955opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3935opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3956{ 3936{
3957 pointer x; 3937 pointer args = SCHEME_V->args;
3938 pointer x = car (args);
3958 num v; 3939 num v;
3959 3940
3941 switch (op)
3942 {
3960#if USE_MATH 3943#if USE_MATH
3961 RVALUE dd;
3962#endif
3963
3964 switch (op)
3965 {
3966#if USE_MATH
3967
3968 case OP_INEX2EX: /* inexact->exact */ 3944 case OP_INEX2EX: /* inexact->exact */
3969 x = car (SCHEME_V->args); 3945 {
3970
3971 if (num_is_integer (x)) 3946 if (is_integer (x))
3972 s_return (x); 3947 s_return (x);
3973 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3948
3949 RVALUE r = rvalue_unchecked (x);
3950
3951 if (r == (RVALUE)(IVALUE)r)
3974 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3975 else 3953 else
3976 Error_1 ("inexact->exact: not integral:", x); 3954 Error_1 ("inexact->exact: not integral:", x);
3955 }
3977 3956
3978 case OP_EXP:
3979 x = car (SCHEME_V->args);
3980 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3957 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3981
3982 case OP_LOG:
3983 x = car (SCHEME_V->args);
3984 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3958 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3985
3986 case OP_SIN:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3959 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3989
3990 case OP_COS:
3991 x = car (SCHEME_V->args);
3992 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3960 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3993
3994 case OP_TAN:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3961 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3997
3998 case OP_ASIN:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3962 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4001
4002 case OP_ACOS:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3963 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4005 3964
4006 case OP_ATAN: 3965 case OP_ATAN:
4007 x = car (SCHEME_V->args);
4008
4009 if (cdr (SCHEME_V->args) == NIL) 3966 if (cdr (args) == NIL)
4010 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3967 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4011 else 3968 else
4012 { 3969 {
4013 pointer y = cadr (SCHEME_V->args); 3970 pointer y = cadr (args);
4014
4015 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3971 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4016 } 3972 }
4017 3973
4018 case OP_SQRT: 3974 case OP_SQRT:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3975 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4021 3976
4022 case OP_EXPT: 3977 case OP_EXPT:
4023 { 3978 {
4024 RVALUE result; 3979 RVALUE result;
4025 int real_result = 1; 3980 int real_result = 1;
4026 pointer y = cadr (SCHEME_V->args); 3981 pointer y = cadr (args);
4027 3982
4028 x = car (SCHEME_V->args);
4029
4030 if (num_is_integer (x) && num_is_integer (y)) 3983 if (is_integer (x) && is_integer (y))
4031 real_result = 0; 3984 real_result = 0;
4032 3985
4033 /* This 'if' is an R5RS compatibility fix. */ 3986 /* This 'if' is an R5RS compatibility fix. */
4034 /* NOTE: Remove this 'if' fix for R6RS. */ 3987 /* NOTE: Remove this 'if' fix for R6RS. */
4035 if (rvalue (x) == 0 && rvalue (y) < 0) 3988 if (rvalue (x) == 0 && rvalue (y) < 0)
4036 result = 0.0; 3989 result = 0;
4037 else 3990 else
4038 result = pow (rvalue (x), rvalue (y)); 3991 result = pow (rvalue (x), rvalue (y));
4039 3992
4040 /* Before returning integer result make sure we can. */ 3993 /* Before returning integer result make sure we can. */
4041 /* If the test fails, result is too big for integer. */ 3994 /* If the test fails, result is too big for integer. */
4042 if (!real_result) 3995 if (!real_result)
4043 { 3996 {
4044 long result_as_long = (long) result; 3997 long result_as_long = result;
4045 3998
4046 if (result != (RVALUE) result_as_long) 3999 if (result != result_as_long)
4047 real_result = 1; 4000 real_result = 1;
4048 } 4001 }
4049 4002
4050 if (real_result) 4003 if (real_result)
4051 s_return (mk_real (SCHEME_A_ result)); 4004 s_return (mk_real (SCHEME_A_ result));
4052 else 4005 else
4053 s_return (mk_integer (SCHEME_A_ result)); 4006 s_return (mk_integer (SCHEME_A_ result));
4054 } 4007 }
4055 4008
4056 case OP_FLOOR:
4057 x = car (SCHEME_V->args);
4058 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4009 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4059
4060 case OP_CEILING:
4061 x = car (SCHEME_V->args);
4062 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4010 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4063 4011
4064 case OP_TRUNCATE: 4012 case OP_TRUNCATE:
4065 { 4013 {
4066 RVALUE rvalue_of_x; 4014 RVALUE n = rvalue (x);
4067
4068 x = car (SCHEME_V->args);
4069 rvalue_of_x = rvalue (x);
4070
4071 if (rvalue_of_x > 0)
4072 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4015 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4073 else
4074 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4075 } 4016 }
4076 4017
4077 case OP_ROUND: 4018 case OP_ROUND:
4078 x = car (SCHEME_V->args);
4079
4080 if (num_is_integer (x)) 4019 if (is_integer (x))
4081 s_return (x); 4020 s_return (x);
4082 4021
4083 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4022 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4084#endif 4023#endif
4085 4024
4086 case OP_ADD: /* + */ 4025 case OP_ADD: /* + */
4087 v = num_zero; 4026 v = num_zero;
4088 4027
4089 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4028 for (x = args; x != NIL; x = cdr (x))
4090 v = num_op ('+', v, nvalue (car (x))); 4029 v = num_op (NUM_ADD, v, nvalue (car (x)));
4091 4030
4092 s_return (mk_number (SCHEME_A_ v)); 4031 s_return (mk_number (SCHEME_A_ v));
4093 4032
4094 case OP_MUL: /* * */ 4033 case OP_MUL: /* * */
4095 v = num_one; 4034 v = num_one;
4096 4035
4097 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4036 for (x = args; x != NIL; x = cdr (x))
4098 v = num_op ('+', v, nvalue (car (x))); 4037 v = num_op (NUM_MUL, v, nvalue (car (x)));
4099 4038
4100 s_return (mk_number (SCHEME_A_ v)); 4039 s_return (mk_number (SCHEME_A_ v));
4101 4040
4102 case OP_SUB: /* - */ 4041 case OP_SUB: /* - */
4103 if (cdr (SCHEME_V->args) == NIL) 4042 if (cdr (args) == NIL)
4104 { 4043 {
4105 x = SCHEME_V->args; 4044 x = args;
4106 v = num_zero; 4045 v = num_zero;
4107 } 4046 }
4108 else 4047 else
4109 { 4048 {
4110 x = cdr (SCHEME_V->args); 4049 x = cdr (args);
4111 v = nvalue (car (SCHEME_V->args)); 4050 v = nvalue (car (args));
4112 } 4051 }
4113 4052
4114 for (; x != NIL; x = cdr (x)) 4053 for (; x != NIL; x = cdr (x))
4115 v = num_op ('+', v, nvalue (car (x))); 4054 v = num_op (NUM_SUB, v, nvalue (car (x)));
4116 4055
4117 s_return (mk_number (SCHEME_A_ v)); 4056 s_return (mk_number (SCHEME_A_ v));
4118 4057
4119 case OP_DIV: /* / */ 4058 case OP_DIV: /* / */
4120 if (cdr (SCHEME_V->args) == NIL) 4059 if (cdr (args) == NIL)
4121 { 4060 {
4122 x = SCHEME_V->args; 4061 x = args;
4123 v = num_one; 4062 v = num_one;
4124 } 4063 }
4125 else 4064 else
4126 { 4065 {
4127 x = cdr (SCHEME_V->args); 4066 x = cdr (args);
4128 v = nvalue (car (SCHEME_V->args)); 4067 v = nvalue (car (args));
4129 } 4068 }
4130 4069
4131 for (; x != NIL; x = cdr (x)) 4070 for (; x != NIL; x = cdr (x))
4132 {
4133 if (!is_zero_rvalue (rvalue (car (x)))) 4071 if (!is_zero_rvalue (rvalue (car (x))))
4134 v = num_div (v, nvalue (car (x))); 4072 v = num_div (v, nvalue (car (x)));
4135 else 4073 else
4136 Error_0 ("/: division by zero"); 4074 Error_0 ("/: division by zero");
4137 }
4138 4075
4139 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4140 4077
4141 case OP_INTDIV: /* quotient */ 4078 case OP_INTDIV: /* quotient */
4142 if (cdr (SCHEME_V->args) == NIL) 4079 if (cdr (args) == NIL)
4143 { 4080 {
4144 x = SCHEME_V->args; 4081 x = args;
4145 v = num_one; 4082 v = num_one;
4146 } 4083 }
4147 else 4084 else
4148 { 4085 {
4149 x = cdr (SCHEME_V->args); 4086 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4087 v = nvalue (car (args));
4151 } 4088 }
4152 4089
4153 for (; x != NIL; x = cdr (x)) 4090 for (; x != NIL; x = cdr (x))
4154 { 4091 {
4155 if (ivalue (car (x)) != 0) 4092 if (ivalue (car (x)) != 0)
4156 v = num_op ('/', v, nvalue (car (x))); 4093 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4157 else 4094 else
4158 Error_0 ("quotient: division by zero"); 4095 Error_0 ("quotient: division by zero");
4159 } 4096 }
4160 4097
4161 s_return (mk_number (SCHEME_A_ v)); 4098 s_return (mk_number (SCHEME_A_ v));
4162 4099
4163 case OP_REM: /* remainder */ 4100 case OP_REM: /* remainder */
4164 v = nvalue (car (SCHEME_V->args)); 4101 v = nvalue (x);
4165 4102
4166 if (ivalue (cadr (SCHEME_V->args)) != 0) 4103 if (ivalue (cadr (args)) != 0)
4167 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4104 v = num_rem (v, nvalue (cadr (args)));
4168 else 4105 else
4169 Error_0 ("remainder: division by zero"); 4106 Error_0 ("remainder: division by zero");
4170 4107
4171 s_return (mk_number (SCHEME_A_ v)); 4108 s_return (mk_number (SCHEME_A_ v));
4172 4109
4173 case OP_MOD: /* modulo */ 4110 case OP_MOD: /* modulo */
4174 v = nvalue (car (SCHEME_V->args)); 4111 v = nvalue (x);
4175 4112
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4113 if (ivalue (cadr (args)) != 0)
4177 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4114 v = num_mod (v, nvalue (cadr (args)));
4178 else 4115 else
4179 Error_0 ("modulo: division by zero"); 4116 Error_0 ("modulo: division by zero");
4180 4117
4181 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4182 4119
4183 case OP_CAR: /* car */ 4120 case OP_CAR: /* car */
4184 s_return (caar (SCHEME_V->args)); 4121 s_return (caar (args));
4185 4122
4186 case OP_CDR: /* cdr */ 4123 case OP_CDR: /* cdr */
4187 s_return (cdar (SCHEME_V->args)); 4124 s_return (cdar (args));
4188 4125
4189 case OP_CONS: /* cons */ 4126 case OP_CONS: /* cons */
4190 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4127 set_cdr (args, cadr (args));
4191 s_return (SCHEME_V->args); 4128 s_return (args);
4192 4129
4193 case OP_SETCAR: /* set-car! */ 4130 case OP_SETCAR: /* set-car! */
4194 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4195 { 4132 {
4196 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_car (x, cadr (args));
4197 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4198 } 4135 }
4199 else 4136 else
4200 Error_0 ("set-car!: unable to alter immutable pair"); 4137 Error_0 ("set-car!: unable to alter immutable pair");
4201 4138
4202 case OP_SETCDR: /* set-cdr! */ 4139 case OP_SETCDR: /* set-cdr! */
4203 if (!is_immutable (car (SCHEME_V->args))) 4140 if (!is_immutable (x))
4204 { 4141 {
4205 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4142 set_cdr (x, cadr (args));
4206 s_return (car (SCHEME_V->args)); 4143 s_return (car (args));
4207 } 4144 }
4208 else 4145 else
4209 Error_0 ("set-cdr!: unable to alter immutable pair"); 4146 Error_0 ("set-cdr!: unable to alter immutable pair");
4210 4147
4211 case OP_CHAR2INT: /* char->integer */ 4148 case OP_CHAR2INT: /* char->integer */
4212 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4149 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4213 4150
4214 case OP_INT2CHAR: /* integer->char */ 4151 case OP_INT2CHAR: /* integer->char */
4215 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4152 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4216 4153
4217 case OP_CHARUPCASE: 4154 case OP_CHARUPCASE:
4218 { 4155 {
4219 unsigned char c = ivalue (car (SCHEME_V->args)); 4156 unsigned char c = ivalue_unchecked (x);
4220 c = toupper (c); 4157 c = toupper (c);
4221 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4222 } 4159 }
4223 4160
4224 case OP_CHARDNCASE: 4161 case OP_CHARDNCASE:
4225 { 4162 {
4226 unsigned char c = ivalue (car (SCHEME_V->args)); 4163 unsigned char c = ivalue_unchecked (x);
4227 c = tolower (c); 4164 c = tolower (c);
4228 s_return (mk_character (SCHEME_A_ c)); 4165 s_return (mk_character (SCHEME_A_ c));
4229 } 4166 }
4230 4167
4231 case OP_STR2SYM: /* string->symbol */ 4168 case OP_STR2SYM: /* string->symbol */
4232 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4169 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4233 4170
4234 case OP_STR2ATOM: /* string->atom */ 4171 case OP_STR2ATOM: /* string->atom */
4235 { 4172 {
4236 char *s = strvalue (car (SCHEME_V->args)); 4173 char *s = strvalue (x);
4237 long pf = 0; 4174 long pf = 0;
4238 4175
4239 if (cdr (SCHEME_V->args) != NIL) 4176 if (cdr (args) != NIL)
4240 { 4177 {
4241 /* we know cadr(SCHEME_V->args) is a natural number */ 4178 /* we know cadr(args) is a natural number */
4242 /* see if it is 2, 8, 10, or 16, or error */ 4179 /* see if it is 2, 8, 10, or 16, or error */
4243 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4180 pf = ivalue_unchecked (cadr (args));
4244 4181
4245 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4182 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4246 { 4183 {
4247 /* base is OK */ 4184 /* base is OK */
4248 } 4185 }
4249 else 4186 else
4250 pf = -1; 4187 pf = -1;
4251 } 4188 }
4252 4189
4253 if (pf < 0) 4190 if (pf < 0)
4254 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4191 Error_1 ("string->atom: bad base:", cadr (args));
4255 else if (*s == '#') /* no use of base! */ 4192 else if (*s == '#') /* no use of base! */
4256 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4193 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4257 else 4194 else
4258 { 4195 {
4259 if (pf == 0 || pf == 10) 4196 if (pf == 0 || pf == 10)
… …
4270 } 4207 }
4271 } 4208 }
4272 } 4209 }
4273 4210
4274 case OP_SYM2STR: /* symbol->string */ 4211 case OP_SYM2STR: /* symbol->string */
4275 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4212 x = mk_string (SCHEME_A_ symname (x));
4276 setimmutable (x); 4213 setimmutable (x);
4277 s_return (x); 4214 s_return (x);
4278 4215
4279 case OP_ATOM2STR: /* atom->string */ 4216 case OP_ATOM2STR: /* atom->string */
4280 { 4217 {
4281 long pf = 0; 4218 long pf = 0;
4282 4219
4283 x = car (SCHEME_V->args);
4284
4285 if (cdr (SCHEME_V->args) != NIL) 4220 if (cdr (args) != NIL)
4286 { 4221 {
4287 /* we know cadr(SCHEME_V->args) is a natural number */ 4222 /* we know cadr(args) is a natural number */
4288 /* see if it is 2, 8, 10, or 16, or error */ 4223 /* see if it is 2, 8, 10, or 16, or error */
4289 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4224 pf = ivalue_unchecked (cadr (args));
4290 4225
4291 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))
4292 { 4227 {
4293 /* base is OK */ 4228 /* base is OK */
4294 } 4229 }
4295 else 4230 else
4296 pf = -1; 4231 pf = -1;
4297 } 4232 }
4298 4233
4299 if (pf < 0) 4234 if (pf < 0)
4300 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4235 Error_1 ("atom->string: bad base:", cadr (args));
4301 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))
4302 { 4237 {
4303 char *p; 4238 char *p;
4304 int len; 4239 int len;
4305 4240
… …
4310 Error_1 ("atom->string: not an atom:", x); 4245 Error_1 ("atom->string: not an atom:", x);
4311 } 4246 }
4312 4247
4313 case OP_MKSTRING: /* make-string */ 4248 case OP_MKSTRING: /* make-string */
4314 { 4249 {
4315 int fill = ' '; 4250 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4316 int len; 4251 int len = ivalue_unchecked (x);
4317 4252
4318 len = ivalue (car (SCHEME_V->args));
4319
4320 if (cdr (SCHEME_V->args) != NIL)
4321 fill = charvalue (cadr (SCHEME_V->args));
4322
4323 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4324 } 4254 }
4325 4255
4326 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4327 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4328 4258
4329 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4330 { 4260 {
4331 char *str; 4261 char *str = strvalue (x);
4332 int index;
4333
4334 str = strvalue (car (SCHEME_V->args));
4335
4336 index = ivalue (cadr (SCHEME_V->args)); 4262 int index = ivalue_unchecked (cadr (args));
4337 4263
4338 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4339 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4340 4266
4341 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4342 } 4268 }
4343 4269
4344 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4345 { 4271 {
4346 char *str; 4272 char *str = strvalue (x);
4347 int index; 4273 int index = ivalue_unchecked (cadr (args));
4348 int c; 4274 int c;
4349 4275
4350 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4351 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4352 4278
4353 str = strvalue (car (SCHEME_V->args));
4354
4355 index = ivalue (cadr (SCHEME_V->args));
4356
4357 if (index >= strlength (car (SCHEME_V->args))) 4279 if (index >= strlength (x))
4358 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4280 Error_1 ("string-set!: out of bounds:", cadr (args));
4359 4281
4360 c = charvalue (caddr (SCHEME_V->args)); 4282 c = charvalue (caddr (args));
4361 4283
4362 str[index] = (char) c; 4284 str[index] = c;
4363 s_return (car (SCHEME_V->args)); 4285 s_return (car (args));
4364 } 4286 }
4365 4287
4366 case OP_STRAPPEND: /* string-append */ 4288 case OP_STRAPPEND: /* string-append */
4367 { 4289 {
4368 /* 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 */
4369 int len = 0; 4291 int len = 0;
4370 pointer newstr; 4292 pointer newstr;
4371 char *pos; 4293 char *pos;
4372 4294
4373 /* compute needed length for new string */ 4295 /* compute needed length for new string */
4374 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4296 for (x = args; x != NIL; x = cdr (x))
4375 len += strlength (car (x)); 4297 len += strlength (car (x));
4376 4298
4377 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4299 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4378 4300
4379 /* store the contents of the argument strings into the new string */ 4301 /* store the contents of the argument strings into the new string */
4380 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))
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4303 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4304
4383 s_return (newstr); 4305 s_return (newstr);
4384 } 4306 }
4385 4307
4386 case OP_SUBSTR: /* substring */ 4308 case OP_SUBSTR: /* substring */
4387 { 4309 {
4388 char *str; 4310 char *str = strvalue (x);
4389 int index0; 4311 int index0 = ivalue_unchecked (cadr (args));
4390 int index1; 4312 int index1;
4391 int len; 4313 int len;
4392 4314
4393 str = strvalue (car (SCHEME_V->args));
4394
4395 index0 = ivalue (cadr (SCHEME_V->args));
4396
4397 if (index0 > strlength (car (SCHEME_V->args))) 4315 if (index0 > strlength (x))
4398 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4316 Error_1 ("substring: start out of bounds:", cadr (args));
4399 4317
4400 if (cddr (SCHEME_V->args) != NIL) 4318 if (cddr (args) != NIL)
4401 { 4319 {
4402 index1 = ivalue (caddr (SCHEME_V->args)); 4320 index1 = ivalue_unchecked (caddr (args));
4403 4321
4404 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4322 if (index1 > strlength (x) || index1 < index0)
4405 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4323 Error_1 ("substring: end out of bounds:", caddr (args));
4406 } 4324 }
4407 else 4325 else
4408 index1 = strlength (car (SCHEME_V->args)); 4326 index1 = strlength (x);
4409 4327
4410 len = index1 - index0; 4328 len = index1 - index0;
4411 x = mk_empty_string (SCHEME_A_ len, ' '); 4329 x = mk_empty_string (SCHEME_A_ len, ' ');
4412 memcpy (strvalue (x), str + index0, len); 4330 memcpy (strvalue (x), str + index0, len);
4413 strvalue (x)[len] = 0; 4331 strvalue (x)[len] = 0;
… …
4417 4335
4418 case OP_VECTOR: /* vector */ 4336 case OP_VECTOR: /* vector */
4419 { 4337 {
4420 int i; 4338 int i;
4421 pointer vec; 4339 pointer vec;
4422 int len = list_length (SCHEME_A_ SCHEME_V->args); 4340 int len = list_length (SCHEME_A_ args);
4423 4341
4424 if (len < 0) 4342 if (len < 0)
4425 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4343 Error_1 ("vector: not a proper list:", args);
4426 4344
4427 vec = mk_vector (SCHEME_A_ len); 4345 vec = mk_vector (SCHEME_A_ len);
4428 4346
4429#if USE_ERROR_CHECKING 4347#if USE_ERROR_CHECKING
4430 if (SCHEME_V->no_memory) 4348 if (SCHEME_V->no_memory)
4431 s_return (S_SINK); 4349 s_return (S_SINK);
4432#endif 4350#endif
4433 4351
4434 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++)
4435 set_vector_elem (vec, i, car (x)); 4353 vector_set (vec, i, car (x));
4436 4354
4437 s_return (vec); 4355 s_return (vec);
4438 } 4356 }
4439 4357
4440 case OP_MKVECTOR: /* make-vector */ 4358 case OP_MKVECTOR: /* make-vector */
4441 { 4359 {
4442 pointer fill = NIL; 4360 pointer fill = NIL;
4443 int len;
4444 pointer vec; 4361 pointer vec;
4362 int len = ivalue_unchecked (x);
4445 4363
4446 len = ivalue (car (SCHEME_V->args));
4447
4448 if (cdr (SCHEME_V->args) != NIL) 4364 if (cdr (args) != NIL)
4449 fill = cadr (SCHEME_V->args); 4365 fill = cadr (args);
4450 4366
4451 vec = mk_vector (SCHEME_A_ len); 4367 vec = mk_vector (SCHEME_A_ len);
4452 4368
4453#if USE_ERROR_CHECKING 4369#if USE_ERROR_CHECKING
4454 if (SCHEME_V->no_memory) 4370 if (SCHEME_V->no_memory)
4455 s_return (S_SINK); 4371 s_return (S_SINK);
4456#endif 4372#endif
4457 4373
4458 if (fill != NIL) 4374 if (fill != NIL)
4459 fill_vector (vec, fill); 4375 fill_vector (vec, 0, fill);
4460 4376
4461 s_return (vec); 4377 s_return (vec);
4462 } 4378 }
4463 4379
4464 case OP_VECLEN: /* vector-length */ 4380 case OP_VECLEN: /* vector-length */
4465 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4381 s_return (mk_integer (SCHEME_A_ veclength (x)));
4466 4382
4467 case OP_VECREF: /* vector-ref */ 4383 case OP_VECREF: /* vector-ref */
4468 { 4384 {
4469 int index;
4470
4471 index = ivalue (cadr (SCHEME_V->args)); 4385 int index = ivalue_unchecked (cadr (args));
4472 4386
4473 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4474 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4388 Error_1 ("vector-ref: out of bounds:", cadr (args));
4475 4389
4476 s_return (vector_elem (car (SCHEME_V->args), index)); 4390 s_return (vector_get (x, index));
4477 } 4391 }
4478 4392
4479 case OP_VECSET: /* vector-set! */ 4393 case OP_VECSET: /* vector-set! */
4480 { 4394 {
4481 int index; 4395 int index = ivalue_unchecked (cadr (args));
4482 4396
4483 if (is_immutable (car (SCHEME_V->args))) 4397 if (is_immutable (x))
4484 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4398 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4485 4399
4486 index = ivalue (cadr (SCHEME_V->args));
4487
4488 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4489 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-set!: out of bounds:", cadr (args));
4490 4402
4491 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4403 vector_set (x, index, caddr (args));
4492 s_return (car (SCHEME_V->args)); 4404 s_return (x);
4493 } 4405 }
4494 } 4406 }
4495 4407
4496 return S_T; 4408 if (USE_ERROR_CHECKING) abort ();
4497} 4409}
4498 4410
4499INTERFACE int 4411static int
4500is_list (SCHEME_P_ pointer a) 4412opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4501{ 4413{
4502 return list_length (SCHEME_A_ a) >= 0; 4414 pointer x = SCHEME_V->args;
4503}
4504 4415
4505/* Result is: 4416 for (;;)
4506 proper list: length
4507 circular list: -1
4508 not even a pair: -2
4509 dotted list: -2 minus length before dot
4510*/
4511INTERFACE int
4512list_length (SCHEME_P_ pointer a)
4513{
4514 int i = 0;
4515 pointer slow, fast;
4516
4517 slow = fast = a;
4518
4519 while (1)
4520 { 4417 {
4418 num v = nvalue (car (x));
4419 x = cdr (x);
4420
4521 if (fast == NIL) 4421 if (x == NIL)
4522 return i; 4422 break;
4523 4423
4524 if (!is_pair (fast)) 4424 int r = num_cmp (v, nvalue (car (x)));
4525 return -2 - i;
4526 4425
4527 fast = cdr (fast); 4426 switch (op)
4528 ++i;
4529
4530 if (fast == NIL)
4531 return i;
4532
4533 if (!is_pair (fast))
4534 return -2 - i;
4535
4536 ++i;
4537 fast = cdr (fast);
4538
4539 /* Safe because we would have already returned if `fast'
4540 encountered a non-pair. */
4541 slow = cdr (slow);
4542
4543 if (fast == slow)
4544 { 4427 {
4545 /* the fast pointer has looped back around and caught up 4428 case OP_NUMEQ: r = r == 0; break;
4546 with the slow pointer, hence the structure is circular, 4429 case OP_LESS: r = r < 0; break;
4547 not of finite length, and therefore not a list */ 4430 case OP_GRE: r = r > 0; break;
4548 return -1; 4431 case OP_LEQ: r = r <= 0; break;
4432 case OP_GEQ: r = r >= 0; break;
4549 } 4433 }
4550 }
4551}
4552 4434
4435 if (!r)
4436 s_return (S_F);
4437 }
4438
4439 s_return (S_T);
4440}
4441
4553static pointer 4442static int
4554opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4443opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4444{
4556 pointer x; 4445 pointer args = SCHEME_V->args;
4557 num v; 4446 pointer a = car (args);
4558 int (*comp_func) (num, num); 4447 pointer d = cdr (args);
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 s_retbool (is_false (car (SCHEME_V->args))); 4453 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4564 4462
4565 case OP_BOOLP: /* boolean? */
4566 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4567
4568 case OP_EOFOBJP: /* boolean? */
4569 s_retbool (car (SCHEME_V->args) == S_EOF);
4570
4571 case OP_NULLP: /* null? */
4572 s_retbool (car (SCHEME_V->args) == NIL);
4573
4574 case OP_NUMEQ: /* = */
4575 case OP_LESS: /* < */
4576 case OP_GRE: /* > */
4577 case OP_LEQ: /* <= */
4578 case OP_GEQ: /* >= */
4579 switch (op)
4580 {
4581 case OP_NUMEQ:
4582 comp_func = num_eq;
4583 break;
4584
4585 case OP_LESS:
4586 comp_func = num_lt;
4587 break;
4588
4589 case OP_GRE:
4590 comp_func = num_gt;
4591 break;
4592
4593 case OP_LEQ:
4594 comp_func = num_le;
4595 break;
4596
4597 case OP_GEQ:
4598 comp_func = num_ge;
4599 break;
4600 }
4601
4602 x = SCHEME_V->args;
4603 v = nvalue (car (x));
4604 x = cdr (x);
4605
4606 for (; x != NIL; x = cdr (x))
4607 {
4608 if (!comp_func (v, nvalue (car (x))))
4609 s_retbool (0);
4610
4611 v = nvalue (car (x));
4612 }
4613
4614 s_retbool (1);
4615
4616 case OP_SYMBOLP: /* symbol? */
4617 s_retbool (is_symbol (car (SCHEME_V->args)));
4618
4619 case OP_NUMBERP: /* number? */
4620 s_retbool (is_number (car (SCHEME_V->args)));
4621
4622 case OP_STRINGP: /* string? */
4623 s_retbool (is_string (car (SCHEME_V->args)));
4624
4625 case OP_INTEGERP: /* integer? */
4626 s_retbool (is_integer (car (SCHEME_V->args)));
4627
4628 case OP_REALP: /* real? */
4629 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4630
4631 case OP_CHARP: /* char? */
4632 s_retbool (is_character (car (SCHEME_V->args)));
4633#if USE_CHAR_CLASSIFIERS 4463#if USE_CHAR_CLASSIFIERS
4634 4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4635 case OP_CHARAP: /* char-alphabetic? */ 4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4636 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4637 4467 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4638 case OP_CHARNP: /* char-numeric? */ 4468 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4639 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4640
4641 case OP_CHARWP: /* char-whitespace? */
4642 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4643
4644 case OP_CHARUP: /* char-upper-case? */
4645 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4646
4647 case OP_CHARLP: /* char-lower-case? */
4648 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4649#endif 4469#endif
4470
4650#if USE_PORTS 4471#if USE_PORTS
4651 4472 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4652 case OP_PORTP: /* port? */
4653 s_retbool (is_port (car (SCHEME_V->args)));
4654
4655 case OP_INPORTP: /* input-port? */ 4473 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4656 s_retbool (is_inport (car (SCHEME_V->args)));
4657
4658 case OP_OUTPORTP: /* output-port? */ 4474 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4659 s_retbool (is_outport (car (SCHEME_V->args)));
4660#endif 4475#endif
4661 4476
4662 case OP_PROCP: /* procedure? */ 4477 case OP_PROCP: /* procedure? */
4663 4478
4664 /*-- 4479 /*--
4665 * continuation should be procedure by the example 4480 * continuation should be procedure by the example
4666 * (call-with-current-continuation procedure?) ==> #t 4481 * (call-with-current-continuation procedure?) ==> #t
4667 * in R^3 report sec. 6.9 4482 * in R^3 report sec. 6.9
4668 */ 4483 */
4669 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4484 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4670 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4485 break;
4671 4486
4672 case OP_PAIRP: /* pair? */ 4487 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4673 s_retbool (is_pair (car (SCHEME_V->args))); 4488 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4674 4489 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4675 case OP_LISTP: /* list? */ 4490 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4676 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4491 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4677 4492 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4678 case OP_ENVP: /* environment? */
4679 s_retbool (is_environment (car (SCHEME_V->args)));
4680
4681 case OP_VECTORP: /* vector? */
4682 s_retbool (is_vector (car (SCHEME_V->args)));
4683
4684 case OP_EQ: /* eq? */
4685 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4686
4687 case OP_EQV: /* eqv? */
4688 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4689 } 4493 }
4690 4494
4691 return S_T; 4495 s_retbool (r);
4692} 4496}
4693 4497
4694static pointer 4498static int
4695opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4696{ 4500{
4501 pointer args = SCHEME_V->args;
4502 pointer a = car (args);
4697 pointer x, y; 4503 pointer x, y;
4698 4504
4699 switch (op) 4505 switch (op)
4700 { 4506 {
4701 case OP_FORCE: /* force */ 4507 case OP_FORCE: /* force */
4702 SCHEME_V->code = car (SCHEME_V->args); 4508 SCHEME_V->code = a;
4703 4509
4704 if (is_promise (SCHEME_V->code)) 4510 if (is_promise (SCHEME_V->code))
4705 { 4511 {
4706 /* Should change type to closure here */ 4512 /* Should change type to closure here */
4707 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4513 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4728 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4534 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4729 SCHEME_V->outport = cadr (SCHEME_V->args); 4535 SCHEME_V->outport = cadr (SCHEME_V->args);
4730 } 4536 }
4731 } 4537 }
4732 4538
4733 SCHEME_V->args = car (SCHEME_V->args); 4539 SCHEME_V->args = a;
4734 4540
4735 if (op == OP_WRITE) 4541 if (op == OP_WRITE)
4736 SCHEME_V->print_flag = 1; 4542 SCHEME_V->print_flag = 1;
4737 else 4543 else
4738 SCHEME_V->print_flag = 0; 4544 SCHEME_V->print_flag = 0;
4739 4545
4740 s_goto (OP_P0LIST); 4546 s_goto (OP_P0LIST);
4741 4547
4742 case OP_NEWLINE: /* newline */ 4548 case OP_NEWLINE: /* newline */
4743 if (is_pair (SCHEME_V->args)) 4549 if (is_pair (args))
4744 { 4550 {
4745 if (car (SCHEME_V->args) != SCHEME_V->outport) 4551 if (a != SCHEME_V->outport)
4746 { 4552 {
4747 x = cons (SCHEME_V->outport, NIL); 4553 x = cons (SCHEME_V->outport, NIL);
4748 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4554 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4749 SCHEME_V->outport = car (SCHEME_V->args); 4555 SCHEME_V->outport = a;
4750 } 4556 }
4751 } 4557 }
4752 4558
4753 putstr (SCHEME_A_ "\n"); 4559 putstr (SCHEME_A_ "\n");
4754 s_return (S_T); 4560 s_return (S_T);
4755#endif 4561#endif
4756 4562
4757 case OP_ERR0: /* error */ 4563 case OP_ERR0: /* error */
4758 SCHEME_V->retcode = -1; 4564 SCHEME_V->retcode = -1;
4759 4565
4760 if (!is_string (car (SCHEME_V->args))) 4566 if (!is_string (a))
4761 { 4567 {
4762 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4568 args = cons (mk_string (SCHEME_A_ " -- "), args);
4763 setimmutable (car (SCHEME_V->args)); 4569 setimmutable (car (args));
4764 } 4570 }
4765 4571
4766 putstr (SCHEME_A_ "Error: "); 4572 putstr (SCHEME_A_ "Error: ");
4767 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4573 putstr (SCHEME_A_ strvalue (car (args)));
4768 SCHEME_V->args = cdr (SCHEME_V->args); 4574 SCHEME_V->args = cdr (args);
4769 s_goto (OP_ERR1); 4575 s_goto (OP_ERR1);
4770 4576
4771 case OP_ERR1: /* error */ 4577 case OP_ERR1: /* error */
4772 putstr (SCHEME_A_ " "); 4578 putstr (SCHEME_A_ " ");
4773 4579
4774 if (SCHEME_V->args != NIL) 4580 if (args != NIL)
4775 { 4581 {
4776 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4582 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4777 SCHEME_V->args = car (SCHEME_V->args); 4583 SCHEME_V->args = a;
4778 SCHEME_V->print_flag = 1; 4584 SCHEME_V->print_flag = 1;
4779 s_goto (OP_P0LIST); 4585 s_goto (OP_P0LIST);
4780 } 4586 }
4781 else 4587 else
4782 { 4588 {
4783 putstr (SCHEME_A_ "\n"); 4589 putstr (SCHEME_A_ "\n");
4784 4590
4785 if (SCHEME_V->interactive_repl) 4591 if (SCHEME_V->interactive_repl)
4786 s_goto (OP_T0LVL); 4592 s_goto (OP_T0LVL);
4787 else 4593 else
4788 return NIL; 4594 return -1;
4789 } 4595 }
4790 4596
4791 case OP_REVERSE: /* reverse */ 4597 case OP_REVERSE: /* reverse */
4792 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4598 s_return (reverse (SCHEME_A_ a));
4793 4599
4794 case OP_LIST_STAR: /* list* */ 4600 case OP_LIST_STAR: /* list* */
4795 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4601 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4796 4602
4797 case OP_APPEND: /* append */ 4603 case OP_APPEND: /* append */
4798 x = NIL; 4604 x = NIL;
4799 y = SCHEME_V->args; 4605 y = args;
4800 4606
4801 if (y == x) 4607 if (y == x)
4802 s_return (x); 4608 s_return (x);
4803 4609
4804 /* cdr() in the while condition is not a typo. If car() */ 4610 /* cdr() in the while condition is not a typo. If car() */
… …
4815 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4621 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4816 4622
4817#if USE_PLIST 4623#if USE_PLIST
4818 4624
4819 case OP_PUT: /* put */ 4625 case OP_PUT: /* put */
4820 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4626 if (!hasprop (a) || !hasprop (cadr (args)))
4821 Error_0 ("illegal use of put"); 4627 Error_0 ("illegal use of put");
4822 4628
4823 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))
4824 { 4630 {
4825 if (caar (x) == y) 4631 if (caar (x) == y)
4826 break; 4632 break;
4827 } 4633 }
4828 4634
4829 if (x != NIL) 4635 if (x != NIL)
4830 cdar (x) = caddr (SCHEME_V->args); 4636 cdar (x) = caddr (args);
4831 else 4637 else
4832 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));
4833 4639
4834 s_return (S_T); 4640 s_return (S_T);
4835 4641
4836 case OP_GET: /* get */ 4642 case OP_GET: /* get */
4837 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4643 if (!hasprop (a) || !hasprop (cadr (args)))
4838 Error_0 ("illegal use of get"); 4644 Error_0 ("illegal use of get");
4839 4645
4840 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))
4841 if (caar (x) == y) 4647 if (caar (x) == y)
4842 break; 4648 break;
4843 4649
4844 if (x != NIL) 4650 if (x != NIL)
4845 s_return (cdar (x)); 4651 s_return (cdar (x));
… …
4847 s_return (NIL); 4653 s_return (NIL);
4848 4654
4849#endif /* USE_PLIST */ 4655#endif /* USE_PLIST */
4850 4656
4851 case OP_QUIT: /* quit */ 4657 case OP_QUIT: /* quit */
4852 if (is_pair (SCHEME_V->args)) 4658 if (is_pair (args))
4853 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4659 SCHEME_V->retcode = ivalue (a);
4854 4660
4855 return NIL; 4661 return -1;
4856 4662
4857 case OP_GC: /* gc */ 4663 case OP_GC: /* gc */
4858 gc (SCHEME_A_ NIL, NIL); 4664 gc (SCHEME_A_ NIL, NIL);
4859 s_return (S_T); 4665 s_return (S_T);
4860 4666
4861 case OP_GCVERB: /* gc-verbose */ 4667 case OP_GCVERB: /* gc-verbose */
4862 { 4668 {
4863 int was = SCHEME_V->gc_verbose; 4669 int was = SCHEME_V->gc_verbose;
4864 4670
4865 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4671 SCHEME_V->gc_verbose = (a != S_F);
4866 s_retbool (was); 4672 s_retbool (was);
4867 } 4673 }
4868 4674
4869 case OP_NEWSEGMENT: /* new-segment */ 4675 case OP_NEWSEGMENT: /* new-segment */
4870 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4676 if (!is_pair (args) || !is_number (a))
4871 Error_0 ("new-segment: argument must be a number"); 4677 Error_0 ("new-segment: argument must be a number");
4872 4678
4873 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4679 alloc_cellseg (SCHEME_A_ ivalue (a));
4874 4680
4875 s_return (S_T); 4681 s_return (S_T);
4876 4682
4877 case OP_OBLIST: /* oblist */ 4683 case OP_OBLIST: /* oblist */
4878 s_return (oblist_all_symbols (SCHEME_A)); 4684 s_return (oblist_all_symbols (SCHEME_A));
… …
4905 case OP_OPEN_INOUTFILE: 4711 case OP_OPEN_INOUTFILE:
4906 prop = port_input | port_output; 4712 prop = port_input | port_output;
4907 break; 4713 break;
4908 } 4714 }
4909 4715
4910 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4716 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4911 4717
4912 if (p == NIL) 4718 s_return (p == NIL ? S_F : p);
4913 s_return (S_F);
4914
4915 s_return (p);
4916 } 4719 }
4917 4720
4918# if USE_STRING_PORTS 4721# if USE_STRING_PORTS
4919 4722
4920 case OP_OPEN_INSTRING: /* open-input-string */ 4723 case OP_OPEN_INSTRING: /* open-input-string */
… …
4932 case OP_OPEN_INOUTSTRING: 4735 case OP_OPEN_INOUTSTRING:
4933 prop = port_input | port_output; 4736 prop = port_input | port_output;
4934 break; 4737 break;
4935 } 4738 }
4936 4739
4937 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4740 p = port_from_string (SCHEME_A_ strvalue (a),
4938 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4741 strvalue (a) + strlength (a), prop);
4939 4742
4940 if (p == NIL) 4743 s_return (p == NIL ? S_F : p);
4941 s_return (S_F);
4942
4943 s_return (p);
4944 } 4744 }
4945 4745
4946 case OP_OPEN_OUTSTRING: /* open-output-string */ 4746 case OP_OPEN_OUTSTRING: /* open-output-string */
4947 { 4747 {
4948 pointer p; 4748 pointer p;
4949 4749
4950 if (car (SCHEME_V->args) == NIL) 4750 if (a == NIL)
4951 {
4952 p = port_from_scratch (SCHEME_A); 4751 p = port_from_scratch (SCHEME_A);
4953
4954 if (p == NIL)
4955 s_return (S_F);
4956 }
4957 else 4752 else
4958 {
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4754 strvalue (a) + strlength (a), port_output);
4961 4755
4962 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964 }
4965
4966 s_return (p);
4967 } 4757 }
4968 4758
4969 case OP_GET_OUTSTRING: /* get-output-string */ 4759 case OP_GET_OUTSTRING: /* get-output-string */
4970 { 4760 {
4971 port *p; 4761 port *p;
4972 4762
4973 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4763 if ((p = a->object.port)->kind & port_string)
4974 { 4764 {
4975 off_t size; 4765 off_t size;
4976 char *str; 4766 char *str;
4977 4767
4978 size = p->rep.string.curr - p->rep.string.start + 1; 4768 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4994 } 4784 }
4995 4785
4996# endif 4786# endif
4997 4787
4998 case OP_CLOSE_INPORT: /* close-input-port */ 4788 case OP_CLOSE_INPORT: /* close-input-port */
4999 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4789 port_close (SCHEME_A_ a, port_input);
5000 s_return (S_T); 4790 s_return (S_T);
5001 4791
5002 case OP_CLOSE_OUTPORT: /* close-output-port */ 4792 case OP_CLOSE_OUTPORT: /* close-output-port */
5003 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4793 port_close (SCHEME_A_ a, port_output);
5004 s_return (S_T); 4794 s_return (S_T);
5005#endif 4795#endif
5006 4796
5007 case OP_INT_ENV: /* interaction-environment */ 4797 case OP_INT_ENV: /* interaction-environment */
5008 s_return (SCHEME_V->global_env); 4798 s_return (SCHEME_V->global_env);
… …
5010 case OP_CURR_ENV: /* current-environment */ 4800 case OP_CURR_ENV: /* current-environment */
5011 s_return (SCHEME_V->envir); 4801 s_return (SCHEME_V->envir);
5012 4802
5013 } 4803 }
5014 4804
5015 return S_T; 4805 if (USE_ERROR_CHECKING) abort ();
5016} 4806}
5017 4807
5018static pointer 4808static int
5019opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4809opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5020{ 4810{
4811 pointer args = SCHEME_V->args;
5021 pointer x; 4812 pointer x;
5022 4813
5023 if (SCHEME_V->nesting != 0) 4814 if (SCHEME_V->nesting != 0)
5024 { 4815 {
5025 int n = SCHEME_V->nesting; 4816 int n = SCHEME_V->nesting;
… …
5032 switch (op) 4823 switch (op)
5033 { 4824 {
5034 /* ========== reading part ========== */ 4825 /* ========== reading part ========== */
5035#if USE_PORTS 4826#if USE_PORTS
5036 case OP_READ: 4827 case OP_READ:
5037 if (!is_pair (SCHEME_V->args)) 4828 if (!is_pair (args))
5038 s_goto (OP_READ_INTERNAL); 4829 s_goto (OP_READ_INTERNAL);
5039 4830
5040 if (!is_inport (car (SCHEME_V->args))) 4831 if (!is_inport (car (args)))
5041 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4832 Error_1 ("read: not an input port:", car (args));
5042 4833
5043 if (car (SCHEME_V->args) == SCHEME_V->inport) 4834 if (car (args) == SCHEME_V->inport)
5044 s_goto (OP_READ_INTERNAL); 4835 s_goto (OP_READ_INTERNAL);
5045 4836
5046 x = SCHEME_V->inport; 4837 x = SCHEME_V->inport;
5047 SCHEME_V->inport = car (SCHEME_V->args); 4838 SCHEME_V->inport = car (args);
5048 x = cons (x, NIL); 4839 x = cons (x, NIL);
5049 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4840 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5050 s_goto (OP_READ_INTERNAL); 4841 s_goto (OP_READ_INTERNAL);
5051 4842
5052 case OP_READ_CHAR: /* read-char */ 4843 case OP_READ_CHAR: /* read-char */
5053 case OP_PEEK_CHAR: /* peek-char */ 4844 case OP_PEEK_CHAR: /* peek-char */
5054 { 4845 {
5055 int c; 4846 int c;
5056 4847
5057 if (is_pair (SCHEME_V->args)) 4848 if (is_pair (args))
5058 { 4849 {
5059 if (car (SCHEME_V->args) != SCHEME_V->inport) 4850 if (car (args) != SCHEME_V->inport)
5060 { 4851 {
5061 x = SCHEME_V->inport; 4852 x = SCHEME_V->inport;
5062 x = cons (x, NIL); 4853 x = cons (x, NIL);
5063 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4854 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5064 SCHEME_V->inport = car (SCHEME_V->args); 4855 SCHEME_V->inport = car (args);
5065 } 4856 }
5066 } 4857 }
5067 4858
5068 c = inchar (SCHEME_A); 4859 c = inchar (SCHEME_A);
5069 4860
… …
5079 case OP_CHAR_READY: /* char-ready? */ 4870 case OP_CHAR_READY: /* char-ready? */
5080 { 4871 {
5081 pointer p = SCHEME_V->inport; 4872 pointer p = SCHEME_V->inport;
5082 int res; 4873 int res;
5083 4874
5084 if (is_pair (SCHEME_V->args)) 4875 if (is_pair (args))
5085 p = car (SCHEME_V->args); 4876 p = car (args);
5086 4877
5087 res = p->object.port->kind & port_string; 4878 res = p->object.port->kind & port_string;
5088 4879
5089 s_retbool (res); 4880 s_retbool (res);
5090 } 4881 }
5091 4882
5092 case OP_SET_INPORT: /* set-input-port */ 4883 case OP_SET_INPORT: /* set-input-port */
5093 SCHEME_V->inport = car (SCHEME_V->args); 4884 SCHEME_V->inport = car (args);
5094 s_return (SCHEME_V->value); 4885 s_return (SCHEME_V->value);
5095 4886
5096 case OP_SET_OUTPORT: /* set-output-port */ 4887 case OP_SET_OUTPORT: /* set-output-port */
5097 SCHEME_V->outport = car (SCHEME_V->args); 4888 SCHEME_V->outport = car (args);
5098 s_return (SCHEME_V->value); 4889 s_return (SCHEME_V->value);
5099#endif 4890#endif
5100 4891
5101 case OP_RDSEXPR: 4892 case OP_RDSEXPR:
5102 switch (SCHEME_V->tok) 4893 switch (SCHEME_V->tok)
… …
5151 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4942 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5152 SCHEME_V->tok = token (SCHEME_A); 4943 SCHEME_V->tok = token (SCHEME_A);
5153 s_goto (OP_RDSEXPR); 4944 s_goto (OP_RDSEXPR);
5154 4945
5155 case TOK_ATOM: 4946 case TOK_ATOM:
5156 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)));
5157 4952
5158 case TOK_DQUOTE: 4953 case TOK_DQUOTE:
5159 x = readstrexp (SCHEME_A); 4954 x = readstrexp (SCHEME_A_ '"');
5160 4955
5161 if (x == S_F) 4956 if (x == S_F)
5162 Error_0 ("Error reading string"); 4957 Error_0 ("Error reading string");
5163 4958
5164 setimmutable (x); 4959 setimmutable (x);
… …
5176 s_goto (OP_EVAL); 4971 s_goto (OP_EVAL);
5177 } 4972 }
5178 } 4973 }
5179 4974
5180 case TOK_SHARP_CONST: 4975 case TOK_SHARP_CONST:
5181 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)
5182 Error_0 ("undefined sharp expression"); 4977 Error_0 ("undefined sharp expression");
5183 else 4978 else
5184 s_return (x); 4979 s_return (x);
5185 4980
5186 default: 4981 default:
… …
5188 } 4983 }
5189 4984
5190 break; 4985 break;
5191 4986
5192 case OP_RDLIST: 4987 case OP_RDLIST:
5193 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4988 SCHEME_V->args = cons (SCHEME_V->value, args);
5194 SCHEME_V->tok = token (SCHEME_A); 4989 SCHEME_V->tok = token (SCHEME_A);
5195 4990
5196 switch (SCHEME_V->tok) 4991 switch (SCHEME_V->tok)
5197 { 4992 {
5198 case TOK_EOF: 4993 case TOK_EOF:
… …
5226 case OP_RDDOT: 5021 case OP_RDDOT:
5227 if (token (SCHEME_A) != TOK_RPAREN) 5022 if (token (SCHEME_A) != TOK_RPAREN)
5228 Error_0 ("syntax error: illegal dot expression"); 5023 Error_0 ("syntax error: illegal dot expression");
5229 5024
5230 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5025 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5231 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));
5232 5027
5233 case OP_RDQUOTE: 5028 case OP_RDQUOTE:
5234 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5029 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5235 5030
5236 case OP_RDQQUOTE: 5031 case OP_RDQQUOTE:
… …
5258 SCHEME_V->args = SCHEME_V->value; 5053 SCHEME_V->args = SCHEME_V->value;
5259 s_goto (OP_VECTOR); 5054 s_goto (OP_VECTOR);
5260 5055
5261 /* ========== printing part ========== */ 5056 /* ========== printing part ========== */
5262 case OP_P0LIST: 5057 case OP_P0LIST:
5263 if (is_vector (SCHEME_V->args)) 5058 if (is_vector (args))
5264 { 5059 {
5265 putstr (SCHEME_A_ "#("); 5060 putstr (SCHEME_A_ "#(");
5266 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5061 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5267 s_goto (OP_PVECFROM); 5062 s_goto (OP_PVECFROM);
5268 } 5063 }
5269 else if (is_environment (SCHEME_V->args)) 5064 else if (is_environment (args))
5270 { 5065 {
5271 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5066 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5272 s_return (S_T); 5067 s_return (S_T);
5273 } 5068 }
5274 else if (!is_pair (SCHEME_V->args)) 5069 else if (!is_pair (args))
5275 { 5070 {
5276 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5071 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5277 s_return (S_T); 5072 s_return (S_T);
5278 } 5073 }
5279 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5074 else
5280 { 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)
5281 putstr (SCHEME_A_ "'"); 5082 putstr (SCHEME_A_ "'");
5282 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
5283 s_goto (OP_P0LIST); 5096 s_goto (OP_P0LIST);
5284 } 5097 }
5285 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))
5286 { 5101 {
5102 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5287 putstr (SCHEME_A_ "`"); 5103 putstr (SCHEME_A_ " ");
5288 SCHEME_V->args = cadr (SCHEME_V->args); 5104 SCHEME_V->args = car (args);
5289 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5290 } 5106 }
5291 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5292 {
5293 putstr (SCHEME_A_ ",");
5294 SCHEME_V->args = cadr (SCHEME_V->args);
5295 s_goto (OP_P0LIST);
5296 }
5297 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5298 {
5299 putstr (SCHEME_A_ ",@");
5300 SCHEME_V->args = cadr (SCHEME_V->args);
5301 s_goto (OP_P0LIST);
5302 }
5303 else
5304 {
5305 putstr (SCHEME_A_ "(");
5306 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5307 SCHEME_V->args = car (SCHEME_V->args);
5308 s_goto (OP_P0LIST);
5309 }
5310
5311 case OP_P1LIST:
5312 if (is_pair (SCHEME_V->args))
5313 {
5314 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5315 putstr (SCHEME_A_ " ");
5316 SCHEME_V->args = car (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (is_vector (SCHEME_V->args)) 5107 else if (is_vector (args))
5320 { 5108 {
5321 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5109 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5322 putstr (SCHEME_A_ " . "); 5110 putstr (SCHEME_A_ " . ");
5323 s_goto (OP_P0LIST); 5111 s_goto (OP_P0LIST);
5324 } 5112 }
5325 else 5113 else
5326 { 5114 {
5327 if (SCHEME_V->args != NIL) 5115 if (args != NIL)
5328 { 5116 {
5329 putstr (SCHEME_A_ " . "); 5117 putstr (SCHEME_A_ " . ");
5330 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5118 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5331 } 5119 }
5332 5120
5333 putstr (SCHEME_A_ ")"); 5121 putstr (SCHEME_A_ ")");
5334 s_return (S_T); 5122 s_return (S_T);
5335 } 5123 }
5336 5124
5337 case OP_PVECFROM: 5125 case OP_PVECFROM:
5338 { 5126 {
5339 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5127 int i = ivalue_unchecked (cdr (args));
5340 pointer vec = car (SCHEME_V->args); 5128 pointer vec = car (args);
5341 int len = veclength (vec); 5129 int len = veclength (vec);
5342 5130
5343 if (i == len) 5131 if (i == len)
5344 { 5132 {
5345 putstr (SCHEME_A_ ")"); 5133 putstr (SCHEME_A_ ")");
5346 s_return (S_T); 5134 s_return (S_T);
5347 } 5135 }
5348 else 5136 else
5349 { 5137 {
5350 pointer elem = vector_elem (vec, i); 5138 pointer elem = vector_get (vec, i);
5351 5139
5352 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5140 ivalue_unchecked (cdr (args)) = i + 1;
5353 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5141 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5354 SCHEME_V->args = elem; 5142 SCHEME_V->args = elem;
5355 5143
5356 if (i > 0) 5144 if (i > 0)
5357 putstr (SCHEME_A_ " "); 5145 putstr (SCHEME_A_ " ");
5358 5146
5359 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5360 } 5148 }
5361 } 5149 }
5362 } 5150 }
5363 5151
5364 return S_T; 5152 if (USE_ERROR_CHECKING) abort ();
5365} 5153}
5366 5154
5367static pointer 5155static int
5368opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5156opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5369{ 5157{
5158 pointer args = SCHEME_V->args;
5159 pointer a = car (args);
5370 pointer x, y; 5160 pointer x, y;
5371 5161
5372 switch (op) 5162 switch (op)
5373 { 5163 {
5374 case OP_LIST_LENGTH: /* length *//* a.k */ 5164 case OP_LIST_LENGTH: /* length *//* a.k */
5375 { 5165 {
5376 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5166 long v = list_length (SCHEME_A_ a);
5377 5167
5378 if (v < 0) 5168 if (v < 0)
5379 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5169 Error_1 ("length: not a list:", a);
5380 5170
5381 s_return (mk_integer (SCHEME_A_ v)); 5171 s_return (mk_integer (SCHEME_A_ v));
5382 } 5172 }
5383 5173
5384 case OP_ASSQ: /* assq *//* a.k */ 5174 case OP_ASSQ: /* assq *//* a.k */
5385 x = car (SCHEME_V->args); 5175 x = a;
5386 5176
5387 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5177 for (y = cadr (args); is_pair (y); y = cdr (y))
5388 { 5178 {
5389 if (!is_pair (car (y))) 5179 if (!is_pair (car (y)))
5390 Error_0 ("unable to handle non pair element"); 5180 Error_0 ("unable to handle non pair element");
5391 5181
5392 if (x == caar (y)) 5182 if (x == caar (y))
… …
5398 else 5188 else
5399 s_return (S_F); 5189 s_return (S_F);
5400 5190
5401 5191
5402 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5192 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5403 SCHEME_V->args = car (SCHEME_V->args); 5193 SCHEME_V->args = a;
5404 5194
5405 if (SCHEME_V->args == NIL) 5195 if (SCHEME_V->args == NIL)
5406 s_return (S_F); 5196 s_return (S_F);
5407 else if (is_closure (SCHEME_V->args)) 5197 else if (is_closure (SCHEME_V->args))
5408 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5198 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5414 case OP_CLOSUREP: /* closure? */ 5204 case OP_CLOSUREP: /* closure? */
5415 /* 5205 /*
5416 * Note, macro object is also a closure. 5206 * Note, macro object is also a closure.
5417 * Therefore, (closure? <#MACRO>) ==> #t 5207 * Therefore, (closure? <#MACRO>) ==> #t
5418 */ 5208 */
5419 s_retbool (is_closure (car (SCHEME_V->args))); 5209 s_retbool (is_closure (a));
5420 5210
5421 case OP_MACROP: /* macro? */ 5211 case OP_MACROP: /* macro? */
5422 s_retbool (is_macro (car (SCHEME_V->args))); 5212 s_retbool (is_macro (a));
5423 } 5213 }
5424 5214
5425 return S_T; /* NOTREACHED */ 5215 if (USE_ERROR_CHECKING) abort ();
5426} 5216}
5427 5217
5218/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5428typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5219typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5429 5220
5430typedef int (*test_predicate) (pointer); 5221typedef int (*test_predicate)(pointer);
5431static int 5222static int
5432is_any (pointer p) 5223tst_any (pointer p)
5433{ 5224{
5434 return 1; 5225 return 1;
5435} 5226}
5436 5227
5437static int 5228static int
5438is_nonneg (pointer p) 5229tst_inonneg (pointer p)
5439{ 5230{
5440 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);
5441} 5238}
5442 5239
5443/* Correspond carefully with following defines! */ 5240/* Correspond carefully with following defines! */
5444static struct 5241static struct
5445{ 5242{
5446 test_predicate fct; 5243 test_predicate fct;
5447 const char *kind; 5244 const char *kind;
5448} tests[] = 5245} tests[] = {
5449{ 5246 { tst_any , 0 },
5450 { 0, 0}, /* unused */ 5247 { is_string , "string" },
5451 { is_any, 0}, 5248 { is_symbol , "symbol" },
5452 { is_string, "string" }, 5249 { is_port , "port" },
5453 { is_symbol, "symbol" },
5454 { is_port, "port" },
5455 { is_inport, "input port" }, 5250 { is_inport , "input port" },
5456 { is_outport, "output port" }, 5251 { is_outport , "output port" },
5457 { is_environment, "environment" }, 5252 { is_environment, "environment" },
5458 { is_pair, "pair" }, 5253 { is_pair , "pair" },
5459 { 0, "pair or '()" }, 5254 { 0 , "pair or '()" },
5460 { is_character, "character" }, 5255 { is_character , "character" },
5461 { is_vector, "vector" }, 5256 { is_vector , "vector" },
5462 { is_number, "number" }, 5257 { is_number , "number" },
5463 { is_integer, "integer" }, 5258 { is_integer , "integer" },
5464 { is_nonneg, "non-negative integer" } 5259 { tst_inonneg , "non-negative integer" }
5465}; 5260};
5466 5261
5467#define TST_NONE 0 5262#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5468#define TST_ANY "\001" 5263#define TST_ANY "\001"
5469#define TST_STRING "\002" 5264#define TST_STRING "\002"
5470#define TST_SYMBOL "\003" 5265#define TST_SYMBOL "\003"
5471#define TST_PORT "\004" 5266#define TST_PORT "\004"
5472#define TST_INPORT "\005" 5267#define TST_INPORT "\005"
5473#define TST_OUTPORT "\006" 5268#define TST_OUTPORT "\006"
5474#define TST_ENVIRONMENT "\007" 5269#define TST_ENVIRONMENT "\007"
5475#define TST_PAIR "\010" 5270#define TST_PAIR "\010"
5476#define TST_LIST "\011" 5271#define TST_LIST "\011"
5477#define TST_CHAR "\012" 5272#define TST_CHAR "\012"
5478#define TST_VECTOR "\013" 5273#define TST_VECTOR "\013"
5479#define TST_NUMBER "\014" 5274#define TST_NUMBER "\014"
5480#define TST_INTEGER "\015" 5275#define TST_INTEGER "\015"
5481#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}
5482 5304
5483typedef struct 5305typedef struct
5484{ 5306{
5485 dispatch_func func; 5307 uint8_t func;
5486 char *name; 5308 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5309 uint8_t builtin;
5310#if USE_ERROR_CHECKING
5487 int min_arity; 5311 uint8_t min_arity;
5488 int max_arity; 5312 uint8_t max_arity;
5489 char *arg_tests_encoding; 5313 char arg_tests_encoding[3];
5314#endif
5490} op_code_info; 5315} op_code_info;
5491 5316
5492#define INF_ARG 0xffff
5493
5494static op_code_info dispatch_table[] = { 5317static const op_code_info dispatch_table[] = {
5495#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
5496#include "opdefines.h" 5323#include "opdefines.h"
5324#undef OP_DEF
5497 {0} 5325 {0}
5498}; 5326};
5499 5327
5500static const char *
5501procname (pointer x)
5502{
5503 int n = procnum (x);
5504 const char *name = dispatch_table[n].name;
5505
5506 if (name == 0)
5507 name = "ILLEGAL!";
5508
5509 return name;
5510}
5511
5512/* kernel of this interpreter */ 5328/* kernel of this interpreter */
5513static void 5329static void ecb_hot
5514Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5330Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5515{ 5331{
5516 SCHEME_V->op = op; 5332 SCHEME_V->op = op;
5517 5333
5518 for (;;) 5334 for (;;)
5519 { 5335 {
5520 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5336 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5521 5337
5522#if USE_ERROR_CHECKING 5338#if USE_ERROR_CHECKING
5523 if (pcd->name) /* if built-in function, check arguments */ 5339 if (pcd->builtin) /* if built-in function, check arguments */
5524 { 5340 {
5525 int ok = 1;
5526 char msg[STRBUFFSIZE]; 5341 char msg[STRBUFFSIZE];
5527 int n = list_length (SCHEME_A_ SCHEME_V->args); 5342 int n = list_length (SCHEME_A_ SCHEME_V->args);
5528 5343
5529 /* Check number of arguments */ 5344 /* Check number of arguments */
5530 if (ecb_expect_false (n < pcd->min_arity)) 5345 if (ecb_expect_false (n < pcd->min_arity))
5531 { 5346 {
5532 ok = 0;
5533 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5347 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5534 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;
5535 } 5351 }
5536 else if (ecb_excpect_false (n > pcd->max_arity)) 5352 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5537 { 5353 {
5538 ok = 0;
5539 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5354 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5540 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;
5541 } 5358 }
5542 5359 else
5543 if (ecb_expect_false (ok))
5544 { 5360 {
5545 if (pcd->arg_tests_encoding) 5361 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5546 { 5362 {
5547 int i = 0; 5363 int i = 0;
5548 int j; 5364 int j;
5549 const char *t = pcd->arg_tests_encoding; 5365 const char *t = pcd->arg_tests_encoding;
5550 pointer arglist = SCHEME_V->args; 5366 pointer arglist = SCHEME_V->args;
5551 5367
5552 do 5368 do
5553 { 5369 {
5554 pointer arg = car (arglist); 5370 pointer arg = car (arglist);
5555 5371
5556 j = (int) t[0]; 5372 j = t[0];
5557 5373
5374 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5558 if (j == TST_LIST[0]) 5375 if (j == TST_LIST[0])
5559 { 5376 {
5560 if (arg != NIL && !is_pair (arg)) 5377 if (!tst_is_list (SCHEME_A_ arg))
5561 break; 5378 break;
5562 } 5379 }
5563 else 5380 else
5564 { 5381 {
5565 if (!tests[j].fct (arg)) 5382 if (!tests[j - 1].fct (arg))
5566 break; 5383 break;
5567 } 5384 }
5568 5385
5569 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 */
5570 t++; 5387 t++;
5571 5388
5572 arglist = cdr (arglist); 5389 arglist = cdr (arglist);
5573 i++; 5390 i++;
5574 } 5391 }
5575 while (i < n); 5392 while (i < n);
5576 5393
5577 if (i < n) 5394 if (i < n)
5578 { 5395 {
5579 ok = 0;
5580 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;
5581 } 5399 }
5582 } 5400 }
5583 } 5401 }
5584
5585 if (!ok)
5586 {
5587 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5588 return;
5589
5590 pcd = dispatch_table + SCHEME_V->op;
5591 }
5592 } 5402 }
5593#endif 5403#endif
5594 5404
5595 ok_to_freely_gc (SCHEME_A); 5405 ok_to_freely_gc (SCHEME_A);
5596 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
5597 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))
5598 return; 5418 return;
5599 5419
5600 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5601 { 5421 {
5602 xwrstr ("No memory!\n"); 5422 xwrstr ("No memory!\n");
… …
5626mk_proc (SCHEME_P_ enum scheme_opcodes op) 5446mk_proc (SCHEME_P_ enum scheme_opcodes op)
5627{ 5447{
5628 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5448 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5629 set_typeflag (y, (T_PROC | T_ATOM)); 5449 set_typeflag (y, (T_PROC | T_ATOM));
5630 ivalue_unchecked (y) = op; 5450 ivalue_unchecked (y) = op;
5631 set_num_integer (y);
5632 return y; 5451 return y;
5633} 5452}
5634 5453
5635/* 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! */
5636static int 5455static int
… …
5701 return OP_C0STREAM; /* cons-stream */ 5520 return OP_C0STREAM; /* cons-stream */
5702 } 5521 }
5703} 5522}
5704 5523
5705#if USE_MULTIPLICITY 5524#if USE_MULTIPLICITY
5706scheme * 5525ecb_cold scheme *
5707scheme_init_new () 5526scheme_init_new ()
5708{ 5527{
5709 scheme *sc = malloc (sizeof (scheme)); 5528 scheme *sc = malloc (sizeof (scheme));
5710 5529
5711 if (!scheme_init (SCHEME_A)) 5530 if (!scheme_init (SCHEME_A))
… …
5716 else 5535 else
5717 return sc; 5536 return sc;
5718} 5537}
5719#endif 5538#endif
5720 5539
5721int 5540ecb_cold int
5722scheme_init (SCHEME_P) 5541scheme_init (SCHEME_P)
5723{ 5542{
5724 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5725 pointer x; 5544 pointer x;
5726 5545
… …
5799 5618
5800 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5619 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5801 assign_syntax (SCHEME_A_ syntax_names[i]); 5620 assign_syntax (SCHEME_A_ syntax_names[i]);
5802 } 5621 }
5803 5622
5623 // TODO: should iterate via strlen, to avoid n² complexity
5804 for (i = 0; i < n; i++) 5624 for (i = 0; i < n; i++)
5805 if (dispatch_table[i].name != 0) 5625 if (dispatch_table[i].builtin)
5806 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5626 assign_proc (SCHEME_A_ i, opname (i));
5807 5627
5808 /* initialization of global pointers to special symbols */ 5628 /* initialization of global pointers to special symbols */
5809 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5629 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5810 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5630 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5811 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5631 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5850scheme_set_external_data (SCHEME_P_ void *p) 5670scheme_set_external_data (SCHEME_P_ void *p)
5851{ 5671{
5852 SCHEME_V->ext_data = p; 5672 SCHEME_V->ext_data = p;
5853} 5673}
5854 5674
5855void 5675ecb_cold void
5856scheme_deinit (SCHEME_P) 5676scheme_deinit (SCHEME_P)
5857{ 5677{
5858 int i; 5678 int i;
5859 5679
5860#if SHOW_ERROR_LINE 5680#if SHOW_ERROR_LINE
… …
5952{ 5772{
5953 dump_stack_reset (SCHEME_A); 5773 dump_stack_reset (SCHEME_A);
5954 SCHEME_V->envir = SCHEME_V->global_env; 5774 SCHEME_V->envir = SCHEME_V->global_env;
5955 SCHEME_V->file_i = 0; 5775 SCHEME_V->file_i = 0;
5956 SCHEME_V->load_stack[0].kind = port_input | port_string; 5776 SCHEME_V->load_stack[0].kind = port_input | port_string;
5957 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 */
5958 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);
5959 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5779 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5960#if USE_PORTS 5780#if USE_PORTS
5961 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5781 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5962#endif 5782#endif
5963 SCHEME_V->retcode = 0; 5783 SCHEME_V->retcode = 0;
5964 SCHEME_V->interactive_repl = 0; 5784 SCHEME_V->interactive_repl = 0;

Diff Legend

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