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

Diff Legend

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