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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.18 by root, Thu Nov 26 21:32:16 2015 UTC

… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 67#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 68#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 69
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79
70#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
71static scheme sc; 81static scheme sc;
72#endif 82#endif
73 83
74static void 84static void
… …
201#define T_SYNTAX 0x0010 211#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 212#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
205 215
206static num num_add (num a, num b); 216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
207static num num_mul (num a, num b); 217
208static num num_div (num a, num b); 218static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 220static num num_rem (num a, num b);
212static num num_mod (num a, num b); 221static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 222
219#if USE_MATH 223#if USE_MATH
220static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
221#endif 225#endif
222static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
369{ 373{
370 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
371} 375}
372 376
373#define car(p) ((p)->object.cons.car + 0) 377#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) ((p)->object.cons.cdr + 0)
375 379
376#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 384
381#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 388
385INTERFACE void 389INTERFACE void
386set_car (pointer p, pointer q) 390set_car (pointer p, pointer q)
387{ 391{
388 p->object.cons.car = q; 392 p->object.cons.car = q;
… …
621static int file_push (SCHEME_P_ const char *fname); 625static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 626static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 627static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 628static INLINE int is_one_of (char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 629static int alloc_cellseg (SCHEME_P_ int n);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 631static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 632static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 634static pointer mk_number (SCHEME_P_ const num n);
… …
665static pointer ss_get_cont (SCHEME_P); 668static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 669static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 670static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 679static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 680static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 682
679static num 683static num
680num_add (num a, num b) 684num_op (enum num_op op, num a, num b)
681{ 685{
682 num ret; 686 num ret;
683 687
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 689
686 if (num_is_fixnum (ret)) 690 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 691 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op)
696 {
697 case NUM_ADD: av += bv; break;
698 case NUM_SUB: av -= bv; break;
699 case NUM_MUL: av *= bv; break;
700 case NUM_INTDIV: av /= bv; break;
701 }
702
703 num_set_ivalue (ret, av);
704 }
688 else 705 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 706 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
690 709
691 return ret; 710 switch (op)
692} 711 {
712 case NUM_ADD: av += bv; break;
713 case NUM_SUB: av -= bv; break;
714 case NUM_MUL: av *= bv; break;
715 case NUM_INTDIV: av /= bv; break;
716 }
693 717
694static num 718 num_set_rvalue (ret, av);
695num_mul (num a, num b) 719 }
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 720
706 return ret; 721 return ret;
707} 722}
708 723
709static num 724static num
… …
720 735
721 return ret; 736 return ret;
722} 737}
723 738
724static num 739static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750
751 return ret;
752}
753
754static num
755num_rem (num a, num b) 740num_rem (num a, num b)
756{ 741{
757 num ret; 742 num ret;
758 long e1, e2, res; 743 long e1, e2, res;
759 744
… …
795 780
796 num_set_ivalue (ret, res); 781 num_set_ivalue (ret, res);
797 return ret; 782 return ret;
798} 783}
799 784
785/* this completely disrespects NaNs */
800static int 786static int
801num_eq (num a, num b) 787num_cmp (num a, num b)
802{ 788{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 790 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 791
806 if (is_fixnum) 792 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 793 {
794 IVALUE av = num_get_ivalue (a);
795 IVALUE bv = num_get_ivalue (b);
796
797 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 }
808 else 799 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 800 {
801 RVALUE av = num_get_rvalue (a);
802 RVALUE bv = num_get_rvalue (b);
803
804 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 }
810 806
811 return ret; 807 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 808}
854 809
855#if USE_MATH 810#if USE_MATH
856 811
857/* Round to nearest. Round to even if midway */ 812/* Round to nearest. Round to even if midway */
… …
867 return ce; 822 return ce;
868 else if (dfl < dce) 823 else if (dfl < dce)
869 return fl; 824 return fl;
870 else 825 else
871 { 826 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 827 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 828 return fl;
874 else 829 else
875 return ce; 830 return ce;
876 } 831 }
877} 832}
… …
883#if USE_REAL 838#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 840#else
886 return x == 0; 841 return x == 0;
887#endif 842#endif
888}
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 843}
904 844
905/* allocate new cell segment */ 845/* allocate new cell segment */
906static int 846static int
907alloc_cellseg (SCHEME_P_ int n) 847alloc_cellseg (SCHEME_P_ int n)
… …
981 921
982/* get new cell. parameter a, b is marked by gc. */ 922/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 923static INLINE pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 924get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 925{
986 if (SCHEME_V->free_cell == NIL) 926 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 927 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 929 return S_SINK;
990 930
991 if (SCHEME_V->free_cell == NIL) 931 if (SCHEME_V->free_cell == NIL)
… …
1320 } 1260 }
1321 1261
1322 return q; 1262 return q;
1323} 1263}
1324 1264
1325/* get new string */
1326INTERFACE pointer 1265INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str) 1266mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1328{ 1267{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269
1270 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1272 strlength (x) = len;
1273 return x;
1330} 1274}
1331 1275
1332INTERFACE pointer 1276INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len) 1277mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{ 1278{
… …
1339 strlength (x) = len; 1283 strlength (x) = len;
1340 return x; 1284 return x;
1341} 1285}
1342 1286
1343INTERFACE pointer 1287INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1288mk_string (SCHEME_P_ const char *str)
1345{ 1289{
1346 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1290 return mk_counted_string (SCHEME_A_ str, strlen (str));
1347
1348 set_typeflag (x, T_STRING | T_ATOM);
1349 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1350 strlength (x) = len;
1351 return x;
1352} 1291}
1353 1292
1354INTERFACE pointer 1293INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1294mk_vector (SCHEME_P_ uint32_t len)
1356{ 1295{
… …
1393 1332
1394INTERFACE pointer 1333INTERFACE pointer
1395gensym (SCHEME_P) 1334gensym (SCHEME_P)
1396{ 1335{
1397 pointer x; 1336 pointer x;
1398 char name[40];
1399 1337
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 { 1339 {
1402 strcpy (name, "gensym-"); 1340 char name[40] = "gensym-";
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1341 xnum (name + 7, SCHEME_V->gensym_cnt);
1404 1342
1405 /* first check oblist */ 1343 /* first check oblist */
1406 x = oblist_find_by_name (SCHEME_A_ name); 1344 x = oblist_find_by_name (SCHEME_A_ name);
1407 1345
1408 if (x != NIL) 1346 if (x == NIL)
1409 continue;
1410 else
1411 { 1347 {
1412 x = oblist_add_by_name (SCHEME_A_ name); 1348 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x; 1349 return x;
1414 } 1350 }
1415 } 1351 }
… …
1424 char c, *p; 1360 char c, *p;
1425 int has_dec_point = 0; 1361 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1362 int has_fp_exp = 0;
1427 1363
1428#if USE_COLON_HOOK 1364#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1365 if ((p = strstr (q, "::")) != 0)
1431 { 1366 {
1432 *p = 0; 1367 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1368 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1369 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1370 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1371 }
1437
1438#endif 1372#endif
1439 1373
1440 p = q; 1374 p = q;
1441 c = *p++; 1375 c = *p++;
1442 1376
… …
1503 1437
1504/* make constant */ 1438/* make constant */
1505static pointer 1439static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1440mk_sharp_const (SCHEME_P_ char *name)
1507{ 1441{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1442 if (!strcmp (name, "t"))
1512 return S_T; 1443 return S_T;
1513 else if (!strcmp (name, "f")) 1444 else if (!strcmp (name, "f"))
1514 return S_F; 1445 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1446 else if (*name == '\\') /* #\w (character) */
1536 { 1447 {
1537 int c = 0; 1448 int c;
1538 1449
1539 if (stricmp (name + 1, "space") == 0) 1450 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1451 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1452 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1453 c = '\n';
… …
1544 c = '\r'; 1455 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1456 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1457 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1458 else if (name[1] == 'x' && name[2] != 0)
1548 { 1459 {
1549 int c1 = strtol (name + 2, 0, 16); 1460 long c1 = strtol (name + 2, 0, 16);
1550 1461
1551 if (c1 <= UCHAR_MAX) 1462 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1463 c = c1;
1553 else 1464 else
1554 return NIL; 1465 return NIL;
1555 1466 }
1556#if USE_ASCII_NAMES 1467#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1468 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1469 /* nothing */;
1561#endif 1470#endif
1562 }
1563 else if (name[2] == 0) 1471 else if (name[2] == 0)
1564 c = name[1]; 1472 c = name[1];
1565 else 1473 else
1566 return NIL; 1474 return NIL;
1567 1475
1568 return mk_character (SCHEME_A_ c); 1476 return mk_character (SCHEME_A_ c);
1569 } 1477 }
1570 else 1478 else
1479 {
1480 /* identify base by string index */
1481 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1482 char *base = strchr (baseidx, *name);
1483
1484 if (base)
1485 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1486
1571 return NIL; 1487 return NIL;
1488 }
1572} 1489}
1573 1490
1574/* ========== garbage collector ========== */ 1491/* ========== garbage collector ========== */
1575 1492
1576/*-- 1493/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1494 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1495 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1496 * for marking.
1497 *
1498 * The exception is vectors - vectors are currently marked recursively,
1499 * which is inherited form tinyscheme and could be fixed by having another
1500 * word of context in the vector
1580 */ 1501 */
1581static void 1502static void
1582mark (pointer a) 1503mark (pointer a)
1583{ 1504{
1584 pointer t, q, p; 1505 pointer t, q, p;
… …
1586 t = 0; 1507 t = 0;
1587 p = a; 1508 p = a;
1588E2: 1509E2:
1589 setmark (p); 1510 setmark (p);
1590 1511
1591 if (is_vector (p)) 1512 if (ecb_expect_false (is_vector (p)))
1592 { 1513 {
1593 int i; 1514 int i;
1594 1515
1595 for (i = 0; i < p->object.vector.length; i++) 1516 for (i = 0; i < p->object.vector.length; i++)
1596 mark (vecvalue (p)[i]); 1517 mark (vecvalue (p)[i]);
… …
1719} 1640}
1720 1641
1721static void 1642static void
1722finalize_cell (SCHEME_P_ pointer a) 1643finalize_cell (SCHEME_P_ pointer a)
1723{ 1644{
1645 /* TODO, fast bitmap check? */
1724 if (is_string (a)) 1646 if (is_string (a))
1725 free (strvalue (a)); 1647 free (strvalue (a));
1726 else if (is_vector (a)) 1648 else if (is_vector (a))
1727 free (vecvalue (a)); 1649 free (vecvalue (a));
1728#if USE_PORTS 1650#if USE_PORTS
… …
2823 } 2745 }
2824 else if (is_number (a)) 2746 else if (is_number (a))
2825 { 2747 {
2826 if (is_number (b)) 2748 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b)) 2749 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2750 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2751
2830 return 0; 2752 return 0;
2831 } 2753 }
2832 else if (is_character (a)) 2754 else if (is_character (a))
2833 { 2755 {
… …
3112 next_frame = SCHEME_V->dump_base + nframes; 3034 next_frame = SCHEME_V->dump_base + nframes;
3113 3035
3114 next_frame->op = op; 3036 next_frame->op = op;
3115 next_frame->args = args; 3037 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3038 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3039 next_frame->code = code;
3118 3040
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3042}
3121 3043
3122static pointer 3044static pointer
… …
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3218
3297static pointer 3219static pointer
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3220opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3221{
3222 pointer args = SCHEME_V->args;
3300 pointer x, y; 3223 pointer x, y;
3301 3224
3302 switch (op) 3225 switch (op)
3303 { 3226 {
3304 case OP_LOAD: /* load */ 3227 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3228 if (file_interactive (SCHEME_A))
3306 { 3229 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3232 }
3310 3233
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3234 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3235 Error_1 ("unable to open", car (args));
3313 else 3236 else
3314 { 3237 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3238 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3239 s_goto (OP_T0LVL);
3317 } 3240 }
… …
3391 case OP_EVAL: /* main part of evaluation */ 3314 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3315#if USE_TRACING
3393 if (SCHEME_V->tracing) 3316 if (SCHEME_V->tracing)
3394 { 3317 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3318 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3319 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3320 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3321 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3322 s_goto (OP_P0LIST);
3400 } 3323 }
3401 3324
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3368 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3369 s_goto (OP_E1ARGS);
3447 } 3370 }
3448 3371
3449 case OP_E1ARGS: /* eval arguments */ 3372 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3373 args = cons (SCHEME_V->value, args);
3451 3374
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3375 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3376 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3377 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3378 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3379 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3380 s_goto (OP_EVAL);
3458 } 3381 }
3459 else /* end */ 3382 else /* end */
3460 { 3383 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3384 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3385 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3386 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3387 s_goto (OP_APPLY);
3465 } 3388 }
3466 3389
3467#if USE_TRACING 3390#if USE_TRACING
3468 3391
3469 case OP_TRACING: 3392 case OP_TRACING:
3470 { 3393 {
3471 int tr = SCHEME_V->tracing; 3394 int tr = SCHEME_V->tracing;
3472 3395
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3396 SCHEME_V->tracing = ivalue (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3397 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3398 }
3476 3399
3477#endif 3400#endif
3478 3401
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3402 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3403#if USE_TRACING
3481 if (SCHEME_V->tracing) 3404 if (SCHEME_V->tracing)
3482 { 3405 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3406 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3407 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3408 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3409 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3410 s_goto (OP_P0LIST);
3488 } 3411 }
3489 3412
3490 /* fall through */ 3413 /* fall through */
3491 3414
3492 case OP_REAL_APPLY: 3415 case OP_REAL_APPLY:
3493#endif 3416#endif
3494 if (is_proc (SCHEME_V->code)) 3417 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3418 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3419 else if (is_foreign (SCHEME_V->code))
3499 { 3420 {
3500 /* Keep nested calls from GC'ing the arglist */ 3421 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3422 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3423 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3503 3424
3504 s_return (x); 3425 s_return (x);
3505 } 3426 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3427 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3428 {
3508 /* Should not accept promise */ 3429 /* Should not accept promise */
3509 /* make environment */ 3430 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3431 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3432
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3433 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3434 {
3514 if (y == NIL) 3435 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3436 Error_0 ("not enough arguments");
3516 else 3437 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3438 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3456 s_goto (OP_BEGIN);
3536 } 3457 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3458 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3459 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3460 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3461 s_return (args != NIL ? car (args) : NIL);
3541 } 3462 }
3542 else 3463 else
3543 Error_0 ("illegal function"); 3464 Error_0 ("illegal function");
3544 3465
3545 case OP_DOMACRO: /* do macro */ 3466 case OP_DOMACRO: /* do macro */
… …
3554 { 3475 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3476 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3477
3557 if (f != NIL) 3478 if (f != NIL)
3558 { 3479 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3480 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3481 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3482 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3483 s_goto (OP_APPLY);
3563 } 3484 }
3564 3485
… …
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3496 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576 3497
3577#endif 3498#endif
3578 3499
3579 case OP_MKCLOSURE: /* make-closure */ 3500 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3501 x = car (args);
3581 3502
3582 if (car (x) == SCHEME_V->LAMBDA) 3503 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3504 x = cdr (x);
3584 3505
3585 if (cdr (SCHEME_V->args) == NIL) 3506 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3507 y = SCHEME_V->envir;
3587 else 3508 else
3588 y = cadr (SCHEME_V->args); 3509 y = cadr (args);
3589 3510
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3511 s_return (mk_closure (SCHEME_A_ x, y));
3591 3512
3592 case OP_QUOTE: /* quote */ 3513 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3514 s_return (car (SCHEME_V->code));
… …
3625 3546
3626 3547
3627 case OP_DEFP: /* defined? */ 3548 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3549 x = SCHEME_V->envir;
3629 3550
3630 if (cdr (SCHEME_V->args) != NIL) 3551 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3552 x = cadr (args);
3632 3553
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3554 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3555
3635 case OP_SET0: /* set! */ 3556 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3557 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3558 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3559
… …
3669 3590
3670 case OP_IF1: /* if */ 3591 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3592 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3593 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3594 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3595 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3596 s_goto (OP_EVAL);
3678 3597
3679 case OP_LET0: /* let */ 3598 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3599 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3600 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3601 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3602 s_goto (OP_LET1);
3684 3603
3685 case OP_LET1: /* let (calculate parameters) */ 3604 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3605 args = cons (SCHEME_V->value, args);
3687 3606
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3607 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3608 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3609 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3610 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3611
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3612 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3613 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3614 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3615 s_goto (OP_EVAL);
3697 } 3616 }
3698 else /* end */ 3617 else /* end */
3699 { 3618 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3619 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3620 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3621 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3622 s_goto (OP_LET2);
3704 } 3623 }
3705 3624
3706 case OP_LET2: /* let */ 3625 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3626 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3627
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3628 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3629 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3630 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3631
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3632 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3633 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3634 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3635 {
3717 if (!is_pair (x)) 3636 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3637 Error_1 ("Bad syntax of binding in let :", x);
3719 3638
3720 if (!is_list (SCHEME_A_ car (x))) 3639 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3640 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3641
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3642 args = cons (caar (x), args);
3724 } 3643 }
3725 3644
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3645 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3646 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3647 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3648 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3649 }
3733 else 3650 else
3734 { 3651 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3652 SCHEME_V->code = cdr (SCHEME_V->code);
3653 }
3654
3736 SCHEME_V->args = NIL; 3655 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3656 s_goto (OP_BEGIN);
3740 3657
3741 case OP_LET0AST: /* let* */ 3658 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3659 if (car (SCHEME_V->code) == NIL)
3743 { 3660 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3678 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3679 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3680
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3681 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3682 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3683 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3684 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3685 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3686 s_goto (OP_EVAL);
3770 } 3687 }
3771 else /* end */ 3688 else /* end */
3772 { 3689 {
3773 SCHEME_V->code = SCHEME_V->args; 3690 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3691 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3692 s_goto (OP_BEGIN);
3776 } 3693 }
3777 3694
3778 case OP_LET0REC: /* letrec */ 3695 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3698 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3699 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3700 s_goto (OP_LET1REC);
3784 3701
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3702 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3703 args = cons (SCHEME_V->value, args);
3787 3704
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3705 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3706 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3707 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3708 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3709
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3710 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3711 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3712 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3713 s_goto (OP_EVAL);
3797 } 3714 }
3798 else /* end */ 3715 else /* end */
3799 { 3716 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3717 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3718 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3719 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3720 s_goto (OP_LET2REC);
3804 } 3721 }
3805 3722
3806 case OP_LET2REC: /* letrec */ 3723 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3724 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3725 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3726
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3727 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3728 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3729 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3815 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3816 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3817 s_goto (OP_EVAL);
3901 3818
3902 case OP_C1STREAM: /* cons-stream */ 3819 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3820 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3821 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3822 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3823 s_return (cons (args, x));
3907 3824
3908 case OP_MACRO0: /* macro */ 3825 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3826 if (is_pair (car (SCHEME_V->code)))
3910 { 3827 {
3911 x = caar (SCHEME_V->code); 3828 x = caar (SCHEME_V->code);
… …
3944 { 3861 {
3945 if (!is_pair (y = caar (x))) 3862 if (!is_pair (y = caar (x)))
3946 break; 3863 break;
3947 3864
3948 for (; y != NIL; y = cdr (y)) 3865 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3866 if (eqv (car (y), SCHEME_V->value))
3951 break; 3867 break;
3952 }
3953 3868
3954 if (y != NIL) 3869 if (y != NIL)
3955 break; 3870 break;
3956 } 3871 }
3957 3872
… …
3977 s_goto (OP_BEGIN); 3892 s_goto (OP_BEGIN);
3978 else 3893 else
3979 s_return (NIL); 3894 s_return (NIL);
3980 3895
3981 case OP_PAPPLY: /* apply */ 3896 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 3897 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3898 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3899 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 3900 s_goto (OP_APPLY);
3986 3901
3987 case OP_PEVAL: /* eval */ 3902 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 3903 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 3904 SCHEME_V->envir = cadr (args);
3990 3905
3991 SCHEME_V->code = car (SCHEME_V->args); 3906 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 3907 s_goto (OP_EVAL);
3993 3908
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 3909 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 3910 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3911 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 3912 s_goto (OP_APPLY);
3998 } 3913 }
3999 3914
4000 return S_T; 3915 abort ();
4001} 3916}
4002 3917
4003static pointer 3918static pointer
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3919opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4005{ 3920{
4006 pointer x; 3921 pointer args = SCHEME_V->args;
3922 pointer x = car (args);
4007 num v; 3923 num v;
4008 3924
4009#if USE_MATH 3925#if USE_MATH
4010 RVALUE dd; 3926 RVALUE dd;
4011#endif 3927#endif
4012 3928
4013 switch (op) 3929 switch (op)
4014 { 3930 {
4015#if USE_MATH 3931#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 3932 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args);
4019
4020 if (num_is_integer (x)) 3933 if (num_is_integer (x))
4021 s_return (x); 3934 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3935 else if (modf (rvalue_unchecked (x), &dd) == 0)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3936 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4024 else 3937 else
4025 Error_1 ("inexact->exact: not integral:", x); 3938 Error_1 ("inexact->exact: not integral:", x);
4026 3939
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3940 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3941 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3942 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3943 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3944 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3945 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3946 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 3947
4055 case OP_ATAN: 3948 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 3949 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3950 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 3951 else
4061 { 3952 {
4062 pointer y = cadr (SCHEME_V->args); 3953 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3954 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 3955 }
4066 3956
4067 case OP_SQRT: 3957 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3958 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 3959
4071 case OP_EXPT: 3960 case OP_EXPT:
4072 { 3961 {
4073 RVALUE result; 3962 RVALUE result;
4074 int real_result = 1; 3963 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 3964 pointer y = cadr (args);
4076
4077 x = car (SCHEME_V->args);
4078 3965
4079 if (num_is_integer (x) && num_is_integer (y)) 3966 if (num_is_integer (x) && num_is_integer (y))
4080 real_result = 0; 3967 real_result = 0;
4081 3968
4082 /* This 'if' is an R5RS compatibility fix. */ 3969 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 3970 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 3971 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 3972 result = 0;
4086 else 3973 else
4087 result = pow (rvalue (x), rvalue (y)); 3974 result = pow (rvalue (x), rvalue (y));
4088 3975
4089 /* Before returning integer result make sure we can. */ 3976 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 3977 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 3978 if (!real_result)
4092 { 3979 {
4093 long result_as_long = (long) result; 3980 long result_as_long = result;
4094 3981
4095 if (result != (RVALUE) result_as_long) 3982 if (result != (RVALUE) result_as_long)
4096 real_result = 1; 3983 real_result = 1;
4097 } 3984 }
4098 3985
… …
4100 s_return (mk_real (SCHEME_A_ result)); 3987 s_return (mk_real (SCHEME_A_ result));
4101 else 3988 else
4102 s_return (mk_integer (SCHEME_A_ result)); 3989 s_return (mk_integer (SCHEME_A_ result));
4103 } 3990 }
4104 3991
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3992 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3993 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 3994
4113 case OP_TRUNCATE: 3995 case OP_TRUNCATE:
4114 { 3996 {
4115 RVALUE rvalue_of_x; 3997 RVALUE rvalue_of_x;
4116 3998
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x); 3999 rvalue_of_x = rvalue (x);
4119 4000
4120 if (rvalue_of_x > 0) 4001 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4002 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4122 else 4003 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4004 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4005 }
4125 4006
4126 case OP_ROUND: 4007 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4008 if (num_is_integer (x))
4130 s_return (x); 4009 s_return (x);
4131 4010
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4011 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4012#endif
4134 4013
4135 case OP_ADD: /* + */ 4014 case OP_ADD: /* + */
4136 v = num_zero; 4015 v = num_zero;
4137 4016
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4017 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4018 v = num_op ('+', v, nvalue (car (x)));
4140 4019
4141 s_return (mk_number (SCHEME_A_ v)); 4020 s_return (mk_number (SCHEME_A_ v));
4142 4021
4143 case OP_MUL: /* * */ 4022 case OP_MUL: /* * */
4144 v = num_one; 4023 v = num_one;
4145 4024
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4025 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4026 v = num_op ('+', v, nvalue (car (x)));
4148 4027
4149 s_return (mk_number (SCHEME_A_ v)); 4028 s_return (mk_number (SCHEME_A_ v));
4150 4029
4151 case OP_SUB: /* - */ 4030 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4031 if (cdr (args) == NIL)
4153 { 4032 {
4154 x = SCHEME_V->args; 4033 x = args;
4155 v = num_zero; 4034 v = num_zero;
4156 } 4035 }
4157 else 4036 else
4158 { 4037 {
4159 x = cdr (SCHEME_V->args); 4038 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4039 v = nvalue (car (args));
4161 } 4040 }
4162 4041
4163 for (; x != NIL; x = cdr (x)) 4042 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4043 v = num_op ('+', v, nvalue (car (x)));
4165 4044
4166 s_return (mk_number (SCHEME_A_ v)); 4045 s_return (mk_number (SCHEME_A_ v));
4167 4046
4168 case OP_DIV: /* / */ 4047 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4048 if (cdr (args) == NIL)
4170 { 4049 {
4171 x = SCHEME_V->args; 4050 x = args;
4172 v = num_one; 4051 v = num_one;
4173 } 4052 }
4174 else 4053 else
4175 { 4054 {
4176 x = cdr (SCHEME_V->args); 4055 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4056 v = nvalue (car (args));
4178 } 4057 }
4179 4058
4180 for (; x != NIL; x = cdr (x)) 4059 for (; x != NIL; x = cdr (x))
4181 { 4060 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4061 if (!is_zero_rvalue (rvalue (car (x))))
… …
4186 } 4065 }
4187 4066
4188 s_return (mk_number (SCHEME_A_ v)); 4067 s_return (mk_number (SCHEME_A_ v));
4189 4068
4190 case OP_INTDIV: /* quotient */ 4069 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4070 if (cdr (args) == NIL)
4192 { 4071 {
4193 x = SCHEME_V->args; 4072 x = args;
4194 v = num_one; 4073 v = num_one;
4195 } 4074 }
4196 else 4075 else
4197 { 4076 {
4198 x = cdr (SCHEME_V->args); 4077 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4078 v = nvalue (car (args));
4200 } 4079 }
4201 4080
4202 for (; x != NIL; x = cdr (x)) 4081 for (; x != NIL; x = cdr (x))
4203 { 4082 {
4204 if (ivalue (car (x)) != 0) 4083 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4084 v = num_op ('/', v, nvalue (car (x)));
4206 else 4085 else
4207 Error_0 ("quotient: division by zero"); 4086 Error_0 ("quotient: division by zero");
4208 } 4087 }
4209 4088
4210 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4211 4090
4212 case OP_REM: /* remainder */ 4091 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4092 v = nvalue (x);
4214 4093
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4094 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4095 v = num_rem (v, nvalue (cadr (args)));
4217 else 4096 else
4218 Error_0 ("remainder: division by zero"); 4097 Error_0 ("remainder: division by zero");
4219 4098
4220 s_return (mk_number (SCHEME_A_ v)); 4099 s_return (mk_number (SCHEME_A_ v));
4221 4100
4222 case OP_MOD: /* modulo */ 4101 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4102 v = nvalue (x);
4224 4103
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4104 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4105 v = num_mod (v, nvalue (cadr (args)));
4227 else 4106 else
4228 Error_0 ("modulo: division by zero"); 4107 Error_0 ("modulo: division by zero");
4229 4108
4230 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4231 4110
4232 case OP_CAR: /* car */ 4111 case OP_CAR: /* car */
4233 s_return (caar (SCHEME_V->args)); 4112 s_return (caar (args));
4234 4113
4235 case OP_CDR: /* cdr */ 4114 case OP_CDR: /* cdr */
4236 s_return (cdar (SCHEME_V->args)); 4115 s_return (cdar (args));
4237 4116
4238 case OP_CONS: /* cons */ 4117 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4118 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4119 s_return (args);
4241 4120
4242 case OP_SETCAR: /* set-car! */ 4121 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4122 if (!is_immutable (x))
4244 { 4123 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4124 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4125 s_return (car (args));
4247 } 4126 }
4248 else 4127 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4128 Error_0 ("set-car!: unable to alter immutable pair");
4250 4129
4251 case OP_SETCDR: /* set-cdr! */ 4130 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4253 { 4132 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4256 } 4135 }
4257 else 4136 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4137 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4138
4260 case OP_CHAR2INT: /* char->integer */ 4139 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4140 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4262 4141
4263 case OP_INT2CHAR: /* integer->char */ 4142 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4143 s_return (mk_character (SCHEME_A_ ivalue (x)));
4265 4144
4266 case OP_CHARUPCASE: 4145 case OP_CHARUPCASE:
4267 { 4146 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4147 unsigned char c = ivalue (x);
4269 c = toupper (c); 4148 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4149 s_return (mk_character (SCHEME_A_ c));
4271 } 4150 }
4272 4151
4273 case OP_CHARDNCASE: 4152 case OP_CHARDNCASE:
4274 { 4153 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4154 unsigned char c = ivalue (x);
4276 c = tolower (c); 4155 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4156 s_return (mk_character (SCHEME_A_ c));
4278 } 4157 }
4279 4158
4280 case OP_STR2SYM: /* string->symbol */ 4159 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4160 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4161
4283 case OP_STR2ATOM: /* string->atom */ 4162 case OP_STR2ATOM: /* string->atom */
4284 { 4163 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4164 char *s = strvalue (x);
4286 long pf = 0; 4165 long pf = 0;
4287 4166
4288 if (cdr (SCHEME_V->args) != NIL) 4167 if (cdr (args) != NIL)
4289 { 4168 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4169 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4170 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4171 pf = ivalue_unchecked (cadr (args));
4293 4172
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4173 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4174 {
4296 /* base is OK */ 4175 /* base is OK */
4297 } 4176 }
4298 else 4177 else
4299 pf = -1; 4178 pf = -1;
4300 } 4179 }
4301 4180
4302 if (pf < 0) 4181 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4182 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4183 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4184 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4185 else
4307 { 4186 {
4308 if (pf == 0 || pf == 10) 4187 if (pf == 0 || pf == 10)
… …
4319 } 4198 }
4320 } 4199 }
4321 } 4200 }
4322 4201
4323 case OP_SYM2STR: /* symbol->string */ 4202 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4203 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4204 setimmutable (x);
4326 s_return (x); 4205 s_return (x);
4327 4206
4328 case OP_ATOM2STR: /* atom->string */ 4207 case OP_ATOM2STR: /* atom->string */
4329 { 4208 {
4330 long pf = 0; 4209 long pf = 0;
4331 4210
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4211 if (cdr (args) != NIL)
4335 { 4212 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4213 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4214 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4215 pf = ivalue_unchecked (cadr (args));
4339 4216
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4217 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4218 {
4342 /* base is OK */ 4219 /* base is OK */
4343 } 4220 }
4344 else 4221 else
4345 pf = -1; 4222 pf = -1;
4346 } 4223 }
4347 4224
4348 if (pf < 0) 4225 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4226 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4227 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4228 {
4352 char *p; 4229 char *p;
4353 int len; 4230 int len;
4354 4231
… …
4362 case OP_MKSTRING: /* make-string */ 4239 case OP_MKSTRING: /* make-string */
4363 { 4240 {
4364 int fill = ' '; 4241 int fill = ' ';
4365 int len; 4242 int len;
4366 4243
4367 len = ivalue (car (SCHEME_V->args)); 4244 len = ivalue (x);
4368 4245
4369 if (cdr (SCHEME_V->args) != NIL) 4246 if (cdr (args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args)); 4247 fill = charvalue (cadr (args));
4371 4248
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4249 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4250 }
4374 4251
4375 case OP_STRLEN: /* string-length */ 4252 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4253 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4254
4378 case OP_STRREF: /* string-ref */ 4255 case OP_STRREF: /* string-ref */
4379 { 4256 {
4380 char *str; 4257 char *str;
4381 int index; 4258 int index;
4382 4259
4383 str = strvalue (car (SCHEME_V->args)); 4260 str = strvalue (x);
4384 4261
4385 index = ivalue (cadr (SCHEME_V->args)); 4262 index = ivalue (cadr (args));
4386 4263
4387 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4266
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4268 }
4392 4269
4393 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4394 { 4271 {
4395 char *str; 4272 char *str;
4396 int index; 4273 int index;
4397 int c; 4274 int c;
4398 4275
4399 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4278
4402 str = strvalue (car (SCHEME_V->args)); 4279 str = strvalue (x);
4403 4280
4404 index = ivalue (cadr (SCHEME_V->args)); 4281 index = ivalue (cadr (args));
4405 4282
4406 if (index >= strlength (car (SCHEME_V->args))) 4283 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4284 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4285
4409 c = charvalue (caddr (SCHEME_V->args)); 4286 c = charvalue (caddr (args));
4410 4287
4411 str[index] = (char) c; 4288 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4289 s_return (car (args));
4413 } 4290 }
4414 4291
4415 case OP_STRAPPEND: /* string-append */ 4292 case OP_STRAPPEND: /* string-append */
4416 { 4293 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4294 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4295 int len = 0;
4419 pointer newstr; 4296 pointer newstr;
4420 char *pos; 4297 char *pos;
4421 4298
4422 /* compute needed length for new string */ 4299 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4300 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4301 len += strlength (car (x));
4425 4302
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4303 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4304
4428 /* store the contents of the argument strings into the new string */ 4305 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4306 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4307 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4308
4432 s_return (newstr); 4309 s_return (newstr);
4433 } 4310 }
4434 4311
… …
4437 char *str; 4314 char *str;
4438 int index0; 4315 int index0;
4439 int index1; 4316 int index1;
4440 int len; 4317 int len;
4441 4318
4442 str = strvalue (car (SCHEME_V->args)); 4319 str = strvalue (x);
4443 4320
4444 index0 = ivalue (cadr (SCHEME_V->args)); 4321 index0 = ivalue (cadr (args));
4445 4322
4446 if (index0 > strlength (car (SCHEME_V->args))) 4323 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4324 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4325
4449 if (cddr (SCHEME_V->args) != NIL) 4326 if (cddr (args) != NIL)
4450 { 4327 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4328 index1 = ivalue (caddr (args));
4452 4329
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4330 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4331 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4332 }
4456 else 4333 else
4457 index1 = strlength (car (SCHEME_V->args)); 4334 index1 = strlength (x);
4458 4335
4459 len = index1 - index0; 4336 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4337 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4338 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4339 strvalue (x)[len] = 0;
… …
4466 4343
4467 case OP_VECTOR: /* vector */ 4344 case OP_VECTOR: /* vector */
4468 { 4345 {
4469 int i; 4346 int i;
4470 pointer vec; 4347 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4348 int len = list_length (SCHEME_A_ args);
4472 4349
4473 if (len < 0) 4350 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4351 Error_1 ("vector: not a proper list:", args);
4475 4352
4476 vec = mk_vector (SCHEME_A_ len); 4353 vec = mk_vector (SCHEME_A_ len);
4477 4354
4478#if USE_ERROR_CHECKING 4355#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4356 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4357 s_return (S_SINK);
4481#endif 4358#endif
4482 4359
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4361 set_vector_elem (vec, i, car (x));
4485 4362
4486 s_return (vec); 4363 s_return (vec);
4487 } 4364 }
4488 4365
… …
4490 { 4367 {
4491 pointer fill = NIL; 4368 pointer fill = NIL;
4492 int len; 4369 int len;
4493 pointer vec; 4370 pointer vec;
4494 4371
4495 len = ivalue (car (SCHEME_V->args)); 4372 len = ivalue (x);
4496 4373
4497 if (cdr (SCHEME_V->args) != NIL) 4374 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4375 fill = cadr (args);
4499 4376
4500 vec = mk_vector (SCHEME_A_ len); 4377 vec = mk_vector (SCHEME_A_ len);
4501 4378
4502#if USE_ERROR_CHECKING 4379#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4380 if (SCHEME_V->no_memory)
… …
4509 4386
4510 s_return (vec); 4387 s_return (vec);
4511 } 4388 }
4512 4389
4513 case OP_VECLEN: /* vector-length */ 4390 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4391 s_return (mk_integer (SCHEME_A_ veclength (x)));
4515 4392
4516 case OP_VECREF: /* vector-ref */ 4393 case OP_VECREF: /* vector-ref */
4517 { 4394 {
4518 int index; 4395 int index;
4519 4396
4520 index = ivalue (cadr (SCHEME_V->args)); 4397 index = ivalue (cadr (args));
4521 4398
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4400 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4401
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4402 s_return (vector_elem (x, index));
4526 } 4403 }
4527 4404
4528 case OP_VECSET: /* vector-set! */ 4405 case OP_VECSET: /* vector-set! */
4529 { 4406 {
4530 int index; 4407 int index;
4531 4408
4532 if (is_immutable (car (SCHEME_V->args))) 4409 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4410 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4411
4535 index = ivalue (cadr (SCHEME_V->args)); 4412 index = ivalue (cadr (args));
4536 4413
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4415 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4416
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4417 set_vector_elem (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4418 s_return (x);
4542 } 4419 }
4543 } 4420 }
4544 4421
4545 return S_T; 4422 return S_T;
4546} 4423}
… …
4598 } 4475 }
4599 } 4476 }
4600} 4477}
4601 4478
4602static pointer 4479static pointer
4480opexe_r (SCHEME_P_ enum scheme_opcodes op)
4481{
4482 pointer x = SCHEME_V->args;
4483
4484 for (;;)
4485 {
4486 num v = nvalue (car (x));
4487 x = cdr (x);
4488
4489 if (x == NIL)
4490 break;
4491
4492 int r = num_cmp (v, nvalue (car (x)));
4493
4494 switch (op)
4495 {
4496 case OP_NUMEQ: r = r == 0; break;
4497 case OP_LESS: r = r < 0; break;
4498 case OP_GRE: r = r > 0; break;
4499 case OP_LEQ: r = r <= 0; break;
4500 case OP_GEQ: r = r >= 0; break;
4501 }
4502
4503 if (!r)
4504 s_return (S_F);
4505 }
4506
4507 s_return (S_T);
4508}
4509
4510static pointer
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4511opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4512{
4605 pointer x; 4513 pointer args = SCHEME_V->args;
4606 num v; 4514 pointer a = car (args);
4607 int (*comp_func) (num, num); 4515 pointer d = cdr (args);
4516 int r;
4608 4517
4609 switch (op) 4518 switch (op)
4610 { 4519 {
4611 case OP_NOT: /* not */ 4520 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4530
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4531#if USE_CHAR_CLASSIFIERS
4683
4684 case OP_CHARAP: /* char-alphabetic? */ 4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4686
4687 case OP_CHARNP: /* char-numeric? */
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */ 4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */ 4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */ 4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4537#endif
4538
4699#if USE_PORTS 4539#if USE_PORTS
4700 4540 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4542 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4543#endif
4710 4544
4711 case OP_PROCP: /* procedure? */ 4545 case OP_PROCP: /* procedure? */
4712 4546
4713 /*-- 4547 /*--
4714 * continuation should be procedure by the example 4548 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4549 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4550 * in R^3 report sec. 6.9
4717 */ 4551 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4552 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4553 break;
4720 4554
4721 case OP_PAIRP: /* pair? */ 4555 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4556 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4557 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4558 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4559 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4560 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4561 }
4739 4562
4740 return S_T; 4563 s_retbool (r);
4741} 4564}
4742 4565
4743static pointer 4566static pointer
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4567opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4568{
4569 pointer args = SCHEME_V->args;
4570 pointer a = car (args);
4746 pointer x, y; 4571 pointer x, y;
4747 4572
4748 switch (op) 4573 switch (op)
4749 { 4574 {
4750 case OP_FORCE: /* force */ 4575 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4576 SCHEME_V->code = a;
4752 4577
4753 if (is_promise (SCHEME_V->code)) 4578 if (is_promise (SCHEME_V->code))
4754 { 4579 {
4755 /* Should change type to closure here */ 4580 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4581 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4602 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4603 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4604 }
4780 } 4605 }
4781 4606
4782 SCHEME_V->args = car (SCHEME_V->args); 4607 SCHEME_V->args = a;
4783 4608
4784 if (op == OP_WRITE) 4609 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4610 SCHEME_V->print_flag = 1;
4786 else 4611 else
4787 SCHEME_V->print_flag = 0; 4612 SCHEME_V->print_flag = 0;
4788 4613
4789 s_goto (OP_P0LIST); 4614 s_goto (OP_P0LIST);
4790 4615
4791 case OP_NEWLINE: /* newline */ 4616 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4617 if (is_pair (args))
4793 { 4618 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4619 if (a != SCHEME_V->outport)
4795 { 4620 {
4796 x = cons (SCHEME_V->outport, NIL); 4621 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4622 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4623 SCHEME_V->outport = a;
4799 } 4624 }
4800 } 4625 }
4801 4626
4802 putstr (SCHEME_A_ "\n"); 4627 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4628 s_return (S_T);
4804#endif 4629#endif
4805 4630
4806 case OP_ERR0: /* error */ 4631 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4632 SCHEME_V->retcode = -1;
4808 4633
4809 if (!is_string (car (SCHEME_V->args))) 4634 if (!is_string (a))
4810 { 4635 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4636 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4637 setimmutable (car (args));
4813 } 4638 }
4814 4639
4815 putstr (SCHEME_A_ "Error: "); 4640 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4641 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4642 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4643 s_goto (OP_ERR1);
4819 4644
4820 case OP_ERR1: /* error */ 4645 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4646 putstr (SCHEME_A_ " ");
4822 4647
4823 if (SCHEME_V->args != NIL) 4648 if (args != NIL)
4824 { 4649 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4650 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4651 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4652 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4653 s_goto (OP_P0LIST);
4829 } 4654 }
4830 else 4655 else
4831 { 4656 {
… …
4836 else 4661 else
4837 return NIL; 4662 return NIL;
4838 } 4663 }
4839 4664
4840 case OP_REVERSE: /* reverse */ 4665 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4666 s_return (reverse (SCHEME_A_ a));
4842 4667
4843 case OP_LIST_STAR: /* list* */ 4668 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4669 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4670
4846 case OP_APPEND: /* append */ 4671 case OP_APPEND: /* append */
4847 x = NIL; 4672 x = NIL;
4848 y = SCHEME_V->args; 4673 y = args;
4849 4674
4850 if (y == x) 4675 if (y == x)
4851 s_return (x); 4676 s_return (x);
4852 4677
4853 /* cdr() in the while condition is not a typo. If car() */ 4678 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4689 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4690
4866#if USE_PLIST 4691#if USE_PLIST
4867 4692
4868 case OP_PUT: /* put */ 4693 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4694 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4695 Error_0 ("illegal use of put");
4871 4696
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4697 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4698 {
4874 if (caar (x) == y) 4699 if (caar (x) == y)
4875 break; 4700 break;
4876 } 4701 }
4877 4702
4878 if (x != NIL) 4703 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4704 cdar (x) = caddr (args);
4880 else 4705 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4706 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4707
4883 s_return (S_T); 4708 s_return (S_T);
4884 4709
4885 case OP_GET: /* get */ 4710 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4711 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4712 Error_0 ("illegal use of get");
4888 4713
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4714 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4715 if (caar (x) == y)
4891 break; 4716 break;
4892 4717
4893 if (x != NIL) 4718 if (x != NIL)
4894 s_return (cdar (x)); 4719 s_return (cdar (x));
… …
4896 s_return (NIL); 4721 s_return (NIL);
4897 4722
4898#endif /* USE_PLIST */ 4723#endif /* USE_PLIST */
4899 4724
4900 case OP_QUIT: /* quit */ 4725 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4726 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4727 SCHEME_V->retcode = ivalue (a);
4903 4728
4904 return NIL; 4729 return NIL;
4905 4730
4906 case OP_GC: /* gc */ 4731 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4732 gc (SCHEME_A_ NIL, NIL);
… …
4909 4734
4910 case OP_GCVERB: /* gc-verbose */ 4735 case OP_GCVERB: /* gc-verbose */
4911 { 4736 {
4912 int was = SCHEME_V->gc_verbose; 4737 int was = SCHEME_V->gc_verbose;
4913 4738
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4739 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4740 s_retbool (was);
4916 } 4741 }
4917 4742
4918 case OP_NEWSEGMENT: /* new-segment */ 4743 case OP_NEWSEGMENT: /* new-segment */
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4744 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4745 Error_0 ("new-segment: argument must be a number");
4921 4746
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4923 4748
4924 s_return (S_T); 4749 s_return (S_T);
4925 4750
4926 case OP_OBLIST: /* oblist */ 4751 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4752 s_return (oblist_all_symbols (SCHEME_A));
… …
4954 case OP_OPEN_INOUTFILE: 4779 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4780 prop = port_input | port_output;
4956 break; 4781 break;
4957 } 4782 }
4958 4783
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4784 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4785
4961 if (p == NIL) 4786 if (p == NIL)
4962 s_return (S_F); 4787 s_return (S_F);
4963 4788
4964 s_return (p); 4789 s_return (p);
… …
4981 case OP_OPEN_INOUTSTRING: 4806 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4807 prop = port_input | port_output;
4983 break; 4808 break;
4984 } 4809 }
4985 4810
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4811 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4812 strvalue (a) + strlength (a), prop);
4988 4813
4989 if (p == NIL) 4814 if (p == NIL)
4990 s_return (S_F); 4815 s_return (S_F);
4991 4816
4992 s_return (p); 4817 s_return (p);
… …
4994 4819
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4820 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4821 {
4997 pointer p; 4822 pointer p;
4998 4823
4999 if (car (SCHEME_V->args) == NIL) 4824 if (a == NIL)
5000 { 4825 {
5001 p = port_from_scratch (SCHEME_A); 4826 p = port_from_scratch (SCHEME_A);
5002 4827
5003 if (p == NIL) 4828 if (p == NIL)
5004 s_return (S_F); 4829 s_return (S_F);
5005 } 4830 }
5006 else 4831 else
5007 { 4832 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4833 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4834 strvalue (a) + strlength (a), port_output);
5010 4835
5011 if (p == NIL) 4836 if (p == NIL)
5012 s_return (S_F); 4837 s_return (S_F);
5013 } 4838 }
5014 4839
… …
5017 4842
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4843 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4844 {
5020 port *p; 4845 port *p;
5021 4846
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4847 if ((p = a->object.port)->kind & port_string)
5023 { 4848 {
5024 off_t size; 4849 off_t size;
5025 char *str; 4850 char *str;
5026 4851
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4852 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4868 }
5044 4869
5045# endif 4870# endif
5046 4871
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4872 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4873 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4874 s_return (S_T);
5050 4875
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4876 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4877 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4878 s_return (S_T);
5054#endif 4879#endif
5055 4880
5056 case OP_INT_ENV: /* interaction-environment */ 4881 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4882 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4884 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4885 s_return (SCHEME_V->envir);
5061 4886
5062 } 4887 }
5063 4888
5064 return S_T; 4889 abort ();
5065} 4890}
5066 4891
5067static pointer 4892static pointer
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4893opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4894{
4895 pointer args = SCHEME_V->args;
5070 pointer x; 4896 pointer x;
5071 4897
5072 if (SCHEME_V->nesting != 0) 4898 if (SCHEME_V->nesting != 0)
5073 { 4899 {
5074 int n = SCHEME_V->nesting; 4900 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4907 switch (op)
5082 { 4908 {
5083 /* ========== reading part ========== */ 4909 /* ========== reading part ========== */
5084#if USE_PORTS 4910#if USE_PORTS
5085 case OP_READ: 4911 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4912 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4913 s_goto (OP_READ_INTERNAL);
5088 4914
5089 if (!is_inport (car (SCHEME_V->args))) 4915 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4916 Error_1 ("read: not an input port:", car (args));
5091 4917
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4918 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4919 s_goto (OP_READ_INTERNAL);
5094 4920
5095 x = SCHEME_V->inport; 4921 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4922 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4923 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4924 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4925 s_goto (OP_READ_INTERNAL);
5100 4926
5101 case OP_READ_CHAR: /* read-char */ 4927 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4928 case OP_PEEK_CHAR: /* peek-char */
5103 { 4929 {
5104 int c; 4930 int c;
5105 4931
5106 if (is_pair (SCHEME_V->args)) 4932 if (is_pair (args))
5107 { 4933 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4934 if (car (args) != SCHEME_V->inport)
5109 { 4935 {
5110 x = SCHEME_V->inport; 4936 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4937 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4938 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4939 SCHEME_V->inport = car (args);
5114 } 4940 }
5115 } 4941 }
5116 4942
5117 c = inchar (SCHEME_A); 4943 c = inchar (SCHEME_A);
5118 4944
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4954 case OP_CHAR_READY: /* char-ready? */
5129 { 4955 {
5130 pointer p = SCHEME_V->inport; 4956 pointer p = SCHEME_V->inport;
5131 int res; 4957 int res;
5132 4958
5133 if (is_pair (SCHEME_V->args)) 4959 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4960 p = car (args);
5135 4961
5136 res = p->object.port->kind & port_string; 4962 res = p->object.port->kind & port_string;
5137 4963
5138 s_retbool (res); 4964 s_retbool (res);
5139 } 4965 }
5140 4966
5141 case OP_SET_INPORT: /* set-input-port */ 4967 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 4968 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 4969 s_return (SCHEME_V->value);
5144 4970
5145 case OP_SET_OUTPORT: /* set-output-port */ 4971 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 4972 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 4973 s_return (SCHEME_V->value);
5148#endif 4974#endif
5149 4975
5150 case OP_RDSEXPR: 4976 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 4977 switch (SCHEME_V->tok)
… …
5237 } 5063 }
5238 5064
5239 break; 5065 break;
5240 5066
5241 case OP_RDLIST: 5067 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5068 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5069 SCHEME_V->tok = token (SCHEME_A);
5244 5070
5245 switch (SCHEME_V->tok) 5071 switch (SCHEME_V->tok)
5246 { 5072 {
5247 case TOK_EOF: 5073 case TOK_EOF:
… …
5275 case OP_RDDOT: 5101 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5102 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5103 Error_0 ("syntax error: illegal dot expression");
5278 5104
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5105 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5106 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5107
5282 case OP_RDQUOTE: 5108 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5109 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5110
5285 case OP_RDQQUOTE: 5111 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5133 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5134 s_goto (OP_VECTOR);
5309 5135
5310 /* ========== printing part ========== */ 5136 /* ========== printing part ========== */
5311 case OP_P0LIST: 5137 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5138 if (is_vector (args))
5313 { 5139 {
5314 putstr (SCHEME_A_ "#("); 5140 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5141 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5142 s_goto (OP_PVECFROM);
5317 } 5143 }
5318 else if (is_environment (SCHEME_V->args)) 5144 else if (is_environment (args))
5319 { 5145 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5146 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5147 s_return (S_T);
5322 } 5148 }
5323 else if (!is_pair (SCHEME_V->args)) 5149 else if (!is_pair (args))
5324 { 5150 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5151 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5152 s_return (S_T);
5327 } 5153 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5154 else
5329 { 5155 {
5156 pointer a = car (args);
5157 pointer b = cdr (args);
5158 int ok_abbr = ok_abbrev (b);
5159 SCHEME_V->args = car (b);
5160
5161 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5162 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5163 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5164 putstr (SCHEME_A_ "`");
5165 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5166 putstr (SCHEME_A_ ",");
5167 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5168 putstr (SCHEME_A_ ",@");
5169 else
5170 {
5171 putstr (SCHEME_A_ "(");
5172 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5173 SCHEME_V->args = a;
5174 }
5175
5332 s_goto (OP_P0LIST); 5176 s_goto (OP_P0LIST);
5333 } 5177 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5178
5179 case OP_P1LIST:
5180 if (is_pair (args))
5335 { 5181 {
5182 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5183 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5184 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5185 s_goto (OP_P0LIST);
5339 } 5186 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5187 else if (is_vector (args))
5369 { 5188 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5189 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5190 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5191 s_goto (OP_P0LIST);
5373 } 5192 }
5374 else 5193 else
5375 { 5194 {
5376 if (SCHEME_V->args != NIL) 5195 if (args != NIL)
5377 { 5196 {
5378 putstr (SCHEME_A_ " . "); 5197 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5198 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5199 }
5381 5200
5382 putstr (SCHEME_A_ ")"); 5201 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5202 s_return (S_T);
5384 } 5203 }
5385 5204
5386 case OP_PVECFROM: 5205 case OP_PVECFROM:
5387 { 5206 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5207 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5208 pointer vec = car (args);
5390 int len = veclength (vec); 5209 int len = veclength (vec);
5391 5210
5392 if (i == len) 5211 if (i == len)
5393 { 5212 {
5394 putstr (SCHEME_A_ ")"); 5213 putstr (SCHEME_A_ ")");
… …
5396 } 5215 }
5397 else 5216 else
5398 { 5217 {
5399 pointer elem = vector_elem (vec, i); 5218 pointer elem = vector_elem (vec, i);
5400 5219
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5220 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5221 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5222 SCHEME_V->args = elem;
5404 5223
5405 if (i > 0) 5224 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5225 putstr (SCHEME_A_ " ");
5407 5226
5408 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5409 } 5228 }
5410 } 5229 }
5411 } 5230 }
5412 5231
5413 return S_T; 5232 abort ();
5414} 5233}
5415 5234
5416static pointer 5235static pointer
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5236opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5237{
5238 pointer args = SCHEME_V->args;
5239 pointer a = car (args);
5419 pointer x, y; 5240 pointer x, y;
5420 5241
5421 switch (op) 5242 switch (op)
5422 { 5243 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5244 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5245 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5246 long v = list_length (SCHEME_A_ a);
5426 5247
5427 if (v < 0) 5248 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5249 Error_1 ("length: not a list:", a);
5429 5250
5430 s_return (mk_integer (SCHEME_A_ v)); 5251 s_return (mk_integer (SCHEME_A_ v));
5431 } 5252 }
5432 5253
5433 case OP_ASSQ: /* assq *//* a.k */ 5254 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5255 x = a;
5435 5256
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5257 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5258 {
5438 if (!is_pair (car (y))) 5259 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5260 Error_0 ("unable to handle non pair element");
5440 5261
5441 if (x == caar (y)) 5262 if (x == caar (y))
… …
5447 else 5268 else
5448 s_return (S_F); 5269 s_return (S_F);
5449 5270
5450 5271
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5272 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5273 SCHEME_V->args = a;
5453 5274
5454 if (SCHEME_V->args == NIL) 5275 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5276 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5277 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5278 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5463 case OP_CLOSUREP: /* closure? */ 5284 case OP_CLOSUREP: /* closure? */
5464 /* 5285 /*
5465 * Note, macro object is also a closure. 5286 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5287 * Therefore, (closure? <#MACRO>) ==> #t
5467 */ 5288 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5289 s_retbool (is_closure (a));
5469 5290
5470 case OP_MACROP: /* macro? */ 5291 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5292 s_retbool (is_macro (a));
5472 } 5293 }
5473 5294
5474 return S_T; /* NOTREACHED */ 5295 abort ();
5475} 5296}
5476 5297
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5298typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5478 5299
5479typedef int (*test_predicate) (pointer); 5300typedef int (*test_predicate) (pointer);
… …
5511 { is_number, "number" }, 5332 { is_number, "number" },
5512 { is_integer, "integer" }, 5333 { is_integer, "integer" },
5513 { is_nonneg, "non-negative integer" } 5334 { is_nonneg, "non-negative integer" }
5514}; 5335};
5515 5336
5516#define TST_NONE 0 5337#define TST_NONE 0 /* TST_NONE used for standard procedures, for internal ops, 0 is used */
5517#define TST_ANY "\001" 5338#define TST_ANY "\001"
5518#define TST_STRING "\002" 5339#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5340#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5341#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5342#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5343#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5344#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5345#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5346#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5347#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5348#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5349#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5350#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5351#define TST_NATURAL "\016"
5531 5352
5532typedef struct 5353typedef struct
5533{ 5354{
5534 dispatch_func func; 5355 dispatch_func func;
5535 char *name; 5356 char *name;
5536 int min_arity; 5357 int min_arity;
5537 int max_arity; 5358 int max_arity;
5538 char *arg_tests_encoding; 5359 char arg_tests_encoding[3];
5539} op_code_info; 5360} op_code_info;
5540 5361
5541#define INF_ARG 0xffff 5362#define INF_ARG 0xffff
5542 5363
5543static op_code_info dispatch_table[] = { 5364static op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) { opexe_ ## func, name, minarity, maxarity, argtest },
5545#include "opdefines.h" 5366#include "opdefines.h"
5367#undef OP_DEF
5546 {0} 5368 {0}
5547}; 5369};
5548 5370
5549static const char * 5371static const char *
5550procname (pointer x) 5372procname (pointer x)
… …
5574 int ok = 1; 5396 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5397 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5398 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5399
5578 /* Check number of arguments */ 5400 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5401 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5402 {
5581 ok = 0; 5403 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5404 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5405 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5584 } 5406 }
5585 5407 else if (ecb_expect_false (n > pcd->max_arity))
5586 if (ok && n > pcd->max_arity)
5587 { 5408 {
5588 ok = 0; 5409 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5410 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5411 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5591 } 5412 }
5592 5413
5593 if (ok) 5414 if (ecb_expect_false (ok))
5594 { 5415 {
5595 if (pcd->arg_tests_encoding) 5416 if (*pcd->arg_tests_encoding)
5596 { 5417 {
5597 int i = 0; 5418 int i = 0;
5598 int j; 5419 int j;
5599 const char *t = pcd->arg_tests_encoding; 5420 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5421 pointer arglist = SCHEME_V->args;
5601 5422
5602 do 5423 do
5603 { 5424 {
5604 pointer arg = car (arglist); 5425 pointer arg = car (arglist);
5605 5426
5606 j = (int) t[0]; 5427 j = t[0];
5607 5428
5608 if (j == TST_LIST[0]) 5429 if (j == TST_LIST[0])
5609 { 5430 {
5610 if (arg != NIL && !is_pair (arg)) 5431 if (arg != NIL && !is_pair (arg))
5611 break; 5432 break;
… …
5614 { 5435 {
5615 if (!tests[j].fct (arg)) 5436 if (!tests[j].fct (arg))
5616 break; 5437 break;
5617 } 5438 }
5618 5439
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5440 if (t[1]) /* last test is replicated as necessary */
5620 t++; 5441 t++;
5621 5442
5622 arglist = cdr (arglist); 5443 arglist = cdr (arglist);
5623 i++; 5444 i++;
5624 } 5445 }
… …
5642 } 5463 }
5643#endif 5464#endif
5644 5465
5645 ok_to_freely_gc (SCHEME_A); 5466 ok_to_freely_gc (SCHEME_A);
5646 5467
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5468 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL))
5648 return; 5469 return;
5649 5470
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5471 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5472 {
5652 xwrstr ("No memory!\n"); 5473 xwrstr ("No memory!\n");
… …
5710 5531
5711 case 'd': 5532 case 'd':
5712 return OP_COND0; /* cond */ 5533 return OP_COND0; /* cond */
5713 5534
5714 case '*': 5535 case '*':
5715 return OP_LET0AST; /* let* */ 5536 return OP_LET0AST;/* let* */
5716 5537
5717 default: 5538 default:
5718 return OP_SET0; /* set! */ 5539 return OP_SET0; /* set! */
5719 } 5540 }
5720 5541
… …
5742 5563
5743 case 'f': 5564 case 'f':
5744 return OP_DEF0; /* define */ 5565 return OP_DEF0; /* define */
5745 5566
5746 default: 5567 default:
5747 return OP_LET0REC; /* letrec */ 5568 return OP_LET0REC;/* letrec */
5748 } 5569 }
5749 5570
5750 default: 5571 default:
5751 return OP_C0STREAM; /* cons-stream */ 5572 return OP_C0STREAM; /* cons-stream */
5752 } 5573 }
… …
6002{ 5823{
6003 dump_stack_reset (SCHEME_A); 5824 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5825 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5826 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5827 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5828 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5829 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5830 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5831#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5832 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5833#endif
6013 SCHEME_V->retcode = 0; 5834 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5835 SCHEME_V->interactive_repl = 0;

Diff Legend

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