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

Comparing microscheme/scheme.c (file contents):
Revision 1.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.22 by root, Thu Nov 26 23:26:00 2015 UTC

… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 67#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 68#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 69
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#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79
70#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
71static scheme sc; 81static scheme sc;
72#endif 82#endif
73 83
74static void 84static void
… …
201#define T_SYNTAX 0x0010 211#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 212#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
205 215
206static num num_add (num a, num b); 216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
207static num num_mul (num a, num b); 217
208static num num_div (num a, num b); 218static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 220static num num_rem (num a, num b);
212static num num_mod (num a, num b); 221static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 222
219#if USE_MATH 223#if USE_MATH
220static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
221#endif 225#endif
222static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
243 247
244#define strvalue(p) ((p)->object.string.svalue) 248#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 249#define strlength(p) ((p)->object.string.length)
246 250
247INTERFACE int is_list (SCHEME_P_ pointer p); 251INTERFACE int is_list (SCHEME_P_ pointer p);
252
248INTERFACE INLINE int 253INTERFACE INLINE int
249is_vector (pointer p) 254is_vector (pointer p)
250{ 255{
251 return type (p) == T_VECTOR; 256 return type (p) == T_VECTOR;
252} 257}
… …
369{ 374{
370 return type (p) == T_PAIR; 375 return type (p) == T_PAIR;
371} 376}
372 377
373#define car(p) ((p)->object.cons.car + 0) 378#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 379#define cdr(p) ((p)->object.cons.cdr + 0)
375 380
376#define caar(p) car (car (p)) 381static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 382static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 383static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 384static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 385
381#define cadar(p) car (cdr (car (p))) 386static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 387static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 388static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 389
385INTERFACE void 390INTERFACE void
386set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
387{ 392{
388 p->object.cons.car = q; 393 p->object.cons.car = q;
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 667static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 668static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 669static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 670static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 671static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 672static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
673static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 674static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 675static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 676static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 677static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 678static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 679static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 680static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 681static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 682static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 683
678static num 684static num
679num_add (num a, num b) 685num_op (enum num_op op, num a, num b)
680{ 686{
681 num ret; 687 num ret;
682 688
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 689 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 690
685 if (num_is_fixnum (ret)) 691 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 692 {
693 IVALUE av = num_get_ivalue (a);
694 IVALUE bv = num_get_ivalue (b);
695
696 switch (op)
697 {
698 case NUM_ADD: av += bv; break;
699 case NUM_SUB: av -= bv; break;
700 case NUM_MUL: av *= bv; break;
701 case NUM_INTDIV: av /= bv; break;
702 }
703
704 num_set_ivalue (ret, av);
705 }
687 else 706 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 707 {
708 RVALUE av = num_get_rvalue (a);
709 RVALUE bv = num_get_rvalue (b);
689 710
690 return ret; 711 switch (op)
691} 712 {
713 case NUM_ADD: av += bv; break;
714 case NUM_SUB: av -= bv; break;
715 case NUM_MUL: av *= bv; break;
716 case NUM_INTDIV: av /= bv; break;
717 }
692 718
693static num 719 num_set_rvalue (ret, av);
694num_mul (num a, num b) 720 }
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 721
705 return ret; 722 return ret;
706} 723}
707 724
708static num 725static num
… …
719 736
720 return ret; 737 return ret;
721} 738}
722 739
723static num 740static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749
750 return ret;
751}
752
753static num
754num_rem (num a, num b) 741num_rem (num a, num b)
755{ 742{
756 num ret; 743 num ret;
757 long e1, e2, res; 744 long e1, e2, res;
758 745
… …
794 781
795 num_set_ivalue (ret, res); 782 num_set_ivalue (ret, res);
796 return ret; 783 return ret;
797} 784}
798 785
786/* this completely disrespects NaNs */
799static int 787static int
800num_eq (num a, num b) 788num_cmp (num a, num b)
801{ 789{
790 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 791 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 792
805 if (is_fixnum) 793 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 794 {
795 IVALUE av = num_get_ivalue (a);
796 IVALUE bv = num_get_ivalue (b);
797
798 ret = av == bv ? 0 : av < bv ? -1 : +1;
799 }
807 else 800 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 801 {
802 RVALUE av = num_get_rvalue (a);
803 RVALUE bv = num_get_rvalue (b);
804
805 ret = av == bv ? 0 : av < bv ? -1 : +1;
806 }
809 807
810 return ret; 808 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 809}
853 810
854#if USE_MATH 811#if USE_MATH
855 812
856/* Round to nearest. Round to even if midway */ 813/* Round to nearest. Round to even if midway */
… …
866 return ce; 823 return ce;
867 else if (dfl < dce) 824 else if (dfl < dce)
868 return fl; 825 return fl;
869 else 826 else
870 { 827 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 828 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 829 return fl;
873 else 830 else
874 return ce; 831 return ce;
875 } 832 }
876} 833}
… …
965 922
966/* get new cell. parameter a, b is marked by gc. */ 923/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 924static INLINE pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 925get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 926{
970 if (SCHEME_V->free_cell == NIL) 927 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 928 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 930 return S_SINK;
974 931
975 if (SCHEME_V->free_cell == NIL) 932 if (SCHEME_V->free_cell == NIL)
… …
1481 1438
1482/* make constant */ 1439/* make constant */
1483static pointer 1440static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1441mk_sharp_const (SCHEME_P_ char *name)
1485{ 1442{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1443 if (!strcmp (name, "t"))
1490 return S_T; 1444 return S_T;
1491 else if (!strcmp (name, "f")) 1445 else if (!strcmp (name, "f"))
1492 return S_F; 1446 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1447 else if (*name == '\\') /* #\w (character) */
1494 { 1448 {
1495 int c = 0; 1449 int c;
1496 1450
1497 if (stricmp (name + 1, "space") == 0) 1451 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1452 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1453 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1454 c = '\n';
… …
1502 c = '\r'; 1456 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1457 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1458 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1459 else if (name[1] == 'x' && name[2] != 0)
1506 { 1460 {
1507 int c1 = strtol (name + 2, 0, 16); 1461 long c1 = strtol (name + 2, 0, 16);
1508 1462
1509 if (c1 <= UCHAR_MAX) 1463 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1464 c = c1;
1511 else 1465 else
1512 return NIL; 1466 return NIL;
1513 1467 }
1514#if USE_ASCII_NAMES 1468#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1469 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1470 /* nothing */;
1519#endif 1471#endif
1520 }
1521 else if (name[2] == 0) 1472 else if (name[2] == 0)
1522 c = name[1]; 1473 c = name[1];
1523 else 1474 else
1524 return NIL; 1475 return NIL;
1525 1476
… …
1542 1493
1543/*-- 1494/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1495 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1497 * for marking.
1498 *
1499 * The exception is vectors - vectors are currently marked recursively,
1500 * which is inherited form tinyscheme and could be fixed by having another
1501 * word of context in the vector
1547 */ 1502 */
1548static void 1503static void
1549mark (pointer a) 1504mark (pointer a)
1550{ 1505{
1551 pointer t, q, p; 1506 pointer t, q, p;
… …
1553 t = 0; 1508 t = 0;
1554 p = a; 1509 p = a;
1555E2: 1510E2:
1556 setmark (p); 1511 setmark (p);
1557 1512
1558 if (is_vector (p)) 1513 if (ecb_expect_false (is_vector (p)))
1559 { 1514 {
1560 int i; 1515 int i;
1561 1516
1562 for (i = 0; i < p->object.vector.length; i++) 1517 for (i = 0; i < p->object.vector.length; i++)
1563 mark (vecvalue (p)[i]); 1518 mark (vecvalue (p)[i]);
… …
1686} 1641}
1687 1642
1688static void 1643static void
1689finalize_cell (SCHEME_P_ pointer a) 1644finalize_cell (SCHEME_P_ pointer a)
1690{ 1645{
1646 /* TODO, fast bitmap check? */
1691 if (is_string (a)) 1647 if (is_string (a))
1692 free (strvalue (a)); 1648 free (strvalue (a));
1693 else if (is_vector (a)) 1649 else if (is_vector (a))
1694 free (vecvalue (a)); 1650 free (vecvalue (a));
1695#if USE_PORTS 1651#if USE_PORTS
… …
2790 } 2746 }
2791 else if (is_number (a)) 2747 else if (is_number (a))
2792 { 2748 {
2793 if (is_number (b)) 2749 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b)) 2750 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2751 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2752
2797 return 0; 2753 return 0;
2798 } 2754 }
2799 else if (is_character (a)) 2755 else if (is_character (a))
2800 { 2756 {
… …
2976 return cdr (slot); 2932 return cdr (slot);
2977} 2933}
2978 2934
2979/* ========== Evaluation Cycle ========== */ 2935/* ========== Evaluation Cycle ========== */
2980 2936
2981static pointer 2937static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2938xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2939{
2984#if USE_ERROR_HOOK 2940#if USE_ERROR_HOOK
2985 pointer x; 2941 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2942 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 2977 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 2978 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 2979 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 2980 SCHEME_V->op = OP_EVAL;
3025 2981
3026 return S_T; 2982 return 0;
3027 } 2983 }
3028#endif 2984#endif
3029 2985
3030 if (a) 2986 if (a)
3031 SCHEME_V->args = cons (a, NIL); 2987 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 2989 SCHEME_V->args = NIL;
3034 2990
3035 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);
3036 setimmutable (car (SCHEME_V->args)); 2992 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 2993 SCHEME_V->op = OP_ERR0;
2994
3038 return S_T; 2995 return 0;
3039} 2996}
3040 2997
3041#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)
3042#define Error_0(s) Error_1 (s, 0) 2999#define Error_0(s) Error_1 (s, 0)
3043 3000
3044/* Too small to turn into function */ 3001/* Too small to turn into function */
3045#define BEGIN do { 3002#define BEGIN do {
3046#define END } while (0) 3003#define END } while (0)
3047#define s_goto(a) BEGIN \ 3004#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3005 SCHEME_V->op = a; \
3049 return S_T; END 3006 return 0; END
3050 3007
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3008#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3009
3053#ifndef USE_SCHEME_STACK 3010#ifndef USE_SCHEME_STACK
3054 3011
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3036 next_frame = SCHEME_V->dump_base + nframes;
3080 3037
3081 next_frame->op = op; 3038 next_frame->op = op;
3082 next_frame->args = args; 3039 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3040 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3041 next_frame->code = code;
3085 3042
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3044}
3088 3045
3089static pointer 3046static int
3090xs_return (SCHEME_P_ pointer a) 3047xs_return (SCHEME_P_ pointer a)
3091{ 3048{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3049 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3050 struct dump_stack_frame *frame;
3094 3051
3095 SCHEME_V->value = a; 3052 SCHEME_V->value = a;
3096 3053
3097 if (nframes <= 0) 3054 if (nframes <= 0)
3098 return NIL; 3055 return -1;
3099 3056
3100 frame = &SCHEME_V->dump_base[--nframes]; 3057 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3058 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3059 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3060 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3061 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3063
3107 return S_T; 3064 return 0;
3108} 3065}
3109 3066
3110static INLINE void 3067static INLINE void
3111dump_stack_reset (SCHEME_P) 3068dump_stack_reset (SCHEME_P)
3112{ 3069{
… …
3207dump_stack_free (SCHEME_P) 3164dump_stack_free (SCHEME_P)
3208{ 3165{
3209 SCHEME_V->dump = NIL; 3166 SCHEME_V->dump = NIL;
3210} 3167}
3211 3168
3212static pointer 3169static int
3213xs_return (SCHEME_P_ pointer a) 3170xs_return (SCHEME_P_ pointer a)
3214{ 3171{
3215 pointer dump = SCHEME_V->dump; 3172 pointer dump = SCHEME_V->dump;
3216 3173
3217 SCHEME_V->value = a; 3174 SCHEME_V->value = a;
3218 3175
3219 if (dump == NIL) 3176 if (dump == NIL)
3220 return NIL; 3177 return -1;
3221 3178
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3183
3227 SCHEME_V->dump = dump; 3184 SCHEME_V->dump = dump;
3228 3185
3229 return S_T; 3186 return 0;
3230} 3187}
3231 3188
3232static void 3189static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3191{
… …
3259 3216
3260#endif 3217#endif
3261 3218
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3220
3264static pointer 3221static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3222opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3223{
3224 pointer args = SCHEME_V->args;
3267 pointer x, y; 3225 pointer x, y;
3268 3226
3269 switch (op) 3227 switch (op)
3270 { 3228 {
3271 case OP_LOAD: /* load */ 3229 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3230 if (file_interactive (SCHEME_A))
3273 { 3231 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3275 //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)));
3276 } 3234 }
3277 3235
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3236 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3237 Error_1 ("unable to open", car (args));
3280 else 3238 else
3281 { 3239 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3241 s_goto (OP_T0LVL);
3284 } 3242 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3316 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3317#if USE_TRACING
3360 if (SCHEME_V->tracing) 3318 if (SCHEME_V->tracing)
3361 { 3319 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3320 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 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);
3364 SCHEME_V->args = SCHEME_V->code; 3322 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3323 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3324 s_goto (OP_P0LIST);
3367 } 3325 }
3368 3326
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3370 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3371 s_goto (OP_E1ARGS);
3414 } 3372 }
3415 3373
3416 case OP_E1ARGS: /* eval arguments */ 3374 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3375 args = cons (SCHEME_V->value, args);
3418 3376
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3377 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3378 {
3421 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));
3422 SCHEME_V->code = car (SCHEME_V->code); 3380 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3381 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3382 s_goto (OP_EVAL);
3425 } 3383 }
3426 else /* end */ 3384 else /* end */
3427 { 3385 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3386 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3387 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3388 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3389 s_goto (OP_APPLY);
3432 } 3390 }
3433 3391
3434#if USE_TRACING 3392#if USE_TRACING
3435 3393
3436 case OP_TRACING: 3394 case OP_TRACING:
3437 { 3395 {
3438 int tr = SCHEME_V->tracing; 3396 int tr = SCHEME_V->tracing;
3439 3397
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3398 SCHEME_V->tracing = ivalue (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3399 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3400 }
3443 3401
3444#endif 3402#endif
3445 3403
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3404 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3405#if USE_TRACING
3448 if (SCHEME_V->tracing) 3406 if (SCHEME_V->tracing)
3449 { 3407 {
3450 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);
3451 SCHEME_V->print_flag = 1; 3409 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3410 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3411 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3412 s_goto (OP_P0LIST);
3455 } 3413 }
3456 3414
3457 /* fall through */ 3415 /* fall through */
3458 3416
3459 case OP_REAL_APPLY: 3417 case OP_REAL_APPLY:
3460#endif 3418#endif
3461 if (is_proc (SCHEME_V->code)) 3419 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3466 { 3422 {
3467 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3426
3471 s_return (x); 3427 s_return (x);
3472 } 3428 }
3473 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 */
3474 { 3430 {
3475 /* Should not accept promise */ 3431 /* Should not accept promise */
3476 /* make environment */ 3432 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3434
3479 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))
3480 { 3436 {
3481 if (y == NIL) 3437 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3483 else 3439 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3503 } 3459 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3461 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3508 } 3464 }
3509 else 3465 else
3510 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3511 3467
3512 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3521 { 3477 {
3522 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);
3523 3479
3524 if (f != NIL) 3480 if (f != NIL)
3525 { 3481 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3530 } 3486 }
3531 3487
… …
3542 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));
3543 3499
3544#endif 3500#endif
3545 3501
3546 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3503 x = car (args);
3548 3504
3549 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3506 x = cdr (x);
3551 3507
3552 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3554 else 3510 else
3555 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3556 3512
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3558 3514
3559 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3592 3548
3593 3549
3594 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3596 3552
3597 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3599 3555
3600 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);
3601 3557
3602 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3604 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));
3605 3561
… …
3636 3592
3637 case OP_IF1: /* if */ 3593 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3594 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3595 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3596 else
3641 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 */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3598 s_goto (OP_EVAL);
3645 3599
3646 case OP_LET0: /* let */ 3600 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3601 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3649 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);
3650 s_goto (OP_LET1); 3604 s_goto (OP_LET1);
3651 3605
3652 case OP_LET1: /* let (calculate parameters) */ 3606 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3607 args = cons (SCHEME_V->value, args);
3654 3608
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3609 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3610 {
3657 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)))
3658 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));
3659 3613
3660 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));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3615 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3616 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3617 s_goto (OP_EVAL);
3664 } 3618 }
3665 else /* end */ 3619 else /* end */
3666 { 3620 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3621 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3622 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3623 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3624 s_goto (OP_LET2);
3671 } 3625 }
3672 3626
3673 case OP_LET2: /* let */ 3627 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3628 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3629
3676 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;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3631 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3632 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3633
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3634 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3635 {
3682 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))
3683 { 3637 {
3684 if (!is_pair (x)) 3638 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3639 Error_1 ("Bad syntax of binding in let :", x);
3686 3640
3687 if (!is_list (SCHEME_A_ car (x))) 3641 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3642 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3643
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3644 args = cons (caar (x), args);
3691 } 3645 }
3692 3646
3693 x =
3694 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)),
3695 SCHEME_V->envir); 3648 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3649 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3650 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3651 }
3700 else 3652 else
3701 { 3653 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3654 SCHEME_V->code = cdr (SCHEME_V->code);
3655 }
3656
3703 SCHEME_V->args = NIL; 3657 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3658 s_goto (OP_BEGIN);
3707 3659
3708 case OP_LET0AST: /* let* */ 3660 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3661 if (car (SCHEME_V->code) == NIL)
3710 { 3662 {
… …
3728 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);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3682
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3683 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3684 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3685 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3686 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3687 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3737 } 3689 }
3738 else /* end */ 3690 else /* end */
3739 { 3691 {
3740 SCHEME_V->code = SCHEME_V->args; 3692 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3694 s_goto (OP_BEGIN);
3743 } 3695 }
3744 3696
3745 case OP_LET0REC: /* letrec */ 3697 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3700 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3701 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3702 s_goto (OP_LET1REC);
3751 3703
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3704 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3705 args = cons (SCHEME_V->value, args);
3754 3706
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3707 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3708 {
3757 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)))
3758 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));
3759 3711
3760 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));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3764 } 3716 }
3765 else /* end */ 3717 else /* end */
3766 { 3718 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3719 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3720 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3721 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3722 s_goto (OP_LET2REC);
3771 } 3723 }
3772 3724
3773 case OP_LET2REC: /* letrec */ 3725 case OP_LET2REC: /* letrec */
3774 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))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3727 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3728
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3729 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3818 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3819 s_goto (OP_EVAL);
3868 3820
3869 case OP_C1STREAM: /* cons-stream */ 3821 case OP_C1STREAM: /* cons-stream */
3870 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 */
3871 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);
3872 set_typeflag (x, T_PROMISE); 3824 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3825 s_return (cons (args, x));
3874 3826
3875 case OP_MACRO0: /* macro */ 3827 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3828 if (is_pair (car (SCHEME_V->code)))
3877 { 3829 {
3878 x = caar (SCHEME_V->code); 3830 x = caar (SCHEME_V->code);
… …
3911 { 3863 {
3912 if (!is_pair (y = caar (x))) 3864 if (!is_pair (y = caar (x)))
3913 break; 3865 break;
3914 3866
3915 for (; y != NIL; y = cdr (y)) 3867 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3868 if (eqv (car (y), SCHEME_V->value))
3918 break; 3869 break;
3919 }
3920 3870
3921 if (y != NIL) 3871 if (y != NIL)
3922 break; 3872 break;
3923 } 3873 }
3924 3874
… …
3944 s_goto (OP_BEGIN); 3894 s_goto (OP_BEGIN);
3945 else 3895 else
3946 s_return (NIL); 3896 s_return (NIL);
3947 3897
3948 case OP_PAPPLY: /* apply */ 3898 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3901 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3902 s_goto (OP_APPLY);
3953 3903
3954 case OP_PEVAL: /* eval */ 3904 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3905 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3906 SCHEME_V->envir = cadr (args);
3957 3907
3958 SCHEME_V->code = car (SCHEME_V->args); 3908 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
3960 3910
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3911 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3912 SCHEME_V->code = car (args);
3963 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);
3964 s_goto (OP_APPLY); 3914 s_goto (OP_APPLY);
3965 } 3915 }
3966 3916
3967 return S_T; 3917 abort ();
3968} 3918}
3969 3919
3970static pointer 3920static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3921opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3922{
3973 pointer x; 3923 pointer args = SCHEME_V->args;
3924 pointer x = car (args);
3974 num v; 3925 num v;
3975 3926
3976#if USE_MATH 3927#if USE_MATH
3977 RVALUE dd; 3928 RVALUE dd;
3978#endif 3929#endif
3979 3930
3980 switch (op) 3931 switch (op)
3981 { 3932 {
3982#if USE_MATH 3933#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 3934 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args);
3986
3987 if (num_is_integer (x)) 3935 if (num_is_integer (x))
3988 s_return (x); 3936 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3937 else if (modf (rvalue_unchecked (x), &dd) == 0)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3938 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3991 else 3939 else
3992 Error_1 ("inexact->exact: not integral:", x); 3940 Error_1 ("inexact->exact: not integral:", x);
3993 3941
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 3949
4022 case OP_ATAN: 3950 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 3951 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 3953 else
4028 { 3954 {
4029 pointer y = cadr (SCHEME_V->args); 3955 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 3957 }
4033 3958
4034 case OP_SQRT: 3959 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 3961
4038 case OP_EXPT: 3962 case OP_EXPT:
4039 { 3963 {
4040 RVALUE result; 3964 RVALUE result;
4041 int real_result = 1; 3965 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 3966 pointer y = cadr (args);
4043
4044 x = car (SCHEME_V->args);
4045 3967
4046 if (num_is_integer (x) && num_is_integer (y)) 3968 if (num_is_integer (x) && num_is_integer (y))
4047 real_result = 0; 3969 real_result = 0;
4048 3970
4049 /* This 'if' is an R5RS compatibility fix. */ 3971 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 3972 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 3973 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 3974 result = 0;
4053 else 3975 else
4054 result = pow (rvalue (x), rvalue (y)); 3976 result = pow (rvalue (x), rvalue (y));
4055 3977
4056 /* Before returning integer result make sure we can. */ 3978 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 3979 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 3980 if (!real_result)
4059 { 3981 {
4060 long result_as_long = (long) result; 3982 long result_as_long = result;
4061 3983
4062 if (result != (RVALUE) result_as_long) 3984 if (result != (RVALUE) result_as_long)
4063 real_result = 1; 3985 real_result = 1;
4064 } 3986 }
4065 3987
… …
4067 s_return (mk_real (SCHEME_A_ result)); 3989 s_return (mk_real (SCHEME_A_ result));
4068 else 3990 else
4069 s_return (mk_integer (SCHEME_A_ result)); 3991 s_return (mk_integer (SCHEME_A_ result));
4070 } 3992 }
4071 3993
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 3996
4080 case OP_TRUNCATE: 3997 case OP_TRUNCATE:
4081 { 3998 {
4082 RVALUE rvalue_of_x; 3999 RVALUE rvalue_of_x;
4083 4000
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x); 4001 rvalue_of_x = rvalue (x);
4086 4002
4087 if (rvalue_of_x > 0) 4003 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4089 else 4005 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4007 }
4092 4008
4093 case OP_ROUND: 4009 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4010 if (num_is_integer (x))
4097 s_return (x); 4011 s_return (x);
4098 4012
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4014#endif
4101 4015
4102 case OP_ADD: /* + */ 4016 case OP_ADD: /* + */
4103 v = num_zero; 4017 v = num_zero;
4104 4018
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4019 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4020 v = num_op ('+', v, nvalue (car (x)));
4107 4021
4108 s_return (mk_number (SCHEME_A_ v)); 4022 s_return (mk_number (SCHEME_A_ v));
4109 4023
4110 case OP_MUL: /* * */ 4024 case OP_MUL: /* * */
4111 v = num_one; 4025 v = num_one;
4112 4026
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4027 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4028 v = num_op ('*', v, nvalue (car (x)));
4115 4029
4116 s_return (mk_number (SCHEME_A_ v)); 4030 s_return (mk_number (SCHEME_A_ v));
4117 4031
4118 case OP_SUB: /* - */ 4032 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4033 if (cdr (args) == NIL)
4120 { 4034 {
4121 x = SCHEME_V->args; 4035 x = args;
4122 v = num_zero; 4036 v = num_zero;
4123 } 4037 }
4124 else 4038 else
4125 { 4039 {
4126 x = cdr (SCHEME_V->args); 4040 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4041 v = nvalue (car (args));
4128 } 4042 }
4129 4043
4130 for (; x != NIL; x = cdr (x)) 4044 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4045 v = num_op ('-', v, nvalue (car (x)));
4132 4046
4133 s_return (mk_number (SCHEME_A_ v)); 4047 s_return (mk_number (SCHEME_A_ v));
4134 4048
4135 case OP_DIV: /* / */ 4049 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4050 if (cdr (args) == NIL)
4137 { 4051 {
4138 x = SCHEME_V->args; 4052 x = args;
4139 v = num_one; 4053 v = num_one;
4140 } 4054 }
4141 else 4055 else
4142 { 4056 {
4143 x = cdr (SCHEME_V->args); 4057 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4058 v = nvalue (car (args));
4145 } 4059 }
4146 4060
4147 for (; x != NIL; x = cdr (x)) 4061 for (; x != NIL; x = cdr (x))
4148 { 4062 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4063 if (!is_zero_rvalue (rvalue (car (x))))
… …
4153 } 4067 }
4154 4068
4155 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4156 4070
4157 case OP_INTDIV: /* quotient */ 4071 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4159 { 4073 {
4160 x = SCHEME_V->args; 4074 x = args;
4161 v = num_one; 4075 v = num_one;
4162 } 4076 }
4163 else 4077 else
4164 { 4078 {
4165 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4167 } 4081 }
4168 4082
4169 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4170 { 4084 {
4171 if (ivalue (car (x)) != 0) 4085 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4086 v = num_op ('/', v, nvalue (car (x)));
4173 else 4087 else
4174 Error_0 ("quotient: division by zero"); 4088 Error_0 ("quotient: division by zero");
4175 } 4089 }
4176 4090
4177 s_return (mk_number (SCHEME_A_ v)); 4091 s_return (mk_number (SCHEME_A_ v));
4178 4092
4179 case OP_REM: /* remainder */ 4093 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4094 v = nvalue (x);
4181 4095
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4096 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4097 v = num_rem (v, nvalue (cadr (args)));
4184 else 4098 else
4185 Error_0 ("remainder: division by zero"); 4099 Error_0 ("remainder: division by zero");
4186 4100
4187 s_return (mk_number (SCHEME_A_ v)); 4101 s_return (mk_number (SCHEME_A_ v));
4188 4102
4189 case OP_MOD: /* modulo */ 4103 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4104 v = nvalue (x);
4191 4105
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4106 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4107 v = num_mod (v, nvalue (cadr (args)));
4194 else 4108 else
4195 Error_0 ("modulo: division by zero"); 4109 Error_0 ("modulo: division by zero");
4196 4110
4197 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4198 4112
4199 case OP_CAR: /* car */ 4113 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4114 s_return (caar (args));
4201 4115
4202 case OP_CDR: /* cdr */ 4116 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4117 s_return (cdar (args));
4204 4118
4205 case OP_CONS: /* cons */ 4119 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4120 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4121 s_return (args);
4208 4122
4209 case OP_SETCAR: /* set-car! */ 4123 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4124 if (!is_immutable (x))
4211 { 4125 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4126 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4127 s_return (car (args));
4214 } 4128 }
4215 else 4129 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4130 Error_0 ("set-car!: unable to alter immutable pair");
4217 4131
4218 case OP_SETCDR: /* set-cdr! */ 4132 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4133 if (!is_immutable (x))
4220 { 4134 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4135 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4136 s_return (car (args));
4223 } 4137 }
4224 else 4138 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4139 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4140
4227 case OP_CHAR2INT: /* char->integer */ 4141 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4142 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4229 4143
4230 case OP_INT2CHAR: /* integer->char */ 4144 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4145 s_return (mk_character (SCHEME_A_ ivalue (x)));
4232 4146
4233 case OP_CHARUPCASE: 4147 case OP_CHARUPCASE:
4234 { 4148 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4149 unsigned char c = ivalue (x);
4236 c = toupper (c); 4150 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4151 s_return (mk_character (SCHEME_A_ c));
4238 } 4152 }
4239 4153
4240 case OP_CHARDNCASE: 4154 case OP_CHARDNCASE:
4241 { 4155 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4156 unsigned char c = ivalue (x);
4243 c = tolower (c); 4157 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4245 } 4159 }
4246 4160
4247 case OP_STR2SYM: /* string->symbol */ 4161 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4162 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4163
4250 case OP_STR2ATOM: /* string->atom */ 4164 case OP_STR2ATOM: /* string->atom */
4251 { 4165 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4166 char *s = strvalue (x);
4253 long pf = 0; 4167 long pf = 0;
4254 4168
4255 if (cdr (SCHEME_V->args) != NIL) 4169 if (cdr (args) != NIL)
4256 { 4170 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4171 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4172 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4173 pf = ivalue_unchecked (cadr (args));
4260 4174
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4175 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4176 {
4263 /* base is OK */ 4177 /* base is OK */
4264 } 4178 }
4265 else 4179 else
4266 pf = -1; 4180 pf = -1;
4267 } 4181 }
4268 4182
4269 if (pf < 0) 4183 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4184 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4185 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4186 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4187 else
4274 { 4188 {
4275 if (pf == 0 || pf == 10) 4189 if (pf == 0 || pf == 10)
… …
4286 } 4200 }
4287 } 4201 }
4288 } 4202 }
4289 4203
4290 case OP_SYM2STR: /* symbol->string */ 4204 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4205 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4206 setimmutable (x);
4293 s_return (x); 4207 s_return (x);
4294 4208
4295 case OP_ATOM2STR: /* atom->string */ 4209 case OP_ATOM2STR: /* atom->string */
4296 { 4210 {
4297 long pf = 0; 4211 long pf = 0;
4298 4212
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4213 if (cdr (args) != NIL)
4302 { 4214 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4215 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4216 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4217 pf = ivalue_unchecked (cadr (args));
4306 4218
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4219 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4220 {
4309 /* base is OK */ 4221 /* base is OK */
4310 } 4222 }
4311 else 4223 else
4312 pf = -1; 4224 pf = -1;
4313 } 4225 }
4314 4226
4315 if (pf < 0) 4227 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4228 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4229 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4230 {
4319 char *p; 4231 char *p;
4320 int len; 4232 int len;
4321 4233
… …
4329 case OP_MKSTRING: /* make-string */ 4241 case OP_MKSTRING: /* make-string */
4330 { 4242 {
4331 int fill = ' '; 4243 int fill = ' ';
4332 int len; 4244 int len;
4333 4245
4334 len = ivalue (car (SCHEME_V->args)); 4246 len = ivalue (x);
4335 4247
4336 if (cdr (SCHEME_V->args) != NIL) 4248 if (cdr (args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args)); 4249 fill = charvalue (cadr (args));
4338 4250
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4251 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4252 }
4341 4253
4342 case OP_STRLEN: /* string-length */ 4254 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4255 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4256
4345 case OP_STRREF: /* string-ref */ 4257 case OP_STRREF: /* string-ref */
4346 { 4258 {
4347 char *str; 4259 char *str;
4348 int index; 4260 int index;
4349 4261
4350 str = strvalue (car (SCHEME_V->args)); 4262 str = strvalue (x);
4351 4263
4352 index = ivalue (cadr (SCHEME_V->args)); 4264 index = ivalue (cadr (args));
4353 4265
4354 if (index >= strlength (car (SCHEME_V->args))) 4266 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4267 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4268
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4269 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4270 }
4359 4271
4360 case OP_STRSET: /* string-set! */ 4272 case OP_STRSET: /* string-set! */
4361 { 4273 {
4362 char *str; 4274 char *str;
4363 int index; 4275 int index;
4364 int c; 4276 int c;
4365 4277
4366 if (is_immutable (car (SCHEME_V->args))) 4278 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4279 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4280
4369 str = strvalue (car (SCHEME_V->args)); 4281 str = strvalue (x);
4370 4282
4371 index = ivalue (cadr (SCHEME_V->args)); 4283 index = ivalue (cadr (args));
4372 4284
4373 if (index >= strlength (car (SCHEME_V->args))) 4285 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4286 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4287
4376 c = charvalue (caddr (SCHEME_V->args)); 4288 c = charvalue (caddr (args));
4377 4289
4378 str[index] = (char) c; 4290 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4291 s_return (car (args));
4380 } 4292 }
4381 4293
4382 case OP_STRAPPEND: /* string-append */ 4294 case OP_STRAPPEND: /* string-append */
4383 { 4295 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4296 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4297 int len = 0;
4386 pointer newstr; 4298 pointer newstr;
4387 char *pos; 4299 char *pos;
4388 4300
4389 /* compute needed length for new string */ 4301 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4302 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4303 len += strlength (car (x));
4392 4304
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4305 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4306
4395 /* store the contents of the argument strings into the new string */ 4307 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4308 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4309 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4310
4399 s_return (newstr); 4311 s_return (newstr);
4400 } 4312 }
4401 4313
… …
4404 char *str; 4316 char *str;
4405 int index0; 4317 int index0;
4406 int index1; 4318 int index1;
4407 int len; 4319 int len;
4408 4320
4409 str = strvalue (car (SCHEME_V->args)); 4321 str = strvalue (x);
4410 4322
4411 index0 = ivalue (cadr (SCHEME_V->args)); 4323 index0 = ivalue (cadr (args));
4412 4324
4413 if (index0 > strlength (car (SCHEME_V->args))) 4325 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4326 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4327
4416 if (cddr (SCHEME_V->args) != NIL) 4328 if (cddr (args) != NIL)
4417 { 4329 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4330 index1 = ivalue (caddr (args));
4419 4331
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4332 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4333 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4334 }
4423 else 4335 else
4424 index1 = strlength (car (SCHEME_V->args)); 4336 index1 = strlength (x);
4425 4337
4426 len = index1 - index0; 4338 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4339 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4340 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4341 strvalue (x)[len] = 0;
… …
4433 4345
4434 case OP_VECTOR: /* vector */ 4346 case OP_VECTOR: /* vector */
4435 { 4347 {
4436 int i; 4348 int i;
4437 pointer vec; 4349 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4350 int len = list_length (SCHEME_A_ args);
4439 4351
4440 if (len < 0) 4352 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4353 Error_1 ("vector: not a proper list:", args);
4442 4354
4443 vec = mk_vector (SCHEME_A_ len); 4355 vec = mk_vector (SCHEME_A_ len);
4444 4356
4445#if USE_ERROR_CHECKING 4357#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4358 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4359 s_return (S_SINK);
4448#endif 4360#endif
4449 4361
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4362 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4363 set_vector_elem (vec, i, car (x));
4452 4364
4453 s_return (vec); 4365 s_return (vec);
4454 } 4366 }
4455 4367
… …
4457 { 4369 {
4458 pointer fill = NIL; 4370 pointer fill = NIL;
4459 int len; 4371 int len;
4460 pointer vec; 4372 pointer vec;
4461 4373
4462 len = ivalue (car (SCHEME_V->args)); 4374 len = ivalue (x);
4463 4375
4464 if (cdr (SCHEME_V->args) != NIL) 4376 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4377 fill = cadr (args);
4466 4378
4467 vec = mk_vector (SCHEME_A_ len); 4379 vec = mk_vector (SCHEME_A_ len);
4468 4380
4469#if USE_ERROR_CHECKING 4381#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4382 if (SCHEME_V->no_memory)
… …
4476 4388
4477 s_return (vec); 4389 s_return (vec);
4478 } 4390 }
4479 4391
4480 case OP_VECLEN: /* vector-length */ 4392 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4393 s_return (mk_integer (SCHEME_A_ veclength (x)));
4482 4394
4483 case OP_VECREF: /* vector-ref */ 4395 case OP_VECREF: /* vector-ref */
4484 { 4396 {
4485 int index; 4397 int index;
4486 4398
4487 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4488 4400
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4403
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4404 s_return (vector_elem (x, index));
4493 } 4405 }
4494 4406
4495 case OP_VECSET: /* vector-set! */ 4407 case OP_VECSET: /* vector-set! */
4496 { 4408 {
4497 int index; 4409 int index;
4498 4410
4499 if (is_immutable (car (SCHEME_V->args))) 4411 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4412 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4413
4502 index = ivalue (cadr (SCHEME_V->args)); 4414 index = ivalue (cadr (args));
4503 4415
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4416 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4417 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4418
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4419 set_vector_elem (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4420 s_return (x);
4509 } 4421 }
4510 } 4422 }
4511 4423
4512 return S_T; 4424 abort ();
4513} 4425}
4514 4426
4515INTERFACE int 4427INTERFACE int
4516is_list (SCHEME_P_ pointer a) 4428is_list (SCHEME_P_ pointer a)
4517{ 4429{
… …
4564 return -1; 4476 return -1;
4565 } 4477 }
4566 } 4478 }
4567} 4479}
4568 4480
4569static pointer 4481static int
4482opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4483{
4484 pointer x = SCHEME_V->args;
4485
4486 for (;;)
4487 {
4488 num v = nvalue (car (x));
4489 x = cdr (x);
4490
4491 if (x == NIL)
4492 break;
4493
4494 int r = num_cmp (v, nvalue (car (x)));
4495
4496 switch (op)
4497 {
4498 case OP_NUMEQ: r = r == 0; break;
4499 case OP_LESS: r = r < 0; break;
4500 case OP_GRE: r = r > 0; break;
4501 case OP_LEQ: r = r <= 0; break;
4502 case OP_GEQ: r = r >= 0; break;
4503 }
4504
4505 if (!r)
4506 s_return (S_F);
4507 }
4508
4509 s_return (S_T);
4510}
4511
4512static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4513opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4514{
4572 pointer x; 4515 pointer args = SCHEME_V->args;
4573 num v; 4516 pointer a = car (args);
4574 int (*comp_func) (num, num); 4517 pointer d = cdr (args);
4518 int r;
4575 4519
4576 switch (op) 4520 switch (op)
4577 { 4521 {
4578 case OP_NOT: /* not */ 4522 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4523 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4524 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4525 case OP_NULLP: /* null? */ r = a == NIL ; break;
4526 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4527 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4528 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4529 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4530 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4531 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4532
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4533#if USE_CHAR_CLASSIFIERS
4650
4651 case OP_CHARAP: /* char-alphabetic? */ 4534 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4535 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4653
4654 case OP_CHARNP: /* char-numeric? */
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */ 4536 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */ 4537 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */ 4538 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4539#endif
4540
4666#if USE_PORTS 4541#if USE_PORTS
4667 4542 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4543 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4544 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4545#endif
4677 4546
4678 case OP_PROCP: /* procedure? */ 4547 case OP_PROCP: /* procedure? */
4679 4548
4680 /*-- 4549 /*--
4681 * continuation should be procedure by the example 4550 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4551 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4552 * in R^3 report sec. 6.9
4684 */ 4553 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4554 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4555 break;
4687 4556
4688 case OP_PAIRP: /* pair? */ 4557 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4558 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4559 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4560 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4561 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4562 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4563 }
4706 4564
4707 return S_T; 4565 s_retbool (r);
4708} 4566}
4709 4567
4710static pointer 4568static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4569opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4570{
4571 pointer args = SCHEME_V->args;
4572 pointer a = car (args);
4713 pointer x, y; 4573 pointer x, y;
4714 4574
4715 switch (op) 4575 switch (op)
4716 { 4576 {
4717 case OP_FORCE: /* force */ 4577 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4578 SCHEME_V->code = a;
4719 4579
4720 if (is_promise (SCHEME_V->code)) 4580 if (is_promise (SCHEME_V->code))
4721 { 4581 {
4722 /* Should change type to closure here */ 4582 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4583 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4604 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4605 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4606 }
4747 } 4607 }
4748 4608
4749 SCHEME_V->args = car (SCHEME_V->args); 4609 SCHEME_V->args = a;
4750 4610
4751 if (op == OP_WRITE) 4611 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4612 SCHEME_V->print_flag = 1;
4753 else 4613 else
4754 SCHEME_V->print_flag = 0; 4614 SCHEME_V->print_flag = 0;
4755 4615
4756 s_goto (OP_P0LIST); 4616 s_goto (OP_P0LIST);
4757 4617
4758 case OP_NEWLINE: /* newline */ 4618 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4619 if (is_pair (args))
4760 { 4620 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4621 if (a != SCHEME_V->outport)
4762 { 4622 {
4763 x = cons (SCHEME_V->outport, NIL); 4623 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4624 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4625 SCHEME_V->outport = a;
4766 } 4626 }
4767 } 4627 }
4768 4628
4769 putstr (SCHEME_A_ "\n"); 4629 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4630 s_return (S_T);
4771#endif 4631#endif
4772 4632
4773 case OP_ERR0: /* error */ 4633 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4634 SCHEME_V->retcode = -1;
4775 4635
4776 if (!is_string (car (SCHEME_V->args))) 4636 if (!is_string (a))
4777 { 4637 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4638 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4639 setimmutable (car (args));
4780 } 4640 }
4781 4641
4782 putstr (SCHEME_A_ "Error: "); 4642 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4643 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4644 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4645 s_goto (OP_ERR1);
4786 4646
4787 case OP_ERR1: /* error */ 4647 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4648 putstr (SCHEME_A_ " ");
4789 4649
4790 if (SCHEME_V->args != NIL) 4650 if (args != NIL)
4791 { 4651 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4652 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4653 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4654 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4655 s_goto (OP_P0LIST);
4796 } 4656 }
4797 else 4657 else
4798 { 4658 {
4799 putstr (SCHEME_A_ "\n"); 4659 putstr (SCHEME_A_ "\n");
4800 4660
4801 if (SCHEME_V->interactive_repl) 4661 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4662 s_goto (OP_T0LVL);
4803 else 4663 else
4804 return NIL; 4664 return -1;
4805 } 4665 }
4806 4666
4807 case OP_REVERSE: /* reverse */ 4667 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4668 s_return (reverse (SCHEME_A_ a));
4809 4669
4810 case OP_LIST_STAR: /* list* */ 4670 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4671 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4672
4813 case OP_APPEND: /* append */ 4673 case OP_APPEND: /* append */
4814 x = NIL; 4674 x = NIL;
4815 y = SCHEME_V->args; 4675 y = args;
4816 4676
4817 if (y == x) 4677 if (y == x)
4818 s_return (x); 4678 s_return (x);
4819 4679
4820 /* cdr() in the while condition is not a typo. If car() */ 4680 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4691 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4692
4833#if USE_PLIST 4693#if USE_PLIST
4834 4694
4835 case OP_PUT: /* put */ 4695 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4696 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4697 Error_0 ("illegal use of put");
4838 4698
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4699 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4700 {
4841 if (caar (x) == y) 4701 if (caar (x) == y)
4842 break; 4702 break;
4843 } 4703 }
4844 4704
4845 if (x != NIL) 4705 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4706 cdar (x) = caddr (args);
4847 else 4707 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4708 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4709
4850 s_return (S_T); 4710 s_return (S_T);
4851 4711
4852 case OP_GET: /* get */ 4712 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4713 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4714 Error_0 ("illegal use of get");
4855 4715
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4716 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4717 if (caar (x) == y)
4858 break; 4718 break;
4859 4719
4860 if (x != NIL) 4720 if (x != NIL)
4861 s_return (cdar (x)); 4721 s_return (cdar (x));
… …
4863 s_return (NIL); 4723 s_return (NIL);
4864 4724
4865#endif /* USE_PLIST */ 4725#endif /* USE_PLIST */
4866 4726
4867 case OP_QUIT: /* quit */ 4727 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4728 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4729 SCHEME_V->retcode = ivalue (a);
4870 4730
4871 return NIL; 4731 return -1;
4872 4732
4873 case OP_GC: /* gc */ 4733 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4734 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4735 s_return (S_T);
4876 4736
4877 case OP_GCVERB: /* gc-verbose */ 4737 case OP_GCVERB: /* gc-verbose */
4878 { 4738 {
4879 int was = SCHEME_V->gc_verbose; 4739 int was = SCHEME_V->gc_verbose;
4880 4740
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4741 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4742 s_retbool (was);
4883 } 4743 }
4884 4744
4885 case OP_NEWSEGMENT: /* new-segment */ 4745 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4746 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4747 Error_0 ("new-segment: argument must be a number");
4888 4748
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4749 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4890 4750
4891 s_return (S_T); 4751 s_return (S_T);
4892 4752
4893 case OP_OBLIST: /* oblist */ 4753 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4754 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4781 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4782 prop = port_input | port_output;
4923 break; 4783 break;
4924 } 4784 }
4925 4785
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4786 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4787
4928 if (p == NIL) 4788 if (p == NIL)
4929 s_return (S_F); 4789 s_return (S_F);
4930 4790
4931 s_return (p); 4791 s_return (p);
… …
4948 case OP_OPEN_INOUTSTRING: 4808 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4809 prop = port_input | port_output;
4950 break; 4810 break;
4951 } 4811 }
4952 4812
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4813 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4814 strvalue (a) + strlength (a), prop);
4955 4815
4956 if (p == NIL) 4816 if (p == NIL)
4957 s_return (S_F); 4817 s_return (S_F);
4958 4818
4959 s_return (p); 4819 s_return (p);
… …
4961 4821
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4822 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4823 {
4964 pointer p; 4824 pointer p;
4965 4825
4966 if (car (SCHEME_V->args) == NIL) 4826 if (a == NIL)
4967 { 4827 {
4968 p = port_from_scratch (SCHEME_A); 4828 p = port_from_scratch (SCHEME_A);
4969 4829
4970 if (p == NIL) 4830 if (p == NIL)
4971 s_return (S_F); 4831 s_return (S_F);
4972 } 4832 }
4973 else 4833 else
4974 { 4834 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4835 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4836 strvalue (a) + strlength (a), port_output);
4977 4837
4978 if (p == NIL) 4838 if (p == NIL)
4979 s_return (S_F); 4839 s_return (S_F);
4980 } 4840 }
4981 4841
… …
4984 4844
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4845 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4846 {
4987 port *p; 4847 port *p;
4988 4848
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4849 if ((p = a->object.port)->kind & port_string)
4990 { 4850 {
4991 off_t size; 4851 off_t size;
4992 char *str; 4852 char *str;
4993 4853
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4854 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4870 }
5011 4871
5012# endif 4872# endif
5013 4873
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4874 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4875 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4876 s_return (S_T);
5017 4877
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4878 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4879 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4880 s_return (S_T);
5021#endif 4881#endif
5022 4882
5023 case OP_INT_ENV: /* interaction-environment */ 4883 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4884 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4886 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4887 s_return (SCHEME_V->envir);
5028 4888
5029 } 4889 }
5030 4890
5031 return S_T; 4891 abort ();
5032} 4892}
5033 4893
5034static pointer 4894static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4895opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4896{
4897 pointer args = SCHEME_V->args;
5037 pointer x; 4898 pointer x;
5038 4899
5039 if (SCHEME_V->nesting != 0) 4900 if (SCHEME_V->nesting != 0)
5040 { 4901 {
5041 int n = SCHEME_V->nesting; 4902 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4909 switch (op)
5049 { 4910 {
5050 /* ========== reading part ========== */ 4911 /* ========== reading part ========== */
5051#if USE_PORTS 4912#if USE_PORTS
5052 case OP_READ: 4913 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4914 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4915 s_goto (OP_READ_INTERNAL);
5055 4916
5056 if (!is_inport (car (SCHEME_V->args))) 4917 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4918 Error_1 ("read: not an input port:", car (args));
5058 4919
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4920 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4921 s_goto (OP_READ_INTERNAL);
5061 4922
5062 x = SCHEME_V->inport; 4923 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4924 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4925 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4926 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4927 s_goto (OP_READ_INTERNAL);
5067 4928
5068 case OP_READ_CHAR: /* read-char */ 4929 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4930 case OP_PEEK_CHAR: /* peek-char */
5070 { 4931 {
5071 int c; 4932 int c;
5072 4933
5073 if (is_pair (SCHEME_V->args)) 4934 if (is_pair (args))
5074 { 4935 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4936 if (car (args) != SCHEME_V->inport)
5076 { 4937 {
5077 x = SCHEME_V->inport; 4938 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4939 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4940 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4941 SCHEME_V->inport = car (args);
5081 } 4942 }
5082 } 4943 }
5083 4944
5084 c = inchar (SCHEME_A); 4945 c = inchar (SCHEME_A);
5085 4946
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4956 case OP_CHAR_READY: /* char-ready? */
5096 { 4957 {
5097 pointer p = SCHEME_V->inport; 4958 pointer p = SCHEME_V->inport;
5098 int res; 4959 int res;
5099 4960
5100 if (is_pair (SCHEME_V->args)) 4961 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4962 p = car (args);
5102 4963
5103 res = p->object.port->kind & port_string; 4964 res = p->object.port->kind & port_string;
5104 4965
5105 s_retbool (res); 4966 s_retbool (res);
5106 } 4967 }
5107 4968
5108 case OP_SET_INPORT: /* set-input-port */ 4969 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4970 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4971 s_return (SCHEME_V->value);
5111 4972
5112 case OP_SET_OUTPORT: /* set-output-port */ 4973 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4974 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4975 s_return (SCHEME_V->value);
5115#endif 4976#endif
5116 4977
5117 case OP_RDSEXPR: 4978 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4979 switch (SCHEME_V->tok)
… …
5204 } 5065 }
5205 5066
5206 break; 5067 break;
5207 5068
5208 case OP_RDLIST: 5069 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5070 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5071 SCHEME_V->tok = token (SCHEME_A);
5211 5072
5212 switch (SCHEME_V->tok) 5073 switch (SCHEME_V->tok)
5213 { 5074 {
5214 case TOK_EOF: 5075 case TOK_EOF:
… …
5242 case OP_RDDOT: 5103 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5104 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5105 Error_0 ("syntax error: illegal dot expression");
5245 5106
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5107 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5108 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5109
5249 case OP_RDQUOTE: 5110 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5111 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5112
5252 case OP_RDQQUOTE: 5113 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5135 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5136 s_goto (OP_VECTOR);
5276 5137
5277 /* ========== printing part ========== */ 5138 /* ========== printing part ========== */
5278 case OP_P0LIST: 5139 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5140 if (is_vector (args))
5280 { 5141 {
5281 putstr (SCHEME_A_ "#("); 5142 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5143 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5144 s_goto (OP_PVECFROM);
5284 } 5145 }
5285 else if (is_environment (SCHEME_V->args)) 5146 else if (is_environment (args))
5286 { 5147 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5148 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5149 s_return (S_T);
5289 } 5150 }
5290 else if (!is_pair (SCHEME_V->args)) 5151 else if (!is_pair (args))
5291 { 5152 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5153 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5154 s_return (S_T);
5294 } 5155 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5156 else
5296 { 5157 {
5158 pointer a = car (args);
5159 pointer b = cdr (args);
5160 int ok_abbr = ok_abbrev (b);
5161 SCHEME_V->args = car (b);
5162
5163 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5164 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5165 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5166 putstr (SCHEME_A_ "`");
5167 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ ",");
5169 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5170 putstr (SCHEME_A_ ",@");
5171 else
5172 {
5173 putstr (SCHEME_A_ "(");
5174 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5175 SCHEME_V->args = a;
5176 }
5177
5299 s_goto (OP_P0LIST); 5178 s_goto (OP_P0LIST);
5300 } 5179 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5180
5181 case OP_P1LIST:
5182 if (is_pair (args))
5302 { 5183 {
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5185 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5186 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5187 s_goto (OP_P0LIST);
5306 } 5188 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5189 else if (is_vector (args))
5336 { 5190 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5191 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5192 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5193 s_goto (OP_P0LIST);
5340 } 5194 }
5341 else 5195 else
5342 { 5196 {
5343 if (SCHEME_V->args != NIL) 5197 if (args != NIL)
5344 { 5198 {
5345 putstr (SCHEME_A_ " . "); 5199 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5200 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5201 }
5348 5202
5349 putstr (SCHEME_A_ ")"); 5203 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5204 s_return (S_T);
5351 } 5205 }
5352 5206
5353 case OP_PVECFROM: 5207 case OP_PVECFROM:
5354 { 5208 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5209 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5210 pointer vec = car (args);
5357 int len = veclength (vec); 5211 int len = veclength (vec);
5358 5212
5359 if (i == len) 5213 if (i == len)
5360 { 5214 {
5361 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
… …
5363 } 5217 }
5364 else 5218 else
5365 { 5219 {
5366 pointer elem = vector_elem (vec, i); 5220 pointer elem = vector_elem (vec, i);
5367 5221
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5222 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5224 SCHEME_V->args = elem;
5371 5225
5372 if (i > 0) 5226 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5227 putstr (SCHEME_A_ " ");
5374 5228
5375 s_goto (OP_P0LIST); 5229 s_goto (OP_P0LIST);
5376 } 5230 }
5377 } 5231 }
5378 } 5232 }
5379 5233
5380 return S_T; 5234 abort ();
5381} 5235}
5382 5236
5383static pointer 5237static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5238opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5239{
5240 pointer args = SCHEME_V->args;
5241 pointer a = car (args);
5386 pointer x, y; 5242 pointer x, y;
5387 5243
5388 switch (op) 5244 switch (op)
5389 { 5245 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5246 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5247 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5248 long v = list_length (SCHEME_A_ a);
5393 5249
5394 if (v < 0) 5250 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5251 Error_1 ("length: not a list:", a);
5396 5252
5397 s_return (mk_integer (SCHEME_A_ v)); 5253 s_return (mk_integer (SCHEME_A_ v));
5398 } 5254 }
5399 5255
5400 case OP_ASSQ: /* assq *//* a.k */ 5256 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5257 x = a;
5402 5258
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5259 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5260 {
5405 if (!is_pair (car (y))) 5261 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5262 Error_0 ("unable to handle non pair element");
5407 5263
5408 if (x == caar (y)) 5264 if (x == caar (y))
… …
5414 else 5270 else
5415 s_return (S_F); 5271 s_return (S_F);
5416 5272
5417 5273
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5274 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5275 SCHEME_V->args = a;
5420 5276
5421 if (SCHEME_V->args == NIL) 5277 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5278 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5279 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5280 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5430 case OP_CLOSUREP: /* closure? */ 5286 case OP_CLOSUREP: /* closure? */
5431 /* 5287 /*
5432 * Note, macro object is also a closure. 5288 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5289 * Therefore, (closure? <#MACRO>) ==> #t
5434 */ 5290 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5291 s_retbool (is_closure (a));
5436 5292
5437 case OP_MACROP: /* macro? */ 5293 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5294 s_retbool (is_macro (a));
5439 } 5295 }
5440 5296
5441 return S_T; /* NOTREACHED */ 5297 abort ();
5442} 5298}
5443 5299
5300/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5301typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5302
5446typedef int (*test_predicate) (pointer); 5303typedef int (*test_predicate)(pointer);
5447static int 5304static int
5448is_any (pointer p) 5305is_any (pointer p)
5449{ 5306{
5450 return 1; 5307 return 1;
5451} 5308}
5452 5309
5453static int 5310static int
5454is_nonneg (pointer p) 5311is_nonneg (pointer p)
5455{ 5312{
5456 return ivalue (p) >= 0 && is_integer (p); 5313 return ivalue (p) >= 0 && is_integer (p);
5314}
5315
5316static int
5317tst_is_list (pointer p)
5318{
5319 return p == NIL || is_pair (p);
5457} 5320}
5458 5321
5459/* Correspond carefully with following defines! */ 5322/* Correspond carefully with following defines! */
5460static struct 5323static struct
5461{ 5324{
5462 test_predicate fct; 5325 test_predicate fct;
5463 const char *kind; 5326 const char *kind;
5464} tests[] = 5327} tests[] =
5465{ 5328{
5466 { 0, 0}, /* unused */ 5329 { is_any, 0 },
5467 { is_any, 0}, 5330 { is_string, "string" },
5468 { is_string, "string" }, 5331 { is_symbol, "symbol" },
5469 { is_symbol, "symbol" }, 5332 { is_port, "port" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5333 { is_inport, "input port" },
5472 { is_outport, "output port" }, 5334 { is_outport, "output port" },
5473 { is_environment, "environment" }, 5335 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5336 { is_pair, "pair" },
5475 { 0, "pair or '()" }, 5337 { tst_is_list, "pair or '()" },
5476 { is_character, "character" }, 5338 { is_character, "character" },
5477 { is_vector, "vector" }, 5339 { is_vector, "vector" },
5478 { is_number, "number" }, 5340 { is_number, "number" },
5479 { is_integer, "integer" }, 5341 { is_integer, "integer" },
5480 { is_nonneg, "non-negative integer" } 5342 { is_nonneg, "non-negative integer" }
5481}; 5343};
5482 5344
5483#define TST_NONE 0 5345#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5346#define TST_ANY "\001"
5485#define TST_STRING "\002" 5347#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5348#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5349#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5350#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5351#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5352#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5353#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5354#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5355#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5356#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5357#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5358#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5359#define TST_NATURAL "\016"
5360
5361#define INF_ARG 0xff
5362#define UNNAMED_OP ""
5363
5364static const char opnames[] =
5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5366#include "opdefines.h"
5367#undef OP_DEF
5368;
5369
5370static const char *
5371opname (int idx)
5372{
5373 const char *name = opnames;
5374
5375 /* should do this at compile time, but would require external program, right? */
5376 while (idx--)
5377 name += strlen (name) + 1;
5378
5379 return *name ? name : "ILLEGAL";
5380}
5381
5382static const char *
5383procname (pointer x)
5384{
5385 return opname (procnum (x));
5386}
5498 5387
5499typedef struct 5388typedef struct
5500{ 5389{
5501 dispatch_func func; 5390 uint8_t func;
5502 char *name; 5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5392 uint8_t builtin;
5503 int min_arity; 5393 uint8_t min_arity;
5504 int max_arity; 5394 uint8_t max_arity;
5505 char *arg_tests_encoding; 5395 char arg_tests_encoding[3];
5506} op_code_info; 5396} op_code_info;
5507 5397
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5398static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5399#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5512#include "opdefines.h" 5400#include "opdefines.h"
5401#undef OP_DEF
5513 {0} 5402 {0}
5514}; 5403};
5515
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527 5404
5528/* kernel of this interpreter */ 5405/* kernel of this interpreter */
5529static void 5406static void
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5407Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5408{
5532 SCHEME_V->op = op; 5409 SCHEME_V->op = op;
5533 5410
5534 for (;;) 5411 for (;;)
5535 { 5412 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5413 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5414
5538#if USE_ERROR_CHECKING 5415#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5416 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5417 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5418 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5419 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5420
5545 /* Check number of arguments */ 5421 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5422 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5423 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5424 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5425 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5426 xError_1 (SCHEME_A_ msg, 0);
5427 continue;
5551 } 5428 }
5552 5429 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5430 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5431 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5432 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5433 xError_1 (SCHEME_A_ msg, 0);
5434 continue;
5558 } 5435 }
5559 5436 else
5560 if (ok)
5561 { 5437 {
5562 if (pcd->arg_tests_encoding) 5438 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5439 {
5564 int i = 0; 5440 int i = 0;
5565 int j; 5441 int j;
5566 const char *t = pcd->arg_tests_encoding; 5442 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5443 pointer arglist = SCHEME_V->args;
5568 5444
5569 do 5445 do
5570 { 5446 {
5571 pointer arg = car (arglist); 5447 pointer arg = car (arglist);
5572 5448
5573 j = (int) t[0]; 5449 j = t[0];
5574 5450
5575 if (j == TST_LIST[0]) 5451 if (!tests[j - 1].fct (arg))
5576 {
5577 if (arg != NIL && !is_pair (arg))
5578 break; 5452 break;
5579 }
5580 else
5581 {
5582 if (!tests[j].fct (arg))
5583 break;
5584 }
5585 5453
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5454 if (t[1]) /* last test is replicated as necessary */
5587 t++; 5455 t++;
5588 5456
5589 arglist = cdr (arglist); 5457 arglist = cdr (arglist);
5590 i++; 5458 i++;
5591 } 5459 }
5592 while (i < n); 5460 while (i < n);
5593 5461
5594 if (i < n) 5462 if (i < n)
5595 { 5463 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5464 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5465 xError_1 (SCHEME_A_ msg, 0);
5466 continue;
5598 } 5467 }
5599 } 5468 }
5600 } 5469 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5470 }
5610#endif 5471#endif
5611 5472
5612 ok_to_freely_gc (SCHEME_A); 5473 ok_to_freely_gc (SCHEME_A);
5613 5474
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5475 static const dispatch_func dispatch_funcs[] = {
5476 opexe_0,
5477 opexe_1,
5478 opexe_2,
5479 opexe_3,
5480 opexe_4,
5481 opexe_5,
5482 opexe_6,
5483 };
5484
5485 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5486 return;
5616 5487
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5488 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5489 {
5619 xwrstr ("No memory!\n"); 5490 xwrstr ("No memory!\n");
… …
5677 5548
5678 case 'd': 5549 case 'd':
5679 return OP_COND0; /* cond */ 5550 return OP_COND0; /* cond */
5680 5551
5681 case '*': 5552 case '*':
5682 return OP_LET0AST; /* let* */ 5553 return OP_LET0AST;/* let* */
5683 5554
5684 default: 5555 default:
5685 return OP_SET0; /* set! */ 5556 return OP_SET0; /* set! */
5686 } 5557 }
5687 5558
… …
5709 5580
5710 case 'f': 5581 case 'f':
5711 return OP_DEF0; /* define */ 5582 return OP_DEF0; /* define */
5712 5583
5713 default: 5584 default:
5714 return OP_LET0REC; /* letrec */ 5585 return OP_LET0REC;/* letrec */
5715 } 5586 }
5716 5587
5717 default: 5588 default:
5718 return OP_C0STREAM; /* cons-stream */ 5589 return OP_C0STREAM; /* cons-stream */
5719 } 5590 }
… …
5816 5687
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5688 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5689 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5690 }
5820 5691
5692 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5693 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5694 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5695 assign_proc (SCHEME_A_ i, opname (i));
5824 5696
5825 /* initialization of global pointers to special symbols */ 5697 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5698 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5699 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5700 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5969{ 5841{
5970 dump_stack_reset (SCHEME_A); 5842 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5843 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5844 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5845 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5846 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5847 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5848 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5849#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5850 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5851#endif
5980 SCHEME_V->retcode = 0; 5852 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5853 SCHEME_V->interactive_repl = 0;

Diff Legend

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