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

Comparing microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.22 by root, Thu Nov 26 23:26:00 2015 UTC

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

Diff Legend

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