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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.13 by root, Thu Nov 26 07:59:42 2015 UTC vs.
Revision 1.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
… …
208#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
212 211
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213
213static num num_op (char op, num a, num b); 214static num num_op (enum num_op op, num a, num b);
214static num num_intdiv (num a, num b); 215static num num_intdiv (num a, num b);
215static num num_rem (num a, num b); 216static num num_rem (num a, num b);
216static num num_mod (num a, num b); 217static num num_mod (num a, num b);
217static int num_eq (num a, num b);
218static int num_gt (num a, num b);
219static int num_ge (num a, num b);
220static int num_lt (num a, num b);
221static int num_le (num a, num b);
222 218
223#if USE_MATH 219#if USE_MATH
224static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
225#endif 221#endif
226static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 223
234static num num_zero; 224static num num_zero;
235static num num_one; 225static num num_one;
236 226
237/* macros for cell operations */ 227/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 228#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 229#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 230#define type(p) (typeflag (p) & T_MASKTYPE)
241 231
242INTERFACE INLINE int 232INTERFACE int
243is_string (pointer p) 233is_string (pointer p)
244{ 234{
245 return type (p) == T_STRING; 235 return type (p) == T_STRING;
246} 236}
247 237
248#define strvalue(p) ((p)->object.string.svalue) 238#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 239#define strlength(p) ((p)->object.string.length)
250 240
251INTERFACE int is_list (SCHEME_P_ pointer p); 241INTERFACE int is_list (SCHEME_P_ pointer p);
242
252INTERFACE INLINE int 243INTERFACE int
253is_vector (pointer p) 244is_vector (pointer p)
254{ 245{
255 return type (p) == T_VECTOR; 246 return type (p) == T_VECTOR;
256} 247}
257 248
… …
266vector_length (pointer vec) 257vector_length (pointer vec)
267{ 258{
268 return vec->object.vector.length; 259 return vec->object.vector.length;
269} 260}
270 261
271INTERFACE INLINE int 262INTERFACE int
272is_number (pointer p) 263is_number (pointer p)
273{ 264{
274 return type (p) == T_NUMBER; 265 return type (p) == T_NUMBER;
275} 266}
276 267
277INTERFACE INLINE int 268INTERFACE int
278is_integer (pointer p) 269is_integer (pointer p)
279{ 270{
280 if (!is_number (p)) 271 return is_number (p) && num_is_fixnum (p->object.number);
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287} 272}
288 273
289INTERFACE INLINE int 274INTERFACE int
290is_real (pointer p) 275is_real (pointer p)
291{ 276{
292 return is_number (p) && !num_is_fixnum (p->object.number); 277 return is_number (p) && !num_is_fixnum (p->object.number);
293} 278}
294 279
295INTERFACE INLINE int 280INTERFACE int
296is_character (pointer p) 281is_character (pointer p)
297{ 282{
298 return type (p) == T_CHARACTER; 283 return type (p) == T_CHARACTER;
299} 284}
300 285
301INTERFACE INLINE char * 286INTERFACE char *
302string_value (pointer p) 287string_value (pointer p)
303{ 288{
304 return strvalue (p); 289 return strvalue (p);
305} 290}
306 291
307INLINE num 292ecb_inline num
308nvalue (pointer p) 293nvalue (pointer p)
309{ 294{
310 return (p)->object.number; 295 return (p)->object.number;
311} 296}
312 297
… …
342#else 327#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
344# define set_num_integer(p) 0 329# define set_num_integer(p) 0
345# define set_num_real(p) 0 330# define set_num_real(p) 0
346#endif 331#endif
332
347INTERFACE long 333INTERFACE long
348charvalue (pointer p) 334charvalue (pointer p)
349{ 335{
350 return ivalue_unchecked (p); 336 return ivalue_unchecked (p);
351} 337}
352 338
353INTERFACE INLINE int 339INTERFACE int
354is_port (pointer p) 340is_port (pointer p)
355{ 341{
356 return type (p) == T_PORT; 342 return type (p) == T_PORT;
357} 343}
358 344
359INTERFACE INLINE int 345INTERFACE int
360is_inport (pointer p) 346is_inport (pointer p)
361{ 347{
362 return is_port (p) && p->object.port->kind & port_input; 348 return is_port (p) && p->object.port->kind & port_input;
363} 349}
364 350
365INTERFACE INLINE int 351INTERFACE int
366is_outport (pointer p) 352is_outport (pointer p)
367{ 353{
368 return is_port (p) && p->object.port->kind & port_output; 354 return is_port (p) && p->object.port->kind & port_output;
369} 355}
370 356
371INTERFACE INLINE int 357INTERFACE int
372is_pair (pointer p) 358is_pair (pointer p)
373{ 359{
374 return type (p) == T_PAIR; 360 return type (p) == T_PAIR;
375} 361}
376 362
… …
408pair_cdr (pointer p) 394pair_cdr (pointer p)
409{ 395{
410 return cdr (p); 396 return cdr (p);
411} 397}
412 398
413INTERFACE INLINE int 399INTERFACE int
414is_symbol (pointer p) 400is_symbol (pointer p)
415{ 401{
416 return type (p) == T_SYMBOL; 402 return type (p) == T_SYMBOL;
417} 403}
418 404
419INTERFACE INLINE char * 405INTERFACE char *
420symname (pointer p) 406symname (pointer p)
421{ 407{
422 return strvalue (car (p)); 408 return strvalue (car (p));
423} 409}
424 410
425#if USE_PLIST 411#if USE_PLIST
426SCHEME_EXPORT INLINE int 412SCHEME_EXPORT int
427hasprop (pointer p) 413hasprop (pointer p)
428{ 414{
429 return typeflag (p) & T_SYMBOL; 415 return typeflag (p) & T_SYMBOL;
430} 416}
431 417
432# define symprop(p) cdr(p) 418# define symprop(p) cdr(p)
433#endif 419#endif
434 420
435INTERFACE INLINE int 421INTERFACE int
436is_syntax (pointer p) 422is_syntax (pointer p)
437{ 423{
438 return typeflag (p) & T_SYNTAX; 424 return typeflag (p) & T_SYNTAX;
439} 425}
440 426
441INTERFACE INLINE int 427INTERFACE int
442is_proc (pointer p) 428is_proc (pointer p)
443{ 429{
444 return type (p) == T_PROC; 430 return type (p) == T_PROC;
445} 431}
446 432
447INTERFACE INLINE int 433INTERFACE int
448is_foreign (pointer p) 434is_foreign (pointer p)
449{ 435{
450 return type (p) == T_FOREIGN; 436 return type (p) == T_FOREIGN;
451} 437}
452 438
453INTERFACE INLINE char * 439INTERFACE char *
454syntaxname (pointer p) 440syntaxname (pointer p)
455{ 441{
456 return strvalue (car (p)); 442 return strvalue (car (p));
457} 443}
458 444
459#define procnum(p) ivalue (p) 445#define procnum(p) ivalue (p)
460static const char *procname (pointer x); 446static const char *procname (pointer x);
461 447
462INTERFACE INLINE int 448INTERFACE int
463is_closure (pointer p) 449is_closure (pointer p)
464{ 450{
465 return type (p) == T_CLOSURE; 451 return type (p) == T_CLOSURE;
466} 452}
467 453
468INTERFACE INLINE int 454INTERFACE int
469is_macro (pointer p) 455is_macro (pointer p)
470{ 456{
471 return type (p) == T_MACRO; 457 return type (p) == T_MACRO;
472} 458}
473 459
474INTERFACE INLINE pointer 460INTERFACE pointer
475closure_code (pointer p) 461closure_code (pointer p)
476{ 462{
477 return car (p); 463 return car (p);
478} 464}
479 465
480INTERFACE INLINE pointer 466INTERFACE pointer
481closure_env (pointer p) 467closure_env (pointer p)
482{ 468{
483 return cdr (p); 469 return cdr (p);
484} 470}
485 471
486INTERFACE INLINE int 472INTERFACE int
487is_continuation (pointer p) 473is_continuation (pointer p)
488{ 474{
489 return type (p) == T_CONTINUATION; 475 return type (p) == T_CONTINUATION;
490} 476}
491 477
492#define cont_dump(p) cdr (p) 478#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 479#define set_cont_dump(p,v) set_cdr ((p), (v))
494 480
495/* To do: promise should be forced ONCE only */ 481/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 482INTERFACE int
497is_promise (pointer p) 483is_promise (pointer p)
498{ 484{
499 return type (p) == T_PROMISE; 485 return type (p) == T_PROMISE;
500} 486}
501 487
502INTERFACE INLINE int 488INTERFACE int
503is_environment (pointer p) 489is_environment (pointer p)
504{ 490{
505 return type (p) == T_ENVIRONMENT; 491 return type (p) == T_ENVIRONMENT;
506} 492}
507 493
… …
513 499
514#define is_mark(p) (typeflag (p) & T_MARK) 500#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 501#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 502#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 503
518INTERFACE INLINE int 504INTERFACE int
519is_immutable (pointer p) 505is_immutable (pointer p)
520{ 506{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 508}
523 509
524INTERFACE INLINE void 510INTERFACE void
525setimmutable (pointer p) 511setimmutable (pointer p)
526{ 512{
527#if USE_ERROR_CHECKING 513#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 514 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 515#endif
530} 516}
531 517
532#if USE_CHAR_CLASSIFIERS 518#if USE_CHAR_CLASSIFIERS
533static INLINE int 519ecb_inline int
534Cisalpha (int c) 520Cisalpha (int c)
535{ 521{
536 return isascii (c) && isalpha (c); 522 return isascii (c) && isalpha (c);
537} 523}
538 524
539static INLINE int 525ecb_inline int
540Cisdigit (int c) 526Cisdigit (int c)
541{ 527{
542 return isascii (c) && isdigit (c); 528 return isascii (c) && isdigit (c);
543} 529}
544 530
545static INLINE int 531ecb_inline int
546Cisspace (int c) 532Cisspace (int c)
547{ 533{
548 return isascii (c) && isspace (c); 534 return isascii (c) && isspace (c);
549} 535}
550 536
551static INLINE int 537ecb_inline int
552Cisupper (int c) 538Cisupper (int c)
553{ 539{
554 return isascii (c) && isupper (c); 540 return isascii (c) && isupper (c);
555} 541}
556 542
557static INLINE int 543ecb_inline int
558Cislower (int c) 544Cislower (int c)
559{ 545{
560 return isascii (c) && islower (c); 546 return isascii (c) && islower (c);
561} 547}
562#endif 548#endif
… …
623#endif 609#endif
624 610
625static int file_push (SCHEME_P_ const char *fname); 611static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 612static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 613static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 614ecb_inline int is_one_of (char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 615static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 617static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 618static int count_consecutive_cells (pointer x, int needed);
633static 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);
634static pointer mk_number (SCHEME_P_ const num n); 620static pointer mk_number (SCHEME_P_ const num n);
635static 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);
… …
652static int basic_inchar (port *pt); 638static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 639static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 640static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 641static char *readstr_upto (SCHEME_P_ char *delim);
656static pointer readstrexp (SCHEME_P); 642static pointer readstrexp (SCHEME_P);
657static INLINE int skipspace (SCHEME_P); 643ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 644static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 645static void printslashstring (SCHEME_P_ char *s, int len);
660static 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);
661static void printatom (SCHEME_P_ pointer l, int f); 647static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 652static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 653static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 654static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 655static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 656static void dump_stack_mark (SCHEME_P);
671static 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);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 659static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 660static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 661static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 662static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 663static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
677static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
678static void assign_syntax (SCHEME_P_ const char *name); 665static void assign_syntax (SCHEME_P_ const char *name);
679static int syntaxnum (pointer p); 666static int syntaxnum (pointer p);
680static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
681 668
682static num 669static num
683num_op (char op, num a, num b) 670num_op (enum num_op op, num a, num b)
684{ 671{
685 num ret; 672 num ret;
686 673
687 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
688 675
… …
691 IVALUE av = num_get_ivalue (a); 678 IVALUE av = num_get_ivalue (a);
692 IVALUE bv = num_get_ivalue (b); 679 IVALUE bv = num_get_ivalue (b);
693 680
694 switch (op) 681 switch (op)
695 { 682 {
696 case '+': av += bv; break; 683 case NUM_ADD: av += bv; break;
697 case '-': av -= bv; break; 684 case NUM_SUB: av -= bv; break;
698 case '*': av *= bv; break; 685 case NUM_MUL: av *= bv; break;
699 case '/': av /= bv; break; 686 case NUM_INTDIV: av /= bv; break;
700 } 687 }
701 688
702 num_set_ivalue (ret, av); 689 num_set_ivalue (ret, av);
703 } 690 }
704 else 691 else
… …
706 RVALUE av = num_get_rvalue (a); 693 RVALUE av = num_get_rvalue (a);
707 RVALUE bv = num_get_rvalue (b); 694 RVALUE bv = num_get_rvalue (b);
708 695
709 switch (op) 696 switch (op)
710 { 697 {
711 case '+': av += bv; break; 698 case NUM_ADD: av += bv; break;
712 case '-': av -= bv; break; 699 case NUM_SUB: av -= bv; break;
713 case '*': av *= bv; break; 700 case NUM_MUL: av *= bv; break;
714 case '/': av /= bv; break; 701 case NUM_INTDIV: av /= bv; break;
715 } 702 }
716 703
717 num_set_rvalue (ret, av); 704 num_set_rvalue (ret, av);
718 } 705 }
719 706
… …
779 766
780 num_set_ivalue (ret, res); 767 num_set_ivalue (ret, res);
781 return ret; 768 return ret;
782} 769}
783 770
771/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
784static int 772static int
785num_eq (num a, num b) 773num_cmp (num a, num b)
786{ 774{
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 776 int ret;
788 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
789 777
790 if (is_fixnum) 778 if (is_fixnum)
791 ret = num_get_ivalue (a) == num_get_ivalue (b); 779 {
780 IVALUE av = num_get_ivalue (a);
781 IVALUE bv = num_get_ivalue (b);
782
783 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 }
792 else 785 else
793 ret = num_get_rvalue (a) == num_get_rvalue (b); 786 {
787 RVALUE av = num_get_rvalue (a);
788 RVALUE bv = num_get_rvalue (b);
789
790 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 }
794 792
795 return ret; 793 return ret;
796}
797
798
799static int
800num_gt (num a, num b)
801{
802 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804
805 if (is_fixnum)
806 ret = num_get_ivalue (a) > num_get_ivalue (b);
807 else
808 ret = num_get_rvalue (a) > num_get_rvalue (b);
809
810 return ret;
811}
812
813static int
814num_ge (num a, num b)
815{
816 return !num_lt (a, b);
817}
818
819static int
820num_lt (num a, num b)
821{
822 int ret;
823 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
824
825 if (is_fixnum)
826 ret = num_get_ivalue (a) < num_get_ivalue (b);
827 else
828 ret = num_get_rvalue (a) < num_get_rvalue (b);
829
830 return ret;
831}
832
833static int
834num_le (num a, num b)
835{
836 return !num_gt (a, b);
837} 794}
838 795
839#if USE_MATH 796#if USE_MATH
840 797
841/* Round to nearest. Round to even if midway */ 798/* Round to nearest. Round to even if midway */
… …
851 return ce; 808 return ce;
852 else if (dfl < dce) 809 else if (dfl < dce)
853 return fl; 810 return fl;
854 else 811 else
855 { 812 {
856 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 813 if (fmod (fl, 2) == 0) /* I imagine this holds */
857 return fl; 814 return fl;
858 else 815 else
859 return ce; 816 return ce;
860 } 817 }
861} 818}
862#endif 819#endif
863 820
864static int 821static int
865is_zero_rvalue (RVALUE x) 822is_zero_rvalue (RVALUE x)
866{ 823{
824 return x == 0;
825#if 0
867#if USE_REAL 826#if USE_REAL
868 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. */
869#else 828#else
870 return x == 0; 829 return x == 0;
830#endif
871#endif 831#endif
872} 832}
873 833
874/* allocate new cell segment */ 834/* allocate new cell segment */
875static int 835static int
… …
947 907
948 return n; 908 return n;
949} 909}
950 910
951/* get new cell. parameter a, b is marked by gc. */ 911/* get new cell. parameter a, b is marked by gc. */
952static INLINE pointer 912ecb_inline pointer
953get_cell_x (SCHEME_P_ pointer a, pointer b) 913get_cell_x (SCHEME_P_ pointer a, pointer b)
954{ 914{
955 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 915 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
956 { 916 {
957 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1035 push_recent_alloc (SCHEME_A_ v, NIL); 995 push_recent_alloc (SCHEME_A_ v, NIL);
1036 996
1037 return v; 997 return v;
1038} 998}
1039 999
1040static INLINE void 1000ecb_inline void
1041ok_to_freely_gc (SCHEME_P) 1001ok_to_freely_gc (SCHEME_P)
1042{ 1002{
1043 set_car (S_SINK, NIL); 1003 set_car (S_SINK, NIL);
1044} 1004}
1045 1005
… …
1109 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1069 location = hash_fn (name, veclength (SCHEME_V->oblist));
1110 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1111 return x; 1071 return x;
1112} 1072}
1113 1073
1114static INLINE pointer 1074ecb_inline pointer
1115oblist_find_by_name (SCHEME_P_ const char *name) 1075oblist_find_by_name (SCHEME_P_ const char *name)
1116{ 1076{
1117 int location; 1077 int location;
1118 pointer x; 1078 pointer x;
1119 char *s; 1079 char *s;
… …
1152oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1153{ 1113{
1154 return NIL; 1114 return NIL;
1155} 1115}
1156 1116
1157static INLINE pointer 1117ecb_inline pointer
1158oblist_find_by_name (SCHEME_P_ const char *name) 1118oblist_find_by_name (SCHEME_P_ const char *name)
1159{ 1119{
1160 pointer x; 1120 pointer x;
1161 char *s; 1121 char *s;
1162 1122
… …
2260 } 2220 }
2261 } 2221 }
2262} 2222}
2263 2223
2264/* check c is in chars */ 2224/* check c is in chars */
2265static INLINE int 2225ecb_inline int
2266is_one_of (char *s, int c) 2226is_one_of (char *s, int c)
2267{ 2227{
2268 if (c == EOF) 2228 if (c == EOF)
2269 return 1; 2229 return 1;
2270 2230
2271 return !!strchr (s, c); 2231 return !!strchr (s, c);
2272} 2232}
2273 2233
2274/* skip white characters */ 2234/* skip white characters */
2275static INLINE int 2235ecb_inline int
2276skipspace (SCHEME_P) 2236skipspace (SCHEME_P)
2277{ 2237{
2278 int c, curr_line = 0; 2238 int c, curr_line = 0;
2279 2239
2280 do 2240 do
… …
2508 { 2468 {
2509 p = SCHEME_V->strbuff; 2469 p = SCHEME_V->strbuff;
2510 2470
2511 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 */
2512 { 2472 {
2513 if (num_is_integer (l)) 2473 if (is_integer (l))
2514 xnum (p, ivalue_unchecked (l)); 2474 xnum (p, ivalue_unchecked (l));
2515#if USE_REAL 2475#if USE_REAL
2516 else 2476 else
2517 { 2477 {
2518 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2478 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2773 return 0; 2733 return 0;
2774 } 2734 }
2775 else if (is_number (a)) 2735 else if (is_number (a))
2776 { 2736 {
2777 if (is_number (b)) 2737 if (is_number (b))
2778 if (num_is_integer (a) == num_is_integer (b))
2779 return num_eq (nvalue (a), nvalue (b)); 2738 return num_cmp (nvalue (a), nvalue (b)) == 0;
2780 2739
2781 return 0; 2740 return 0;
2782 } 2741 }
2783 else if (is_character (a)) 2742 else if (is_character (a))
2784 { 2743 {
… …
2851 2810
2852 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2811 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2853 setenvironment (SCHEME_V->envir); 2812 setenvironment (SCHEME_V->envir);
2854} 2813}
2855 2814
2856static INLINE void 2815ecb_inline void
2857new_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)
2858{ 2817{
2859 pointer slot = immutable_cons (variable, value); 2818 pointer slot = immutable_cons (variable, value);
2860 2819
2861 if (is_vector (car (env))) 2820 if (is_vector (car (env)))
… …
2901 return NIL; 2860 return NIL;
2902} 2861}
2903 2862
2904#else /* USE_ALIST_ENV */ 2863#else /* USE_ALIST_ENV */
2905 2864
2906static INLINE void 2865ecb_inline void
2907new_frame_in_env (SCHEME_P_ pointer old_env) 2866new_frame_in_env (SCHEME_P_ pointer old_env)
2908{ 2867{
2909 SCHEME_V->envir = immutable_cons (NIL, old_env); 2868 SCHEME_V->envir = immutable_cons (NIL, old_env);
2910 setenvironment (SCHEME_V->envir); 2869 setenvironment (SCHEME_V->envir);
2911} 2870}
2912 2871
2913static INLINE void 2872ecb_inline void
2914new_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)
2915{ 2874{
2916 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2917} 2876}
2918 2877
… …
2940 return NIL; 2899 return NIL;
2941} 2900}
2942 2901
2943#endif /* USE_ALIST_ENV else */ 2902#endif /* USE_ALIST_ENV else */
2944 2903
2945static INLINE void 2904ecb_inline void
2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2947{ 2906{
2948 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);
2949} 2908}
2950 2909
2951static INLINE void 2910ecb_inline void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2912{
2954 set_cdr (slot, value); 2913 set_cdr (slot, value);
2955} 2914}
2956 2915
2957static INLINE pointer 2916ecb_inline pointer
2958slot_value_in_env (pointer slot) 2917slot_value_in_env (pointer slot)
2959{ 2918{
2960 return cdr (slot); 2919 return cdr (slot);
2961} 2920}
2962 2921
2963/* ========== Evaluation Cycle ========== */ 2922/* ========== Evaluation Cycle ========== */
2964 2923
2965static pointer 2924static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2925xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2926{
2968#if USE_ERROR_HOOK 2927#if USE_ERROR_HOOK
2969 pointer x; 2928 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK; 2929 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3005 code = cons (mk_string (SCHEME_A_ s), code); 2964 code = cons (mk_string (SCHEME_A_ s), code);
3006 setimmutable (car (code)); 2965 setimmutable (car (code));
3007 SCHEME_V->code = cons (slot_value_in_env (x), code); 2966 SCHEME_V->code = cons (slot_value_in_env (x), code);
3008 SCHEME_V->op = OP_EVAL; 2967 SCHEME_V->op = OP_EVAL;
3009 2968
3010 return S_T; 2969 return 0;
3011 } 2970 }
3012#endif 2971#endif
3013 2972
3014 if (a) 2973 if (a)
3015 SCHEME_V->args = cons (a, NIL); 2974 SCHEME_V->args = cons (a, NIL);
… …
3017 SCHEME_V->args = NIL; 2976 SCHEME_V->args = NIL;
3018 2977
3019 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);
3020 setimmutable (car (SCHEME_V->args)); 2979 setimmutable (car (SCHEME_V->args));
3021 SCHEME_V->op = OP_ERR0; 2980 SCHEME_V->op = OP_ERR0;
2981
3022 return S_T; 2982 return 0;
3023} 2983}
3024 2984
3025#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)
3026#define Error_0(s) Error_1 (s, 0) 2986#define Error_0(s) Error_1 (s, 0)
3027 2987
3028/* Too small to turn into function */ 2988/* Too small to turn into function */
3029#define BEGIN do { 2989#define BEGIN do {
3030#define END } while (0) 2990#define END } while (0)
3031#define s_goto(a) BEGIN \ 2991#define s_goto(a) BEGIN \
3032 SCHEME_V->op = a; \ 2992 SCHEME_V->op = a; \
3033 return S_T; END 2993 return 0; END
3034 2994
3035#define s_return(a) return xs_return (SCHEME_A_ a) 2995#define s_return(a) return xs_return (SCHEME_A_ a)
3036 2996
3037#ifndef USE_SCHEME_STACK 2997#ifndef USE_SCHEME_STACK
3038 2998
… …
3063 next_frame = SCHEME_V->dump_base + nframes; 3023 next_frame = SCHEME_V->dump_base + nframes;
3064 3024
3065 next_frame->op = op; 3025 next_frame->op = op;
3066 next_frame->args = args; 3026 next_frame->args = args;
3067 next_frame->envir = SCHEME_V->envir; 3027 next_frame->envir = SCHEME_V->envir;
3068 next_frame->code = code; 3028 next_frame->code = code;
3069 3029
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3031}
3072 3032
3073static pointer 3033static int
3074xs_return (SCHEME_P_ pointer a) 3034xs_return (SCHEME_P_ pointer a)
3075{ 3035{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3036 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3037 struct dump_stack_frame *frame;
3078 3038
3079 SCHEME_V->value = a; 3039 SCHEME_V->value = a;
3080 3040
3081 if (nframes <= 0) 3041 if (nframes <= 0)
3082 return NIL; 3042 return -1;
3083 3043
3084 frame = &SCHEME_V->dump_base[--nframes]; 3044 frame = &SCHEME_V->dump_base[--nframes];
3085 SCHEME_V->op = frame->op; 3045 SCHEME_V->op = frame->op;
3086 SCHEME_V->args = frame->args; 3046 SCHEME_V->args = frame->args;
3087 SCHEME_V->envir = frame->envir; 3047 SCHEME_V->envir = frame->envir;
3088 SCHEME_V->code = frame->code; 3048 SCHEME_V->code = frame->code;
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3050
3091 return S_T; 3051 return 0;
3092} 3052}
3093 3053
3094static INLINE void 3054ecb_inline void
3095dump_stack_reset (SCHEME_P) 3055dump_stack_reset (SCHEME_P)
3096{ 3056{
3097 /* 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 */
3098 SCHEME_V->dump = (pointer)+0; 3058 SCHEME_V->dump = (pointer)+0;
3099} 3059}
3100 3060
3101static INLINE void 3061ecb_inline void
3102dump_stack_initialize (SCHEME_P) 3062dump_stack_initialize (SCHEME_P)
3103{ 3063{
3104 SCHEME_V->dump_size = 0; 3064 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3065 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3066 dump_stack_reset (SCHEME_A);
… …
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3133 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3134}
3175 3135
3176#else 3136#else
3177 3137
3178static INLINE void 3138ecb_inline void
3179dump_stack_reset (SCHEME_P) 3139dump_stack_reset (SCHEME_P)
3180{ 3140{
3181 SCHEME_V->dump = NIL; 3141 SCHEME_V->dump = NIL;
3182} 3142}
3183 3143
3184static INLINE void 3144ecb_inline void
3185dump_stack_initialize (SCHEME_P) 3145dump_stack_initialize (SCHEME_P)
3186{ 3146{
3187 dump_stack_reset (SCHEME_A); 3147 dump_stack_reset (SCHEME_A);
3188} 3148}
3189 3149
… …
3191dump_stack_free (SCHEME_P) 3151dump_stack_free (SCHEME_P)
3192{ 3152{
3193 SCHEME_V->dump = NIL; 3153 SCHEME_V->dump = NIL;
3194} 3154}
3195 3155
3196static pointer 3156static int
3197xs_return (SCHEME_P_ pointer a) 3157xs_return (SCHEME_P_ pointer a)
3198{ 3158{
3199 pointer dump = SCHEME_V->dump; 3159 pointer dump = SCHEME_V->dump;
3200 3160
3201 SCHEME_V->value = a; 3161 SCHEME_V->value = a;
3202 3162
3203 if (dump == NIL) 3163 if (dump == NIL)
3204 return NIL; 3164 return -1;
3205 3165
3206 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3207 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3167 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3209 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3169 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3210 3170
3211 SCHEME_V->dump = dump; 3171 SCHEME_V->dump = dump;
3212 3172
3213 return S_T; 3173 return 0;
3214} 3174}
3215 3175
3216static void 3176static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3178{
… …
3243 3203
3244#endif 3204#endif
3245 3205
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3207
3248static pointer 3208static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3209opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3210{
3211 pointer args = SCHEME_V->args;
3251 pointer x, y; 3212 pointer x, y;
3252 3213
3253 switch (op) 3214 switch (op)
3254 { 3215 {
3255 case OP_LOAD: /* load */ 3216 case OP_LOAD: /* load */
3256 if (file_interactive (SCHEME_A)) 3217 if (file_interactive (SCHEME_A))
3257 { 3218 {
3258 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3259 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3260 } 3221 }
3261 3222
3262 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3223 if (!file_push (SCHEME_A_ strvalue (car (args))))
3263 Error_1 ("unable to open", car (SCHEME_V->args)); 3224 Error_1 ("unable to open", car (args));
3264 else 3225 else
3265 { 3226 {
3266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3267 s_goto (OP_T0LVL); 3228 s_goto (OP_T0LVL);
3268 } 3229 }
… …
3342 case OP_EVAL: /* main part of evaluation */ 3303 case OP_EVAL: /* main part of evaluation */
3343#if USE_TRACING 3304#if USE_TRACING
3344 if (SCHEME_V->tracing) 3305 if (SCHEME_V->tracing)
3345 { 3306 {
3346 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3307 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3347 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);
3348 SCHEME_V->args = SCHEME_V->code; 3309 SCHEME_V->args = SCHEME_V->code;
3349 putstr (SCHEME_A_ "\nEval: "); 3310 putstr (SCHEME_A_ "\nEval: ");
3350 s_goto (OP_P0LIST); 3311 s_goto (OP_P0LIST);
3351 } 3312 }
3352 3313
… …
3396 SCHEME_V->code = cdr (SCHEME_V->code); 3357 SCHEME_V->code = cdr (SCHEME_V->code);
3397 s_goto (OP_E1ARGS); 3358 s_goto (OP_E1ARGS);
3398 } 3359 }
3399 3360
3400 case OP_E1ARGS: /* eval arguments */ 3361 case OP_E1ARGS: /* eval arguments */
3401 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3362 args = cons (SCHEME_V->value, args);
3402 3363
3403 if (is_pair (SCHEME_V->code)) /* continue */ 3364 if (is_pair (SCHEME_V->code)) /* continue */
3404 { 3365 {
3405 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));
3406 SCHEME_V->code = car (SCHEME_V->code); 3367 SCHEME_V->code = car (SCHEME_V->code);
3407 SCHEME_V->args = NIL; 3368 SCHEME_V->args = NIL;
3408 s_goto (OP_EVAL); 3369 s_goto (OP_EVAL);
3409 } 3370 }
3410 else /* end */ 3371 else /* end */
3411 { 3372 {
3412 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3373 args = reverse_in_place (SCHEME_A_ NIL, args);
3413 SCHEME_V->code = car (SCHEME_V->args); 3374 SCHEME_V->code = car (args);
3414 SCHEME_V->args = cdr (SCHEME_V->args); 3375 SCHEME_V->args = cdr (args);
3415 s_goto (OP_APPLY); 3376 s_goto (OP_APPLY);
3416 } 3377 }
3417 3378
3418#if USE_TRACING 3379#if USE_TRACING
3419 3380
3420 case OP_TRACING: 3381 case OP_TRACING:
3421 { 3382 {
3422 int tr = SCHEME_V->tracing; 3383 int tr = SCHEME_V->tracing;
3423 3384
3424 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3385 SCHEME_V->tracing = ivalue (car (args));
3425 s_return (mk_integer (SCHEME_A_ tr)); 3386 s_return (mk_integer (SCHEME_A_ tr));
3426 } 3387 }
3427 3388
3428#endif 3389#endif
3429 3390
3430 case OP_APPLY: /* apply 'code' to 'args' */ 3391 case OP_APPLY: /* apply 'code' to 'args' */
3431#if USE_TRACING 3392#if USE_TRACING
3432 if (SCHEME_V->tracing) 3393 if (SCHEME_V->tracing)
3433 { 3394 {
3434 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);
3435 SCHEME_V->print_flag = 1; 3396 SCHEME_V->print_flag = 1;
3436 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3397 /* args=cons(SCHEME_V->code,args); */
3437 putstr (SCHEME_A_ "\nApply to: "); 3398 putstr (SCHEME_A_ "\nApply to: ");
3438 s_goto (OP_P0LIST); 3399 s_goto (OP_P0LIST);
3439 } 3400 }
3440 3401
3441 /* fall through */ 3402 /* fall through */
3442 3403
3443 case OP_REAL_APPLY: 3404 case OP_REAL_APPLY:
3444#endif 3405#endif
3445 if (is_proc (SCHEME_V->code)) 3406 if (is_proc (SCHEME_V->code))
3446 {
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 }
3449 else if (is_foreign (SCHEME_V->code)) 3408 else if (is_foreign (SCHEME_V->code))
3450 { 3409 {
3451 /* Keep nested calls from GC'ing the arglist */ 3410 /* Keep nested calls from GC'ing the arglist */
3452 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3411 push_recent_alloc (SCHEME_A_ args, NIL);
3453 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3454 3413
3455 s_return (x); 3414 s_return (x);
3456 } 3415 }
3457 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 */
3458 { 3417 {
3459 /* Should not accept promise */ 3418 /* Should not accept promise */
3460 /* make environment */ 3419 /* make environment */
3461 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3420 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3462 3421
3463 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))
3464 { 3423 {
3465 if (y == NIL) 3424 if (y == NIL)
3466 Error_0 ("not enough arguments"); 3425 Error_0 ("not enough arguments");
3467 else 3426 else
3468 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3427 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3486 s_goto (OP_BEGIN); 3445 s_goto (OP_BEGIN);
3487 } 3446 }
3488 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3447 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3489 { 3448 {
3490 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3449 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3491 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3450 s_return (args != NIL ? car (args) : NIL);
3492 } 3451 }
3493 else 3452 else
3494 Error_0 ("illegal function"); 3453 Error_0 ("illegal function");
3495 3454
3496 case OP_DOMACRO: /* do macro */ 3455 case OP_DOMACRO: /* do macro */
… …
3505 { 3464 {
3506 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);
3507 3466
3508 if (f != NIL) 3467 if (f != NIL)
3509 { 3468 {
3510 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3469 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3511 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3470 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3512 SCHEME_V->code = slot_value_in_env (f); 3471 SCHEME_V->code = slot_value_in_env (f);
3513 s_goto (OP_APPLY); 3472 s_goto (OP_APPLY);
3514 } 3473 }
3515 3474
… …
3526 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));
3527 3486
3528#endif 3487#endif
3529 3488
3530 case OP_MKCLOSURE: /* make-closure */ 3489 case OP_MKCLOSURE: /* make-closure */
3531 x = car (SCHEME_V->args); 3490 x = car (args);
3532 3491
3533 if (car (x) == SCHEME_V->LAMBDA) 3492 if (car (x) == SCHEME_V->LAMBDA)
3534 x = cdr (x); 3493 x = cdr (x);
3535 3494
3536 if (cdr (SCHEME_V->args) == NIL) 3495 if (cdr (args) == NIL)
3537 y = SCHEME_V->envir; 3496 y = SCHEME_V->envir;
3538 else 3497 else
3539 y = cadr (SCHEME_V->args); 3498 y = cadr (args);
3540 3499
3541 s_return (mk_closure (SCHEME_A_ x, y)); 3500 s_return (mk_closure (SCHEME_A_ x, y));
3542 3501
3543 case OP_QUOTE: /* quote */ 3502 case OP_QUOTE: /* quote */
3544 s_return (car (SCHEME_V->code)); 3503 s_return (car (SCHEME_V->code));
… …
3576 3535
3577 3536
3578 case OP_DEFP: /* defined? */ 3537 case OP_DEFP: /* defined? */
3579 x = SCHEME_V->envir; 3538 x = SCHEME_V->envir;
3580 3539
3581 if (cdr (SCHEME_V->args) != NIL) 3540 if (cdr (args) != NIL)
3582 x = cadr (SCHEME_V->args); 3541 x = cadr (args);
3583 3542
3584 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);
3585 3544
3586 case OP_SET0: /* set! */ 3545 case OP_SET0: /* set! */
3587 if (is_immutable (car (SCHEME_V->code))) 3546 if (is_immutable (car (SCHEME_V->code)))
3588 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));
3589 3548
… …
3620 3579
3621 case OP_IF1: /* if */ 3580 case OP_IF1: /* if */
3622 if (is_true (SCHEME_V->value)) 3581 if (is_true (SCHEME_V->value))
3623 SCHEME_V->code = car (SCHEME_V->code); 3582 SCHEME_V->code = car (SCHEME_V->code);
3624 else 3583 else
3625 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 */
3626
3627 * car(NIL) = NIL */
3628 s_goto (OP_EVAL); 3585 s_goto (OP_EVAL);
3629 3586
3630 case OP_LET0: /* let */ 3587 case OP_LET0: /* let */
3631 SCHEME_V->args = NIL; 3588 SCHEME_V->args = NIL;
3632 SCHEME_V->value = SCHEME_V->code; 3589 SCHEME_V->value = SCHEME_V->code;
3633 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);
3634 s_goto (OP_LET1); 3591 s_goto (OP_LET1);
3635 3592
3636 case OP_LET1: /* let (calculate parameters) */ 3593 case OP_LET1: /* let (calculate parameters) */
3637 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3594 args = cons (SCHEME_V->value, args);
3638 3595
3639 if (is_pair (SCHEME_V->code)) /* continue */ 3596 if (is_pair (SCHEME_V->code)) /* continue */
3640 { 3597 {
3641 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)))
3642 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));
3643 3600
3644 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));
3645 SCHEME_V->code = cadar (SCHEME_V->code); 3602 SCHEME_V->code = cadar (SCHEME_V->code);
3646 SCHEME_V->args = NIL; 3603 SCHEME_V->args = NIL;
3647 s_goto (OP_EVAL); 3604 s_goto (OP_EVAL);
3648 } 3605 }
3649 else /* end */ 3606 else /* end */
3650 { 3607 {
3651 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3608 args = reverse_in_place (SCHEME_A_ NIL, args);
3652 SCHEME_V->code = car (SCHEME_V->args); 3609 SCHEME_V->code = car (args);
3653 SCHEME_V->args = cdr (SCHEME_V->args); 3610 SCHEME_V->args = cdr (args);
3654 s_goto (OP_LET2); 3611 s_goto (OP_LET2);
3655 } 3612 }
3656 3613
3657 case OP_LET2: /* let */ 3614 case OP_LET2: /* let */
3658 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3659 3616
3660 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;
3661 y != NIL; x = cdr (x), y = cdr (y)) 3618 y != NIL; x = cdr (x), y = cdr (y))
3662 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3619 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3663 3620
3664 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3621 if (is_symbol (car (SCHEME_V->code))) /* named let */
3665 { 3622 {
3666 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))
3667 { 3624 {
3668 if (!is_pair (x)) 3625 if (!is_pair (x))
3669 Error_1 ("Bad syntax of binding in let :", x); 3626 Error_1 ("Bad syntax of binding in let :", x);
3670 3627
3671 if (!is_list (SCHEME_A_ car (x))) 3628 if (!is_list (SCHEME_A_ car (x)))
3672 Error_1 ("Bad syntax of binding in let :", car (x)); 3629 Error_1 ("Bad syntax of binding in let :", car (x));
3673 3630
3674 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3631 args = cons (caar (x), args);
3675 } 3632 }
3676 3633
3677 x =
3678 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)),
3679 SCHEME_V->envir); 3635 SCHEME_V->envir);
3680 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3636 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3681 SCHEME_V->code = cddr (SCHEME_V->code); 3637 SCHEME_V->code = cddr (SCHEME_V->code);
3682 SCHEME_V->args = NIL;
3683 } 3638 }
3684 else 3639 else
3685 { 3640 {
3686 SCHEME_V->code = cdr (SCHEME_V->code); 3641 SCHEME_V->code = cdr (SCHEME_V->code);
3642 }
3643
3687 SCHEME_V->args = NIL; 3644 SCHEME_V->args = NIL;
3688 }
3689
3690 s_goto (OP_BEGIN); 3645 s_goto (OP_BEGIN);
3691 3646
3692 case OP_LET0AST: /* let* */ 3647 case OP_LET0AST: /* let* */
3693 if (car (SCHEME_V->code) == NIL) 3648 if (car (SCHEME_V->code) == NIL)
3694 { 3649 {
… …
3712 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);
3713 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3714 3669
3715 if (is_pair (SCHEME_V->code)) /* continue */ 3670 if (is_pair (SCHEME_V->code)) /* continue */
3716 { 3671 {
3717 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3672 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3718 SCHEME_V->code = cadar (SCHEME_V->code); 3673 SCHEME_V->code = cadar (SCHEME_V->code);
3719 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3720 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3721 } 3676 }
3722 else /* end */ 3677 else /* end */
3723 { 3678 {
3724 SCHEME_V->code = SCHEME_V->args; 3679 SCHEME_V->code = args;
3725 SCHEME_V->args = NIL; 3680 SCHEME_V->args = NIL;
3726 s_goto (OP_BEGIN); 3681 s_goto (OP_BEGIN);
3727 } 3682 }
3728 3683
3729 case OP_LET0REC: /* letrec */ 3684 case OP_LET0REC: /* letrec */
… …
3732 SCHEME_V->value = SCHEME_V->code; 3687 SCHEME_V->value = SCHEME_V->code;
3733 SCHEME_V->code = car (SCHEME_V->code); 3688 SCHEME_V->code = car (SCHEME_V->code);
3734 s_goto (OP_LET1REC); 3689 s_goto (OP_LET1REC);
3735 3690
3736 case OP_LET1REC: /* letrec (calculate parameters) */ 3691 case OP_LET1REC: /* letrec (calculate parameters) */
3737 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3692 args = cons (SCHEME_V->value, args);
3738 3693
3739 if (is_pair (SCHEME_V->code)) /* continue */ 3694 if (is_pair (SCHEME_V->code)) /* continue */
3740 { 3695 {
3741 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)))
3742 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));
3743 3698
3744 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));
3745 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3746 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3747 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3748 } 3703 }
3749 else /* end */ 3704 else /* end */
3750 { 3705 {
3751 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3706 args = reverse_in_place (SCHEME_A_ NIL, args);
3752 SCHEME_V->code = car (SCHEME_V->args); 3707 SCHEME_V->code = car (args);
3753 SCHEME_V->args = cdr (SCHEME_V->args); 3708 SCHEME_V->args = cdr (args);
3754 s_goto (OP_LET2REC); 3709 s_goto (OP_LET2REC);
3755 } 3710 }
3756 3711
3757 case OP_LET2REC: /* letrec */ 3712 case OP_LET2REC: /* letrec */
3758 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))
3759 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3714 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3760 3715
3761 SCHEME_V->code = cdr (SCHEME_V->code); 3716 SCHEME_V->code = cdr (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3763 s_goto (OP_BEGIN); 3718 s_goto (OP_BEGIN);
… …
3849 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3850 SCHEME_V->code = car (SCHEME_V->code); 3805 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3806 s_goto (OP_EVAL);
3852 3807
3853 case OP_C1STREAM: /* cons-stream */ 3808 case OP_C1STREAM: /* cons-stream */
3854 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 */
3855 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);
3856 set_typeflag (x, T_PROMISE); 3811 set_typeflag (x, T_PROMISE);
3857 s_return (cons (SCHEME_V->args, x)); 3812 s_return (cons (args, x));
3858 3813
3859 case OP_MACRO0: /* macro */ 3814 case OP_MACRO0: /* macro */
3860 if (is_pair (car (SCHEME_V->code))) 3815 if (is_pair (car (SCHEME_V->code)))
3861 { 3816 {
3862 x = caar (SCHEME_V->code); 3817 x = caar (SCHEME_V->code);
… …
3895 { 3850 {
3896 if (!is_pair (y = caar (x))) 3851 if (!is_pair (y = caar (x)))
3897 break; 3852 break;
3898 3853
3899 for (; y != NIL; y = cdr (y)) 3854 for (; y != NIL; y = cdr (y))
3900 {
3901 if (eqv (car (y), SCHEME_V->value)) 3855 if (eqv (car (y), SCHEME_V->value))
3902 break; 3856 break;
3903 }
3904 3857
3905 if (y != NIL) 3858 if (y != NIL)
3906 break; 3859 break;
3907 } 3860 }
3908 3861
… …
3928 s_goto (OP_BEGIN); 3881 s_goto (OP_BEGIN);
3929 else 3882 else
3930 s_return (NIL); 3883 s_return (NIL);
3931 3884
3932 case OP_PAPPLY: /* apply */ 3885 case OP_PAPPLY: /* apply */
3933 SCHEME_V->code = car (SCHEME_V->args); 3886 SCHEME_V->code = car (args);
3934 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3935 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3888 /*SCHEME_V->args = cadr(args); */
3936 s_goto (OP_APPLY); 3889 s_goto (OP_APPLY);
3937 3890
3938 case OP_PEVAL: /* eval */ 3891 case OP_PEVAL: /* eval */
3939 if (cdr (SCHEME_V->args) != NIL) 3892 if (cdr (args) != NIL)
3940 SCHEME_V->envir = cadr (SCHEME_V->args); 3893 SCHEME_V->envir = cadr (args);
3941 3894
3942 SCHEME_V->code = car (SCHEME_V->args); 3895 SCHEME_V->code = car (args);
3943 s_goto (OP_EVAL); 3896 s_goto (OP_EVAL);
3944 3897
3945 case OP_CONTINUATION: /* call-with-current-continuation */ 3898 case OP_CONTINUATION: /* call-with-current-continuation */
3946 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3947 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);
3948 s_goto (OP_APPLY); 3901 s_goto (OP_APPLY);
3949 } 3902 }
3950 3903
3951 return S_T; 3904 if (USE_ERROR_CHECKING) abort ();
3952} 3905}
3953 3906
3954static pointer 3907static int
3955opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3908opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3956{ 3909{
3957 pointer x; 3910 pointer args = SCHEME_V->args;
3911 pointer x = car (args);
3958 num v; 3912 num v;
3959 3913
3960#if USE_MATH 3914#if USE_MATH
3961 RVALUE dd; 3915 RVALUE dd;
3962#endif 3916#endif
3963 3917
3964 switch (op) 3918 switch (op)
3965 { 3919 {
3966#if USE_MATH 3920#if USE_MATH
3967
3968 case OP_INEX2EX: /* inexact->exact */ 3921 case OP_INEX2EX: /* inexact->exact */
3969 x = car (SCHEME_V->args);
3970
3971 if (num_is_integer (x)) 3922 if (is_integer (x))
3972 s_return (x); 3923 s_return (x);
3973 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3924 else if (modf (rvalue_unchecked (x), &dd) == 0)
3974 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3925 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3975 else 3926 else
3976 Error_1 ("inexact->exact: not integral:", x); 3927 Error_1 ("inexact->exact: not integral:", x);
3977 3928
3978 case OP_EXP:
3979 x = car (SCHEME_V->args);
3980 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3981
3982 case OP_LOG:
3983 x = car (SCHEME_V->args);
3984 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3985
3986 case OP_SIN:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3989
3990 case OP_COS:
3991 x = car (SCHEME_V->args);
3992 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3993
3994 case OP_TAN:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3997
3998 case OP_ASIN:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4001
4002 case OP_ACOS:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4005 3936
4006 case OP_ATAN: 3937 case OP_ATAN:
4007 x = car (SCHEME_V->args);
4008
4009 if (cdr (SCHEME_V->args) == NIL) 3938 if (cdr (args) == NIL)
4010 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4011 else 3940 else
4012 { 3941 {
4013 pointer y = cadr (SCHEME_V->args); 3942 pointer y = cadr (args);
4014
4015 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4016 } 3944 }
4017 3945
4018 case OP_SQRT: 3946 case OP_SQRT:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4021 3948
4022 case OP_EXPT: 3949 case OP_EXPT:
4023 { 3950 {
4024 RVALUE result; 3951 RVALUE result;
4025 int real_result = 1; 3952 int real_result = 1;
4026 pointer y = cadr (SCHEME_V->args); 3953 pointer y = cadr (args);
4027 3954
4028 x = car (SCHEME_V->args);
4029
4030 if (num_is_integer (x) && num_is_integer (y)) 3955 if (is_integer (x) && is_integer (y))
4031 real_result = 0; 3956 real_result = 0;
4032 3957
4033 /* This 'if' is an R5RS compatibility fix. */ 3958 /* This 'if' is an R5RS compatibility fix. */
4034 /* NOTE: Remove this 'if' fix for R6RS. */ 3959 /* NOTE: Remove this 'if' fix for R6RS. */
4035 if (rvalue (x) == 0 && rvalue (y) < 0) 3960 if (rvalue (x) == 0 && rvalue (y) < 0)
4036 result = 0.0; 3961 result = 0;
4037 else 3962 else
4038 result = pow (rvalue (x), rvalue (y)); 3963 result = pow (rvalue (x), rvalue (y));
4039 3964
4040 /* Before returning integer result make sure we can. */ 3965 /* Before returning integer result make sure we can. */
4041 /* If the test fails, result is too big for integer. */ 3966 /* If the test fails, result is too big for integer. */
4042 if (!real_result) 3967 if (!real_result)
4043 { 3968 {
4044 long result_as_long = (long) result; 3969 long result_as_long = result;
4045 3970
4046 if (result != (RVALUE) result_as_long) 3971 if (result != (RVALUE) result_as_long)
4047 real_result = 1; 3972 real_result = 1;
4048 } 3973 }
4049 3974
… …
4051 s_return (mk_real (SCHEME_A_ result)); 3976 s_return (mk_real (SCHEME_A_ result));
4052 else 3977 else
4053 s_return (mk_integer (SCHEME_A_ result)); 3978 s_return (mk_integer (SCHEME_A_ result));
4054 } 3979 }
4055 3980
4056 case OP_FLOOR:
4057 x = car (SCHEME_V->args);
4058 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4059
4060 case OP_CEILING:
4061 x = car (SCHEME_V->args);
4062 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4063 3983
4064 case OP_TRUNCATE: 3984 case OP_TRUNCATE:
4065 { 3985 {
4066 RVALUE rvalue_of_x; 3986 RVALUE rvalue_of_x;
4067 3987
4068 x = car (SCHEME_V->args);
4069 rvalue_of_x = rvalue (x); 3988 rvalue_of_x = rvalue (x);
4070 3989
4071 if (rvalue_of_x > 0) 3990 if (rvalue_of_x > 0)
4072 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4073 else 3992 else
4074 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4075 } 3994 }
4076 3995
4077 case OP_ROUND: 3996 case OP_ROUND:
4078 x = car (SCHEME_V->args);
4079
4080 if (num_is_integer (x)) 3997 if (num_is_integer (x))
4081 s_return (x); 3998 s_return (x);
4082 3999
4083 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4084#endif 4001#endif
4085 4002
4086 case OP_ADD: /* + */ 4003 case OP_ADD: /* + */
4087 v = num_zero; 4004 v = num_zero;
4088 4005
4089 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4006 for (x = args; x != NIL; x = cdr (x))
4090 v = num_op ('+', v, nvalue (car (x))); 4007 v = num_op (NUM_ADD, v, nvalue (car (x)));
4091 4008
4092 s_return (mk_number (SCHEME_A_ v)); 4009 s_return (mk_number (SCHEME_A_ v));
4093 4010
4094 case OP_MUL: /* * */ 4011 case OP_MUL: /* * */
4095 v = num_one; 4012 v = num_one;
4096 4013
4097 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4014 for (x = args; x != NIL; x = cdr (x))
4098 v = num_op ('+', v, nvalue (car (x))); 4015 v = num_op (NUM_MUL, v, nvalue (car (x)));
4099 4016
4100 s_return (mk_number (SCHEME_A_ v)); 4017 s_return (mk_number (SCHEME_A_ v));
4101 4018
4102 case OP_SUB: /* - */ 4019 case OP_SUB: /* - */
4103 if (cdr (SCHEME_V->args) == NIL) 4020 if (cdr (args) == NIL)
4104 { 4021 {
4105 x = SCHEME_V->args; 4022 x = args;
4106 v = num_zero; 4023 v = num_zero;
4107 } 4024 }
4108 else 4025 else
4109 { 4026 {
4110 x = cdr (SCHEME_V->args); 4027 x = cdr (args);
4111 v = nvalue (car (SCHEME_V->args)); 4028 v = nvalue (car (args));
4112 } 4029 }
4113 4030
4114 for (; x != NIL; x = cdr (x)) 4031 for (; x != NIL; x = cdr (x))
4115 v = num_op ('+', v, nvalue (car (x))); 4032 v = num_op (NUM_SUB, v, nvalue (car (x)));
4116 4033
4117 s_return (mk_number (SCHEME_A_ v)); 4034 s_return (mk_number (SCHEME_A_ v));
4118 4035
4119 case OP_DIV: /* / */ 4036 case OP_DIV: /* / */
4120 if (cdr (SCHEME_V->args) == NIL) 4037 if (cdr (args) == NIL)
4121 { 4038 {
4122 x = SCHEME_V->args; 4039 x = args;
4123 v = num_one; 4040 v = num_one;
4124 } 4041 }
4125 else 4042 else
4126 { 4043 {
4127 x = cdr (SCHEME_V->args); 4044 x = cdr (args);
4128 v = nvalue (car (SCHEME_V->args)); 4045 v = nvalue (car (args));
4129 } 4046 }
4130 4047
4131 for (; x != NIL; x = cdr (x)) 4048 for (; x != NIL; x = cdr (x))
4132 {
4133 if (!is_zero_rvalue (rvalue (car (x)))) 4049 if (!is_zero_rvalue (rvalue (car (x))))
4134 v = num_div (v, nvalue (car (x))); 4050 v = num_div (v, nvalue (car (x)));
4135 else 4051 else
4136 Error_0 ("/: division by zero"); 4052 Error_0 ("/: division by zero");
4137 }
4138 4053
4139 s_return (mk_number (SCHEME_A_ v)); 4054 s_return (mk_number (SCHEME_A_ v));
4140 4055
4141 case OP_INTDIV: /* quotient */ 4056 case OP_INTDIV: /* quotient */
4142 if (cdr (SCHEME_V->args) == NIL) 4057 if (cdr (args) == NIL)
4143 { 4058 {
4144 x = SCHEME_V->args; 4059 x = args;
4145 v = num_one; 4060 v = num_one;
4146 } 4061 }
4147 else 4062 else
4148 { 4063 {
4149 x = cdr (SCHEME_V->args); 4064 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4065 v = nvalue (car (args));
4151 } 4066 }
4152 4067
4153 for (; x != NIL; x = cdr (x)) 4068 for (; x != NIL; x = cdr (x))
4154 { 4069 {
4155 if (ivalue (car (x)) != 0) 4070 if (ivalue (car (x)) != 0)
4156 v = num_op ('/', v, nvalue (car (x))); 4071 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4157 else 4072 else
4158 Error_0 ("quotient: division by zero"); 4073 Error_0 ("quotient: division by zero");
4159 } 4074 }
4160 4075
4161 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4162 4077
4163 case OP_REM: /* remainder */ 4078 case OP_REM: /* remainder */
4164 v = nvalue (car (SCHEME_V->args)); 4079 v = nvalue (x);
4165 4080
4166 if (ivalue (cadr (SCHEME_V->args)) != 0) 4081 if (ivalue (cadr (args)) != 0)
4167 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4082 v = num_rem (v, nvalue (cadr (args)));
4168 else 4083 else
4169 Error_0 ("remainder: division by zero"); 4084 Error_0 ("remainder: division by zero");
4170 4085
4171 s_return (mk_number (SCHEME_A_ v)); 4086 s_return (mk_number (SCHEME_A_ v));
4172 4087
4173 case OP_MOD: /* modulo */ 4088 case OP_MOD: /* modulo */
4174 v = nvalue (car (SCHEME_V->args)); 4089 v = nvalue (x);
4175 4090
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4091 if (ivalue (cadr (args)) != 0)
4177 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4092 v = num_mod (v, nvalue (cadr (args)));
4178 else 4093 else
4179 Error_0 ("modulo: division by zero"); 4094 Error_0 ("modulo: division by zero");
4180 4095
4181 s_return (mk_number (SCHEME_A_ v)); 4096 s_return (mk_number (SCHEME_A_ v));
4182 4097
4183 case OP_CAR: /* car */ 4098 case OP_CAR: /* car */
4184 s_return (caar (SCHEME_V->args)); 4099 s_return (caar (args));
4185 4100
4186 case OP_CDR: /* cdr */ 4101 case OP_CDR: /* cdr */
4187 s_return (cdar (SCHEME_V->args)); 4102 s_return (cdar (args));
4188 4103
4189 case OP_CONS: /* cons */ 4104 case OP_CONS: /* cons */
4190 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4105 set_cdr (args, cadr (args));
4191 s_return (SCHEME_V->args); 4106 s_return (args);
4192 4107
4193 case OP_SETCAR: /* set-car! */ 4108 case OP_SETCAR: /* set-car! */
4194 if (!is_immutable (car (SCHEME_V->args))) 4109 if (!is_immutable (x))
4195 { 4110 {
4196 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4111 set_car (x, cadr (args));
4197 s_return (car (SCHEME_V->args)); 4112 s_return (car (args));
4198 } 4113 }
4199 else 4114 else
4200 Error_0 ("set-car!: unable to alter immutable pair"); 4115 Error_0 ("set-car!: unable to alter immutable pair");
4201 4116
4202 case OP_SETCDR: /* set-cdr! */ 4117 case OP_SETCDR: /* set-cdr! */
4203 if (!is_immutable (car (SCHEME_V->args))) 4118 if (!is_immutable (x))
4204 { 4119 {
4205 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4120 set_cdr (x, cadr (args));
4206 s_return (car (SCHEME_V->args)); 4121 s_return (car (args));
4207 } 4122 }
4208 else 4123 else
4209 Error_0 ("set-cdr!: unable to alter immutable pair"); 4124 Error_0 ("set-cdr!: unable to alter immutable pair");
4210 4125
4211 case OP_CHAR2INT: /* char->integer */ 4126 case OP_CHAR2INT: /* char->integer */
4212 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4127 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4213 4128
4214 case OP_INT2CHAR: /* integer->char */ 4129 case OP_INT2CHAR: /* integer->char */
4215 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4130 s_return (mk_character (SCHEME_A_ ivalue (x)));
4216 4131
4217 case OP_CHARUPCASE: 4132 case OP_CHARUPCASE:
4218 { 4133 {
4219 unsigned char c = ivalue (car (SCHEME_V->args)); 4134 unsigned char c = ivalue (x);
4220 c = toupper (c); 4135 c = toupper (c);
4221 s_return (mk_character (SCHEME_A_ c)); 4136 s_return (mk_character (SCHEME_A_ c));
4222 } 4137 }
4223 4138
4224 case OP_CHARDNCASE: 4139 case OP_CHARDNCASE:
4225 { 4140 {
4226 unsigned char c = ivalue (car (SCHEME_V->args)); 4141 unsigned char c = ivalue (x);
4227 c = tolower (c); 4142 c = tolower (c);
4228 s_return (mk_character (SCHEME_A_ c)); 4143 s_return (mk_character (SCHEME_A_ c));
4229 } 4144 }
4230 4145
4231 case OP_STR2SYM: /* string->symbol */ 4146 case OP_STR2SYM: /* string->symbol */
4232 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4147 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4233 4148
4234 case OP_STR2ATOM: /* string->atom */ 4149 case OP_STR2ATOM: /* string->atom */
4235 { 4150 {
4236 char *s = strvalue (car (SCHEME_V->args)); 4151 char *s = strvalue (x);
4237 long pf = 0; 4152 long pf = 0;
4238 4153
4239 if (cdr (SCHEME_V->args) != NIL) 4154 if (cdr (args) != NIL)
4240 { 4155 {
4241 /* we know cadr(SCHEME_V->args) is a natural number */ 4156 /* we know cadr(args) is a natural number */
4242 /* see if it is 2, 8, 10, or 16, or error */ 4157 /* see if it is 2, 8, 10, or 16, or error */
4243 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4158 pf = ivalue_unchecked (cadr (args));
4244 4159
4245 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4160 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4246 { 4161 {
4247 /* base is OK */ 4162 /* base is OK */
4248 } 4163 }
4249 else 4164 else
4250 pf = -1; 4165 pf = -1;
4251 } 4166 }
4252 4167
4253 if (pf < 0) 4168 if (pf < 0)
4254 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4169 Error_1 ("string->atom: bad base:", cadr (args));
4255 else if (*s == '#') /* no use of base! */ 4170 else if (*s == '#') /* no use of base! */
4256 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4171 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4257 else 4172 else
4258 { 4173 {
4259 if (pf == 0 || pf == 10) 4174 if (pf == 0 || pf == 10)
… …
4270 } 4185 }
4271 } 4186 }
4272 } 4187 }
4273 4188
4274 case OP_SYM2STR: /* symbol->string */ 4189 case OP_SYM2STR: /* symbol->string */
4275 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4190 x = mk_string (SCHEME_A_ symname (x));
4276 setimmutable (x); 4191 setimmutable (x);
4277 s_return (x); 4192 s_return (x);
4278 4193
4279 case OP_ATOM2STR: /* atom->string */ 4194 case OP_ATOM2STR: /* atom->string */
4280 { 4195 {
4281 long pf = 0; 4196 long pf = 0;
4282 4197
4283 x = car (SCHEME_V->args);
4284
4285 if (cdr (SCHEME_V->args) != NIL) 4198 if (cdr (args) != NIL)
4286 { 4199 {
4287 /* we know cadr(SCHEME_V->args) is a natural number */ 4200 /* we know cadr(args) is a natural number */
4288 /* see if it is 2, 8, 10, or 16, or error */ 4201 /* see if it is 2, 8, 10, or 16, or error */
4289 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4202 pf = ivalue_unchecked (cadr (args));
4290 4203
4291 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))
4292 { 4205 {
4293 /* base is OK */ 4206 /* base is OK */
4294 } 4207 }
4295 else 4208 else
4296 pf = -1; 4209 pf = -1;
4297 } 4210 }
4298 4211
4299 if (pf < 0) 4212 if (pf < 0)
4300 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4213 Error_1 ("atom->string: bad base:", cadr (args));
4301 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))
4302 { 4215 {
4303 char *p; 4216 char *p;
4304 int len; 4217 int len;
4305 4218
… …
4313 case OP_MKSTRING: /* make-string */ 4226 case OP_MKSTRING: /* make-string */
4314 { 4227 {
4315 int fill = ' '; 4228 int fill = ' ';
4316 int len; 4229 int len;
4317 4230
4318 len = ivalue (car (SCHEME_V->args)); 4231 len = ivalue (x);
4319 4232
4320 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4321 fill = charvalue (cadr (SCHEME_V->args)); 4234 fill = charvalue (cadr (args));
4322 4235
4323 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4236 s_return (mk_empty_string (SCHEME_A_ len, fill));
4324 } 4237 }
4325 4238
4326 case OP_STRLEN: /* string-length */ 4239 case OP_STRLEN: /* string-length */
4327 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4240 s_return (mk_integer (SCHEME_A_ strlength (x)));
4328 4241
4329 case OP_STRREF: /* string-ref */ 4242 case OP_STRREF: /* string-ref */
4330 { 4243 {
4331 char *str; 4244 char *str;
4332 int index; 4245 int index;
4333 4246
4334 str = strvalue (car (SCHEME_V->args)); 4247 str = strvalue (x);
4335 4248
4336 index = ivalue (cadr (SCHEME_V->args)); 4249 index = ivalue (cadr (args));
4337 4250
4338 if (index >= strlength (car (SCHEME_V->args))) 4251 if (index >= strlength (x))
4339 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4252 Error_1 ("string-ref: out of bounds:", cadr (args));
4340 4253
4341 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4342 } 4255 }
4343 4256
4344 case OP_STRSET: /* string-set! */ 4257 case OP_STRSET: /* string-set! */
4345 { 4258 {
4346 char *str; 4259 char *str;
4347 int index; 4260 int index;
4348 int c; 4261 int c;
4349 4262
4350 if (is_immutable (car (SCHEME_V->args))) 4263 if (is_immutable (x))
4351 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4264 Error_1 ("string-set!: unable to alter immutable string:", x);
4352 4265
4353 str = strvalue (car (SCHEME_V->args)); 4266 str = strvalue (x);
4354 4267
4355 index = ivalue (cadr (SCHEME_V->args)); 4268 index = ivalue (cadr (args));
4356 4269
4357 if (index >= strlength (car (SCHEME_V->args))) 4270 if (index >= strlength (x))
4358 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4271 Error_1 ("string-set!: out of bounds:", cadr (args));
4359 4272
4360 c = charvalue (caddr (SCHEME_V->args)); 4273 c = charvalue (caddr (args));
4361 4274
4362 str[index] = (char) c; 4275 str[index] = c;
4363 s_return (car (SCHEME_V->args)); 4276 s_return (car (args));
4364 } 4277 }
4365 4278
4366 case OP_STRAPPEND: /* string-append */ 4279 case OP_STRAPPEND: /* string-append */
4367 { 4280 {
4368 /* 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 */
4369 int len = 0; 4282 int len = 0;
4370 pointer newstr; 4283 pointer newstr;
4371 char *pos; 4284 char *pos;
4372 4285
4373 /* compute needed length for new string */ 4286 /* compute needed length for new string */
4374 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4287 for (x = args; x != NIL; x = cdr (x))
4375 len += strlength (car (x)); 4288 len += strlength (car (x));
4376 4289
4377 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4290 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4378 4291
4379 /* store the contents of the argument strings into the new string */ 4292 /* store the contents of the argument strings into the new string */
4380 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4293 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4294 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4295
4383 s_return (newstr); 4296 s_return (newstr);
4384 } 4297 }
4385 4298
… …
4388 char *str; 4301 char *str;
4389 int index0; 4302 int index0;
4390 int index1; 4303 int index1;
4391 int len; 4304 int len;
4392 4305
4393 str = strvalue (car (SCHEME_V->args)); 4306 str = strvalue (x);
4394 4307
4395 index0 = ivalue (cadr (SCHEME_V->args)); 4308 index0 = ivalue (cadr (args));
4396 4309
4397 if (index0 > strlength (car (SCHEME_V->args))) 4310 if (index0 > strlength (x))
4398 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4311 Error_1 ("substring: start out of bounds:", cadr (args));
4399 4312
4400 if (cddr (SCHEME_V->args) != NIL) 4313 if (cddr (args) != NIL)
4401 { 4314 {
4402 index1 = ivalue (caddr (SCHEME_V->args)); 4315 index1 = ivalue (caddr (args));
4403 4316
4404 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4317 if (index1 > strlength (x) || index1 < index0)
4405 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4318 Error_1 ("substring: end out of bounds:", caddr (args));
4406 } 4319 }
4407 else 4320 else
4408 index1 = strlength (car (SCHEME_V->args)); 4321 index1 = strlength (x);
4409 4322
4410 len = index1 - index0; 4323 len = index1 - index0;
4411 x = mk_empty_string (SCHEME_A_ len, ' '); 4324 x = mk_empty_string (SCHEME_A_ len, ' ');
4412 memcpy (strvalue (x), str + index0, len); 4325 memcpy (strvalue (x), str + index0, len);
4413 strvalue (x)[len] = 0; 4326 strvalue (x)[len] = 0;
… …
4417 4330
4418 case OP_VECTOR: /* vector */ 4331 case OP_VECTOR: /* vector */
4419 { 4332 {
4420 int i; 4333 int i;
4421 pointer vec; 4334 pointer vec;
4422 int len = list_length (SCHEME_A_ SCHEME_V->args); 4335 int len = list_length (SCHEME_A_ args);
4423 4336
4424 if (len < 0) 4337 if (len < 0)
4425 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4338 Error_1 ("vector: not a proper list:", args);
4426 4339
4427 vec = mk_vector (SCHEME_A_ len); 4340 vec = mk_vector (SCHEME_A_ len);
4428 4341
4429#if USE_ERROR_CHECKING 4342#if USE_ERROR_CHECKING
4430 if (SCHEME_V->no_memory) 4343 if (SCHEME_V->no_memory)
4431 s_return (S_SINK); 4344 s_return (S_SINK);
4432#endif 4345#endif
4433 4346
4434 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++)
4435 set_vector_elem (vec, i, car (x)); 4348 set_vector_elem (vec, i, car (x));
4436 4349
4437 s_return (vec); 4350 s_return (vec);
4438 } 4351 }
4439 4352
… …
4441 { 4354 {
4442 pointer fill = NIL; 4355 pointer fill = NIL;
4443 int len; 4356 int len;
4444 pointer vec; 4357 pointer vec;
4445 4358
4446 len = ivalue (car (SCHEME_V->args)); 4359 len = ivalue (x);
4447 4360
4448 if (cdr (SCHEME_V->args) != NIL) 4361 if (cdr (args) != NIL)
4449 fill = cadr (SCHEME_V->args); 4362 fill = cadr (args);
4450 4363
4451 vec = mk_vector (SCHEME_A_ len); 4364 vec = mk_vector (SCHEME_A_ len);
4452 4365
4453#if USE_ERROR_CHECKING 4366#if USE_ERROR_CHECKING
4454 if (SCHEME_V->no_memory) 4367 if (SCHEME_V->no_memory)
… …
4460 4373
4461 s_return (vec); 4374 s_return (vec);
4462 } 4375 }
4463 4376
4464 case OP_VECLEN: /* vector-length */ 4377 case OP_VECLEN: /* vector-length */
4465 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4378 s_return (mk_integer (SCHEME_A_ veclength (x)));
4466 4379
4467 case OP_VECREF: /* vector-ref */ 4380 case OP_VECREF: /* vector-ref */
4468 { 4381 {
4469 int index; 4382 int index;
4470 4383
4471 index = ivalue (cadr (SCHEME_V->args)); 4384 index = ivalue (cadr (args));
4472 4385
4473 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4474 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4387 Error_1 ("vector-ref: out of bounds:", cadr (args));
4475 4388
4476 s_return (vector_elem (car (SCHEME_V->args), index)); 4389 s_return (vector_elem (x, index));
4477 } 4390 }
4478 4391
4479 case OP_VECSET: /* vector-set! */ 4392 case OP_VECSET: /* vector-set! */
4480 { 4393 {
4481 int index; 4394 int index;
4482 4395
4483 if (is_immutable (car (SCHEME_V->args))) 4396 if (is_immutable (x))
4484 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4397 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4485 4398
4486 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4487 4400
4488 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4489 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-set!: out of bounds:", cadr (args));
4490 4403
4491 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4404 set_vector_elem (x, index, caddr (args));
4492 s_return (car (SCHEME_V->args)); 4405 s_return (x);
4493 } 4406 }
4494 } 4407 }
4495 4408
4496 return S_T; 4409 if (USE_ERROR_CHECKING) abort ();
4497} 4410}
4498 4411
4499INTERFACE int 4412INTERFACE int
4500is_list (SCHEME_P_ pointer a) 4413is_list (SCHEME_P_ pointer a)
4501{ 4414{
… …
4548 return -1; 4461 return -1;
4549 } 4462 }
4550 } 4463 }
4551} 4464}
4552 4465
4553static pointer 4466static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{
4469 pointer x = SCHEME_V->args;
4470
4471 for (;;)
4472 {
4473 num v = nvalue (car (x));
4474 x = cdr (x);
4475
4476 if (x == NIL)
4477 break;
4478
4479 int r = num_cmp (v, nvalue (car (x)));
4480
4481 switch (op)
4482 {
4483 case OP_NUMEQ: r = r == 0; break;
4484 case OP_LESS: r = r < 0; break;
4485 case OP_GRE: r = r > 0; break;
4486 case OP_LEQ: r = r <= 0; break;
4487 case OP_GEQ: r = r >= 0; break;
4488 }
4489
4490 if (!r)
4491 s_return (S_F);
4492 }
4493
4494 s_return (S_T);
4495}
4496
4497static int
4554opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4498opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4499{
4556 pointer x; 4500 pointer args = SCHEME_V->args;
4557 num v; 4501 pointer a = car (args);
4558 int (*comp_func) (num, num); 4502 pointer d = cdr (args);
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 s_retbool (is_false (car (SCHEME_V->args))); 4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4564 4517
4565 case OP_BOOLP: /* boolean? */
4566 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4567
4568 case OP_EOFOBJP: /* boolean? */
4569 s_retbool (car (SCHEME_V->args) == S_EOF);
4570
4571 case OP_NULLP: /* null? */
4572 s_retbool (car (SCHEME_V->args) == NIL);
4573
4574 case OP_NUMEQ: /* = */
4575 case OP_LESS: /* < */
4576 case OP_GRE: /* > */
4577 case OP_LEQ: /* <= */
4578 case OP_GEQ: /* >= */
4579 switch (op)
4580 {
4581 case OP_NUMEQ:
4582 comp_func = num_eq;
4583 break;
4584
4585 case OP_LESS:
4586 comp_func = num_lt;
4587 break;
4588
4589 case OP_GRE:
4590 comp_func = num_gt;
4591 break;
4592
4593 case OP_LEQ:
4594 comp_func = num_le;
4595 break;
4596
4597 case OP_GEQ:
4598 comp_func = num_ge;
4599 break;
4600 }
4601
4602 x = SCHEME_V->args;
4603 v = nvalue (car (x));
4604 x = cdr (x);
4605
4606 for (; x != NIL; x = cdr (x))
4607 {
4608 if (!comp_func (v, nvalue (car (x))))
4609 s_retbool (0);
4610
4611 v = nvalue (car (x));
4612 }
4613
4614 s_retbool (1);
4615
4616 case OP_SYMBOLP: /* symbol? */
4617 s_retbool (is_symbol (car (SCHEME_V->args)));
4618
4619 case OP_NUMBERP: /* number? */
4620 s_retbool (is_number (car (SCHEME_V->args)));
4621
4622 case OP_STRINGP: /* string? */
4623 s_retbool (is_string (car (SCHEME_V->args)));
4624
4625 case OP_INTEGERP: /* integer? */
4626 s_retbool (is_integer (car (SCHEME_V->args)));
4627
4628 case OP_REALP: /* real? */
4629 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4630
4631 case OP_CHARP: /* char? */
4632 s_retbool (is_character (car (SCHEME_V->args)));
4633#if USE_CHAR_CLASSIFIERS 4518#if USE_CHAR_CLASSIFIERS
4634
4635 case OP_CHARAP: /* char-alphabetic? */ 4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4636 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4637
4638 case OP_CHARNP: /* char-numeric? */
4639 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4640
4641 case OP_CHARWP: /* char-whitespace? */ 4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4642 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4643
4644 case OP_CHARUP: /* char-upper-case? */ 4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4645 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4646
4647 case OP_CHARLP: /* char-lower-case? */ 4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4648 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4649#endif 4524#endif
4525
4650#if USE_PORTS 4526#if USE_PORTS
4651 4527 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4652 case OP_PORTP: /* port? */
4653 s_retbool (is_port (car (SCHEME_V->args)));
4654
4655 case OP_INPORTP: /* input-port? */ 4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4656 s_retbool (is_inport (car (SCHEME_V->args)));
4657
4658 case OP_OUTPORTP: /* output-port? */ 4529 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4659 s_retbool (is_outport (car (SCHEME_V->args)));
4660#endif 4530#endif
4661 4531
4662 case OP_PROCP: /* procedure? */ 4532 case OP_PROCP: /* procedure? */
4663 4533
4664 /*-- 4534 /*--
4665 * continuation should be procedure by the example 4535 * continuation should be procedure by the example
4666 * (call-with-current-continuation procedure?) ==> #t 4536 * (call-with-current-continuation procedure?) ==> #t
4667 * in R^3 report sec. 6.9 4537 * in R^3 report sec. 6.9
4668 */ 4538 */
4669 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4539 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4670 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4540 break;
4671 4541
4672 case OP_PAIRP: /* pair? */ 4542 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4673 s_retbool (is_pair (car (SCHEME_V->args))); 4543 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4674 4544 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4675 case OP_LISTP: /* list? */ 4545 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4676 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4546 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4677 4547 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4678 case OP_ENVP: /* environment? */
4679 s_retbool (is_environment (car (SCHEME_V->args)));
4680
4681 case OP_VECTORP: /* vector? */
4682 s_retbool (is_vector (car (SCHEME_V->args)));
4683
4684 case OP_EQ: /* eq? */
4685 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4686
4687 case OP_EQV: /* eqv? */
4688 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4689 } 4548 }
4690 4549
4691 return S_T; 4550 s_retbool (r);
4692} 4551}
4693 4552
4694static pointer 4553static int
4695opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4554opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4696{ 4555{
4556 pointer args = SCHEME_V->args;
4557 pointer a = car (args);
4697 pointer x, y; 4558 pointer x, y;
4698 4559
4699 switch (op) 4560 switch (op)
4700 { 4561 {
4701 case OP_FORCE: /* force */ 4562 case OP_FORCE: /* force */
4702 SCHEME_V->code = car (SCHEME_V->args); 4563 SCHEME_V->code = a;
4703 4564
4704 if (is_promise (SCHEME_V->code)) 4565 if (is_promise (SCHEME_V->code))
4705 { 4566 {
4706 /* Should change type to closure here */ 4567 /* Should change type to closure here */
4707 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4568 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4728 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4589 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4729 SCHEME_V->outport = cadr (SCHEME_V->args); 4590 SCHEME_V->outport = cadr (SCHEME_V->args);
4730 } 4591 }
4731 } 4592 }
4732 4593
4733 SCHEME_V->args = car (SCHEME_V->args); 4594 SCHEME_V->args = a;
4734 4595
4735 if (op == OP_WRITE) 4596 if (op == OP_WRITE)
4736 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4737 else 4598 else
4738 SCHEME_V->print_flag = 0; 4599 SCHEME_V->print_flag = 0;
4739 4600
4740 s_goto (OP_P0LIST); 4601 s_goto (OP_P0LIST);
4741 4602
4742 case OP_NEWLINE: /* newline */ 4603 case OP_NEWLINE: /* newline */
4743 if (is_pair (SCHEME_V->args)) 4604 if (is_pair (args))
4744 { 4605 {
4745 if (car (SCHEME_V->args) != SCHEME_V->outport) 4606 if (a != SCHEME_V->outport)
4746 { 4607 {
4747 x = cons (SCHEME_V->outport, NIL); 4608 x = cons (SCHEME_V->outport, NIL);
4748 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4749 SCHEME_V->outport = car (SCHEME_V->args); 4610 SCHEME_V->outport = a;
4750 } 4611 }
4751 } 4612 }
4752 4613
4753 putstr (SCHEME_A_ "\n"); 4614 putstr (SCHEME_A_ "\n");
4754 s_return (S_T); 4615 s_return (S_T);
4755#endif 4616#endif
4756 4617
4757 case OP_ERR0: /* error */ 4618 case OP_ERR0: /* error */
4758 SCHEME_V->retcode = -1; 4619 SCHEME_V->retcode = -1;
4759 4620
4760 if (!is_string (car (SCHEME_V->args))) 4621 if (!is_string (a))
4761 { 4622 {
4762 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4623 args = cons (mk_string (SCHEME_A_ " -- "), args);
4763 setimmutable (car (SCHEME_V->args)); 4624 setimmutable (car (args));
4764 } 4625 }
4765 4626
4766 putstr (SCHEME_A_ "Error: "); 4627 putstr (SCHEME_A_ "Error: ");
4767 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4628 putstr (SCHEME_A_ strvalue (car (args)));
4768 SCHEME_V->args = cdr (SCHEME_V->args); 4629 SCHEME_V->args = cdr (args);
4769 s_goto (OP_ERR1); 4630 s_goto (OP_ERR1);
4770 4631
4771 case OP_ERR1: /* error */ 4632 case OP_ERR1: /* error */
4772 putstr (SCHEME_A_ " "); 4633 putstr (SCHEME_A_ " ");
4773 4634
4774 if (SCHEME_V->args != NIL) 4635 if (args != NIL)
4775 { 4636 {
4776 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4777 SCHEME_V->args = car (SCHEME_V->args); 4638 SCHEME_V->args = a;
4778 SCHEME_V->print_flag = 1; 4639 SCHEME_V->print_flag = 1;
4779 s_goto (OP_P0LIST); 4640 s_goto (OP_P0LIST);
4780 } 4641 }
4781 else 4642 else
4782 { 4643 {
4783 putstr (SCHEME_A_ "\n"); 4644 putstr (SCHEME_A_ "\n");
4784 4645
4785 if (SCHEME_V->interactive_repl) 4646 if (SCHEME_V->interactive_repl)
4786 s_goto (OP_T0LVL); 4647 s_goto (OP_T0LVL);
4787 else 4648 else
4788 return NIL; 4649 return -1;
4789 } 4650 }
4790 4651
4791 case OP_REVERSE: /* reverse */ 4652 case OP_REVERSE: /* reverse */
4792 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4653 s_return (reverse (SCHEME_A_ a));
4793 4654
4794 case OP_LIST_STAR: /* list* */ 4655 case OP_LIST_STAR: /* list* */
4795 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4656 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4796 4657
4797 case OP_APPEND: /* append */ 4658 case OP_APPEND: /* append */
4798 x = NIL; 4659 x = NIL;
4799 y = SCHEME_V->args; 4660 y = args;
4800 4661
4801 if (y == x) 4662 if (y == x)
4802 s_return (x); 4663 s_return (x);
4803 4664
4804 /* cdr() in the while condition is not a typo. If car() */ 4665 /* cdr() in the while condition is not a typo. If car() */
… …
4815 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4676 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4816 4677
4817#if USE_PLIST 4678#if USE_PLIST
4818 4679
4819 case OP_PUT: /* put */ 4680 case OP_PUT: /* put */
4820 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4681 if (!hasprop (a) || !hasprop (cadr (args)))
4821 Error_0 ("illegal use of put"); 4682 Error_0 ("illegal use of put");
4822 4683
4823 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))
4824 { 4685 {
4825 if (caar (x) == y) 4686 if (caar (x) == y)
4826 break; 4687 break;
4827 } 4688 }
4828 4689
4829 if (x != NIL) 4690 if (x != NIL)
4830 cdar (x) = caddr (SCHEME_V->args); 4691 cdar (x) = caddr (args);
4831 else 4692 else
4832 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));
4833 4694
4834 s_return (S_T); 4695 s_return (S_T);
4835 4696
4836 case OP_GET: /* get */ 4697 case OP_GET: /* get */
4837 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4838 Error_0 ("illegal use of get"); 4699 Error_0 ("illegal use of get");
4839 4700
4840 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))
4841 if (caar (x) == y) 4702 if (caar (x) == y)
4842 break; 4703 break;
4843 4704
4844 if (x != NIL) 4705 if (x != NIL)
4845 s_return (cdar (x)); 4706 s_return (cdar (x));
… …
4847 s_return (NIL); 4708 s_return (NIL);
4848 4709
4849#endif /* USE_PLIST */ 4710#endif /* USE_PLIST */
4850 4711
4851 case OP_QUIT: /* quit */ 4712 case OP_QUIT: /* quit */
4852 if (is_pair (SCHEME_V->args)) 4713 if (is_pair (args))
4853 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4714 SCHEME_V->retcode = ivalue (a);
4854 4715
4855 return NIL; 4716 return -1;
4856 4717
4857 case OP_GC: /* gc */ 4718 case OP_GC: /* gc */
4858 gc (SCHEME_A_ NIL, NIL); 4719 gc (SCHEME_A_ NIL, NIL);
4859 s_return (S_T); 4720 s_return (S_T);
4860 4721
4861 case OP_GCVERB: /* gc-verbose */ 4722 case OP_GCVERB: /* gc-verbose */
4862 { 4723 {
4863 int was = SCHEME_V->gc_verbose; 4724 int was = SCHEME_V->gc_verbose;
4864 4725
4865 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4726 SCHEME_V->gc_verbose = (a != S_F);
4866 s_retbool (was); 4727 s_retbool (was);
4867 } 4728 }
4868 4729
4869 case OP_NEWSEGMENT: /* new-segment */ 4730 case OP_NEWSEGMENT: /* new-segment */
4870 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4731 if (!is_pair (args) || !is_number (a))
4871 Error_0 ("new-segment: argument must be a number"); 4732 Error_0 ("new-segment: argument must be a number");
4872 4733
4873 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4874 4735
4875 s_return (S_T); 4736 s_return (S_T);
4876 4737
4877 case OP_OBLIST: /* oblist */ 4738 case OP_OBLIST: /* oblist */
4878 s_return (oblist_all_symbols (SCHEME_A)); 4739 s_return (oblist_all_symbols (SCHEME_A));
… …
4905 case OP_OPEN_INOUTFILE: 4766 case OP_OPEN_INOUTFILE:
4906 prop = port_input | port_output; 4767 prop = port_input | port_output;
4907 break; 4768 break;
4908 } 4769 }
4909 4770
4910 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4771 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4911 4772
4912 if (p == NIL) 4773 s_return (p == NIL ? S_F : p);
4913 s_return (S_F);
4914
4915 s_return (p);
4916 } 4774 }
4917 4775
4918# if USE_STRING_PORTS 4776# if USE_STRING_PORTS
4919 4777
4920 case OP_OPEN_INSTRING: /* open-input-string */ 4778 case OP_OPEN_INSTRING: /* open-input-string */
… …
4932 case OP_OPEN_INOUTSTRING: 4790 case OP_OPEN_INOUTSTRING:
4933 prop = port_input | port_output; 4791 prop = port_input | port_output;
4934 break; 4792 break;
4935 } 4793 }
4936 4794
4937 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4795 p = port_from_string (SCHEME_A_ strvalue (a),
4938 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4796 strvalue (a) + strlength (a), prop);
4939 4797
4940 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
4941 s_return (S_F);
4942
4943 s_return (p);
4944 } 4799 }
4945 4800
4946 case OP_OPEN_OUTSTRING: /* open-output-string */ 4801 case OP_OPEN_OUTSTRING: /* open-output-string */
4947 { 4802 {
4948 pointer p; 4803 pointer p;
4949 4804
4950 if (car (SCHEME_V->args) == NIL) 4805 if (a == NIL)
4951 {
4952 p = port_from_scratch (SCHEME_A); 4806 p = port_from_scratch (SCHEME_A);
4953
4954 if (p == NIL)
4955 s_return (S_F);
4956 }
4957 else 4807 else
4958 {
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4809 strvalue (a) + strlength (a), port_output);
4961 4810
4962 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964 }
4965
4966 s_return (p);
4967 } 4812 }
4968 4813
4969 case OP_GET_OUTSTRING: /* get-output-string */ 4814 case OP_GET_OUTSTRING: /* get-output-string */
4970 { 4815 {
4971 port *p; 4816 port *p;
4972 4817
4973 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4818 if ((p = a->object.port)->kind & port_string)
4974 { 4819 {
4975 off_t size; 4820 off_t size;
4976 char *str; 4821 char *str;
4977 4822
4978 size = p->rep.string.curr - p->rep.string.start + 1; 4823 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4994 } 4839 }
4995 4840
4996# endif 4841# endif
4997 4842
4998 case OP_CLOSE_INPORT: /* close-input-port */ 4843 case OP_CLOSE_INPORT: /* close-input-port */
4999 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4844 port_close (SCHEME_A_ a, port_input);
5000 s_return (S_T); 4845 s_return (S_T);
5001 4846
5002 case OP_CLOSE_OUTPORT: /* close-output-port */ 4847 case OP_CLOSE_OUTPORT: /* close-output-port */
5003 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4848 port_close (SCHEME_A_ a, port_output);
5004 s_return (S_T); 4849 s_return (S_T);
5005#endif 4850#endif
5006 4851
5007 case OP_INT_ENV: /* interaction-environment */ 4852 case OP_INT_ENV: /* interaction-environment */
5008 s_return (SCHEME_V->global_env); 4853 s_return (SCHEME_V->global_env);
… …
5010 case OP_CURR_ENV: /* current-environment */ 4855 case OP_CURR_ENV: /* current-environment */
5011 s_return (SCHEME_V->envir); 4856 s_return (SCHEME_V->envir);
5012 4857
5013 } 4858 }
5014 4859
5015 return S_T; 4860 if (USE_ERROR_CHECKING) abort ();
5016} 4861}
5017 4862
5018static pointer 4863static int
5019opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4864opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5020{ 4865{
4866 pointer args = SCHEME_V->args;
5021 pointer x; 4867 pointer x;
5022 4868
5023 if (SCHEME_V->nesting != 0) 4869 if (SCHEME_V->nesting != 0)
5024 { 4870 {
5025 int n = SCHEME_V->nesting; 4871 int n = SCHEME_V->nesting;
… …
5032 switch (op) 4878 switch (op)
5033 { 4879 {
5034 /* ========== reading part ========== */ 4880 /* ========== reading part ========== */
5035#if USE_PORTS 4881#if USE_PORTS
5036 case OP_READ: 4882 case OP_READ:
5037 if (!is_pair (SCHEME_V->args)) 4883 if (!is_pair (args))
5038 s_goto (OP_READ_INTERNAL); 4884 s_goto (OP_READ_INTERNAL);
5039 4885
5040 if (!is_inport (car (SCHEME_V->args))) 4886 if (!is_inport (car (args)))
5041 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4887 Error_1 ("read: not an input port:", car (args));
5042 4888
5043 if (car (SCHEME_V->args) == SCHEME_V->inport) 4889 if (car (args) == SCHEME_V->inport)
5044 s_goto (OP_READ_INTERNAL); 4890 s_goto (OP_READ_INTERNAL);
5045 4891
5046 x = SCHEME_V->inport; 4892 x = SCHEME_V->inport;
5047 SCHEME_V->inport = car (SCHEME_V->args); 4893 SCHEME_V->inport = car (args);
5048 x = cons (x, NIL); 4894 x = cons (x, NIL);
5049 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4895 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5050 s_goto (OP_READ_INTERNAL); 4896 s_goto (OP_READ_INTERNAL);
5051 4897
5052 case OP_READ_CHAR: /* read-char */ 4898 case OP_READ_CHAR: /* read-char */
5053 case OP_PEEK_CHAR: /* peek-char */ 4899 case OP_PEEK_CHAR: /* peek-char */
5054 { 4900 {
5055 int c; 4901 int c;
5056 4902
5057 if (is_pair (SCHEME_V->args)) 4903 if (is_pair (args))
5058 { 4904 {
5059 if (car (SCHEME_V->args) != SCHEME_V->inport) 4905 if (car (args) != SCHEME_V->inport)
5060 { 4906 {
5061 x = SCHEME_V->inport; 4907 x = SCHEME_V->inport;
5062 x = cons (x, NIL); 4908 x = cons (x, NIL);
5063 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4909 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5064 SCHEME_V->inport = car (SCHEME_V->args); 4910 SCHEME_V->inport = car (args);
5065 } 4911 }
5066 } 4912 }
5067 4913
5068 c = inchar (SCHEME_A); 4914 c = inchar (SCHEME_A);
5069 4915
… …
5079 case OP_CHAR_READY: /* char-ready? */ 4925 case OP_CHAR_READY: /* char-ready? */
5080 { 4926 {
5081 pointer p = SCHEME_V->inport; 4927 pointer p = SCHEME_V->inport;
5082 int res; 4928 int res;
5083 4929
5084 if (is_pair (SCHEME_V->args)) 4930 if (is_pair (args))
5085 p = car (SCHEME_V->args); 4931 p = car (args);
5086 4932
5087 res = p->object.port->kind & port_string; 4933 res = p->object.port->kind & port_string;
5088 4934
5089 s_retbool (res); 4935 s_retbool (res);
5090 } 4936 }
5091 4937
5092 case OP_SET_INPORT: /* set-input-port */ 4938 case OP_SET_INPORT: /* set-input-port */
5093 SCHEME_V->inport = car (SCHEME_V->args); 4939 SCHEME_V->inport = car (args);
5094 s_return (SCHEME_V->value); 4940 s_return (SCHEME_V->value);
5095 4941
5096 case OP_SET_OUTPORT: /* set-output-port */ 4942 case OP_SET_OUTPORT: /* set-output-port */
5097 SCHEME_V->outport = car (SCHEME_V->args); 4943 SCHEME_V->outport = car (args);
5098 s_return (SCHEME_V->value); 4944 s_return (SCHEME_V->value);
5099#endif 4945#endif
5100 4946
5101 case OP_RDSEXPR: 4947 case OP_RDSEXPR:
5102 switch (SCHEME_V->tok) 4948 switch (SCHEME_V->tok)
… …
5188 } 5034 }
5189 5035
5190 break; 5036 break;
5191 5037
5192 case OP_RDLIST: 5038 case OP_RDLIST:
5193 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5039 SCHEME_V->args = cons (SCHEME_V->value, args);
5194 SCHEME_V->tok = token (SCHEME_A); 5040 SCHEME_V->tok = token (SCHEME_A);
5195 5041
5196 switch (SCHEME_V->tok) 5042 switch (SCHEME_V->tok)
5197 { 5043 {
5198 case TOK_EOF: 5044 case TOK_EOF:
… …
5226 case OP_RDDOT: 5072 case OP_RDDOT:
5227 if (token (SCHEME_A) != TOK_RPAREN) 5073 if (token (SCHEME_A) != TOK_RPAREN)
5228 Error_0 ("syntax error: illegal dot expression"); 5074 Error_0 ("syntax error: illegal dot expression");
5229 5075
5230 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5076 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5231 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));
5232 5078
5233 case OP_RDQUOTE: 5079 case OP_RDQUOTE:
5234 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5080 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5235 5081
5236 case OP_RDQQUOTE: 5082 case OP_RDQQUOTE:
… …
5258 SCHEME_V->args = SCHEME_V->value; 5104 SCHEME_V->args = SCHEME_V->value;
5259 s_goto (OP_VECTOR); 5105 s_goto (OP_VECTOR);
5260 5106
5261 /* ========== printing part ========== */ 5107 /* ========== printing part ========== */
5262 case OP_P0LIST: 5108 case OP_P0LIST:
5263 if (is_vector (SCHEME_V->args)) 5109 if (is_vector (args))
5264 { 5110 {
5265 putstr (SCHEME_A_ "#("); 5111 putstr (SCHEME_A_ "#(");
5266 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5112 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5267 s_goto (OP_PVECFROM); 5113 s_goto (OP_PVECFROM);
5268 } 5114 }
5269 else if (is_environment (SCHEME_V->args)) 5115 else if (is_environment (args))
5270 { 5116 {
5271 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5117 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5272 s_return (S_T); 5118 s_return (S_T);
5273 } 5119 }
5274 else if (!is_pair (SCHEME_V->args)) 5120 else if (!is_pair (args))
5275 { 5121 {
5276 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5122 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5277 s_return (S_T); 5123 s_return (S_T);
5278 } 5124 }
5279 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5125 else
5280 { 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)
5281 putstr (SCHEME_A_ "'"); 5133 putstr (SCHEME_A_ "'");
5282 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
5283 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5284 } 5148 }
5285 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))
5286 { 5152 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5287 putstr (SCHEME_A_ "`"); 5154 putstr (SCHEME_A_ " ");
5288 SCHEME_V->args = cadr (SCHEME_V->args); 5155 SCHEME_V->args = car (args);
5289 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5290 } 5157 }
5291 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5292 {
5293 putstr (SCHEME_A_ ",");
5294 SCHEME_V->args = cadr (SCHEME_V->args);
5295 s_goto (OP_P0LIST);
5296 }
5297 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5298 {
5299 putstr (SCHEME_A_ ",@");
5300 SCHEME_V->args = cadr (SCHEME_V->args);
5301 s_goto (OP_P0LIST);
5302 }
5303 else
5304 {
5305 putstr (SCHEME_A_ "(");
5306 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5307 SCHEME_V->args = car (SCHEME_V->args);
5308 s_goto (OP_P0LIST);
5309 }
5310
5311 case OP_P1LIST:
5312 if (is_pair (SCHEME_V->args))
5313 {
5314 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5315 putstr (SCHEME_A_ " ");
5316 SCHEME_V->args = car (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (is_vector (SCHEME_V->args)) 5158 else if (is_vector (args))
5320 { 5159 {
5321 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5160 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5322 putstr (SCHEME_A_ " . "); 5161 putstr (SCHEME_A_ " . ");
5323 s_goto (OP_P0LIST); 5162 s_goto (OP_P0LIST);
5324 } 5163 }
5325 else 5164 else
5326 { 5165 {
5327 if (SCHEME_V->args != NIL) 5166 if (args != NIL)
5328 { 5167 {
5329 putstr (SCHEME_A_ " . "); 5168 putstr (SCHEME_A_ " . ");
5330 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5331 } 5170 }
5332 5171
5333 putstr (SCHEME_A_ ")"); 5172 putstr (SCHEME_A_ ")");
5334 s_return (S_T); 5173 s_return (S_T);
5335 } 5174 }
5336 5175
5337 case OP_PVECFROM: 5176 case OP_PVECFROM:
5338 { 5177 {
5339 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5178 int i = ivalue_unchecked (cdr (args));
5340 pointer vec = car (SCHEME_V->args); 5179 pointer vec = car (args);
5341 int len = veclength (vec); 5180 int len = veclength (vec);
5342 5181
5343 if (i == len) 5182 if (i == len)
5344 { 5183 {
5345 putstr (SCHEME_A_ ")"); 5184 putstr (SCHEME_A_ ")");
… …
5347 } 5186 }
5348 else 5187 else
5349 { 5188 {
5350 pointer elem = vector_elem (vec, i); 5189 pointer elem = vector_elem (vec, i);
5351 5190
5352 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5191 ivalue_unchecked (cdr (args)) = i + 1;
5353 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5354 SCHEME_V->args = elem; 5193 SCHEME_V->args = elem;
5355 5194
5356 if (i > 0) 5195 if (i > 0)
5357 putstr (SCHEME_A_ " "); 5196 putstr (SCHEME_A_ " ");
5358 5197
5359 s_goto (OP_P0LIST); 5198 s_goto (OP_P0LIST);
5360 } 5199 }
5361 } 5200 }
5362 } 5201 }
5363 5202
5364 return S_T; 5203 if (USE_ERROR_CHECKING) abort ();
5365} 5204}
5366 5205
5367static pointer 5206static int
5368opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5207opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5369{ 5208{
5209 pointer args = SCHEME_V->args;
5210 pointer a = car (args);
5370 pointer x, y; 5211 pointer x, y;
5371 5212
5372 switch (op) 5213 switch (op)
5373 { 5214 {
5374 case OP_LIST_LENGTH: /* length *//* a.k */ 5215 case OP_LIST_LENGTH: /* length *//* a.k */
5375 { 5216 {
5376 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5217 long v = list_length (SCHEME_A_ a);
5377 5218
5378 if (v < 0) 5219 if (v < 0)
5379 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5220 Error_1 ("length: not a list:", a);
5380 5221
5381 s_return (mk_integer (SCHEME_A_ v)); 5222 s_return (mk_integer (SCHEME_A_ v));
5382 } 5223 }
5383 5224
5384 case OP_ASSQ: /* assq *//* a.k */ 5225 case OP_ASSQ: /* assq *//* a.k */
5385 x = car (SCHEME_V->args); 5226 x = a;
5386 5227
5387 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5228 for (y = cadr (args); is_pair (y); y = cdr (y))
5388 { 5229 {
5389 if (!is_pair (car (y))) 5230 if (!is_pair (car (y)))
5390 Error_0 ("unable to handle non pair element"); 5231 Error_0 ("unable to handle non pair element");
5391 5232
5392 if (x == caar (y)) 5233 if (x == caar (y))
… …
5398 else 5239 else
5399 s_return (S_F); 5240 s_return (S_F);
5400 5241
5401 5242
5402 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5243 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5403 SCHEME_V->args = car (SCHEME_V->args); 5244 SCHEME_V->args = a;
5404 5245
5405 if (SCHEME_V->args == NIL) 5246 if (SCHEME_V->args == NIL)
5406 s_return (S_F); 5247 s_return (S_F);
5407 else if (is_closure (SCHEME_V->args)) 5248 else if (is_closure (SCHEME_V->args))
5408 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5414 case OP_CLOSUREP: /* closure? */ 5255 case OP_CLOSUREP: /* closure? */
5415 /* 5256 /*
5416 * Note, macro object is also a closure. 5257 * Note, macro object is also a closure.
5417 * Therefore, (closure? <#MACRO>) ==> #t 5258 * Therefore, (closure? <#MACRO>) ==> #t
5418 */ 5259 */
5419 s_retbool (is_closure (car (SCHEME_V->args))); 5260 s_retbool (is_closure (a));
5420 5261
5421 case OP_MACROP: /* macro? */ 5262 case OP_MACROP: /* macro? */
5422 s_retbool (is_macro (car (SCHEME_V->args))); 5263 s_retbool (is_macro (a));
5423 } 5264 }
5424 5265
5425 return S_T; /* NOTREACHED */ 5266 if (USE_ERROR_CHECKING) abort ();
5426} 5267}
5427 5268
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5428typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5429 5271
5430typedef int (*test_predicate) (pointer); 5272typedef int (*test_predicate)(pointer);
5431static int 5273static int
5432is_any (pointer p) 5274is_any (pointer p)
5433{ 5275{
5434 return 1; 5276 return 1;
5435} 5277}
5436 5278
5437static int 5279static int
5438is_nonneg (pointer p) 5280is_nonneg (pointer p)
5439{ 5281{
5440 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);
5441} 5289}
5442 5290
5443/* Correspond carefully with following defines! */ 5291/* Correspond carefully with following defines! */
5444static struct 5292static struct
5445{ 5293{
5446 test_predicate fct; 5294 test_predicate fct;
5447 const char *kind; 5295 const char *kind;
5448} tests[] = 5296} tests[] =
5449{ 5297{
5450 { 0, 0}, /* unused */ 5298 { is_any, 0 },
5451 { is_any, 0}, 5299 { is_string, "string" },
5452 { is_string, "string" }, 5300 { is_symbol, "symbol" },
5453 { is_symbol, "symbol" }, 5301 { is_port, "port" },
5454 { is_port, "port" },
5455 { is_inport, "input port" }, 5302 { is_inport, "input port" },
5456 { is_outport, "output port" }, 5303 { is_outport, "output port" },
5457 { is_environment, "environment" }, 5304 { is_environment, "environment" },
5458 { is_pair, "pair" }, 5305 { is_pair, "pair" },
5459 { 0, "pair or '()" }, 5306 { tst_is_list, "pair or '()" },
5460 { is_character, "character" }, 5307 { is_character, "character" },
5461 { is_vector, "vector" }, 5308 { is_vector, "vector" },
5462 { is_number, "number" }, 5309 { is_number, "number" },
5463 { is_integer, "integer" }, 5310 { is_integer, "integer" },
5464 { is_nonneg, "non-negative integer" } 5311 { is_nonneg, "non-negative integer" }
5465}; 5312};
5466 5313
5467#define TST_NONE 0 5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5468#define TST_ANY "\001" 5315#define TST_ANY "\001"
5469#define TST_STRING "\002" 5316#define TST_STRING "\002"
5470#define TST_SYMBOL "\003" 5317#define TST_SYMBOL "\003"
5471#define TST_PORT "\004" 5318#define TST_PORT "\004"
5472#define TST_INPORT "\005" 5319#define TST_INPORT "\005"
5473#define TST_OUTPORT "\006" 5320#define TST_OUTPORT "\006"
5474#define TST_ENVIRONMENT "\007" 5321#define TST_ENVIRONMENT "\007"
5475#define TST_PAIR "\010" 5322#define TST_PAIR "\010"
5476#define TST_LIST "\011" 5323#define TST_LIST "\011"
5477#define TST_CHAR "\012" 5324#define TST_CHAR "\012"
5478#define TST_VECTOR "\013" 5325#define TST_VECTOR "\013"
5479#define TST_NUMBER "\014" 5326#define TST_NUMBER "\014"
5480#define TST_INTEGER "\015" 5327#define TST_INTEGER "\015"
5481#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}
5482 5356
5483typedef struct 5357typedef struct
5484{ 5358{
5485 dispatch_func func; 5359 uint8_t func;
5486 char *name; 5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin;
5487 int min_arity; 5362 uint8_t min_arity;
5488 int max_arity; 5363 uint8_t max_arity;
5489 char *arg_tests_encoding; 5364 char arg_tests_encoding[3];
5490} op_code_info; 5365} op_code_info;
5491 5366
5492#define INF_ARG 0xffff
5493
5494static op_code_info dispatch_table[] = { 5367static const op_code_info dispatch_table[] = {
5495#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 },
5496#include "opdefines.h" 5369#include "opdefines.h"
5370#undef OP_DEF
5497 {0} 5371 {0}
5498}; 5372};
5499 5373
5500static const char *
5501procname (pointer x)
5502{
5503 int n = procnum (x);
5504 const char *name = dispatch_table[n].name;
5505
5506 if (name == 0)
5507 name = "ILLEGAL!";
5508
5509 return name;
5510}
5511
5512/* kernel of this interpreter */ 5374/* kernel of this interpreter */
5513static void 5375static void ecb_hot
5514Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5515{ 5377{
5516 SCHEME_V->op = op; 5378 SCHEME_V->op = op;
5517 5379
5518 for (;;) 5380 for (;;)
5519 { 5381 {
5520 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5382 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5521 5383
5522#if USE_ERROR_CHECKING 5384#if USE_ERROR_CHECKING
5523 if (pcd->name) /* if built-in function, check arguments */ 5385 if (pcd->builtin) /* if built-in function, check arguments */
5524 { 5386 {
5525 int ok = 1;
5526 char msg[STRBUFFSIZE]; 5387 char msg[STRBUFFSIZE];
5527 int n = list_length (SCHEME_A_ SCHEME_V->args); 5388 int n = list_length (SCHEME_A_ SCHEME_V->args);
5528 5389
5529 /* Check number of arguments */ 5390 /* Check number of arguments */
5530 if (ecb_expect_false (n < pcd->min_arity)) 5391 if (ecb_expect_false (n < pcd->min_arity))
5531 { 5392 {
5532 ok = 0;
5533 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5393 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5534 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;
5535 } 5397 }
5536 else if (ecb_excpect_false (n > pcd->max_arity)) 5398 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5537 { 5399 {
5538 ok = 0;
5539 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5400 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5540 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;
5541 } 5404 }
5542 5405 else
5543 if (ecb_expect_false (ok))
5544 { 5406 {
5545 if (pcd->arg_tests_encoding) 5407 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5546 { 5408 {
5547 int i = 0; 5409 int i = 0;
5548 int j; 5410 int j;
5549 const char *t = pcd->arg_tests_encoding; 5411 const char *t = pcd->arg_tests_encoding;
5550 pointer arglist = SCHEME_V->args; 5412 pointer arglist = SCHEME_V->args;
5551 5413
5552 do 5414 do
5553 { 5415 {
5554 pointer arg = car (arglist); 5416 pointer arg = car (arglist);
5555 5417
5556 j = (int) t[0]; 5418 j = t[0];
5557 5419
5558 if (j == TST_LIST[0]) 5420 if (!tests[j - 1].fct (arg))
5559 {
5560 if (arg != NIL && !is_pair (arg))
5561 break; 5421 break;
5562 }
5563 else
5564 {
5565 if (!tests[j].fct (arg))
5566 break;
5567 }
5568 5422
5569 if (t[1] != 0) /* last test is replicated as necessary */ 5423 if (t[1]) /* last test is replicated as necessary */
5570 t++; 5424 t++;
5571 5425
5572 arglist = cdr (arglist); 5426 arglist = cdr (arglist);
5573 i++; 5427 i++;
5574 } 5428 }
5575 while (i < n); 5429 while (i < n);
5576 5430
5577 if (i < n) 5431 if (i < n)
5578 { 5432 {
5579 ok = 0;
5580 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;
5581 } 5436 }
5582 } 5437 }
5583 } 5438 }
5584
5585 if (!ok)
5586 {
5587 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5588 return;
5589
5590 pcd = dispatch_table + SCHEME_V->op;
5591 }
5592 } 5439 }
5593#endif 5440#endif
5594 5441
5595 ok_to_freely_gc (SCHEME_A); 5442 ok_to_freely_gc (SCHEME_A);
5596 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
5597 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))
5598 return; 5455 return;
5599 5456
5600 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5601 { 5458 {
5602 xwrstr ("No memory!\n"); 5459 xwrstr ("No memory!\n");
… …
5701 return OP_C0STREAM; /* cons-stream */ 5558 return OP_C0STREAM; /* cons-stream */
5702 } 5559 }
5703} 5560}
5704 5561
5705#if USE_MULTIPLICITY 5562#if USE_MULTIPLICITY
5706scheme * 5563ecb_cold scheme *
5707scheme_init_new () 5564scheme_init_new ()
5708{ 5565{
5709 scheme *sc = malloc (sizeof (scheme)); 5566 scheme *sc = malloc (sizeof (scheme));
5710 5567
5711 if (!scheme_init (SCHEME_A)) 5568 if (!scheme_init (SCHEME_A))
… …
5716 else 5573 else
5717 return sc; 5574 return sc;
5718} 5575}
5719#endif 5576#endif
5720 5577
5721int 5578ecb_cold int
5722scheme_init (SCHEME_P) 5579scheme_init (SCHEME_P)
5723{ 5580{
5724 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5725 pointer x; 5582 pointer x;
5726 5583
… …
5799 5656
5800 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5657 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5801 assign_syntax (SCHEME_A_ syntax_names[i]); 5658 assign_syntax (SCHEME_A_ syntax_names[i]);
5802 } 5659 }
5803 5660
5661 // TODO: should iterate via strlen, to avoid n² complexity
5804 for (i = 0; i < n; i++) 5662 for (i = 0; i < n; i++)
5805 if (dispatch_table[i].name != 0) 5663 if (dispatch_table[i].builtin)
5806 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5664 assign_proc (SCHEME_A_ i, opname (i));
5807 5665
5808 /* initialization of global pointers to special symbols */ 5666 /* initialization of global pointers to special symbols */
5809 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5667 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5810 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5668 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5811 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5669 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5850scheme_set_external_data (SCHEME_P_ void *p) 5708scheme_set_external_data (SCHEME_P_ void *p)
5851{ 5709{
5852 SCHEME_V->ext_data = p; 5710 SCHEME_V->ext_data = p;
5853} 5711}
5854 5712
5855void 5713ecb_cold void
5856scheme_deinit (SCHEME_P) 5714scheme_deinit (SCHEME_P)
5857{ 5715{
5858 int i; 5716 int i;
5859 5717
5860#if SHOW_ERROR_LINE 5718#if SHOW_ERROR_LINE
… …
5952{ 5810{
5953 dump_stack_reset (SCHEME_A); 5811 dump_stack_reset (SCHEME_A);
5954 SCHEME_V->envir = SCHEME_V->global_env; 5812 SCHEME_V->envir = SCHEME_V->global_env;
5955 SCHEME_V->file_i = 0; 5813 SCHEME_V->file_i = 0;
5956 SCHEME_V->load_stack[0].kind = port_input | port_string; 5814 SCHEME_V->load_stack[0].kind = port_input | port_string;
5957 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5815 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5958 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5816 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5959 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5960#if USE_PORTS 5818#if USE_PORTS
5961 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5962#endif 5820#endif
5963 SCHEME_V->retcode = 0; 5821 SCHEME_V->retcode = 0;
5964 SCHEME_V->interactive_repl = 0; 5822 SCHEME_V->interactive_repl = 0;

Diff Legend

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