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.19 by root, Thu Nov 26 21:36:11 2015 UTC

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

Diff Legend

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