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.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC

… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 67#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 68#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 69
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79
70#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
71static scheme sc; 81static scheme sc;
72#endif 82#endif
73 83
74static void 84static void
… …
201#define T_SYNTAX 0x0010 211#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 212#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
205 215
206static num num_add (num a, num b); 216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
207static num num_mul (num a, num b); 217
208static num num_div (num a, num b); 218static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 220static num num_rem (num a, num b);
212static num num_mod (num a, num b); 221static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 222
219#if USE_MATH 223#if USE_MATH
220static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
221#endif 225#endif
222static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
369{ 373{
370 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
371} 375}
372 376
373#define car(p) ((p)->object.cons.car + 0) 377#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) ((p)->object.cons.cdr + 0)
375 379
376#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 384
381#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 388
385INTERFACE void 389INTERFACE void
386set_car (pointer p, pointer q) 390set_car (pointer p, pointer q)
387{ 391{
388 p->object.cons.car = q; 392 p->object.cons.car = q;
… …
664static pointer ss_get_cont (SCHEME_P); 668static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 669static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 670static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op);
668static 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);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 679static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 680static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 682
678static num 683static num
679num_add (num a, num b) 684num_op (enum num_op op, num a, num b)
680{ 685{
681 num ret; 686 num ret;
682 687
683 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));
684 689
685 if (num_is_fixnum (ret)) 690 if (num_is_fixnum (ret))
686 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 }
687 else 705 else
688 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);
689 709
690 return ret; 710 switch (op)
691} 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 }
692 717
693static num 718 num_set_rvalue (ret, av);
694num_mul (num a, num b) 719 }
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 720
705 return ret; 721 return ret;
706} 722}
707 723
708static num 724static num
… …
719 735
720 return ret; 736 return ret;
721} 737}
722 738
723static num 739static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749
750 return ret;
751}
752
753static num
754num_rem (num a, num b) 740num_rem (num a, num b)
755{ 741{
756 num ret; 742 num ret;
757 long e1, e2, res; 743 long e1, e2, res;
758 744
… …
794 780
795 num_set_ivalue (ret, res); 781 num_set_ivalue (ret, res);
796 return ret; 782 return ret;
797} 783}
798 784
785/* this completely disrespects NaNs */
799static int 786static int
800num_eq (num a, num b) 787num_cmp (num a, num b)
801{ 788{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 790 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 791
805 if (is_fixnum) 792 if (is_fixnum)
806 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 }
807 else 799 else
808 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 }
809 806
810 return ret; 807 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 808}
853 809
854#if USE_MATH 810#if USE_MATH
855 811
856/* Round to nearest. Round to even if midway */ 812/* Round to nearest. Round to even if midway */
… …
866 return ce; 822 return ce;
867 else if (dfl < dce) 823 else if (dfl < dce)
868 return fl; 824 return fl;
869 else 825 else
870 { 826 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 827 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 828 return fl;
873 else 829 else
874 return ce; 830 return ce;
875 } 831 }
876} 832}
… …
965 921
966/* get new cell. parameter a, b is marked by gc. */ 922/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 923static INLINE pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 924get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 925{
970 if (SCHEME_V->free_cell == NIL) 926 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 927 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 929 return S_SINK;
974 930
975 if (SCHEME_V->free_cell == NIL) 931 if (SCHEME_V->free_cell == NIL)
… …
1481 1437
1482/* make constant */ 1438/* make constant */
1483static pointer 1439static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1440mk_sharp_const (SCHEME_P_ char *name)
1485{ 1441{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1442 if (!strcmp (name, "t"))
1490 return S_T; 1443 return S_T;
1491 else if (!strcmp (name, "f")) 1444 else if (!strcmp (name, "f"))
1492 return S_F; 1445 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1446 else if (*name == '\\') /* #\w (character) */
1494 { 1447 {
1495 int c = 0; 1448 int c;
1496 1449
1497 if (stricmp (name + 1, "space") == 0) 1450 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1451 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1452 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1453 c = '\n';
… …
1502 c = '\r'; 1455 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1456 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1457 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1458 else if (name[1] == 'x' && name[2] != 0)
1506 { 1459 {
1507 int c1 = strtol (name + 2, 0, 16); 1460 long c1 = strtol (name + 2, 0, 16);
1508 1461
1509 if (c1 <= UCHAR_MAX) 1462 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1463 c = c1;
1511 else 1464 else
1512 return NIL; 1465 return NIL;
1513 1466 }
1514#if USE_ASCII_NAMES 1467#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1468 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1469 /* nothing */;
1519#endif 1470#endif
1520 }
1521 else if (name[2] == 0) 1471 else if (name[2] == 0)
1522 c = name[1]; 1472 c = name[1];
1523 else 1473 else
1524 return NIL; 1474 return NIL;
1525 1475
… …
1542 1492
1543/*-- 1493/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1494 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1495 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1496 * for marking.
1497 *
1498 * The exception is vectors - vectors are currently marked recursively,
1499 * which is inherited form tinyscheme and could be fixed by having another
1500 * word of context in the vector
1547 */ 1501 */
1548static void 1502static void
1549mark (pointer a) 1503mark (pointer a)
1550{ 1504{
1551 pointer t, q, p; 1505 pointer t, q, p;
… …
1553 t = 0; 1507 t = 0;
1554 p = a; 1508 p = a;
1555E2: 1509E2:
1556 setmark (p); 1510 setmark (p);
1557 1511
1558 if (is_vector (p)) 1512 if (ecb_expect_false (is_vector (p)))
1559 { 1513 {
1560 int i; 1514 int i;
1561 1515
1562 for (i = 0; i < p->object.vector.length; i++) 1516 for (i = 0; i < p->object.vector.length; i++)
1563 mark (vecvalue (p)[i]); 1517 mark (vecvalue (p)[i]);
… …
1686} 1640}
1687 1641
1688static void 1642static void
1689finalize_cell (SCHEME_P_ pointer a) 1643finalize_cell (SCHEME_P_ pointer a)
1690{ 1644{
1645 /* TODO, fast bitmap check? */
1691 if (is_string (a)) 1646 if (is_string (a))
1692 free (strvalue (a)); 1647 free (strvalue (a));
1693 else if (is_vector (a)) 1648 else if (is_vector (a))
1694 free (vecvalue (a)); 1649 free (vecvalue (a));
1695#if USE_PORTS 1650#if USE_PORTS
… …
2790 } 2745 }
2791 else if (is_number (a)) 2746 else if (is_number (a))
2792 { 2747 {
2793 if (is_number (b)) 2748 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b)) 2749 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2750 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2751
2797 return 0; 2752 return 0;
2798 } 2753 }
2799 else if (is_character (a)) 2754 else if (is_character (a))
2800 { 2755 {
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3034 next_frame = SCHEME_V->dump_base + nframes;
3080 3035
3081 next_frame->op = op; 3036 next_frame->op = op;
3082 next_frame->args = args; 3037 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3038 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3039 next_frame->code = code;
3085 3040
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3042}
3088 3043
3089static pointer 3044static pointer
… …
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3218
3264static pointer 3219static pointer
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3220opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3221{
3222 pointer args = SCHEME_V->args;
3267 pointer x, y; 3223 pointer x, y;
3268 3224
3269 switch (op) 3225 switch (op)
3270 { 3226 {
3271 case OP_LOAD: /* load */ 3227 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3228 if (file_interactive (SCHEME_A))
3273 { 3229 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3275 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3232 }
3277 3233
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3234 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3235 Error_1 ("unable to open", car (args));
3280 else 3236 else
3281 { 3237 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3238 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3239 s_goto (OP_T0LVL);
3284 } 3240 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3314 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3315#if USE_TRACING
3360 if (SCHEME_V->tracing) 3316 if (SCHEME_V->tracing)
3361 { 3317 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3318 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 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);
3364 SCHEME_V->args = SCHEME_V->code; 3320 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3321 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3322 s_goto (OP_P0LIST);
3367 } 3323 }
3368 3324
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3368 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3369 s_goto (OP_E1ARGS);
3414 } 3370 }
3415 3371
3416 case OP_E1ARGS: /* eval arguments */ 3372 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3373 args = cons (SCHEME_V->value, args);
3418 3374
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3375 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3376 {
3421 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));
3422 SCHEME_V->code = car (SCHEME_V->code); 3378 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3379 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3380 s_goto (OP_EVAL);
3425 } 3381 }
3426 else /* end */ 3382 else /* end */
3427 { 3383 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3384 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3385 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3386 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3387 s_goto (OP_APPLY);
3432 } 3388 }
3433 3389
3434#if USE_TRACING 3390#if USE_TRACING
3435 3391
3436 case OP_TRACING: 3392 case OP_TRACING:
3437 { 3393 {
3438 int tr = SCHEME_V->tracing; 3394 int tr = SCHEME_V->tracing;
3439 3395
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3396 SCHEME_V->tracing = ivalue (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3397 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3398 }
3443 3399
3444#endif 3400#endif
3445 3401
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3402 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3403#if USE_TRACING
3448 if (SCHEME_V->tracing) 3404 if (SCHEME_V->tracing)
3449 { 3405 {
3450 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);
3451 SCHEME_V->print_flag = 1; 3407 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3408 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3409 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3410 s_goto (OP_P0LIST);
3455 } 3411 }
3456 3412
3457 /* fall through */ 3413 /* fall through */
… …
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 } 3420 }
3465 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3466 { 3422 {
3467 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3426
3471 s_return (x); 3427 s_return (x);
3472 } 3428 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3430 {
3475 /* Should not accept promise */ 3431 /* Should not accept promise */
3476 /* make environment */ 3432 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3434
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3435 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3436 {
3481 if (y == NIL) 3437 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3483 else 3439 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3503 } 3459 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3461 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3508 } 3464 }
3509 else 3465 else
3510 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3511 3467
3512 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3521 { 3477 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3479
3524 if (f != NIL) 3480 if (f != NIL)
3525 { 3481 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3530 } 3486 }
3531 3487
… …
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543 3499
3544#endif 3500#endif
3545 3501
3546 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3503 x = car (args);
3548 3504
3549 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3506 x = cdr (x);
3551 3507
3552 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3554 else 3510 else
3555 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3556 3512
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3558 3514
3559 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3592 3548
3593 3549
3594 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3596 3552
3597 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3599 3555
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3556 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3557
3602 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3560 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3561
… …
3648 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3649 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);
3650 s_goto (OP_LET1); 3606 s_goto (OP_LET1);
3651 3607
3652 case OP_LET1: /* let (calculate parameters) */ 3608 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3609 args = cons (SCHEME_V->value, args);
3654 3610
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3611 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3612 {
3657 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)))
3658 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));
3659 3615
3660 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));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3617 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3618 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3619 s_goto (OP_EVAL);
3664 } 3620 }
3665 else /* end */ 3621 else /* end */
3666 { 3622 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3623 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3624 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3625 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3626 s_goto (OP_LET2);
3671 } 3627 }
3672 3628
3673 case OP_LET2: /* let */ 3629 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3630 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3631
3676 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;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3633 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3634 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3635
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3636 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3637 {
3682 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))
3683 { 3639 {
3684 if (!is_pair (x)) 3640 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3641 Error_1 ("Bad syntax of binding in let :", x);
3686 3642
3687 if (!is_list (SCHEME_A_ car (x))) 3643 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3644 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3645
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3646 args = cons (caar (x), args);
3691 } 3647 }
3692 3648
3693 x =
3694 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)),
3695 SCHEME_V->envir); 3650 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3651 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3652 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3653 }
3700 else 3654 else
3701 { 3655 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3656 SCHEME_V->code = cdr (SCHEME_V->code);
3657 }
3658
3703 SCHEME_V->args = NIL; 3659 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3660 s_goto (OP_BEGIN);
3707 3661
3708 case OP_LET0AST: /* let* */ 3662 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3663 if (car (SCHEME_V->code) == NIL)
3710 { 3664 {
… …
3728 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);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3683 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3684
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3685 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3686 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3687 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3737 } 3691 }
3738 else /* end */ 3692 else /* end */
3739 { 3693 {
3740 SCHEME_V->code = SCHEME_V->args; 3694 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3743 } 3697 }
3744 3698
3745 case OP_LET0REC: /* letrec */ 3699 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3702 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3703 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3704 s_goto (OP_LET1REC);
3751 3705
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3706 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3707 args = cons (SCHEME_V->value, args);
3754 3708
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3709 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3710 {
3757 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)))
3758 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));
3759 3713
3760 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));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3715 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3716 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3717 s_goto (OP_EVAL);
3764 } 3718 }
3765 else /* end */ 3719 else /* end */
3766 { 3720 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3721 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3722 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3723 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3724 s_goto (OP_LET2REC);
3771 } 3725 }
3772 3726
3773 case OP_LET2REC: /* letrec */ 3727 case OP_LET2REC: /* letrec */
3774 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))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3729 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3730
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3731 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3732 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3733 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3820 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3821 s_goto (OP_EVAL);
3868 3822
3869 case OP_C1STREAM: /* cons-stream */ 3823 case OP_C1STREAM: /* cons-stream */
3870 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 */
3871 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);
3872 set_typeflag (x, T_PROMISE); 3826 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3827 s_return (cons (args, x));
3874 3828
3875 case OP_MACRO0: /* macro */ 3829 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3830 if (is_pair (car (SCHEME_V->code)))
3877 { 3831 {
3878 x = caar (SCHEME_V->code); 3832 x = caar (SCHEME_V->code);
… …
3911 { 3865 {
3912 if (!is_pair (y = caar (x))) 3866 if (!is_pair (y = caar (x)))
3913 break; 3867 break;
3914 3868
3915 for (; y != NIL; y = cdr (y)) 3869 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3870 if (eqv (car (y), SCHEME_V->value))
3918 break; 3871 break;
3919 }
3920 3872
3921 if (y != NIL) 3873 if (y != NIL)
3922 break; 3874 break;
3923 } 3875 }
3924 3876
… …
3944 s_goto (OP_BEGIN); 3896 s_goto (OP_BEGIN);
3945 else 3897 else
3946 s_return (NIL); 3898 s_return (NIL);
3947 3899
3948 case OP_PAPPLY: /* apply */ 3900 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3901 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3903 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3904 s_goto (OP_APPLY);
3953 3905
3954 case OP_PEVAL: /* eval */ 3906 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3907 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3908 SCHEME_V->envir = cadr (args);
3957 3909
3958 SCHEME_V->code = car (SCHEME_V->args); 3910 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
3960 3912
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3913 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3914 SCHEME_V->code = car (args);
3963 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);
3964 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3965 } 3917 }
3966 3918
3967 return S_T; 3919 abort ();
3968} 3920}
3969 3921
3970static pointer 3922static pointer
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3923opexe_2 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3924{
3973 pointer x; 3925 pointer args = SCHEME_V->args;
3926 pointer x = car (args);
3974 num v; 3927 num v;
3975 3928
3976#if USE_MATH 3929#if USE_MATH
3977 RVALUE dd; 3930 RVALUE dd;
3978#endif 3931#endif
3979 3932
3980 switch (op) 3933 switch (op)
3981 { 3934 {
3982#if USE_MATH 3935#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 3936 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args);
3986
3987 if (num_is_integer (x)) 3937 if (num_is_integer (x))
3988 s_return (x); 3938 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3939 else if (modf (rvalue_unchecked (x), &dd) == 0)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3940 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3991 else 3941 else
3992 Error_1 ("inexact->exact: not integral:", x); 3942 Error_1 ("inexact->exact: not integral:", x);
3993 3943
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3948 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3949 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3950 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 3951
4022 case OP_ATAN: 3952 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 3953 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3954 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 3955 else
4028 { 3956 {
4029 pointer y = cadr (SCHEME_V->args); 3957 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3958 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 3959 }
4033 3960
4034 case OP_SQRT: 3961 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3962 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 3963
4038 case OP_EXPT: 3964 case OP_EXPT:
4039 { 3965 {
4040 RVALUE result; 3966 RVALUE result;
4041 int real_result = 1; 3967 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 3968 pointer y = cadr (args);
4043
4044 x = car (SCHEME_V->args);
4045 3969
4046 if (num_is_integer (x) && num_is_integer (y)) 3970 if (num_is_integer (x) && num_is_integer (y))
4047 real_result = 0; 3971 real_result = 0;
4048 3972
4049 /* This 'if' is an R5RS compatibility fix. */ 3973 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 3974 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 3975 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 3976 result = 0;
4053 else 3977 else
4054 result = pow (rvalue (x), rvalue (y)); 3978 result = pow (rvalue (x), rvalue (y));
4055 3979
4056 /* Before returning integer result make sure we can. */ 3980 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 3981 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 3982 if (!real_result)
4059 { 3983 {
4060 long result_as_long = (long) result; 3984 long result_as_long = result;
4061 3985
4062 if (result != (RVALUE) result_as_long) 3986 if (result != (RVALUE) result_as_long)
4063 real_result = 1; 3987 real_result = 1;
4064 } 3988 }
4065 3989
… …
4067 s_return (mk_real (SCHEME_A_ result)); 3991 s_return (mk_real (SCHEME_A_ result));
4068 else 3992 else
4069 s_return (mk_integer (SCHEME_A_ result)); 3993 s_return (mk_integer (SCHEME_A_ result));
4070 } 3994 }
4071 3995
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 3998
4080 case OP_TRUNCATE: 3999 case OP_TRUNCATE:
4081 { 4000 {
4082 RVALUE rvalue_of_x; 4001 RVALUE rvalue_of_x;
4083 4002
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x); 4003 rvalue_of_x = rvalue (x);
4086 4004
4087 if (rvalue_of_x > 0) 4005 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4089 else 4007 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4009 }
4092 4010
4093 case OP_ROUND: 4011 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4012 if (num_is_integer (x))
4097 s_return (x); 4013 s_return (x);
4098 4014
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4016#endif
4101 4017
4102 case OP_ADD: /* + */ 4018 case OP_ADD: /* + */
4103 v = num_zero; 4019 v = num_zero;
4104 4020
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4021 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4022 v = num_op ('+', v, nvalue (car (x)));
4107 4023
4108 s_return (mk_number (SCHEME_A_ v)); 4024 s_return (mk_number (SCHEME_A_ v));
4109 4025
4110 case OP_MUL: /* * */ 4026 case OP_MUL: /* * */
4111 v = num_one; 4027 v = num_one;
4112 4028
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4029 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4030 v = num_op ('+', v, nvalue (car (x)));
4115 4031
4116 s_return (mk_number (SCHEME_A_ v)); 4032 s_return (mk_number (SCHEME_A_ v));
4117 4033
4118 case OP_SUB: /* - */ 4034 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4035 if (cdr (args) == NIL)
4120 { 4036 {
4121 x = SCHEME_V->args; 4037 x = args;
4122 v = num_zero; 4038 v = num_zero;
4123 } 4039 }
4124 else 4040 else
4125 { 4041 {
4126 x = cdr (SCHEME_V->args); 4042 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4043 v = nvalue (car (args));
4128 } 4044 }
4129 4045
4130 for (; x != NIL; x = cdr (x)) 4046 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4047 v = num_op ('+', v, nvalue (car (x)));
4132 4048
4133 s_return (mk_number (SCHEME_A_ v)); 4049 s_return (mk_number (SCHEME_A_ v));
4134 4050
4135 case OP_DIV: /* / */ 4051 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4052 if (cdr (args) == NIL)
4137 { 4053 {
4138 x = SCHEME_V->args; 4054 x = args;
4139 v = num_one; 4055 v = num_one;
4140 } 4056 }
4141 else 4057 else
4142 { 4058 {
4143 x = cdr (SCHEME_V->args); 4059 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4060 v = nvalue (car (args));
4145 } 4061 }
4146 4062
4147 for (; x != NIL; x = cdr (x)) 4063 for (; x != NIL; x = cdr (x))
4148 { 4064 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4065 if (!is_zero_rvalue (rvalue (car (x))))
… …
4153 } 4069 }
4154 4070
4155 s_return (mk_number (SCHEME_A_ v)); 4071 s_return (mk_number (SCHEME_A_ v));
4156 4072
4157 case OP_INTDIV: /* quotient */ 4073 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4074 if (cdr (args) == NIL)
4159 { 4075 {
4160 x = SCHEME_V->args; 4076 x = args;
4161 v = num_one; 4077 v = num_one;
4162 } 4078 }
4163 else 4079 else
4164 { 4080 {
4165 x = cdr (SCHEME_V->args); 4081 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4082 v = nvalue (car (args));
4167 } 4083 }
4168 4084
4169 for (; x != NIL; x = cdr (x)) 4085 for (; x != NIL; x = cdr (x))
4170 { 4086 {
4171 if (ivalue (car (x)) != 0) 4087 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4088 v = num_op ('/', v, nvalue (car (x)));
4173 else 4089 else
4174 Error_0 ("quotient: division by zero"); 4090 Error_0 ("quotient: division by zero");
4175 } 4091 }
4176 4092
4177 s_return (mk_number (SCHEME_A_ v)); 4093 s_return (mk_number (SCHEME_A_ v));
4178 4094
4179 case OP_REM: /* remainder */ 4095 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4096 v = nvalue (x);
4181 4097
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4098 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4099 v = num_rem (v, nvalue (cadr (args)));
4184 else 4100 else
4185 Error_0 ("remainder: division by zero"); 4101 Error_0 ("remainder: division by zero");
4186 4102
4187 s_return (mk_number (SCHEME_A_ v)); 4103 s_return (mk_number (SCHEME_A_ v));
4188 4104
4189 case OP_MOD: /* modulo */ 4105 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4106 v = nvalue (x);
4191 4107
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4108 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4109 v = num_mod (v, nvalue (cadr (args)));
4194 else 4110 else
4195 Error_0 ("modulo: division by zero"); 4111 Error_0 ("modulo: division by zero");
4196 4112
4197 s_return (mk_number (SCHEME_A_ v)); 4113 s_return (mk_number (SCHEME_A_ v));
4198 4114
4199 case OP_CAR: /* car */ 4115 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4116 s_return (caar (args));
4201 4117
4202 case OP_CDR: /* cdr */ 4118 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4119 s_return (cdar (args));
4204 4120
4205 case OP_CONS: /* cons */ 4121 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4122 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4123 s_return (args);
4208 4124
4209 case OP_SETCAR: /* set-car! */ 4125 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4126 if (!is_immutable (x))
4211 { 4127 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4128 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4129 s_return (car (args));
4214 } 4130 }
4215 else 4131 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4132 Error_0 ("set-car!: unable to alter immutable pair");
4217 4133
4218 case OP_SETCDR: /* set-cdr! */ 4134 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4135 if (!is_immutable (x))
4220 { 4136 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4137 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4138 s_return (car (args));
4223 } 4139 }
4224 else 4140 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4141 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4142
4227 case OP_CHAR2INT: /* char->integer */ 4143 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4144 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4229 4145
4230 case OP_INT2CHAR: /* integer->char */ 4146 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4147 s_return (mk_character (SCHEME_A_ ivalue (x)));
4232 4148
4233 case OP_CHARUPCASE: 4149 case OP_CHARUPCASE:
4234 { 4150 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4151 unsigned char c = ivalue (x);
4236 c = toupper (c); 4152 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4153 s_return (mk_character (SCHEME_A_ c));
4238 } 4154 }
4239 4155
4240 case OP_CHARDNCASE: 4156 case OP_CHARDNCASE:
4241 { 4157 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4158 unsigned char c = ivalue (x);
4243 c = tolower (c); 4159 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4160 s_return (mk_character (SCHEME_A_ c));
4245 } 4161 }
4246 4162
4247 case OP_STR2SYM: /* string->symbol */ 4163 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4164 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4165
4250 case OP_STR2ATOM: /* string->atom */ 4166 case OP_STR2ATOM: /* string->atom */
4251 { 4167 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4168 char *s = strvalue (x);
4253 long pf = 0; 4169 long pf = 0;
4254 4170
4255 if (cdr (SCHEME_V->args) != NIL) 4171 if (cdr (args) != NIL)
4256 { 4172 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4173 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4174 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4175 pf = ivalue_unchecked (cadr (args));
4260 4176
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4177 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4178 {
4263 /* base is OK */ 4179 /* base is OK */
4264 } 4180 }
4265 else 4181 else
4266 pf = -1; 4182 pf = -1;
4267 } 4183 }
4268 4184
4269 if (pf < 0) 4185 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4186 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4187 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4188 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4189 else
4274 { 4190 {
4275 if (pf == 0 || pf == 10) 4191 if (pf == 0 || pf == 10)
… …
4286 } 4202 }
4287 } 4203 }
4288 } 4204 }
4289 4205
4290 case OP_SYM2STR: /* symbol->string */ 4206 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4207 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4208 setimmutable (x);
4293 s_return (x); 4209 s_return (x);
4294 4210
4295 case OP_ATOM2STR: /* atom->string */ 4211 case OP_ATOM2STR: /* atom->string */
4296 { 4212 {
4297 long pf = 0; 4213 long pf = 0;
4298 4214
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4215 if (cdr (args) != NIL)
4302 { 4216 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4217 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4218 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4219 pf = ivalue_unchecked (cadr (args));
4306 4220
4307 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))
4308 { 4222 {
4309 /* base is OK */ 4223 /* base is OK */
4310 } 4224 }
4311 else 4225 else
4312 pf = -1; 4226 pf = -1;
4313 } 4227 }
4314 4228
4315 if (pf < 0) 4229 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4230 Error_1 ("atom->string: bad base:", cadr (args));
4317 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))
4318 { 4232 {
4319 char *p; 4233 char *p;
4320 int len; 4234 int len;
4321 4235
… …
4329 case OP_MKSTRING: /* make-string */ 4243 case OP_MKSTRING: /* make-string */
4330 { 4244 {
4331 int fill = ' '; 4245 int fill = ' ';
4332 int len; 4246 int len;
4333 4247
4334 len = ivalue (car (SCHEME_V->args)); 4248 len = ivalue (x);
4335 4249
4336 if (cdr (SCHEME_V->args) != NIL) 4250 if (cdr (args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args)); 4251 fill = charvalue (cadr (args));
4338 4252
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4254 }
4341 4255
4342 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4258
4345 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4346 { 4260 {
4347 char *str; 4261 char *str;
4348 int index; 4262 int index;
4349 4263
4350 str = strvalue (car (SCHEME_V->args)); 4264 str = strvalue (x);
4351 4265
4352 index = ivalue (cadr (SCHEME_V->args)); 4266 index = ivalue (cadr (args));
4353 4267
4354 if (index >= strlength (car (SCHEME_V->args))) 4268 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4269 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4270
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4272 }
4359 4273
4360 case OP_STRSET: /* string-set! */ 4274 case OP_STRSET: /* string-set! */
4361 { 4275 {
4362 char *str; 4276 char *str;
4363 int index; 4277 int index;
4364 int c; 4278 int c;
4365 4279
4366 if (is_immutable (car (SCHEME_V->args))) 4280 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4281 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4282
4369 str = strvalue (car (SCHEME_V->args)); 4283 str = strvalue (x);
4370 4284
4371 index = ivalue (cadr (SCHEME_V->args)); 4285 index = ivalue (cadr (args));
4372 4286
4373 if (index >= strlength (car (SCHEME_V->args))) 4287 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4288 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4289
4376 c = charvalue (caddr (SCHEME_V->args)); 4290 c = charvalue (caddr (args));
4377 4291
4378 str[index] = (char) c; 4292 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4293 s_return (car (args));
4380 } 4294 }
4381 4295
4382 case OP_STRAPPEND: /* string-append */ 4296 case OP_STRAPPEND: /* string-append */
4383 { 4297 {
4384 /* 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 */
4385 int len = 0; 4299 int len = 0;
4386 pointer newstr; 4300 pointer newstr;
4387 char *pos; 4301 char *pos;
4388 4302
4389 /* compute needed length for new string */ 4303 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4304 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4305 len += strlength (car (x));
4392 4306
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4307 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4308
4395 /* store the contents of the argument strings into the new string */ 4309 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4310 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4311 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4312
4399 s_return (newstr); 4313 s_return (newstr);
4400 } 4314 }
4401 4315
… …
4404 char *str; 4318 char *str;
4405 int index0; 4319 int index0;
4406 int index1; 4320 int index1;
4407 int len; 4321 int len;
4408 4322
4409 str = strvalue (car (SCHEME_V->args)); 4323 str = strvalue (x);
4410 4324
4411 index0 = ivalue (cadr (SCHEME_V->args)); 4325 index0 = ivalue (cadr (args));
4412 4326
4413 if (index0 > strlength (car (SCHEME_V->args))) 4327 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4328 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4329
4416 if (cddr (SCHEME_V->args) != NIL) 4330 if (cddr (args) != NIL)
4417 { 4331 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4332 index1 = ivalue (caddr (args));
4419 4333
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4334 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4335 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4336 }
4423 else 4337 else
4424 index1 = strlength (car (SCHEME_V->args)); 4338 index1 = strlength (x);
4425 4339
4426 len = index1 - index0; 4340 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4341 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4342 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4343 strvalue (x)[len] = 0;
… …
4433 4347
4434 case OP_VECTOR: /* vector */ 4348 case OP_VECTOR: /* vector */
4435 { 4349 {
4436 int i; 4350 int i;
4437 pointer vec; 4351 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4352 int len = list_length (SCHEME_A_ args);
4439 4353
4440 if (len < 0) 4354 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4355 Error_1 ("vector: not a proper list:", args);
4442 4356
4443 vec = mk_vector (SCHEME_A_ len); 4357 vec = mk_vector (SCHEME_A_ len);
4444 4358
4445#if USE_ERROR_CHECKING 4359#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4360 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4361 s_return (S_SINK);
4448#endif 4362#endif
4449 4363
4450 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++)
4451 set_vector_elem (vec, i, car (x)); 4365 set_vector_elem (vec, i, car (x));
4452 4366
4453 s_return (vec); 4367 s_return (vec);
4454 } 4368 }
4455 4369
… …
4457 { 4371 {
4458 pointer fill = NIL; 4372 pointer fill = NIL;
4459 int len; 4373 int len;
4460 pointer vec; 4374 pointer vec;
4461 4375
4462 len = ivalue (car (SCHEME_V->args)); 4376 len = ivalue (x);
4463 4377
4464 if (cdr (SCHEME_V->args) != NIL) 4378 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4379 fill = cadr (args);
4466 4380
4467 vec = mk_vector (SCHEME_A_ len); 4381 vec = mk_vector (SCHEME_A_ len);
4468 4382
4469#if USE_ERROR_CHECKING 4383#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4384 if (SCHEME_V->no_memory)
… …
4476 4390
4477 s_return (vec); 4391 s_return (vec);
4478 } 4392 }
4479 4393
4480 case OP_VECLEN: /* vector-length */ 4394 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4395 s_return (mk_integer (SCHEME_A_ veclength (x)));
4482 4396
4483 case OP_VECREF: /* vector-ref */ 4397 case OP_VECREF: /* vector-ref */
4484 { 4398 {
4485 int index; 4399 int index;
4486 4400
4487 index = ivalue (cadr (SCHEME_V->args)); 4401 index = ivalue (cadr (args));
4488 4402
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4404 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4405
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4406 s_return (vector_elem (x, index));
4493 } 4407 }
4494 4408
4495 case OP_VECSET: /* vector-set! */ 4409 case OP_VECSET: /* vector-set! */
4496 { 4410 {
4497 int index; 4411 int index;
4498 4412
4499 if (is_immutable (car (SCHEME_V->args))) 4413 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4414 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4415
4502 index = ivalue (cadr (SCHEME_V->args)); 4416 index = ivalue (cadr (args));
4503 4417
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4419 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4420
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4421 set_vector_elem (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4422 s_return (x);
4509 } 4423 }
4510 } 4424 }
4511 4425
4512 return S_T; 4426 return S_T;
4513} 4427}
… …
4565 } 4479 }
4566 } 4480 }
4567} 4481}
4568 4482
4569static 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
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4515opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4516{
4572 pointer x; 4517 pointer args = SCHEME_V->args;
4573 num v; 4518 pointer a = car (args);
4574 int (*comp_func) (num, num); 4519 pointer d = cdr (args);
4520 int r;
4575 4521
4576 switch (op) 4522 switch (op)
4577 { 4523 {
4578 case OP_NOT: /* not */ 4524 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 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;
4580 4534
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4535#if USE_CHAR_CLASSIFIERS
4650
4651 case OP_CHARAP: /* char-alphabetic? */ 4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4653
4654 case OP_CHARNP: /* char-numeric? */
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */ 4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */ 4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */ 4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4541#endif
4542
4666#if USE_PORTS 4543#if USE_PORTS
4667 4544 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4546 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4547#endif
4677 4548
4678 case OP_PROCP: /* procedure? */ 4549 case OP_PROCP: /* procedure? */
4679 4550
4680 /*-- 4551 /*--
4681 * continuation should be procedure by the example 4552 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4553 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4554 * in R^3 report sec. 6.9
4684 */ 4555 */
4685 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);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4557 break;
4687 4558
4688 case OP_PAIRP: /* pair? */ 4559 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4560 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4561 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4562 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4563 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4564 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4565 }
4706 4566
4707 return S_T; 4567 s_retbool (r);
4708} 4568}
4709 4569
4710static pointer 4570static pointer
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4571opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4572{
4573 pointer args = SCHEME_V->args;
4574 pointer a = car (args);
4713 pointer x, y; 4575 pointer x, y;
4714 4576
4715 switch (op) 4577 switch (op)
4716 { 4578 {
4717 case OP_FORCE: /* force */ 4579 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4580 SCHEME_V->code = a;
4719 4581
4720 if (is_promise (SCHEME_V->code)) 4582 if (is_promise (SCHEME_V->code))
4721 { 4583 {
4722 /* Should change type to closure here */ 4584 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4585 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4606 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4607 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4608 }
4747 } 4609 }
4748 4610
4749 SCHEME_V->args = car (SCHEME_V->args); 4611 SCHEME_V->args = a;
4750 4612
4751 if (op == OP_WRITE) 4613 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4614 SCHEME_V->print_flag = 1;
4753 else 4615 else
4754 SCHEME_V->print_flag = 0; 4616 SCHEME_V->print_flag = 0;
4755 4617
4756 s_goto (OP_P0LIST); 4618 s_goto (OP_P0LIST);
4757 4619
4758 case OP_NEWLINE: /* newline */ 4620 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4621 if (is_pair (args))
4760 { 4622 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4623 if (a != SCHEME_V->outport)
4762 { 4624 {
4763 x = cons (SCHEME_V->outport, NIL); 4625 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4626 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4627 SCHEME_V->outport = a;
4766 } 4628 }
4767 } 4629 }
4768 4630
4769 putstr (SCHEME_A_ "\n"); 4631 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4632 s_return (S_T);
4771#endif 4633#endif
4772 4634
4773 case OP_ERR0: /* error */ 4635 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4636 SCHEME_V->retcode = -1;
4775 4637
4776 if (!is_string (car (SCHEME_V->args))) 4638 if (!is_string (a))
4777 { 4639 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4640 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4641 setimmutable (car (args));
4780 } 4642 }
4781 4643
4782 putstr (SCHEME_A_ "Error: "); 4644 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4645 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4646 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4647 s_goto (OP_ERR1);
4786 4648
4787 case OP_ERR1: /* error */ 4649 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4650 putstr (SCHEME_A_ " ");
4789 4651
4790 if (SCHEME_V->args != NIL) 4652 if (args != NIL)
4791 { 4653 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4654 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4655 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4656 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4657 s_goto (OP_P0LIST);
4796 } 4658 }
4797 else 4659 else
4798 { 4660 {
… …
4803 else 4665 else
4804 return NIL; 4666 return NIL;
4805 } 4667 }
4806 4668
4807 case OP_REVERSE: /* reverse */ 4669 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4670 s_return (reverse (SCHEME_A_ a));
4809 4671
4810 case OP_LIST_STAR: /* list* */ 4672 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4673 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4674
4813 case OP_APPEND: /* append */ 4675 case OP_APPEND: /* append */
4814 x = NIL; 4676 x = NIL;
4815 y = SCHEME_V->args; 4677 y = args;
4816 4678
4817 if (y == x) 4679 if (y == x)
4818 s_return (x); 4680 s_return (x);
4819 4681
4820 /* cdr() in the while condition is not a typo. If car() */ 4682 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4693 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4694
4833#if USE_PLIST 4695#if USE_PLIST
4834 4696
4835 case OP_PUT: /* put */ 4697 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4699 Error_0 ("illegal use of put");
4838 4700
4839 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))
4840 { 4702 {
4841 if (caar (x) == y) 4703 if (caar (x) == y)
4842 break; 4704 break;
4843 } 4705 }
4844 4706
4845 if (x != NIL) 4707 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4708 cdar (x) = caddr (args);
4847 else 4709 else
4848 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));
4849 4711
4850 s_return (S_T); 4712 s_return (S_T);
4851 4713
4852 case OP_GET: /* get */ 4714 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4715 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4716 Error_0 ("illegal use of get");
4855 4717
4856 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))
4857 if (caar (x) == y) 4719 if (caar (x) == y)
4858 break; 4720 break;
4859 4721
4860 if (x != NIL) 4722 if (x != NIL)
4861 s_return (cdar (x)); 4723 s_return (cdar (x));
… …
4863 s_return (NIL); 4725 s_return (NIL);
4864 4726
4865#endif /* USE_PLIST */ 4727#endif /* USE_PLIST */
4866 4728
4867 case OP_QUIT: /* quit */ 4729 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4730 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4731 SCHEME_V->retcode = ivalue (a);
4870 4732
4871 return NIL; 4733 return NIL;
4872 4734
4873 case OP_GC: /* gc */ 4735 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4736 gc (SCHEME_A_ NIL, NIL);
… …
4876 4738
4877 case OP_GCVERB: /* gc-verbose */ 4739 case OP_GCVERB: /* gc-verbose */
4878 { 4740 {
4879 int was = SCHEME_V->gc_verbose; 4741 int was = SCHEME_V->gc_verbose;
4880 4742
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4743 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4744 s_retbool (was);
4883 } 4745 }
4884 4746
4885 case OP_NEWSEGMENT: /* new-segment */ 4747 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4748 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4749 Error_0 ("new-segment: argument must be a number");
4888 4750
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4890 4752
4891 s_return (S_T); 4753 s_return (S_T);
4892 4754
4893 case OP_OBLIST: /* oblist */ 4755 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4756 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4783 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4784 prop = port_input | port_output;
4923 break; 4785 break;
4924 } 4786 }
4925 4787
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4789
4928 if (p == NIL) 4790 if (p == NIL)
4929 s_return (S_F); 4791 s_return (S_F);
4930 4792
4931 s_return (p); 4793 s_return (p);
… …
4948 case OP_OPEN_INOUTSTRING: 4810 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4811 prop = port_input | port_output;
4950 break; 4812 break;
4951 } 4813 }
4952 4814
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4815 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4816 strvalue (a) + strlength (a), prop);
4955 4817
4956 if (p == NIL) 4818 if (p == NIL)
4957 s_return (S_F); 4819 s_return (S_F);
4958 4820
4959 s_return (p); 4821 s_return (p);
… …
4961 4823
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4824 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4825 {
4964 pointer p; 4826 pointer p;
4965 4827
4966 if (car (SCHEME_V->args) == NIL) 4828 if (a == NIL)
4967 { 4829 {
4968 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4969 4831
4970 if (p == NIL) 4832 if (p == NIL)
4971 s_return (S_F); 4833 s_return (S_F);
4972 } 4834 }
4973 else 4835 else
4974 { 4836 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4837 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4838 strvalue (a) + strlength (a), port_output);
4977 4839
4978 if (p == NIL) 4840 if (p == NIL)
4979 s_return (S_F); 4841 s_return (S_F);
4980 } 4842 }
4981 4843
… …
4984 4846
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4847 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4848 {
4987 port *p; 4849 port *p;
4988 4850
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4851 if ((p = a->object.port)->kind & port_string)
4990 { 4852 {
4991 off_t size; 4853 off_t size;
4992 char *str; 4854 char *str;
4993 4855
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4856 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4872 }
5011 4873
5012# endif 4874# endif
5013 4875
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4876 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4877 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4878 s_return (S_T);
5017 4879
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4880 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4881 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4882 s_return (S_T);
5021#endif 4883#endif
5022 4884
5023 case OP_INT_ENV: /* interaction-environment */ 4885 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4886 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4888 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4889 s_return (SCHEME_V->envir);
5028 4890
5029 } 4891 }
5030 4892
5031 return S_T; 4893 abort ();
5032} 4894}
5033 4895
5034static pointer 4896static pointer
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4897opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4898{
… …
5375 s_goto (OP_P0LIST); 5237 s_goto (OP_P0LIST);
5376 } 5238 }
5377 } 5239 }
5378 } 5240 }
5379 5241
5380 return S_T; 5242 abort ();
5381} 5243}
5382 5244
5383static pointer 5245static pointer
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5246opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5247{
… …
5436 5298
5437 case OP_MACROP: /* macro? */ 5299 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5300 s_retbool (is_macro (car (SCHEME_V->args)));
5439 } 5301 }
5440 5302
5441 return S_T; /* NOTREACHED */ 5303 abort ();
5442} 5304}
5443 5305
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5445 5307
5446typedef int (*test_predicate) (pointer); 5308typedef int (*test_predicate) (pointer);
… …
5541 int ok = 1; 5403 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5404 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5405 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5406
5545 /* Check number of arguments */ 5407 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5408 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5409 {
5548 ok = 0; 5410 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 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);
5551 } 5413 }
5552 5414 else if (ecb_expect_false (n > pcd->max_arity))
5553 if (ok && n > pcd->max_arity)
5554 { 5415 {
5555 ok = 0; 5416 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 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);
5558 } 5419 }
5559 5420
5560 if (ok) 5421 if (ecb_expect_false (ok))
5561 { 5422 {
5562 if (pcd->arg_tests_encoding) 5423 if (pcd->arg_tests_encoding)
5563 { 5424 {
5564 int i = 0; 5425 int i = 0;
5565 int j; 5426 int j;
… …
5609 } 5470 }
5610#endif 5471#endif
5611 5472
5612 ok_to_freely_gc (SCHEME_A); 5473 ok_to_freely_gc (SCHEME_A);
5613 5474
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL))
5615 return; 5476 return;
5616 5477
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5479 {
5619 xwrstr ("No memory!\n"); 5480 xwrstr ("No memory!\n");
… …
5677 5538
5678 case 'd': 5539 case 'd':
5679 return OP_COND0; /* cond */ 5540 return OP_COND0; /* cond */
5680 5541
5681 case '*': 5542 case '*':
5682 return OP_LET0AST; /* let* */ 5543 return OP_LET0AST;/* let* */
5683 5544
5684 default: 5545 default:
5685 return OP_SET0; /* set! */ 5546 return OP_SET0; /* set! */
5686 } 5547 }
5687 5548
… …
5709 5570
5710 case 'f': 5571 case 'f':
5711 return OP_DEF0; /* define */ 5572 return OP_DEF0; /* define */
5712 5573
5713 default: 5574 default:
5714 return OP_LET0REC; /* letrec */ 5575 return OP_LET0REC;/* letrec */
5715 } 5576 }
5716 5577
5717 default: 5578 default:
5718 return OP_C0STREAM; /* cons-stream */ 5579 return OP_C0STREAM; /* cons-stream */
5719 } 5580 }
… …
5969{ 5830{
5970 dump_stack_reset (SCHEME_A); 5831 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5832 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5833 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5834 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5835 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5836 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5837 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5838#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5839 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5840#endif
5980 SCHEME_V->retcode = 0; 5841 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5842 SCHEME_V->interactive_repl = 0;

Diff Legend

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