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

Diff Legend

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