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

Comparing microscheme/scheme.c (file contents):
Revision 1.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.27 by root, Sat Nov 28 05:13:08 2015 UTC

182# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
183#endif 183#endif
184 184
185enum scheme_types 185enum scheme_types
186{ 186{
187 T_INTEGER,
187 T_FREE, 188 T_REAL,
188 T_STRING, 189 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 190 T_SYMBOL,
191 T_PROC, 191 T_PROC,
192 T_PAIR, 192 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 193 T_CLOSURE,
194 T_CONTINUATION, 194 T_CONTINUATION,
195 T_FOREIGN, 195 T_FOREIGN,
196 T_CHARACTER, 196 T_CHARACTER,
197 T_PORT, 197 T_PORT,
207#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
211 211
212/* num, for generic arithmetic */
213struct num
214{
215 IVALUE ivalue;
216#if USE_REAL
217 RVALUE rvalue;
218 char is_fixnum;
219#endif
220};
221
222#if USE_REAL
223# define num_is_fixnum(n) (n).is_fixnum
224# define num_set_fixnum(n,f) (n).is_fixnum = (f)
225# define num_ivalue(n) (n).ivalue
226# define num_rvalue(n) (n).rvalue
227# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
228# define num_set_rvalue(n,r) (n).rvalue = (r)
229#else
230# define num_is_fixnum(n) 1
231# define num_set_fixnum(n,f) 0
232# define num_ivalue(n) (n).ivalue
233# define num_rvalue(n) (n).ivalue
234# define num_set_ivalue(n,i) (n).ivalue = (i)
235# define num_set_rvalue(n,r) (n).ivalue = (r)
236#endif
237
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 238enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 239
214static num num_op (enum num_op op, num a, num b); 240static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 242static num num_rem (num a, num b);
235 return type (p) == T_STRING; 261 return type (p) == T_STRING;
236} 262}
237 263
238#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
240
241INTERFACE int is_list (SCHEME_P_ pointer p);
242 266
243INTERFACE int 267INTERFACE int
244is_vector (pointer p) 268is_vector (pointer p)
245{ 269{
246 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
258{ 282{
259 return vec->object.vector.length; 283 return vec->object.vector.length;
260} 284}
261 285
262INTERFACE int 286INTERFACE int
263is_number (pointer p)
264{
265 return type (p) == T_NUMBER;
266}
267
268INTERFACE int
269is_integer (pointer p) 287is_integer (pointer p)
270{ 288{
271 return is_number (p) && num_is_fixnum (p->object.number); 289 return type (p) == T_INTEGER;
272} 290}
273 291
292/* not the same as in scheme, where integers are (correctly :) reals */
274INTERFACE int 293INTERFACE int
275is_real (pointer p) 294is_real (pointer p)
276{ 295{
277 return is_number (p) && !num_is_fixnum (p->object.number); 296 return type (p) == T_REAL;
297}
298
299INTERFACE int
300is_number (pointer p)
301{
302 return is_integer (p) || is_real (p);
278} 303}
279 304
280INTERFACE int 305INTERFACE int
281is_character (pointer p) 306is_character (pointer p)
282{ 307{
287string_value (pointer p) 312string_value (pointer p)
288{ 313{
289 return strvalue (p); 314 return strvalue (p);
290} 315}
291 316
292ecb_inline num
293nvalue (pointer p)
294{
295 return (p)->object.number;
296}
297
298static IVALUE
299num_get_ivalue (const num n)
300{
301 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302}
303
304static RVALUE
305num_get_rvalue (const num n)
306{
307 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308}
309
310INTERFACE IVALUE
311ivalue (pointer p)
312{
313 return num_get_ivalue (p->object.number);
314}
315
316INTERFACE RVALUE
317rvalue (pointer p)
318{
319 return num_get_rvalue (p->object.number);
320}
321
322#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 317#define ivalue_unchecked(p) (p)->object.ivalue
318#define set_ivalue(p,v) (p)->object.ivalue = (v)
319
323#if USE_REAL 320#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 321#define rvalue_unchecked(p) (p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 322#define set_rvalue(p,v) (p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 323#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 324#define rvalue_unchecked(p) (p)->object.ivalue
329# define set_num_integer(p) 0 325#define set_rvalue(p,v) (p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 326#endif
332 327
333INTERFACE long 328INTERFACE long
334charvalue (pointer p) 329charvalue (pointer p)
335{ 330{
440syntaxname (pointer p) 435syntaxname (pointer p)
441{ 436{
442 return strvalue (car (p)); 437 return strvalue (car (p));
443} 438}
444 439
445#define procnum(p) ivalue (p) 440#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 441static const char *procname (pointer x);
447 442
448INTERFACE int 443INTERFACE int
449is_closure (pointer p) 444is_closure (pointer p)
450{ 445{
511setimmutable (pointer p) 506setimmutable (pointer p)
512{ 507{
513#if USE_ERROR_CHECKING 508#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 509 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 510#endif
511}
512
513/* Result is:
514 proper list: length
515 circular list: -1
516 not even a pair: -2
517 dotted list: -2 minus length before dot
518*/
519INTERFACE int
520list_length (SCHEME_P_ pointer a)
521{
522 int i = 0;
523 pointer slow, fast;
524
525 slow = fast = a;
526
527 while (1)
528 {
529 if (fast == NIL)
530 return i;
531
532 if (!is_pair (fast))
533 return -2 - i;
534
535 fast = cdr (fast);
536 ++i;
537
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 ++i;
545 fast = cdr (fast);
546
547 /* Safe because we would have already returned if `fast'
548 encountered a non-pair. */
549 slow = cdr (slow);
550
551 if (fast == slow)
552 {
553 /* the fast pointer has looped back around and caught up
554 with the slow pointer, hence the structure is circular,
555 not of finite length, and therefore not a list */
556 return -1;
557 }
558 }
559}
560
561INTERFACE int
562is_list (SCHEME_P_ pointer a)
563{
564 return list_length (SCHEME_A_ a) >= 0;
516} 565}
517 566
518#if USE_CHAR_CLASSIFIERS 567#if USE_CHAR_CLASSIFIERS
519ecb_inline int 568ecb_inline int
520Cisalpha (int c) 569Cisalpha (int c)
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 713static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 714static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 715static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 716static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 717
718static IVALUE
719ivalue (pointer x)
720{
721 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
722}
723
724static RVALUE
725rvalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730INTERFACE num
731nvalue (pointer x)
732{
733 num n;
734
735 num_set_fixnum (n, is_integer (x));
736
737 if (num_is_fixnum (n))
738 num_set_ivalue (n, ivalue_unchecked (x));
739 else
740 num_set_rvalue (n, rvalue_unchecked (x));
741
742 return n;
743}
744
669static num 745static num
670num_op (enum num_op op, num a, num b) 746num_op (enum num_op op, num a, num b)
671{ 747{
672 num ret; 748 num ret;
673 749
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 751
676 if (num_is_fixnum (ret)) 752 if (num_is_fixnum (ret))
677 { 753 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 754 switch (op)
682 { 755 {
683 case NUM_ADD: av += bv; break; 756 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 757 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 758 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 759 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 760 }
688 761
689 num_set_ivalue (ret, av); 762 num_set_ivalue (ret, a.ivalue);
690 } 763 }
764#if USE_REAL
691 else 765 else
692 { 766 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 767 switch (op)
697 { 768 {
698 case NUM_ADD: av += bv; break; 769 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 770 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 771 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 772 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 773 }
703 774
704 num_set_rvalue (ret, av); 775 num_set_rvalue (ret, a.rvalue);
705 } 776 }
777#endif
706 778
707 return ret; 779 return ret;
708} 780}
709 781
710static num 782static num
711num_div (num a, num b) 783num_div (num a, num b)
712{ 784{
713 num ret; 785 num ret;
714 786
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 787 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 788
717 if (num_is_fixnum (ret)) 789 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 790 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 791 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 792 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 793
722 return ret; 794 return ret;
723} 795}
724 796
725static num 797static num
727{ 799{
728 num ret; 800 num ret;
729 long e1, e2, res; 801 long e1, e2, res;
730 802
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 803 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 804 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 805 e2 = num_ivalue (b);
734 res = e1 % e2; 806 res = e1 % e2;
735 807
736 /* remainder should have same sign as second operand */ 808 /* remainder should have same sign as second operand */
737 if (res > 0) 809 if (res > 0)
738 { 810 {
754{ 826{
755 num ret; 827 num ret;
756 long e1, e2, res; 828 long e1, e2, res;
757 829
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 830 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 831 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 832 e2 = num_ivalue (b);
761 res = e1 % e2; 833 res = e1 % e2;
762 834
763 /* modulo should have same sign as second operand */ 835 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 836 if (res * e2 < 0)
765 res += e2; 837 res += e2;
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 847 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 848 int ret;
777 849
778 if (is_fixnum) 850 if (is_fixnum)
779 { 851 {
780 IVALUE av = num_get_ivalue (a); 852 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 853 IVALUE bv = num_ivalue (b);
782 854
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 855 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 856 }
785 else 857 else
786 { 858 {
787 RVALUE av = num_get_rvalue (a); 859 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 860 RVALUE bv = num_rvalue (b);
789 861
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 862 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 863 }
792 864
793 return ret; 865 return ret;
880 SCHEME_V->fcells += segsize; 952 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 953 last = newp + segsize - 1;
882 954
883 for (p = newp; p <= last; p++) 955 for (p = newp; p <= last; p++)
884 { 956 {
885 set_typeflag (p, T_FREE); 957 set_typeflag (p, T_PAIR);
886 set_car (p, NIL); 958 set_car (p, NIL);
887 set_cdr (p, p + 1); 959 set_cdr (p, p + 1);
888 } 960 }
889 961
890 /* insert new cells in address order on free list */ 962 /* insert new cells in address order on free list */
1181mk_character (SCHEME_P_ int c) 1253mk_character (SCHEME_P_ int c)
1182{ 1254{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1255 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1256
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1257 set_typeflag (x, (T_CHARACTER | T_ATOM));
1186 ivalue_unchecked (x) = c & 0xff; 1258 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1259
1188 return x; 1260 return x;
1189} 1261}
1190 1262
1191/* get number atom (integer) */ 1263/* get number atom (integer) */
1192INTERFACE pointer 1264INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1265mk_integer (SCHEME_P_ long n)
1194{ 1266{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1267 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1268
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1269 set_typeflag (x, (T_INTEGER | T_ATOM));
1198 ivalue_unchecked (x) = num; 1270 set_ivalue (x, n);
1199 set_num_integer (x); 1271
1200 return x; 1272 return x;
1201} 1273}
1202 1274
1203INTERFACE pointer 1275INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1276mk_real (SCHEME_P_ RVALUE n)
1205{ 1277{
1278#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1279 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1280
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1281 set_typeflag (x, (T_REAL | T_ATOM));
1209 rvalue_unchecked (x) = n; 1282 set_rvalue (x, n);
1210 set_num_real (x); 1283
1211 return x; 1284 return x;
1285#else
1286 return mk_integer (SCHEME_A_ n);
1287#endif
1212} 1288}
1213 1289
1214static pointer 1290static pointer
1215mk_number (SCHEME_P_ const num n) 1291mk_number (SCHEME_P_ const num n)
1216{ 1292{
1293#if USE_REAL
1217 if (num_is_fixnum (n)) 1294 return num_is_fixnum (n)
1295 ? mk_integer (SCHEME_A_ num_ivalue (n))
1296 : mk_real (SCHEME_A_ num_rvalue (n));
1297#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1298 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1299#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1300}
1222 1301
1223/* allocate name to string area */ 1302/* allocate name to string area */
1224static char * 1303static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1304store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1401 } 1480 }
1402 else if ((c == 'e') || (c == 'E')) 1481 else if ((c == 'e') || (c == 'E'))
1403 { 1482 {
1404 if (!has_fp_exp) 1483 if (!has_fp_exp)
1405 { 1484 {
1406 has_dec_point = 1; /* decimal point illegal 1485 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1486 p++;
1409 1487
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1488 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1489 continue;
1412 } 1490 }
1608 if (is_mark (p)) 1686 if (is_mark (p))
1609 clrmark (p); 1687 clrmark (p);
1610 else 1688 else
1611 { 1689 {
1612 /* reclaim cell */ 1690 /* reclaim cell */
1613 if (typeflag (p) != T_FREE) 1691 if (typeflag (p) != T_PAIR)
1614 { 1692 {
1615 finalize_cell (SCHEME_A_ p); 1693 finalize_cell (SCHEME_A_ p);
1616 set_typeflag (p, T_FREE); 1694 set_typeflag (p, T_PAIR);
1617 set_car (p, NIL); 1695 set_car (p, NIL);
1618 } 1696 }
1619 1697
1620 ++SCHEME_V->fcells; 1698 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell); 1699 set_cdr (p, SCHEME_V->free_cell);
1623 } 1701 }
1624 } 1702 }
1625 } 1703 }
1626 1704
1627 if (SCHEME_V->gc_verbose) 1705 if (SCHEME_V->gc_verbose)
1706 {
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1707 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1708 }
1629} 1709}
1630 1710
1631static void 1711static void
1632finalize_cell (SCHEME_P_ pointer a) 1712finalize_cell (SCHEME_P_ pointer a)
1633{ 1713{
3119 int i = 0; 3199 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3200 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3201
3122 while (cont != NIL) 3202 while (cont != NIL)
3123 { 3203 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3204 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3205 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3206 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3207 frame->code = car (cont) ; cont = cdr (cont);
3128 3208
3129 ++frame; 3209 ++frame;
3130 ++i; 3210 ++i;
3131 } 3211 }
3132 3212
3161 SCHEME_V->value = a; 3241 SCHEME_V->value = a;
3162 3242
3163 if (dump == NIL) 3243 if (dump == NIL)
3164 return -1; 3244 return -1;
3165 3245
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3246 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3247 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3248 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3249 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3250
3171 SCHEME_V->dump = dump; 3251 SCHEME_V->dump = dump;
3172 3252
3173 return 0; 3253 return 0;
3174} 3254}
3380 3460
3381 case OP_TRACING: 3461 case OP_TRACING:
3382 { 3462 {
3383 int tr = SCHEME_V->tracing; 3463 int tr = SCHEME_V->tracing;
3384 3464
3385 SCHEME_V->tracing = ivalue (car (args)); 3465 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3466 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3467 }
3388 3468
3389#endif 3469#endif
3390 3470
3909{ 3989{
3910 pointer args = SCHEME_V->args; 3990 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 3991 pointer x = car (args);
3912 num v; 3992 num v;
3913 3993
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 3994 switch (op)
3919 { 3995 {
3920#if USE_MATH 3996#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 3997 case OP_INEX2EX: /* inexact->exact */
3998 {
3922 if (is_integer (x)) 3999 if (is_integer (x))
3923 s_return (x); 4000 s_return (x);
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 4001
4002 RVALUE r = rvalue_unchecked (x);
4003
4004 if (r == (RVALUE)(IVALUE)r)
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4005 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3926 else 4006 else
3927 Error_1 ("inexact->exact: not integral:", x); 4007 Error_1 ("inexact->exact: not integral:", x);
4008 }
3928 4009
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4010 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4011 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4012 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4013 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3966 /* If the test fails, result is too big for integer. */ 4047 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4048 if (!real_result)
3968 { 4049 {
3969 long result_as_long = result; 4050 long result_as_long = result;
3970 4051
3971 if (result != (RVALUE) result_as_long) 4052 if (result != result_as_long)
3972 real_result = 1; 4053 real_result = 1;
3973 } 4054 }
3974 4055
3975 if (real_result) 4056 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4057 s_return (mk_real (SCHEME_A_ result));
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4062 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4063 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983 4064
3984 case OP_TRUNCATE: 4065 case OP_TRUNCATE:
3985 { 4066 {
3986 RVALUE rvalue_of_x; 4067 RVALUE n = rvalue (x);
3987
3988 rvalue_of_x = rvalue (x);
3989
3990 if (rvalue_of_x > 0)
3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4068 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
3992 else
3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994 } 4069 }
3995 4070
3996 case OP_ROUND: 4071 case OP_ROUND:
3997 if (num_is_integer (x)) 4072 if (is_integer (x))
3998 s_return (x); 4073 s_return (x);
3999 4074
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4075 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4076#endif
4002 4077
4122 } 4197 }
4123 else 4198 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4199 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4200
4126 case OP_CHAR2INT: /* char->integer */ 4201 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4202 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4203
4129 case OP_INT2CHAR: /* integer->char */ 4204 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4205 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4206
4132 case OP_CHARUPCASE: 4207 case OP_CHARUPCASE:
4133 { 4208 {
4134 unsigned char c = ivalue (x); 4209 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4210 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4211 s_return (mk_character (SCHEME_A_ c));
4137 } 4212 }
4138 4213
4139 case OP_CHARDNCASE: 4214 case OP_CHARDNCASE:
4140 { 4215 {
4141 unsigned char c = ivalue (x); 4216 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4217 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4218 s_return (mk_character (SCHEME_A_ c));
4144 } 4219 }
4145 4220
4146 case OP_STR2SYM: /* string->symbol */ 4221 case OP_STR2SYM: /* string->symbol */
4223 Error_1 ("atom->string: not an atom:", x); 4298 Error_1 ("atom->string: not an atom:", x);
4224 } 4299 }
4225 4300
4226 case OP_MKSTRING: /* make-string */ 4301 case OP_MKSTRING: /* make-string */
4227 { 4302 {
4228 int fill = ' '; 4303 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4304 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4305
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4306 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4307 }
4238 4308
4239 case OP_STRLEN: /* string-length */ 4309 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4310 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4311
4242 case OP_STRREF: /* string-ref */ 4312 case OP_STRREF: /* string-ref */
4243 { 4313 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4314 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4315 int index = ivalue_unchecked (cadr (args));
4250 4316
4251 if (index >= strlength (x)) 4317 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4318 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4319
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4320 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4321 }
4256 4322
4257 case OP_STRSET: /* string-set! */ 4323 case OP_STRSET: /* string-set! */
4258 { 4324 {
4259 char *str; 4325 char *str = strvalue (x);
4260 int index; 4326 int index = ivalue_unchecked (cadr (args));
4261 int c; 4327 int c;
4262 4328
4263 if (is_immutable (x)) 4329 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4330 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4331
4270 if (index >= strlength (x)) 4332 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4333 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4334
4273 c = charvalue (caddr (args)); 4335 c = charvalue (caddr (args));
4296 s_return (newstr); 4358 s_return (newstr);
4297 } 4359 }
4298 4360
4299 case OP_SUBSTR: /* substring */ 4361 case OP_SUBSTR: /* substring */
4300 { 4362 {
4301 char *str; 4363 char *str = strvalue (x);
4302 int index0; 4364 int index0 = ivalue_unchecked (cadr (args));
4303 int index1; 4365 int index1;
4304 int len; 4366 int len;
4305 4367
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4368 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4369 Error_1 ("substring: start out of bounds:", cadr (args));
4312 4370
4313 if (cddr (args) != NIL) 4371 if (cddr (args) != NIL)
4314 { 4372 {
4315 index1 = ivalue (caddr (args)); 4373 index1 = ivalue_unchecked (caddr (args));
4316 4374
4317 if (index1 > strlength (x) || index1 < index0) 4375 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4376 Error_1 ("substring: end out of bounds:", caddr (args));
4319 } 4377 }
4320 else 4378 else
4351 } 4409 }
4352 4410
4353 case OP_MKVECTOR: /* make-vector */ 4411 case OP_MKVECTOR: /* make-vector */
4354 { 4412 {
4355 pointer fill = NIL; 4413 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4414 pointer vec;
4358
4359 len = ivalue (x); 4415 int len = ivalue_unchecked (x);
4360 4416
4361 if (cdr (args) != NIL) 4417 if (cdr (args) != NIL)
4362 fill = cadr (args); 4418 fill = cadr (args);
4363 4419
4364 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4377 case OP_VECLEN: /* vector-length */ 4433 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4434 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4435
4380 case OP_VECREF: /* vector-ref */ 4436 case OP_VECREF: /* vector-ref */
4381 { 4437 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4438 int index = ivalue_unchecked (cadr (args));
4385 4439
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4440 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4441 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4442
4389 s_return (vector_elem (x, index)); 4443 s_return (vector_elem (x, index));
4390 } 4444 }
4391 4445
4392 case OP_VECSET: /* vector-set! */ 4446 case OP_VECSET: /* vector-set! */
4393 { 4447 {
4394 int index; 4448 int index = ivalue_unchecked (cadr (args));
4395 4449
4396 if (is_immutable (x)) 4450 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4451 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398
4399 index = ivalue (cadr (args));
4400 4452
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4453 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4454 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4455
4404 set_vector_elem (x, index, caddr (args)); 4456 set_vector_elem (x, index, caddr (args));
4405 s_return (x); 4457 s_return (x);
4406 } 4458 }
4407 } 4459 }
4408 4460
4409 if (USE_ERROR_CHECKING) abort (); 4461 if (USE_ERROR_CHECKING) abort ();
4410}
4411
4412INTERFACE int
4413is_list (SCHEME_P_ pointer a)
4414{
4415 return list_length (SCHEME_A_ a) >= 0;
4416}
4417
4418/* Result is:
4419 proper list: length
4420 circular list: -1
4421 not even a pair: -2
4422 dotted list: -2 minus length before dot
4423*/
4424INTERFACE int
4425list_length (SCHEME_P_ pointer a)
4426{
4427 int i = 0;
4428 pointer slow, fast;
4429
4430 slow = fast = a;
4431
4432 while (1)
4433 {
4434 if (fast == NIL)
4435 return i;
4436
4437 if (!is_pair (fast))
4438 return -2 - i;
4439
4440 fast = cdr (fast);
4441 ++i;
4442
4443 if (fast == NIL)
4444 return i;
4445
4446 if (!is_pair (fast))
4447 return -2 - i;
4448
4449 ++i;
4450 fast = cdr (fast);
4451
4452 /* Safe because we would have already returned if `fast'
4453 encountered a non-pair. */
4454 slow = cdr (slow);
4455
4456 if (fast == slow)
4457 {
4458 /* the fast pointer has looped back around and caught up
4459 with the slow pointer, hence the structure is circular,
4460 not of finite length, and therefore not a list */
4461 return -1;
4462 }
4463 }
4464} 4462}
4465 4463
4466static int 4464static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4465opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4466{
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4512 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4513 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4514 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4515
4518#if USE_CHAR_CLASSIFIERS 4516#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4517 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4518 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4519 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4520 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4521 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4522#endif
4525 4523
4526#if USE_PORTS 4524#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4525 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4526 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4729 4727
4730 case OP_NEWSEGMENT: /* new-segment */ 4728 case OP_NEWSEGMENT: /* new-segment */
4731 if (!is_pair (args) || !is_number (a)) 4729 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 4730 Error_0 ("new-segment: argument must be a number");
4733 4731
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4732 alloc_cellseg (SCHEME_A_ ivalue (a));
4735 4733
4736 s_return (S_T); 4734 s_return (S_T);
4737 4735
4738 case OP_OBLIST: /* oblist */ 4736 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 4737 s_return (oblist_all_symbols (SCHEME_A));
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5267/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5268typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5269
5272typedef int (*test_predicate)(pointer); 5270typedef int (*test_predicate)(pointer);
5273static int 5271static int
5274is_any (pointer p) 5272tst_any (pointer p)
5275{ 5273{
5276 return 1; 5274 return 1;
5277} 5275}
5278 5276
5279static int 5277static int
5280is_nonneg (pointer p) 5278tst_inonneg (pointer p)
5281{ 5279{
5282 return ivalue (p) >= 0 && is_integer (p); 5280 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5281}
5284 5282
5285static int 5283static int
5286tst_is_list (pointer p) 5284tst_is_list (SCHEME_P_ pointer p)
5287{ 5285{
5288 return p == NIL || is_pair (p); 5286 return p == NIL || is_pair (p);
5289} 5287}
5290 5288
5291/* Correspond carefully with following defines! */ 5289/* Correspond carefully with following defines! */
5292static struct 5290static struct
5293{ 5291{
5294 test_predicate fct; 5292 test_predicate fct;
5295 const char *kind; 5293 const char *kind;
5296} tests[] = 5294} tests[] = {
5297{
5298 { is_any, 0 }, 5295 { tst_any , 0 },
5299 { is_string, "string" }, 5296 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5297 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5298 { is_port , "port" },
5302 { is_inport, "input port" }, 5299 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5300 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5301 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5302 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5303 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5304 { is_character , "character" },
5308 { is_vector, "vector" }, 5305 { is_vector , "vector" },
5309 { is_number, "number" }, 5306 { is_number , "number" },
5310 { is_integer, "integer" }, 5307 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5308 { tst_inonneg , "non-negative integer" }
5312}; 5309};
5313 5310
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5311#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5312#define TST_ANY "\001"
5316#define TST_STRING "\002" 5313#define TST_STRING "\002"
5357typedef struct 5354typedef struct
5358{ 5355{
5359 uint8_t func; 5356 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5357 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5358 uint8_t builtin;
5359#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5360 uint8_t min_arity;
5363 uint8_t max_arity; 5361 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5362 char arg_tests_encoding[3];
5363#endif
5365} op_code_info; 5364} op_code_info;
5366 5365
5367static const op_code_info dispatch_table[] = { 5366static const op_code_info dispatch_table[] = {
5367#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5369#else
5370#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5371#endif
5369#include "opdefines.h" 5372#include "opdefines.h"
5370#undef OP_DEF 5373#undef OP_DEF
5371 {0} 5374 {0}
5372}; 5375};
5373 5376
5415 { 5418 {
5416 pointer arg = car (arglist); 5419 pointer arg = car (arglist);
5417 5420
5418 j = t[0]; 5421 j = t[0];
5419 5422
5423 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5424 if (j == TST_LIST[0])
5425 {
5426 if (!tst_is_list (SCHEME_A_ arg))
5427 break;
5428 }
5429 else
5430 {
5420 if (!tests[j - 1].fct (arg)) 5431 if (!tests[j - 1].fct (arg))
5421 break; 5432 break;
5433 }
5422 5434
5423 if (t[1]) /* last test is replicated as necessary */ 5435 if (t[1]) /* last test is replicated as necessary */
5424 t++; 5436 t++;
5425 5437
5426 arglist = cdr (arglist); 5438 arglist = cdr (arglist);
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5495mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5496{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5497 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5498 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5499 ivalue_unchecked (y) = op;
5488 set_num_integer (y);
5489 return y; 5500 return y;
5490} 5501}
5491 5502
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5503/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5504static int

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines