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

Diff Legend

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