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

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

Diff Legend

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