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

Comparing microscheme/scheme.c (file contents):
Revision 1.9 by root, Wed Nov 25 22:39:19 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)
… …
1536 1493
1537/*-- 1494/*--
1538 * 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,
1539 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1540 * 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
1541 */ 1502 */
1542static void 1503static void
1543mark (pointer a) 1504mark (pointer a)
1544{ 1505{
1545 pointer t, q, p; 1506 pointer t, q, p;
… …
1547 t = 0; 1508 t = 0;
1548 p = a; 1509 p = a;
1549E2: 1510E2:
1550 setmark (p); 1511 setmark (p);
1551 1512
1552 if (is_vector (p)) 1513 if (ecb_expect_false (is_vector (p)))
1553 { 1514 {
1554 int i; 1515 int i;
1555 1516
1556 for (i = 0; i < p->object.vector.length; i++) 1517 for (i = 0; i < p->object.vector.length; i++)
1557 mark (vecvalue (p)[i]); 1518 mark (vecvalue (p)[i]);
… …
1680} 1641}
1681 1642
1682static void 1643static void
1683finalize_cell (SCHEME_P_ pointer a) 1644finalize_cell (SCHEME_P_ pointer a)
1684{ 1645{
1646 /* TODO, fast bitmap check? */
1685 if (is_string (a)) 1647 if (is_string (a))
1686 free (strvalue (a)); 1648 free (strvalue (a));
1687 else if (is_vector (a)) 1649 else if (is_vector (a))
1688 free (vecvalue (a)); 1650 free (vecvalue (a));
1689#if USE_PORTS 1651#if USE_PORTS
… …
2784 } 2746 }
2785 else if (is_number (a)) 2747 else if (is_number (a))
2786 { 2748 {
2787 if (is_number (b)) 2749 if (is_number (b))
2788 if (num_is_integer (a) == num_is_integer (b)) 2750 if (num_is_integer (a) == num_is_integer (b))
2789 return num_eq (nvalue (a), nvalue (b)); 2751 return num_cmp (nvalue (a), nvalue (b)) == 0;
2790 2752
2791 return 0; 2753 return 0;
2792 } 2754 }
2793 else if (is_character (a)) 2755 else if (is_character (a))
2794 { 2756 {
… …
2970 return cdr (slot); 2932 return cdr (slot);
2971} 2933}
2972 2934
2973/* ========== Evaluation Cycle ========== */ 2935/* ========== Evaluation Cycle ========== */
2974 2936
2975static pointer 2937static int
2976xError_1 (SCHEME_P_ const char *s, pointer a) 2938xError_1 (SCHEME_P_ const char *s, pointer a)
2977{ 2939{
2978#if USE_ERROR_HOOK 2940#if USE_ERROR_HOOK
2979 pointer x; 2941 pointer x;
2980 pointer hdl = SCHEME_V->ERROR_HOOK; 2942 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3015 code = cons (mk_string (SCHEME_A_ s), code); 2977 code = cons (mk_string (SCHEME_A_ s), code);
3016 setimmutable (car (code)); 2978 setimmutable (car (code));
3017 SCHEME_V->code = cons (slot_value_in_env (x), code); 2979 SCHEME_V->code = cons (slot_value_in_env (x), code);
3018 SCHEME_V->op = OP_EVAL; 2980 SCHEME_V->op = OP_EVAL;
3019 2981
3020 return S_T; 2982 return 0;
3021 } 2983 }
3022#endif 2984#endif
3023 2985
3024 if (a) 2986 if (a)
3025 SCHEME_V->args = cons (a, NIL); 2987 SCHEME_V->args = cons (a, NIL);
… …
3027 SCHEME_V->args = NIL; 2989 SCHEME_V->args = NIL;
3028 2990
3029 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);
3030 setimmutable (car (SCHEME_V->args)); 2992 setimmutable (car (SCHEME_V->args));
3031 SCHEME_V->op = OP_ERR0; 2993 SCHEME_V->op = OP_ERR0;
2994
3032 return S_T; 2995 return 0;
3033} 2996}
3034 2997
3035#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)
3036#define Error_0(s) Error_1 (s, 0) 2999#define Error_0(s) Error_1 (s, 0)
3037 3000
3038/* Too small to turn into function */ 3001/* Too small to turn into function */
3039#define BEGIN do { 3002#define BEGIN do {
3040#define END } while (0) 3003#define END } while (0)
3041#define s_goto(a) BEGIN \ 3004#define s_goto(a) BEGIN \
3042 SCHEME_V->op = a; \ 3005 SCHEME_V->op = a; \
3043 return S_T; END 3006 return 0; END
3044 3007
3045#define s_return(a) return xs_return (SCHEME_A_ a) 3008#define s_return(a) return xs_return (SCHEME_A_ a)
3046 3009
3047#ifndef USE_SCHEME_STACK 3010#ifndef USE_SCHEME_STACK
3048 3011
… …
3073 next_frame = SCHEME_V->dump_base + nframes; 3036 next_frame = SCHEME_V->dump_base + nframes;
3074 3037
3075 next_frame->op = op; 3038 next_frame->op = op;
3076 next_frame->args = args; 3039 next_frame->args = args;
3077 next_frame->envir = SCHEME_V->envir; 3040 next_frame->envir = SCHEME_V->envir;
3078 next_frame->code = code; 3041 next_frame->code = code;
3079 3042
3080 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3081} 3044}
3082 3045
3083static pointer 3046static int
3084xs_return (SCHEME_P_ pointer a) 3047xs_return (SCHEME_P_ pointer a)
3085{ 3048{
3086 int nframes = (uintptr_t)SCHEME_V->dump; 3049 int nframes = (uintptr_t)SCHEME_V->dump;
3087 struct dump_stack_frame *frame; 3050 struct dump_stack_frame *frame;
3088 3051
3089 SCHEME_V->value = a; 3052 SCHEME_V->value = a;
3090 3053
3091 if (nframes <= 0) 3054 if (nframes <= 0)
3092 return NIL; 3055 return -1;
3093 3056
3094 frame = &SCHEME_V->dump_base[--nframes]; 3057 frame = &SCHEME_V->dump_base[--nframes];
3095 SCHEME_V->op = frame->op; 3058 SCHEME_V->op = frame->op;
3096 SCHEME_V->args = frame->args; 3059 SCHEME_V->args = frame->args;
3097 SCHEME_V->envir = frame->envir; 3060 SCHEME_V->envir = frame->envir;
3098 SCHEME_V->code = frame->code; 3061 SCHEME_V->code = frame->code;
3099 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3100 3063
3101 return S_T; 3064 return 0;
3102} 3065}
3103 3066
3104static INLINE void 3067static INLINE void
3105dump_stack_reset (SCHEME_P) 3068dump_stack_reset (SCHEME_P)
3106{ 3069{
… …
3201dump_stack_free (SCHEME_P) 3164dump_stack_free (SCHEME_P)
3202{ 3165{
3203 SCHEME_V->dump = NIL; 3166 SCHEME_V->dump = NIL;
3204} 3167}
3205 3168
3206static pointer 3169static int
3207xs_return (SCHEME_P_ pointer a) 3170xs_return (SCHEME_P_ pointer a)
3208{ 3171{
3209 pointer dump = SCHEME_V->dump; 3172 pointer dump = SCHEME_V->dump;
3210 3173
3211 SCHEME_V->value = a; 3174 SCHEME_V->value = a;
3212 3175
3213 if (dump == NIL) 3176 if (dump == NIL)
3214 return NIL; 3177 return -1;
3215 3178
3216 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3217 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3218 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3219 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3220 3183
3221 SCHEME_V->dump = dump; 3184 SCHEME_V->dump = dump;
3222 3185
3223 return S_T; 3186 return 0;
3224} 3187}
3225 3188
3226static void 3189static void
3227s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3228{ 3191{
… …
3253 3216
3254#endif 3217#endif
3255 3218
3256#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3257 3220
3258static pointer 3221static int
3259opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3222opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3260{ 3223{
3224 pointer args = SCHEME_V->args;
3261 pointer x, y; 3225 pointer x, y;
3262 3226
3263 switch (op) 3227 switch (op)
3264 { 3228 {
3265 case OP_LOAD: /* load */ 3229 case OP_LOAD: /* load */
3266 if (file_interactive (SCHEME_A)) 3230 if (file_interactive (SCHEME_A))
3267 { 3231 {
3268 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3269 //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)));
3270 } 3234 }
3271 3235
3272 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3236 if (!file_push (SCHEME_A_ strvalue (car (args))))
3273 Error_1 ("unable to open", car (SCHEME_V->args)); 3237 Error_1 ("unable to open", car (args));
3274 else 3238 else
3275 { 3239 {
3276 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3277 s_goto (OP_T0LVL); 3241 s_goto (OP_T0LVL);
3278 } 3242 }
… …
3352 case OP_EVAL: /* main part of evaluation */ 3316 case OP_EVAL: /* main part of evaluation */
3353#if USE_TRACING 3317#if USE_TRACING
3354 if (SCHEME_V->tracing) 3318 if (SCHEME_V->tracing)
3355 { 3319 {
3356 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3320 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3357 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);
3358 SCHEME_V->args = SCHEME_V->code; 3322 SCHEME_V->args = SCHEME_V->code;
3359 putstr (SCHEME_A_ "\nEval: "); 3323 putstr (SCHEME_A_ "\nEval: ");
3360 s_goto (OP_P0LIST); 3324 s_goto (OP_P0LIST);
3361 } 3325 }
3362 3326
… …
3406 SCHEME_V->code = cdr (SCHEME_V->code); 3370 SCHEME_V->code = cdr (SCHEME_V->code);
3407 s_goto (OP_E1ARGS); 3371 s_goto (OP_E1ARGS);
3408 } 3372 }
3409 3373
3410 case OP_E1ARGS: /* eval arguments */ 3374 case OP_E1ARGS: /* eval arguments */
3411 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3375 args = cons (SCHEME_V->value, args);
3412 3376
3413 if (is_pair (SCHEME_V->code)) /* continue */ 3377 if (is_pair (SCHEME_V->code)) /* continue */
3414 { 3378 {
3415 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));
3416 SCHEME_V->code = car (SCHEME_V->code); 3380 SCHEME_V->code = car (SCHEME_V->code);
3417 SCHEME_V->args = NIL; 3381 SCHEME_V->args = NIL;
3418 s_goto (OP_EVAL); 3382 s_goto (OP_EVAL);
3419 } 3383 }
3420 else /* end */ 3384 else /* end */
3421 { 3385 {
3422 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3386 args = reverse_in_place (SCHEME_A_ NIL, args);
3423 SCHEME_V->code = car (SCHEME_V->args); 3387 SCHEME_V->code = car (args);
3424 SCHEME_V->args = cdr (SCHEME_V->args); 3388 SCHEME_V->args = cdr (args);
3425 s_goto (OP_APPLY); 3389 s_goto (OP_APPLY);
3426 } 3390 }
3427 3391
3428#if USE_TRACING 3392#if USE_TRACING
3429 3393
3430 case OP_TRACING: 3394 case OP_TRACING:
3431 { 3395 {
3432 int tr = SCHEME_V->tracing; 3396 int tr = SCHEME_V->tracing;
3433 3397
3434 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3398 SCHEME_V->tracing = ivalue (car (args));
3435 s_return (mk_integer (SCHEME_A_ tr)); 3399 s_return (mk_integer (SCHEME_A_ tr));
3436 } 3400 }
3437 3401
3438#endif 3402#endif
3439 3403
3440 case OP_APPLY: /* apply 'code' to 'args' */ 3404 case OP_APPLY: /* apply 'code' to 'args' */
3441#if USE_TRACING 3405#if USE_TRACING
3442 if (SCHEME_V->tracing) 3406 if (SCHEME_V->tracing)
3443 { 3407 {
3444 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);
3445 SCHEME_V->print_flag = 1; 3409 SCHEME_V->print_flag = 1;
3446 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3410 /* args=cons(SCHEME_V->code,args); */
3447 putstr (SCHEME_A_ "\nApply to: "); 3411 putstr (SCHEME_A_ "\nApply to: ");
3448 s_goto (OP_P0LIST); 3412 s_goto (OP_P0LIST);
3449 } 3413 }
3450 3414
3451 /* fall through */ 3415 /* fall through */
3452 3416
3453 case OP_REAL_APPLY: 3417 case OP_REAL_APPLY:
3454#endif 3418#endif
3455 if (is_proc (SCHEME_V->code)) 3419 if (is_proc (SCHEME_V->code))
3456 {
3457 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3458 }
3459 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3460 { 3422 {
3461 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3462 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3463 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3464 3426
3465 s_return (x); 3427 s_return (x);
3466 } 3428 }
3467 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 */
3468 { 3430 {
3469 /* Should not accept promise */ 3431 /* Should not accept promise */
3470 /* make environment */ 3432 /* make environment */
3471 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3472 3434
3473 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))
3474 { 3436 {
3475 if (y == NIL) 3437 if (y == NIL)
3476 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3477 else 3439 else
3478 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3496 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3497 } 3459 }
3498 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3499 { 3461 {
3500 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3501 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3502 } 3464 }
3503 else 3465 else
3504 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3505 3467
3506 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3515 { 3477 {
3516 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);
3517 3479
3518 if (f != NIL) 3480 if (f != NIL)
3519 { 3481 {
3520 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3521 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3522 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3523 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3524 } 3486 }
3525 3487
… …
3536 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));
3537 3499
3538#endif 3500#endif
3539 3501
3540 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3541 x = car (SCHEME_V->args); 3503 x = car (args);
3542 3504
3543 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3544 x = cdr (x); 3506 x = cdr (x);
3545 3507
3546 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3547 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3548 else 3510 else
3549 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3550 3512
3551 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3552 3514
3553 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3554 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3586 3548
3587 3549
3588 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3589 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3590 3552
3591 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3592 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3593 3555
3594 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);
3595 3557
3596 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3597 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3598 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));
3599 3561
… …
3630 3592
3631 case OP_IF1: /* if */ 3593 case OP_IF1: /* if */
3632 if (is_true (SCHEME_V->value)) 3594 if (is_true (SCHEME_V->value))
3633 SCHEME_V->code = car (SCHEME_V->code); 3595 SCHEME_V->code = car (SCHEME_V->code);
3634 else 3596 else
3635 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 */
3636
3637 * car(NIL) = NIL */
3638 s_goto (OP_EVAL); 3598 s_goto (OP_EVAL);
3639 3599
3640 case OP_LET0: /* let */ 3600 case OP_LET0: /* let */
3641 SCHEME_V->args = NIL; 3601 SCHEME_V->args = NIL;
3642 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3643 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);
3644 s_goto (OP_LET1); 3604 s_goto (OP_LET1);
3645 3605
3646 case OP_LET1: /* let (calculate parameters) */ 3606 case OP_LET1: /* let (calculate parameters) */
3647 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3607 args = cons (SCHEME_V->value, args);
3648 3608
3649 if (is_pair (SCHEME_V->code)) /* continue */ 3609 if (is_pair (SCHEME_V->code)) /* continue */
3650 { 3610 {
3651 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)))
3652 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));
3653 3613
3654 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));
3655 SCHEME_V->code = cadar (SCHEME_V->code); 3615 SCHEME_V->code = cadar (SCHEME_V->code);
3656 SCHEME_V->args = NIL; 3616 SCHEME_V->args = NIL;
3657 s_goto (OP_EVAL); 3617 s_goto (OP_EVAL);
3658 } 3618 }
3659 else /* end */ 3619 else /* end */
3660 { 3620 {
3661 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3621 args = reverse_in_place (SCHEME_A_ NIL, args);
3662 SCHEME_V->code = car (SCHEME_V->args); 3622 SCHEME_V->code = car (args);
3663 SCHEME_V->args = cdr (SCHEME_V->args); 3623 SCHEME_V->args = cdr (args);
3664 s_goto (OP_LET2); 3624 s_goto (OP_LET2);
3665 } 3625 }
3666 3626
3667 case OP_LET2: /* let */ 3627 case OP_LET2: /* let */
3668 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3628 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3669 3629
3670 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;
3671 y != NIL; x = cdr (x), y = cdr (y)) 3631 y != NIL; x = cdr (x), y = cdr (y))
3672 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3632 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3673 3633
3674 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3634 if (is_symbol (car (SCHEME_V->code))) /* named let */
3675 { 3635 {
3676 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))
3677 { 3637 {
3678 if (!is_pair (x)) 3638 if (!is_pair (x))
3679 Error_1 ("Bad syntax of binding in let :", x); 3639 Error_1 ("Bad syntax of binding in let :", x);
3680 3640
3681 if (!is_list (SCHEME_A_ car (x))) 3641 if (!is_list (SCHEME_A_ car (x)))
3682 Error_1 ("Bad syntax of binding in let :", car (x)); 3642 Error_1 ("Bad syntax of binding in let :", car (x));
3683 3643
3684 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3644 args = cons (caar (x), args);
3685 } 3645 }
3686 3646
3687 x =
3688 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)),
3689 SCHEME_V->envir); 3648 SCHEME_V->envir);
3690 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3649 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3691 SCHEME_V->code = cddr (SCHEME_V->code); 3650 SCHEME_V->code = cddr (SCHEME_V->code);
3692 SCHEME_V->args = NIL;
3693 } 3651 }
3694 else 3652 else
3695 { 3653 {
3696 SCHEME_V->code = cdr (SCHEME_V->code); 3654 SCHEME_V->code = cdr (SCHEME_V->code);
3655 }
3656
3697 SCHEME_V->args = NIL; 3657 SCHEME_V->args = NIL;
3698 }
3699
3700 s_goto (OP_BEGIN); 3658 s_goto (OP_BEGIN);
3701 3659
3702 case OP_LET0AST: /* let* */ 3660 case OP_LET0AST: /* let* */
3703 if (car (SCHEME_V->code) == NIL) 3661 if (car (SCHEME_V->code) == NIL)
3704 { 3662 {
… …
3722 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);
3723 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3724 3682
3725 if (is_pair (SCHEME_V->code)) /* continue */ 3683 if (is_pair (SCHEME_V->code)) /* continue */
3726 { 3684 {
3727 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3685 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3728 SCHEME_V->code = cadar (SCHEME_V->code); 3686 SCHEME_V->code = cadar (SCHEME_V->code);
3729 SCHEME_V->args = NIL; 3687 SCHEME_V->args = NIL;
3730 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3731 } 3689 }
3732 else /* end */ 3690 else /* end */
3733 { 3691 {
3734 SCHEME_V->code = SCHEME_V->args; 3692 SCHEME_V->code = args;
3735 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3736 s_goto (OP_BEGIN); 3694 s_goto (OP_BEGIN);
3737 } 3695 }
3738 3696
3739 case OP_LET0REC: /* letrec */ 3697 case OP_LET0REC: /* letrec */
… …
3742 SCHEME_V->value = SCHEME_V->code; 3700 SCHEME_V->value = SCHEME_V->code;
3743 SCHEME_V->code = car (SCHEME_V->code); 3701 SCHEME_V->code = car (SCHEME_V->code);
3744 s_goto (OP_LET1REC); 3702 s_goto (OP_LET1REC);
3745 3703
3746 case OP_LET1REC: /* letrec (calculate parameters) */ 3704 case OP_LET1REC: /* letrec (calculate parameters) */
3747 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3705 args = cons (SCHEME_V->value, args);
3748 3706
3749 if (is_pair (SCHEME_V->code)) /* continue */ 3707 if (is_pair (SCHEME_V->code)) /* continue */
3750 { 3708 {
3751 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)))
3752 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));
3753 3711
3754 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));
3755 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3756 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3757 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3758 } 3716 }
3759 else /* end */ 3717 else /* end */
3760 { 3718 {
3761 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3719 args = reverse_in_place (SCHEME_A_ NIL, args);
3762 SCHEME_V->code = car (SCHEME_V->args); 3720 SCHEME_V->code = car (args);
3763 SCHEME_V->args = cdr (SCHEME_V->args); 3721 SCHEME_V->args = cdr (args);
3764 s_goto (OP_LET2REC); 3722 s_goto (OP_LET2REC);
3765 } 3723 }
3766 3724
3767 case OP_LET2REC: /* letrec */ 3725 case OP_LET2REC: /* letrec */
3768 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))
3769 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3727 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3770 3728
3771 SCHEME_V->code = cdr (SCHEME_V->code); 3729 SCHEME_V->code = cdr (SCHEME_V->code);
3772 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3773 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
… …
3859 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3860 SCHEME_V->code = car (SCHEME_V->code); 3818 SCHEME_V->code = car (SCHEME_V->code);
3861 s_goto (OP_EVAL); 3819 s_goto (OP_EVAL);
3862 3820
3863 case OP_C1STREAM: /* cons-stream */ 3821 case OP_C1STREAM: /* cons-stream */
3864 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 */
3865 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);
3866 set_typeflag (x, T_PROMISE); 3824 set_typeflag (x, T_PROMISE);
3867 s_return (cons (SCHEME_V->args, x)); 3825 s_return (cons (args, x));
3868 3826
3869 case OP_MACRO0: /* macro */ 3827 case OP_MACRO0: /* macro */
3870 if (is_pair (car (SCHEME_V->code))) 3828 if (is_pair (car (SCHEME_V->code)))
3871 { 3829 {
3872 x = caar (SCHEME_V->code); 3830 x = caar (SCHEME_V->code);
… …
3905 { 3863 {
3906 if (!is_pair (y = caar (x))) 3864 if (!is_pair (y = caar (x)))
3907 break; 3865 break;
3908 3866
3909 for (; y != NIL; y = cdr (y)) 3867 for (; y != NIL; y = cdr (y))
3910 {
3911 if (eqv (car (y), SCHEME_V->value)) 3868 if (eqv (car (y), SCHEME_V->value))
3912 break; 3869 break;
3913 }
3914 3870
3915 if (y != NIL) 3871 if (y != NIL)
3916 break; 3872 break;
3917 } 3873 }
3918 3874
… …
3938 s_goto (OP_BEGIN); 3894 s_goto (OP_BEGIN);
3939 else 3895 else
3940 s_return (NIL); 3896 s_return (NIL);
3941 3897
3942 case OP_PAPPLY: /* apply */ 3898 case OP_PAPPLY: /* apply */
3943 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3944 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3945 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3901 /*SCHEME_V->args = cadr(args); */
3946 s_goto (OP_APPLY); 3902 s_goto (OP_APPLY);
3947 3903
3948 case OP_PEVAL: /* eval */ 3904 case OP_PEVAL: /* eval */
3949 if (cdr (SCHEME_V->args) != NIL) 3905 if (cdr (args) != NIL)
3950 SCHEME_V->envir = cadr (SCHEME_V->args); 3906 SCHEME_V->envir = cadr (args);
3951 3907
3952 SCHEME_V->code = car (SCHEME_V->args); 3908 SCHEME_V->code = car (args);
3953 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
3954 3910
3955 case OP_CONTINUATION: /* call-with-current-continuation */ 3911 case OP_CONTINUATION: /* call-with-current-continuation */
3956 SCHEME_V->code = car (SCHEME_V->args); 3912 SCHEME_V->code = car (args);
3957 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);
3958 s_goto (OP_APPLY); 3914 s_goto (OP_APPLY);
3959 } 3915 }
3960 3916
3961 return S_T; 3917 abort ();
3962} 3918}
3963 3919
3964static pointer 3920static int
3965opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3921opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3966{ 3922{
3967 pointer x; 3923 pointer args = SCHEME_V->args;
3924 pointer x = car (args);
3968 num v; 3925 num v;
3969 3926
3970#if USE_MATH 3927#if USE_MATH
3971 RVALUE dd; 3928 RVALUE dd;
3972#endif 3929#endif
3973 3930
3974 switch (op) 3931 switch (op)
3975 { 3932 {
3976#if USE_MATH 3933#if USE_MATH
3977
3978 case OP_INEX2EX: /* inexact->exact */ 3934 case OP_INEX2EX: /* inexact->exact */
3979 x = car (SCHEME_V->args);
3980
3981 if (num_is_integer (x)) 3935 if (num_is_integer (x))
3982 s_return (x); 3936 s_return (x);
3983 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3937 else if (modf (rvalue_unchecked (x), &dd) == 0)
3984 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3938 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3985 else 3939 else
3986 Error_1 ("inexact->exact: not integral:", x); 3940 Error_1 ("inexact->exact: not integral:", x);
3987 3941
3988 case OP_EXP:
3989 x = car (SCHEME_V->args);
3990 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3991
3992 case OP_LOG:
3993 x = car (SCHEME_V->args);
3994 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3995
3996 case OP_SIN:
3997 x = car (SCHEME_V->args);
3998 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3999
4000 case OP_COS:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4003
4004 case OP_TAN:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4007
4008 case OP_ASIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4011
4012 case OP_ACOS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4015 3949
4016 case OP_ATAN: 3950 case OP_ATAN:
4017 x = car (SCHEME_V->args);
4018
4019 if (cdr (SCHEME_V->args) == NIL) 3951 if (cdr (args) == NIL)
4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4021 else 3953 else
4022 { 3954 {
4023 pointer y = cadr (SCHEME_V->args); 3955 pointer y = cadr (args);
4024
4025 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4026 } 3957 }
4027 3958
4028 case OP_SQRT: 3959 case OP_SQRT:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4031 3961
4032 case OP_EXPT: 3962 case OP_EXPT:
4033 { 3963 {
4034 RVALUE result; 3964 RVALUE result;
4035 int real_result = 1; 3965 int real_result = 1;
4036 pointer y = cadr (SCHEME_V->args); 3966 pointer y = cadr (args);
4037
4038 x = car (SCHEME_V->args);
4039 3967
4040 if (num_is_integer (x) && num_is_integer (y)) 3968 if (num_is_integer (x) && num_is_integer (y))
4041 real_result = 0; 3969 real_result = 0;
4042 3970
4043 /* This 'if' is an R5RS compatibility fix. */ 3971 /* This 'if' is an R5RS compatibility fix. */
4044 /* NOTE: Remove this 'if' fix for R6RS. */ 3972 /* NOTE: Remove this 'if' fix for R6RS. */
4045 if (rvalue (x) == 0 && rvalue (y) < 0) 3973 if (rvalue (x) == 0 && rvalue (y) < 0)
4046 result = 0.0; 3974 result = 0;
4047 else 3975 else
4048 result = pow (rvalue (x), rvalue (y)); 3976 result = pow (rvalue (x), rvalue (y));
4049 3977
4050 /* Before returning integer result make sure we can. */ 3978 /* Before returning integer result make sure we can. */
4051 /* If the test fails, result is too big for integer. */ 3979 /* If the test fails, result is too big for integer. */
4052 if (!real_result) 3980 if (!real_result)
4053 { 3981 {
4054 long result_as_long = (long) result; 3982 long result_as_long = result;
4055 3983
4056 if (result != (RVALUE) result_as_long) 3984 if (result != (RVALUE) result_as_long)
4057 real_result = 1; 3985 real_result = 1;
4058 } 3986 }
4059 3987
… …
4061 s_return (mk_real (SCHEME_A_ result)); 3989 s_return (mk_real (SCHEME_A_ result));
4062 else 3990 else
4063 s_return (mk_integer (SCHEME_A_ result)); 3991 s_return (mk_integer (SCHEME_A_ result));
4064 } 3992 }
4065 3993
4066 case OP_FLOOR:
4067 x = car (SCHEME_V->args);
4068 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4069
4070 case OP_CEILING:
4071 x = car (SCHEME_V->args);
4072 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4073 3996
4074 case OP_TRUNCATE: 3997 case OP_TRUNCATE:
4075 { 3998 {
4076 RVALUE rvalue_of_x; 3999 RVALUE rvalue_of_x;
4077 4000
4078 x = car (SCHEME_V->args);
4079 rvalue_of_x = rvalue (x); 4001 rvalue_of_x = rvalue (x);
4080 4002
4081 if (rvalue_of_x > 0) 4003 if (rvalue_of_x > 0)
4082 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4083 else 4005 else
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4085 } 4007 }
4086 4008
4087 case OP_ROUND: 4009 case OP_ROUND:
4088 x = car (SCHEME_V->args);
4089
4090 if (num_is_integer (x)) 4010 if (num_is_integer (x))
4091 s_return (x); 4011 s_return (x);
4092 4012
4093 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4094#endif 4014#endif
4095 4015
4096 case OP_ADD: /* + */ 4016 case OP_ADD: /* + */
4097 v = num_zero; 4017 v = num_zero;
4098 4018
4099 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4019 for (x = args; x != NIL; x = cdr (x))
4100 v = num_add (v, nvalue (car (x))); 4020 v = num_op ('+', v, nvalue (car (x)));
4101 4021
4102 s_return (mk_number (SCHEME_A_ v)); 4022 s_return (mk_number (SCHEME_A_ v));
4103 4023
4104 case OP_MUL: /* * */ 4024 case OP_MUL: /* * */
4105 v = num_one; 4025 v = num_one;
4106 4026
4107 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4027 for (x = args; x != NIL; x = cdr (x))
4108 v = num_mul (v, nvalue (car (x))); 4028 v = num_op ('*', v, nvalue (car (x)));
4109 4029
4110 s_return (mk_number (SCHEME_A_ v)); 4030 s_return (mk_number (SCHEME_A_ v));
4111 4031
4112 case OP_SUB: /* - */ 4032 case OP_SUB: /* - */
4113 if (cdr (SCHEME_V->args) == NIL) 4033 if (cdr (args) == NIL)
4114 { 4034 {
4115 x = SCHEME_V->args; 4035 x = args;
4116 v = num_zero; 4036 v = num_zero;
4117 } 4037 }
4118 else 4038 else
4119 { 4039 {
4120 x = cdr (SCHEME_V->args); 4040 x = cdr (args);
4121 v = nvalue (car (SCHEME_V->args)); 4041 v = nvalue (car (args));
4122 } 4042 }
4123 4043
4124 for (; x != NIL; x = cdr (x)) 4044 for (; x != NIL; x = cdr (x))
4125 v = num_sub (v, nvalue (car (x))); 4045 v = num_op ('-', v, nvalue (car (x)));
4126 4046
4127 s_return (mk_number (SCHEME_A_ v)); 4047 s_return (mk_number (SCHEME_A_ v));
4128 4048
4129 case OP_DIV: /* / */ 4049 case OP_DIV: /* / */
4130 if (cdr (SCHEME_V->args) == NIL) 4050 if (cdr (args) == NIL)
4131 { 4051 {
4132 x = SCHEME_V->args; 4052 x = args;
4133 v = num_one; 4053 v = num_one;
4134 } 4054 }
4135 else 4055 else
4136 { 4056 {
4137 x = cdr (SCHEME_V->args); 4057 x = cdr (args);
4138 v = nvalue (car (SCHEME_V->args)); 4058 v = nvalue (car (args));
4139 } 4059 }
4140 4060
4141 for (; x != NIL; x = cdr (x)) 4061 for (; x != NIL; x = cdr (x))
4142 { 4062 {
4143 if (!is_zero_rvalue (rvalue (car (x)))) 4063 if (!is_zero_rvalue (rvalue (car (x))))
… …
4147 } 4067 }
4148 4068
4149 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4150 4070
4151 case OP_INTDIV: /* quotient */ 4071 case OP_INTDIV: /* quotient */
4152 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4153 { 4073 {
4154 x = SCHEME_V->args; 4074 x = args;
4155 v = num_one; 4075 v = num_one;
4156 } 4076 }
4157 else 4077 else
4158 { 4078 {
4159 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4161 } 4081 }
4162 4082
4163 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4164 { 4084 {
4165 if (ivalue (car (x)) != 0) 4085 if (ivalue (car (x)) != 0)
4166 v = num_intdiv (v, nvalue (car (x))); 4086 v = num_op ('/', v, nvalue (car (x)));
4167 else 4087 else
4168 Error_0 ("quotient: division by zero"); 4088 Error_0 ("quotient: division by zero");
4169 } 4089 }
4170 4090
4171 s_return (mk_number (SCHEME_A_ v)); 4091 s_return (mk_number (SCHEME_A_ v));
4172 4092
4173 case OP_REM: /* remainder */ 4093 case OP_REM: /* remainder */
4174 v = nvalue (car (SCHEME_V->args)); 4094 v = nvalue (x);
4175 4095
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4096 if (ivalue (cadr (args)) != 0)
4177 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4097 v = num_rem (v, nvalue (cadr (args)));
4178 else 4098 else
4179 Error_0 ("remainder: division by zero"); 4099 Error_0 ("remainder: division by zero");
4180 4100
4181 s_return (mk_number (SCHEME_A_ v)); 4101 s_return (mk_number (SCHEME_A_ v));
4182 4102
4183 case OP_MOD: /* modulo */ 4103 case OP_MOD: /* modulo */
4184 v = nvalue (car (SCHEME_V->args)); 4104 v = nvalue (x);
4185 4105
4186 if (ivalue (cadr (SCHEME_V->args)) != 0) 4106 if (ivalue (cadr (args)) != 0)
4187 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4107 v = num_mod (v, nvalue (cadr (args)));
4188 else 4108 else
4189 Error_0 ("modulo: division by zero"); 4109 Error_0 ("modulo: division by zero");
4190 4110
4191 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4192 4112
4193 case OP_CAR: /* car */ 4113 case OP_CAR: /* car */
4194 s_return (caar (SCHEME_V->args)); 4114 s_return (caar (args));
4195 4115
4196 case OP_CDR: /* cdr */ 4116 case OP_CDR: /* cdr */
4197 s_return (cdar (SCHEME_V->args)); 4117 s_return (cdar (args));
4198 4118
4199 case OP_CONS: /* cons */ 4119 case OP_CONS: /* cons */
4200 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4120 set_cdr (args, cadr (args));
4201 s_return (SCHEME_V->args); 4121 s_return (args);
4202 4122
4203 case OP_SETCAR: /* set-car! */ 4123 case OP_SETCAR: /* set-car! */
4204 if (!is_immutable (car (SCHEME_V->args))) 4124 if (!is_immutable (x))
4205 { 4125 {
4206 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4126 set_car (x, cadr (args));
4207 s_return (car (SCHEME_V->args)); 4127 s_return (car (args));
4208 } 4128 }
4209 else 4129 else
4210 Error_0 ("set-car!: unable to alter immutable pair"); 4130 Error_0 ("set-car!: unable to alter immutable pair");
4211 4131
4212 case OP_SETCDR: /* set-cdr! */ 4132 case OP_SETCDR: /* set-cdr! */
4213 if (!is_immutable (car (SCHEME_V->args))) 4133 if (!is_immutable (x))
4214 { 4134 {
4215 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4135 set_cdr (x, cadr (args));
4216 s_return (car (SCHEME_V->args)); 4136 s_return (car (args));
4217 } 4137 }
4218 else 4138 else
4219 Error_0 ("set-cdr!: unable to alter immutable pair"); 4139 Error_0 ("set-cdr!: unable to alter immutable pair");
4220 4140
4221 case OP_CHAR2INT: /* char->integer */ 4141 case OP_CHAR2INT: /* char->integer */
4222 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4142 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4223 4143
4224 case OP_INT2CHAR: /* integer->char */ 4144 case OP_INT2CHAR: /* integer->char */
4225 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4145 s_return (mk_character (SCHEME_A_ ivalue (x)));
4226 4146
4227 case OP_CHARUPCASE: 4147 case OP_CHARUPCASE:
4228 { 4148 {
4229 unsigned char c = ivalue (car (SCHEME_V->args)); 4149 unsigned char c = ivalue (x);
4230 c = toupper (c); 4150 c = toupper (c);
4231 s_return (mk_character (SCHEME_A_ c)); 4151 s_return (mk_character (SCHEME_A_ c));
4232 } 4152 }
4233 4153
4234 case OP_CHARDNCASE: 4154 case OP_CHARDNCASE:
4235 { 4155 {
4236 unsigned char c = ivalue (car (SCHEME_V->args)); 4156 unsigned char c = ivalue (x);
4237 c = tolower (c); 4157 c = tolower (c);
4238 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4239 } 4159 }
4240 4160
4241 case OP_STR2SYM: /* string->symbol */ 4161 case OP_STR2SYM: /* string->symbol */
4242 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4162 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4243 4163
4244 case OP_STR2ATOM: /* string->atom */ 4164 case OP_STR2ATOM: /* string->atom */
4245 { 4165 {
4246 char *s = strvalue (car (SCHEME_V->args)); 4166 char *s = strvalue (x);
4247 long pf = 0; 4167 long pf = 0;
4248 4168
4249 if (cdr (SCHEME_V->args) != NIL) 4169 if (cdr (args) != NIL)
4250 { 4170 {
4251 /* we know cadr(SCHEME_V->args) is a natural number */ 4171 /* we know cadr(args) is a natural number */
4252 /* see if it is 2, 8, 10, or 16, or error */ 4172 /* see if it is 2, 8, 10, or 16, or error */
4253 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4173 pf = ivalue_unchecked (cadr (args));
4254 4174
4255 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4175 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4256 { 4176 {
4257 /* base is OK */ 4177 /* base is OK */
4258 } 4178 }
4259 else 4179 else
4260 pf = -1; 4180 pf = -1;
4261 } 4181 }
4262 4182
4263 if (pf < 0) 4183 if (pf < 0)
4264 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4184 Error_1 ("string->atom: bad base:", cadr (args));
4265 else if (*s == '#') /* no use of base! */ 4185 else if (*s == '#') /* no use of base! */
4266 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4186 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4267 else 4187 else
4268 { 4188 {
4269 if (pf == 0 || pf == 10) 4189 if (pf == 0 || pf == 10)
… …
4280 } 4200 }
4281 } 4201 }
4282 } 4202 }
4283 4203
4284 case OP_SYM2STR: /* symbol->string */ 4204 case OP_SYM2STR: /* symbol->string */
4285 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4205 x = mk_string (SCHEME_A_ symname (x));
4286 setimmutable (x); 4206 setimmutable (x);
4287 s_return (x); 4207 s_return (x);
4288 4208
4289 case OP_ATOM2STR: /* atom->string */ 4209 case OP_ATOM2STR: /* atom->string */
4290 { 4210 {
4291 long pf = 0; 4211 long pf = 0;
4292 4212
4293 x = car (SCHEME_V->args);
4294
4295 if (cdr (SCHEME_V->args) != NIL) 4213 if (cdr (args) != NIL)
4296 { 4214 {
4297 /* we know cadr(SCHEME_V->args) is a natural number */ 4215 /* we know cadr(args) is a natural number */
4298 /* see if it is 2, 8, 10, or 16, or error */ 4216 /* see if it is 2, 8, 10, or 16, or error */
4299 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4217 pf = ivalue_unchecked (cadr (args));
4300 4218
4301 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))
4302 { 4220 {
4303 /* base is OK */ 4221 /* base is OK */
4304 } 4222 }
4305 else 4223 else
4306 pf = -1; 4224 pf = -1;
4307 } 4225 }
4308 4226
4309 if (pf < 0) 4227 if (pf < 0)
4310 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4228 Error_1 ("atom->string: bad base:", cadr (args));
4311 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))
4312 { 4230 {
4313 char *p; 4231 char *p;
4314 int len; 4232 int len;
4315 4233
… …
4323 case OP_MKSTRING: /* make-string */ 4241 case OP_MKSTRING: /* make-string */
4324 { 4242 {
4325 int fill = ' '; 4243 int fill = ' ';
4326 int len; 4244 int len;
4327 4245
4328 len = ivalue (car (SCHEME_V->args)); 4246 len = ivalue (x);
4329 4247
4330 if (cdr (SCHEME_V->args) != NIL) 4248 if (cdr (args) != NIL)
4331 fill = charvalue (cadr (SCHEME_V->args)); 4249 fill = charvalue (cadr (args));
4332 4250
4333 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4251 s_return (mk_empty_string (SCHEME_A_ len, fill));
4334 } 4252 }
4335 4253
4336 case OP_STRLEN: /* string-length */ 4254 case OP_STRLEN: /* string-length */
4337 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4255 s_return (mk_integer (SCHEME_A_ strlength (x)));
4338 4256
4339 case OP_STRREF: /* string-ref */ 4257 case OP_STRREF: /* string-ref */
4340 { 4258 {
4341 char *str; 4259 char *str;
4342 int index; 4260 int index;
4343 4261
4344 str = strvalue (car (SCHEME_V->args)); 4262 str = strvalue (x);
4345 4263
4346 index = ivalue (cadr (SCHEME_V->args)); 4264 index = ivalue (cadr (args));
4347 4265
4348 if (index >= strlength (car (SCHEME_V->args))) 4266 if (index >= strlength (x))
4349 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4267 Error_1 ("string-ref: out of bounds:", cadr (args));
4350 4268
4351 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4269 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4352 } 4270 }
4353 4271
4354 case OP_STRSET: /* string-set! */ 4272 case OP_STRSET: /* string-set! */
4355 { 4273 {
4356 char *str; 4274 char *str;
4357 int index; 4275 int index;
4358 int c; 4276 int c;
4359 4277
4360 if (is_immutable (car (SCHEME_V->args))) 4278 if (is_immutable (x))
4361 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4279 Error_1 ("string-set!: unable to alter immutable string:", x);
4362 4280
4363 str = strvalue (car (SCHEME_V->args)); 4281 str = strvalue (x);
4364 4282
4365 index = ivalue (cadr (SCHEME_V->args)); 4283 index = ivalue (cadr (args));
4366 4284
4367 if (index >= strlength (car (SCHEME_V->args))) 4285 if (index >= strlength (x))
4368 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4286 Error_1 ("string-set!: out of bounds:", cadr (args));
4369 4287
4370 c = charvalue (caddr (SCHEME_V->args)); 4288 c = charvalue (caddr (args));
4371 4289
4372 str[index] = (char) c; 4290 str[index] = c;
4373 s_return (car (SCHEME_V->args)); 4291 s_return (car (args));
4374 } 4292 }
4375 4293
4376 case OP_STRAPPEND: /* string-append */ 4294 case OP_STRAPPEND: /* string-append */
4377 { 4295 {
4378 /* 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 */
4379 int len = 0; 4297 int len = 0;
4380 pointer newstr; 4298 pointer newstr;
4381 char *pos; 4299 char *pos;
4382 4300
4383 /* compute needed length for new string */ 4301 /* compute needed length for new string */
4384 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4302 for (x = args; x != NIL; x = cdr (x))
4385 len += strlength (car (x)); 4303 len += strlength (car (x));
4386 4304
4387 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4305 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4388 4306
4389 /* store the contents of the argument strings into the new string */ 4307 /* store the contents of the argument strings into the new string */
4390 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))
4391 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4309 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4392 4310
4393 s_return (newstr); 4311 s_return (newstr);
4394 } 4312 }
4395 4313
… …
4398 char *str; 4316 char *str;
4399 int index0; 4317 int index0;
4400 int index1; 4318 int index1;
4401 int len; 4319 int len;
4402 4320
4403 str = strvalue (car (SCHEME_V->args)); 4321 str = strvalue (x);
4404 4322
4405 index0 = ivalue (cadr (SCHEME_V->args)); 4323 index0 = ivalue (cadr (args));
4406 4324
4407 if (index0 > strlength (car (SCHEME_V->args))) 4325 if (index0 > strlength (x))
4408 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4326 Error_1 ("substring: start out of bounds:", cadr (args));
4409 4327
4410 if (cddr (SCHEME_V->args) != NIL) 4328 if (cddr (args) != NIL)
4411 { 4329 {
4412 index1 = ivalue (caddr (SCHEME_V->args)); 4330 index1 = ivalue (caddr (args));
4413 4331
4414 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4332 if (index1 > strlength (x) || index1 < index0)
4415 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4333 Error_1 ("substring: end out of bounds:", caddr (args));
4416 } 4334 }
4417 else 4335 else
4418 index1 = strlength (car (SCHEME_V->args)); 4336 index1 = strlength (x);
4419 4337
4420 len = index1 - index0; 4338 len = index1 - index0;
4421 x = mk_empty_string (SCHEME_A_ len, ' '); 4339 x = mk_empty_string (SCHEME_A_ len, ' ');
4422 memcpy (strvalue (x), str + index0, len); 4340 memcpy (strvalue (x), str + index0, len);
4423 strvalue (x)[len] = 0; 4341 strvalue (x)[len] = 0;
… …
4427 4345
4428 case OP_VECTOR: /* vector */ 4346 case OP_VECTOR: /* vector */
4429 { 4347 {
4430 int i; 4348 int i;
4431 pointer vec; 4349 pointer vec;
4432 int len = list_length (SCHEME_A_ SCHEME_V->args); 4350 int len = list_length (SCHEME_A_ args);
4433 4351
4434 if (len < 0) 4352 if (len < 0)
4435 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4353 Error_1 ("vector: not a proper list:", args);
4436 4354
4437 vec = mk_vector (SCHEME_A_ len); 4355 vec = mk_vector (SCHEME_A_ len);
4438 4356
4439#if USE_ERROR_CHECKING 4357#if USE_ERROR_CHECKING
4440 if (SCHEME_V->no_memory) 4358 if (SCHEME_V->no_memory)
4441 s_return (S_SINK); 4359 s_return (S_SINK);
4442#endif 4360#endif
4443 4361
4444 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++)
4445 set_vector_elem (vec, i, car (x)); 4363 set_vector_elem (vec, i, car (x));
4446 4364
4447 s_return (vec); 4365 s_return (vec);
4448 } 4366 }
4449 4367
… …
4451 { 4369 {
4452 pointer fill = NIL; 4370 pointer fill = NIL;
4453 int len; 4371 int len;
4454 pointer vec; 4372 pointer vec;
4455 4373
4456 len = ivalue (car (SCHEME_V->args)); 4374 len = ivalue (x);
4457 4375
4458 if (cdr (SCHEME_V->args) != NIL) 4376 if (cdr (args) != NIL)
4459 fill = cadr (SCHEME_V->args); 4377 fill = cadr (args);
4460 4378
4461 vec = mk_vector (SCHEME_A_ len); 4379 vec = mk_vector (SCHEME_A_ len);
4462 4380
4463#if USE_ERROR_CHECKING 4381#if USE_ERROR_CHECKING
4464 if (SCHEME_V->no_memory) 4382 if (SCHEME_V->no_memory)
… …
4470 4388
4471 s_return (vec); 4389 s_return (vec);
4472 } 4390 }
4473 4391
4474 case OP_VECLEN: /* vector-length */ 4392 case OP_VECLEN: /* vector-length */
4475 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4393 s_return (mk_integer (SCHEME_A_ veclength (x)));
4476 4394
4477 case OP_VECREF: /* vector-ref */ 4395 case OP_VECREF: /* vector-ref */
4478 { 4396 {
4479 int index; 4397 int index;
4480 4398
4481 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4482 4400
4483 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4484 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-ref: out of bounds:", cadr (args));
4485 4403
4486 s_return (vector_elem (car (SCHEME_V->args), index)); 4404 s_return (vector_elem (x, index));
4487 } 4405 }
4488 4406
4489 case OP_VECSET: /* vector-set! */ 4407 case OP_VECSET: /* vector-set! */
4490 { 4408 {
4491 int index; 4409 int index;
4492 4410
4493 if (is_immutable (car (SCHEME_V->args))) 4411 if (is_immutable (x))
4494 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4412 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4495 4413
4496 index = ivalue (cadr (SCHEME_V->args)); 4414 index = ivalue (cadr (args));
4497 4415
4498 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4416 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4499 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4417 Error_1 ("vector-set!: out of bounds:", cadr (args));
4500 4418
4501 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4419 set_vector_elem (x, index, caddr (args));
4502 s_return (car (SCHEME_V->args)); 4420 s_return (x);
4503 } 4421 }
4504 } 4422 }
4505 4423
4506 return S_T; 4424 abort ();
4507} 4425}
4508 4426
4509INTERFACE int 4427INTERFACE int
4510is_list (SCHEME_P_ pointer a) 4428is_list (SCHEME_P_ pointer a)
4511{ 4429{
… …
4558 return -1; 4476 return -1;
4559 } 4477 }
4560 } 4478 }
4561} 4479}
4562 4480
4563static 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
4564opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4513opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4565{ 4514{
4566 pointer x; 4515 pointer args = SCHEME_V->args;
4567 num v; 4516 pointer a = car (args);
4568 int (*comp_func) (num, num); 4517 pointer d = cdr (args);
4518 int r;
4569 4519
4570 switch (op) 4520 switch (op)
4571 { 4521 {
4572 case OP_NOT: /* not */ 4522 case OP_NOT: /* not */ r = is_false (a) ; break;
4573 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;
4574 4532
4575 case OP_BOOLP: /* boolean? */
4576 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4577
4578 case OP_EOFOBJP: /* boolean? */
4579 s_retbool (car (SCHEME_V->args) == S_EOF);
4580
4581 case OP_NULLP: /* null? */
4582 s_retbool (car (SCHEME_V->args) == NIL);
4583
4584 case OP_NUMEQ: /* = */
4585 case OP_LESS: /* < */
4586 case OP_GRE: /* > */
4587 case OP_LEQ: /* <= */
4588 case OP_GEQ: /* >= */
4589 switch (op)
4590 {
4591 case OP_NUMEQ:
4592 comp_func = num_eq;
4593 break;
4594
4595 case OP_LESS:
4596 comp_func = num_lt;
4597 break;
4598
4599 case OP_GRE:
4600 comp_func = num_gt;
4601 break;
4602
4603 case OP_LEQ:
4604 comp_func = num_le;
4605 break;
4606
4607 case OP_GEQ:
4608 comp_func = num_ge;
4609 break;
4610 }
4611
4612 x = SCHEME_V->args;
4613 v = nvalue (car (x));
4614 x = cdr (x);
4615
4616 for (; x != NIL; x = cdr (x))
4617 {
4618 if (!comp_func (v, nvalue (car (x))))
4619 s_retbool (0);
4620
4621 v = nvalue (car (x));
4622 }
4623
4624 s_retbool (1);
4625
4626 case OP_SYMBOLP: /* symbol? */
4627 s_retbool (is_symbol (car (SCHEME_V->args)));
4628
4629 case OP_NUMBERP: /* number? */
4630 s_retbool (is_number (car (SCHEME_V->args)));
4631
4632 case OP_STRINGP: /* string? */
4633 s_retbool (is_string (car (SCHEME_V->args)));
4634
4635 case OP_INTEGERP: /* integer? */
4636 s_retbool (is_integer (car (SCHEME_V->args)));
4637
4638 case OP_REALP: /* real? */
4639 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4640
4641 case OP_CHARP: /* char? */
4642 s_retbool (is_character (car (SCHEME_V->args)));
4643#if USE_CHAR_CLASSIFIERS 4533#if USE_CHAR_CLASSIFIERS
4644
4645 case OP_CHARAP: /* char-alphabetic? */ 4534 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4646 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4535 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4647
4648 case OP_CHARNP: /* char-numeric? */
4649 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4650
4651 case OP_CHARWP: /* char-whitespace? */ 4536 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4652 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4653
4654 case OP_CHARUP: /* char-upper-case? */ 4537 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4655 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARLP: /* char-lower-case? */ 4538 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4658 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4659#endif 4539#endif
4540
4660#if USE_PORTS 4541#if USE_PORTS
4661 4542 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4662 case OP_PORTP: /* port? */
4663 s_retbool (is_port (car (SCHEME_V->args)));
4664
4665 case OP_INPORTP: /* input-port? */ 4543 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4666 s_retbool (is_inport (car (SCHEME_V->args)));
4667
4668 case OP_OUTPORTP: /* output-port? */ 4544 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4669 s_retbool (is_outport (car (SCHEME_V->args)));
4670#endif 4545#endif
4671 4546
4672 case OP_PROCP: /* procedure? */ 4547 case OP_PROCP: /* procedure? */
4673 4548
4674 /*-- 4549 /*--
4675 * continuation should be procedure by the example 4550 * continuation should be procedure by the example
4676 * (call-with-current-continuation procedure?) ==> #t 4551 * (call-with-current-continuation procedure?) ==> #t
4677 * in R^3 report sec. 6.9 4552 * in R^3 report sec. 6.9
4678 */ 4553 */
4679 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);
4680 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4555 break;
4681 4556
4682 case OP_PAIRP: /* pair? */ 4557 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4683 s_retbool (is_pair (car (SCHEME_V->args))); 4558 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4684 4559 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4685 case OP_LISTP: /* list? */ 4560 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4686 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4561 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4687 4562 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4688 case OP_ENVP: /* environment? */
4689 s_retbool (is_environment (car (SCHEME_V->args)));
4690
4691 case OP_VECTORP: /* vector? */
4692 s_retbool (is_vector (car (SCHEME_V->args)));
4693
4694 case OP_EQ: /* eq? */
4695 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4696
4697 case OP_EQV: /* eqv? */
4698 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4699 } 4563 }
4700 4564
4701 return S_T; 4565 s_retbool (r);
4702} 4566}
4703 4567
4704static pointer 4568static int
4705opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4569opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4706{ 4570{
4571 pointer args = SCHEME_V->args;
4572 pointer a = car (args);
4707 pointer x, y; 4573 pointer x, y;
4708 4574
4709 switch (op) 4575 switch (op)
4710 { 4576 {
4711 case OP_FORCE: /* force */ 4577 case OP_FORCE: /* force */
4712 SCHEME_V->code = car (SCHEME_V->args); 4578 SCHEME_V->code = a;
4713 4579
4714 if (is_promise (SCHEME_V->code)) 4580 if (is_promise (SCHEME_V->code))
4715 { 4581 {
4716 /* Should change type to closure here */ 4582 /* Should change type to closure here */
4717 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4583 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4738 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4604 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4739 SCHEME_V->outport = cadr (SCHEME_V->args); 4605 SCHEME_V->outport = cadr (SCHEME_V->args);
4740 } 4606 }
4741 } 4607 }
4742 4608
4743 SCHEME_V->args = car (SCHEME_V->args); 4609 SCHEME_V->args = a;
4744 4610
4745 if (op == OP_WRITE) 4611 if (op == OP_WRITE)
4746 SCHEME_V->print_flag = 1; 4612 SCHEME_V->print_flag = 1;
4747 else 4613 else
4748 SCHEME_V->print_flag = 0; 4614 SCHEME_V->print_flag = 0;
4749 4615
4750 s_goto (OP_P0LIST); 4616 s_goto (OP_P0LIST);
4751 4617
4752 case OP_NEWLINE: /* newline */ 4618 case OP_NEWLINE: /* newline */
4753 if (is_pair (SCHEME_V->args)) 4619 if (is_pair (args))
4754 { 4620 {
4755 if (car (SCHEME_V->args) != SCHEME_V->outport) 4621 if (a != SCHEME_V->outport)
4756 { 4622 {
4757 x = cons (SCHEME_V->outport, NIL); 4623 x = cons (SCHEME_V->outport, NIL);
4758 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4624 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4759 SCHEME_V->outport = car (SCHEME_V->args); 4625 SCHEME_V->outport = a;
4760 } 4626 }
4761 } 4627 }
4762 4628
4763 putstr (SCHEME_A_ "\n"); 4629 putstr (SCHEME_A_ "\n");
4764 s_return (S_T); 4630 s_return (S_T);
4765#endif 4631#endif
4766 4632
4767 case OP_ERR0: /* error */ 4633 case OP_ERR0: /* error */
4768 SCHEME_V->retcode = -1; 4634 SCHEME_V->retcode = -1;
4769 4635
4770 if (!is_string (car (SCHEME_V->args))) 4636 if (!is_string (a))
4771 { 4637 {
4772 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4638 args = cons (mk_string (SCHEME_A_ " -- "), args);
4773 setimmutable (car (SCHEME_V->args)); 4639 setimmutable (car (args));
4774 } 4640 }
4775 4641
4776 putstr (SCHEME_A_ "Error: "); 4642 putstr (SCHEME_A_ "Error: ");
4777 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4643 putstr (SCHEME_A_ strvalue (car (args)));
4778 SCHEME_V->args = cdr (SCHEME_V->args); 4644 SCHEME_V->args = cdr (args);
4779 s_goto (OP_ERR1); 4645 s_goto (OP_ERR1);
4780 4646
4781 case OP_ERR1: /* error */ 4647 case OP_ERR1: /* error */
4782 putstr (SCHEME_A_ " "); 4648 putstr (SCHEME_A_ " ");
4783 4649
4784 if (SCHEME_V->args != NIL) 4650 if (args != NIL)
4785 { 4651 {
4786 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4652 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4787 SCHEME_V->args = car (SCHEME_V->args); 4653 SCHEME_V->args = a;
4788 SCHEME_V->print_flag = 1; 4654 SCHEME_V->print_flag = 1;
4789 s_goto (OP_P0LIST); 4655 s_goto (OP_P0LIST);
4790 } 4656 }
4791 else 4657 else
4792 { 4658 {
4793 putstr (SCHEME_A_ "\n"); 4659 putstr (SCHEME_A_ "\n");
4794 4660
4795 if (SCHEME_V->interactive_repl) 4661 if (SCHEME_V->interactive_repl)
4796 s_goto (OP_T0LVL); 4662 s_goto (OP_T0LVL);
4797 else 4663 else
4798 return NIL; 4664 return -1;
4799 } 4665 }
4800 4666
4801 case OP_REVERSE: /* reverse */ 4667 case OP_REVERSE: /* reverse */
4802 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4668 s_return (reverse (SCHEME_A_ a));
4803 4669
4804 case OP_LIST_STAR: /* list* */ 4670 case OP_LIST_STAR: /* list* */
4805 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4671 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4806 4672
4807 case OP_APPEND: /* append */ 4673 case OP_APPEND: /* append */
4808 x = NIL; 4674 x = NIL;
4809 y = SCHEME_V->args; 4675 y = args;
4810 4676
4811 if (y == x) 4677 if (y == x)
4812 s_return (x); 4678 s_return (x);
4813 4679
4814 /* cdr() in the while condition is not a typo. If car() */ 4680 /* cdr() in the while condition is not a typo. If car() */
… …
4825 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4691 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4826 4692
4827#if USE_PLIST 4693#if USE_PLIST
4828 4694
4829 case OP_PUT: /* put */ 4695 case OP_PUT: /* put */
4830 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4696 if (!hasprop (a) || !hasprop (cadr (args)))
4831 Error_0 ("illegal use of put"); 4697 Error_0 ("illegal use of put");
4832 4698
4833 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))
4834 { 4700 {
4835 if (caar (x) == y) 4701 if (caar (x) == y)
4836 break; 4702 break;
4837 } 4703 }
4838 4704
4839 if (x != NIL) 4705 if (x != NIL)
4840 cdar (x) = caddr (SCHEME_V->args); 4706 cdar (x) = caddr (args);
4841 else 4707 else
4842 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));
4843 4709
4844 s_return (S_T); 4710 s_return (S_T);
4845 4711
4846 case OP_GET: /* get */ 4712 case OP_GET: /* get */
4847 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4713 if (!hasprop (a) || !hasprop (cadr (args)))
4848 Error_0 ("illegal use of get"); 4714 Error_0 ("illegal use of get");
4849 4715
4850 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))
4851 if (caar (x) == y) 4717 if (caar (x) == y)
4852 break; 4718 break;
4853 4719
4854 if (x != NIL) 4720 if (x != NIL)
4855 s_return (cdar (x)); 4721 s_return (cdar (x));
… …
4857 s_return (NIL); 4723 s_return (NIL);
4858 4724
4859#endif /* USE_PLIST */ 4725#endif /* USE_PLIST */
4860 4726
4861 case OP_QUIT: /* quit */ 4727 case OP_QUIT: /* quit */
4862 if (is_pair (SCHEME_V->args)) 4728 if (is_pair (args))
4863 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4729 SCHEME_V->retcode = ivalue (a);
4864 4730
4865 return NIL; 4731 return -1;
4866 4732
4867 case OP_GC: /* gc */ 4733 case OP_GC: /* gc */
4868 gc (SCHEME_A_ NIL, NIL); 4734 gc (SCHEME_A_ NIL, NIL);
4869 s_return (S_T); 4735 s_return (S_T);
4870 4736
4871 case OP_GCVERB: /* gc-verbose */ 4737 case OP_GCVERB: /* gc-verbose */
4872 { 4738 {
4873 int was = SCHEME_V->gc_verbose; 4739 int was = SCHEME_V->gc_verbose;
4874 4740
4875 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4741 SCHEME_V->gc_verbose = (a != S_F);
4876 s_retbool (was); 4742 s_retbool (was);
4877 } 4743 }
4878 4744
4879 case OP_NEWSEGMENT: /* new-segment */ 4745 case OP_NEWSEGMENT: /* new-segment */
4880 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4746 if (!is_pair (args) || !is_number (a))
4881 Error_0 ("new-segment: argument must be a number"); 4747 Error_0 ("new-segment: argument must be a number");
4882 4748
4883 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4749 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4884 4750
4885 s_return (S_T); 4751 s_return (S_T);
4886 4752
4887 case OP_OBLIST: /* oblist */ 4753 case OP_OBLIST: /* oblist */
4888 s_return (oblist_all_symbols (SCHEME_A)); 4754 s_return (oblist_all_symbols (SCHEME_A));
… …
4915 case OP_OPEN_INOUTFILE: 4781 case OP_OPEN_INOUTFILE:
4916 prop = port_input | port_output; 4782 prop = port_input | port_output;
4917 break; 4783 break;
4918 } 4784 }
4919 4785
4920 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4786 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4921 4787
4922 if (p == NIL) 4788 if (p == NIL)
4923 s_return (S_F); 4789 s_return (S_F);
4924 4790
4925 s_return (p); 4791 s_return (p);
… …
4942 case OP_OPEN_INOUTSTRING: 4808 case OP_OPEN_INOUTSTRING:
4943 prop = port_input | port_output; 4809 prop = port_input | port_output;
4944 break; 4810 break;
4945 } 4811 }
4946 4812
4947 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4813 p = port_from_string (SCHEME_A_ strvalue (a),
4948 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4814 strvalue (a) + strlength (a), prop);
4949 4815
4950 if (p == NIL) 4816 if (p == NIL)
4951 s_return (S_F); 4817 s_return (S_F);
4952 4818
4953 s_return (p); 4819 s_return (p);
… …
4955 4821
4956 case OP_OPEN_OUTSTRING: /* open-output-string */ 4822 case OP_OPEN_OUTSTRING: /* open-output-string */
4957 { 4823 {
4958 pointer p; 4824 pointer p;
4959 4825
4960 if (car (SCHEME_V->args) == NIL) 4826 if (a == NIL)
4961 { 4827 {
4962 p = port_from_scratch (SCHEME_A); 4828 p = port_from_scratch (SCHEME_A);
4963 4829
4964 if (p == NIL) 4830 if (p == NIL)
4965 s_return (S_F); 4831 s_return (S_F);
4966 } 4832 }
4967 else 4833 else
4968 { 4834 {
4969 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4835 p = port_from_string (SCHEME_A_ strvalue (a),
4970 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4836 strvalue (a) + strlength (a), port_output);
4971 4837
4972 if (p == NIL) 4838 if (p == NIL)
4973 s_return (S_F); 4839 s_return (S_F);
4974 } 4840 }
4975 4841
… …
4978 4844
4979 case OP_GET_OUTSTRING: /* get-output-string */ 4845 case OP_GET_OUTSTRING: /* get-output-string */
4980 { 4846 {
4981 port *p; 4847 port *p;
4982 4848
4983 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4849 if ((p = a->object.port)->kind & port_string)
4984 { 4850 {
4985 off_t size; 4851 off_t size;
4986 char *str; 4852 char *str;
4987 4853
4988 size = p->rep.string.curr - p->rep.string.start + 1; 4854 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5004 } 4870 }
5005 4871
5006# endif 4872# endif
5007 4873
5008 case OP_CLOSE_INPORT: /* close-input-port */ 4874 case OP_CLOSE_INPORT: /* close-input-port */
5009 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4875 port_close (SCHEME_A_ a, port_input);
5010 s_return (S_T); 4876 s_return (S_T);
5011 4877
5012 case OP_CLOSE_OUTPORT: /* close-output-port */ 4878 case OP_CLOSE_OUTPORT: /* close-output-port */
5013 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4879 port_close (SCHEME_A_ a, port_output);
5014 s_return (S_T); 4880 s_return (S_T);
5015#endif 4881#endif
5016 4882
5017 case OP_INT_ENV: /* interaction-environment */ 4883 case OP_INT_ENV: /* interaction-environment */
5018 s_return (SCHEME_V->global_env); 4884 s_return (SCHEME_V->global_env);
… …
5020 case OP_CURR_ENV: /* current-environment */ 4886 case OP_CURR_ENV: /* current-environment */
5021 s_return (SCHEME_V->envir); 4887 s_return (SCHEME_V->envir);
5022 4888
5023 } 4889 }
5024 4890
5025 return S_T; 4891 abort ();
5026} 4892}
5027 4893
5028static pointer 4894static int
5029opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4895opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5030{ 4896{
4897 pointer args = SCHEME_V->args;
5031 pointer x; 4898 pointer x;
5032 4899
5033 if (SCHEME_V->nesting != 0) 4900 if (SCHEME_V->nesting != 0)
5034 { 4901 {
5035 int n = SCHEME_V->nesting; 4902 int n = SCHEME_V->nesting;
… …
5042 switch (op) 4909 switch (op)
5043 { 4910 {
5044 /* ========== reading part ========== */ 4911 /* ========== reading part ========== */
5045#if USE_PORTS 4912#if USE_PORTS
5046 case OP_READ: 4913 case OP_READ:
5047 if (!is_pair (SCHEME_V->args)) 4914 if (!is_pair (args))
5048 s_goto (OP_READ_INTERNAL); 4915 s_goto (OP_READ_INTERNAL);
5049 4916
5050 if (!is_inport (car (SCHEME_V->args))) 4917 if (!is_inport (car (args)))
5051 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4918 Error_1 ("read: not an input port:", car (args));
5052 4919
5053 if (car (SCHEME_V->args) == SCHEME_V->inport) 4920 if (car (args) == SCHEME_V->inport)
5054 s_goto (OP_READ_INTERNAL); 4921 s_goto (OP_READ_INTERNAL);
5055 4922
5056 x = SCHEME_V->inport; 4923 x = SCHEME_V->inport;
5057 SCHEME_V->inport = car (SCHEME_V->args); 4924 SCHEME_V->inport = car (args);
5058 x = cons (x, NIL); 4925 x = cons (x, NIL);
5059 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4926 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5060 s_goto (OP_READ_INTERNAL); 4927 s_goto (OP_READ_INTERNAL);
5061 4928
5062 case OP_READ_CHAR: /* read-char */ 4929 case OP_READ_CHAR: /* read-char */
5063 case OP_PEEK_CHAR: /* peek-char */ 4930 case OP_PEEK_CHAR: /* peek-char */
5064 { 4931 {
5065 int c; 4932 int c;
5066 4933
5067 if (is_pair (SCHEME_V->args)) 4934 if (is_pair (args))
5068 { 4935 {
5069 if (car (SCHEME_V->args) != SCHEME_V->inport) 4936 if (car (args) != SCHEME_V->inport)
5070 { 4937 {
5071 x = SCHEME_V->inport; 4938 x = SCHEME_V->inport;
5072 x = cons (x, NIL); 4939 x = cons (x, NIL);
5073 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4940 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5074 SCHEME_V->inport = car (SCHEME_V->args); 4941 SCHEME_V->inport = car (args);
5075 } 4942 }
5076 } 4943 }
5077 4944
5078 c = inchar (SCHEME_A); 4945 c = inchar (SCHEME_A);
5079 4946
… …
5089 case OP_CHAR_READY: /* char-ready? */ 4956 case OP_CHAR_READY: /* char-ready? */
5090 { 4957 {
5091 pointer p = SCHEME_V->inport; 4958 pointer p = SCHEME_V->inport;
5092 int res; 4959 int res;
5093 4960
5094 if (is_pair (SCHEME_V->args)) 4961 if (is_pair (args))
5095 p = car (SCHEME_V->args); 4962 p = car (args);
5096 4963
5097 res = p->object.port->kind & port_string; 4964 res = p->object.port->kind & port_string;
5098 4965
5099 s_retbool (res); 4966 s_retbool (res);
5100 } 4967 }
5101 4968
5102 case OP_SET_INPORT: /* set-input-port */ 4969 case OP_SET_INPORT: /* set-input-port */
5103 SCHEME_V->inport = car (SCHEME_V->args); 4970 SCHEME_V->inport = car (args);
5104 s_return (SCHEME_V->value); 4971 s_return (SCHEME_V->value);
5105 4972
5106 case OP_SET_OUTPORT: /* set-output-port */ 4973 case OP_SET_OUTPORT: /* set-output-port */
5107 SCHEME_V->outport = car (SCHEME_V->args); 4974 SCHEME_V->outport = car (args);
5108 s_return (SCHEME_V->value); 4975 s_return (SCHEME_V->value);
5109#endif 4976#endif
5110 4977
5111 case OP_RDSEXPR: 4978 case OP_RDSEXPR:
5112 switch (SCHEME_V->tok) 4979 switch (SCHEME_V->tok)
… …
5198 } 5065 }
5199 5066
5200 break; 5067 break;
5201 5068
5202 case OP_RDLIST: 5069 case OP_RDLIST:
5203 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5070 SCHEME_V->args = cons (SCHEME_V->value, args);
5204 SCHEME_V->tok = token (SCHEME_A); 5071 SCHEME_V->tok = token (SCHEME_A);
5205 5072
5206 switch (SCHEME_V->tok) 5073 switch (SCHEME_V->tok)
5207 { 5074 {
5208 case TOK_EOF: 5075 case TOK_EOF:
… …
5236 case OP_RDDOT: 5103 case OP_RDDOT:
5237 if (token (SCHEME_A) != TOK_RPAREN) 5104 if (token (SCHEME_A) != TOK_RPAREN)
5238 Error_0 ("syntax error: illegal dot expression"); 5105 Error_0 ("syntax error: illegal dot expression");
5239 5106
5240 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5107 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5241 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));
5242 5109
5243 case OP_RDQUOTE: 5110 case OP_RDQUOTE:
5244 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5111 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5245 5112
5246 case OP_RDQQUOTE: 5113 case OP_RDQQUOTE:
… …
5268 SCHEME_V->args = SCHEME_V->value; 5135 SCHEME_V->args = SCHEME_V->value;
5269 s_goto (OP_VECTOR); 5136 s_goto (OP_VECTOR);
5270 5137
5271 /* ========== printing part ========== */ 5138 /* ========== printing part ========== */
5272 case OP_P0LIST: 5139 case OP_P0LIST:
5273 if (is_vector (SCHEME_V->args)) 5140 if (is_vector (args))
5274 { 5141 {
5275 putstr (SCHEME_A_ "#("); 5142 putstr (SCHEME_A_ "#(");
5276 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5143 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5277 s_goto (OP_PVECFROM); 5144 s_goto (OP_PVECFROM);
5278 } 5145 }
5279 else if (is_environment (SCHEME_V->args)) 5146 else if (is_environment (args))
5280 { 5147 {
5281 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5148 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5282 s_return (S_T); 5149 s_return (S_T);
5283 } 5150 }
5284 else if (!is_pair (SCHEME_V->args)) 5151 else if (!is_pair (args))
5285 { 5152 {
5286 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5153 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5287 s_return (S_T); 5154 s_return (S_T);
5288 } 5155 }
5289 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5156 else
5290 { 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)
5291 putstr (SCHEME_A_ "'"); 5164 putstr (SCHEME_A_ "'");
5292 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
5293 s_goto (OP_P0LIST); 5178 s_goto (OP_P0LIST);
5294 } 5179 }
5295 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))
5296 { 5183 {
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5297 putstr (SCHEME_A_ "`"); 5185 putstr (SCHEME_A_ " ");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5186 SCHEME_V->args = car (args);
5299 s_goto (OP_P0LIST); 5187 s_goto (OP_P0LIST);
5300 } 5188 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5302 {
5303 putstr (SCHEME_A_ ",");
5304 SCHEME_V->args = cadr (SCHEME_V->args);
5305 s_goto (OP_P0LIST);
5306 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && 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
5314 {
5315 putstr (SCHEME_A_ "(");
5316 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5317 SCHEME_V->args = car (SCHEME_V->args);
5318 s_goto (OP_P0LIST);
5319 }
5320
5321 case OP_P1LIST:
5322 if (is_pair (SCHEME_V->args))
5323 {
5324 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5325 putstr (SCHEME_A_ " ");
5326 SCHEME_V->args = car (SCHEME_V->args);
5327 s_goto (OP_P0LIST);
5328 }
5329 else if (is_vector (SCHEME_V->args)) 5189 else if (is_vector (args))
5330 { 5190 {
5331 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5191 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5332 putstr (SCHEME_A_ " . "); 5192 putstr (SCHEME_A_ " . ");
5333 s_goto (OP_P0LIST); 5193 s_goto (OP_P0LIST);
5334 } 5194 }
5335 else 5195 else
5336 { 5196 {
5337 if (SCHEME_V->args != NIL) 5197 if (args != NIL)
5338 { 5198 {
5339 putstr (SCHEME_A_ " . "); 5199 putstr (SCHEME_A_ " . ");
5340 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5200 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5341 } 5201 }
5342 5202
5343 putstr (SCHEME_A_ ")"); 5203 putstr (SCHEME_A_ ")");
5344 s_return (S_T); 5204 s_return (S_T);
5345 } 5205 }
5346 5206
5347 case OP_PVECFROM: 5207 case OP_PVECFROM:
5348 { 5208 {
5349 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5209 int i = ivalue_unchecked (cdr (args));
5350 pointer vec = car (SCHEME_V->args); 5210 pointer vec = car (args);
5351 int len = veclength (vec); 5211 int len = veclength (vec);
5352 5212
5353 if (i == len) 5213 if (i == len)
5354 { 5214 {
5355 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
… …
5357 } 5217 }
5358 else 5218 else
5359 { 5219 {
5360 pointer elem = vector_elem (vec, i); 5220 pointer elem = vector_elem (vec, i);
5361 5221
5362 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5222 ivalue_unchecked (cdr (args)) = i + 1;
5363 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5364 SCHEME_V->args = elem; 5224 SCHEME_V->args = elem;
5365 5225
5366 if (i > 0) 5226 if (i > 0)
5367 putstr (SCHEME_A_ " "); 5227 putstr (SCHEME_A_ " ");
5368 5228
5369 s_goto (OP_P0LIST); 5229 s_goto (OP_P0LIST);
5370 } 5230 }
5371 } 5231 }
5372 } 5232 }
5373 5233
5374 return S_T; 5234 abort ();
5375} 5235}
5376 5236
5377static pointer 5237static int
5378opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5238opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5379{ 5239{
5240 pointer args = SCHEME_V->args;
5241 pointer a = car (args);
5380 pointer x, y; 5242 pointer x, y;
5381 5243
5382 switch (op) 5244 switch (op)
5383 { 5245 {
5384 case OP_LIST_LENGTH: /* length *//* a.k */ 5246 case OP_LIST_LENGTH: /* length *//* a.k */
5385 { 5247 {
5386 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5248 long v = list_length (SCHEME_A_ a);
5387 5249
5388 if (v < 0) 5250 if (v < 0)
5389 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5251 Error_1 ("length: not a list:", a);
5390 5252
5391 s_return (mk_integer (SCHEME_A_ v)); 5253 s_return (mk_integer (SCHEME_A_ v));
5392 } 5254 }
5393 5255
5394 case OP_ASSQ: /* assq *//* a.k */ 5256 case OP_ASSQ: /* assq *//* a.k */
5395 x = car (SCHEME_V->args); 5257 x = a;
5396 5258
5397 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5259 for (y = cadr (args); is_pair (y); y = cdr (y))
5398 { 5260 {
5399 if (!is_pair (car (y))) 5261 if (!is_pair (car (y)))
5400 Error_0 ("unable to handle non pair element"); 5262 Error_0 ("unable to handle non pair element");
5401 5263
5402 if (x == caar (y)) 5264 if (x == caar (y))
… …
5408 else 5270 else
5409 s_return (S_F); 5271 s_return (S_F);
5410 5272
5411 5273
5412 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5274 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5413 SCHEME_V->args = car (SCHEME_V->args); 5275 SCHEME_V->args = a;
5414 5276
5415 if (SCHEME_V->args == NIL) 5277 if (SCHEME_V->args == NIL)
5416 s_return (S_F); 5278 s_return (S_F);
5417 else if (is_closure (SCHEME_V->args)) 5279 else if (is_closure (SCHEME_V->args))
5418 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5280 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5424 case OP_CLOSUREP: /* closure? */ 5286 case OP_CLOSUREP: /* closure? */
5425 /* 5287 /*
5426 * Note, macro object is also a closure. 5288 * Note, macro object is also a closure.
5427 * Therefore, (closure? <#MACRO>) ==> #t 5289 * Therefore, (closure? <#MACRO>) ==> #t
5428 */ 5290 */
5429 s_retbool (is_closure (car (SCHEME_V->args))); 5291 s_retbool (is_closure (a));
5430 5292
5431 case OP_MACROP: /* macro? */ 5293 case OP_MACROP: /* macro? */
5432 s_retbool (is_macro (car (SCHEME_V->args))); 5294 s_retbool (is_macro (a));
5433 } 5295 }
5434 5296
5435 return S_T; /* NOTREACHED */ 5297 abort ();
5436} 5298}
5437 5299
5300/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5438typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5301typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5439 5302
5440typedef int (*test_predicate) (pointer); 5303typedef int (*test_predicate)(pointer);
5441static int 5304static int
5442is_any (pointer p) 5305is_any (pointer p)
5443{ 5306{
5444 return 1; 5307 return 1;
5445} 5308}
5446 5309
5447static int 5310static int
5448is_nonneg (pointer p) 5311is_nonneg (pointer p)
5449{ 5312{
5450 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);
5451} 5320}
5452 5321
5453/* Correspond carefully with following defines! */ 5322/* Correspond carefully with following defines! */
5454static struct 5323static struct
5455{ 5324{
5456 test_predicate fct; 5325 test_predicate fct;
5457 const char *kind; 5326 const char *kind;
5458} tests[] = 5327} tests[] =
5459{ 5328{
5460 { 0, 0}, /* unused */ 5329 { is_any, 0 },
5461 { is_any, 0}, 5330 { is_string, "string" },
5462 { is_string, "string" }, 5331 { is_symbol, "symbol" },
5463 { is_symbol, "symbol" }, 5332 { is_port, "port" },
5464 { is_port, "port" },
5465 { is_inport, "input port" }, 5333 { is_inport, "input port" },
5466 { is_outport, "output port" }, 5334 { is_outport, "output port" },
5467 { is_environment, "environment" }, 5335 { is_environment, "environment" },
5468 { is_pair, "pair" }, 5336 { is_pair, "pair" },
5469 { 0, "pair or '()" }, 5337 { tst_is_list, "pair or '()" },
5470 { is_character, "character" }, 5338 { is_character, "character" },
5471 { is_vector, "vector" }, 5339 { is_vector, "vector" },
5472 { is_number, "number" }, 5340 { is_number, "number" },
5473 { is_integer, "integer" }, 5341 { is_integer, "integer" },
5474 { is_nonneg, "non-negative integer" } 5342 { is_nonneg, "non-negative integer" }
5475}; 5343};
5476 5344
5477#define TST_NONE 0 5345#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5478#define TST_ANY "\001" 5346#define TST_ANY "\001"
5479#define TST_STRING "\002" 5347#define TST_STRING "\002"
5480#define TST_SYMBOL "\003" 5348#define TST_SYMBOL "\003"
5481#define TST_PORT "\004" 5349#define TST_PORT "\004"
5482#define TST_INPORT "\005" 5350#define TST_INPORT "\005"
5483#define TST_OUTPORT "\006" 5351#define TST_OUTPORT "\006"
5484#define TST_ENVIRONMENT "\007" 5352#define TST_ENVIRONMENT "\007"
5485#define TST_PAIR "\010" 5353#define TST_PAIR "\010"
5486#define TST_LIST "\011" 5354#define TST_LIST "\011"
5487#define TST_CHAR "\012" 5355#define TST_CHAR "\012"
5488#define TST_VECTOR "\013" 5356#define TST_VECTOR "\013"
5489#define TST_NUMBER "\014" 5357#define TST_NUMBER "\014"
5490#define TST_INTEGER "\015" 5358#define TST_INTEGER "\015"
5491#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}
5492 5387
5493typedef struct 5388typedef struct
5494{ 5389{
5495 dispatch_func func; 5390 uint8_t func;
5496 char *name; 5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5392 uint8_t builtin;
5497 int min_arity; 5393 uint8_t min_arity;
5498 int max_arity; 5394 uint8_t max_arity;
5499 char *arg_tests_encoding; 5395 char arg_tests_encoding[3];
5500} op_code_info; 5396} op_code_info;
5501 5397
5502#define INF_ARG 0xffff
5503
5504static op_code_info dispatch_table[] = { 5398static const op_code_info dispatch_table[] = {
5505#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 },
5506#include "opdefines.h" 5400#include "opdefines.h"
5401#undef OP_DEF
5507 {0} 5402 {0}
5508}; 5403};
5509
5510static const char *
5511procname (pointer x)
5512{
5513 int n = procnum (x);
5514 const char *name = dispatch_table[n].name;
5515
5516 if (name == 0)
5517 name = "ILLEGAL!";
5518
5519 return name;
5520}
5521 5404
5522/* kernel of this interpreter */ 5405/* kernel of this interpreter */
5523static void 5406static void
5524Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5407Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5525{ 5408{
5526 SCHEME_V->op = op; 5409 SCHEME_V->op = op;
5527 5410
5528 for (;;) 5411 for (;;)
5529 { 5412 {
5530 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5413 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5531 5414
5532#if USE_ERROR_CHECKING 5415#if USE_ERROR_CHECKING
5533 if (pcd->name) /* if built-in function, check arguments */ 5416 if (pcd->builtin) /* if built-in function, check arguments */
5534 { 5417 {
5535 int ok = 1;
5536 char msg[STRBUFFSIZE]; 5418 char msg[STRBUFFSIZE];
5537 int n = list_length (SCHEME_A_ SCHEME_V->args); 5419 int n = list_length (SCHEME_A_ SCHEME_V->args);
5538 5420
5539 /* Check number of arguments */ 5421 /* Check number of arguments */
5540 if (n < pcd->min_arity) 5422 if (ecb_expect_false (n < pcd->min_arity))
5541 { 5423 {
5542 ok = 0;
5543 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5424 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5544 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;
5545 } 5428 }
5546 5429 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5547 if (ok && n > pcd->max_arity)
5548 { 5430 {
5549 ok = 0;
5550 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5431 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5551 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;
5552 } 5435 }
5553 5436 else
5554 if (ok)
5555 { 5437 {
5556 if (pcd->arg_tests_encoding) 5438 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5557 { 5439 {
5558 int i = 0; 5440 int i = 0;
5559 int j; 5441 int j;
5560 const char *t = pcd->arg_tests_encoding; 5442 const char *t = pcd->arg_tests_encoding;
5561 pointer arglist = SCHEME_V->args; 5443 pointer arglist = SCHEME_V->args;
5562 5444
5563 do 5445 do
5564 { 5446 {
5565 pointer arg = car (arglist); 5447 pointer arg = car (arglist);
5566 5448
5567 j = (int) t[0]; 5449 j = t[0];
5568 5450
5569 if (j == TST_LIST[0]) 5451 if (!tests[j - 1].fct (arg))
5570 {
5571 if (arg != NIL && !is_pair (arg))
5572 break; 5452 break;
5573 }
5574 else
5575 {
5576 if (!tests[j].fct (arg))
5577 break;
5578 }
5579 5453
5580 if (t[1] != 0) /* last test is replicated as necessary */ 5454 if (t[1]) /* last test is replicated as necessary */
5581 t++; 5455 t++;
5582 5456
5583 arglist = cdr (arglist); 5457 arglist = cdr (arglist);
5584 i++; 5458 i++;
5585 } 5459 }
5586 while (i < n); 5460 while (i < n);
5587 5461
5588 if (i < n) 5462 if (i < n)
5589 { 5463 {
5590 ok = 0;
5591 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;
5592 } 5467 }
5593 } 5468 }
5594 } 5469 }
5595
5596 if (!ok)
5597 {
5598 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5599 return;
5600
5601 pcd = dispatch_table + SCHEME_V->op;
5602 }
5603 } 5470 }
5604#endif 5471#endif
5605 5472
5606 ok_to_freely_gc (SCHEME_A); 5473 ok_to_freely_gc (SCHEME_A);
5607 5474
5608 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))
5609 return; 5486 return;
5610 5487
5611 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5488 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5612 { 5489 {
5613 xwrstr ("No memory!\n"); 5490 xwrstr ("No memory!\n");
… …
5671 5548
5672 case 'd': 5549 case 'd':
5673 return OP_COND0; /* cond */ 5550 return OP_COND0; /* cond */
5674 5551
5675 case '*': 5552 case '*':
5676 return OP_LET0AST; /* let* */ 5553 return OP_LET0AST;/* let* */
5677 5554
5678 default: 5555 default:
5679 return OP_SET0; /* set! */ 5556 return OP_SET0; /* set! */
5680 } 5557 }
5681 5558
… …
5703 5580
5704 case 'f': 5581 case 'f':
5705 return OP_DEF0; /* define */ 5582 return OP_DEF0; /* define */
5706 5583
5707 default: 5584 default:
5708 return OP_LET0REC; /* letrec */ 5585 return OP_LET0REC;/* letrec */
5709 } 5586 }
5710 5587
5711 default: 5588 default:
5712 return OP_C0STREAM; /* cons-stream */ 5589 return OP_C0STREAM; /* cons-stream */
5713 } 5590 }
… …
5810 5687
5811 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5688 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5812 assign_syntax (SCHEME_A_ syntax_names[i]); 5689 assign_syntax (SCHEME_A_ syntax_names[i]);
5813 } 5690 }
5814 5691
5692 // TODO: should iterate via strlen, to avoid n² complexity
5815 for (i = 0; i < n; i++) 5693 for (i = 0; i < n; i++)
5816 if (dispatch_table[i].name != 0) 5694 if (dispatch_table[i].builtin)
5817 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5695 assign_proc (SCHEME_A_ i, opname (i));
5818 5696
5819 /* initialization of global pointers to special symbols */ 5697 /* initialization of global pointers to special symbols */
5820 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5698 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5821 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5699 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5822 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5700 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5963{ 5841{
5964 dump_stack_reset (SCHEME_A); 5842 dump_stack_reset (SCHEME_A);
5965 SCHEME_V->envir = SCHEME_V->global_env; 5843 SCHEME_V->envir = SCHEME_V->global_env;
5966 SCHEME_V->file_i = 0; 5844 SCHEME_V->file_i = 0;
5967 SCHEME_V->load_stack[0].kind = port_input | port_string; 5845 SCHEME_V->load_stack[0].kind = port_input | port_string;
5968 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 */
5969 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);
5970 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5848 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5971#if USE_PORTS 5849#if USE_PORTS
5972 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5850 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5973#endif 5851#endif
5974 SCHEME_V->retcode = 0; 5852 SCHEME_V->retcode = 0;
5975 SCHEME_V->interactive_repl = 0; 5853 SCHEME_V->interactive_repl = 0;

Diff Legend

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