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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.5 by root, Wed Nov 25 10:50:24 2015 UTC vs.
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
60#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
61#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
62#define S_SINK (&SCHEME_V->xsink) 67#define S_SINK (&SCHEME_V->xsink)
63#define S_EOF (&SCHEME_V->xEOF_OBJ) 68#define S_EOF (&SCHEME_V->xEOF_OBJ)
64 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
65#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
66static scheme sc; 81static scheme sc;
67#endif 82#endif
68 83
69static void 84static void
… …
128 c += 'a' - 'A'; 143 c += 'a' - 'A';
129 144
130 return c; 145 return c;
131} 146}
132 147
148static int
149xisdigit (char c)
150{
151 return c >= '0' && c <= '9';
152}
153
154#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c)
157
133#if USE_STRLWR 158#if USE_STRLWR
134static const char * 159static const char *
135strlwr (char *s) 160strlwr (char *s)
136{ 161{
137 const char *p = s; 162 const char *p = s;
… …
146} 171}
147#endif 172#endif
148 173
149#define stricmp(a,b) strcmp (a, b) 174#define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 175#define strlwr(s) (s)
151#define toupper(c) xtoupper(c)
152#define tolower(c) xtolower(c)
153 176
154#ifndef prompt 177#ifndef prompt
155# define prompt "ts> " 178# define prompt "ts> "
156#endif 179#endif
157 180
… …
188#define T_SYNTAX 0x0010 211#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 212#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
192 215
193static num num_add (num a, num b); 216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
194static num num_mul (num a, num b); 217
195static num num_div (num a, num b); 218static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 220static num num_rem (num a, num b);
199static num num_mod (num a, num b); 221static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 222
206#if USE_MATH 223#if USE_MATH
207static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
208#endif 225#endif
209static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
236is_vector (pointer p) 253is_vector (pointer p)
237{ 254{
238 return type (p) == T_VECTOR; 255 return type (p) == T_VECTOR;
239} 256}
240 257
258#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 260INTERFACE void fill_vector (pointer vec, pointer obj);
242INTERFACE uint32_t vector_length (pointer vec); 261INTERFACE uint32_t vector_length (pointer vec);
243INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);
244INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);
245 264
… …
314{ 333{
315 return num_get_rvalue (p->object.number); 334 return num_get_rvalue (p->object.number);
316} 335}
317 336
318#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)
319#if USE_FLOAT 338#if USE_REAL
320# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)
321# define set_num_integer(p) (p)->object.number.is_fixnum=1; 340# define set_num_integer(p) (p)->object.number.is_fixnum=1;
322# define set_num_real(p) (p)->object.number.is_fixnum=0; 341# define set_num_real(p) (p)->object.number.is_fixnum=0;
323#else 342#else
324# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
… …
354{ 373{
355 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
356} 375}
357 376
358#define car(p) ((p)->object.cons.car + 0) 377#define car(p) ((p)->object.cons.car + 0)
359#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) ((p)->object.cons.cdr + 0)
360 379
361#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
362#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
363#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
364#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
365 384
366#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
367#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
368#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
369 388
370INTERFACE void 389INTERFACE void
371set_car (pointer p, pointer q) 390set_car (pointer p, pointer q)
372{ 391{
373 p->object.cons.car = q; 392 p->object.cons.car = q;
… …
486 return type (p) == T_ENVIRONMENT; 505 return type (p) == T_ENVIRONMENT;
487} 506}
488 507
489#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 508#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
490 509
491#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
492#define is_atom(p) (typeflag (p) & T_ATOM) 510#define is_atom(p) (typeflag (p) & T_ATOM)
493#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 511#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
494#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 512#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
495 513
496#define is_mark(p) (typeflag (p) & T_MARK) 514#define is_mark(p) (typeflag (p) & T_MARK)
497#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
498#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
499
500#if 0
501static int
502is_atom(pointer p)
503{
504 if (!is_atom1(p) != !is_atom2(p))
505 printf ("atoms disagree %x\n", typeflag(p));
506
507 return is_atom2(p);
508}
509#endif
510 517
511INTERFACE INLINE int 518INTERFACE INLINE int
512is_immutable (pointer p) 519is_immutable (pointer p)
513{ 520{
514 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
618static int file_push (SCHEME_P_ const char *fname); 625static int file_push (SCHEME_P_ const char *fname);
619static void file_pop (SCHEME_P); 626static void file_pop (SCHEME_P);
620static int file_interactive (SCHEME_P); 627static int file_interactive (SCHEME_P);
621static INLINE int is_one_of (char *s, int c); 628static INLINE int is_one_of (char *s, int c);
622static int alloc_cellseg (SCHEME_P_ int n); 629static int alloc_cellseg (SCHEME_P_ int n);
623static long binary_decode (const char *s);
624static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b);
625static void finalize_cell (SCHEME_P_ pointer a); 631static void finalize_cell (SCHEME_P_ pointer a);
626static int count_consecutive_cells (pointer x, int needed); 632static int count_consecutive_cells (pointer x, int needed);
627static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
628static pointer mk_number (SCHEME_P_ const num n); 634static pointer mk_number (SCHEME_P_ const num n);
… …
662static pointer ss_get_cont (SCHEME_P); 668static pointer ss_get_cont (SCHEME_P);
663static void ss_set_cont (SCHEME_P_ pointer cont); 669static void ss_set_cont (SCHEME_P_ pointer cont);
664static void dump_stack_mark (SCHEME_P); 670static void dump_stack_mark (SCHEME_P);
665static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
667static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op);
671static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
672static void assign_syntax (SCHEME_P_ const char *name); 679static void assign_syntax (SCHEME_P_ const char *name);
673static int syntaxnum (pointer p); 680static int syntaxnum (pointer p);
674static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
675 682
676static num 683static num
677num_add (num a, num b) 684num_op (enum num_op op, num a, num b)
678{ 685{
679 num ret; 686 num ret;
680 687
681 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
682 689
683 if (num_is_fixnum (ret)) 690 if (num_is_fixnum (ret))
684 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 691 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op)
696 {
697 case NUM_ADD: av += bv; break;
698 case NUM_SUB: av -= bv; break;
699 case NUM_MUL: av *= bv; break;
700 case NUM_INTDIV: av /= bv; break;
701 }
702
703 num_set_ivalue (ret, av);
704 }
685 else 705 else
686 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 706 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
687 709
688 return ret; 710 switch (op)
689} 711 {
712 case NUM_ADD: av += bv; break;
713 case NUM_SUB: av -= bv; break;
714 case NUM_MUL: av *= bv; break;
715 case NUM_INTDIV: av /= bv; break;
716 }
690 717
691static num 718 num_set_rvalue (ret, av);
692num_mul (num a, num b) 719 }
693{
694 num ret;
695
696 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
697
698 if (num_is_fixnum (ret))
699 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
700 else
701 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
702 720
703 return ret; 721 return ret;
704} 722}
705 723
706static num 724static num
… …
717 735
718 return ret; 736 return ret;
719} 737}
720 738
721static num 739static num
722num_intdiv (num a, num b)
723{
724 num ret;
725
726 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
727
728 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
730 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
732
733 return ret;
734}
735
736static num
737num_sub (num a, num b)
738{
739 num ret;
740
741 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
742
743 if (num_is_fixnum (ret))
744 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
745 else
746 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
747
748 return ret;
749}
750
751static num
752num_rem (num a, num b) 740num_rem (num a, num b)
753{ 741{
754 num ret; 742 num ret;
755 long e1, e2, res; 743 long e1, e2, res;
756 744
… …
792 780
793 num_set_ivalue (ret, res); 781 num_set_ivalue (ret, res);
794 return ret; 782 return ret;
795} 783}
796 784
785/* this completely disrespects NaNs */
797static int 786static int
798num_eq (num a, num b) 787num_cmp (num a, num b)
799{ 788{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
800 int ret; 790 int ret;
801 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 791
803 if (is_fixnum) 792 if (is_fixnum)
804 ret = num_get_ivalue (a) == num_get_ivalue (b); 793 {
794 IVALUE av = num_get_ivalue (a);
795 IVALUE bv = num_get_ivalue (b);
796
797 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 }
805 else 799 else
806 ret = num_get_rvalue (a) == num_get_rvalue (b); 800 {
801 RVALUE av = num_get_rvalue (a);
802 RVALUE bv = num_get_rvalue (b);
803
804 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 }
807 806
808 return ret; 807 return ret;
809}
810
811
812static int
813num_gt (num a, num b)
814{
815 int ret;
816 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
817
818 if (is_fixnum)
819 ret = num_get_ivalue (a) > num_get_ivalue (b);
820 else
821 ret = num_get_rvalue (a) > num_get_rvalue (b);
822
823 return ret;
824}
825
826static int
827num_ge (num a, num b)
828{
829 return !num_lt (a, b);
830}
831
832static int
833num_lt (num a, num b)
834{
835 int ret;
836 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
837
838 if (is_fixnum)
839 ret = num_get_ivalue (a) < num_get_ivalue (b);
840 else
841 ret = num_get_rvalue (a) < num_get_rvalue (b);
842
843 return ret;
844}
845
846static int
847num_le (num a, num b)
848{
849 return !num_gt (a, b);
850} 808}
851 809
852#if USE_MATH 810#if USE_MATH
853 811
854/* Round to nearest. Round to even if midway */ 812/* Round to nearest. Round to even if midway */
… …
864 return ce; 822 return ce;
865 else if (dfl < dce) 823 else if (dfl < dce)
866 return fl; 824 return fl;
867 else 825 else
868 { 826 {
869 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 827 if (fmod (fl, 2) == 0) /* I imagine this holds */
870 return fl; 828 return fl;
871 else 829 else
872 return ce; 830 return ce;
873 } 831 }
874} 832}
875#endif 833#endif
876 834
877static int 835static int
878is_zero_rvalue (RVALUE x) 836is_zero_rvalue (RVALUE x)
879{ 837{
880#if USE_FLOAT 838#if USE_REAL
881 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
882#else 840#else
883 return x == 0; 841 return x == 0;
884#endif 842#endif
885}
886
887static long
888binary_decode (const char *s)
889{
890 long x = 0;
891
892 while (*s != 0 && (*s == '1' || *s == '0'))
893 {
894 x <<= 1;
895 x += *s - '0';
896 s++;
897 }
898
899 return x;
900} 843}
901 844
902/* allocate new cell segment */ 845/* allocate new cell segment */
903static int 846static int
904alloc_cellseg (SCHEME_P_ int n) 847alloc_cellseg (SCHEME_P_ int n)
… …
978 921
979/* get new cell. parameter a, b is marked by gc. */ 922/* get new cell. parameter a, b is marked by gc. */
980static INLINE pointer 923static INLINE pointer
981get_cell_x (SCHEME_P_ pointer a, pointer b) 924get_cell_x (SCHEME_P_ pointer a, pointer b)
982{ 925{
983 if (SCHEME_V->free_cell == NIL) 926 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
984 { 927 {
985 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
986 return S_SINK; 929 return S_SINK;
987 930
988 if (SCHEME_V->free_cell == NIL) 931 if (SCHEME_V->free_cell == NIL)
… …
1132 1075
1133 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1134 set_typeflag (x, T_SYMBOL); 1077 set_typeflag (x, T_SYMBOL);
1135 setimmutable (car (x)); 1078 setimmutable (car (x));
1136 1079
1137 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1080 location = hash_fn (name, veclength (SCHEME_V->oblist));
1138 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1081 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1139 return x; 1082 return x;
1140} 1083}
1141 1084
1142static INLINE pointer 1085static INLINE pointer
… …
1144{ 1087{
1145 int location; 1088 int location;
1146 pointer x; 1089 pointer x;
1147 char *s; 1090 char *s;
1148 1091
1149 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1092 location = hash_fn (name, veclength (SCHEME_V->oblist));
1150 1093
1151 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1152 { 1095 {
1153 s = symname (car (x)); 1096 s = symname (car (x));
1154 1097
… …
1165{ 1108{
1166 int i; 1109 int i;
1167 pointer x; 1110 pointer x;
1168 pointer ob_list = NIL; 1111 pointer ob_list = NIL;
1169 1112
1170 for (i = 0; i < vector_length (SCHEME_V->oblist); i++) 1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1171 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1172 ob_list = cons (x, ob_list); 1115 ob_list = cons (x, ob_list);
1173 1116
1174 return ob_list; 1117 return ob_list;
1175} 1118}
… …
1317 } 1260 }
1318 1261
1319 return q; 1262 return q;
1320} 1263}
1321 1264
1322/* get new string */
1323INTERFACE pointer 1265INTERFACE pointer
1324mk_string (SCHEME_P_ const char *str) 1266mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1325{ 1267{
1326 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269
1270 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1272 strlength (x) = len;
1273 return x;
1327} 1274}
1328 1275
1329INTERFACE pointer 1276INTERFACE pointer
1330mk_counted_string (SCHEME_P_ const char *str, uint32_t len) 1277mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1331{ 1278{
… …
1336 strlength (x) = len; 1283 strlength (x) = len;
1337 return x; 1284 return x;
1338} 1285}
1339 1286
1340INTERFACE pointer 1287INTERFACE pointer
1341mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1288mk_string (SCHEME_P_ const char *str)
1342{ 1289{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1290 return mk_counted_string (SCHEME_A_ str, strlen (str));
1344
1345 set_typeflag (x, T_STRING | T_ATOM);
1346 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1347 strlength (x) = len;
1348 return x;
1349} 1291}
1350 1292
1351INTERFACE pointer 1293INTERFACE pointer
1352mk_vector (SCHEME_P_ uint32_t len) 1294mk_vector (SCHEME_P_ uint32_t len)
1353{ 1295{
… …
1358fill_vector (pointer vec, pointer obj) 1300fill_vector (pointer vec, pointer obj)
1359{ 1301{
1360 int i; 1302 int i;
1361 1303
1362 for (i = 0; i < vec->object.vector.length; i++) 1304 for (i = 0; i < vec->object.vector.length; i++)
1363 vec->object.vector.vvalue[i] = obj; 1305 vecvalue (vec)[i] = obj;
1364} 1306}
1365 1307
1366INTERFACE pointer 1308INTERFACE pointer
1367vector_elem (pointer vec, uint32_t ielem) 1309vector_elem (pointer vec, uint32_t ielem)
1368{ 1310{
1369 return vec->object.vector.vvalue[ielem]; 1311 return vecvalue(vec)[ielem];
1370} 1312}
1371 1313
1372INTERFACE void 1314INTERFACE void
1373set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1315set_vector_elem (pointer vec, uint32_t ielem, pointer a)
1374{ 1316{
1375 vec->object.vector.vvalue[ielem] = a; 1317 vecvalue(vec)[ielem] = a;
1376} 1318}
1377 1319
1378/* get new symbol */ 1320/* get new symbol */
1379INTERFACE pointer 1321INTERFACE pointer
1380mk_symbol (SCHEME_P_ const char *name) 1322mk_symbol (SCHEME_P_ const char *name)
… …
1390 1332
1391INTERFACE pointer 1333INTERFACE pointer
1392gensym (SCHEME_P) 1334gensym (SCHEME_P)
1393{ 1335{
1394 pointer x; 1336 pointer x;
1395 char name[40];
1396 1337
1397 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1398 { 1339 {
1399 strcpy (name, "gensym-"); 1340 char name[40] = "gensym-";
1400 xnum (name + 7, SCHEME_V->gensym_cnt); 1341 xnum (name + 7, SCHEME_V->gensym_cnt);
1401 1342
1402 /* first check oblist */ 1343 /* first check oblist */
1403 x = oblist_find_by_name (SCHEME_A_ name); 1344 x = oblist_find_by_name (SCHEME_A_ name);
1404 1345
1405 if (x != NIL) 1346 if (x == NIL)
1406 continue;
1407 else
1408 { 1347 {
1409 x = oblist_add_by_name (SCHEME_A_ name); 1348 x = oblist_add_by_name (SCHEME_A_ name);
1410 return x; 1349 return x;
1411 } 1350 }
1412 } 1351 }
… …
1421 char c, *p; 1360 char c, *p;
1422 int has_dec_point = 0; 1361 int has_dec_point = 0;
1423 int has_fp_exp = 0; 1362 int has_fp_exp = 0;
1424 1363
1425#if USE_COLON_HOOK 1364#if USE_COLON_HOOK
1426
1427 if ((p = strstr (q, "::")) != 0) 1365 if ((p = strstr (q, "::")) != 0)
1428 { 1366 {
1429 *p = 0; 1367 *p = 0;
1430 return cons (SCHEME_V->COLON_HOOK, 1368 return cons (SCHEME_V->COLON_HOOK,
1431 cons (cons (SCHEME_V->QUOTE, 1369 cons (cons (SCHEME_V->QUOTE,
1432 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1370 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1433 } 1371 }
1434
1435#endif 1372#endif
1436 1373
1437 p = q; 1374 p = q;
1438 c = *p++; 1375 c = *p++;
1439 1376
… …
1488 1425
1489 return mk_symbol (SCHEME_A_ strlwr (q)); 1426 return mk_symbol (SCHEME_A_ strlwr (q));
1490 } 1427 }
1491 } 1428 }
1492 1429
1493#if USE_FLOAT 1430#if USE_REAL
1494 if (has_dec_point) 1431 if (has_dec_point)
1495 return mk_real (SCHEME_A_ atof (q)); 1432 return mk_real (SCHEME_A_ atof (q));
1496#endif 1433#endif
1497 1434
1498 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1435 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1500 1437
1501/* make constant */ 1438/* make constant */
1502static pointer 1439static pointer
1503mk_sharp_const (SCHEME_P_ char *name) 1440mk_sharp_const (SCHEME_P_ char *name)
1504{ 1441{
1505 long x;
1506 char tmp[STRBUFFSIZE];
1507
1508 if (!strcmp (name, "t")) 1442 if (!strcmp (name, "t"))
1509 return S_T; 1443 return S_T;
1510 else if (!strcmp (name, "f")) 1444 else if (!strcmp (name, "f"))
1511 return S_F; 1445 return S_F;
1512 else if (*name == 'o') /* #o (octal) */
1513 {
1514 x = strtol (name + 1, 0, 8);
1515 return mk_integer (SCHEME_A_ x);
1516 }
1517 else if (*name == 'd') /* #d (decimal) */
1518 {
1519 x = strtol (name + 1, 0, 10);
1520 return mk_integer (SCHEME_A_ x);
1521 }
1522 else if (*name == 'x') /* #x (hex) */
1523 {
1524 x = strtol (name + 1, 0, 16);
1525 return mk_integer (SCHEME_A_ x);
1526 }
1527 else if (*name == 'b') /* #b (binary) */
1528 {
1529 x = binary_decode (name + 1);
1530 return mk_integer (SCHEME_A_ x);
1531 }
1532 else if (*name == '\\') /* #\w (character) */ 1446 else if (*name == '\\') /* #\w (character) */
1533 { 1447 {
1534 int c = 0; 1448 int c;
1535 1449
1536 if (stricmp (name + 1, "space") == 0) 1450 if (stricmp (name + 1, "space") == 0)
1537 c = ' '; 1451 c = ' ';
1538 else if (stricmp (name + 1, "newline") == 0) 1452 else if (stricmp (name + 1, "newline") == 0)
1539 c = '\n'; 1453 c = '\n';
… …
1541 c = '\r'; 1455 c = '\r';
1542 else if (stricmp (name + 1, "tab") == 0) 1456 else if (stricmp (name + 1, "tab") == 0)
1543 c = '\t'; 1457 c = '\t';
1544 else if (name[1] == 'x' && name[2] != 0) 1458 else if (name[1] == 'x' && name[2] != 0)
1545 { 1459 {
1546 int c1 = strtol (name + 2, 0, 16); 1460 long c1 = strtol (name + 2, 0, 16);
1547 1461
1548 if (c1 <= UCHAR_MAX) 1462 if (0 <= c1 && c1 <= UCHAR_MAX)
1549 c = c1; 1463 c = c1;
1550 else 1464 else
1551 return NIL; 1465 return NIL;
1552 1466 }
1553#if USE_ASCII_NAMES 1467#if USE_ASCII_NAMES
1554 }
1555 else if (is_ascii_name (name + 1, &c)) 1468 else if (is_ascii_name (name + 1, &c))
1556 {
1557 /* nothing */ 1469 /* nothing */;
1558#endif 1470#endif
1559 }
1560 else if (name[2] == 0) 1471 else if (name[2] == 0)
1561 c = name[1]; 1472 c = name[1];
1562 else 1473 else
1563 return NIL; 1474 return NIL;
1564 1475
1565 return mk_character (SCHEME_A_ c); 1476 return mk_character (SCHEME_A_ c);
1566 } 1477 }
1567 else 1478 else
1479 {
1480 /* identify base by string index */
1481 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1482 char *base = strchr (baseidx, *name);
1483
1484 if (base)
1485 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1486
1568 return NIL; 1487 return NIL;
1488 }
1569} 1489}
1570 1490
1571/* ========== garbage collector ========== */ 1491/* ========== garbage collector ========== */
1572 1492
1573/*-- 1493/*--
1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1494 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1495 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1576 * for marking. 1496 * for marking.
1497 *
1498 * The exception is vectors - vectors are currently marked recursively,
1499 * which is inherited form tinyscheme and could be fixed by having another
1500 * word of context in the vector
1577 */ 1501 */
1578static void 1502static void
1579mark (pointer a) 1503mark (pointer a)
1580{ 1504{
1581 pointer t, q, p; 1505 pointer t, q, p;
… …
1583 t = 0; 1507 t = 0;
1584 p = a; 1508 p = a;
1585E2: 1509E2:
1586 setmark (p); 1510 setmark (p);
1587 1511
1588 if (is_vector (p)) 1512 if (ecb_expect_false (is_vector (p)))
1589 { 1513 {
1590 int i; 1514 int i;
1591 1515
1592 for (i = 0; i < p->object.vector.length; i++) 1516 for (i = 0; i < p->object.vector.length; i++)
1593 mark (p->object.vector.vvalue[i]); 1517 mark (vecvalue (p)[i]);
1594 } 1518 }
1595 1519
1596 if (is_atom (p)) 1520 if (is_atom (p))
1597 goto E6; 1521 goto E6;
1598 1522
… …
1716} 1640}
1717 1641
1718static void 1642static void
1719finalize_cell (SCHEME_P_ pointer a) 1643finalize_cell (SCHEME_P_ pointer a)
1720{ 1644{
1645 /* TODO, fast bitmap check? */
1721 if (is_string (a)) 1646 if (is_string (a))
1722 free (strvalue (a)); 1647 free (strvalue (a));
1723 else if (is_vector (a)) 1648 else if (is_vector (a))
1724 free (a->object.vector.vvalue); 1649 free (vecvalue (a));
1725#if USE_PORTS 1650#if USE_PORTS
1726 else if (is_port (a)) 1651 else if (is_port (a))
1727 { 1652 {
1728 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1653 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1729 port_close (SCHEME_A_ a, port_input | port_output); 1654 port_close (SCHEME_A_ a, port_input | port_output);
… …
2556 2481
2557 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2558 { 2483 {
2559 if (num_is_integer (l)) 2484 if (num_is_integer (l))
2560 xnum (p, ivalue_unchecked (l)); 2485 xnum (p, ivalue_unchecked (l));
2561#if USE_FLOAT 2486#if USE_REAL
2562 else 2487 else
2563 { 2488 {
2564 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2565 /* r5rs says there must be a '.' (unless 'e'?) */ 2490 /* r5rs says there must be a '.' (unless 'e'?) */
2566 f = strcspn (p, ".e"); 2491 f = strcspn (p, ".e");
… …
2820 } 2745 }
2821 else if (is_number (a)) 2746 else if (is_number (a))
2822 { 2747 {
2823 if (is_number (b)) 2748 if (is_number (b))
2824 if (num_is_integer (a) == num_is_integer (b)) 2749 if (num_is_integer (a) == num_is_integer (b))
2825 return num_eq (nvalue (a), nvalue (b)); 2750 return num_cmp (nvalue (a), nvalue (b)) == 0;
2826 2751
2827 return 0; 2752 return 0;
2828 } 2753 }
2829 else if (is_character (a)) 2754 else if (is_character (a))
2830 { 2755 {
… …
2904{ 2829{
2905 pointer slot = immutable_cons (variable, value); 2830 pointer slot = immutable_cons (variable, value);
2906 2831
2907 if (is_vector (car (env))) 2832 if (is_vector (car (env)))
2908 { 2833 {
2909 int location = hash_fn (symname (variable), vector_length (car (env))); 2834 int location = hash_fn (symname (variable), veclength (car (env)));
2910 2835
2911 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));
2912 } 2837 }
2913 else 2838 else
2914 set_car (env, immutable_cons (slot, car (env))); 2839 set_car (env, immutable_cons (slot, car (env)));
… …
2922 2847
2923 for (x = env; x != NIL; x = cdr (x)) 2848 for (x = env; x != NIL; x = cdr (x))
2924 { 2849 {
2925 if (is_vector (car (x))) 2850 if (is_vector (car (x)))
2926 { 2851 {
2927 location = hash_fn (symname (hdl), vector_length (car (x))); 2852 location = hash_fn (symname (hdl), veclength (car (x)));
2928 y = vector_elem (car (x), location); 2853 y = vector_elem (car (x), location);
2929 } 2854 }
2930 else 2855 else
2931 y = car (x); 2856 y = car (x);
2932 2857
… …
3042#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
3043 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2968 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3044 2969
3045 if (x != NIL) 2970 if (x != NIL)
3046 { 2971 {
3047 if (a) 2972 pointer code = a
3048 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2973 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3049 else 2974 : NIL;
3050 SCHEME_V->code = NIL;
3051 2975
3052 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2976 code = cons (mk_string (SCHEME_A_ s), code);
3053 setimmutable (car (SCHEME_V->code)); 2977 setimmutable (car (code));
3054 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2978 SCHEME_V->code = cons (slot_value_in_env (x), code);
3055 SCHEME_V->op = OP_EVAL; 2979 SCHEME_V->op = OP_EVAL;
3056 2980
3057 return S_T; 2981 return S_T;
3058 } 2982 }
3059#endif 2983#endif
… …
3110 next_frame = SCHEME_V->dump_base + nframes; 3034 next_frame = SCHEME_V->dump_base + nframes;
3111 3035
3112 next_frame->op = op; 3036 next_frame->op = op;
3113 next_frame->args = args; 3037 next_frame->args = args;
3114 next_frame->envir = SCHEME_V->envir; 3038 next_frame->envir = SCHEME_V->envir;
3115 next_frame->code = code; 3039 next_frame->code = code;
3116 3040
3117 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3118} 3042}
3119 3043
3120static pointer 3044static pointer
… …
3293#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3294 3218
3295static pointer 3219static pointer
3296opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3220opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3297{ 3221{
3222 pointer args = SCHEME_V->args;
3298 pointer x, y; 3223 pointer x, y;
3299 3224
3300 switch (op) 3225 switch (op)
3301 { 3226 {
3302 case OP_LOAD: /* load */ 3227 case OP_LOAD: /* load */
3303 if (file_interactive (SCHEME_A)) 3228 if (file_interactive (SCHEME_A))
3304 { 3229 {
3305 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3306 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3307 } 3232 }
3308 3233
3309 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3234 if (!file_push (SCHEME_A_ strvalue (car (args))))
3310 Error_1 ("unable to open", car (SCHEME_V->args)); 3235 Error_1 ("unable to open", car (args));
3311 else 3236 else
3312 { 3237 {
3313 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3238 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3314 s_goto (OP_T0LVL); 3239 s_goto (OP_T0LVL);
3315 } 3240 }
… …
3350 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3275 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3351 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3276 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3352 s_goto (OP_READ_INTERNAL); 3277 s_goto (OP_READ_INTERNAL);
3353 3278
3354 case OP_T1LVL: /* top level */ 3279 case OP_T1LVL: /* top level */
3355 SCHEME_V->code = SCHEME_V->value; 3280 SCHEME_V->code = SCHEME_V->value;
3356 SCHEME_V->inport = SCHEME_V->save_inport; 3281 SCHEME_V->inport = SCHEME_V->save_inport;
3357 s_goto (OP_EVAL); 3282 s_goto (OP_EVAL);
3358 3283
3359 case OP_READ_INTERNAL: /* internal read */ 3284 case OP_READ_INTERNAL: /* internal read */
3360 SCHEME_V->tok = token (SCHEME_A); 3285 SCHEME_V->tok = token (SCHEME_A);
… …
3389 case OP_EVAL: /* main part of evaluation */ 3314 case OP_EVAL: /* main part of evaluation */
3390#if USE_TRACING 3315#if USE_TRACING
3391 if (SCHEME_V->tracing) 3316 if (SCHEME_V->tracing)
3392 { 3317 {
3393 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3318 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3394 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3319 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3395 SCHEME_V->args = SCHEME_V->code; 3320 SCHEME_V->args = SCHEME_V->code;
3396 putstr (SCHEME_A_ "\nEval: "); 3321 putstr (SCHEME_A_ "\nEval: ");
3397 s_goto (OP_P0LIST); 3322 s_goto (OP_P0LIST);
3398 } 3323 }
3399 3324
… …
3410 else 3335 else
3411 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3336 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3412 } 3337 }
3413 else if (is_pair (SCHEME_V->code)) 3338 else if (is_pair (SCHEME_V->code))
3414 { 3339 {
3340 x = car (SCHEME_V->code);
3341
3415 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3342 if (is_syntax (x)) /* SYNTAX */
3416 { 3343 {
3417 SCHEME_V->code = cdr (SCHEME_V->code); 3344 SCHEME_V->code = cdr (SCHEME_V->code);
3418 s_goto (syntaxnum (x)); 3345 s_goto (syntaxnum (x));
3419 } 3346 }
3420 else /* first, eval top element and eval arguments */ 3347 else /* first, eval top element and eval arguments */
3421 { 3348 {
3422 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3349 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3423 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3350 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3424 SCHEME_V->code = car (SCHEME_V->code); 3351 SCHEME_V->code = x;
3425 s_goto (OP_EVAL); 3352 s_goto (OP_EVAL);
3426 } 3353 }
3427 } 3354 }
3428 else 3355 else
3429 s_return (SCHEME_V->code); 3356 s_return (SCHEME_V->code);
… …
3441 SCHEME_V->code = cdr (SCHEME_V->code); 3368 SCHEME_V->code = cdr (SCHEME_V->code);
3442 s_goto (OP_E1ARGS); 3369 s_goto (OP_E1ARGS);
3443 } 3370 }
3444 3371
3445 case OP_E1ARGS: /* eval arguments */ 3372 case OP_E1ARGS: /* eval arguments */
3446 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3373 args = cons (SCHEME_V->value, args);
3447 3374
3448 if (is_pair (SCHEME_V->code)) /* continue */ 3375 if (is_pair (SCHEME_V->code)) /* continue */
3449 { 3376 {
3450 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3377 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3451 SCHEME_V->code = car (SCHEME_V->code); 3378 SCHEME_V->code = car (SCHEME_V->code);
3452 SCHEME_V->args = NIL; 3379 SCHEME_V->args = NIL;
3453 s_goto (OP_EVAL); 3380 s_goto (OP_EVAL);
3454 } 3381 }
3455 else /* end */ 3382 else /* end */
3456 { 3383 {
3457 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3384 args = reverse_in_place (SCHEME_A_ NIL, args);
3458 SCHEME_V->code = car (SCHEME_V->args); 3385 SCHEME_V->code = car (args);
3459 SCHEME_V->args = cdr (SCHEME_V->args); 3386 SCHEME_V->args = cdr (args);
3460 s_goto (OP_APPLY); 3387 s_goto (OP_APPLY);
3461 } 3388 }
3462 3389
3463#if USE_TRACING 3390#if USE_TRACING
3464 3391
3465 case OP_TRACING: 3392 case OP_TRACING:
3466 { 3393 {
3467 int tr = SCHEME_V->tracing; 3394 int tr = SCHEME_V->tracing;
3468 3395
3469 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3396 SCHEME_V->tracing = ivalue (car (args));
3470 s_return (mk_integer (SCHEME_A_ tr)); 3397 s_return (mk_integer (SCHEME_A_ tr));
3471 } 3398 }
3472 3399
3473#endif 3400#endif
3474 3401
3475 case OP_APPLY: /* apply 'code' to 'args' */ 3402 case OP_APPLY: /* apply 'code' to 'args' */
3476#if USE_TRACING 3403#if USE_TRACING
3477 if (SCHEME_V->tracing) 3404 if (SCHEME_V->tracing)
3478 { 3405 {
3479 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3406 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3480 SCHEME_V->print_flag = 1; 3407 SCHEME_V->print_flag = 1;
3481 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3408 /* args=cons(SCHEME_V->code,args); */
3482 putstr (SCHEME_A_ "\nApply to: "); 3409 putstr (SCHEME_A_ "\nApply to: ");
3483 s_goto (OP_P0LIST); 3410 s_goto (OP_P0LIST);
3484 } 3411 }
3485 3412
3486 /* fall through */ 3413 /* fall through */
… …
3492 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3493 } 3420 }
3494 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3495 { 3422 {
3496 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3497 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3498 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3499 3426
3500 s_return (x); 3427 s_return (x);
3501 } 3428 }
3502 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 */
3503 { 3430 {
3504 /* Should not accept promise */ 3431 /* Should not accept promise */
3505 /* make environment */ 3432 /* make environment */
3506 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3507 3434
3508 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))
3509 { 3436 {
3510 if (y == NIL) 3437 if (y == NIL)
3511 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3512 else 3439 else
3513 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3531 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3532 } 3459 }
3533 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3534 { 3461 {
3535 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3536 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3537 } 3464 }
3538 else 3465 else
3539 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3540 3467
3541 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3550 { 3477 {
3551 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);
3552 3479
3553 if (f != NIL) 3480 if (f != NIL)
3554 { 3481 {
3555 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3556 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3557 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3558 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3559 } 3486 }
3560 3487
… …
3571 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));
3572 3499
3573#endif 3500#endif
3574 3501
3575 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3576 x = car (SCHEME_V->args); 3503 x = car (args);
3577 3504
3578 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3579 x = cdr (x); 3506 x = cdr (x);
3580 3507
3581 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3582 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3583 else 3510 else
3584 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3585 3512
3586 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3587 3514
3588 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3589 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3621 3548
3622 3549
3623 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3624 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3625 3552
3626 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3627 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3628 3555
3629 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);
3630 3557
3631 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3632 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3633 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));
3634 3561
… …
3677 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3678 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3605 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3679 s_goto (OP_LET1); 3606 s_goto (OP_LET1);
3680 3607
3681 case OP_LET1: /* let (calculate parameters) */ 3608 case OP_LET1: /* let (calculate parameters) */
3682 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3609 args = cons (SCHEME_V->value, args);
3683 3610
3684 if (is_pair (SCHEME_V->code)) /* continue */ 3611 if (is_pair (SCHEME_V->code)) /* continue */
3685 { 3612 {
3686 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3613 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3687 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3614 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3688 3615
3689 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3616 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3690 SCHEME_V->code = cadar (SCHEME_V->code); 3617 SCHEME_V->code = cadar (SCHEME_V->code);
3691 SCHEME_V->args = NIL; 3618 SCHEME_V->args = NIL;
3692 s_goto (OP_EVAL); 3619 s_goto (OP_EVAL);
3693 } 3620 }
3694 else /* end */ 3621 else /* end */
3695 { 3622 {
3696 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3623 args = reverse_in_place (SCHEME_A_ NIL, args);
3697 SCHEME_V->code = car (SCHEME_V->args); 3624 SCHEME_V->code = car (args);
3698 SCHEME_V->args = cdr (SCHEME_V->args); 3625 SCHEME_V->args = cdr (args);
3699 s_goto (OP_LET2); 3626 s_goto (OP_LET2);
3700 } 3627 }
3701 3628
3702 case OP_LET2: /* let */ 3629 case OP_LET2: /* let */
3703 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3630 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3704 3631
3705 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3632 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3706 y != NIL; x = cdr (x), y = cdr (y)) 3633 y != NIL; x = cdr (x), y = cdr (y))
3707 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3634 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3708 3635
3709 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3636 if (is_symbol (car (SCHEME_V->code))) /* named let */
3710 { 3637 {
3711 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3638 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3712 { 3639 {
3713 if (!is_pair (x)) 3640 if (!is_pair (x))
3714 Error_1 ("Bad syntax of binding in let :", x); 3641 Error_1 ("Bad syntax of binding in let :", x);
3715 3642
3716 if (!is_list (SCHEME_A_ car (x))) 3643 if (!is_list (SCHEME_A_ car (x)))
3717 Error_1 ("Bad syntax of binding in let :", car (x)); 3644 Error_1 ("Bad syntax of binding in let :", car (x));
3718 3645
3719 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3646 args = cons (caar (x), args);
3720 } 3647 }
3721 3648
3722 x =
3723 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3649 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3724 SCHEME_V->envir); 3650 SCHEME_V->envir);
3725 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3651 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3726 SCHEME_V->code = cddr (SCHEME_V->code); 3652 SCHEME_V->code = cddr (SCHEME_V->code);
3727 SCHEME_V->args = NIL;
3728 } 3653 }
3729 else 3654 else
3730 { 3655 {
3731 SCHEME_V->code = cdr (SCHEME_V->code); 3656 SCHEME_V->code = cdr (SCHEME_V->code);
3657 }
3658
3732 SCHEME_V->args = NIL; 3659 SCHEME_V->args = NIL;
3733 }
3734
3735 s_goto (OP_BEGIN); 3660 s_goto (OP_BEGIN);
3736 3661
3737 case OP_LET0AST: /* let* */ 3662 case OP_LET0AST: /* let* */
3738 if (car (SCHEME_V->code) == NIL) 3663 if (car (SCHEME_V->code) == NIL)
3739 { 3664 {
… …
3757 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3682 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3758 SCHEME_V->code = cdr (SCHEME_V->code); 3683 SCHEME_V->code = cdr (SCHEME_V->code);
3759 3684
3760 if (is_pair (SCHEME_V->code)) /* continue */ 3685 if (is_pair (SCHEME_V->code)) /* continue */
3761 { 3686 {
3762 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3687 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3763 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3764 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3765 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3766 } 3691 }
3767 else /* end */ 3692 else /* end */
3768 { 3693 {
3769 SCHEME_V->code = SCHEME_V->args; 3694 SCHEME_V->code = args;
3770 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3771 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3772 } 3697 }
3773 3698
3774 case OP_LET0REC: /* letrec */ 3699 case OP_LET0REC: /* letrec */
… …
3777 SCHEME_V->value = SCHEME_V->code; 3702 SCHEME_V->value = SCHEME_V->code;
3778 SCHEME_V->code = car (SCHEME_V->code); 3703 SCHEME_V->code = car (SCHEME_V->code);
3779 s_goto (OP_LET1REC); 3704 s_goto (OP_LET1REC);
3780 3705
3781 case OP_LET1REC: /* letrec (calculate parameters) */ 3706 case OP_LET1REC: /* letrec (calculate parameters) */
3782 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3707 args = cons (SCHEME_V->value, args);
3783 3708
3784 if (is_pair (SCHEME_V->code)) /* continue */ 3709 if (is_pair (SCHEME_V->code)) /* continue */
3785 { 3710 {
3786 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3711 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3787 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3712 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3788 3713
3789 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3714 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3790 SCHEME_V->code = cadar (SCHEME_V->code); 3715 SCHEME_V->code = cadar (SCHEME_V->code);
3791 SCHEME_V->args = NIL; 3716 SCHEME_V->args = NIL;
3792 s_goto (OP_EVAL); 3717 s_goto (OP_EVAL);
3793 } 3718 }
3794 else /* end */ 3719 else /* end */
3795 { 3720 {
3796 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3721 args = reverse_in_place (SCHEME_A_ NIL, args);
3797 SCHEME_V->code = car (SCHEME_V->args); 3722 SCHEME_V->code = car (args);
3798 SCHEME_V->args = cdr (SCHEME_V->args); 3723 SCHEME_V->args = cdr (args);
3799 s_goto (OP_LET2REC); 3724 s_goto (OP_LET2REC);
3800 } 3725 }
3801 3726
3802 case OP_LET2REC: /* letrec */ 3727 case OP_LET2REC: /* letrec */
3803 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3728 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3804 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3729 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3805 3730
3806 SCHEME_V->code = cdr (SCHEME_V->code); 3731 SCHEME_V->code = cdr (SCHEME_V->code);
3807 SCHEME_V->args = NIL; 3732 SCHEME_V->args = NIL;
3808 s_goto (OP_BEGIN); 3733 s_goto (OP_BEGIN);
… …
3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3895 SCHEME_V->code = car (SCHEME_V->code); 3820 SCHEME_V->code = car (SCHEME_V->code);
3896 s_goto (OP_EVAL); 3821 s_goto (OP_EVAL);
3897 3822
3898 case OP_C1STREAM: /* cons-stream */ 3823 case OP_C1STREAM: /* cons-stream */
3899 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3824 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3900 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3825 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3901 set_typeflag (x, T_PROMISE); 3826 set_typeflag (x, T_PROMISE);
3902 s_return (cons (SCHEME_V->args, x)); 3827 s_return (cons (args, x));
3903 3828
3904 case OP_MACRO0: /* macro */ 3829 case OP_MACRO0: /* macro */
3905 if (is_pair (car (SCHEME_V->code))) 3830 if (is_pair (car (SCHEME_V->code)))
3906 { 3831 {
3907 x = caar (SCHEME_V->code); 3832 x = caar (SCHEME_V->code);
… …
3940 { 3865 {
3941 if (!is_pair (y = caar (x))) 3866 if (!is_pair (y = caar (x)))
3942 break; 3867 break;
3943 3868
3944 for (; y != NIL; y = cdr (y)) 3869 for (; y != NIL; y = cdr (y))
3945 {
3946 if (eqv (car (y), SCHEME_V->value)) 3870 if (eqv (car (y), SCHEME_V->value))
3947 break; 3871 break;
3948 }
3949 3872
3950 if (y != NIL) 3873 if (y != NIL)
3951 break; 3874 break;
3952 } 3875 }
3953 3876
… …
3973 s_goto (OP_BEGIN); 3896 s_goto (OP_BEGIN);
3974 else 3897 else
3975 s_return (NIL); 3898 s_return (NIL);
3976 3899
3977 case OP_PAPPLY: /* apply */ 3900 case OP_PAPPLY: /* apply */
3978 SCHEME_V->code = car (SCHEME_V->args); 3901 SCHEME_V->code = car (args);
3979 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3980 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3903 /*SCHEME_V->args = cadr(args); */
3981 s_goto (OP_APPLY); 3904 s_goto (OP_APPLY);
3982 3905
3983 case OP_PEVAL: /* eval */ 3906 case OP_PEVAL: /* eval */
3984 if (cdr (SCHEME_V->args) != NIL) 3907 if (cdr (args) != NIL)
3985 SCHEME_V->envir = cadr (SCHEME_V->args); 3908 SCHEME_V->envir = cadr (args);
3986 3909
3987 SCHEME_V->code = car (SCHEME_V->args); 3910 SCHEME_V->code = car (args);
3988 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
3989 3912
3990 case OP_CONTINUATION: /* call-with-current-continuation */ 3913 case OP_CONTINUATION: /* call-with-current-continuation */
3991 SCHEME_V->code = car (SCHEME_V->args); 3914 SCHEME_V->code = car (args);
3992 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3993 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3994 } 3917 }
3995 3918
3996 return S_T; 3919 abort ();
3997} 3920}
3998 3921
3999static pointer 3922static pointer
4000opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3923opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4001{ 3924{
4002 pointer x; 3925 pointer args = SCHEME_V->args;
3926 pointer x = car (args);
4003 num v; 3927 num v;
4004 3928
4005#if USE_MATH 3929#if USE_MATH
4006 RVALUE dd; 3930 RVALUE dd;
4007#endif 3931#endif
4008 3932
4009 switch (op) 3933 switch (op)
4010 { 3934 {
4011#if USE_MATH 3935#if USE_MATH
4012
4013 case OP_INEX2EX: /* inexact->exact */ 3936 case OP_INEX2EX: /* inexact->exact */
4014 x = car (SCHEME_V->args);
4015
4016 if (num_is_integer (x)) 3937 if (num_is_integer (x))
4017 s_return (x); 3938 s_return (x);
4018 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3939 else if (modf (rvalue_unchecked (x), &dd) == 0)
4019 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3940 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4020 else 3941 else
4021 Error_1 ("inexact->exact: not integral:", x); 3942 Error_1 ("inexact->exact: not integral:", x);
4022 3943
4023 case OP_EXP:
4024 x = car (SCHEME_V->args);
4025 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4026
4027 case OP_LOG:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4030
4031 case OP_SIN:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4034
4035 case OP_COS:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4038
4039 case OP_TAN:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3948 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4042
4043 case OP_ASIN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3949 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4046
4047 case OP_ACOS:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3950 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4050 3951
4051 case OP_ATAN: 3952 case OP_ATAN:
4052 x = car (SCHEME_V->args);
4053
4054 if (cdr (SCHEME_V->args) == NIL) 3953 if (cdr (args) == NIL)
4055 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3954 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4056 else 3955 else
4057 { 3956 {
4058 pointer y = cadr (SCHEME_V->args); 3957 pointer y = cadr (args);
4059
4060 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3958 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4061 } 3959 }
4062 3960
4063 case OP_SQRT: 3961 case OP_SQRT:
4064 x = car (SCHEME_V->args);
4065 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3962 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4066 3963
4067 case OP_EXPT: 3964 case OP_EXPT:
4068 { 3965 {
4069 RVALUE result; 3966 RVALUE result;
4070 int real_result = 1; 3967 int real_result = 1;
4071 pointer y = cadr (SCHEME_V->args); 3968 pointer y = cadr (args);
4072
4073 x = car (SCHEME_V->args);
4074 3969
4075 if (num_is_integer (x) && num_is_integer (y)) 3970 if (num_is_integer (x) && num_is_integer (y))
4076 real_result = 0; 3971 real_result = 0;
4077 3972
4078 /* This 'if' is an R5RS compatibility fix. */ 3973 /* This 'if' is an R5RS compatibility fix. */
4079 /* NOTE: Remove this 'if' fix for R6RS. */ 3974 /* NOTE: Remove this 'if' fix for R6RS. */
4080 if (rvalue (x) == 0 && rvalue (y) < 0) 3975 if (rvalue (x) == 0 && rvalue (y) < 0)
4081 result = 0.0; 3976 result = 0;
4082 else 3977 else
4083 result = pow (rvalue (x), rvalue (y)); 3978 result = pow (rvalue (x), rvalue (y));
4084 3979
4085 /* Before returning integer result make sure we can. */ 3980 /* Before returning integer result make sure we can. */
4086 /* If the test fails, result is too big for integer. */ 3981 /* If the test fails, result is too big for integer. */
4087 if (!real_result) 3982 if (!real_result)
4088 { 3983 {
4089 long result_as_long = (long) result; 3984 long result_as_long = result;
4090 3985
4091 if (result != (RVALUE) result_as_long) 3986 if (result != (RVALUE) result_as_long)
4092 real_result = 1; 3987 real_result = 1;
4093 } 3988 }
4094 3989
… …
4096 s_return (mk_real (SCHEME_A_ result)); 3991 s_return (mk_real (SCHEME_A_ result));
4097 else 3992 else
4098 s_return (mk_integer (SCHEME_A_ result)); 3993 s_return (mk_integer (SCHEME_A_ result));
4099 } 3994 }
4100 3995
4101 case OP_FLOOR:
4102 x = car (SCHEME_V->args);
4103 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4104
4105 case OP_CEILING:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4108 3998
4109 case OP_TRUNCATE: 3999 case OP_TRUNCATE:
4110 { 4000 {
4111 RVALUE rvalue_of_x; 4001 RVALUE rvalue_of_x;
4112 4002
4113 x = car (SCHEME_V->args);
4114 rvalue_of_x = rvalue (x); 4003 rvalue_of_x = rvalue (x);
4115 4004
4116 if (rvalue_of_x > 0) 4005 if (rvalue_of_x > 0)
4117 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4118 else 4007 else
4119 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4120 } 4009 }
4121 4010
4122 case OP_ROUND: 4011 case OP_ROUND:
4123 x = car (SCHEME_V->args);
4124
4125 if (num_is_integer (x)) 4012 if (num_is_integer (x))
4126 s_return (x); 4013 s_return (x);
4127 4014
4128 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4129#endif 4016#endif
4130 4017
4131 case OP_ADD: /* + */ 4018 case OP_ADD: /* + */
4132 v = num_zero; 4019 v = num_zero;
4133 4020
4134 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4021 for (x = args; x != NIL; x = cdr (x))
4135 v = num_add (v, nvalue (car (x))); 4022 v = num_op ('+', v, nvalue (car (x)));
4136 4023
4137 s_return (mk_number (SCHEME_A_ v)); 4024 s_return (mk_number (SCHEME_A_ v));
4138 4025
4139 case OP_MUL: /* * */ 4026 case OP_MUL: /* * */
4140 v = num_one; 4027 v = num_one;
4141 4028
4142 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4029 for (x = args; x != NIL; x = cdr (x))
4143 v = num_mul (v, nvalue (car (x))); 4030 v = num_op ('+', v, nvalue (car (x)));
4144 4031
4145 s_return (mk_number (SCHEME_A_ v)); 4032 s_return (mk_number (SCHEME_A_ v));
4146 4033
4147 case OP_SUB: /* - */ 4034 case OP_SUB: /* - */
4148 if (cdr (SCHEME_V->args) == NIL) 4035 if (cdr (args) == NIL)
4149 { 4036 {
4150 x = SCHEME_V->args; 4037 x = args;
4151 v = num_zero; 4038 v = num_zero;
4152 } 4039 }
4153 else 4040 else
4154 { 4041 {
4155 x = cdr (SCHEME_V->args); 4042 x = cdr (args);
4156 v = nvalue (car (SCHEME_V->args)); 4043 v = nvalue (car (args));
4157 } 4044 }
4158 4045
4159 for (; x != NIL; x = cdr (x)) 4046 for (; x != NIL; x = cdr (x))
4160 v = num_sub (v, nvalue (car (x))); 4047 v = num_op ('+', v, nvalue (car (x)));
4161 4048
4162 s_return (mk_number (SCHEME_A_ v)); 4049 s_return (mk_number (SCHEME_A_ v));
4163 4050
4164 case OP_DIV: /* / */ 4051 case OP_DIV: /* / */
4165 if (cdr (SCHEME_V->args) == NIL) 4052 if (cdr (args) == NIL)
4166 { 4053 {
4167 x = SCHEME_V->args; 4054 x = args;
4168 v = num_one; 4055 v = num_one;
4169 } 4056 }
4170 else 4057 else
4171 { 4058 {
4172 x = cdr (SCHEME_V->args); 4059 x = cdr (args);
4173 v = nvalue (car (SCHEME_V->args)); 4060 v = nvalue (car (args));
4174 } 4061 }
4175 4062
4176 for (; x != NIL; x = cdr (x)) 4063 for (; x != NIL; x = cdr (x))
4177 { 4064 {
4178 if (!is_zero_rvalue (rvalue (car (x)))) 4065 if (!is_zero_rvalue (rvalue (car (x))))
… …
4182 } 4069 }
4183 4070
4184 s_return (mk_number (SCHEME_A_ v)); 4071 s_return (mk_number (SCHEME_A_ v));
4185 4072
4186 case OP_INTDIV: /* quotient */ 4073 case OP_INTDIV: /* quotient */
4187 if (cdr (SCHEME_V->args) == NIL) 4074 if (cdr (args) == NIL)
4188 { 4075 {
4189 x = SCHEME_V->args; 4076 x = args;
4190 v = num_one; 4077 v = num_one;
4191 } 4078 }
4192 else 4079 else
4193 { 4080 {
4194 x = cdr (SCHEME_V->args); 4081 x = cdr (args);
4195 v = nvalue (car (SCHEME_V->args)); 4082 v = nvalue (car (args));
4196 } 4083 }
4197 4084
4198 for (; x != NIL; x = cdr (x)) 4085 for (; x != NIL; x = cdr (x))
4199 { 4086 {
4200 if (ivalue (car (x)) != 0) 4087 if (ivalue (car (x)) != 0)
4201 v = num_intdiv (v, nvalue (car (x))); 4088 v = num_op ('/', v, nvalue (car (x)));
4202 else 4089 else
4203 Error_0 ("quotient: division by zero"); 4090 Error_0 ("quotient: division by zero");
4204 } 4091 }
4205 4092
4206 s_return (mk_number (SCHEME_A_ v)); 4093 s_return (mk_number (SCHEME_A_ v));
4207 4094
4208 case OP_REM: /* remainder */ 4095 case OP_REM: /* remainder */
4209 v = nvalue (car (SCHEME_V->args)); 4096 v = nvalue (x);
4210 4097
4211 if (ivalue (cadr (SCHEME_V->args)) != 0) 4098 if (ivalue (cadr (args)) != 0)
4212 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4099 v = num_rem (v, nvalue (cadr (args)));
4213 else 4100 else
4214 Error_0 ("remainder: division by zero"); 4101 Error_0 ("remainder: division by zero");
4215 4102
4216 s_return (mk_number (SCHEME_A_ v)); 4103 s_return (mk_number (SCHEME_A_ v));
4217 4104
4218 case OP_MOD: /* modulo */ 4105 case OP_MOD: /* modulo */
4219 v = nvalue (car (SCHEME_V->args)); 4106 v = nvalue (x);
4220 4107
4221 if (ivalue (cadr (SCHEME_V->args)) != 0) 4108 if (ivalue (cadr (args)) != 0)
4222 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4109 v = num_mod (v, nvalue (cadr (args)));
4223 else 4110 else
4224 Error_0 ("modulo: division by zero"); 4111 Error_0 ("modulo: division by zero");
4225 4112
4226 s_return (mk_number (SCHEME_A_ v)); 4113 s_return (mk_number (SCHEME_A_ v));
4227 4114
4228 case OP_CAR: /* car */ 4115 case OP_CAR: /* car */
4229 s_return (caar (SCHEME_V->args)); 4116 s_return (caar (args));
4230 4117
4231 case OP_CDR: /* cdr */ 4118 case OP_CDR: /* cdr */
4232 s_return (cdar (SCHEME_V->args)); 4119 s_return (cdar (args));
4233 4120
4234 case OP_CONS: /* cons */ 4121 case OP_CONS: /* cons */
4235 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4122 set_cdr (args, cadr (args));
4236 s_return (SCHEME_V->args); 4123 s_return (args);
4237 4124
4238 case OP_SETCAR: /* set-car! */ 4125 case OP_SETCAR: /* set-car! */
4239 if (!is_immutable (car (SCHEME_V->args))) 4126 if (!is_immutable (x))
4240 { 4127 {
4241 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4128 set_car (x, cadr (args));
4242 s_return (car (SCHEME_V->args)); 4129 s_return (car (args));
4243 } 4130 }
4244 else 4131 else
4245 Error_0 ("set-car!: unable to alter immutable pair"); 4132 Error_0 ("set-car!: unable to alter immutable pair");
4246 4133
4247 case OP_SETCDR: /* set-cdr! */ 4134 case OP_SETCDR: /* set-cdr! */
4248 if (!is_immutable (car (SCHEME_V->args))) 4135 if (!is_immutable (x))
4249 { 4136 {
4250 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4137 set_cdr (x, cadr (args));
4251 s_return (car (SCHEME_V->args)); 4138 s_return (car (args));
4252 } 4139 }
4253 else 4140 else
4254 Error_0 ("set-cdr!: unable to alter immutable pair"); 4141 Error_0 ("set-cdr!: unable to alter immutable pair");
4255 4142
4256 case OP_CHAR2INT: /* char->integer */ 4143 case OP_CHAR2INT: /* char->integer */
4257 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4144 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4258 4145
4259 case OP_INT2CHAR: /* integer->char */ 4146 case OP_INT2CHAR: /* integer->char */
4260 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4147 s_return (mk_character (SCHEME_A_ ivalue (x)));
4261 4148
4262 case OP_CHARUPCASE: 4149 case OP_CHARUPCASE:
4263 { 4150 {
4264 unsigned char c = ivalue (car (SCHEME_V->args)); 4151 unsigned char c = ivalue (x);
4265 c = toupper (c); 4152 c = toupper (c);
4266 s_return (mk_character (SCHEME_A_ c)); 4153 s_return (mk_character (SCHEME_A_ c));
4267 } 4154 }
4268 4155
4269 case OP_CHARDNCASE: 4156 case OP_CHARDNCASE:
4270 { 4157 {
4271 unsigned char c = ivalue (car (SCHEME_V->args)); 4158 unsigned char c = ivalue (x);
4272 c = tolower (c); 4159 c = tolower (c);
4273 s_return (mk_character (SCHEME_A_ c)); 4160 s_return (mk_character (SCHEME_A_ c));
4274 } 4161 }
4275 4162
4276 case OP_STR2SYM: /* string->symbol */ 4163 case OP_STR2SYM: /* string->symbol */
4277 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4164 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4278 4165
4279 case OP_STR2ATOM: /* string->atom */ 4166 case OP_STR2ATOM: /* string->atom */
4280 { 4167 {
4281 char *s = strvalue (car (SCHEME_V->args)); 4168 char *s = strvalue (x);
4282 long pf = 0; 4169 long pf = 0;
4283 4170
4284 if (cdr (SCHEME_V->args) != NIL) 4171 if (cdr (args) != NIL)
4285 { 4172 {
4286 /* we know cadr(SCHEME_V->args) is a natural number */ 4173 /* we know cadr(args) is a natural number */
4287 /* see if it is 2, 8, 10, or 16, or error */ 4174 /* see if it is 2, 8, 10, or 16, or error */
4288 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4175 pf = ivalue_unchecked (cadr (args));
4289 4176
4290 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4177 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4291 { 4178 {
4292 /* base is OK */ 4179 /* base is OK */
4293 } 4180 }
4294 else 4181 else
4295 pf = -1; 4182 pf = -1;
4296 } 4183 }
4297 4184
4298 if (pf < 0) 4185 if (pf < 0)
4299 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4186 Error_1 ("string->atom: bad base:", cadr (args));
4300 else if (*s == '#') /* no use of base! */ 4187 else if (*s == '#') /* no use of base! */
4301 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4188 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4302 else 4189 else
4303 { 4190 {
4304 if (pf == 0 || pf == 10) 4191 if (pf == 0 || pf == 10)
… …
4315 } 4202 }
4316 } 4203 }
4317 } 4204 }
4318 4205
4319 case OP_SYM2STR: /* symbol->string */ 4206 case OP_SYM2STR: /* symbol->string */
4320 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4207 x = mk_string (SCHEME_A_ symname (x));
4321 setimmutable (x); 4208 setimmutable (x);
4322 s_return (x); 4209 s_return (x);
4323 4210
4324 case OP_ATOM2STR: /* atom->string */ 4211 case OP_ATOM2STR: /* atom->string */
4325 { 4212 {
4326 long pf = 0; 4213 long pf = 0;
4327 4214
4328 x = car (SCHEME_V->args);
4329
4330 if (cdr (SCHEME_V->args) != NIL) 4215 if (cdr (args) != NIL)
4331 { 4216 {
4332 /* we know cadr(SCHEME_V->args) is a natural number */ 4217 /* we know cadr(args) is a natural number */
4333 /* see if it is 2, 8, 10, or 16, or error */ 4218 /* see if it is 2, 8, 10, or 16, or error */
4334 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4219 pf = ivalue_unchecked (cadr (args));
4335 4220
4336 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4221 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4337 { 4222 {
4338 /* base is OK */ 4223 /* base is OK */
4339 } 4224 }
4340 else 4225 else
4341 pf = -1; 4226 pf = -1;
4342 } 4227 }
4343 4228
4344 if (pf < 0) 4229 if (pf < 0)
4345 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4230 Error_1 ("atom->string: bad base:", cadr (args));
4346 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4231 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4347 { 4232 {
4348 char *p; 4233 char *p;
4349 int len; 4234 int len;
4350 4235
… …
4358 case OP_MKSTRING: /* make-string */ 4243 case OP_MKSTRING: /* make-string */
4359 { 4244 {
4360 int fill = ' '; 4245 int fill = ' ';
4361 int len; 4246 int len;
4362 4247
4363 len = ivalue (car (SCHEME_V->args)); 4248 len = ivalue (x);
4364 4249
4365 if (cdr (SCHEME_V->args) != NIL) 4250 if (cdr (args) != NIL)
4366 fill = charvalue (cadr (SCHEME_V->args)); 4251 fill = charvalue (cadr (args));
4367 4252
4368 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4369 } 4254 }
4370 4255
4371 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4372 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4373 4258
4374 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4375 { 4260 {
4376 char *str; 4261 char *str;
4377 int index; 4262 int index;
4378 4263
4379 str = strvalue (car (SCHEME_V->args)); 4264 str = strvalue (x);
4380 4265
4381 index = ivalue (cadr (SCHEME_V->args)); 4266 index = ivalue (cadr (args));
4382 4267
4383 if (index >= strlength (car (SCHEME_V->args))) 4268 if (index >= strlength (x))
4384 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4269 Error_1 ("string-ref: out of bounds:", cadr (args));
4385 4270
4386 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4387 } 4272 }
4388 4273
4389 case OP_STRSET: /* string-set! */ 4274 case OP_STRSET: /* string-set! */
4390 { 4275 {
4391 char *str; 4276 char *str;
4392 int index; 4277 int index;
4393 int c; 4278 int c;
4394 4279
4395 if (is_immutable (car (SCHEME_V->args))) 4280 if (is_immutable (x))
4396 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4281 Error_1 ("string-set!: unable to alter immutable string:", x);
4397 4282
4398 str = strvalue (car (SCHEME_V->args)); 4283 str = strvalue (x);
4399 4284
4400 index = ivalue (cadr (SCHEME_V->args)); 4285 index = ivalue (cadr (args));
4401 4286
4402 if (index >= strlength (car (SCHEME_V->args))) 4287 if (index >= strlength (x))
4403 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4288 Error_1 ("string-set!: out of bounds:", cadr (args));
4404 4289
4405 c = charvalue (caddr (SCHEME_V->args)); 4290 c = charvalue (caddr (args));
4406 4291
4407 str[index] = (char) c; 4292 str[index] = c;
4408 s_return (car (SCHEME_V->args)); 4293 s_return (car (args));
4409 } 4294 }
4410 4295
4411 case OP_STRAPPEND: /* string-append */ 4296 case OP_STRAPPEND: /* string-append */
4412 { 4297 {
4413 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4298 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4414 int len = 0; 4299 int len = 0;
4415 pointer newstr; 4300 pointer newstr;
4416 char *pos; 4301 char *pos;
4417 4302
4418 /* compute needed length for new string */ 4303 /* compute needed length for new string */
4419 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4304 for (x = args; x != NIL; x = cdr (x))
4420 len += strlength (car (x)); 4305 len += strlength (car (x));
4421 4306
4422 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4307 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4423 4308
4424 /* store the contents of the argument strings into the new string */ 4309 /* store the contents of the argument strings into the new string */
4425 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4310 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4426 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4311 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4427 4312
4428 s_return (newstr); 4313 s_return (newstr);
4429 } 4314 }
4430 4315
… …
4433 char *str; 4318 char *str;
4434 int index0; 4319 int index0;
4435 int index1; 4320 int index1;
4436 int len; 4321 int len;
4437 4322
4438 str = strvalue (car (SCHEME_V->args)); 4323 str = strvalue (x);
4439 4324
4440 index0 = ivalue (cadr (SCHEME_V->args)); 4325 index0 = ivalue (cadr (args));
4441 4326
4442 if (index0 > strlength (car (SCHEME_V->args))) 4327 if (index0 > strlength (x))
4443 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4328 Error_1 ("substring: start out of bounds:", cadr (args));
4444 4329
4445 if (cddr (SCHEME_V->args) != NIL) 4330 if (cddr (args) != NIL)
4446 { 4331 {
4447 index1 = ivalue (caddr (SCHEME_V->args)); 4332 index1 = ivalue (caddr (args));
4448 4333
4449 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4334 if (index1 > strlength (x) || index1 < index0)
4450 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4335 Error_1 ("substring: end out of bounds:", caddr (args));
4451 } 4336 }
4452 else 4337 else
4453 index1 = strlength (car (SCHEME_V->args)); 4338 index1 = strlength (x);
4454 4339
4455 len = index1 - index0; 4340 len = index1 - index0;
4456 x = mk_empty_string (SCHEME_A_ len, ' '); 4341 x = mk_empty_string (SCHEME_A_ len, ' ');
4457 memcpy (strvalue (x), str + index0, len); 4342 memcpy (strvalue (x), str + index0, len);
4458 strvalue (x)[len] = 0; 4343 strvalue (x)[len] = 0;
… …
4462 4347
4463 case OP_VECTOR: /* vector */ 4348 case OP_VECTOR: /* vector */
4464 { 4349 {
4465 int i; 4350 int i;
4466 pointer vec; 4351 pointer vec;
4467 int len = list_length (SCHEME_A_ SCHEME_V->args); 4352 int len = list_length (SCHEME_A_ args);
4468 4353
4469 if (len < 0) 4354 if (len < 0)
4470 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4355 Error_1 ("vector: not a proper list:", args);
4471 4356
4472 vec = mk_vector (SCHEME_A_ len); 4357 vec = mk_vector (SCHEME_A_ len);
4473 4358
4474#if USE_ERROR_CHECKING 4359#if USE_ERROR_CHECKING
4475 if (SCHEME_V->no_memory) 4360 if (SCHEME_V->no_memory)
4476 s_return (S_SINK); 4361 s_return (S_SINK);
4477#endif 4362#endif
4478 4363
4479 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4480 set_vector_elem (vec, i, car (x)); 4365 set_vector_elem (vec, i, car (x));
4481 4366
4482 s_return (vec); 4367 s_return (vec);
4483 } 4368 }
4484 4369
… …
4486 { 4371 {
4487 pointer fill = NIL; 4372 pointer fill = NIL;
4488 int len; 4373 int len;
4489 pointer vec; 4374 pointer vec;
4490 4375
4491 len = ivalue (car (SCHEME_V->args)); 4376 len = ivalue (x);
4492 4377
4493 if (cdr (SCHEME_V->args) != NIL) 4378 if (cdr (args) != NIL)
4494 fill = cadr (SCHEME_V->args); 4379 fill = cadr (args);
4495 4380
4496 vec = mk_vector (SCHEME_A_ len); 4381 vec = mk_vector (SCHEME_A_ len);
4497 4382
4498#if USE_ERROR_CHECKING 4383#if USE_ERROR_CHECKING
4499 if (SCHEME_V->no_memory) 4384 if (SCHEME_V->no_memory)
… …
4505 4390
4506 s_return (vec); 4391 s_return (vec);
4507 } 4392 }
4508 4393
4509 case OP_VECLEN: /* vector-length */ 4394 case OP_VECLEN: /* vector-length */
4510 s_return (mk_integer (SCHEME_A_ vector_length (car (SCHEME_V->args)))); 4395 s_return (mk_integer (SCHEME_A_ veclength (x)));
4511 4396
4512 case OP_VECREF: /* vector-ref */ 4397 case OP_VECREF: /* vector-ref */
4513 { 4398 {
4514 int index; 4399 int index;
4515 4400
4516 index = ivalue (cadr (SCHEME_V->args)); 4401 index = ivalue (cadr (args));
4517 4402
4518 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4519 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4404 Error_1 ("vector-ref: out of bounds:", cadr (args));
4520 4405
4521 s_return (vector_elem (car (SCHEME_V->args), index)); 4406 s_return (vector_elem (x, index));
4522 } 4407 }
4523 4408
4524 case OP_VECSET: /* vector-set! */ 4409 case OP_VECSET: /* vector-set! */
4525 { 4410 {
4526 int index; 4411 int index;
4527 4412
4528 if (is_immutable (car (SCHEME_V->args))) 4413 if (is_immutable (x))
4529 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4414 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4530 4415
4531 index = ivalue (cadr (SCHEME_V->args)); 4416 index = ivalue (cadr (args));
4532 4417
4533 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4534 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4419 Error_1 ("vector-set!: out of bounds:", cadr (args));
4535 4420
4536 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4421 set_vector_elem (x, index, caddr (args));
4537 s_return (car (SCHEME_V->args)); 4422 s_return (x);
4538 } 4423 }
4539 } 4424 }
4540 4425
4541 return S_T; 4426 return S_T;
4542} 4427}
… …
4594 } 4479 }
4595 } 4480 }
4596} 4481}
4597 4482
4598static pointer 4483static pointer
4484opexe_r (SCHEME_P_ enum scheme_opcodes op)
4485{
4486 pointer x = SCHEME_V->args;
4487
4488 for (;;)
4489 {
4490 num v = nvalue (car (x));
4491 x = cdr (x);
4492
4493 if (x == NIL)
4494 break;
4495
4496 int r = num_cmp (v, nvalue (car (x)));
4497
4498 switch (op)
4499 {
4500 case OP_NUMEQ: r = r == 0; break;
4501 case OP_LESS: r = r < 0; break;
4502 case OP_GRE: r = r > 0; break;
4503 case OP_LEQ: r = r <= 0; break;
4504 case OP_GEQ: r = r >= 0; break;
4505 }
4506
4507 if (!r)
4508 s_return (S_F);
4509 }
4510
4511 s_return (S_T);
4512}
4513
4514static pointer
4599opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4515opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4600{ 4516{
4601 pointer x; 4517 pointer args = SCHEME_V->args;
4602 num v; 4518 pointer a = car (args);
4603 int (*comp_func) (num, num); 4519 pointer d = cdr (args);
4520 int r;
4604 4521
4605 switch (op) 4522 switch (op)
4606 { 4523 {
4607 case OP_NOT: /* not */ 4524 case OP_NOT: /* not */ r = is_false (a) ; break;
4608 s_retbool (is_false (car (SCHEME_V->args))); 4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4609 4534
4610 case OP_BOOLP: /* boolean? */
4611 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4612
4613 case OP_EOFOBJP: /* boolean? */
4614 s_retbool (car (SCHEME_V->args) == S_EOF);
4615
4616 case OP_NULLP: /* null? */
4617 s_retbool (car (SCHEME_V->args) == NIL);
4618
4619 case OP_NUMEQ: /* = */
4620 case OP_LESS: /* < */
4621 case OP_GRE: /* > */
4622 case OP_LEQ: /* <= */
4623 case OP_GEQ: /* >= */
4624 switch (op)
4625 {
4626 case OP_NUMEQ:
4627 comp_func = num_eq;
4628 break;
4629
4630 case OP_LESS:
4631 comp_func = num_lt;
4632 break;
4633
4634 case OP_GRE:
4635 comp_func = num_gt;
4636 break;
4637
4638 case OP_LEQ:
4639 comp_func = num_le;
4640 break;
4641
4642 case OP_GEQ:
4643 comp_func = num_ge;
4644 break;
4645 }
4646
4647 x = SCHEME_V->args;
4648 v = nvalue (car (x));
4649 x = cdr (x);
4650
4651 for (; x != NIL; x = cdr (x))
4652 {
4653 if (!comp_func (v, nvalue (car (x))))
4654 s_retbool (0);
4655
4656 v = nvalue (car (x));
4657 }
4658
4659 s_retbool (1);
4660
4661 case OP_SYMBOLP: /* symbol? */
4662 s_retbool (is_symbol (car (SCHEME_V->args)));
4663
4664 case OP_NUMBERP: /* number? */
4665 s_retbool (is_number (car (SCHEME_V->args)));
4666
4667 case OP_STRINGP: /* string? */
4668 s_retbool (is_string (car (SCHEME_V->args)));
4669
4670 case OP_INTEGERP: /* integer? */
4671 s_retbool (is_integer (car (SCHEME_V->args)));
4672
4673 case OP_REALP: /* real? */
4674 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4675
4676 case OP_CHARP: /* char? */
4677 s_retbool (is_character (car (SCHEME_V->args)));
4678#if USE_CHAR_CLASSIFIERS 4535#if USE_CHAR_CLASSIFIERS
4679
4680 case OP_CHARAP: /* char-alphabetic? */ 4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4681 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4682
4683 case OP_CHARNP: /* char-numeric? */
4684 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4685
4686 case OP_CHARWP: /* char-whitespace? */ 4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4687 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4688
4689 case OP_CHARUP: /* char-upper-case? */ 4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4690 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4691
4692 case OP_CHARLP: /* char-lower-case? */ 4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4693 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4694#endif 4541#endif
4542
4695#if USE_PORTS 4543#if USE_PORTS
4696 4544 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4697 case OP_PORTP: /* port? */
4698 s_retbool (is_port (car (SCHEME_V->args)));
4699
4700 case OP_INPORTP: /* input-port? */ 4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4701 s_retbool (is_inport (car (SCHEME_V->args)));
4702
4703 case OP_OUTPORTP: /* output-port? */ 4546 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4704 s_retbool (is_outport (car (SCHEME_V->args)));
4705#endif 4547#endif
4706 4548
4707 case OP_PROCP: /* procedure? */ 4549 case OP_PROCP: /* procedure? */
4708 4550
4709 /*-- 4551 /*--
4710 * continuation should be procedure by the example 4552 * continuation should be procedure by the example
4711 * (call-with-current-continuation procedure?) ==> #t 4553 * (call-with-current-continuation procedure?) ==> #t
4712 * in R^3 report sec. 6.9 4554 * in R^3 report sec. 6.9
4713 */ 4555 */
4714 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4556 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4715 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4557 break;
4716 4558
4717 case OP_PAIRP: /* pair? */ 4559 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4718 s_retbool (is_pair (car (SCHEME_V->args))); 4560 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4719 4561 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4720 case OP_LISTP: /* list? */ 4562 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4721 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4563 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4722 4564 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4723 case OP_ENVP: /* environment? */
4724 s_retbool (is_environment (car (SCHEME_V->args)));
4725
4726 case OP_VECTORP: /* vector? */
4727 s_retbool (is_vector (car (SCHEME_V->args)));
4728
4729 case OP_EQ: /* eq? */
4730 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4731
4732 case OP_EQV: /* eqv? */
4733 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4734 } 4565 }
4735 4566
4736 return S_T; 4567 s_retbool (r);
4737} 4568}
4738 4569
4739static pointer 4570static pointer
4740opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4571opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4741{ 4572{
4573 pointer args = SCHEME_V->args;
4574 pointer a = car (args);
4742 pointer x, y; 4575 pointer x, y;
4743 4576
4744 switch (op) 4577 switch (op)
4745 { 4578 {
4746 case OP_FORCE: /* force */ 4579 case OP_FORCE: /* force */
4747 SCHEME_V->code = car (SCHEME_V->args); 4580 SCHEME_V->code = a;
4748 4581
4749 if (is_promise (SCHEME_V->code)) 4582 if (is_promise (SCHEME_V->code))
4750 { 4583 {
4751 /* Should change type to closure here */ 4584 /* Should change type to closure here */
4752 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4585 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4773 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4606 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4774 SCHEME_V->outport = cadr (SCHEME_V->args); 4607 SCHEME_V->outport = cadr (SCHEME_V->args);
4775 } 4608 }
4776 } 4609 }
4777 4610
4778 SCHEME_V->args = car (SCHEME_V->args); 4611 SCHEME_V->args = a;
4779 4612
4780 if (op == OP_WRITE) 4613 if (op == OP_WRITE)
4781 SCHEME_V->print_flag = 1; 4614 SCHEME_V->print_flag = 1;
4782 else 4615 else
4783 SCHEME_V->print_flag = 0; 4616 SCHEME_V->print_flag = 0;
4784 4617
4785 s_goto (OP_P0LIST); 4618 s_goto (OP_P0LIST);
4786 4619
4787 case OP_NEWLINE: /* newline */ 4620 case OP_NEWLINE: /* newline */
4788 if (is_pair (SCHEME_V->args)) 4621 if (is_pair (args))
4789 { 4622 {
4790 if (car (SCHEME_V->args) != SCHEME_V->outport) 4623 if (a != SCHEME_V->outport)
4791 { 4624 {
4792 x = cons (SCHEME_V->outport, NIL); 4625 x = cons (SCHEME_V->outport, NIL);
4793 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4626 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4794 SCHEME_V->outport = car (SCHEME_V->args); 4627 SCHEME_V->outport = a;
4795 } 4628 }
4796 } 4629 }
4797 4630
4798 putstr (SCHEME_A_ "\n"); 4631 putstr (SCHEME_A_ "\n");
4799 s_return (S_T); 4632 s_return (S_T);
4800#endif 4633#endif
4801 4634
4802 case OP_ERR0: /* error */ 4635 case OP_ERR0: /* error */
4803 SCHEME_V->retcode = -1; 4636 SCHEME_V->retcode = -1;
4804 4637
4805 if (!is_string (car (SCHEME_V->args))) 4638 if (!is_string (a))
4806 { 4639 {
4807 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4640 args = cons (mk_string (SCHEME_A_ " -- "), args);
4808 setimmutable (car (SCHEME_V->args)); 4641 setimmutable (car (args));
4809 } 4642 }
4810 4643
4811 putstr (SCHEME_A_ "Error: "); 4644 putstr (SCHEME_A_ "Error: ");
4812 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4645 putstr (SCHEME_A_ strvalue (car (args)));
4813 SCHEME_V->args = cdr (SCHEME_V->args); 4646 SCHEME_V->args = cdr (args);
4814 s_goto (OP_ERR1); 4647 s_goto (OP_ERR1);
4815 4648
4816 case OP_ERR1: /* error */ 4649 case OP_ERR1: /* error */
4817 putstr (SCHEME_A_ " "); 4650 putstr (SCHEME_A_ " ");
4818 4651
4819 if (SCHEME_V->args != NIL) 4652 if (args != NIL)
4820 { 4653 {
4821 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4654 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4822 SCHEME_V->args = car (SCHEME_V->args); 4655 SCHEME_V->args = a;
4823 SCHEME_V->print_flag = 1; 4656 SCHEME_V->print_flag = 1;
4824 s_goto (OP_P0LIST); 4657 s_goto (OP_P0LIST);
4825 } 4658 }
4826 else 4659 else
4827 { 4660 {
… …
4832 else 4665 else
4833 return NIL; 4666 return NIL;
4834 } 4667 }
4835 4668
4836 case OP_REVERSE: /* reverse */ 4669 case OP_REVERSE: /* reverse */
4837 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4670 s_return (reverse (SCHEME_A_ a));
4838 4671
4839 case OP_LIST_STAR: /* list* */ 4672 case OP_LIST_STAR: /* list* */
4840 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4673 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4841 4674
4842 case OP_APPEND: /* append */ 4675 case OP_APPEND: /* append */
4843 x = NIL; 4676 x = NIL;
4844 y = SCHEME_V->args; 4677 y = args;
4845 4678
4846 if (y == x) 4679 if (y == x)
4847 s_return (x); 4680 s_return (x);
4848 4681
4849 /* cdr() in the while condition is not a typo. If car() */ 4682 /* cdr() in the while condition is not a typo. If car() */
… …
4860 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4693 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4861 4694
4862#if USE_PLIST 4695#if USE_PLIST
4863 4696
4864 case OP_PUT: /* put */ 4697 case OP_PUT: /* put */
4865 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4866 Error_0 ("illegal use of put"); 4699 Error_0 ("illegal use of put");
4867 4700
4868 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4701 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4869 { 4702 {
4870 if (caar (x) == y) 4703 if (caar (x) == y)
4871 break; 4704 break;
4872 } 4705 }
4873 4706
4874 if (x != NIL) 4707 if (x != NIL)
4875 cdar (x) = caddr (SCHEME_V->args); 4708 cdar (x) = caddr (args);
4876 else 4709 else
4877 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4710 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4878 4711
4879 s_return (S_T); 4712 s_return (S_T);
4880 4713
4881 case OP_GET: /* get */ 4714 case OP_GET: /* get */
4882 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4715 if (!hasprop (a) || !hasprop (cadr (args)))
4883 Error_0 ("illegal use of get"); 4716 Error_0 ("illegal use of get");
4884 4717
4885 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4718 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4886 if (caar (x) == y) 4719 if (caar (x) == y)
4887 break; 4720 break;
4888 4721
4889 if (x != NIL) 4722 if (x != NIL)
4890 s_return (cdar (x)); 4723 s_return (cdar (x));
… …
4892 s_return (NIL); 4725 s_return (NIL);
4893 4726
4894#endif /* USE_PLIST */ 4727#endif /* USE_PLIST */
4895 4728
4896 case OP_QUIT: /* quit */ 4729 case OP_QUIT: /* quit */
4897 if (is_pair (SCHEME_V->args)) 4730 if (is_pair (args))
4898 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4731 SCHEME_V->retcode = ivalue (a);
4899 4732
4900 return NIL; 4733 return NIL;
4901 4734
4902 case OP_GC: /* gc */ 4735 case OP_GC: /* gc */
4903 gc (SCHEME_A_ NIL, NIL); 4736 gc (SCHEME_A_ NIL, NIL);
… …
4905 4738
4906 case OP_GCVERB: /* gc-verbose */ 4739 case OP_GCVERB: /* gc-verbose */
4907 { 4740 {
4908 int was = SCHEME_V->gc_verbose; 4741 int was = SCHEME_V->gc_verbose;
4909 4742
4910 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4743 SCHEME_V->gc_verbose = (a != S_F);
4911 s_retbool (was); 4744 s_retbool (was);
4912 } 4745 }
4913 4746
4914 case OP_NEWSEGMENT: /* new-segment */ 4747 case OP_NEWSEGMENT: /* new-segment */
4915 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4748 if (!is_pair (args) || !is_number (a))
4916 Error_0 ("new-segment: argument must be a number"); 4749 Error_0 ("new-segment: argument must be a number");
4917 4750
4918 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4919 4752
4920 s_return (S_T); 4753 s_return (S_T);
4921 4754
4922 case OP_OBLIST: /* oblist */ 4755 case OP_OBLIST: /* oblist */
4923 s_return (oblist_all_symbols (SCHEME_A)); 4756 s_return (oblist_all_symbols (SCHEME_A));
… …
4950 case OP_OPEN_INOUTFILE: 4783 case OP_OPEN_INOUTFILE:
4951 prop = port_input | port_output; 4784 prop = port_input | port_output;
4952 break; 4785 break;
4953 } 4786 }
4954 4787
4955 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4956 4789
4957 if (p == NIL) 4790 if (p == NIL)
4958 s_return (S_F); 4791 s_return (S_F);
4959 4792
4960 s_return (p); 4793 s_return (p);
… …
4977 case OP_OPEN_INOUTSTRING: 4810 case OP_OPEN_INOUTSTRING:
4978 prop = port_input | port_output; 4811 prop = port_input | port_output;
4979 break; 4812 break;
4980 } 4813 }
4981 4814
4982 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4815 p = port_from_string (SCHEME_A_ strvalue (a),
4983 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4816 strvalue (a) + strlength (a), prop);
4984 4817
4985 if (p == NIL) 4818 if (p == NIL)
4986 s_return (S_F); 4819 s_return (S_F);
4987 4820
4988 s_return (p); 4821 s_return (p);
… …
4990 4823
4991 case OP_OPEN_OUTSTRING: /* open-output-string */ 4824 case OP_OPEN_OUTSTRING: /* open-output-string */
4992 { 4825 {
4993 pointer p; 4826 pointer p;
4994 4827
4995 if (car (SCHEME_V->args) == NIL) 4828 if (a == NIL)
4996 { 4829 {
4997 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4998 4831
4999 if (p == NIL) 4832 if (p == NIL)
5000 s_return (S_F); 4833 s_return (S_F);
5001 } 4834 }
5002 else 4835 else
5003 { 4836 {
5004 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4837 p = port_from_string (SCHEME_A_ strvalue (a),
5005 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4838 strvalue (a) + strlength (a), port_output);
5006 4839
5007 if (p == NIL) 4840 if (p == NIL)
5008 s_return (S_F); 4841 s_return (S_F);
5009 } 4842 }
5010 4843
… …
5013 4846
5014 case OP_GET_OUTSTRING: /* get-output-string */ 4847 case OP_GET_OUTSTRING: /* get-output-string */
5015 { 4848 {
5016 port *p; 4849 port *p;
5017 4850
5018 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4851 if ((p = a->object.port)->kind & port_string)
5019 { 4852 {
5020 off_t size; 4853 off_t size;
5021 char *str; 4854 char *str;
5022 4855
5023 size = p->rep.string.curr - p->rep.string.start + 1; 4856 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5039 } 4872 }
5040 4873
5041# endif 4874# endif
5042 4875
5043 case OP_CLOSE_INPORT: /* close-input-port */ 4876 case OP_CLOSE_INPORT: /* close-input-port */
5044 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4877 port_close (SCHEME_A_ a, port_input);
5045 s_return (S_T); 4878 s_return (S_T);
5046 4879
5047 case OP_CLOSE_OUTPORT: /* close-output-port */ 4880 case OP_CLOSE_OUTPORT: /* close-output-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4881 port_close (SCHEME_A_ a, port_output);
5049 s_return (S_T); 4882 s_return (S_T);
5050#endif 4883#endif
5051 4884
5052 case OP_INT_ENV: /* interaction-environment */ 4885 case OP_INT_ENV: /* interaction-environment */
5053 s_return (SCHEME_V->global_env); 4886 s_return (SCHEME_V->global_env);
… …
5055 case OP_CURR_ENV: /* current-environment */ 4888 case OP_CURR_ENV: /* current-environment */
5056 s_return (SCHEME_V->envir); 4889 s_return (SCHEME_V->envir);
5057 4890
5058 } 4891 }
5059 4892
5060 return S_T; 4893 abort ();
5061} 4894}
5062 4895
5063static pointer 4896static pointer
5064opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4897opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5065{ 4898{
… …
5381 5214
5382 case OP_PVECFROM: 5215 case OP_PVECFROM:
5383 { 5216 {
5384 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5217 int i = ivalue_unchecked (cdr (SCHEME_V->args));
5385 pointer vec = car (SCHEME_V->args); 5218 pointer vec = car (SCHEME_V->args);
5386 int len = vector_length (vec); 5219 int len = veclength (vec);
5387 5220
5388 if (i == len) 5221 if (i == len)
5389 { 5222 {
5390 putstr (SCHEME_A_ ")"); 5223 putstr (SCHEME_A_ ")");
5391 s_return (S_T); 5224 s_return (S_T);
… …
5404 s_goto (OP_P0LIST); 5237 s_goto (OP_P0LIST);
5405 } 5238 }
5406 } 5239 }
5407 } 5240 }
5408 5241
5409 return S_T; 5242 abort ();
5410} 5243}
5411 5244
5412static pointer 5245static pointer
5413opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5246opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5414{ 5247{
… …
5465 5298
5466 case OP_MACROP: /* macro? */ 5299 case OP_MACROP: /* macro? */
5467 s_retbool (is_macro (car (SCHEME_V->args))); 5300 s_retbool (is_macro (car (SCHEME_V->args)));
5468 } 5301 }
5469 5302
5470 return S_T; /* NOTREACHED */ 5303 abort ();
5471} 5304}
5472 5305
5473typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5474 5307
5475typedef int (*test_predicate) (pointer); 5308typedef int (*test_predicate) (pointer);
… …
5570 int ok = 1; 5403 int ok = 1;
5571 char msg[STRBUFFSIZE]; 5404 char msg[STRBUFFSIZE];
5572 int n = list_length (SCHEME_A_ SCHEME_V->args); 5405 int n = list_length (SCHEME_A_ SCHEME_V->args);
5573 5406
5574 /* Check number of arguments */ 5407 /* Check number of arguments */
5575 if (n < pcd->min_arity) 5408 if (ecb_expect_false (n < pcd->min_arity))
5576 { 5409 {
5577 ok = 0; 5410 ok = 0;
5578 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5579 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5580 } 5413 }
5581 5414 else if (ecb_expect_false (n > pcd->max_arity))
5582 if (ok && n > pcd->max_arity)
5583 { 5415 {
5584 ok = 0; 5416 ok = 0;
5585 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5586 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5587 } 5419 }
5588 5420
5589 if (ok) 5421 if (ecb_expect_false (ok))
5590 { 5422 {
5591 if (pcd->arg_tests_encoding) 5423 if (pcd->arg_tests_encoding)
5592 { 5424 {
5593 int i = 0; 5425 int i = 0;
5594 int j; 5426 int j;
… …
5638 } 5470 }
5639#endif 5471#endif
5640 5472
5641 ok_to_freely_gc (SCHEME_A); 5473 ok_to_freely_gc (SCHEME_A);
5642 5474
5643 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL))
5644 return; 5476 return;
5645 5477
5646 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5647 { 5479 {
5648 xwrstr ("No memory!\n"); 5480 xwrstr ("No memory!\n");
… …
5706 5538
5707 case 'd': 5539 case 'd':
5708 return OP_COND0; /* cond */ 5540 return OP_COND0; /* cond */
5709 5541
5710 case '*': 5542 case '*':
5711 return OP_LET0AST; /* let* */ 5543 return OP_LET0AST;/* let* */
5712 5544
5713 default: 5545 default:
5714 return OP_SET0; /* set! */ 5546 return OP_SET0; /* set! */
5715 } 5547 }
5716 5548
… …
5738 5570
5739 case 'f': 5571 case 'f':
5740 return OP_DEF0; /* define */ 5572 return OP_DEF0; /* define */
5741 5573
5742 default: 5574 default:
5743 return OP_LET0REC; /* letrec */ 5575 return OP_LET0REC;/* letrec */
5744 } 5576 }
5745 5577
5746 default: 5578 default:
5747 return OP_C0STREAM; /* cons-stream */ 5579 return OP_C0STREAM; /* cons-stream */
5748 } 5580 }
… …
5815 set_cdr (S_T, S_T); 5647 set_cdr (S_T, S_T);
5816 /* init F */ 5648 /* init F */
5817 set_typeflag (S_F, T_ATOM | T_MARK); 5649 set_typeflag (S_F, T_ATOM | T_MARK);
5818 set_car (S_F, S_F); 5650 set_car (S_F, S_F);
5819 set_cdr (S_F, S_F); 5651 set_cdr (S_F, S_F);
5652 /* init EOF_OBJ */
5653 set_typeflag (S_EOF, T_ATOM | T_MARK);
5654 set_car (S_EOF, S_EOF);
5655 set_cdr (S_EOF, S_EOF);
5820 /* init sink */ 5656 /* init sink */
5821 set_typeflag (S_SINK, T_PAIR | T_MARK); 5657 set_typeflag (S_SINK, T_PAIR | T_MARK);
5822 set_car (S_SINK, NIL); 5658 set_car (S_SINK, NIL);
5659
5823 /* init c_nest */ 5660 /* init c_nest */
5824 SCHEME_V->c_nest = NIL; 5661 SCHEME_V->c_nest = NIL;
5825 5662
5826 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5663 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5827 /* init global_env */ 5664 /* init global_env */
… …
5845 for (i = 0; i < n; i++) 5682 for (i = 0; i < n; i++)
5846 if (dispatch_table[i].name != 0) 5683 if (dispatch_table[i].name != 0)
5847 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name);
5848 5685
5849 /* initialization of global pointers to special symbols */ 5686 /* initialization of global pointers to special symbols */
5850 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5851 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5852 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5853 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5690 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5854 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5691 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5855 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5692 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5856 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5693 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5857 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5694 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5858 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5695 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5859 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5696 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5860 5697
5861 return !SCHEME_V->no_memory; 5698 return !SCHEME_V->no_memory;
5862} 5699}
5863 5700
… …
5993{ 5830{
5994 dump_stack_reset (SCHEME_A); 5831 dump_stack_reset (SCHEME_A);
5995 SCHEME_V->envir = SCHEME_V->global_env; 5832 SCHEME_V->envir = SCHEME_V->global_env;
5996 SCHEME_V->file_i = 0; 5833 SCHEME_V->file_i = 0;
5997 SCHEME_V->load_stack[0].kind = port_input | port_string; 5834 SCHEME_V->load_stack[0].kind = port_input | port_string;
5998 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5835 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5999 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5836 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6000 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5837 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6001#if USE_PORTS 5838#if USE_PORTS
6002 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5839 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6003#endif 5840#endif
6004 SCHEME_V->retcode = 0; 5841 SCHEME_V->retcode = 0;
6005 SCHEME_V->interactive_repl = 0; 5842 SCHEME_V->interactive_repl = 0;
… …
6110 5947
6111/* ========== Main ========== */ 5948/* ========== Main ========== */
6112 5949
6113#if STANDALONE 5950#if STANDALONE
6114 5951
6115# if defined(__APPLE__) && !defined (OSX)
6116int
6117main ()
6118{
6119 extern MacTS_main (int argc, char **argv);
6120 char **argv;
6121 int argc = ccommand (&argv);
6122
6123 MacTS_main (argc, argv);
6124 return 0;
6125}
6126
6127int
6128MacTS_main (int argc, char **argv)
6129{
6130# else
6131int 5952int
6132main (int argc, char **argv) 5953main (int argc, char **argv)
6133{ 5954{
6134# endif
6135# if USE_MULTIPLICITY 5955# if USE_MULTIPLICITY
6136 scheme ssc; 5956 scheme ssc;
6137 scheme *const SCHEME_V = &ssc; 5957 scheme *const SCHEME_V = &ssc;
6138# else 5958# else
6139# endif 5959# endif

Diff Legend

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