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

Comparing microscheme/scheme.c (file contents):
Revision 1.12 by root, Thu Nov 26 07:30:25 2015 UTC vs.
Revision 1.16 by root, Thu Nov 26 10:02:58 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);
… …
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 */
… …
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 } 3420 }
3471 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3472 { 3422 {
3473 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3426
3477 s_return (x); 3427 s_return (x);
3478 } 3428 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3430 {
3481 /* Should not accept promise */ 3431 /* Should not accept promise */
3482 /* make environment */ 3432 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3434
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3435 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3436 {
3487 if (y == NIL) 3437 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3489 else 3439 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3509 } 3459 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3461 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3514 } 3464 }
3515 else 3465 else
3516 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3517 3467
3518 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3527 { 3477 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3479
3530 if (f != NIL) 3480 if (f != NIL)
3531 { 3481 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3536 } 3486 }
3537 3487
… …
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549 3499
3550#endif 3500#endif
3551 3501
3552 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3503 x = car (args);
3554 3504
3555 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3506 x = cdr (x);
3557 3507
3558 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3560 else 3510 else
3561 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3562 3512
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3564 3514
3565 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3598 3548
3599 3549
3600 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3602 3552
3603 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3605 3555
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3556 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3557
3608 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3560 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3561
… …
3654 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3605 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3606 s_goto (OP_LET1);
3657 3607
3658 case OP_LET1: /* let (calculate parameters) */ 3608 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3609 args = cons (SCHEME_V->value, args);
3660 3610
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3611 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3612 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3613 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)); 3614 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3615
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3616 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3617 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3618 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3619 s_goto (OP_EVAL);
3670 } 3620 }
3671 else /* end */ 3621 else /* end */
3672 { 3622 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3623 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3624 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3625 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3626 s_goto (OP_LET2);
3677 } 3627 }
3678 3628
3679 case OP_LET2: /* let */ 3629 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3630 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3631
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3632 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)) 3633 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3634 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3635
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3636 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3637 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3638 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3639 {
3690 if (!is_pair (x)) 3640 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3641 Error_1 ("Bad syntax of binding in let :", x);
3692 3642
3693 if (!is_list (SCHEME_A_ car (x))) 3643 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3644 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3645
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3646 args = cons (caar (x), args);
3697 } 3647 }
3698 3648
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3649 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3650 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3651 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3652 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3653 }
3706 else 3654 else
3707 { 3655 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3656 SCHEME_V->code = cdr (SCHEME_V->code);
3657 }
3658
3709 SCHEME_V->args = NIL; 3659 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3660 s_goto (OP_BEGIN);
3713 3661
3714 case OP_LET0AST: /* let* */ 3662 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3663 if (car (SCHEME_V->code) == NIL)
3716 { 3664 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3682 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3683 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3684
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3685 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3686 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3687 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3743 } 3691 }
3744 else /* end */ 3692 else /* end */
3745 { 3693 {
3746 SCHEME_V->code = SCHEME_V->args; 3694 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3749 } 3697 }
3750 3698
3751 case OP_LET0REC: /* letrec */ 3699 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3702 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3703 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3704 s_goto (OP_LET1REC);
3757 3705
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3706 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3707 args = cons (SCHEME_V->value, args);
3760 3708
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3709 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3710 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3711 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)); 3712 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3713
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3714 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3715 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3716 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3717 s_goto (OP_EVAL);
3770 } 3718 }
3771 else /* end */ 3719 else /* end */
3772 { 3720 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3721 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3722 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3723 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3724 s_goto (OP_LET2REC);
3777 } 3725 }
3778 3726
3779 case OP_LET2REC: /* letrec */ 3727 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3728 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)); 3729 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3730
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3731 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3732 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3733 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3820 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3821 s_goto (OP_EVAL);
3874 3822
3875 case OP_C1STREAM: /* cons-stream */ 3823 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3824 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); 3825 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3826 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3827 s_return (cons (args, x));
3880 3828
3881 case OP_MACRO0: /* macro */ 3829 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3830 if (is_pair (car (SCHEME_V->code)))
3883 { 3831 {
3884 x = caar (SCHEME_V->code); 3832 x = caar (SCHEME_V->code);
… …
3917 { 3865 {
3918 if (!is_pair (y = caar (x))) 3866 if (!is_pair (y = caar (x)))
3919 break; 3867 break;
3920 3868
3921 for (; y != NIL; y = cdr (y)) 3869 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3870 if (eqv (car (y), SCHEME_V->value))
3924 break; 3871 break;
3925 }
3926 3872
3927 if (y != NIL) 3873 if (y != NIL)
3928 break; 3874 break;
3929 } 3875 }
3930 3876
… …
3950 s_goto (OP_BEGIN); 3896 s_goto (OP_BEGIN);
3951 else 3897 else
3952 s_return (NIL); 3898 s_return (NIL);
3953 3899
3954 case OP_PAPPLY: /* apply */ 3900 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3901 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3903 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3904 s_goto (OP_APPLY);
3959 3905
3960 case OP_PEVAL: /* eval */ 3906 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3907 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3908 SCHEME_V->envir = cadr (args);
3963 3909
3964 SCHEME_V->code = car (SCHEME_V->args); 3910 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
3966 3912
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3913 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3914 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3971 } 3917 }
3972 3918
3973 return S_T; 3919 abort ();
3974} 3920}
3975 3921
3976static pointer 3922static pointer
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3923opexe_2 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3924{
3979 pointer x; 3925 pointer args = SCHEME_V->args;
3926 pointer x = car (args);
3980 num v; 3927 num v;
3981 3928
3982#if USE_MATH 3929#if USE_MATH
3983 RVALUE dd; 3930 RVALUE dd;
3984#endif 3931#endif
3985 3932
3986 switch (op) 3933 switch (op)
3987 { 3934 {
3988#if USE_MATH 3935#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3936 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args);
3992
3993 if (num_is_integer (x)) 3937 if (num_is_integer (x))
3994 s_return (x); 3938 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3939 else if (modf (rvalue_unchecked (x), &dd) == 0)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3940 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3997 else 3941 else
3998 Error_1 ("inexact->exact: not integral:", x); 3942 Error_1 ("inexact->exact: not integral:", x);
3999 3943
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3944 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)))); 3945 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)))); 3946 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)))); 3947 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)))); 3948 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)))); 3949 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)))); 3950 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 3951
4028 case OP_ATAN: 3952 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 3953 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3954 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 3955 else
4034 { 3956 {
4035 pointer y = cadr (SCHEME_V->args); 3957 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3958 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 3959 }
4039 3960
4040 case OP_SQRT: 3961 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3962 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 3963
4044 case OP_EXPT: 3964 case OP_EXPT:
4045 { 3965 {
4046 RVALUE result; 3966 RVALUE result;
4047 int real_result = 1; 3967 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 3968 pointer y = cadr (args);
4049
4050 x = car (SCHEME_V->args);
4051 3969
4052 if (num_is_integer (x) && num_is_integer (y)) 3970 if (num_is_integer (x) && num_is_integer (y))
4053 real_result = 0; 3971 real_result = 0;
4054 3972
4055 /* This 'if' is an R5RS compatibility fix. */ 3973 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 3974 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 3975 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 3976 result = 0;
4059 else 3977 else
4060 result = pow (rvalue (x), rvalue (y)); 3978 result = pow (rvalue (x), rvalue (y));
4061 3979
4062 /* Before returning integer result make sure we can. */ 3980 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 3981 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 3982 if (!real_result)
4065 { 3983 {
4066 long result_as_long = (long) result; 3984 long result_as_long = result;
4067 3985
4068 if (result != (RVALUE) result_as_long) 3986 if (result != (RVALUE) result_as_long)
4069 real_result = 1; 3987 real_result = 1;
4070 } 3988 }
4071 3989
… …
4073 s_return (mk_real (SCHEME_A_ result)); 3991 s_return (mk_real (SCHEME_A_ result));
4074 else 3992 else
4075 s_return (mk_integer (SCHEME_A_ result)); 3993 s_return (mk_integer (SCHEME_A_ result));
4076 } 3994 }
4077 3995
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3996 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)))); 3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 3998
4086 case OP_TRUNCATE: 3999 case OP_TRUNCATE:
4087 { 4000 {
4088 RVALUE rvalue_of_x; 4001 RVALUE rvalue_of_x;
4089 4002
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x); 4003 rvalue_of_x = rvalue (x);
4092 4004
4093 if (rvalue_of_x > 0) 4005 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4095 else 4007 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4009 }
4098 4010
4099 case OP_ROUND: 4011 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4012 if (num_is_integer (x))
4103 s_return (x); 4013 s_return (x);
4104 4014
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4016#endif
4107 4017
4108 case OP_ADD: /* + */ 4018 case OP_ADD: /* + */
4109 v = num_zero; 4019 v = num_zero;
4110 4020
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4021 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4022 v = num_op ('+', v, nvalue (car (x)));
4113 4023
4114 s_return (mk_number (SCHEME_A_ v)); 4024 s_return (mk_number (SCHEME_A_ v));
4115 4025
4116 case OP_MUL: /* * */ 4026 case OP_MUL: /* * */
4117 v = num_one; 4027 v = num_one;
4118 4028
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4029 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4030 v = num_op ('+', v, nvalue (car (x)));
4121 4031
4122 s_return (mk_number (SCHEME_A_ v)); 4032 s_return (mk_number (SCHEME_A_ v));
4123 4033
4124 case OP_SUB: /* - */ 4034 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4035 if (cdr (args) == NIL)
4126 { 4036 {
4127 x = SCHEME_V->args; 4037 x = args;
4128 v = num_zero; 4038 v = num_zero;
4129 } 4039 }
4130 else 4040 else
4131 { 4041 {
4132 x = cdr (SCHEME_V->args); 4042 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4043 v = nvalue (car (args));
4134 } 4044 }
4135 4045
4136 for (; x != NIL; x = cdr (x)) 4046 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4047 v = num_op ('+', v, nvalue (car (x)));
4138 4048
4139 s_return (mk_number (SCHEME_A_ v)); 4049 s_return (mk_number (SCHEME_A_ v));
4140 4050
4141 case OP_DIV: /* / */ 4051 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4052 if (cdr (args) == NIL)
4143 { 4053 {
4144 x = SCHEME_V->args; 4054 x = args;
4145 v = num_one; 4055 v = num_one;
4146 } 4056 }
4147 else 4057 else
4148 { 4058 {
4149 x = cdr (SCHEME_V->args); 4059 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4060 v = nvalue (car (args));
4151 } 4061 }
4152 4062
4153 for (; x != NIL; x = cdr (x)) 4063 for (; x != NIL; x = cdr (x))
4154 { 4064 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4065 if (!is_zero_rvalue (rvalue (car (x))))
… …
4159 } 4069 }
4160 4070
4161 s_return (mk_number (SCHEME_A_ v)); 4071 s_return (mk_number (SCHEME_A_ v));
4162 4072
4163 case OP_INTDIV: /* quotient */ 4073 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4074 if (cdr (args) == NIL)
4165 { 4075 {
4166 x = SCHEME_V->args; 4076 x = args;
4167 v = num_one; 4077 v = num_one;
4168 } 4078 }
4169 else 4079 else
4170 { 4080 {
4171 x = cdr (SCHEME_V->args); 4081 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4082 v = nvalue (car (args));
4173 } 4083 }
4174 4084
4175 for (; x != NIL; x = cdr (x)) 4085 for (; x != NIL; x = cdr (x))
4176 { 4086 {
4177 if (ivalue (car (x)) != 0) 4087 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4088 v = num_op ('/', v, nvalue (car (x)));
4179 else 4089 else
4180 Error_0 ("quotient: division by zero"); 4090 Error_0 ("quotient: division by zero");
4181 } 4091 }
4182 4092
4183 s_return (mk_number (SCHEME_A_ v)); 4093 s_return (mk_number (SCHEME_A_ v));
4184 4094
4185 case OP_REM: /* remainder */ 4095 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4096 v = nvalue (x);
4187 4097
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4098 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4099 v = num_rem (v, nvalue (cadr (args)));
4190 else 4100 else
4191 Error_0 ("remainder: division by zero"); 4101 Error_0 ("remainder: division by zero");
4192 4102
4193 s_return (mk_number (SCHEME_A_ v)); 4103 s_return (mk_number (SCHEME_A_ v));
4194 4104
4195 case OP_MOD: /* modulo */ 4105 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4106 v = nvalue (x);
4197 4107
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4108 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4109 v = num_mod (v, nvalue (cadr (args)));
4200 else 4110 else
4201 Error_0 ("modulo: division by zero"); 4111 Error_0 ("modulo: division by zero");
4202 4112
4203 s_return (mk_number (SCHEME_A_ v)); 4113 s_return (mk_number (SCHEME_A_ v));
4204 4114
4205 case OP_CAR: /* car */ 4115 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4116 s_return (caar (args));
4207 4117
4208 case OP_CDR: /* cdr */ 4118 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4119 s_return (cdar (args));
4210 4120
4211 case OP_CONS: /* cons */ 4121 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4122 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4123 s_return (args);
4214 4124
4215 case OP_SETCAR: /* set-car! */ 4125 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4126 if (!is_immutable (x))
4217 { 4127 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4128 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4129 s_return (car (args));
4220 } 4130 }
4221 else 4131 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4132 Error_0 ("set-car!: unable to alter immutable pair");
4223 4133
4224 case OP_SETCDR: /* set-cdr! */ 4134 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4135 if (!is_immutable (x))
4226 { 4136 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4137 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4138 s_return (car (args));
4229 } 4139 }
4230 else 4140 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4141 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4142
4233 case OP_CHAR2INT: /* char->integer */ 4143 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4144 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4235 4145
4236 case OP_INT2CHAR: /* integer->char */ 4146 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4147 s_return (mk_character (SCHEME_A_ ivalue (x)));
4238 4148
4239 case OP_CHARUPCASE: 4149 case OP_CHARUPCASE:
4240 { 4150 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4151 unsigned char c = ivalue (x);
4242 c = toupper (c); 4152 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4153 s_return (mk_character (SCHEME_A_ c));
4244 } 4154 }
4245 4155
4246 case OP_CHARDNCASE: 4156 case OP_CHARDNCASE:
4247 { 4157 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4158 unsigned char c = ivalue (x);
4249 c = tolower (c); 4159 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4160 s_return (mk_character (SCHEME_A_ c));
4251 } 4161 }
4252 4162
4253 case OP_STR2SYM: /* string->symbol */ 4163 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4164 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4165
4256 case OP_STR2ATOM: /* string->atom */ 4166 case OP_STR2ATOM: /* string->atom */
4257 { 4167 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4168 char *s = strvalue (x);
4259 long pf = 0; 4169 long pf = 0;
4260 4170
4261 if (cdr (SCHEME_V->args) != NIL) 4171 if (cdr (args) != NIL)
4262 { 4172 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4173 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4174 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4175 pf = ivalue_unchecked (cadr (args));
4266 4176
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4177 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4178 {
4269 /* base is OK */ 4179 /* base is OK */
4270 } 4180 }
4271 else 4181 else
4272 pf = -1; 4182 pf = -1;
4273 } 4183 }
4274 4184
4275 if (pf < 0) 4185 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4186 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4187 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4188 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4189 else
4280 { 4190 {
4281 if (pf == 0 || pf == 10) 4191 if (pf == 0 || pf == 10)
… …
4292 } 4202 }
4293 } 4203 }
4294 } 4204 }
4295 4205
4296 case OP_SYM2STR: /* symbol->string */ 4206 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4207 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4208 setimmutable (x);
4299 s_return (x); 4209 s_return (x);
4300 4210
4301 case OP_ATOM2STR: /* atom->string */ 4211 case OP_ATOM2STR: /* atom->string */
4302 { 4212 {
4303 long pf = 0; 4213 long pf = 0;
4304 4214
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4215 if (cdr (args) != NIL)
4308 { 4216 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4217 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4218 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4219 pf = ivalue_unchecked (cadr (args));
4312 4220
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4221 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4222 {
4315 /* base is OK */ 4223 /* base is OK */
4316 } 4224 }
4317 else 4225 else
4318 pf = -1; 4226 pf = -1;
4319 } 4227 }
4320 4228
4321 if (pf < 0) 4229 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4230 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4231 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4232 {
4325 char *p; 4233 char *p;
4326 int len; 4234 int len;
4327 4235
… …
4335 case OP_MKSTRING: /* make-string */ 4243 case OP_MKSTRING: /* make-string */
4336 { 4244 {
4337 int fill = ' '; 4245 int fill = ' ';
4338 int len; 4246 int len;
4339 4247
4340 len = ivalue (car (SCHEME_V->args)); 4248 len = ivalue (x);
4341 4249
4342 if (cdr (SCHEME_V->args) != NIL) 4250 if (cdr (args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args)); 4251 fill = charvalue (cadr (args));
4344 4252
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, (char) fill));
4346 } 4254 }
4347 4255
4348 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4258
4351 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4352 { 4260 {
4353 char *str; 4261 char *str;
4354 int index; 4262 int index;
4355 4263
4356 str = strvalue (car (SCHEME_V->args)); 4264 str = strvalue (x);
4357 4265
4358 index = ivalue (cadr (SCHEME_V->args)); 4266 index = ivalue (cadr (args));
4359 4267
4360 if (index >= strlength (car (SCHEME_V->args))) 4268 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4269 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4270
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4271 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index]));
4364 } 4272 }
4365 4273
4366 case OP_STRSET: /* string-set! */ 4274 case OP_STRSET: /* string-set! */
4367 { 4275 {
4368 char *str; 4276 char *str;
4369 int index; 4277 int index;
4370 int c; 4278 int c;
4371 4279
4372 if (is_immutable (car (SCHEME_V->args))) 4280 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4281 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4282
4375 str = strvalue (car (SCHEME_V->args)); 4283 str = strvalue (x);
4376 4284
4377 index = ivalue (cadr (SCHEME_V->args)); 4285 index = ivalue (cadr (args));
4378 4286
4379 if (index >= strlength (car (SCHEME_V->args))) 4287 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4288 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4289
4382 c = charvalue (caddr (SCHEME_V->args)); 4290 c = charvalue (caddr (args));
4383 4291
4384 str[index] = (char) c; 4292 str[index] = (char)c;
4385 s_return (car (SCHEME_V->args)); 4293 s_return (car (args));
4386 } 4294 }
4387 4295
4388 case OP_STRAPPEND: /* string-append */ 4296 case OP_STRAPPEND: /* string-append */
4389 { 4297 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4298 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4299 int len = 0;
4392 pointer newstr; 4300 pointer newstr;
4393 char *pos; 4301 char *pos;
4394 4302
4395 /* compute needed length for new string */ 4303 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4304 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4305 len += strlength (car (x));
4398 4306
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4307 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4308
4401 /* store the contents of the argument strings into the new string */ 4309 /* 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)) 4310 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4311 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4312
4405 s_return (newstr); 4313 s_return (newstr);
4406 } 4314 }
4407 4315
… …
4410 char *str; 4318 char *str;
4411 int index0; 4319 int index0;
4412 int index1; 4320 int index1;
4413 int len; 4321 int len;
4414 4322
4415 str = strvalue (car (SCHEME_V->args)); 4323 str = strvalue (x);
4416 4324
4417 index0 = ivalue (cadr (SCHEME_V->args)); 4325 index0 = ivalue (cadr (args));
4418 4326
4419 if (index0 > strlength (car (SCHEME_V->args))) 4327 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4328 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4329
4422 if (cddr (SCHEME_V->args) != NIL) 4330 if (cddr (args) != NIL)
4423 { 4331 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4332 index1 = ivalue (caddr (args));
4425 4333
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4334 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4335 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4336 }
4429 else 4337 else
4430 index1 = strlength (car (SCHEME_V->args)); 4338 index1 = strlength (x);
4431 4339
4432 len = index1 - index0; 4340 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4341 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4342 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4343 strvalue (x)[len] = 0;
… …
4439 4347
4440 case OP_VECTOR: /* vector */ 4348 case OP_VECTOR: /* vector */
4441 { 4349 {
4442 int i; 4350 int i;
4443 pointer vec; 4351 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4352 int len = list_length (SCHEME_A_ args);
4445 4353
4446 if (len < 0) 4354 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4355 Error_1 ("vector: not a proper list:", args);
4448 4356
4449 vec = mk_vector (SCHEME_A_ len); 4357 vec = mk_vector (SCHEME_A_ len);
4450 4358
4451#if USE_ERROR_CHECKING 4359#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4360 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4361 s_return (S_SINK);
4454#endif 4362#endif
4455 4363
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4365 set_vector_elem (vec, i, car (x));
4458 4366
4459 s_return (vec); 4367 s_return (vec);
4460 } 4368 }
4461 4369
… …
4463 { 4371 {
4464 pointer fill = NIL; 4372 pointer fill = NIL;
4465 int len; 4373 int len;
4466 pointer vec; 4374 pointer vec;
4467 4375
4468 len = ivalue (car (SCHEME_V->args)); 4376 len = ivalue (x);
4469 4377
4470 if (cdr (SCHEME_V->args) != NIL) 4378 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4379 fill = cadr (args);
4472 4380
4473 vec = mk_vector (SCHEME_A_ len); 4381 vec = mk_vector (SCHEME_A_ len);
4474 4382
4475#if USE_ERROR_CHECKING 4383#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4384 if (SCHEME_V->no_memory)
… …
4482 4390
4483 s_return (vec); 4391 s_return (vec);
4484 } 4392 }
4485 4393
4486 case OP_VECLEN: /* vector-length */ 4394 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4395 s_return (mk_integer (SCHEME_A_ veclength (x)));
4488 4396
4489 case OP_VECREF: /* vector-ref */ 4397 case OP_VECREF: /* vector-ref */
4490 { 4398 {
4491 int index; 4399 int index;
4492 4400
4493 index = ivalue (cadr (SCHEME_V->args)); 4401 index = ivalue (cadr (args));
4494 4402
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4404 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4405
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4406 s_return (vector_elem (x, index));
4499 } 4407 }
4500 4408
4501 case OP_VECSET: /* vector-set! */ 4409 case OP_VECSET: /* vector-set! */
4502 { 4410 {
4503 int index; 4411 int index;
4504 4412
4505 if (is_immutable (car (SCHEME_V->args))) 4413 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4414 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4415
4508 index = ivalue (cadr (SCHEME_V->args)); 4416 index = ivalue (cadr (args));
4509 4417
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4419 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4420
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4421 set_vector_elem (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4422 s_return (x);
4515 } 4423 }
4516 } 4424 }
4517 4425
4518 return S_T; 4426 return S_T;
4519} 4427}
… …
4571 } 4479 }
4572 } 4480 }
4573} 4481}
4574 4482
4575static pointer 4483static pointer
4484opexe_r (SCHEME_P_ enum scheme_opcodes op)
4485{
4486 pointer x = SCHEME_V->args;
4487
4488 for (;;)
4489 {
4490 num v = nvalue (car (x));
4491 x = cdr (x);
4492
4493 if (x == NIL)
4494 break;
4495
4496 int r = num_cmp (v, nvalue (car (x)));
4497
4498 switch (op)
4499 {
4500 case OP_NUMEQ: r = r == 0; break;
4501 case OP_LESS: r = r < 0; break;
4502 case OP_GRE: r = r > 0; break;
4503 case OP_LEQ: r = r <= 0; break;
4504 case OP_GEQ: r = r >= 0; break;
4505 }
4506
4507 if (!r)
4508 s_return (S_F);
4509 }
4510
4511 s_return (S_T);
4512}
4513
4514static pointer
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4515opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4516{
4578 pointer x; 4517 pointer args = SCHEME_V->args;
4579 num v; 4518 pointer a = car (args);
4580 int (*comp_func) (num, num); 4519 pointer d = cdr (args);
4520 int r;
4581 4521
4582 switch (op) 4522 switch (op)
4583 { 4523 {
4584 case OP_NOT: /* not */ 4524 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4534
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 4535#if USE_CHAR_CLASSIFIERS
4656
4657 case OP_CHARAP: /* char-alphabetic? */ 4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4537 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? */ 4538 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? */ 4539 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? */ 4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4541#endif
4542
4672#if USE_PORTS 4543#if USE_PORTS
4673 4544 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? */ 4545 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? */ 4546 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4547#endif
4683 4548
4684 case OP_PROCP: /* procedure? */ 4549 case OP_PROCP: /* procedure? */
4685 4550
4686 /*-- 4551 /*--
4687 * continuation should be procedure by the example 4552 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4553 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4554 * in R^3 report sec. 6.9
4690 */ 4555 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4556 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))); 4557 break;
4693 4558
4694 case OP_PAIRP: /* pair? */ 4559 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4560 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4561 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4562 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4563 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4564 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 } 4565 }
4712 4566
4713 return S_T; 4567 s_retbool (r);
4714} 4568}
4715 4569
4716static pointer 4570static pointer
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4571opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4572{
4573 pointer args = SCHEME_V->args;
4574 pointer a = car (args);
4719 pointer x, y; 4575 pointer x, y;
4720 4576
4721 switch (op) 4577 switch (op)
4722 { 4578 {
4723 case OP_FORCE: /* force */ 4579 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4580 SCHEME_V->code = a;
4725 4581
4726 if (is_promise (SCHEME_V->code)) 4582 if (is_promise (SCHEME_V->code))
4727 { 4583 {
4728 /* Should change type to closure here */ 4584 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4585 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4606 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4607 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4608 }
4753 } 4609 }
4754 4610
4755 SCHEME_V->args = car (SCHEME_V->args); 4611 SCHEME_V->args = a;
4756 4612
4757 if (op == OP_WRITE) 4613 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4614 SCHEME_V->print_flag = 1;
4759 else 4615 else
4760 SCHEME_V->print_flag = 0; 4616 SCHEME_V->print_flag = 0;
4761 4617
4762 s_goto (OP_P0LIST); 4618 s_goto (OP_P0LIST);
4763 4619
4764 case OP_NEWLINE: /* newline */ 4620 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4621 if (is_pair (args))
4766 { 4622 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4623 if (a != SCHEME_V->outport)
4768 { 4624 {
4769 x = cons (SCHEME_V->outport, NIL); 4625 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4626 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4627 SCHEME_V->outport = a;
4772 } 4628 }
4773 } 4629 }
4774 4630
4775 putstr (SCHEME_A_ "\n"); 4631 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4632 s_return (S_T);
4777#endif 4633#endif
4778 4634
4779 case OP_ERR0: /* error */ 4635 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4636 SCHEME_V->retcode = -1;
4781 4637
4782 if (!is_string (car (SCHEME_V->args))) 4638 if (!is_string (a))
4783 { 4639 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4640 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4641 setimmutable (car (args));
4786 } 4642 }
4787 4643
4788 putstr (SCHEME_A_ "Error: "); 4644 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4645 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4646 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4647 s_goto (OP_ERR1);
4792 4648
4793 case OP_ERR1: /* error */ 4649 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4650 putstr (SCHEME_A_ " ");
4795 4651
4796 if (SCHEME_V->args != NIL) 4652 if (args != NIL)
4797 { 4653 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4654 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4655 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4656 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4657 s_goto (OP_P0LIST);
4802 } 4658 }
4803 else 4659 else
4804 { 4660 {
… …
4809 else 4665 else
4810 return NIL; 4666 return NIL;
4811 } 4667 }
4812 4668
4813 case OP_REVERSE: /* reverse */ 4669 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4670 s_return (reverse (SCHEME_A_ a));
4815 4671
4816 case OP_LIST_STAR: /* list* */ 4672 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4673 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4674
4819 case OP_APPEND: /* append */ 4675 case OP_APPEND: /* append */
4820 x = NIL; 4676 x = NIL;
4821 y = SCHEME_V->args; 4677 y = args;
4822 4678
4823 if (y == x) 4679 if (y == x)
4824 s_return (x); 4680 s_return (x);
4825 4681
4826 /* cdr() in the while condition is not a typo. If car() */ 4682 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4693 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4694
4839#if USE_PLIST 4695#if USE_PLIST
4840 4696
4841 case OP_PUT: /* put */ 4697 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4699 Error_0 ("illegal use of put");
4844 4700
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4701 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4702 {
4847 if (caar (x) == y) 4703 if (caar (x) == y)
4848 break; 4704 break;
4849 } 4705 }
4850 4706
4851 if (x != NIL) 4707 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4708 cdar (x) = caddr (args);
4853 else 4709 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4710 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4711
4856 s_return (S_T); 4712 s_return (S_T);
4857 4713
4858 case OP_GET: /* get */ 4714 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4715 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4716 Error_0 ("illegal use of get");
4861 4717
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4718 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4719 if (caar (x) == y)
4864 break; 4720 break;
4865 4721
4866 if (x != NIL) 4722 if (x != NIL)
4867 s_return (cdar (x)); 4723 s_return (cdar (x));
… …
4869 s_return (NIL); 4725 s_return (NIL);
4870 4726
4871#endif /* USE_PLIST */ 4727#endif /* USE_PLIST */
4872 4728
4873 case OP_QUIT: /* quit */ 4729 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4730 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4731 SCHEME_V->retcode = ivalue (a);
4876 4732
4877 return NIL; 4733 return NIL;
4878 4734
4879 case OP_GC: /* gc */ 4735 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4736 gc (SCHEME_A_ NIL, NIL);
… …
4882 4738
4883 case OP_GCVERB: /* gc-verbose */ 4739 case OP_GCVERB: /* gc-verbose */
4884 { 4740 {
4885 int was = SCHEME_V->gc_verbose; 4741 int was = SCHEME_V->gc_verbose;
4886 4742
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4743 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4744 s_retbool (was);
4889 } 4745 }
4890 4746
4891 case OP_NEWSEGMENT: /* new-segment */ 4747 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4748 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4749 Error_0 ("new-segment: argument must be a number");
4894 4750
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4896 4752
4897 s_return (S_T); 4753 s_return (S_T);
4898 4754
4899 case OP_OBLIST: /* oblist */ 4755 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4756 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4783 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4784 prop = port_input | port_output;
4929 break; 4785 break;
4930 } 4786 }
4931 4787
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4789
4934 if (p == NIL) 4790 if (p == NIL)
4935 s_return (S_F); 4791 s_return (S_F);
4936 4792
4937 s_return (p); 4793 s_return (p);
… …
4954 case OP_OPEN_INOUTSTRING: 4810 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4811 prop = port_input | port_output;
4956 break; 4812 break;
4957 } 4813 }
4958 4814
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4815 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4816 strvalue (a) + strlength (a), prop);
4961 4817
4962 if (p == NIL) 4818 if (p == NIL)
4963 s_return (S_F); 4819 s_return (S_F);
4964 4820
4965 s_return (p); 4821 s_return (p);
… …
4967 4823
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4824 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4825 {
4970 pointer p; 4826 pointer p;
4971 4827
4972 if (car (SCHEME_V->args) == NIL) 4828 if (a == NIL)
4973 { 4829 {
4974 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4975 4831
4976 if (p == NIL) 4832 if (p == NIL)
4977 s_return (S_F); 4833 s_return (S_F);
4978 } 4834 }
4979 else 4835 else
4980 { 4836 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4837 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4838 strvalue (a) + strlength (a), port_output);
4983 4839
4984 if (p == NIL) 4840 if (p == NIL)
4985 s_return (S_F); 4841 s_return (S_F);
4986 } 4842 }
4987 4843
… …
4990 4846
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4847 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4848 {
4993 port *p; 4849 port *p;
4994 4850
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4851 if ((p = a->object.port)->kind & port_string)
4996 { 4852 {
4997 off_t size; 4853 off_t size;
4998 char *str; 4854 char *str;
4999 4855
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4856 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4872 }
5017 4873
5018# endif 4874# endif
5019 4875
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4876 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4877 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4878 s_return (S_T);
5023 4879
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4880 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4881 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4882 s_return (S_T);
5027#endif 4883#endif
5028 4884
5029 case OP_INT_ENV: /* interaction-environment */ 4885 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4886 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4888 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4889 s_return (SCHEME_V->envir);
5034 4890
5035 } 4891 }
5036 4892
5037 return S_T; 4893 abort ();
5038} 4894}
5039 4895
5040static pointer 4896static pointer
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4897opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4898{
… …
5381 s_goto (OP_P0LIST); 5237 s_goto (OP_P0LIST);
5382 } 5238 }
5383 } 5239 }
5384 } 5240 }
5385 5241
5386 return S_T; 5242 abort ();
5387} 5243}
5388 5244
5389static pointer 5245static pointer
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5246opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5247{
… …
5442 5298
5443 case OP_MACROP: /* macro? */ 5299 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5300 s_retbool (is_macro (car (SCHEME_V->args)));
5445 } 5301 }
5446 5302
5447 return S_T; /* NOTREACHED */ 5303 abort ();
5448} 5304}
5449 5305
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5451 5307
5452typedef int (*test_predicate) (pointer); 5308typedef int (*test_predicate) (pointer);
… …
5553 { 5409 {
5554 ok = 0; 5410 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5557 } 5413 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5414 else if (ecb_expect_false (n > pcd->max_arity))
5559 { 5415 {
5560 ok = 0; 5416 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5563 } 5419 }

Diff Legend

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