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.25 by root, Fri Nov 27 04:37:26 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
… …
220#if USE_MATH 219#if USE_MATH
221static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
222#endif 221#endif
223static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
224 223
225static INLINE int
226num_is_integer (pointer p)
227{
228 return num_is_fixnum (p->object.number);
229}
230
231static num num_zero; 224static num num_zero;
232static num num_one; 225static num num_one;
233 226
234/* macros for cell operations */ 227/* macros for cell operations */
235#define typeflag(p) ((p)->flag + 0) 228#define typeflag(p) ((p)->flag + 0)
236#define set_typeflag(p,v) ((p)->flag = (v)) 229#define set_typeflag(p,v) ((p)->flag = (v))
237#define type(p) (typeflag (p) & T_MASKTYPE) 230#define type(p) (typeflag (p) & T_MASKTYPE)
238 231
239INTERFACE INLINE int 232INTERFACE int
240is_string (pointer p) 233is_string (pointer p)
241{ 234{
242 return type (p) == T_STRING; 235 return type (p) == T_STRING;
243} 236}
244 237
245#define strvalue(p) ((p)->object.string.svalue) 238#define strvalue(p) ((p)->object.string.svalue)
246#define strlength(p) ((p)->object.string.length) 239#define strlength(p) ((p)->object.string.length)
247 240
248INTERFACE int is_list (SCHEME_P_ pointer p); 241INTERFACE int is_list (SCHEME_P_ pointer p);
242
249INTERFACE INLINE int 243INTERFACE int
250is_vector (pointer p) 244is_vector (pointer p)
251{ 245{
252 return type (p) == T_VECTOR; 246 return type (p) == T_VECTOR;
253} 247}
254 248
… …
263vector_length (pointer vec) 257vector_length (pointer vec)
264{ 258{
265 return vec->object.vector.length; 259 return vec->object.vector.length;
266} 260}
267 261
268INTERFACE INLINE int 262INTERFACE int
269is_number (pointer p) 263is_number (pointer p)
270{ 264{
271 return type (p) == T_NUMBER; 265 return type (p) == T_NUMBER;
272} 266}
273 267
274INTERFACE INLINE int 268INTERFACE int
275is_integer (pointer p) 269is_integer (pointer p)
276{ 270{
277 if (!is_number (p)) 271 return is_number (p) && num_is_fixnum (p->object.number);
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284} 272}
285 273
286INTERFACE INLINE int 274INTERFACE int
287is_real (pointer p) 275is_real (pointer p)
288{ 276{
289 return is_number (p) && !num_is_fixnum (p->object.number); 277 return is_number (p) && !num_is_fixnum (p->object.number);
290} 278}
291 279
292INTERFACE INLINE int 280INTERFACE int
293is_character (pointer p) 281is_character (pointer p)
294{ 282{
295 return type (p) == T_CHARACTER; 283 return type (p) == T_CHARACTER;
296} 284}
297 285
298INTERFACE INLINE char * 286INTERFACE char *
299string_value (pointer p) 287string_value (pointer p)
300{ 288{
301 return strvalue (p); 289 return strvalue (p);
302} 290}
303 291
304INLINE num 292ecb_inline num
305nvalue (pointer p) 293nvalue (pointer p)
306{ 294{
307 return (p)->object.number; 295 return (p)->object.number;
308} 296}
309 297
… …
339#else 327#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
341# define set_num_integer(p) 0 329# define set_num_integer(p) 0
342# define set_num_real(p) 0 330# define set_num_real(p) 0
343#endif 331#endif
332
344INTERFACE long 333INTERFACE long
345charvalue (pointer p) 334charvalue (pointer p)
346{ 335{
347 return ivalue_unchecked (p); 336 return ivalue_unchecked (p);
348} 337}
349 338
350INTERFACE INLINE int 339INTERFACE int
351is_port (pointer p) 340is_port (pointer p)
352{ 341{
353 return type (p) == T_PORT; 342 return type (p) == T_PORT;
354} 343}
355 344
356INTERFACE INLINE int 345INTERFACE int
357is_inport (pointer p) 346is_inport (pointer p)
358{ 347{
359 return is_port (p) && p->object.port->kind & port_input; 348 return is_port (p) && p->object.port->kind & port_input;
360} 349}
361 350
362INTERFACE INLINE int 351INTERFACE int
363is_outport (pointer p) 352is_outport (pointer p)
364{ 353{
365 return is_port (p) && p->object.port->kind & port_output; 354 return is_port (p) && p->object.port->kind & port_output;
366} 355}
367 356
368INTERFACE INLINE int 357INTERFACE int
369is_pair (pointer p) 358is_pair (pointer p)
370{ 359{
371 return type (p) == T_PAIR; 360 return type (p) == T_PAIR;
372} 361}
373 362
… …
405pair_cdr (pointer p) 394pair_cdr (pointer p)
406{ 395{
407 return cdr (p); 396 return cdr (p);
408} 397}
409 398
410INTERFACE INLINE int 399INTERFACE int
411is_symbol (pointer p) 400is_symbol (pointer p)
412{ 401{
413 return type (p) == T_SYMBOL; 402 return type (p) == T_SYMBOL;
414} 403}
415 404
416INTERFACE INLINE char * 405INTERFACE char *
417symname (pointer p) 406symname (pointer p)
418{ 407{
419 return strvalue (car (p)); 408 return strvalue (car (p));
420} 409}
421 410
422#if USE_PLIST 411#if USE_PLIST
423SCHEME_EXPORT INLINE int 412SCHEME_EXPORT int
424hasprop (pointer p) 413hasprop (pointer p)
425{ 414{
426 return typeflag (p) & T_SYMBOL; 415 return typeflag (p) & T_SYMBOL;
427} 416}
428 417
429# define symprop(p) cdr(p) 418# define symprop(p) cdr(p)
430#endif 419#endif
431 420
432INTERFACE INLINE int 421INTERFACE int
433is_syntax (pointer p) 422is_syntax (pointer p)
434{ 423{
435 return typeflag (p) & T_SYNTAX; 424 return typeflag (p) & T_SYNTAX;
436} 425}
437 426
438INTERFACE INLINE int 427INTERFACE int
439is_proc (pointer p) 428is_proc (pointer p)
440{ 429{
441 return type (p) == T_PROC; 430 return type (p) == T_PROC;
442} 431}
443 432
444INTERFACE INLINE int 433INTERFACE int
445is_foreign (pointer p) 434is_foreign (pointer p)
446{ 435{
447 return type (p) == T_FOREIGN; 436 return type (p) == T_FOREIGN;
448} 437}
449 438
450INTERFACE INLINE char * 439INTERFACE char *
451syntaxname (pointer p) 440syntaxname (pointer p)
452{ 441{
453 return strvalue (car (p)); 442 return strvalue (car (p));
454} 443}
455 444
456#define procnum(p) ivalue (p) 445#define procnum(p) ivalue (p)
457static const char *procname (pointer x); 446static const char *procname (pointer x);
458 447
459INTERFACE INLINE int 448INTERFACE int
460is_closure (pointer p) 449is_closure (pointer p)
461{ 450{
462 return type (p) == T_CLOSURE; 451 return type (p) == T_CLOSURE;
463} 452}
464 453
465INTERFACE INLINE int 454INTERFACE int
466is_macro (pointer p) 455is_macro (pointer p)
467{ 456{
468 return type (p) == T_MACRO; 457 return type (p) == T_MACRO;
469} 458}
470 459
471INTERFACE INLINE pointer 460INTERFACE pointer
472closure_code (pointer p) 461closure_code (pointer p)
473{ 462{
474 return car (p); 463 return car (p);
475} 464}
476 465
477INTERFACE INLINE pointer 466INTERFACE pointer
478closure_env (pointer p) 467closure_env (pointer p)
479{ 468{
480 return cdr (p); 469 return cdr (p);
481} 470}
482 471
483INTERFACE INLINE int 472INTERFACE int
484is_continuation (pointer p) 473is_continuation (pointer p)
485{ 474{
486 return type (p) == T_CONTINUATION; 475 return type (p) == T_CONTINUATION;
487} 476}
488 477
489#define cont_dump(p) cdr (p) 478#define cont_dump(p) cdr (p)
490#define set_cont_dump(p,v) set_cdr ((p), (v)) 479#define set_cont_dump(p,v) set_cdr ((p), (v))
491 480
492/* To do: promise should be forced ONCE only */ 481/* To do: promise should be forced ONCE only */
493INTERFACE INLINE int 482INTERFACE int
494is_promise (pointer p) 483is_promise (pointer p)
495{ 484{
496 return type (p) == T_PROMISE; 485 return type (p) == T_PROMISE;
497} 486}
498 487
499INTERFACE INLINE int 488INTERFACE int
500is_environment (pointer p) 489is_environment (pointer p)
501{ 490{
502 return type (p) == T_ENVIRONMENT; 491 return type (p) == T_ENVIRONMENT;
503} 492}
504 493
… …
510 499
511#define is_mark(p) (typeflag (p) & T_MARK) 500#define is_mark(p) (typeflag (p) & T_MARK)
512#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 501#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
513#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 502#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
514 503
515INTERFACE INLINE int 504INTERFACE int
516is_immutable (pointer p) 505is_immutable (pointer p)
517{ 506{
518 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
519} 508}
520 509
521INTERFACE INLINE void 510INTERFACE void
522setimmutable (pointer p) 511setimmutable (pointer p)
523{ 512{
524#if USE_ERROR_CHECKING 513#if USE_ERROR_CHECKING
525 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 514 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
526#endif 515#endif
527} 516}
528 517
529#if USE_CHAR_CLASSIFIERS 518#if USE_CHAR_CLASSIFIERS
530static INLINE int 519ecb_inline int
531Cisalpha (int c) 520Cisalpha (int c)
532{ 521{
533 return isascii (c) && isalpha (c); 522 return isascii (c) && isalpha (c);
534} 523}
535 524
536static INLINE int 525ecb_inline int
537Cisdigit (int c) 526Cisdigit (int c)
538{ 527{
539 return isascii (c) && isdigit (c); 528 return isascii (c) && isdigit (c);
540} 529}
541 530
542static INLINE int 531ecb_inline int
543Cisspace (int c) 532Cisspace (int c)
544{ 533{
545 return isascii (c) && isspace (c); 534 return isascii (c) && isspace (c);
546} 535}
547 536
548static INLINE int 537ecb_inline int
549Cisupper (int c) 538Cisupper (int c)
550{ 539{
551 return isascii (c) && isupper (c); 540 return isascii (c) && isupper (c);
552} 541}
553 542
554static INLINE int 543ecb_inline int
555Cislower (int c) 544Cislower (int c)
556{ 545{
557 return isascii (c) && islower (c); 546 return isascii (c) && islower (c);
558} 547}
559#endif 548#endif
… …
620#endif 609#endif
621 610
622static int file_push (SCHEME_P_ const char *fname); 611static int file_push (SCHEME_P_ const char *fname);
623static void file_pop (SCHEME_P); 612static void file_pop (SCHEME_P);
624static int file_interactive (SCHEME_P); 613static int file_interactive (SCHEME_P);
625static INLINE int is_one_of (char *s, int c); 614ecb_inline int is_one_of (char *s, int c);
626static int alloc_cellseg (SCHEME_P_ int n); 615static int alloc_cellseg (SCHEME_P_ int n);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 617static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 618static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 620static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 621static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
649static int basic_inchar (port *pt); 638static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 639static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 640static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 641static char *readstr_upto (SCHEME_P_ char *delim);
653static pointer readstrexp (SCHEME_P); 642static pointer readstrexp (SCHEME_P);
654static INLINE int skipspace (SCHEME_P); 643ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 644static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 645static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 647static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 652static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 653static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 654static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 655static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 656static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 657static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
658static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 659static 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); 660static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 661static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 662static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 663static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
675static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
676static void assign_syntax (SCHEME_P_ const char *name); 665static void assign_syntax (SCHEME_P_ const char *name);
677static int syntaxnum (pointer p); 666static int syntaxnum (pointer p);
678static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
679 668
… …
777 766
778 num_set_ivalue (ret, res); 767 num_set_ivalue (ret, res);
779 return ret; 768 return ret;
780} 769}
781 770
782/* this completely disrespects NaNs */ 771/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
783static int 772static int
784num_cmp (num a, num b) 773num_cmp (num a, num b)
785{ 774{
786 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 776 int ret;
… …
819 return ce; 808 return ce;
820 else if (dfl < dce) 809 else if (dfl < dce)
821 return fl; 810 return fl;
822 else 811 else
823 { 812 {
824 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 813 if (fmod (fl, 2) == 0) /* I imagine this holds */
825 return fl; 814 return fl;
826 else 815 else
827 return ce; 816 return ce;
828 } 817 }
829} 818}
830#endif 819#endif
831 820
832static int 821static int
833is_zero_rvalue (RVALUE x) 822is_zero_rvalue (RVALUE x)
834{ 823{
824 return x == 0;
825#if 0
835#if USE_REAL 826#if USE_REAL
836 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 827 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
837#else 828#else
838 return x == 0; 829 return x == 0;
830#endif
839#endif 831#endif
840} 832}
841 833
842/* allocate new cell segment */ 834/* allocate new cell segment */
843static int 835static int
… …
915 907
916 return n; 908 return n;
917} 909}
918 910
919/* get new cell. parameter a, b is marked by gc. */ 911/* get new cell. parameter a, b is marked by gc. */
920static INLINE pointer 912ecb_inline pointer
921get_cell_x (SCHEME_P_ pointer a, pointer b) 913get_cell_x (SCHEME_P_ pointer a, pointer b)
922{ 914{
923 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 915 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
924 { 916 {
925 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1003 push_recent_alloc (SCHEME_A_ v, NIL); 995 push_recent_alloc (SCHEME_A_ v, NIL);
1004 996
1005 return v; 997 return v;
1006} 998}
1007 999
1008static INLINE void 1000ecb_inline void
1009ok_to_freely_gc (SCHEME_P) 1001ok_to_freely_gc (SCHEME_P)
1010{ 1002{
1011 set_car (S_SINK, NIL); 1003 set_car (S_SINK, NIL);
1012} 1004}
1013 1005
… …
1077 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1069 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))); 1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1079 return x; 1071 return x;
1080} 1072}
1081 1073
1082static INLINE pointer 1074ecb_inline pointer
1083oblist_find_by_name (SCHEME_P_ const char *name) 1075oblist_find_by_name (SCHEME_P_ const char *name)
1084{ 1076{
1085 int location; 1077 int location;
1086 pointer x; 1078 pointer x;
1087 char *s; 1079 char *s;
… …
1120oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1121{ 1113{
1122 return NIL; 1114 return NIL;
1123} 1115}
1124 1116
1125static INLINE pointer 1117ecb_inline pointer
1126oblist_find_by_name (SCHEME_P_ const char *name) 1118oblist_find_by_name (SCHEME_P_ const char *name)
1127{ 1119{
1128 pointer x; 1120 pointer x;
1129 char *s; 1121 char *s;
1130 1122
… …
2228 } 2220 }
2229 } 2221 }
2230} 2222}
2231 2223
2232/* check c is in chars */ 2224/* check c is in chars */
2233static INLINE int 2225ecb_inline int
2234is_one_of (char *s, int c) 2226is_one_of (char *s, int c)
2235{ 2227{
2236 if (c == EOF) 2228 if (c == EOF)
2237 return 1; 2229 return 1;
2238 2230
2239 return !!strchr (s, c); 2231 return !!strchr (s, c);
2240} 2232}
2241 2233
2242/* skip white characters */ 2234/* skip white characters */
2243static INLINE int 2235ecb_inline int
2244skipspace (SCHEME_P) 2236skipspace (SCHEME_P)
2245{ 2237{
2246 int c, curr_line = 0; 2238 int c, curr_line = 0;
2247 2239
2248 do 2240 do
… …
2476 { 2468 {
2477 p = SCHEME_V->strbuff; 2469 p = SCHEME_V->strbuff;
2478 2470
2479 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2471 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2480 { 2472 {
2481 if (num_is_integer (l)) 2473 if (is_integer (l))
2482 xnum (p, ivalue_unchecked (l)); 2474 xnum (p, ivalue_unchecked (l));
2483#if USE_REAL 2475#if USE_REAL
2484 else 2476 else
2485 { 2477 {
2486 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2478 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2741 return 0; 2733 return 0;
2742 } 2734 }
2743 else if (is_number (a)) 2735 else if (is_number (a))
2744 { 2736 {
2745 if (is_number (b)) 2737 if (is_number (b))
2746 if (num_is_integer (a) == num_is_integer (b))
2747 return num_cmp (nvalue (a), nvalue (b)) == 0; 2738 return num_cmp (nvalue (a), nvalue (b)) == 0;
2748 2739
2749 return 0; 2740 return 0;
2750 } 2741 }
2751 else if (is_character (a)) 2742 else if (is_character (a))
2752 { 2743 {
… …
2819 2810
2820 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2811 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2821 setenvironment (SCHEME_V->envir); 2812 setenvironment (SCHEME_V->envir);
2822} 2813}
2823 2814
2824static INLINE void 2815ecb_inline void
2825new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2826{ 2817{
2827 pointer slot = immutable_cons (variable, value); 2818 pointer slot = immutable_cons (variable, value);
2828 2819
2829 if (is_vector (car (env))) 2820 if (is_vector (car (env)))
… …
2869 return NIL; 2860 return NIL;
2870} 2861}
2871 2862
2872#else /* USE_ALIST_ENV */ 2863#else /* USE_ALIST_ENV */
2873 2864
2874static INLINE void 2865ecb_inline void
2875new_frame_in_env (SCHEME_P_ pointer old_env) 2866new_frame_in_env (SCHEME_P_ pointer old_env)
2876{ 2867{
2877 SCHEME_V->envir = immutable_cons (NIL, old_env); 2868 SCHEME_V->envir = immutable_cons (NIL, old_env);
2878 setenvironment (SCHEME_V->envir); 2869 setenvironment (SCHEME_V->envir);
2879} 2870}
2880 2871
2881static INLINE void 2872ecb_inline void
2882new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2883{ 2874{
2884 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2885} 2876}
2886 2877
… …
2908 return NIL; 2899 return NIL;
2909} 2900}
2910 2901
2911#endif /* USE_ALIST_ENV else */ 2902#endif /* USE_ALIST_ENV else */
2912 2903
2913static INLINE void 2904ecb_inline void
2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2915{ 2906{
2916 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2917} 2908}
2918 2909
2919static INLINE void 2910ecb_inline void
2920set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2921{ 2912{
2922 set_cdr (slot, value); 2913 set_cdr (slot, value);
2923} 2914}
2924 2915
2925static INLINE pointer 2916ecb_inline pointer
2926slot_value_in_env (pointer slot) 2917slot_value_in_env (pointer slot)
2927{ 2918{
2928 return cdr (slot); 2919 return cdr (slot);
2929} 2920}
2930 2921
2931/* ========== Evaluation Cycle ========== */ 2922/* ========== Evaluation Cycle ========== */
2932 2923
2933static pointer 2924static int
2934xError_1 (SCHEME_P_ const char *s, pointer a) 2925xError_1 (SCHEME_P_ const char *s, pointer a)
2935{ 2926{
2936#if USE_ERROR_HOOK 2927#if USE_ERROR_HOOK
2937 pointer x; 2928 pointer x;
2938 pointer hdl = SCHEME_V->ERROR_HOOK; 2929 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2973 code = cons (mk_string (SCHEME_A_ s), code); 2964 code = cons (mk_string (SCHEME_A_ s), code);
2974 setimmutable (car (code)); 2965 setimmutable (car (code));
2975 SCHEME_V->code = cons (slot_value_in_env (x), code); 2966 SCHEME_V->code = cons (slot_value_in_env (x), code);
2976 SCHEME_V->op = OP_EVAL; 2967 SCHEME_V->op = OP_EVAL;
2977 2968
2978 return S_T; 2969 return 0;
2979 } 2970 }
2980#endif 2971#endif
2981 2972
2982 if (a) 2973 if (a)
2983 SCHEME_V->args = cons (a, NIL); 2974 SCHEME_V->args = cons (a, NIL);
… …
2985 SCHEME_V->args = NIL; 2976 SCHEME_V->args = NIL;
2986 2977
2987 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2978 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2988 setimmutable (car (SCHEME_V->args)); 2979 setimmutable (car (SCHEME_V->args));
2989 SCHEME_V->op = OP_ERR0; 2980 SCHEME_V->op = OP_ERR0;
2981
2990 return S_T; 2982 return 0;
2991} 2983}
2992 2984
2993#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 2985#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2994#define Error_0(s) Error_1 (s, 0) 2986#define Error_0(s) Error_1 (s, 0)
2995 2987
2996/* Too small to turn into function */ 2988/* Too small to turn into function */
2997#define BEGIN do { 2989#define BEGIN do {
2998#define END } while (0) 2990#define END } while (0)
2999#define s_goto(a) BEGIN \ 2991#define s_goto(a) BEGIN \
3000 SCHEME_V->op = a; \ 2992 SCHEME_V->op = a; \
3001 return S_T; END 2993 return 0; END
3002 2994
3003#define s_return(a) return xs_return (SCHEME_A_ a) 2995#define s_return(a) return xs_return (SCHEME_A_ a)
3004 2996
3005#ifndef USE_SCHEME_STACK 2997#ifndef USE_SCHEME_STACK
3006 2998
… …
3031 next_frame = SCHEME_V->dump_base + nframes; 3023 next_frame = SCHEME_V->dump_base + nframes;
3032 3024
3033 next_frame->op = op; 3025 next_frame->op = op;
3034 next_frame->args = args; 3026 next_frame->args = args;
3035 next_frame->envir = SCHEME_V->envir; 3027 next_frame->envir = SCHEME_V->envir;
3036 next_frame->code = code; 3028 next_frame->code = code;
3037 3029
3038 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3039} 3031}
3040 3032
3041static pointer 3033static int
3042xs_return (SCHEME_P_ pointer a) 3034xs_return (SCHEME_P_ pointer a)
3043{ 3035{
3044 int nframes = (uintptr_t)SCHEME_V->dump; 3036 int nframes = (uintptr_t)SCHEME_V->dump;
3045 struct dump_stack_frame *frame; 3037 struct dump_stack_frame *frame;
3046 3038
3047 SCHEME_V->value = a; 3039 SCHEME_V->value = a;
3048 3040
3049 if (nframes <= 0) 3041 if (nframes <= 0)
3050 return NIL; 3042 return -1;
3051 3043
3052 frame = &SCHEME_V->dump_base[--nframes]; 3044 frame = &SCHEME_V->dump_base[--nframes];
3053 SCHEME_V->op = frame->op; 3045 SCHEME_V->op = frame->op;
3054 SCHEME_V->args = frame->args; 3046 SCHEME_V->args = frame->args;
3055 SCHEME_V->envir = frame->envir; 3047 SCHEME_V->envir = frame->envir;
3056 SCHEME_V->code = frame->code; 3048 SCHEME_V->code = frame->code;
3057 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3058 3050
3059 return S_T; 3051 return 0;
3060} 3052}
3061 3053
3062static INLINE void 3054ecb_inline void
3063dump_stack_reset (SCHEME_P) 3055dump_stack_reset (SCHEME_P)
3064{ 3056{
3065 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3057 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3066 SCHEME_V->dump = (pointer)+0; 3058 SCHEME_V->dump = (pointer)+0;
3067} 3059}
3068 3060
3069static INLINE void 3061ecb_inline void
3070dump_stack_initialize (SCHEME_P) 3062dump_stack_initialize (SCHEME_P)
3071{ 3063{
3072 SCHEME_V->dump_size = 0; 3064 SCHEME_V->dump_size = 0;
3073 SCHEME_V->dump_base = 0; 3065 SCHEME_V->dump_base = 0;
3074 dump_stack_reset (SCHEME_A); 3066 dump_stack_reset (SCHEME_A);
… …
3141 SCHEME_V->dump = (pointer)(uintptr_t)i; 3133 SCHEME_V->dump = (pointer)(uintptr_t)i;
3142} 3134}
3143 3135
3144#else 3136#else
3145 3137
3146static INLINE void 3138ecb_inline void
3147dump_stack_reset (SCHEME_P) 3139dump_stack_reset (SCHEME_P)
3148{ 3140{
3149 SCHEME_V->dump = NIL; 3141 SCHEME_V->dump = NIL;
3150} 3142}
3151 3143
3152static INLINE void 3144ecb_inline void
3153dump_stack_initialize (SCHEME_P) 3145dump_stack_initialize (SCHEME_P)
3154{ 3146{
3155 dump_stack_reset (SCHEME_A); 3147 dump_stack_reset (SCHEME_A);
3156} 3148}
3157 3149
… …
3159dump_stack_free (SCHEME_P) 3151dump_stack_free (SCHEME_P)
3160{ 3152{
3161 SCHEME_V->dump = NIL; 3153 SCHEME_V->dump = NIL;
3162} 3154}
3163 3155
3164static pointer 3156static int
3165xs_return (SCHEME_P_ pointer a) 3157xs_return (SCHEME_P_ pointer a)
3166{ 3158{
3167 pointer dump = SCHEME_V->dump; 3159 pointer dump = SCHEME_V->dump;
3168 3160
3169 SCHEME_V->value = a; 3161 SCHEME_V->value = a;
3170 3162
3171 if (dump == NIL) 3163 if (dump == NIL)
3172 return NIL; 3164 return -1;
3173 3165
3174 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3175 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3167 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3176 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3177 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3169 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3178 3170
3179 SCHEME_V->dump = dump; 3171 SCHEME_V->dump = dump;
3180 3172
3181 return S_T; 3173 return 0;
3182} 3174}
3183 3175
3184static void 3176static void
3185s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3186{ 3178{
… …
3211 3203
3212#endif 3204#endif
3213 3205
3214#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3215 3207
3216static pointer 3208static int
3217opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3209opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3218{ 3210{
3211 pointer args = SCHEME_V->args;
3219 pointer x, y; 3212 pointer x, y;
3220 3213
3221 switch (op) 3214 switch (op)
3222 { 3215 {
3223 case OP_LOAD: /* load */ 3216 case OP_LOAD: /* load */
3224 if (file_interactive (SCHEME_A)) 3217 if (file_interactive (SCHEME_A))
3225 { 3218 {
3226 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3219 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))); 3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3228 } 3221 }
3229 3222
3230 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3223 if (!file_push (SCHEME_A_ strvalue (car (args))))
3231 Error_1 ("unable to open", car (SCHEME_V->args)); 3224 Error_1 ("unable to open", car (args));
3232 else 3225 else
3233 { 3226 {
3234 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3235 s_goto (OP_T0LVL); 3228 s_goto (OP_T0LVL);
3236 } 3229 }
… …
3310 case OP_EVAL: /* main part of evaluation */ 3303 case OP_EVAL: /* main part of evaluation */
3311#if USE_TRACING 3304#if USE_TRACING
3312 if (SCHEME_V->tracing) 3305 if (SCHEME_V->tracing)
3313 { 3306 {
3314 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3307 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3315 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3308 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3316 SCHEME_V->args = SCHEME_V->code; 3309 SCHEME_V->args = SCHEME_V->code;
3317 putstr (SCHEME_A_ "\nEval: "); 3310 putstr (SCHEME_A_ "\nEval: ");
3318 s_goto (OP_P0LIST); 3311 s_goto (OP_P0LIST);
3319 } 3312 }
3320 3313
… …
3364 SCHEME_V->code = cdr (SCHEME_V->code); 3357 SCHEME_V->code = cdr (SCHEME_V->code);
3365 s_goto (OP_E1ARGS); 3358 s_goto (OP_E1ARGS);
3366 } 3359 }
3367 3360
3368 case OP_E1ARGS: /* eval arguments */ 3361 case OP_E1ARGS: /* eval arguments */
3369 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3362 args = cons (SCHEME_V->value, args);
3370 3363
3371 if (is_pair (SCHEME_V->code)) /* continue */ 3364 if (is_pair (SCHEME_V->code)) /* continue */
3372 { 3365 {
3373 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3366 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3374 SCHEME_V->code = car (SCHEME_V->code); 3367 SCHEME_V->code = car (SCHEME_V->code);
3375 SCHEME_V->args = NIL; 3368 SCHEME_V->args = NIL;
3376 s_goto (OP_EVAL); 3369 s_goto (OP_EVAL);
3377 } 3370 }
3378 else /* end */ 3371 else /* end */
3379 { 3372 {
3380 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3373 args = reverse_in_place (SCHEME_A_ NIL, args);
3381 SCHEME_V->code = car (SCHEME_V->args); 3374 SCHEME_V->code = car (args);
3382 SCHEME_V->args = cdr (SCHEME_V->args); 3375 SCHEME_V->args = cdr (args);
3383 s_goto (OP_APPLY); 3376 s_goto (OP_APPLY);
3384 } 3377 }
3385 3378
3386#if USE_TRACING 3379#if USE_TRACING
3387 3380
3388 case OP_TRACING: 3381 case OP_TRACING:
3389 { 3382 {
3390 int tr = SCHEME_V->tracing; 3383 int tr = SCHEME_V->tracing;
3391 3384
3392 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3385 SCHEME_V->tracing = ivalue (car (args));
3393 s_return (mk_integer (SCHEME_A_ tr)); 3386 s_return (mk_integer (SCHEME_A_ tr));
3394 } 3387 }
3395 3388
3396#endif 3389#endif
3397 3390
3398 case OP_APPLY: /* apply 'code' to 'args' */ 3391 case OP_APPLY: /* apply 'code' to 'args' */
3399#if USE_TRACING 3392#if USE_TRACING
3400 if (SCHEME_V->tracing) 3393 if (SCHEME_V->tracing)
3401 { 3394 {
3402 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3395 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3403 SCHEME_V->print_flag = 1; 3396 SCHEME_V->print_flag = 1;
3404 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3397 /* args=cons(SCHEME_V->code,args); */
3405 putstr (SCHEME_A_ "\nApply to: "); 3398 putstr (SCHEME_A_ "\nApply to: ");
3406 s_goto (OP_P0LIST); 3399 s_goto (OP_P0LIST);
3407 } 3400 }
3408 3401
3409 /* fall through */ 3402 /* fall through */
3410 3403
3411 case OP_REAL_APPLY: 3404 case OP_REAL_APPLY:
3412#endif 3405#endif
3413 if (is_proc (SCHEME_V->code)) 3406 if (is_proc (SCHEME_V->code))
3414 {
3415 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3416 }
3417 else if (is_foreign (SCHEME_V->code)) 3408 else if (is_foreign (SCHEME_V->code))
3418 { 3409 {
3419 /* Keep nested calls from GC'ing the arglist */ 3410 /* Keep nested calls from GC'ing the arglist */
3420 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3411 push_recent_alloc (SCHEME_A_ args, NIL);
3421 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3422 3413
3423 s_return (x); 3414 s_return (x);
3424 } 3415 }
3425 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3416 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3426 { 3417 {
3427 /* Should not accept promise */ 3418 /* Should not accept promise */
3428 /* make environment */ 3419 /* make environment */
3429 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3420 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3430 3421
3431 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3422 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3432 { 3423 {
3433 if (y == NIL) 3424 if (y == NIL)
3434 Error_0 ("not enough arguments"); 3425 Error_0 ("not enough arguments");
3435 else 3426 else
3436 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3427 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3454 s_goto (OP_BEGIN); 3445 s_goto (OP_BEGIN);
3455 } 3446 }
3456 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3447 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3457 { 3448 {
3458 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3449 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3459 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3450 s_return (args != NIL ? car (args) : NIL);
3460 } 3451 }
3461 else 3452 else
3462 Error_0 ("illegal function"); 3453 Error_0 ("illegal function");
3463 3454
3464 case OP_DOMACRO: /* do macro */ 3455 case OP_DOMACRO: /* do macro */
… …
3473 { 3464 {
3474 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3465 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3475 3466
3476 if (f != NIL) 3467 if (f != NIL)
3477 { 3468 {
3478 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3469 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3479 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3470 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3480 SCHEME_V->code = slot_value_in_env (f); 3471 SCHEME_V->code = slot_value_in_env (f);
3481 s_goto (OP_APPLY); 3472 s_goto (OP_APPLY);
3482 } 3473 }
3483 3474
… …
3494 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3485 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3495 3486
3496#endif 3487#endif
3497 3488
3498 case OP_MKCLOSURE: /* make-closure */ 3489 case OP_MKCLOSURE: /* make-closure */
3499 x = car (SCHEME_V->args); 3490 x = car (args);
3500 3491
3501 if (car (x) == SCHEME_V->LAMBDA) 3492 if (car (x) == SCHEME_V->LAMBDA)
3502 x = cdr (x); 3493 x = cdr (x);
3503 3494
3504 if (cdr (SCHEME_V->args) == NIL) 3495 if (cdr (args) == NIL)
3505 y = SCHEME_V->envir; 3496 y = SCHEME_V->envir;
3506 else 3497 else
3507 y = cadr (SCHEME_V->args); 3498 y = cadr (args);
3508 3499
3509 s_return (mk_closure (SCHEME_A_ x, y)); 3500 s_return (mk_closure (SCHEME_A_ x, y));
3510 3501
3511 case OP_QUOTE: /* quote */ 3502 case OP_QUOTE: /* quote */
3512 s_return (car (SCHEME_V->code)); 3503 s_return (car (SCHEME_V->code));
… …
3544 3535
3545 3536
3546 case OP_DEFP: /* defined? */ 3537 case OP_DEFP: /* defined? */
3547 x = SCHEME_V->envir; 3538 x = SCHEME_V->envir;
3548 3539
3549 if (cdr (SCHEME_V->args) != NIL) 3540 if (cdr (args) != NIL)
3550 x = cadr (SCHEME_V->args); 3541 x = cadr (args);
3551 3542
3552 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3543 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3553 3544
3554 case OP_SET0: /* set! */ 3545 case OP_SET0: /* set! */
3555 if (is_immutable (car (SCHEME_V->code))) 3546 if (is_immutable (car (SCHEME_V->code)))
3556 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3547 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3557 3548
… …
3588 3579
3589 case OP_IF1: /* if */ 3580 case OP_IF1: /* if */
3590 if (is_true (SCHEME_V->value)) 3581 if (is_true (SCHEME_V->value))
3591 SCHEME_V->code = car (SCHEME_V->code); 3582 SCHEME_V->code = car (SCHEME_V->code);
3592 else 3583 else
3593 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3584 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3594
3595 * car(NIL) = NIL */
3596 s_goto (OP_EVAL); 3585 s_goto (OP_EVAL);
3597 3586
3598 case OP_LET0: /* let */ 3587 case OP_LET0: /* let */
3599 SCHEME_V->args = NIL; 3588 SCHEME_V->args = NIL;
3600 SCHEME_V->value = SCHEME_V->code; 3589 SCHEME_V->value = SCHEME_V->code;
3601 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3590 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3602 s_goto (OP_LET1); 3591 s_goto (OP_LET1);
3603 3592
3604 case OP_LET1: /* let (calculate parameters) */ 3593 case OP_LET1: /* let (calculate parameters) */
3605 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3594 args = cons (SCHEME_V->value, args);
3606 3595
3607 if (is_pair (SCHEME_V->code)) /* continue */ 3596 if (is_pair (SCHEME_V->code)) /* continue */
3608 { 3597 {
3609 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3598 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)); 3599 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3611 3600
3612 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3601 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3613 SCHEME_V->code = cadar (SCHEME_V->code); 3602 SCHEME_V->code = cadar (SCHEME_V->code);
3614 SCHEME_V->args = NIL; 3603 SCHEME_V->args = NIL;
3615 s_goto (OP_EVAL); 3604 s_goto (OP_EVAL);
3616 } 3605 }
3617 else /* end */ 3606 else /* end */
3618 { 3607 {
3619 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3608 args = reverse_in_place (SCHEME_A_ NIL, args);
3620 SCHEME_V->code = car (SCHEME_V->args); 3609 SCHEME_V->code = car (args);
3621 SCHEME_V->args = cdr (SCHEME_V->args); 3610 SCHEME_V->args = cdr (args);
3622 s_goto (OP_LET2); 3611 s_goto (OP_LET2);
3623 } 3612 }
3624 3613
3625 case OP_LET2: /* let */ 3614 case OP_LET2: /* let */
3626 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3627 3616
3628 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3617 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)) 3618 y != NIL; x = cdr (x), y = cdr (y))
3630 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3619 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3631 3620
3632 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3621 if (is_symbol (car (SCHEME_V->code))) /* named let */
3633 { 3622 {
3634 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3623 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3635 { 3624 {
3636 if (!is_pair (x)) 3625 if (!is_pair (x))
3637 Error_1 ("Bad syntax of binding in let :", x); 3626 Error_1 ("Bad syntax of binding in let :", x);
3638 3627
3639 if (!is_list (SCHEME_A_ car (x))) 3628 if (!is_list (SCHEME_A_ car (x)))
3640 Error_1 ("Bad syntax of binding in let :", car (x)); 3629 Error_1 ("Bad syntax of binding in let :", car (x));
3641 3630
3642 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3631 args = cons (caar (x), args);
3643 } 3632 }
3644 3633
3645 x =
3646 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3634 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3647 SCHEME_V->envir); 3635 SCHEME_V->envir);
3648 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3636 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3649 SCHEME_V->code = cddr (SCHEME_V->code); 3637 SCHEME_V->code = cddr (SCHEME_V->code);
3650 SCHEME_V->args = NIL;
3651 } 3638 }
3652 else 3639 else
3653 { 3640 {
3654 SCHEME_V->code = cdr (SCHEME_V->code); 3641 SCHEME_V->code = cdr (SCHEME_V->code);
3642 }
3643
3655 SCHEME_V->args = NIL; 3644 SCHEME_V->args = NIL;
3656 }
3657
3658 s_goto (OP_BEGIN); 3645 s_goto (OP_BEGIN);
3659 3646
3660 case OP_LET0AST: /* let* */ 3647 case OP_LET0AST: /* let* */
3661 if (car (SCHEME_V->code) == NIL) 3648 if (car (SCHEME_V->code) == NIL)
3662 { 3649 {
… …
3680 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3667 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3681 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3682 3669
3683 if (is_pair (SCHEME_V->code)) /* continue */ 3670 if (is_pair (SCHEME_V->code)) /* continue */
3684 { 3671 {
3685 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3672 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3686 SCHEME_V->code = cadar (SCHEME_V->code); 3673 SCHEME_V->code = cadar (SCHEME_V->code);
3687 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3688 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3689 } 3676 }
3690 else /* end */ 3677 else /* end */
3691 { 3678 {
3692 SCHEME_V->code = SCHEME_V->args; 3679 SCHEME_V->code = args;
3693 SCHEME_V->args = NIL; 3680 SCHEME_V->args = NIL;
3694 s_goto (OP_BEGIN); 3681 s_goto (OP_BEGIN);
3695 } 3682 }
3696 3683
3697 case OP_LET0REC: /* letrec */ 3684 case OP_LET0REC: /* letrec */
… …
3700 SCHEME_V->value = SCHEME_V->code; 3687 SCHEME_V->value = SCHEME_V->code;
3701 SCHEME_V->code = car (SCHEME_V->code); 3688 SCHEME_V->code = car (SCHEME_V->code);
3702 s_goto (OP_LET1REC); 3689 s_goto (OP_LET1REC);
3703 3690
3704 case OP_LET1REC: /* letrec (calculate parameters) */ 3691 case OP_LET1REC: /* letrec (calculate parameters) */
3705 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3692 args = cons (SCHEME_V->value, args);
3706 3693
3707 if (is_pair (SCHEME_V->code)) /* continue */ 3694 if (is_pair (SCHEME_V->code)) /* continue */
3708 { 3695 {
3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3696 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)); 3697 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3711 3698
3712 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3699 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3713 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3716 } 3703 }
3717 else /* end */ 3704 else /* end */
3718 { 3705 {
3719 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3706 args = reverse_in_place (SCHEME_A_ NIL, args);
3720 SCHEME_V->code = car (SCHEME_V->args); 3707 SCHEME_V->code = car (args);
3721 SCHEME_V->args = cdr (SCHEME_V->args); 3708 SCHEME_V->args = cdr (args);
3722 s_goto (OP_LET2REC); 3709 s_goto (OP_LET2REC);
3723 } 3710 }
3724 3711
3725 case OP_LET2REC: /* letrec */ 3712 case OP_LET2REC: /* letrec */
3726 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3713 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)); 3714 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3728 3715
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3716 SCHEME_V->code = cdr (SCHEME_V->code);
3730 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3731 s_goto (OP_BEGIN); 3718 s_goto (OP_BEGIN);
… …
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 3805 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 3806 s_goto (OP_EVAL);
3820 3807
3821 case OP_C1STREAM: /* cons-stream */ 3808 case OP_C1STREAM: /* cons-stream */
3822 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3809 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); 3810 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3824 set_typeflag (x, T_PROMISE); 3811 set_typeflag (x, T_PROMISE);
3825 s_return (cons (SCHEME_V->args, x)); 3812 s_return (cons (args, x));
3826 3813
3827 case OP_MACRO0: /* macro */ 3814 case OP_MACRO0: /* macro */
3828 if (is_pair (car (SCHEME_V->code))) 3815 if (is_pair (car (SCHEME_V->code)))
3829 { 3816 {
3830 x = caar (SCHEME_V->code); 3817 x = caar (SCHEME_V->code);
… …
3863 { 3850 {
3864 if (!is_pair (y = caar (x))) 3851 if (!is_pair (y = caar (x)))
3865 break; 3852 break;
3866 3853
3867 for (; y != NIL; y = cdr (y)) 3854 for (; y != NIL; y = cdr (y))
3868 {
3869 if (eqv (car (y), SCHEME_V->value)) 3855 if (eqv (car (y), SCHEME_V->value))
3870 break; 3856 break;
3871 }
3872 3857
3873 if (y != NIL) 3858 if (y != NIL)
3874 break; 3859 break;
3875 } 3860 }
3876 3861
… …
3896 s_goto (OP_BEGIN); 3881 s_goto (OP_BEGIN);
3897 else 3882 else
3898 s_return (NIL); 3883 s_return (NIL);
3899 3884
3900 case OP_PAPPLY: /* apply */ 3885 case OP_PAPPLY: /* apply */
3901 SCHEME_V->code = car (SCHEME_V->args); 3886 SCHEME_V->code = car (args);
3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3903 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3888 /*SCHEME_V->args = cadr(args); */
3904 s_goto (OP_APPLY); 3889 s_goto (OP_APPLY);
3905 3890
3906 case OP_PEVAL: /* eval */ 3891 case OP_PEVAL: /* eval */
3907 if (cdr (SCHEME_V->args) != NIL) 3892 if (cdr (args) != NIL)
3908 SCHEME_V->envir = cadr (SCHEME_V->args); 3893 SCHEME_V->envir = cadr (args);
3909 3894
3910 SCHEME_V->code = car (SCHEME_V->args); 3895 SCHEME_V->code = car (args);
3911 s_goto (OP_EVAL); 3896 s_goto (OP_EVAL);
3912 3897
3913 case OP_CONTINUATION: /* call-with-current-continuation */ 3898 case OP_CONTINUATION: /* call-with-current-continuation */
3914 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3900 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 3901 s_goto (OP_APPLY);
3917 } 3902 }
3918 3903
3919 abort (); 3904 if (USE_ERROR_CHECKING) abort ();
3920} 3905}
3921 3906
3922static pointer 3907static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3908opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 3909{
3925 pointer x; 3910 pointer args = SCHEME_V->args;
3911 pointer x = car (args);
3926 num v; 3912 num v;
3927 3913
3928#if USE_MATH 3914#if USE_MATH
3929 RVALUE dd; 3915 RVALUE dd;
3930#endif 3916#endif
3931 3917
3932 switch (op) 3918 switch (op)
3933 { 3919 {
3934#if USE_MATH 3920#if USE_MATH
3935
3936 case OP_INEX2EX: /* inexact->exact */ 3921 case OP_INEX2EX: /* inexact->exact */
3937 x = car (SCHEME_V->args);
3938
3939 if (num_is_integer (x)) 3922 if (is_integer (x))
3940 s_return (x); 3923 s_return (x);
3941 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3924 else if (modf (rvalue_unchecked (x), &dd) == 0)
3942 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3925 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3943 else 3926 else
3944 Error_1 ("inexact->exact: not integral:", x); 3927 Error_1 ("inexact->exact: not integral:", x);
3945 3928
3946 case OP_EXP:
3947 x = car (SCHEME_V->args);
3948 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3929 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)))); 3930 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)))); 3931 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)))); 3932 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)))); 3933 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)))); 3934 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)))); 3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 3936
3974 case OP_ATAN: 3937 case OP_ATAN:
3975 x = car (SCHEME_V->args);
3976
3977 if (cdr (SCHEME_V->args) == NIL) 3938 if (cdr (args) == NIL)
3978 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
3979 else 3940 else
3980 { 3941 {
3981 pointer y = cadr (SCHEME_V->args); 3942 pointer y = cadr (args);
3982
3983 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3984 } 3944 }
3985 3945
3986 case OP_SQRT: 3946 case OP_SQRT:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 3948
3990 case OP_EXPT: 3949 case OP_EXPT:
3991 { 3950 {
3992 RVALUE result; 3951 RVALUE result;
3993 int real_result = 1; 3952 int real_result = 1;
3994 pointer y = cadr (SCHEME_V->args); 3953 pointer y = cadr (args);
3995 3954
3996 x = car (SCHEME_V->args);
3997
3998 if (num_is_integer (x) && num_is_integer (y)) 3955 if (is_integer (x) && is_integer (y))
3999 real_result = 0; 3956 real_result = 0;
4000 3957
4001 /* This 'if' is an R5RS compatibility fix. */ 3958 /* This 'if' is an R5RS compatibility fix. */
4002 /* NOTE: Remove this 'if' fix for R6RS. */ 3959 /* NOTE: Remove this 'if' fix for R6RS. */
4003 if (rvalue (x) == 0 && rvalue (y) < 0) 3960 if (rvalue (x) == 0 && rvalue (y) < 0)
4004 result = 0.0; 3961 result = 0;
4005 else 3962 else
4006 result = pow (rvalue (x), rvalue (y)); 3963 result = pow (rvalue (x), rvalue (y));
4007 3964
4008 /* Before returning integer result make sure we can. */ 3965 /* Before returning integer result make sure we can. */
4009 /* If the test fails, result is too big for integer. */ 3966 /* If the test fails, result is too big for integer. */
4010 if (!real_result) 3967 if (!real_result)
4011 { 3968 {
4012 long result_as_long = (long) result; 3969 long result_as_long = result;
4013 3970
4014 if (result != (RVALUE) result_as_long) 3971 if (result != (RVALUE) result_as_long)
4015 real_result = 1; 3972 real_result = 1;
4016 } 3973 }
4017 3974
… …
4019 s_return (mk_real (SCHEME_A_ result)); 3976 s_return (mk_real (SCHEME_A_ result));
4020 else 3977 else
4021 s_return (mk_integer (SCHEME_A_ result)); 3978 s_return (mk_integer (SCHEME_A_ result));
4022 } 3979 }
4023 3980
4024 case OP_FLOOR:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3981 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)))); 3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 3983
4032 case OP_TRUNCATE: 3984 case OP_TRUNCATE:
4033 { 3985 {
4034 RVALUE rvalue_of_x; 3986 RVALUE rvalue_of_x;
4035 3987
4036 x = car (SCHEME_V->args);
4037 rvalue_of_x = rvalue (x); 3988 rvalue_of_x = rvalue (x);
4038 3989
4039 if (rvalue_of_x > 0) 3990 if (rvalue_of_x > 0)
4040 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4041 else 3992 else
4042 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4043 } 3994 }
4044 3995
4045 case OP_ROUND: 3996 case OP_ROUND:
4046 x = car (SCHEME_V->args);
4047
4048 if (num_is_integer (x)) 3997 if (num_is_integer (x))
4049 s_return (x); 3998 s_return (x);
4050 3999
4051 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4052#endif 4001#endif
4053 4002
4054 case OP_ADD: /* + */ 4003 case OP_ADD: /* + */
4055 v = num_zero; 4004 v = num_zero;
4056 4005
4057 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4006 for (x = args; x != NIL; x = cdr (x))
4058 v = num_op ('+', v, nvalue (car (x))); 4007 v = num_op (NUM_ADD, v, nvalue (car (x)));
4059 4008
4060 s_return (mk_number (SCHEME_A_ v)); 4009 s_return (mk_number (SCHEME_A_ v));
4061 4010
4062 case OP_MUL: /* * */ 4011 case OP_MUL: /* * */
4063 v = num_one; 4012 v = num_one;
4064 4013
4065 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4014 for (x = args; x != NIL; x = cdr (x))
4066 v = num_op ('+', v, nvalue (car (x))); 4015 v = num_op (NUM_MUL, v, nvalue (car (x)));
4067 4016
4068 s_return (mk_number (SCHEME_A_ v)); 4017 s_return (mk_number (SCHEME_A_ v));
4069 4018
4070 case OP_SUB: /* - */ 4019 case OP_SUB: /* - */
4071 if (cdr (SCHEME_V->args) == NIL) 4020 if (cdr (args) == NIL)
4072 { 4021 {
4073 x = SCHEME_V->args; 4022 x = args;
4074 v = num_zero; 4023 v = num_zero;
4075 } 4024 }
4076 else 4025 else
4077 { 4026 {
4078 x = cdr (SCHEME_V->args); 4027 x = cdr (args);
4079 v = nvalue (car (SCHEME_V->args)); 4028 v = nvalue (car (args));
4080 } 4029 }
4081 4030
4082 for (; x != NIL; x = cdr (x)) 4031 for (; x != NIL; x = cdr (x))
4083 v = num_op ('+', v, nvalue (car (x))); 4032 v = num_op (NUM_SUB, v, nvalue (car (x)));
4084 4033
4085 s_return (mk_number (SCHEME_A_ v)); 4034 s_return (mk_number (SCHEME_A_ v));
4086 4035
4087 case OP_DIV: /* / */ 4036 case OP_DIV: /* / */
4088 if (cdr (SCHEME_V->args) == NIL) 4037 if (cdr (args) == NIL)
4089 { 4038 {
4090 x = SCHEME_V->args; 4039 x = args;
4091 v = num_one; 4040 v = num_one;
4092 } 4041 }
4093 else 4042 else
4094 { 4043 {
4095 x = cdr (SCHEME_V->args); 4044 x = cdr (args);
4096 v = nvalue (car (SCHEME_V->args)); 4045 v = nvalue (car (args));
4097 } 4046 }
4098 4047
4099 for (; x != NIL; x = cdr (x)) 4048 for (; x != NIL; x = cdr (x))
4100 {
4101 if (!is_zero_rvalue (rvalue (car (x)))) 4049 if (!is_zero_rvalue (rvalue (car (x))))
4102 v = num_div (v, nvalue (car (x))); 4050 v = num_div (v, nvalue (car (x)));
4103 else 4051 else
4104 Error_0 ("/: division by zero"); 4052 Error_0 ("/: division by zero");
4105 }
4106 4053
4107 s_return (mk_number (SCHEME_A_ v)); 4054 s_return (mk_number (SCHEME_A_ v));
4108 4055
4109 case OP_INTDIV: /* quotient */ 4056 case OP_INTDIV: /* quotient */
4110 if (cdr (SCHEME_V->args) == NIL) 4057 if (cdr (args) == NIL)
4111 { 4058 {
4112 x = SCHEME_V->args; 4059 x = args;
4113 v = num_one; 4060 v = num_one;
4114 } 4061 }
4115 else 4062 else
4116 { 4063 {
4117 x = cdr (SCHEME_V->args); 4064 x = cdr (args);
4118 v = nvalue (car (SCHEME_V->args)); 4065 v = nvalue (car (args));
4119 } 4066 }
4120 4067
4121 for (; x != NIL; x = cdr (x)) 4068 for (; x != NIL; x = cdr (x))
4122 { 4069 {
4123 if (ivalue (car (x)) != 0) 4070 if (ivalue (car (x)) != 0)
4124 v = num_op ('/', v, nvalue (car (x))); 4071 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4125 else 4072 else
4126 Error_0 ("quotient: division by zero"); 4073 Error_0 ("quotient: division by zero");
4127 } 4074 }
4128 4075
4129 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4130 4077
4131 case OP_REM: /* remainder */ 4078 case OP_REM: /* remainder */
4132 v = nvalue (car (SCHEME_V->args)); 4079 v = nvalue (x);
4133 4080
4134 if (ivalue (cadr (SCHEME_V->args)) != 0) 4081 if (ivalue (cadr (args)) != 0)
4135 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4082 v = num_rem (v, nvalue (cadr (args)));
4136 else 4083 else
4137 Error_0 ("remainder: division by zero"); 4084 Error_0 ("remainder: division by zero");
4138 4085
4139 s_return (mk_number (SCHEME_A_ v)); 4086 s_return (mk_number (SCHEME_A_ v));
4140 4087
4141 case OP_MOD: /* modulo */ 4088 case OP_MOD: /* modulo */
4142 v = nvalue (car (SCHEME_V->args)); 4089 v = nvalue (x);
4143 4090
4144 if (ivalue (cadr (SCHEME_V->args)) != 0) 4091 if (ivalue (cadr (args)) != 0)
4145 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4092 v = num_mod (v, nvalue (cadr (args)));
4146 else 4093 else
4147 Error_0 ("modulo: division by zero"); 4094 Error_0 ("modulo: division by zero");
4148 4095
4149 s_return (mk_number (SCHEME_A_ v)); 4096 s_return (mk_number (SCHEME_A_ v));
4150 4097
4151 case OP_CAR: /* car */ 4098 case OP_CAR: /* car */
4152 s_return (caar (SCHEME_V->args)); 4099 s_return (caar (args));
4153 4100
4154 case OP_CDR: /* cdr */ 4101 case OP_CDR: /* cdr */
4155 s_return (cdar (SCHEME_V->args)); 4102 s_return (cdar (args));
4156 4103
4157 case OP_CONS: /* cons */ 4104 case OP_CONS: /* cons */
4158 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4105 set_cdr (args, cadr (args));
4159 s_return (SCHEME_V->args); 4106 s_return (args);
4160 4107
4161 case OP_SETCAR: /* set-car! */ 4108 case OP_SETCAR: /* set-car! */
4162 if (!is_immutable (car (SCHEME_V->args))) 4109 if (!is_immutable (x))
4163 { 4110 {
4164 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4111 set_car (x, cadr (args));
4165 s_return (car (SCHEME_V->args)); 4112 s_return (car (args));
4166 } 4113 }
4167 else 4114 else
4168 Error_0 ("set-car!: unable to alter immutable pair"); 4115 Error_0 ("set-car!: unable to alter immutable pair");
4169 4116
4170 case OP_SETCDR: /* set-cdr! */ 4117 case OP_SETCDR: /* set-cdr! */
4171 if (!is_immutable (car (SCHEME_V->args))) 4118 if (!is_immutable (x))
4172 { 4119 {
4173 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4120 set_cdr (x, cadr (args));
4174 s_return (car (SCHEME_V->args)); 4121 s_return (car (args));
4175 } 4122 }
4176 else 4123 else
4177 Error_0 ("set-cdr!: unable to alter immutable pair"); 4124 Error_0 ("set-cdr!: unable to alter immutable pair");
4178 4125
4179 case OP_CHAR2INT: /* char->integer */ 4126 case OP_CHAR2INT: /* char->integer */
4180 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4127 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4181 4128
4182 case OP_INT2CHAR: /* integer->char */ 4129 case OP_INT2CHAR: /* integer->char */
4183 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4130 s_return (mk_character (SCHEME_A_ ivalue (x)));
4184 4131
4185 case OP_CHARUPCASE: 4132 case OP_CHARUPCASE:
4186 { 4133 {
4187 unsigned char c = ivalue (car (SCHEME_V->args)); 4134 unsigned char c = ivalue (x);
4188 c = toupper (c); 4135 c = toupper (c);
4189 s_return (mk_character (SCHEME_A_ c)); 4136 s_return (mk_character (SCHEME_A_ c));
4190 } 4137 }
4191 4138
4192 case OP_CHARDNCASE: 4139 case OP_CHARDNCASE:
4193 { 4140 {
4194 unsigned char c = ivalue (car (SCHEME_V->args)); 4141 unsigned char c = ivalue (x);
4195 c = tolower (c); 4142 c = tolower (c);
4196 s_return (mk_character (SCHEME_A_ c)); 4143 s_return (mk_character (SCHEME_A_ c));
4197 } 4144 }
4198 4145
4199 case OP_STR2SYM: /* string->symbol */ 4146 case OP_STR2SYM: /* string->symbol */
4200 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4147 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4201 4148
4202 case OP_STR2ATOM: /* string->atom */ 4149 case OP_STR2ATOM: /* string->atom */
4203 { 4150 {
4204 char *s = strvalue (car (SCHEME_V->args)); 4151 char *s = strvalue (x);
4205 long pf = 0; 4152 long pf = 0;
4206 4153
4207 if (cdr (SCHEME_V->args) != NIL) 4154 if (cdr (args) != NIL)
4208 { 4155 {
4209 /* we know cadr(SCHEME_V->args) is a natural number */ 4156 /* we know cadr(args) is a natural number */
4210 /* see if it is 2, 8, 10, or 16, or error */ 4157 /* see if it is 2, 8, 10, or 16, or error */
4211 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4158 pf = ivalue_unchecked (cadr (args));
4212 4159
4213 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4160 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4214 { 4161 {
4215 /* base is OK */ 4162 /* base is OK */
4216 } 4163 }
4217 else 4164 else
4218 pf = -1; 4165 pf = -1;
4219 } 4166 }
4220 4167
4221 if (pf < 0) 4168 if (pf < 0)
4222 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4169 Error_1 ("string->atom: bad base:", cadr (args));
4223 else if (*s == '#') /* no use of base! */ 4170 else if (*s == '#') /* no use of base! */
4224 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4171 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4225 else 4172 else
4226 { 4173 {
4227 if (pf == 0 || pf == 10) 4174 if (pf == 0 || pf == 10)
… …
4238 } 4185 }
4239 } 4186 }
4240 } 4187 }
4241 4188
4242 case OP_SYM2STR: /* symbol->string */ 4189 case OP_SYM2STR: /* symbol->string */
4243 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4190 x = mk_string (SCHEME_A_ symname (x));
4244 setimmutable (x); 4191 setimmutable (x);
4245 s_return (x); 4192 s_return (x);
4246 4193
4247 case OP_ATOM2STR: /* atom->string */ 4194 case OP_ATOM2STR: /* atom->string */
4248 { 4195 {
4249 long pf = 0; 4196 long pf = 0;
4250 4197
4251 x = car (SCHEME_V->args);
4252
4253 if (cdr (SCHEME_V->args) != NIL) 4198 if (cdr (args) != NIL)
4254 { 4199 {
4255 /* we know cadr(SCHEME_V->args) is a natural number */ 4200 /* we know cadr(args) is a natural number */
4256 /* see if it is 2, 8, 10, or 16, or error */ 4201 /* see if it is 2, 8, 10, or 16, or error */
4257 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4202 pf = ivalue_unchecked (cadr (args));
4258 4203
4259 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4204 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4260 { 4205 {
4261 /* base is OK */ 4206 /* base is OK */
4262 } 4207 }
4263 else 4208 else
4264 pf = -1; 4209 pf = -1;
4265 } 4210 }
4266 4211
4267 if (pf < 0) 4212 if (pf < 0)
4268 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4213 Error_1 ("atom->string: bad base:", cadr (args));
4269 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4214 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4270 { 4215 {
4271 char *p; 4216 char *p;
4272 int len; 4217 int len;
4273 4218
… …
4281 case OP_MKSTRING: /* make-string */ 4226 case OP_MKSTRING: /* make-string */
4282 { 4227 {
4283 int fill = ' '; 4228 int fill = ' ';
4284 int len; 4229 int len;
4285 4230
4286 len = ivalue (car (SCHEME_V->args)); 4231 len = ivalue (x);
4287 4232
4288 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4289 fill = charvalue (cadr (SCHEME_V->args)); 4234 fill = charvalue (cadr (args));
4290 4235
4291 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4236 s_return (mk_empty_string (SCHEME_A_ len, fill));
4292 } 4237 }
4293 4238
4294 case OP_STRLEN: /* string-length */ 4239 case OP_STRLEN: /* string-length */
4295 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4240 s_return (mk_integer (SCHEME_A_ strlength (x)));
4296 4241
4297 case OP_STRREF: /* string-ref */ 4242 case OP_STRREF: /* string-ref */
4298 { 4243 {
4299 char *str; 4244 char *str;
4300 int index; 4245 int index;
4301 4246
4302 str = strvalue (car (SCHEME_V->args)); 4247 str = strvalue (x);
4303 4248
4304 index = ivalue (cadr (SCHEME_V->args)); 4249 index = ivalue (cadr (args));
4305 4250
4306 if (index >= strlength (car (SCHEME_V->args))) 4251 if (index >= strlength (x))
4307 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4252 Error_1 ("string-ref: out of bounds:", cadr (args));
4308 4253
4309 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4310 } 4255 }
4311 4256
4312 case OP_STRSET: /* string-set! */ 4257 case OP_STRSET: /* string-set! */
4313 { 4258 {
4314 char *str; 4259 char *str;
4315 int index; 4260 int index;
4316 int c; 4261 int c;
4317 4262
4318 if (is_immutable (car (SCHEME_V->args))) 4263 if (is_immutable (x))
4319 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4264 Error_1 ("string-set!: unable to alter immutable string:", x);
4320 4265
4321 str = strvalue (car (SCHEME_V->args)); 4266 str = strvalue (x);
4322 4267
4323 index = ivalue (cadr (SCHEME_V->args)); 4268 index = ivalue (cadr (args));
4324 4269
4325 if (index >= strlength (car (SCHEME_V->args))) 4270 if (index >= strlength (x))
4326 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4271 Error_1 ("string-set!: out of bounds:", cadr (args));
4327 4272
4328 c = charvalue (caddr (SCHEME_V->args)); 4273 c = charvalue (caddr (args));
4329 4274
4330 str[index] = (char) c; 4275 str[index] = c;
4331 s_return (car (SCHEME_V->args)); 4276 s_return (car (args));
4332 } 4277 }
4333 4278
4334 case OP_STRAPPEND: /* string-append */ 4279 case OP_STRAPPEND: /* string-append */
4335 { 4280 {
4336 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4281 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4337 int len = 0; 4282 int len = 0;
4338 pointer newstr; 4283 pointer newstr;
4339 char *pos; 4284 char *pos;
4340 4285
4341 /* compute needed length for new string */ 4286 /* compute needed length for new string */
4342 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4287 for (x = args; x != NIL; x = cdr (x))
4343 len += strlength (car (x)); 4288 len += strlength (car (x));
4344 4289
4345 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4290 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4346 4291
4347 /* store the contents of the argument strings into the new string */ 4292 /* 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)) 4293 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4349 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4294 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4350 4295
4351 s_return (newstr); 4296 s_return (newstr);
4352 } 4297 }
4353 4298
… …
4356 char *str; 4301 char *str;
4357 int index0; 4302 int index0;
4358 int index1; 4303 int index1;
4359 int len; 4304 int len;
4360 4305
4361 str = strvalue (car (SCHEME_V->args)); 4306 str = strvalue (x);
4362 4307
4363 index0 = ivalue (cadr (SCHEME_V->args)); 4308 index0 = ivalue (cadr (args));
4364 4309
4365 if (index0 > strlength (car (SCHEME_V->args))) 4310 if (index0 > strlength (x))
4366 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4311 Error_1 ("substring: start out of bounds:", cadr (args));
4367 4312
4368 if (cddr (SCHEME_V->args) != NIL) 4313 if (cddr (args) != NIL)
4369 { 4314 {
4370 index1 = ivalue (caddr (SCHEME_V->args)); 4315 index1 = ivalue (caddr (args));
4371 4316
4372 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4317 if (index1 > strlength (x) || index1 < index0)
4373 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4318 Error_1 ("substring: end out of bounds:", caddr (args));
4374 } 4319 }
4375 else 4320 else
4376 index1 = strlength (car (SCHEME_V->args)); 4321 index1 = strlength (x);
4377 4322
4378 len = index1 - index0; 4323 len = index1 - index0;
4379 x = mk_empty_string (SCHEME_A_ len, ' '); 4324 x = mk_empty_string (SCHEME_A_ len, ' ');
4380 memcpy (strvalue (x), str + index0, len); 4325 memcpy (strvalue (x), str + index0, len);
4381 strvalue (x)[len] = 0; 4326 strvalue (x)[len] = 0;
… …
4385 4330
4386 case OP_VECTOR: /* vector */ 4331 case OP_VECTOR: /* vector */
4387 { 4332 {
4388 int i; 4333 int i;
4389 pointer vec; 4334 pointer vec;
4390 int len = list_length (SCHEME_A_ SCHEME_V->args); 4335 int len = list_length (SCHEME_A_ args);
4391 4336
4392 if (len < 0) 4337 if (len < 0)
4393 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4338 Error_1 ("vector: not a proper list:", args);
4394 4339
4395 vec = mk_vector (SCHEME_A_ len); 4340 vec = mk_vector (SCHEME_A_ len);
4396 4341
4397#if USE_ERROR_CHECKING 4342#if USE_ERROR_CHECKING
4398 if (SCHEME_V->no_memory) 4343 if (SCHEME_V->no_memory)
4399 s_return (S_SINK); 4344 s_return (S_SINK);
4400#endif 4345#endif
4401 4346
4402 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4403 set_vector_elem (vec, i, car (x)); 4348 set_vector_elem (vec, i, car (x));
4404 4349
4405 s_return (vec); 4350 s_return (vec);
4406 } 4351 }
4407 4352
… …
4409 { 4354 {
4410 pointer fill = NIL; 4355 pointer fill = NIL;
4411 int len; 4356 int len;
4412 pointer vec; 4357 pointer vec;
4413 4358
4414 len = ivalue (car (SCHEME_V->args)); 4359 len = ivalue (x);
4415 4360
4416 if (cdr (SCHEME_V->args) != NIL) 4361 if (cdr (args) != NIL)
4417 fill = cadr (SCHEME_V->args); 4362 fill = cadr (args);
4418 4363
4419 vec = mk_vector (SCHEME_A_ len); 4364 vec = mk_vector (SCHEME_A_ len);
4420 4365
4421#if USE_ERROR_CHECKING 4366#if USE_ERROR_CHECKING
4422 if (SCHEME_V->no_memory) 4367 if (SCHEME_V->no_memory)
… …
4428 4373
4429 s_return (vec); 4374 s_return (vec);
4430 } 4375 }
4431 4376
4432 case OP_VECLEN: /* vector-length */ 4377 case OP_VECLEN: /* vector-length */
4433 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4378 s_return (mk_integer (SCHEME_A_ veclength (x)));
4434 4379
4435 case OP_VECREF: /* vector-ref */ 4380 case OP_VECREF: /* vector-ref */
4436 { 4381 {
4437 int index; 4382 int index;
4438 4383
4439 index = ivalue (cadr (SCHEME_V->args)); 4384 index = ivalue (cadr (args));
4440 4385
4441 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4442 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4387 Error_1 ("vector-ref: out of bounds:", cadr (args));
4443 4388
4444 s_return (vector_elem (car (SCHEME_V->args), index)); 4389 s_return (vector_elem (x, index));
4445 } 4390 }
4446 4391
4447 case OP_VECSET: /* vector-set! */ 4392 case OP_VECSET: /* vector-set! */
4448 { 4393 {
4449 int index; 4394 int index;
4450 4395
4451 if (is_immutable (car (SCHEME_V->args))) 4396 if (is_immutable (x))
4452 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4397 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4453 4398
4454 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4455 4400
4456 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4457 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-set!: out of bounds:", cadr (args));
4458 4403
4459 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4404 set_vector_elem (x, index, caddr (args));
4460 s_return (car (SCHEME_V->args)); 4405 s_return (x);
4461 } 4406 }
4462 } 4407 }
4463 4408
4464 return S_T; 4409 if (USE_ERROR_CHECKING) abort ();
4465} 4410}
4466 4411
4467INTERFACE int 4412INTERFACE int
4468is_list (SCHEME_P_ pointer a) 4413is_list (SCHEME_P_ pointer a)
4469{ 4414{
… …
4516 return -1; 4461 return -1;
4517 } 4462 }
4518 } 4463 }
4519} 4464}
4520 4465
4521static pointer 4466static int
4522opexe_r (SCHEME_P_ enum scheme_opcodes op) 4467opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4468{
4524 pointer x = SCHEME_V->args; 4469 pointer x = SCHEME_V->args;
4525 4470
4526 for (;;) 4471 for (;;)
4527 { 4472 {
… …
4547 } 4492 }
4548 4493
4549 s_return (S_T); 4494 s_return (S_T);
4550} 4495}
4551 4496
4552static pointer 4497static int
4553opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4498opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4554{ 4499{
4555 pointer x = SCHEME_V->args; 4500 pointer args = SCHEME_V->args;
4556 pointer a = car (x); 4501 pointer a = car (args);
4557 pointer d = cdr (x); 4502 pointer d = cdr (args);
4558 int r; 4503 int r;
4559 4504
4560 switch (op) 4505 switch (op)
4561 { 4506 {
4562 case OP_NOT: /* not */ 4507 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 r = is_false (a); break; 4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4564 4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4565 case OP_BOOLP: /* boolean? */ 4510 case OP_NULLP: /* null? */ r = a == NIL ; break;
4566 r = a == S_F || a == S_T; break; 4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4567 4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4568 case OP_EOFOBJP: /* eof-object? */ 4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4569 r = a == S_EOF; break; 4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4570 4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4571 case OP_NULLP: /* null? */ 4516 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 4517
4592#if USE_CHAR_CLASSIFIERS 4518#if USE_CHAR_CLASSIFIERS
4593 case OP_CHARAP: /* char-alphabetic? */ 4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4594 r = Cisalpha (ivalue (a)); break; 4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4595
4596 case OP_CHARNP: /* char-numeric? */
4597 r = Cisdigit (ivalue (a)); break;
4598
4599 case OP_CHARWP: /* char-whitespace? */ 4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4600 r = Cisspace (ivalue (a)); break;
4601
4602 case OP_CHARUP: /* char-upper-case? */ 4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4603 r = Cisupper (ivalue (a)); break;
4604
4605 case OP_CHARLP: /* char-lower-case? */ 4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4606 r = Cislower (ivalue (a)); break;
4607#endif 4524#endif
4608 4525
4609#if USE_PORTS 4526#if USE_PORTS
4610 case OP_PORTP: /* port? */ 4527 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4611 r = is_port (a); break;
4612
4613 case OP_INPORTP: /* input-port? */ 4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4614 r = is_inport (a); break;
4615
4616 case OP_OUTPORTP: /* output-port? */ 4529 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4617 r = is_outport (a); break;
4618#endif 4530#endif
4619 4531
4620 case OP_PROCP: /* procedure? */ 4532 case OP_PROCP: /* procedure? */
4621 4533
4622 /*-- 4534 /*--
… …
4625 * in R^3 report sec. 6.9 4537 * in R^3 report sec. 6.9
4626 */ 4538 */
4627 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a); 4539 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4628 break; 4540 break;
4629 4541
4630 case OP_PAIRP: /* pair? */ 4542 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4631 r = is_pair (a); break; 4543 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4632 4544 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4633 case OP_LISTP: /* list? */ 4545 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4634 r = list_length (SCHEME_A_ a) >= 0; break; 4546 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4635 4547 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 } 4548 }
4648 4549
4649 s_retbool (r); 4550 s_retbool (r);
4650} 4551}
4651 4552
4652static pointer 4553static int
4653opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4554opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4654{ 4555{
4556 pointer args = SCHEME_V->args;
4557 pointer a = car (args);
4655 pointer x, y; 4558 pointer x, y;
4656 4559
4657 switch (op) 4560 switch (op)
4658 { 4561 {
4659 case OP_FORCE: /* force */ 4562 case OP_FORCE: /* force */
4660 SCHEME_V->code = car (SCHEME_V->args); 4563 SCHEME_V->code = a;
4661 4564
4662 if (is_promise (SCHEME_V->code)) 4565 if (is_promise (SCHEME_V->code))
4663 { 4566 {
4664 /* Should change type to closure here */ 4567 /* Should change type to closure here */
4665 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4568 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4686 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4589 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4687 SCHEME_V->outport = cadr (SCHEME_V->args); 4590 SCHEME_V->outport = cadr (SCHEME_V->args);
4688 } 4591 }
4689 } 4592 }
4690 4593
4691 SCHEME_V->args = car (SCHEME_V->args); 4594 SCHEME_V->args = a;
4692 4595
4693 if (op == OP_WRITE) 4596 if (op == OP_WRITE)
4694 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4695 else 4598 else
4696 SCHEME_V->print_flag = 0; 4599 SCHEME_V->print_flag = 0;
4697 4600
4698 s_goto (OP_P0LIST); 4601 s_goto (OP_P0LIST);
4699 4602
4700 case OP_NEWLINE: /* newline */ 4603 case OP_NEWLINE: /* newline */
4701 if (is_pair (SCHEME_V->args)) 4604 if (is_pair (args))
4702 { 4605 {
4703 if (car (SCHEME_V->args) != SCHEME_V->outport) 4606 if (a != SCHEME_V->outport)
4704 { 4607 {
4705 x = cons (SCHEME_V->outport, NIL); 4608 x = cons (SCHEME_V->outport, NIL);
4706 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4707 SCHEME_V->outport = car (SCHEME_V->args); 4610 SCHEME_V->outport = a;
4708 } 4611 }
4709 } 4612 }
4710 4613
4711 putstr (SCHEME_A_ "\n"); 4614 putstr (SCHEME_A_ "\n");
4712 s_return (S_T); 4615 s_return (S_T);
4713#endif 4616#endif
4714 4617
4715 case OP_ERR0: /* error */ 4618 case OP_ERR0: /* error */
4716 SCHEME_V->retcode = -1; 4619 SCHEME_V->retcode = -1;
4717 4620
4718 if (!is_string (car (SCHEME_V->args))) 4621 if (!is_string (a))
4719 { 4622 {
4720 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4623 args = cons (mk_string (SCHEME_A_ " -- "), args);
4721 setimmutable (car (SCHEME_V->args)); 4624 setimmutable (car (args));
4722 } 4625 }
4723 4626
4724 putstr (SCHEME_A_ "Error: "); 4627 putstr (SCHEME_A_ "Error: ");
4725 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4628 putstr (SCHEME_A_ strvalue (car (args)));
4726 SCHEME_V->args = cdr (SCHEME_V->args); 4629 SCHEME_V->args = cdr (args);
4727 s_goto (OP_ERR1); 4630 s_goto (OP_ERR1);
4728 4631
4729 case OP_ERR1: /* error */ 4632 case OP_ERR1: /* error */
4730 putstr (SCHEME_A_ " "); 4633 putstr (SCHEME_A_ " ");
4731 4634
4732 if (SCHEME_V->args != NIL) 4635 if (args != NIL)
4733 { 4636 {
4734 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4735 SCHEME_V->args = car (SCHEME_V->args); 4638 SCHEME_V->args = a;
4736 SCHEME_V->print_flag = 1; 4639 SCHEME_V->print_flag = 1;
4737 s_goto (OP_P0LIST); 4640 s_goto (OP_P0LIST);
4738 } 4641 }
4739 else 4642 else
4740 { 4643 {
4741 putstr (SCHEME_A_ "\n"); 4644 putstr (SCHEME_A_ "\n");
4742 4645
4743 if (SCHEME_V->interactive_repl) 4646 if (SCHEME_V->interactive_repl)
4744 s_goto (OP_T0LVL); 4647 s_goto (OP_T0LVL);
4745 else 4648 else
4746 return NIL; 4649 return -1;
4747 } 4650 }
4748 4651
4749 case OP_REVERSE: /* reverse */ 4652 case OP_REVERSE: /* reverse */
4750 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4653 s_return (reverse (SCHEME_A_ a));
4751 4654
4752 case OP_LIST_STAR: /* list* */ 4655 case OP_LIST_STAR: /* list* */
4753 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4656 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4754 4657
4755 case OP_APPEND: /* append */ 4658 case OP_APPEND: /* append */
4756 x = NIL; 4659 x = NIL;
4757 y = SCHEME_V->args; 4660 y = args;
4758 4661
4759 if (y == x) 4662 if (y == x)
4760 s_return (x); 4663 s_return (x);
4761 4664
4762 /* cdr() in the while condition is not a typo. If car() */ 4665 /* cdr() in the while condition is not a typo. If car() */
… …
4773 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4676 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4774 4677
4775#if USE_PLIST 4678#if USE_PLIST
4776 4679
4777 case OP_PUT: /* put */ 4680 case OP_PUT: /* put */
4778 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4681 if (!hasprop (a) || !hasprop (cadr (args)))
4779 Error_0 ("illegal use of put"); 4682 Error_0 ("illegal use of put");
4780 4683
4781 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4684 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4782 { 4685 {
4783 if (caar (x) == y) 4686 if (caar (x) == y)
4784 break; 4687 break;
4785 } 4688 }
4786 4689
4787 if (x != NIL) 4690 if (x != NIL)
4788 cdar (x) = caddr (SCHEME_V->args); 4691 cdar (x) = caddr (args);
4789 else 4692 else
4790 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4693 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4791 4694
4792 s_return (S_T); 4695 s_return (S_T);
4793 4696
4794 case OP_GET: /* get */ 4697 case OP_GET: /* get */
4795 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4796 Error_0 ("illegal use of get"); 4699 Error_0 ("illegal use of get");
4797 4700
4798 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4701 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4799 if (caar (x) == y) 4702 if (caar (x) == y)
4800 break; 4703 break;
4801 4704
4802 if (x != NIL) 4705 if (x != NIL)
4803 s_return (cdar (x)); 4706 s_return (cdar (x));
… …
4805 s_return (NIL); 4708 s_return (NIL);
4806 4709
4807#endif /* USE_PLIST */ 4710#endif /* USE_PLIST */
4808 4711
4809 case OP_QUIT: /* quit */ 4712 case OP_QUIT: /* quit */
4810 if (is_pair (SCHEME_V->args)) 4713 if (is_pair (args))
4811 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4714 SCHEME_V->retcode = ivalue (a);
4812 4715
4813 return NIL; 4716 return -1;
4814 4717
4815 case OP_GC: /* gc */ 4718 case OP_GC: /* gc */
4816 gc (SCHEME_A_ NIL, NIL); 4719 gc (SCHEME_A_ NIL, NIL);
4817 s_return (S_T); 4720 s_return (S_T);
4818 4721
4819 case OP_GCVERB: /* gc-verbose */ 4722 case OP_GCVERB: /* gc-verbose */
4820 { 4723 {
4821 int was = SCHEME_V->gc_verbose; 4724 int was = SCHEME_V->gc_verbose;
4822 4725
4823 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4726 SCHEME_V->gc_verbose = (a != S_F);
4824 s_retbool (was); 4727 s_retbool (was);
4825 } 4728 }
4826 4729
4827 case OP_NEWSEGMENT: /* new-segment */ 4730 case OP_NEWSEGMENT: /* new-segment */
4828 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4731 if (!is_pair (args) || !is_number (a))
4829 Error_0 ("new-segment: argument must be a number"); 4732 Error_0 ("new-segment: argument must be a number");
4830 4733
4831 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4832 4735
4833 s_return (S_T); 4736 s_return (S_T);
4834 4737
4835 case OP_OBLIST: /* oblist */ 4738 case OP_OBLIST: /* oblist */
4836 s_return (oblist_all_symbols (SCHEME_A)); 4739 s_return (oblist_all_symbols (SCHEME_A));
… …
4863 case OP_OPEN_INOUTFILE: 4766 case OP_OPEN_INOUTFILE:
4864 prop = port_input | port_output; 4767 prop = port_input | port_output;
4865 break; 4768 break;
4866 } 4769 }
4867 4770
4868 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4771 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4869 4772
4870 if (p == NIL) 4773 s_return (p == NIL ? S_F : p);
4871 s_return (S_F);
4872
4873 s_return (p);
4874 } 4774 }
4875 4775
4876# if USE_STRING_PORTS 4776# if USE_STRING_PORTS
4877 4777
4878 case OP_OPEN_INSTRING: /* open-input-string */ 4778 case OP_OPEN_INSTRING: /* open-input-string */
… …
4890 case OP_OPEN_INOUTSTRING: 4790 case OP_OPEN_INOUTSTRING:
4891 prop = port_input | port_output; 4791 prop = port_input | port_output;
4892 break; 4792 break;
4893 } 4793 }
4894 4794
4895 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4795 p = port_from_string (SCHEME_A_ strvalue (a),
4896 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4796 strvalue (a) + strlength (a), prop);
4897 4797
4898 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
4899 s_return (S_F);
4900
4901 s_return (p);
4902 } 4799 }
4903 4800
4904 case OP_OPEN_OUTSTRING: /* open-output-string */ 4801 case OP_OPEN_OUTSTRING: /* open-output-string */
4905 { 4802 {
4906 pointer p; 4803 pointer p;
4907 4804
4908 if (car (SCHEME_V->args) == NIL) 4805 if (a == NIL)
4909 {
4910 p = port_from_scratch (SCHEME_A); 4806 p = port_from_scratch (SCHEME_A);
4911
4912 if (p == NIL)
4913 s_return (S_F);
4914 }
4915 else 4807 else
4916 {
4917 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
4918 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4809 strvalue (a) + strlength (a), port_output);
4919 4810
4920 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
4921 s_return (S_F);
4922 }
4923
4924 s_return (p);
4925 } 4812 }
4926 4813
4927 case OP_GET_OUTSTRING: /* get-output-string */ 4814 case OP_GET_OUTSTRING: /* get-output-string */
4928 { 4815 {
4929 port *p; 4816 port *p;
4930 4817
4931 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4818 if ((p = a->object.port)->kind & port_string)
4932 { 4819 {
4933 off_t size; 4820 off_t size;
4934 char *str; 4821 char *str;
4935 4822
4936 size = p->rep.string.curr - p->rep.string.start + 1; 4823 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4952 } 4839 }
4953 4840
4954# endif 4841# endif
4955 4842
4956 case OP_CLOSE_INPORT: /* close-input-port */ 4843 case OP_CLOSE_INPORT: /* close-input-port */
4957 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4844 port_close (SCHEME_A_ a, port_input);
4958 s_return (S_T); 4845 s_return (S_T);
4959 4846
4960 case OP_CLOSE_OUTPORT: /* close-output-port */ 4847 case OP_CLOSE_OUTPORT: /* close-output-port */
4961 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4848 port_close (SCHEME_A_ a, port_output);
4962 s_return (S_T); 4849 s_return (S_T);
4963#endif 4850#endif
4964 4851
4965 case OP_INT_ENV: /* interaction-environment */ 4852 case OP_INT_ENV: /* interaction-environment */
4966 s_return (SCHEME_V->global_env); 4853 s_return (SCHEME_V->global_env);
… …
4968 case OP_CURR_ENV: /* current-environment */ 4855 case OP_CURR_ENV: /* current-environment */
4969 s_return (SCHEME_V->envir); 4856 s_return (SCHEME_V->envir);
4970 4857
4971 } 4858 }
4972 4859
4973 abort (); 4860 if (USE_ERROR_CHECKING) abort ();
4974} 4861}
4975 4862
4976static pointer 4863static int
4977opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4864opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4978{ 4865{
4866 pointer args = SCHEME_V->args;
4979 pointer x; 4867 pointer x;
4980 4868
4981 if (SCHEME_V->nesting != 0) 4869 if (SCHEME_V->nesting != 0)
4982 { 4870 {
4983 int n = SCHEME_V->nesting; 4871 int n = SCHEME_V->nesting;
… …
4990 switch (op) 4878 switch (op)
4991 { 4879 {
4992 /* ========== reading part ========== */ 4880 /* ========== reading part ========== */
4993#if USE_PORTS 4881#if USE_PORTS
4994 case OP_READ: 4882 case OP_READ:
4995 if (!is_pair (SCHEME_V->args)) 4883 if (!is_pair (args))
4996 s_goto (OP_READ_INTERNAL); 4884 s_goto (OP_READ_INTERNAL);
4997 4885
4998 if (!is_inport (car (SCHEME_V->args))) 4886 if (!is_inport (car (args)))
4999 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4887 Error_1 ("read: not an input port:", car (args));
5000 4888
5001 if (car (SCHEME_V->args) == SCHEME_V->inport) 4889 if (car (args) == SCHEME_V->inport)
5002 s_goto (OP_READ_INTERNAL); 4890 s_goto (OP_READ_INTERNAL);
5003 4891
5004 x = SCHEME_V->inport; 4892 x = SCHEME_V->inport;
5005 SCHEME_V->inport = car (SCHEME_V->args); 4893 SCHEME_V->inport = car (args);
5006 x = cons (x, NIL); 4894 x = cons (x, NIL);
5007 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4895 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5008 s_goto (OP_READ_INTERNAL); 4896 s_goto (OP_READ_INTERNAL);
5009 4897
5010 case OP_READ_CHAR: /* read-char */ 4898 case OP_READ_CHAR: /* read-char */
5011 case OP_PEEK_CHAR: /* peek-char */ 4899 case OP_PEEK_CHAR: /* peek-char */
5012 { 4900 {
5013 int c; 4901 int c;
5014 4902
5015 if (is_pair (SCHEME_V->args)) 4903 if (is_pair (args))
5016 { 4904 {
5017 if (car (SCHEME_V->args) != SCHEME_V->inport) 4905 if (car (args) != SCHEME_V->inport)
5018 { 4906 {
5019 x = SCHEME_V->inport; 4907 x = SCHEME_V->inport;
5020 x = cons (x, NIL); 4908 x = cons (x, NIL);
5021 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4909 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5022 SCHEME_V->inport = car (SCHEME_V->args); 4910 SCHEME_V->inport = car (args);
5023 } 4911 }
5024 } 4912 }
5025 4913
5026 c = inchar (SCHEME_A); 4914 c = inchar (SCHEME_A);
5027 4915
… …
5037 case OP_CHAR_READY: /* char-ready? */ 4925 case OP_CHAR_READY: /* char-ready? */
5038 { 4926 {
5039 pointer p = SCHEME_V->inport; 4927 pointer p = SCHEME_V->inport;
5040 int res; 4928 int res;
5041 4929
5042 if (is_pair (SCHEME_V->args)) 4930 if (is_pair (args))
5043 p = car (SCHEME_V->args); 4931 p = car (args);
5044 4932
5045 res = p->object.port->kind & port_string; 4933 res = p->object.port->kind & port_string;
5046 4934
5047 s_retbool (res); 4935 s_retbool (res);
5048 } 4936 }
5049 4937
5050 case OP_SET_INPORT: /* set-input-port */ 4938 case OP_SET_INPORT: /* set-input-port */
5051 SCHEME_V->inport = car (SCHEME_V->args); 4939 SCHEME_V->inport = car (args);
5052 s_return (SCHEME_V->value); 4940 s_return (SCHEME_V->value);
5053 4941
5054 case OP_SET_OUTPORT: /* set-output-port */ 4942 case OP_SET_OUTPORT: /* set-output-port */
5055 SCHEME_V->outport = car (SCHEME_V->args); 4943 SCHEME_V->outport = car (args);
5056 s_return (SCHEME_V->value); 4944 s_return (SCHEME_V->value);
5057#endif 4945#endif
5058 4946
5059 case OP_RDSEXPR: 4947 case OP_RDSEXPR:
5060 switch (SCHEME_V->tok) 4948 switch (SCHEME_V->tok)
… …
5146 } 5034 }
5147 5035
5148 break; 5036 break;
5149 5037
5150 case OP_RDLIST: 5038 case OP_RDLIST:
5151 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5039 SCHEME_V->args = cons (SCHEME_V->value, args);
5152 SCHEME_V->tok = token (SCHEME_A); 5040 SCHEME_V->tok = token (SCHEME_A);
5153 5041
5154 switch (SCHEME_V->tok) 5042 switch (SCHEME_V->tok)
5155 { 5043 {
5156 case TOK_EOF: 5044 case TOK_EOF:
… …
5184 case OP_RDDOT: 5072 case OP_RDDOT:
5185 if (token (SCHEME_A) != TOK_RPAREN) 5073 if (token (SCHEME_A) != TOK_RPAREN)
5186 Error_0 ("syntax error: illegal dot expression"); 5074 Error_0 ("syntax error: illegal dot expression");
5187 5075
5188 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5076 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5189 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5077 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5190 5078
5191 case OP_RDQUOTE: 5079 case OP_RDQUOTE:
5192 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5080 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5193 5081
5194 case OP_RDQQUOTE: 5082 case OP_RDQQUOTE:
… …
5216 SCHEME_V->args = SCHEME_V->value; 5104 SCHEME_V->args = SCHEME_V->value;
5217 s_goto (OP_VECTOR); 5105 s_goto (OP_VECTOR);
5218 5106
5219 /* ========== printing part ========== */ 5107 /* ========== printing part ========== */
5220 case OP_P0LIST: 5108 case OP_P0LIST:
5221 if (is_vector (SCHEME_V->args)) 5109 if (is_vector (args))
5222 { 5110 {
5223 putstr (SCHEME_A_ "#("); 5111 putstr (SCHEME_A_ "#(");
5224 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5112 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5225 s_goto (OP_PVECFROM); 5113 s_goto (OP_PVECFROM);
5226 } 5114 }
5227 else if (is_environment (SCHEME_V->args)) 5115 else if (is_environment (args))
5228 { 5116 {
5229 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5117 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5230 s_return (S_T); 5118 s_return (S_T);
5231 } 5119 }
5232 else if (!is_pair (SCHEME_V->args)) 5120 else if (!is_pair (args))
5233 { 5121 {
5234 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5122 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5235 s_return (S_T); 5123 s_return (S_T);
5236 } 5124 }
5237 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5125 else
5238 { 5126 {
5127 pointer a = car (args);
5128 pointer b = cdr (args);
5129 int ok_abbr = ok_abbrev (b);
5130 SCHEME_V->args = car (b);
5131
5132 if (a == SCHEME_V->QUOTE && ok_abbr)
5239 putstr (SCHEME_A_ "'"); 5133 putstr (SCHEME_A_ "'");
5240 SCHEME_V->args = cadr (SCHEME_V->args); 5134 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ "`");
5136 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5137 putstr (SCHEME_A_ ",");
5138 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5139 putstr (SCHEME_A_ ",@");
5140 else
5141 {
5142 putstr (SCHEME_A_ "(");
5143 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5144 SCHEME_V->args = a;
5145 }
5146
5241 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5242 } 5148 }
5243 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5149
5150 case OP_P1LIST:
5151 if (is_pair (args))
5244 { 5152 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5245 putstr (SCHEME_A_ "`"); 5154 putstr (SCHEME_A_ " ");
5246 SCHEME_V->args = cadr (SCHEME_V->args); 5155 SCHEME_V->args = car (args);
5247 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5248 } 5157 }
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)) 5158 else if (is_vector (args))
5278 { 5159 {
5279 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5160 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5280 putstr (SCHEME_A_ " . "); 5161 putstr (SCHEME_A_ " . ");
5281 s_goto (OP_P0LIST); 5162 s_goto (OP_P0LIST);
5282 } 5163 }
5283 else 5164 else
5284 { 5165 {
5285 if (SCHEME_V->args != NIL) 5166 if (args != NIL)
5286 { 5167 {
5287 putstr (SCHEME_A_ " . "); 5168 putstr (SCHEME_A_ " . ");
5288 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5289 } 5170 }
5290 5171
5291 putstr (SCHEME_A_ ")"); 5172 putstr (SCHEME_A_ ")");
5292 s_return (S_T); 5173 s_return (S_T);
5293 } 5174 }
5294 5175
5295 case OP_PVECFROM: 5176 case OP_PVECFROM:
5296 { 5177 {
5297 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5178 int i = ivalue_unchecked (cdr (args));
5298 pointer vec = car (SCHEME_V->args); 5179 pointer vec = car (args);
5299 int len = veclength (vec); 5180 int len = veclength (vec);
5300 5181
5301 if (i == len) 5182 if (i == len)
5302 { 5183 {
5303 putstr (SCHEME_A_ ")"); 5184 putstr (SCHEME_A_ ")");
… …
5305 } 5186 }
5306 else 5187 else
5307 { 5188 {
5308 pointer elem = vector_elem (vec, i); 5189 pointer elem = vector_elem (vec, i);
5309 5190
5310 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5191 ivalue_unchecked (cdr (args)) = i + 1;
5311 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5312 SCHEME_V->args = elem; 5193 SCHEME_V->args = elem;
5313 5194
5314 if (i > 0) 5195 if (i > 0)
5315 putstr (SCHEME_A_ " "); 5196 putstr (SCHEME_A_ " ");
5316 5197
5317 s_goto (OP_P0LIST); 5198 s_goto (OP_P0LIST);
5318 } 5199 }
5319 } 5200 }
5320 } 5201 }
5321 5202
5322 abort (); 5203 if (USE_ERROR_CHECKING) abort ();
5323} 5204}
5324 5205
5325static pointer 5206static int
5326opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5207opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5327{ 5208{
5209 pointer args = SCHEME_V->args;
5210 pointer a = car (args);
5328 pointer x, y; 5211 pointer x, y;
5329 5212
5330 switch (op) 5213 switch (op)
5331 { 5214 {
5332 case OP_LIST_LENGTH: /* length *//* a.k */ 5215 case OP_LIST_LENGTH: /* length *//* a.k */
5333 { 5216 {
5334 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5217 long v = list_length (SCHEME_A_ a);
5335 5218
5336 if (v < 0) 5219 if (v < 0)
5337 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5220 Error_1 ("length: not a list:", a);
5338 5221
5339 s_return (mk_integer (SCHEME_A_ v)); 5222 s_return (mk_integer (SCHEME_A_ v));
5340 } 5223 }
5341 5224
5342 case OP_ASSQ: /* assq *//* a.k */ 5225 case OP_ASSQ: /* assq *//* a.k */
5343 x = car (SCHEME_V->args); 5226 x = a;
5344 5227
5345 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5228 for (y = cadr (args); is_pair (y); y = cdr (y))
5346 { 5229 {
5347 if (!is_pair (car (y))) 5230 if (!is_pair (car (y)))
5348 Error_0 ("unable to handle non pair element"); 5231 Error_0 ("unable to handle non pair element");
5349 5232
5350 if (x == caar (y)) 5233 if (x == caar (y))
… …
5356 else 5239 else
5357 s_return (S_F); 5240 s_return (S_F);
5358 5241
5359 5242
5360 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5243 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5361 SCHEME_V->args = car (SCHEME_V->args); 5244 SCHEME_V->args = a;
5362 5245
5363 if (SCHEME_V->args == NIL) 5246 if (SCHEME_V->args == NIL)
5364 s_return (S_F); 5247 s_return (S_F);
5365 else if (is_closure (SCHEME_V->args)) 5248 else if (is_closure (SCHEME_V->args))
5366 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5372 case OP_CLOSUREP: /* closure? */ 5255 case OP_CLOSUREP: /* closure? */
5373 /* 5256 /*
5374 * Note, macro object is also a closure. 5257 * Note, macro object is also a closure.
5375 * Therefore, (closure? <#MACRO>) ==> #t 5258 * Therefore, (closure? <#MACRO>) ==> #t
5376 */ 5259 */
5377 s_retbool (is_closure (car (SCHEME_V->args))); 5260 s_retbool (is_closure (a));
5378 5261
5379 case OP_MACROP: /* macro? */ 5262 case OP_MACROP: /* macro? */
5380 s_retbool (is_macro (car (SCHEME_V->args))); 5263 s_retbool (is_macro (a));
5381 } 5264 }
5382 5265
5383 abort (); 5266 if (USE_ERROR_CHECKING) abort ();
5384} 5267}
5385 5268
5269/* 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); 5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5387 5271
5388typedef int (*test_predicate) (pointer); 5272typedef int (*test_predicate)(pointer);
5389static int 5273static int
5390is_any (pointer p) 5274is_any (pointer p)
5391{ 5275{
5392 return 1; 5276 return 1;
5393} 5277}
5394 5278
5395static int 5279static int
5396is_nonneg (pointer p) 5280is_nonneg (pointer p)
5397{ 5281{
5398 return ivalue (p) >= 0 && is_integer (p); 5282 return ivalue (p) >= 0 && is_integer (p);
5283}
5284
5285static int
5286tst_is_list (pointer p)
5287{
5288 return p == NIL || is_pair (p);
5399} 5289}
5400 5290
5401/* Correspond carefully with following defines! */ 5291/* Correspond carefully with following defines! */
5402static struct 5292static struct
5403{ 5293{
5404 test_predicate fct; 5294 test_predicate fct;
5405 const char *kind; 5295 const char *kind;
5406} tests[] = 5296} tests[] =
5407{ 5297{
5408 { 0, 0}, /* unused */ 5298 { is_any, 0 },
5409 { is_any, 0}, 5299 { is_string, "string" },
5410 { is_string, "string" }, 5300 { is_symbol, "symbol" },
5411 { is_symbol, "symbol" }, 5301 { is_port, "port" },
5412 { is_port, "port" },
5413 { is_inport, "input port" }, 5302 { is_inport, "input port" },
5414 { is_outport, "output port" }, 5303 { is_outport, "output port" },
5415 { is_environment, "environment" }, 5304 { is_environment, "environment" },
5416 { is_pair, "pair" }, 5305 { is_pair, "pair" },
5417 { 0, "pair or '()" }, 5306 { tst_is_list, "pair or '()" },
5418 { is_character, "character" }, 5307 { is_character, "character" },
5419 { is_vector, "vector" }, 5308 { is_vector, "vector" },
5420 { is_number, "number" }, 5309 { is_number, "number" },
5421 { is_integer, "integer" }, 5310 { is_integer, "integer" },
5422 { is_nonneg, "non-negative integer" } 5311 { is_nonneg, "non-negative integer" }
5423}; 5312};
5424 5313
5425#define TST_NONE 0 5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5426#define TST_ANY "\001" 5315#define TST_ANY "\001"
5427#define TST_STRING "\002" 5316#define TST_STRING "\002"
5428#define TST_SYMBOL "\003" 5317#define TST_SYMBOL "\003"
5429#define TST_PORT "\004" 5318#define TST_PORT "\004"
5430#define TST_INPORT "\005" 5319#define TST_INPORT "\005"
5431#define TST_OUTPORT "\006" 5320#define TST_OUTPORT "\006"
5432#define TST_ENVIRONMENT "\007" 5321#define TST_ENVIRONMENT "\007"
5433#define TST_PAIR "\010" 5322#define TST_PAIR "\010"
5434#define TST_LIST "\011" 5323#define TST_LIST "\011"
5435#define TST_CHAR "\012" 5324#define TST_CHAR "\012"
5436#define TST_VECTOR "\013" 5325#define TST_VECTOR "\013"
5437#define TST_NUMBER "\014" 5326#define TST_NUMBER "\014"
5438#define TST_INTEGER "\015" 5327#define TST_INTEGER "\015"
5439#define TST_NATURAL "\016" 5328#define TST_NATURAL "\016"
5329
5330#define INF_ARG 0xff
5331#define UNNAMED_OP ""
5332
5333static const char opnames[] =
5334#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5335#include "opdefines.h"
5336#undef OP_DEF
5337;
5338
5339static const char *
5340opname (int idx)
5341{
5342 const char *name = opnames;
5343
5344 /* should do this at compile time, but would require external program, right? */
5345 while (idx--)
5346 name += strlen (name) + 1;
5347
5348 return *name ? name : "ILLEGAL";
5349}
5350
5351static const char *
5352procname (pointer x)
5353{
5354 return opname (procnum (x));
5355}
5440 5356
5441typedef struct 5357typedef struct
5442{ 5358{
5443 dispatch_func func; 5359 uint8_t func;
5444 char *name; 5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin;
5445 int min_arity; 5362 uint8_t min_arity;
5446 int max_arity; 5363 uint8_t max_arity;
5447 char *arg_tests_encoding; 5364 char arg_tests_encoding[3];
5448} op_code_info; 5365} op_code_info;
5449 5366
5450#define INF_ARG 0xffff
5451
5452static op_code_info dispatch_table[] = { 5367static const op_code_info dispatch_table[] = {
5453#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5454#include "opdefines.h" 5369#include "opdefines.h"
5370#undef OP_DEF
5455 {0} 5371 {0}
5456}; 5372};
5457 5373
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 */ 5374/* kernel of this interpreter */
5471static void 5375static void ecb_hot
5472Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5473{ 5377{
5474 SCHEME_V->op = op; 5378 SCHEME_V->op = op;
5475 5379
5476 for (;;) 5380 for (;;)
5477 { 5381 {
5478 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5382 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5479 5383
5480#if USE_ERROR_CHECKING 5384#if USE_ERROR_CHECKING
5481 if (pcd->name) /* if built-in function, check arguments */ 5385 if (pcd->builtin) /* if built-in function, check arguments */
5482 { 5386 {
5483 int ok = 1;
5484 char msg[STRBUFFSIZE]; 5387 char msg[STRBUFFSIZE];
5485 int n = list_length (SCHEME_A_ SCHEME_V->args); 5388 int n = list_length (SCHEME_A_ SCHEME_V->args);
5486 5389
5487 /* Check number of arguments */ 5390 /* Check number of arguments */
5488 if (ecb_expect_false (n < pcd->min_arity)) 5391 if (ecb_expect_false (n < pcd->min_arity))
5489 { 5392 {
5490 ok = 0;
5491 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5393 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5492 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5394 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5395 xError_1 (SCHEME_A_ msg, 0);
5396 continue;
5493 } 5397 }
5494 else if (ecb_excpect_false (n > pcd->max_arity)) 5398 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5495 { 5399 {
5496 ok = 0;
5497 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5400 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5498 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5401 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5402 xError_1 (SCHEME_A_ msg, 0);
5403 continue;
5499 } 5404 }
5500 5405 else
5501 if (ecb_expect_false (ok))
5502 { 5406 {
5503 if (pcd->arg_tests_encoding) 5407 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5504 { 5408 {
5505 int i = 0; 5409 int i = 0;
5506 int j; 5410 int j;
5507 const char *t = pcd->arg_tests_encoding; 5411 const char *t = pcd->arg_tests_encoding;
5508 pointer arglist = SCHEME_V->args; 5412 pointer arglist = SCHEME_V->args;
5509 5413
5510 do 5414 do
5511 { 5415 {
5512 pointer arg = car (arglist); 5416 pointer arg = car (arglist);
5513 5417
5514 j = (int) t[0]; 5418 j = t[0];
5515 5419
5516 if (j == TST_LIST[0]) 5420 if (!tests[j - 1].fct (arg))
5517 {
5518 if (arg != NIL && !is_pair (arg))
5519 break; 5421 break;
5520 }
5521 else
5522 {
5523 if (!tests[j].fct (arg))
5524 break;
5525 }
5526 5422
5527 if (t[1] != 0) /* last test is replicated as necessary */ 5423 if (t[1]) /* last test is replicated as necessary */
5528 t++; 5424 t++;
5529 5425
5530 arglist = cdr (arglist); 5426 arglist = cdr (arglist);
5531 i++; 5427 i++;
5532 } 5428 }
5533 while (i < n); 5429 while (i < n);
5534 5430
5535 if (i < n) 5431 if (i < n)
5536 { 5432 {
5537 ok = 0;
5538 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5433 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5539 } 5436 }
5540 } 5437 }
5541 } 5438 }
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 } 5439 }
5551#endif 5440#endif
5552 5441
5553 ok_to_freely_gc (SCHEME_A); 5442 ok_to_freely_gc (SCHEME_A);
5554 5443
5444 static const dispatch_func dispatch_funcs[] = {
5445 opexe_0,
5446 opexe_1,
5447 opexe_2,
5448 opexe_3,
5449 opexe_4,
5450 opexe_5,
5451 opexe_6,
5452 };
5453
5555 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5454 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5556 return; 5455 return;
5557 5456
5558 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5559 { 5458 {
5560 xwrstr ("No memory!\n"); 5459 xwrstr ("No memory!\n");
… …
5659 return OP_C0STREAM; /* cons-stream */ 5558 return OP_C0STREAM; /* cons-stream */
5660 } 5559 }
5661} 5560}
5662 5561
5663#if USE_MULTIPLICITY 5562#if USE_MULTIPLICITY
5664scheme * 5563ecb_cold scheme *
5665scheme_init_new () 5564scheme_init_new ()
5666{ 5565{
5667 scheme *sc = malloc (sizeof (scheme)); 5566 scheme *sc = malloc (sizeof (scheme));
5668 5567
5669 if (!scheme_init (SCHEME_A)) 5568 if (!scheme_init (SCHEME_A))
… …
5674 else 5573 else
5675 return sc; 5574 return sc;
5676} 5575}
5677#endif 5576#endif
5678 5577
5679int 5578ecb_cold int
5680scheme_init (SCHEME_P) 5579scheme_init (SCHEME_P)
5681{ 5580{
5682 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5683 pointer x; 5582 pointer x;
5684 5583
… …
5757 5656
5758 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5657 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5759 assign_syntax (SCHEME_A_ syntax_names[i]); 5658 assign_syntax (SCHEME_A_ syntax_names[i]);
5760 } 5659 }
5761 5660
5661 // TODO: should iterate via strlen, to avoid n² complexity
5762 for (i = 0; i < n; i++) 5662 for (i = 0; i < n; i++)
5763 if (dispatch_table[i].name != 0) 5663 if (dispatch_table[i].builtin)
5764 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5664 assign_proc (SCHEME_A_ i, opname (i));
5765 5665
5766 /* initialization of global pointers to special symbols */ 5666 /* initialization of global pointers to special symbols */
5767 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5667 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5768 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5668 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5769 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5669 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5808scheme_set_external_data (SCHEME_P_ void *p) 5708scheme_set_external_data (SCHEME_P_ void *p)
5809{ 5709{
5810 SCHEME_V->ext_data = p; 5710 SCHEME_V->ext_data = p;
5811} 5711}
5812 5712
5813void 5713ecb_cold void
5814scheme_deinit (SCHEME_P) 5714scheme_deinit (SCHEME_P)
5815{ 5715{
5816 int i; 5716 int i;
5817 5717
5818#if SHOW_ERROR_LINE 5718#if SHOW_ERROR_LINE
… …
5910{ 5810{
5911 dump_stack_reset (SCHEME_A); 5811 dump_stack_reset (SCHEME_A);
5912 SCHEME_V->envir = SCHEME_V->global_env; 5812 SCHEME_V->envir = SCHEME_V->global_env;
5913 SCHEME_V->file_i = 0; 5813 SCHEME_V->file_i = 0;
5914 SCHEME_V->load_stack[0].kind = port_input | port_string; 5814 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 */ 5815 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); 5816 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; 5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5918#if USE_PORTS 5818#if USE_PORTS
5919 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5920#endif 5820#endif
5921 SCHEME_V->retcode = 0; 5821 SCHEME_V->retcode = 0;
5922 SCHEME_V->interactive_repl = 0; 5822 SCHEME_V->interactive_repl = 0;

Diff Legend

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