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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.19 by root, Thu Nov 26 21:36:11 2015 UTC

… …
70/* should use libecb */ 70/* should use libecb */
71#if __GNUC__ >= 4 71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0) 73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1) 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)
75#endif 78#endif
76 79
77#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
78static scheme sc; 81static scheme sc;
79#endif 82#endif
… …
208#define T_SYNTAX 0x0010 211#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 212#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
212 215
213static num num_add (num a, num b); 216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
214static num num_mul (num a, num b); 217
215static num num_div (num a, num b); 218static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 220static num num_rem (num a, num b);
219static num num_mod (num a, num b); 221static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 222
226#if USE_MATH 223#if USE_MATH
227static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
228#endif 225#endif
229static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
250 247
251#define strvalue(p) ((p)->object.string.svalue) 248#define strvalue(p) ((p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 249#define strlength(p) ((p)->object.string.length)
253 250
254INTERFACE int is_list (SCHEME_P_ pointer p); 251INTERFACE int is_list (SCHEME_P_ pointer p);
252
255INTERFACE INLINE int 253INTERFACE INLINE int
256is_vector (pointer p) 254is_vector (pointer p)
257{ 255{
258 return type (p) == T_VECTOR; 256 return type (p) == T_VECTOR;
259} 257}
… …
376{ 374{
377 return type (p) == T_PAIR; 375 return type (p) == T_PAIR;
378} 376}
379 377
380#define car(p) ((p)->object.cons.car + 0) 378#define car(p) ((p)->object.cons.car + 0)
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 379#define cdr(p) ((p)->object.cons.cdr + 0)
382 380
383#define caar(p) car (car (p)) 381static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 382static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 383static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 384static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 385
388#define cadar(p) car (cdr (car (p))) 386static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 387static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 388static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 389
392INTERFACE void 390INTERFACE void
393set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
394{ 392{
395 p->object.cons.car = q; 393 p->object.cons.car = q;
… …
671static pointer ss_get_cont (SCHEME_P); 669static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 670static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 671static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 672static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 673static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 675static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 676static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 677static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 678static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 679static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 680static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 681static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 682static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 683
685static num 684static num
686num_add (num a, num b) 685num_op (enum num_op op, num a, num b)
687{ 686{
688 num ret; 687 num ret;
689 688
690 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));
691 690
692 if (num_is_fixnum (ret)) 691 if (num_is_fixnum (ret))
693 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 }
694 else 706 else
695 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);
696 710
697 return ret; 711 switch (op)
698} 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 }
699 718
700static num 719 num_set_rvalue (ret, av);
701num_mul (num a, num b) 720 }
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 721
712 return ret; 722 return ret;
713} 723}
714 724
715static num 725static num
… …
726 736
727 return ret; 737 return ret;
728} 738}
729 739
730static num 740static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756
757 return ret;
758}
759
760static num
761num_rem (num a, num b) 741num_rem (num a, num b)
762{ 742{
763 num ret; 743 num ret;
764 long e1, e2, res; 744 long e1, e2, res;
765 745
… …
801 781
802 num_set_ivalue (ret, res); 782 num_set_ivalue (ret, res);
803 return ret; 783 return ret;
804} 784}
805 785
786/* this completely disrespects NaNs */
806static int 787static int
807num_eq (num a, num b) 788num_cmp (num a, num b)
808{ 789{
790 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 791 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 792
812 if (is_fixnum) 793 if (is_fixnum)
813 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 }
814 else 800 else
815 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 }
816 807
817 return ret; 808 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 809}
860 810
861#if USE_MATH 811#if USE_MATH
862 812
863/* Round to nearest. Round to even if midway */ 813/* Round to nearest. Round to even if midway */
… …
873 return ce; 823 return ce;
874 else if (dfl < dce) 824 else if (dfl < dce)
875 return fl; 825 return fl;
876 else 826 else
877 { 827 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 828 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 829 return fl;
880 else 830 else
881 return ce; 831 return ce;
882 } 832 }
883} 833}
… …
2796 } 2746 }
2797 else if (is_number (a)) 2747 else if (is_number (a))
2798 { 2748 {
2799 if (is_number (b)) 2749 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b)) 2750 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2751 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2752
2803 return 0; 2753 return 0;
2804 } 2754 }
2805 else if (is_character (a)) 2755 else if (is_character (a))
2806 { 2756 {
… …
3085 next_frame = SCHEME_V->dump_base + nframes; 3035 next_frame = SCHEME_V->dump_base + nframes;
3086 3036
3087 next_frame->op = op; 3037 next_frame->op = op;
3088 next_frame->args = args; 3038 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3039 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3040 next_frame->code = code;
3091 3041
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3042 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3043}
3094 3044
3095static pointer 3045static pointer
… …
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3218#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3219
3270static pointer 3220static pointer
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3221opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3222{
3223 pointer args = SCHEME_V->args;
3273 pointer x, y; 3224 pointer x, y;
3274 3225
3275 switch (op) 3226 switch (op)
3276 { 3227 {
3277 case OP_LOAD: /* load */ 3228 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3229 if (file_interactive (SCHEME_A))
3279 { 3230 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3231 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3232 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3233 }
3283 3234
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3235 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3236 Error_1 ("unable to open", car (args));
3286 else 3237 else
3287 { 3238 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3239 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3240 s_goto (OP_T0LVL);
3290 } 3241 }
… …
3364 case OP_EVAL: /* main part of evaluation */ 3315 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3316#if USE_TRACING
3366 if (SCHEME_V->tracing) 3317 if (SCHEME_V->tracing)
3367 { 3318 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3319 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3320 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3321 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3322 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3323 s_goto (OP_P0LIST);
3373 } 3324 }
3374 3325
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3369 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3370 s_goto (OP_E1ARGS);
3420 } 3371 }
3421 3372
3422 case OP_E1ARGS: /* eval arguments */ 3373 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3374 args = cons (SCHEME_V->value, args);
3424 3375
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3376 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3377 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3378 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3379 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3380 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3381 s_goto (OP_EVAL);
3431 } 3382 }
3432 else /* end */ 3383 else /* end */
3433 { 3384 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3385 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3386 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3387 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3388 s_goto (OP_APPLY);
3438 } 3389 }
3439 3390
3440#if USE_TRACING 3391#if USE_TRACING
3441 3392
3442 case OP_TRACING: 3393 case OP_TRACING:
3443 { 3394 {
3444 int tr = SCHEME_V->tracing; 3395 int tr = SCHEME_V->tracing;
3445 3396
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3397 SCHEME_V->tracing = ivalue (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3398 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3399 }
3449 3400
3450#endif 3401#endif
3451 3402
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3403 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3404#if USE_TRACING
3454 if (SCHEME_V->tracing) 3405 if (SCHEME_V->tracing)
3455 { 3406 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3407 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3408 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3409 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3410 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3411 s_goto (OP_P0LIST);
3461 } 3412 }
3462 3413
3463 /* fall through */ 3414 /* fall through */
3464 3415
3465 case OP_REAL_APPLY: 3416 case OP_REAL_APPLY:
3466#endif 3417#endif
3467 if (is_proc (SCHEME_V->code)) 3418 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3420 else if (is_foreign (SCHEME_V->code))
3472 { 3421 {
3473 /* Keep nested calls from GC'ing the arglist */ 3422 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3423 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3424 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3425
3477 s_return (x); 3426 s_return (x);
3478 } 3427 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3428 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3429 {
3481 /* Should not accept promise */ 3430 /* Should not accept promise */
3482 /* make environment */ 3431 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3432 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3433
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3434 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3435 {
3487 if (y == NIL) 3436 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3437 Error_0 ("not enough arguments");
3489 else 3438 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3439 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3457 s_goto (OP_BEGIN);
3509 } 3458 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3459 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3460 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3461 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3462 s_return (args != NIL ? car (args) : NIL);
3514 } 3463 }
3515 else 3464 else
3516 Error_0 ("illegal function"); 3465 Error_0 ("illegal function");
3517 3466
3518 case OP_DOMACRO: /* do macro */ 3467 case OP_DOMACRO: /* do macro */
… …
3527 { 3476 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3477 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3478
3530 if (f != NIL) 3479 if (f != NIL)
3531 { 3480 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3481 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3482 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3483 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3484 s_goto (OP_APPLY);
3536 } 3485 }
3537 3486
… …
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3497 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549 3498
3550#endif 3499#endif
3551 3500
3552 case OP_MKCLOSURE: /* make-closure */ 3501 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3502 x = car (args);
3554 3503
3555 if (car (x) == SCHEME_V->LAMBDA) 3504 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3505 x = cdr (x);
3557 3506
3558 if (cdr (SCHEME_V->args) == NIL) 3507 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3508 y = SCHEME_V->envir;
3560 else 3509 else
3561 y = cadr (SCHEME_V->args); 3510 y = cadr (args);
3562 3511
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3512 s_return (mk_closure (SCHEME_A_ x, y));
3564 3513
3565 case OP_QUOTE: /* quote */ 3514 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3515 s_return (car (SCHEME_V->code));
… …
3598 3547
3599 3548
3600 case OP_DEFP: /* defined? */ 3549 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3550 x = SCHEME_V->envir;
3602 3551
3603 if (cdr (SCHEME_V->args) != NIL) 3552 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3553 x = cadr (args);
3605 3554
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3555 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3556
3608 case OP_SET0: /* set! */ 3557 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3558 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3559 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3560
… …
3642 3591
3643 case OP_IF1: /* if */ 3592 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3593 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3594 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3595 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3596 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3597 s_goto (OP_EVAL);
3651 3598
3652 case OP_LET0: /* let */ 3599 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3600 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3601 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3602 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3603 s_goto (OP_LET1);
3657 3604
3658 case OP_LET1: /* let (calculate parameters) */ 3605 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3606 args = cons (SCHEME_V->value, args);
3660 3607
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3608 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3609 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3610 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3664 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3611 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3612
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3613 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3614 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3615 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3616 s_goto (OP_EVAL);
3670 } 3617 }
3671 else /* end */ 3618 else /* end */
3672 { 3619 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3620 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3621 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3622 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3623 s_goto (OP_LET2);
3677 } 3624 }
3678 3625
3679 case OP_LET2: /* let */ 3626 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3627 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3628
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3629 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3630 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3631 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3632
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3633 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3634 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3635 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3636 {
3690 if (!is_pair (x)) 3637 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3638 Error_1 ("Bad syntax of binding in let :", x);
3692 3639
3693 if (!is_list (SCHEME_A_ car (x))) 3640 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3641 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3642
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3643 args = cons (caar (x), args);
3697 } 3644 }
3698 3645
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3646 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3647 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3648 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3649 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3650 }
3706 else 3651 else
3707 { 3652 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3653 SCHEME_V->code = cdr (SCHEME_V->code);
3654 }
3655
3709 SCHEME_V->args = NIL; 3656 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3657 s_goto (OP_BEGIN);
3713 3658
3714 case OP_LET0AST: /* let* */ 3659 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3660 if (car (SCHEME_V->code) == NIL)
3716 { 3661 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3679 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3680 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3681
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3682 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3683 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3684 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3685 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3687 s_goto (OP_EVAL);
3743 } 3688 }
3744 else /* end */ 3689 else /* end */
3745 { 3690 {
3746 SCHEME_V->code = SCHEME_V->args; 3691 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3692 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3693 s_goto (OP_BEGIN);
3749 } 3694 }
3750 3695
3751 case OP_LET0REC: /* letrec */ 3696 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3699 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3700 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3701 s_goto (OP_LET1REC);
3757 3702
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3703 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3704 args = cons (SCHEME_V->value, args);
3760 3705
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3706 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3707 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3708 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3764 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3709 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3710
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3711 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3712 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3713 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3714 s_goto (OP_EVAL);
3770 } 3715 }
3771 else /* end */ 3716 else /* end */
3772 { 3717 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3718 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3719 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3720 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3721 s_goto (OP_LET2REC);
3777 } 3722 }
3778 3723
3779 case OP_LET2REC: /* letrec */ 3724 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3725 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3726 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3727
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3728 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3729 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3730 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3816 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3817 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3818 s_goto (OP_EVAL);
3874 3819
3875 case OP_C1STREAM: /* cons-stream */ 3820 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3821 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3877 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3822 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3823 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3824 s_return (cons (args, x));
3880 3825
3881 case OP_MACRO0: /* macro */ 3826 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3827 if (is_pair (car (SCHEME_V->code)))
3883 { 3828 {
3884 x = caar (SCHEME_V->code); 3829 x = caar (SCHEME_V->code);
… …
3917 { 3862 {
3918 if (!is_pair (y = caar (x))) 3863 if (!is_pair (y = caar (x)))
3919 break; 3864 break;
3920 3865
3921 for (; y != NIL; y = cdr (y)) 3866 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3867 if (eqv (car (y), SCHEME_V->value))
3924 break; 3868 break;
3925 }
3926 3869
3927 if (y != NIL) 3870 if (y != NIL)
3928 break; 3871 break;
3929 } 3872 }
3930 3873
… …
3950 s_goto (OP_BEGIN); 3893 s_goto (OP_BEGIN);
3951 else 3894 else
3952 s_return (NIL); 3895 s_return (NIL);
3953 3896
3954 case OP_PAPPLY: /* apply */ 3897 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3898 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3899 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3900 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3901 s_goto (OP_APPLY);
3959 3902
3960 case OP_PEVAL: /* eval */ 3903 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3904 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3905 SCHEME_V->envir = cadr (args);
3963 3906
3964 SCHEME_V->code = car (SCHEME_V->args); 3907 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3908 s_goto (OP_EVAL);
3966 3909
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3910 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3911 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3912 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 3913 s_goto (OP_APPLY);
3971 } 3914 }
3972 3915
3973 return S_T; 3916 abort ();
3974} 3917}
3975 3918
3976static pointer 3919static pointer
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3920opexe_2 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3921{
3979 pointer x; 3922 pointer args = SCHEME_V->args;
3923 pointer x = car (args);
3980 num v; 3924 num v;
3981 3925
3982#if USE_MATH 3926#if USE_MATH
3983 RVALUE dd; 3927 RVALUE dd;
3984#endif 3928#endif
3985 3929
3986 switch (op) 3930 switch (op)
3987 { 3931 {
3988#if USE_MATH 3932#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3933 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args);
3992
3993 if (num_is_integer (x)) 3934 if (num_is_integer (x))
3994 s_return (x); 3935 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3936 else if (modf (rvalue_unchecked (x), &dd) == 0)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3937 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3997 else 3938 else
3998 Error_1 ("inexact->exact: not integral:", x); 3939 Error_1 ("inexact->exact: not integral:", x);
3999 3940
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3941 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3942 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3943 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3944 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3945 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3946 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3947 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 3948
4028 case OP_ATAN: 3949 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 3950 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3951 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 3952 else
4034 { 3953 {
4035 pointer y = cadr (SCHEME_V->args); 3954 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3955 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 3956 }
4039 3957
4040 case OP_SQRT: 3958 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3959 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 3960
4044 case OP_EXPT: 3961 case OP_EXPT:
4045 { 3962 {
4046 RVALUE result; 3963 RVALUE result;
4047 int real_result = 1; 3964 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 3965 pointer y = cadr (args);
4049
4050 x = car (SCHEME_V->args);
4051 3966
4052 if (num_is_integer (x) && num_is_integer (y)) 3967 if (num_is_integer (x) && num_is_integer (y))
4053 real_result = 0; 3968 real_result = 0;
4054 3969
4055 /* This 'if' is an R5RS compatibility fix. */ 3970 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 3971 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 3972 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 3973 result = 0;
4059 else 3974 else
4060 result = pow (rvalue (x), rvalue (y)); 3975 result = pow (rvalue (x), rvalue (y));
4061 3976
4062 /* Before returning integer result make sure we can. */ 3977 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 3978 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 3979 if (!real_result)
4065 { 3980 {
4066 long result_as_long = (long) result; 3981 long result_as_long = result;
4067 3982
4068 if (result != (RVALUE) result_as_long) 3983 if (result != (RVALUE) result_as_long)
4069 real_result = 1; 3984 real_result = 1;
4070 } 3985 }
4071 3986
… …
4073 s_return (mk_real (SCHEME_A_ result)); 3988 s_return (mk_real (SCHEME_A_ result));
4074 else 3989 else
4075 s_return (mk_integer (SCHEME_A_ result)); 3990 s_return (mk_integer (SCHEME_A_ result));
4076 } 3991 }
4077 3992
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3993 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3994 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 3995
4086 case OP_TRUNCATE: 3996 case OP_TRUNCATE:
4087 { 3997 {
4088 RVALUE rvalue_of_x; 3998 RVALUE rvalue_of_x;
4089 3999
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x); 4000 rvalue_of_x = rvalue (x);
4092 4001
4093 if (rvalue_of_x > 0) 4002 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4003 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4095 else 4004 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4005 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4006 }
4098 4007
4099 case OP_ROUND: 4008 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4009 if (num_is_integer (x))
4103 s_return (x); 4010 s_return (x);
4104 4011
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4012 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4013#endif
4107 4014
4108 case OP_ADD: /* + */ 4015 case OP_ADD: /* + */
4109 v = num_zero; 4016 v = num_zero;
4110 4017
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4018 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4019 v = num_op ('+', v, nvalue (car (x)));
4113 4020
4114 s_return (mk_number (SCHEME_A_ v)); 4021 s_return (mk_number (SCHEME_A_ v));
4115 4022
4116 case OP_MUL: /* * */ 4023 case OP_MUL: /* * */
4117 v = num_one; 4024 v = num_one;
4118 4025
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4026 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4027 v = num_op ('+', v, nvalue (car (x)));
4121 4028
4122 s_return (mk_number (SCHEME_A_ v)); 4029 s_return (mk_number (SCHEME_A_ v));
4123 4030
4124 case OP_SUB: /* - */ 4031 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4032 if (cdr (args) == NIL)
4126 { 4033 {
4127 x = SCHEME_V->args; 4034 x = args;
4128 v = num_zero; 4035 v = num_zero;
4129 } 4036 }
4130 else 4037 else
4131 { 4038 {
4132 x = cdr (SCHEME_V->args); 4039 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4040 v = nvalue (car (args));
4134 } 4041 }
4135 4042
4136 for (; x != NIL; x = cdr (x)) 4043 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4044 v = num_op ('+', v, nvalue (car (x)));
4138 4045
4139 s_return (mk_number (SCHEME_A_ v)); 4046 s_return (mk_number (SCHEME_A_ v));
4140 4047
4141 case OP_DIV: /* / */ 4048 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4049 if (cdr (args) == NIL)
4143 { 4050 {
4144 x = SCHEME_V->args; 4051 x = args;
4145 v = num_one; 4052 v = num_one;
4146 } 4053 }
4147 else 4054 else
4148 { 4055 {
4149 x = cdr (SCHEME_V->args); 4056 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4057 v = nvalue (car (args));
4151 } 4058 }
4152 4059
4153 for (; x != NIL; x = cdr (x)) 4060 for (; x != NIL; x = cdr (x))
4154 { 4061 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4062 if (!is_zero_rvalue (rvalue (car (x))))
… …
4159 } 4066 }
4160 4067
4161 s_return (mk_number (SCHEME_A_ v)); 4068 s_return (mk_number (SCHEME_A_ v));
4162 4069
4163 case OP_INTDIV: /* quotient */ 4070 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4071 if (cdr (args) == NIL)
4165 { 4072 {
4166 x = SCHEME_V->args; 4073 x = args;
4167 v = num_one; 4074 v = num_one;
4168 } 4075 }
4169 else 4076 else
4170 { 4077 {
4171 x = cdr (SCHEME_V->args); 4078 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4079 v = nvalue (car (args));
4173 } 4080 }
4174 4081
4175 for (; x != NIL; x = cdr (x)) 4082 for (; x != NIL; x = cdr (x))
4176 { 4083 {
4177 if (ivalue (car (x)) != 0) 4084 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4085 v = num_op ('/', v, nvalue (car (x)));
4179 else 4086 else
4180 Error_0 ("quotient: division by zero"); 4087 Error_0 ("quotient: division by zero");
4181 } 4088 }
4182 4089
4183 s_return (mk_number (SCHEME_A_ v)); 4090 s_return (mk_number (SCHEME_A_ v));
4184 4091
4185 case OP_REM: /* remainder */ 4092 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4093 v = nvalue (x);
4187 4094
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4095 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4096 v = num_rem (v, nvalue (cadr (args)));
4190 else 4097 else
4191 Error_0 ("remainder: division by zero"); 4098 Error_0 ("remainder: division by zero");
4192 4099
4193 s_return (mk_number (SCHEME_A_ v)); 4100 s_return (mk_number (SCHEME_A_ v));
4194 4101
4195 case OP_MOD: /* modulo */ 4102 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4103 v = nvalue (x);
4197 4104
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4105 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4106 v = num_mod (v, nvalue (cadr (args)));
4200 else 4107 else
4201 Error_0 ("modulo: division by zero"); 4108 Error_0 ("modulo: division by zero");
4202 4109
4203 s_return (mk_number (SCHEME_A_ v)); 4110 s_return (mk_number (SCHEME_A_ v));
4204 4111
4205 case OP_CAR: /* car */ 4112 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4113 s_return (caar (args));
4207 4114
4208 case OP_CDR: /* cdr */ 4115 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4116 s_return (cdar (args));
4210 4117
4211 case OP_CONS: /* cons */ 4118 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4119 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4120 s_return (args);
4214 4121
4215 case OP_SETCAR: /* set-car! */ 4122 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4123 if (!is_immutable (x))
4217 { 4124 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4125 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4126 s_return (car (args));
4220 } 4127 }
4221 else 4128 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4129 Error_0 ("set-car!: unable to alter immutable pair");
4223 4130
4224 case OP_SETCDR: /* set-cdr! */ 4131 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4132 if (!is_immutable (x))
4226 { 4133 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4134 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4135 s_return (car (args));
4229 } 4136 }
4230 else 4137 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4138 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4139
4233 case OP_CHAR2INT: /* char->integer */ 4140 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4141 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4235 4142
4236 case OP_INT2CHAR: /* integer->char */ 4143 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4144 s_return (mk_character (SCHEME_A_ ivalue (x)));
4238 4145
4239 case OP_CHARUPCASE: 4146 case OP_CHARUPCASE:
4240 { 4147 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4148 unsigned char c = ivalue (x);
4242 c = toupper (c); 4149 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4150 s_return (mk_character (SCHEME_A_ c));
4244 } 4151 }
4245 4152
4246 case OP_CHARDNCASE: 4153 case OP_CHARDNCASE:
4247 { 4154 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4155 unsigned char c = ivalue (x);
4249 c = tolower (c); 4156 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4157 s_return (mk_character (SCHEME_A_ c));
4251 } 4158 }
4252 4159
4253 case OP_STR2SYM: /* string->symbol */ 4160 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4161 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4162
4256 case OP_STR2ATOM: /* string->atom */ 4163 case OP_STR2ATOM: /* string->atom */
4257 { 4164 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4165 char *s = strvalue (x);
4259 long pf = 0; 4166 long pf = 0;
4260 4167
4261 if (cdr (SCHEME_V->args) != NIL) 4168 if (cdr (args) != NIL)
4262 { 4169 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4170 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4171 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4172 pf = ivalue_unchecked (cadr (args));
4266 4173
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4174 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4175 {
4269 /* base is OK */ 4176 /* base is OK */
4270 } 4177 }
4271 else 4178 else
4272 pf = -1; 4179 pf = -1;
4273 } 4180 }
4274 4181
4275 if (pf < 0) 4182 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4183 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4184 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4185 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4186 else
4280 { 4187 {
4281 if (pf == 0 || pf == 10) 4188 if (pf == 0 || pf == 10)
… …
4292 } 4199 }
4293 } 4200 }
4294 } 4201 }
4295 4202
4296 case OP_SYM2STR: /* symbol->string */ 4203 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4204 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4205 setimmutable (x);
4299 s_return (x); 4206 s_return (x);
4300 4207
4301 case OP_ATOM2STR: /* atom->string */ 4208 case OP_ATOM2STR: /* atom->string */
4302 { 4209 {
4303 long pf = 0; 4210 long pf = 0;
4304 4211
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4212 if (cdr (args) != NIL)
4308 { 4213 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4214 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4215 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4216 pf = ivalue_unchecked (cadr (args));
4312 4217
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4218 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4219 {
4315 /* base is OK */ 4220 /* base is OK */
4316 } 4221 }
4317 else 4222 else
4318 pf = -1; 4223 pf = -1;
4319 } 4224 }
4320 4225
4321 if (pf < 0) 4226 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4227 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4228 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4229 {
4325 char *p; 4230 char *p;
4326 int len; 4231 int len;
4327 4232
… …
4335 case OP_MKSTRING: /* make-string */ 4240 case OP_MKSTRING: /* make-string */
4336 { 4241 {
4337 int fill = ' '; 4242 int fill = ' ';
4338 int len; 4243 int len;
4339 4244
4340 len = ivalue (car (SCHEME_V->args)); 4245 len = ivalue (x);
4341 4246
4342 if (cdr (SCHEME_V->args) != NIL) 4247 if (cdr (args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args)); 4248 fill = charvalue (cadr (args));
4344 4249
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4250 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4251 }
4347 4252
4348 case OP_STRLEN: /* string-length */ 4253 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4254 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4255
4351 case OP_STRREF: /* string-ref */ 4256 case OP_STRREF: /* string-ref */
4352 { 4257 {
4353 char *str; 4258 char *str;
4354 int index; 4259 int index;
4355 4260
4356 str = strvalue (car (SCHEME_V->args)); 4261 str = strvalue (x);
4357 4262
4358 index = ivalue (cadr (SCHEME_V->args)); 4263 index = ivalue (cadr (args));
4359 4264
4360 if (index >= strlength (car (SCHEME_V->args))) 4265 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4266 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4267
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4268 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4269 }
4365 4270
4366 case OP_STRSET: /* string-set! */ 4271 case OP_STRSET: /* string-set! */
4367 { 4272 {
4368 char *str; 4273 char *str;
4369 int index; 4274 int index;
4370 int c; 4275 int c;
4371 4276
4372 if (is_immutable (car (SCHEME_V->args))) 4277 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4278 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4279
4375 str = strvalue (car (SCHEME_V->args)); 4280 str = strvalue (x);
4376 4281
4377 index = ivalue (cadr (SCHEME_V->args)); 4282 index = ivalue (cadr (args));
4378 4283
4379 if (index >= strlength (car (SCHEME_V->args))) 4284 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4285 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4286
4382 c = charvalue (caddr (SCHEME_V->args)); 4287 c = charvalue (caddr (args));
4383 4288
4384 str[index] = (char) c; 4289 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4290 s_return (car (args));
4386 } 4291 }
4387 4292
4388 case OP_STRAPPEND: /* string-append */ 4293 case OP_STRAPPEND: /* string-append */
4389 { 4294 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4295 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4296 int len = 0;
4392 pointer newstr; 4297 pointer newstr;
4393 char *pos; 4298 char *pos;
4394 4299
4395 /* compute needed length for new string */ 4300 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4301 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4302 len += strlength (car (x));
4398 4303
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4304 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4305
4401 /* store the contents of the argument strings into the new string */ 4306 /* store the contents of the argument strings into the new string */
4402 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4307 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4308 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4309
4405 s_return (newstr); 4310 s_return (newstr);
4406 } 4311 }
4407 4312
… …
4410 char *str; 4315 char *str;
4411 int index0; 4316 int index0;
4412 int index1; 4317 int index1;
4413 int len; 4318 int len;
4414 4319
4415 str = strvalue (car (SCHEME_V->args)); 4320 str = strvalue (x);
4416 4321
4417 index0 = ivalue (cadr (SCHEME_V->args)); 4322 index0 = ivalue (cadr (args));
4418 4323
4419 if (index0 > strlength (car (SCHEME_V->args))) 4324 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4325 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4326
4422 if (cddr (SCHEME_V->args) != NIL) 4327 if (cddr (args) != NIL)
4423 { 4328 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4329 index1 = ivalue (caddr (args));
4425 4330
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4331 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4332 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4333 }
4429 else 4334 else
4430 index1 = strlength (car (SCHEME_V->args)); 4335 index1 = strlength (x);
4431 4336
4432 len = index1 - index0; 4337 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4338 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4339 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4340 strvalue (x)[len] = 0;
… …
4439 4344
4440 case OP_VECTOR: /* vector */ 4345 case OP_VECTOR: /* vector */
4441 { 4346 {
4442 int i; 4347 int i;
4443 pointer vec; 4348 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4349 int len = list_length (SCHEME_A_ args);
4445 4350
4446 if (len < 0) 4351 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4352 Error_1 ("vector: not a proper list:", args);
4448 4353
4449 vec = mk_vector (SCHEME_A_ len); 4354 vec = mk_vector (SCHEME_A_ len);
4450 4355
4451#if USE_ERROR_CHECKING 4356#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4357 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4358 s_return (S_SINK);
4454#endif 4359#endif
4455 4360
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4361 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4362 set_vector_elem (vec, i, car (x));
4458 4363
4459 s_return (vec); 4364 s_return (vec);
4460 } 4365 }
4461 4366
… …
4463 { 4368 {
4464 pointer fill = NIL; 4369 pointer fill = NIL;
4465 int len; 4370 int len;
4466 pointer vec; 4371 pointer vec;
4467 4372
4468 len = ivalue (car (SCHEME_V->args)); 4373 len = ivalue (x);
4469 4374
4470 if (cdr (SCHEME_V->args) != NIL) 4375 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4376 fill = cadr (args);
4472 4377
4473 vec = mk_vector (SCHEME_A_ len); 4378 vec = mk_vector (SCHEME_A_ len);
4474 4379
4475#if USE_ERROR_CHECKING 4380#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4381 if (SCHEME_V->no_memory)
… …
4482 4387
4483 s_return (vec); 4388 s_return (vec);
4484 } 4389 }
4485 4390
4486 case OP_VECLEN: /* vector-length */ 4391 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4392 s_return (mk_integer (SCHEME_A_ veclength (x)));
4488 4393
4489 case OP_VECREF: /* vector-ref */ 4394 case OP_VECREF: /* vector-ref */
4490 { 4395 {
4491 int index; 4396 int index;
4492 4397
4493 index = ivalue (cadr (SCHEME_V->args)); 4398 index = ivalue (cadr (args));
4494 4399
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4402
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_elem (x, index));
4499 } 4404 }
4500 4405
4501 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4502 { 4407 {
4503 int index; 4408 int index;
4504 4409
4505 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4412
4508 index = ivalue (cadr (SCHEME_V->args)); 4413 index = ivalue (cadr (args));
4509 4414
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4415 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4416 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4417
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4418 set_vector_elem (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4419 s_return (x);
4515 } 4420 }
4516 } 4421 }
4517 4422
4518 return S_T; 4423 return S_T;
4519} 4424}
… …
4571 } 4476 }
4572 } 4477 }
4573} 4478}
4574 4479
4575static pointer 4480static pointer
4481opexe_r (SCHEME_P_ enum scheme_opcodes op)
4482{
4483 pointer x = SCHEME_V->args;
4484
4485 for (;;)
4486 {
4487 num v = nvalue (car (x));
4488 x = cdr (x);
4489
4490 if (x == NIL)
4491 break;
4492
4493 int r = num_cmp (v, nvalue (car (x)));
4494
4495 switch (op)
4496 {
4497 case OP_NUMEQ: r = r == 0; break;
4498 case OP_LESS: r = r < 0; break;
4499 case OP_GRE: r = r > 0; break;
4500 case OP_LEQ: r = r <= 0; break;
4501 case OP_GEQ: r = r >= 0; break;
4502 }
4503
4504 if (!r)
4505 s_return (S_F);
4506 }
4507
4508 s_return (S_T);
4509}
4510
4511static pointer
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4513{
4578 pointer x; 4514 pointer args = SCHEME_V->args;
4579 num v; 4515 pointer a = car (args);
4580 int (*comp_func) (num, num); 4516 pointer d = cdr (args);
4517 int r;
4581 4518
4582 switch (op) 4519 switch (op)
4583 { 4520 {
4584 case OP_NOT: /* not */ 4521 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4522 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4523 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4524 case OP_NULLP: /* null? */ r = a == NIL ; break;
4525 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4526 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4527 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4528 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4529 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4530 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4531
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4532#if USE_CHAR_CLASSIFIERS
4656
4657 case OP_CHARAP: /* char-alphabetic? */ 4533 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4534 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4659
4660 case OP_CHARNP: /* char-numeric? */
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */ 4535 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */ 4536 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */ 4537 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4538#endif
4539
4672#if USE_PORTS 4540#if USE_PORTS
4673 4541 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4542 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4543 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4544#endif
4683 4545
4684 case OP_PROCP: /* procedure? */ 4546 case OP_PROCP: /* procedure? */
4685 4547
4686 /*-- 4548 /*--
4687 * continuation should be procedure by the example 4549 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4550 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4551 * in R^3 report sec. 6.9
4690 */ 4552 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4553 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4554 break;
4693 4555
4694 case OP_PAIRP: /* pair? */ 4556 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4557 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4558 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4559 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4560 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4561 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4562 }
4712 4563
4713 return S_T; 4564 s_retbool (r);
4714} 4565}
4715 4566
4716static pointer 4567static pointer
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4568opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4569{
4570 pointer args = SCHEME_V->args;
4571 pointer a = car (args);
4719 pointer x, y; 4572 pointer x, y;
4720 4573
4721 switch (op) 4574 switch (op)
4722 { 4575 {
4723 case OP_FORCE: /* force */ 4576 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4577 SCHEME_V->code = a;
4725 4578
4726 if (is_promise (SCHEME_V->code)) 4579 if (is_promise (SCHEME_V->code))
4727 { 4580 {
4728 /* Should change type to closure here */ 4581 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4582 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4603 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4604 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4605 }
4753 } 4606 }
4754 4607
4755 SCHEME_V->args = car (SCHEME_V->args); 4608 SCHEME_V->args = a;
4756 4609
4757 if (op == OP_WRITE) 4610 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4611 SCHEME_V->print_flag = 1;
4759 else 4612 else
4760 SCHEME_V->print_flag = 0; 4613 SCHEME_V->print_flag = 0;
4761 4614
4762 s_goto (OP_P0LIST); 4615 s_goto (OP_P0LIST);
4763 4616
4764 case OP_NEWLINE: /* newline */ 4617 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4618 if (is_pair (args))
4766 { 4619 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4620 if (a != SCHEME_V->outport)
4768 { 4621 {
4769 x = cons (SCHEME_V->outport, NIL); 4622 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4623 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4624 SCHEME_V->outport = a;
4772 } 4625 }
4773 } 4626 }
4774 4627
4775 putstr (SCHEME_A_ "\n"); 4628 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4629 s_return (S_T);
4777#endif 4630#endif
4778 4631
4779 case OP_ERR0: /* error */ 4632 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4633 SCHEME_V->retcode = -1;
4781 4634
4782 if (!is_string (car (SCHEME_V->args))) 4635 if (!is_string (a))
4783 { 4636 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4637 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4638 setimmutable (car (args));
4786 } 4639 }
4787 4640
4788 putstr (SCHEME_A_ "Error: "); 4641 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4642 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4643 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4644 s_goto (OP_ERR1);
4792 4645
4793 case OP_ERR1: /* error */ 4646 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4647 putstr (SCHEME_A_ " ");
4795 4648
4796 if (SCHEME_V->args != NIL) 4649 if (args != NIL)
4797 { 4650 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4651 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4652 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4653 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4654 s_goto (OP_P0LIST);
4802 } 4655 }
4803 else 4656 else
4804 { 4657 {
… …
4809 else 4662 else
4810 return NIL; 4663 return NIL;
4811 } 4664 }
4812 4665
4813 case OP_REVERSE: /* reverse */ 4666 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4667 s_return (reverse (SCHEME_A_ a));
4815 4668
4816 case OP_LIST_STAR: /* list* */ 4669 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4670 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4671
4819 case OP_APPEND: /* append */ 4672 case OP_APPEND: /* append */
4820 x = NIL; 4673 x = NIL;
4821 y = SCHEME_V->args; 4674 y = args;
4822 4675
4823 if (y == x) 4676 if (y == x)
4824 s_return (x); 4677 s_return (x);
4825 4678
4826 /* cdr() in the while condition is not a typo. If car() */ 4679 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4690 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4691
4839#if USE_PLIST 4692#if USE_PLIST
4840 4693
4841 case OP_PUT: /* put */ 4694 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4695 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4696 Error_0 ("illegal use of put");
4844 4697
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4698 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4699 {
4847 if (caar (x) == y) 4700 if (caar (x) == y)
4848 break; 4701 break;
4849 } 4702 }
4850 4703
4851 if (x != NIL) 4704 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4705 cdar (x) = caddr (args);
4853 else 4706 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4707 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4708
4856 s_return (S_T); 4709 s_return (S_T);
4857 4710
4858 case OP_GET: /* get */ 4711 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4712 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4713 Error_0 ("illegal use of get");
4861 4714
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4715 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4716 if (caar (x) == y)
4864 break; 4717 break;
4865 4718
4866 if (x != NIL) 4719 if (x != NIL)
4867 s_return (cdar (x)); 4720 s_return (cdar (x));
… …
4869 s_return (NIL); 4722 s_return (NIL);
4870 4723
4871#endif /* USE_PLIST */ 4724#endif /* USE_PLIST */
4872 4725
4873 case OP_QUIT: /* quit */ 4726 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4727 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4728 SCHEME_V->retcode = ivalue (a);
4876 4729
4877 return NIL; 4730 return NIL;
4878 4731
4879 case OP_GC: /* gc */ 4732 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4733 gc (SCHEME_A_ NIL, NIL);
… …
4882 4735
4883 case OP_GCVERB: /* gc-verbose */ 4736 case OP_GCVERB: /* gc-verbose */
4884 { 4737 {
4885 int was = SCHEME_V->gc_verbose; 4738 int was = SCHEME_V->gc_verbose;
4886 4739
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4740 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4741 s_retbool (was);
4889 } 4742 }
4890 4743
4891 case OP_NEWSEGMENT: /* new-segment */ 4744 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4745 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4746 Error_0 ("new-segment: argument must be a number");
4894 4747
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4748 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4896 4749
4897 s_return (S_T); 4750 s_return (S_T);
4898 4751
4899 case OP_OBLIST: /* oblist */ 4752 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4753 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4780 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4781 prop = port_input | port_output;
4929 break; 4782 break;
4930 } 4783 }
4931 4784
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4785 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4786
4934 if (p == NIL) 4787 if (p == NIL)
4935 s_return (S_F); 4788 s_return (S_F);
4936 4789
4937 s_return (p); 4790 s_return (p);
… …
4954 case OP_OPEN_INOUTSTRING: 4807 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4808 prop = port_input | port_output;
4956 break; 4809 break;
4957 } 4810 }
4958 4811
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4812 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4813 strvalue (a) + strlength (a), prop);
4961 4814
4962 if (p == NIL) 4815 if (p == NIL)
4963 s_return (S_F); 4816 s_return (S_F);
4964 4817
4965 s_return (p); 4818 s_return (p);
… …
4967 4820
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4821 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4822 {
4970 pointer p; 4823 pointer p;
4971 4824
4972 if (car (SCHEME_V->args) == NIL) 4825 if (a == NIL)
4973 { 4826 {
4974 p = port_from_scratch (SCHEME_A); 4827 p = port_from_scratch (SCHEME_A);
4975 4828
4976 if (p == NIL) 4829 if (p == NIL)
4977 s_return (S_F); 4830 s_return (S_F);
4978 } 4831 }
4979 else 4832 else
4980 { 4833 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4834 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4835 strvalue (a) + strlength (a), port_output);
4983 4836
4984 if (p == NIL) 4837 if (p == NIL)
4985 s_return (S_F); 4838 s_return (S_F);
4986 } 4839 }
4987 4840
… …
4990 4843
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4844 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4845 {
4993 port *p; 4846 port *p;
4994 4847
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4848 if ((p = a->object.port)->kind & port_string)
4996 { 4849 {
4997 off_t size; 4850 off_t size;
4998 char *str; 4851 char *str;
4999 4852
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4853 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4869 }
5017 4870
5018# endif 4871# endif
5019 4872
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4873 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4874 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4875 s_return (S_T);
5023 4876
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4877 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4878 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4879 s_return (S_T);
5027#endif 4880#endif
5028 4881
5029 case OP_INT_ENV: /* interaction-environment */ 4882 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4883 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4885 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4886 s_return (SCHEME_V->envir);
5034 4887
5035 } 4888 }
5036 4889
5037 return S_T; 4890 abort ();
5038} 4891}
5039 4892
5040static pointer 4893static pointer
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4894opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4895{
4896 pointer args = SCHEME_V->args;
5043 pointer x; 4897 pointer x;
5044 4898
5045 if (SCHEME_V->nesting != 0) 4899 if (SCHEME_V->nesting != 0)
5046 { 4900 {
5047 int n = SCHEME_V->nesting; 4901 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4908 switch (op)
5055 { 4909 {
5056 /* ========== reading part ========== */ 4910 /* ========== reading part ========== */
5057#if USE_PORTS 4911#if USE_PORTS
5058 case OP_READ: 4912 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4913 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5061 4915
5062 if (!is_inport (car (SCHEME_V->args))) 4916 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4917 Error_1 ("read: not an input port:", car (args));
5064 4918
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4919 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5067 4921
5068 x = SCHEME_V->inport; 4922 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4923 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4924 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4925 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4926 s_goto (OP_READ_INTERNAL);
5073 4927
5074 case OP_READ_CHAR: /* read-char */ 4928 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4929 case OP_PEEK_CHAR: /* peek-char */
5076 { 4930 {
5077 int c; 4931 int c;
5078 4932
5079 if (is_pair (SCHEME_V->args)) 4933 if (is_pair (args))
5080 { 4934 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4935 if (car (args) != SCHEME_V->inport)
5082 { 4936 {
5083 x = SCHEME_V->inport; 4937 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4938 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4939 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4940 SCHEME_V->inport = car (args);
5087 } 4941 }
5088 } 4942 }
5089 4943
5090 c = inchar (SCHEME_A); 4944 c = inchar (SCHEME_A);
5091 4945
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4955 case OP_CHAR_READY: /* char-ready? */
5102 { 4956 {
5103 pointer p = SCHEME_V->inport; 4957 pointer p = SCHEME_V->inport;
5104 int res; 4958 int res;
5105 4959
5106 if (is_pair (SCHEME_V->args)) 4960 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4961 p = car (args);
5108 4962
5109 res = p->object.port->kind & port_string; 4963 res = p->object.port->kind & port_string;
5110 4964
5111 s_retbool (res); 4965 s_retbool (res);
5112 } 4966 }
5113 4967
5114 case OP_SET_INPORT: /* set-input-port */ 4968 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 4969 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 4970 s_return (SCHEME_V->value);
5117 4971
5118 case OP_SET_OUTPORT: /* set-output-port */ 4972 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 4973 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 4974 s_return (SCHEME_V->value);
5121#endif 4975#endif
5122 4976
5123 case OP_RDSEXPR: 4977 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 4978 switch (SCHEME_V->tok)
… …
5210 } 5064 }
5211 5065
5212 break; 5066 break;
5213 5067
5214 case OP_RDLIST: 5068 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5069 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5070 SCHEME_V->tok = token (SCHEME_A);
5217 5071
5218 switch (SCHEME_V->tok) 5072 switch (SCHEME_V->tok)
5219 { 5073 {
5220 case TOK_EOF: 5074 case TOK_EOF:
… …
5248 case OP_RDDOT: 5102 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5103 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5104 Error_0 ("syntax error: illegal dot expression");
5251 5105
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5106 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5107 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5108
5255 case OP_RDQUOTE: 5109 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5110 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5111
5258 case OP_RDQQUOTE: 5112 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5134 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5135 s_goto (OP_VECTOR);
5282 5136
5283 /* ========== printing part ========== */ 5137 /* ========== printing part ========== */
5284 case OP_P0LIST: 5138 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5139 if (is_vector (args))
5286 { 5140 {
5287 putstr (SCHEME_A_ "#("); 5141 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5142 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5143 s_goto (OP_PVECFROM);
5290 } 5144 }
5291 else if (is_environment (SCHEME_V->args)) 5145 else if (is_environment (args))
5292 { 5146 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5147 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5148 s_return (S_T);
5295 } 5149 }
5296 else if (!is_pair (SCHEME_V->args)) 5150 else if (!is_pair (args))
5297 { 5151 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5152 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5153 s_return (S_T);
5300 } 5154 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5155 else
5302 { 5156 {
5157 pointer a = car (args);
5158 pointer b = cdr (args);
5159 int ok_abbr = ok_abbrev (b);
5160 SCHEME_V->args = car (b);
5161
5162 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5163 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5164 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5165 putstr (SCHEME_A_ "`");
5166 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5167 putstr (SCHEME_A_ ",");
5168 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5169 putstr (SCHEME_A_ ",@");
5170 else
5171 {
5172 putstr (SCHEME_A_ "(");
5173 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5174 SCHEME_V->args = a;
5175 }
5176
5305 s_goto (OP_P0LIST); 5177 s_goto (OP_P0LIST);
5306 } 5178 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5179
5180 case OP_P1LIST:
5181 if (is_pair (args))
5308 { 5182 {
5183 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5184 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5185 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5186 s_goto (OP_P0LIST);
5312 } 5187 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5188 else if (is_vector (args))
5342 { 5189 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5190 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5191 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5192 s_goto (OP_P0LIST);
5346 } 5193 }
5347 else 5194 else
5348 { 5195 {
5349 if (SCHEME_V->args != NIL) 5196 if (args != NIL)
5350 { 5197 {
5351 putstr (SCHEME_A_ " . "); 5198 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5199 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5200 }
5354 5201
5355 putstr (SCHEME_A_ ")"); 5202 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5203 s_return (S_T);
5357 } 5204 }
5358 5205
5359 case OP_PVECFROM: 5206 case OP_PVECFROM:
5360 { 5207 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5208 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5209 pointer vec = car (args);
5363 int len = veclength (vec); 5210 int len = veclength (vec);
5364 5211
5365 if (i == len) 5212 if (i == len)
5366 { 5213 {
5367 putstr (SCHEME_A_ ")"); 5214 putstr (SCHEME_A_ ")");
… …
5369 } 5216 }
5370 else 5217 else
5371 { 5218 {
5372 pointer elem = vector_elem (vec, i); 5219 pointer elem = vector_elem (vec, i);
5373 5220
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5221 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5222 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5223 SCHEME_V->args = elem;
5377 5224
5378 if (i > 0) 5225 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5226 putstr (SCHEME_A_ " ");
5380 5227
5381 s_goto (OP_P0LIST); 5228 s_goto (OP_P0LIST);
5382 } 5229 }
5383 } 5230 }
5384 } 5231 }
5385 5232
5386 return S_T; 5233 abort ();
5387} 5234}
5388 5235
5389static pointer 5236static pointer
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5237opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5238{
5239 pointer args = SCHEME_V->args;
5240 pointer a = car (args);
5392 pointer x, y; 5241 pointer x, y;
5393 5242
5394 switch (op) 5243 switch (op)
5395 { 5244 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5245 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5246 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5247 long v = list_length (SCHEME_A_ a);
5399 5248
5400 if (v < 0) 5249 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5250 Error_1 ("length: not a list:", a);
5402 5251
5403 s_return (mk_integer (SCHEME_A_ v)); 5252 s_return (mk_integer (SCHEME_A_ v));
5404 } 5253 }
5405 5254
5406 case OP_ASSQ: /* assq *//* a.k */ 5255 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5256 x = a;
5408 5257
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5258 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5259 {
5411 if (!is_pair (car (y))) 5260 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5261 Error_0 ("unable to handle non pair element");
5413 5262
5414 if (x == caar (y)) 5263 if (x == caar (y))
… …
5420 else 5269 else
5421 s_return (S_F); 5270 s_return (S_F);
5422 5271
5423 5272
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5273 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5274 SCHEME_V->args = a;
5426 5275
5427 if (SCHEME_V->args == NIL) 5276 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5277 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5278 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5279 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5436 case OP_CLOSUREP: /* closure? */ 5285 case OP_CLOSUREP: /* closure? */
5437 /* 5286 /*
5438 * Note, macro object is also a closure. 5287 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5288 * Therefore, (closure? <#MACRO>) ==> #t
5440 */ 5289 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5290 s_retbool (is_closure (a));
5442 5291
5443 case OP_MACROP: /* macro? */ 5292 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5293 s_retbool (is_macro (a));
5445 } 5294 }
5446 5295
5447 return S_T; /* NOTREACHED */ 5296 abort ();
5448} 5297}
5449 5298
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5299typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5451 5300
5452typedef int (*test_predicate) (pointer); 5301typedef int (*test_predicate)(pointer);
5453static int 5302static int
5454is_any (pointer p) 5303is_any (pointer p)
5455{ 5304{
5456 return 1; 5305 return 1;
5457} 5306}
5458 5307
5459static int 5308static int
5460is_nonneg (pointer p) 5309is_nonneg (pointer p)
5461{ 5310{
5462 return ivalue (p) >= 0 && is_integer (p); 5311 return ivalue (p) >= 0 && is_integer (p);
5312}
5313
5314static int
5315tst_is_list (pointer p)
5316{
5317 return p == NIL || is_pair (p);
5463} 5318}
5464 5319
5465/* Correspond carefully with following defines! */ 5320/* Correspond carefully with following defines! */
5466static struct 5321static struct
5467{ 5322{
5468 test_predicate fct; 5323 test_predicate fct;
5469 const char *kind; 5324 const char *kind;
5470} tests[] = 5325} tests[] =
5471{ 5326{
5472 { 0, 0}, /* unused */ 5327 { is_any, 0 },
5473 { is_any, 0}, 5328 { is_string, "string" },
5474 { is_string, "string" }, 5329 { is_symbol, "symbol" },
5475 { is_symbol, "symbol" }, 5330 { is_port, "port" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5331 { is_inport, "input port" },
5478 { is_outport, "output port" }, 5332 { is_outport, "output port" },
5479 { is_environment, "environment" }, 5333 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5334 { is_pair, "pair" },
5481 { 0, "pair or '()" }, 5335 { tst_is_list, "pair or '()" },
5482 { is_character, "character" }, 5336 { is_character, "character" },
5483 { is_vector, "vector" }, 5337 { is_vector, "vector" },
5484 { is_number, "number" }, 5338 { is_number, "number" },
5485 { is_integer, "integer" }, 5339 { is_integer, "integer" },
5486 { is_nonneg, "non-negative integer" } 5340 { is_nonneg, "non-negative integer" }
5487}; 5341};
5488 5342
5489#define TST_NONE 0 5343#define TST_NONE 0 /* TST_NONE used for standard procedures, for internal ops, 0 is used */
5490#define TST_ANY "\001" 5344#define TST_ANY "\001"
5491#define TST_STRING "\002" 5345#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5346#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5347#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5348#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5349#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5350#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5351#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5352#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5353#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5354#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5355#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5356#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5357#define TST_NATURAL "\016"
5504 5358
5505typedef struct 5359typedef struct
5506{ 5360{
5507 dispatch_func func; 5361 dispatch_func func;
5508 char *name; 5362 char *name;
5509 int min_arity; 5363 int min_arity;
5510 int max_arity; 5364 int max_arity;
5511 char *arg_tests_encoding; 5365 char arg_tests_encoding[3];
5512} op_code_info; 5366} op_code_info;
5513 5367
5514#define INF_ARG 0xffff 5368#define INF_ARG 0xffff
5515 5369
5516static op_code_info dispatch_table[] = { 5370static op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5371#define OP_DEF(func,name,minarity,maxarity,argtest,op) { opexe_ ## func, name, minarity, maxarity, argtest },
5518#include "opdefines.h" 5372#include "opdefines.h"
5373#undef OP_DEF
5519 {0} 5374 {0}
5520}; 5375};
5521 5376
5522static const char * 5377static const char *
5523procname (pointer x) 5378procname (pointer x)
… …
5553 { 5408 {
5554 ok = 0; 5409 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5410 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5411 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5557 } 5412 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5413 else if (ecb_expect_false (n > pcd->max_arity))
5559 { 5414 {
5560 ok = 0; 5415 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5416 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5417 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5563 } 5418 }
5564 5419
5565 if (ecb_expect_false (ok)) 5420 if (ecb_expect_false (ok))
5566 { 5421 {
5567 if (pcd->arg_tests_encoding) 5422 if (*pcd->arg_tests_encoding)
5568 { 5423 {
5569 int i = 0; 5424 int i = 0;
5570 int j; 5425 int j;
5571 const char *t = pcd->arg_tests_encoding; 5426 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5427 pointer arglist = SCHEME_V->args;
5573 5428
5574 do 5429 do
5575 { 5430 {
5576 pointer arg = car (arglist); 5431 pointer arg = car (arglist);
5577 5432
5578 j = (int) t[0]; 5433 j = t[0];
5579 5434
5580 if (j == TST_LIST[0]) 5435 if (!tests[j - 1].fct (arg))
5581 {
5582 if (arg != NIL && !is_pair (arg))
5583 break; 5436 break;
5584 }
5585 else
5586 {
5587 if (!tests[j].fct (arg))
5588 break;
5589 }
5590 5437
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5438 if (t[1]) /* last test is replicated as necessary */
5592 t++; 5439 t++;
5593 5440
5594 arglist = cdr (arglist); 5441 arglist = cdr (arglist);
5595 i++; 5442 i++;
5596 } 5443 }
… …
5974{ 5821{
5975 dump_stack_reset (SCHEME_A); 5822 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5823 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5824 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5825 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5826 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5827 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5828 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5829#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5830 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5831#endif
5985 SCHEME_V->retcode = 0; 5832 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5833 SCHEME_V->interactive_repl = 0;

Diff Legend

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