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

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

Diff Legend

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