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.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.38 by root, Sun Nov 29 13:47:15 2015 UTC

34 34
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/stat.h> 36#include <sys/stat.h>
37#include <fcntl.h> 37#include <fcntl.h>
38 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
39#include <string.h> 45#include <string.h>
40#include <stdlib.h>
41 46
42#include <limits.h> 47#include <limits.h>
43#include <inttypes.h> 48#include <inttypes.h>
44#include <float.h> 49#include <float.h>
45//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
46 59
47enum { 60enum {
48 TOK_EOF, 61 TOK_EOF,
49 TOK_LPAREN, 62 TOK_LPAREN,
50 TOK_RPAREN, 63 TOK_RPAREN,
51 TOK_DOT, 64 TOK_DOT,
52 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 68 TOK_QUOTE,
54 TOK_DQUOTE, 69 TOK_DQUOTE,
55 TOK_BQUOTE, 70 TOK_BQUOTE,
56 TOK_COMMA, 71 TOK_COMMA,
57 TOK_ATMARK, 72 TOK_ATMARK,
182# define FIRST_CELLSEGS 3 197# define FIRST_CELLSEGS 3
183#endif 198#endif
184 199
185enum scheme_types 200enum scheme_types
186{ 201{
202 T_INTEGER,
187 T_FREE, 203 T_REAL,
188 T_STRING, 204 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 205 T_SYMBOL,
191 T_PROC, 206 T_PROC,
192 T_PAIR, 207 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 208 T_CLOSURE,
194 T_CONTINUATION, 209 T_CONTINUATION,
195 T_FOREIGN, 210 T_FOREIGN,
196 T_CHARACTER, 211 T_CHARACTER,
197 T_PORT, 212 T_PORT,
207#define T_SYNTAX 0x0010 222#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 223#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 224#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 225#define T_MARK 0x0080 /* only for gc */
211 226
227/* num, for generic arithmetic */
228struct num
229{
230 IVALUE ivalue;
231#if USE_REAL
232 RVALUE rvalue;
233 char is_fixnum;
234#endif
235};
236
237#if USE_REAL
238# define num_is_fixnum(n) (n).is_fixnum
239# define num_set_fixnum(n,f) (n).is_fixnum = (f)
240# define num_ivalue(n) (n).ivalue
241# define num_rvalue(n) (n).rvalue
242# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
243# define num_set_rvalue(n,r) (n).rvalue = (r)
244#else
245# define num_is_fixnum(n) 1
246# define num_set_fixnum(n,f) 0
247# define num_ivalue(n) (n).ivalue
248# define num_rvalue(n) (n).ivalue
249# define num_set_ivalue(n,i) (n).ivalue = (i)
250# define num_set_rvalue(n,r) (n).ivalue = (r)
251#endif
252
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 254
214static num num_op (enum num_op op, num a, num b); 255static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 257static num num_rem (num a, num b);
236} 277}
237 278
238#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
240 281
241INTERFACE int is_list (SCHEME_P_ pointer p);
242
243INTERFACE int 282INTERFACE int
244is_vector (pointer p) 283is_vector (pointer p)
245{ 284{
246 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
247} 286}
248 287
249#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
251INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252INTERFACE uint32_t vector_length (pointer vec);
253INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255 293
256INTERFACE uint32_t 294INTERFACE int
257vector_length (pointer vec) 295is_integer (pointer p)
258{ 296{
259 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
298}
299
300/* not the same as in scheme, where integers are (correctly :) reals */
301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
260} 305}
261 306
262INTERFACE int 307INTERFACE int
263is_number (pointer p) 308is_number (pointer p)
264{ 309{
265 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
266}
267
268INTERFACE int
269is_integer (pointer p)
270{
271 return is_number (p) && num_is_fixnum (p->object.number);
272}
273
274INTERFACE int
275is_real (pointer p)
276{
277 return is_number (p) && !num_is_fixnum (p->object.number);
278} 311}
279 312
280INTERFACE int 313INTERFACE int
281is_character (pointer p) 314is_character (pointer p)
282{ 315{
287string_value (pointer p) 320string_value (pointer p)
288{ 321{
289 return strvalue (p); 322 return strvalue (p);
290} 323}
291 324
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) 325#define ivalue_unchecked(p) (p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v)
327
323#if USE_REAL 328#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 331#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
329# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 334#endif
332 335
333INTERFACE long 336INTERFACE long
334charvalue (pointer p) 337charvalue (pointer p)
335{ 338{
403} 406}
404 407
405INTERFACE char * 408INTERFACE char *
406symname (pointer p) 409symname (pointer p)
407{ 410{
408 return strvalue (car (p)); 411 return strvalue (p);
409} 412}
410 413
411#if USE_PLIST 414#if USE_PLIST
412SCHEME_EXPORT int 415SCHEME_EXPORT int
413hasprop (pointer p) 416hasprop (pointer p)
437} 440}
438 441
439INTERFACE char * 442INTERFACE char *
440syntaxname (pointer p) 443syntaxname (pointer p)
441{ 444{
442 return strvalue (car (p)); 445 return strvalue (p);
443} 446}
444 447
445#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 449static const char *procname (pointer x);
447 450
448INTERFACE int 451INTERFACE int
449is_closure (pointer p) 452is_closure (pointer p)
450{ 453{
511setimmutable (pointer p) 514setimmutable (pointer p)
512{ 515{
513#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 518#endif
519}
520
521/* Result is:
522 proper list: length
523 circular list: -1
524 not even a pair: -2
525 dotted list: -2 minus length before dot
526*/
527INTERFACE int
528list_length (SCHEME_P_ pointer a)
529{
530 int i = 0;
531 pointer slow, fast;
532
533 slow = fast = a;
534
535 while (1)
536 {
537 if (fast == NIL)
538 return i;
539
540 if (!is_pair (fast))
541 return -2 - i;
542
543 fast = cdr (fast);
544 ++i;
545
546 if (fast == NIL)
547 return i;
548
549 if (!is_pair (fast))
550 return -2 - i;
551
552 ++i;
553 fast = cdr (fast);
554
555 /* Safe because we would have already returned if `fast'
556 encountered a non-pair. */
557 slow = cdr (slow);
558
559 if (fast == slow)
560 {
561 /* the fast pointer has looped back around and caught up
562 with the slow pointer, hence the structure is circular,
563 not of finite length, and therefore not a list */
564 return -1;
565 }
566 }
567}
568
569INTERFACE int
570is_list (SCHEME_P_ pointer a)
571{
572 return list_length (SCHEME_A_ a) >= 0;
516} 573}
517 574
518#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
519ecb_inline int 576ecb_inline int
520Cisalpha (int c) 577Cisalpha (int c)
609#endif 666#endif
610 667
611static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
614ecb_inline int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
618static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
636static void mark (pointer a); 693static void mark (pointer a);
637static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
638static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
639static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
640static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
641static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
643ecb_inline int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
644static int token (SCHEME_P); 701static int token (SCHEME_P);
645static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 725
726static IVALUE
727ivalue (pointer x)
728{
729 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
730}
731
732static RVALUE
733rvalue (pointer x)
734{
735 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
736}
737
738INTERFACE num
739nvalue (pointer x)
740{
741 num n;
742
743 num_set_fixnum (n, is_integer (x));
744
745 if (num_is_fixnum (n))
746 num_set_ivalue (n, ivalue_unchecked (x));
747 else
748 num_set_rvalue (n, rvalue_unchecked (x));
749
750 return n;
751}
752
669static num 753static num
670num_op (enum num_op op, num a, num b) 754num_op (enum num_op op, num a, num b)
671{ 755{
672 num ret; 756 num ret;
673 757
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 759
676 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
677 { 761 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 762 switch (op)
682 { 763 {
683 case NUM_ADD: av += bv; break; 764 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 765 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 766 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 768 }
688 769
689 num_set_ivalue (ret, av); 770 num_set_ivalue (ret, a.ivalue);
690 } 771 }
772#if USE_REAL
691 else 773 else
692 { 774 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 775 switch (op)
697 { 776 {
698 case NUM_ADD: av += bv; break; 777 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 778 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 779 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 781 }
703 782
704 num_set_rvalue (ret, av); 783 num_set_rvalue (ret, a.rvalue);
705 } 784 }
785#endif
706 786
707 return ret; 787 return ret;
708} 788}
709 789
710static num 790static num
711num_div (num a, num b) 791num_div (num a, num b)
712{ 792{
713 num ret; 793 num ret;
714 794
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 795 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 796
717 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 799 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 801
722 return ret; 802 return ret;
723} 803}
724 804
725static num 805static num
727{ 807{
728 num ret; 808 num ret;
729 long e1, e2, res; 809 long e1, e2, res;
730 810
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 811 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
734 res = e1 % e2; 814 res = e1 % e2;
735 815
736 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
737 if (res > 0) 817 if (res > 0)
738 { 818 {
754{ 834{
755 num ret; 835 num ret;
756 long e1, e2, res; 836 long e1, e2, res;
757 837
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 838 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
761 res = e1 % e2; 841 res = e1 % e2;
762 842
763 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 844 if (res * e2 < 0)
765 res += e2; 845 res += e2;
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 856 int ret;
777 857
778 if (is_fixnum) 858 if (is_fixnum)
779 { 859 {
780 IVALUE av = num_get_ivalue (a); 860 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 861 IVALUE bv = num_ivalue (b);
782 862
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 863 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 864 }
785 else 865 else
786 { 866 {
787 RVALUE av = num_get_rvalue (a); 867 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 868 RVALUE bv = num_rvalue (b);
789 869
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 870 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 871 }
792 872
793 return ret; 873 return ret;
856 return k; 936 return k;
857 937
858 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
859 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
860 940
861 /* insert new segment in address order */
862 newp = (pointer)cp; 941 newp = (pointer)cp;
863 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
864 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
865
866 //TODO: insert, not swap
867 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868 {
869 p = SCHEME_V->cell_seg[i];
870 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871 SCHEME_V->cell_seg[i - 1] = p;
872
873 k = SCHEME_V->cell_segsize[i];
874 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875 SCHEME_V->cell_segsize[i - 1] = k;
876
877 --i;
878 }
879
880 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 945 last = newp + segsize - 1;
882 946
883 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
884 { 948 {
885 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
886 set_car (p, NIL); 950 set_car (p, NIL);
887 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
888 } 952 }
889 953
890 /* insert new cells in address order on free list */
891 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892 {
893 set_cdr (last, SCHEME_V->free_cell); 954 set_cdr (last, SCHEME_V->free_cell);
894 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
895 }
896 else
897 {
898 p = SCHEME_V->free_cell;
899
900 while (cdr (p) != NIL && newp > cdr (p))
901 p = cdr (p);
902
903 set_cdr (last, cdr (p));
904 set_cdr (p, newp);
905 }
906 } 956 }
907 957
908 return n; 958 return n;
909} 959}
910 960
989 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
990 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
991 1041
992 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
993 v->object.vector.length = len; 1043 v->object.vector.length = len;
994 fill_vector (v, init); 1044 fill_vector (v, 0, init);
995 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
996 1046
997 return v; 1047 return v;
998} 1048}
999 1049
1044 return x; 1094 return x;
1045} 1095}
1046 1096
1047/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1048 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x;
1106}
1107
1049#ifndef USE_OBJECT_LIST 1108#ifndef USE_OBJECT_LIST
1050 1109
1110static int
1051static int hash_fn (const char *key, int table_size); 1111hash_fn (const char *key, int table_size)
1112{
1113 const unsigned char *p = key;
1114 uint32_t hash = 2166136261;
1115
1116 while (*p)
1117 hash = (hash ^ *p++) * 16777619;
1118
1119 return hash % table_size;
1120}
1052 1121
1053static pointer 1122static pointer
1054oblist_initial_value (SCHEME_P) 1123oblist_initial_value (SCHEME_P)
1055{ 1124{
1056 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1125 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1058 1127
1059/* returns the new symbol */ 1128/* returns the new symbol */
1060static pointer 1129static pointer
1061oblist_add_by_name (SCHEME_P_ const char *name) 1130oblist_add_by_name (SCHEME_P_ const char *name)
1062{ 1131{
1063 int location; 1132 pointer x = generate_symbol (SCHEME_A_ name);
1064
1065 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066 set_typeflag (x, T_SYMBOL);
1067 setimmutable (car (x));
1068
1069 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1133 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1134 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071 return x; 1135 return x;
1072} 1136}
1073 1137
1074ecb_inline pointer 1138ecb_inline pointer
1075oblist_find_by_name (SCHEME_P_ const char *name) 1139oblist_find_by_name (SCHEME_P_ const char *name)
1078 pointer x; 1142 pointer x;
1079 char *s; 1143 char *s;
1080 1144
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1145 location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 1146
1083 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1147 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084 { 1148 {
1085 s = symname (car (x)); 1149 s = symname (car (x));
1086 1150
1087 /* case-insensitive, per R5RS section 2 */ 1151 /* case-insensitive, per R5RS section 2 */
1088 if (stricmp (name, s) == 0) 1152 if (stricmp (name, s) == 0)
1098 int i; 1162 int i;
1099 pointer x; 1163 pointer x;
1100 pointer ob_list = NIL; 1164 pointer ob_list = NIL;
1101 1165
1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1166 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1167 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104 ob_list = cons (x, ob_list); 1168 ob_list = cons (x, ob_list);
1105 1169
1106 return ob_list; 1170 return ob_list;
1107} 1171}
1108 1172
1134 1198
1135/* returns the new symbol */ 1199/* returns the new symbol */
1136static pointer 1200static pointer
1137oblist_add_by_name (SCHEME_P_ const char *name) 1201oblist_add_by_name (SCHEME_P_ const char *name)
1138{ 1202{
1139 pointer x; 1203 pointer x = mk_string (SCHEME_A_ name);
1140
1141 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142 set_typeflag (x, T_SYMBOL); 1204 set_typeflag (x, T_SYMBOL);
1143 setimmutable (car (x)); 1205 setimmutable (x);
1144 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145 return x; 1207 return x;
1146} 1208}
1147 1209
1148static pointer 1210static pointer
1181mk_character (SCHEME_P_ int c) 1243mk_character (SCHEME_P_ int c)
1182{ 1244{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1245 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1246
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1247 set_typeflag (x, (T_CHARACTER | T_ATOM));
1186 ivalue_unchecked (x) = c & 0xff; 1248 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1249
1188 return x; 1250 return x;
1189} 1251}
1190 1252
1191/* get number atom (integer) */ 1253/* get number atom (integer) */
1192INTERFACE pointer 1254INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1255mk_integer (SCHEME_P_ long n)
1194{ 1256{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1257 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1258
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1259 set_typeflag (x, (T_INTEGER | T_ATOM));
1198 ivalue_unchecked (x) = num; 1260 set_ivalue (x, n);
1199 set_num_integer (x); 1261
1200 return x; 1262 return x;
1201} 1263}
1202 1264
1203INTERFACE pointer 1265INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1205{ 1267{
1268#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1270
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1271 set_typeflag (x, (T_REAL | T_ATOM));
1209 rvalue_unchecked (x) = n; 1272 set_rvalue (x, n);
1210 set_num_real (x); 1273
1211 return x; 1274 return x;
1275#else
1276 return mk_integer (SCHEME_A_ n);
1277#endif
1212} 1278}
1213 1279
1214static pointer 1280static pointer
1215mk_number (SCHEME_P_ const num n) 1281mk_number (SCHEME_P_ const num n)
1216{ 1282{
1283#if USE_REAL
1217 if (num_is_fixnum (n)) 1284 return num_is_fixnum (n)
1285 ? mk_integer (SCHEME_A_ num_ivalue (n))
1286 : mk_real (SCHEME_A_ num_rvalue (n));
1287#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1288 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1289#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1290}
1222 1291
1223/* allocate name to string area */ 1292/* allocate name to string area */
1224static char * 1293static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1294store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1231 SCHEME_V->no_memory = 1; 1300 SCHEME_V->no_memory = 1;
1232 return SCHEME_V->strbuff; 1301 return SCHEME_V->strbuff;
1233 } 1302 }
1234 1303
1235 if (str) 1304 if (str)
1236 { 1305 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237 int l = strlen (str);
1238
1239 if (l > len_str)
1240 l = len_str;
1241
1242 memcpy (q, str, l);
1243 q[l] = 0;
1244 }
1245 else 1306 else
1246 {
1247 memset (q, fill, len_str); 1307 memset (q, fill, len_str);
1308
1248 q[len_str] = 0; 1309 q[len_str] = 0;
1249 }
1250 1310
1251 return q; 1311 return q;
1252} 1312}
1253 1313
1254INTERFACE pointer 1314INTERFACE pointer
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1328 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1329
1270 set_typeflag (x, T_STRING | T_ATOM); 1330 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1331 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272 strlength (x) = len; 1332 strlength (x) = len;
1333
1273 return x; 1334 return x;
1274} 1335}
1275 1336
1276INTERFACE pointer 1337INTERFACE pointer
1277mk_string (SCHEME_P_ const char *str) 1338mk_string (SCHEME_P_ const char *str)
1284{ 1345{
1285 return get_vector_object (SCHEME_A_ len, NIL); 1346 return get_vector_object (SCHEME_A_ len, NIL);
1286} 1347}
1287 1348
1288INTERFACE void 1349INTERFACE void
1289fill_vector (pointer vec, pointer obj) 1350fill_vector (pointer vec, uint32_t start, pointer obj)
1290{ 1351{
1291 int i; 1352 int i;
1292 1353
1293 for (i = 0; i < vec->object.vector.length; i++) 1354 for (i = start; i < veclength (vec); i++)
1294 vecvalue (vec)[i] = obj; 1355 vecvalue (vec)[i] = obj;
1295} 1356}
1296 1357
1358INTERFACE void
1359vector_resize (pointer vec, uint32_t newsize, pointer fill)
1360{
1361 uint32_t oldsize = veclength (vec);
1362 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1363 veclength (vec) = newsize;
1364 fill_vector (vec, oldsize, fill);
1365}
1366
1297INTERFACE pointer 1367INTERFACE pointer
1298vector_elem (pointer vec, uint32_t ielem) 1368vector_get (pointer vec, uint32_t ielem)
1299{ 1369{
1300 return vecvalue(vec)[ielem]; 1370 return vecvalue(vec)[ielem];
1301} 1371}
1302 1372
1303INTERFACE void 1373INTERFACE void
1304set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1374vector_set (pointer vec, uint32_t ielem, pointer a)
1305{ 1375{
1306 vecvalue(vec)[ielem] = a; 1376 vecvalue(vec)[ielem] = a;
1307} 1377}
1308 1378
1309/* get new symbol */ 1379/* get new symbol */
1321 1391
1322INTERFACE pointer 1392INTERFACE pointer
1323gensym (SCHEME_P) 1393gensym (SCHEME_P)
1324{ 1394{
1325 pointer x; 1395 pointer x;
1326
1327 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328 {
1329 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1330 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, SCHEME_V->gensym_cnt);
1331 1398
1332 /* first check oblist */ 1399 return generate_symbol (SCHEME_A_ name);
1333 x = oblist_find_by_name (SCHEME_A_ name);
1334
1335 if (x == NIL)
1336 {
1337 x = oblist_add_by_name (SCHEME_A_ name);
1338 return x;
1339 }
1340 }
1341
1342 return NIL;
1343} 1400}
1344 1401
1345/* make symbol or number atom from string */ 1402/* make symbol or number atom from string */
1346static pointer 1403static pointer
1347mk_atom (SCHEME_P_ char *q) 1404mk_atom (SCHEME_P_ char *q)
1401 } 1458 }
1402 else if ((c == 'e') || (c == 'E')) 1459 else if ((c == 'e') || (c == 'E'))
1403 { 1460 {
1404 if (!has_fp_exp) 1461 if (!has_fp_exp)
1405 { 1462 {
1406 has_dec_point = 1; /* decimal point illegal 1463 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1464 p++;
1409 1465
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1466 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1467 continue;
1412 } 1468 }
1500 1556
1501 if (ecb_expect_false (is_vector (p))) 1557 if (ecb_expect_false (is_vector (p)))
1502 { 1558 {
1503 int i; 1559 int i;
1504 1560
1505 for (i = 0; i < p->object.vector.length; i++) 1561 for (i = 0; i < veclength (p); i++)
1506 mark (vecvalue (p)[i]); 1562 mark (vecvalue (p)[i]);
1507 } 1563 }
1508 1564
1509 if (is_atom (p)) 1565 if (is_atom (p))
1510 goto E6; 1566 goto E6;
1608 if (is_mark (p)) 1664 if (is_mark (p))
1609 clrmark (p); 1665 clrmark (p);
1610 else 1666 else
1611 { 1667 {
1612 /* reclaim cell */ 1668 /* reclaim cell */
1613 if (typeflag (p) != T_FREE) 1669 if (typeflag (p) != T_PAIR)
1614 { 1670 {
1615 finalize_cell (SCHEME_A_ p); 1671 finalize_cell (SCHEME_A_ p);
1616 set_typeflag (p, T_FREE); 1672 set_typeflag (p, T_PAIR);
1617 set_car (p, NIL); 1673 set_car (p, NIL);
1618 } 1674 }
1619 1675
1620 ++SCHEME_V->fcells; 1676 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell); 1677 set_cdr (p, SCHEME_V->free_cell);
1623 } 1679 }
1624 } 1680 }
1625 } 1681 }
1626 1682
1627 if (SCHEME_V->gc_verbose) 1683 if (SCHEME_V->gc_verbose)
1684 {
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1686 }
1629} 1687}
1630 1688
1631static void 1689static void
1632finalize_cell (SCHEME_P_ pointer a) 1690finalize_cell (SCHEME_P_ pointer a)
1633{ 1691{
2062#endif 2120#endif
2063} 2121}
2064 2122
2065/* read characters up to delimiter, but cater to character constants */ 2123/* read characters up to delimiter, but cater to character constants */
2066static char * 2124static char *
2067readstr_upto (SCHEME_P_ char *delim) 2125readstr_upto (SCHEME_P_ int skip, const char *delim)
2068{ 2126{
2069 char *p = SCHEME_V->strbuff; 2127 char *p = SCHEME_V->strbuff + skip;
2070 2128
2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2129 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072 2130
2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2131 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074 *p = 0; 2132 *p = 0;
2081 return SCHEME_V->strbuff; 2139 return SCHEME_V->strbuff;
2082} 2140}
2083 2141
2084/* read string expression "xxx...xxx" */ 2142/* read string expression "xxx...xxx" */
2085static pointer 2143static pointer
2086readstrexp (SCHEME_P) 2144readstrexp (SCHEME_P_ char delim)
2087{ 2145{
2088 char *p = SCHEME_V->strbuff; 2146 char *p = SCHEME_V->strbuff;
2089 int c; 2147 int c;
2090 int c1 = 0; 2148 int c1 = 0;
2091 enum
2092 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2149 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093 2150
2094 for (;;) 2151 for (;;)
2095 { 2152 {
2096 c = inchar (SCHEME_A); 2153 c = inchar (SCHEME_A);
2097 2154
2099 return S_F; 2156 return S_F;
2100 2157
2101 switch (state) 2158 switch (state)
2102 { 2159 {
2103 case st_ok: 2160 case st_ok:
2104 switch (c) 2161 if (ecb_expect_false (c == delim))
2105 {
2106 case '\\':
2107 state = st_bsl;
2108 break;
2109
2110 case '"':
2111 *p = 0;
2112 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2162 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113 2163
2114 default: 2164 if (ecb_expect_false (c == '\\'))
2165 state = st_bsl;
2166 else
2115 *p++ = c; 2167 *p++ = c;
2116 break;
2117 }
2118 2168
2119 break; 2169 break;
2120 2170
2121 case st_bsl: 2171 case st_bsl:
2122 switch (c) 2172 switch (c)
2152 case 'r': 2202 case 'r':
2153 *p++ = '\r'; 2203 *p++ = '\r';
2154 state = st_ok; 2204 state = st_ok;
2155 break; 2205 break;
2156 2206
2157 case '"':
2158 *p++ = '"';
2159 state = st_ok;
2160 break;
2161
2162 default: 2207 default:
2163 *p++ = c; 2208 *p++ = c;
2164 state = st_ok; 2209 state = st_ok;
2165 break; 2210 break;
2166 } 2211 }
2167 2212
2168 break; 2213 break;
2169 2214
2170 case st_x1: 2215 case st_x1:
2171 case st_x2: 2216 case st_x2:
2172 c = toupper (c); 2217 c = tolower (c);
2173 2218
2174 if (c >= '0' && c <= 'F') 2219 if (c >= '0' && c <= '9')
2175 {
2176 if (c <= '9')
2177 c1 = (c1 << 4) + c - '0'; 2220 c1 = (c1 << 4) + c - '0';
2178 else 2221 else if (c >= 'a' && c <= 'f')
2179 c1 = (c1 << 4) + c - 'A' + 10; 2222 c1 = (c1 << 4) + c - 'a' + 10;
2180
2181 if (state == st_x1)
2182 state = st_x2;
2183 else
2184 {
2185 *p++ = c1;
2186 state = st_ok;
2187 }
2188 }
2189 else 2223 else
2190 return S_F; 2224 return S_F;
2225
2226 if (state == st_x1)
2227 state = st_x2;
2228 else
2229 {
2230 *p++ = c1;
2231 state = st_ok;
2232 }
2191 2233
2192 break; 2234 break;
2193 2235
2194 case st_oct1: 2236 case st_oct1:
2195 case st_oct2: 2237 case st_oct2:
2199 backchar (SCHEME_A_ c); 2241 backchar (SCHEME_A_ c);
2200 state = st_ok; 2242 state = st_ok;
2201 } 2243 }
2202 else 2244 else
2203 { 2245 {
2204 if (state == st_oct2 && c1 >= 32) 2246 if (state == st_oct2 && c1 >= ' ')
2205 return S_F; 2247 return S_F;
2206 2248
2207 c1 = (c1 << 3) + (c - '0'); 2249 c1 = (c1 << 3) + (c - '0');
2208 2250
2209 if (state == st_oct1) 2251 if (state == st_oct1)
2214 state = st_ok; 2256 state = st_ok;
2215 } 2257 }
2216 } 2258 }
2217 2259
2218 break; 2260 break;
2219
2220 } 2261 }
2221 } 2262 }
2222} 2263}
2223 2264
2224/* check c is in chars */ 2265/* check c is in chars */
2225ecb_inline int 2266ecb_inline int
2226is_one_of (char *s, int c) 2267is_one_of (const char *s, int c)
2227{ 2268{
2228 if (c == EOF) 2269 if (c == EOF)
2229 return 1; 2270 return 1;
2230 2271
2231 return !!strchr (s, c); 2272 return !!strchr (s, c);
2287 2328
2288 if (is_one_of (" \n\t", c)) 2329 if (is_one_of (" \n\t", c))
2289 return TOK_DOT; 2330 return TOK_DOT;
2290 else 2331 else
2291 { 2332 {
2292 //TODO: ungetc twice in a row is not supported in C
2293 backchar (SCHEME_A_ c); 2333 backchar (SCHEME_A_ c);
2294 backchar (SCHEME_A_ '.');
2295 return TOK_ATOM; 2334 return TOK_DOTATOM;
2296 } 2335 }
2336
2337 case '|':
2338 return TOK_STRATOM;
2297 2339
2298 case '\'': 2340 case '\'':
2299 return TOK_QUOTE; 2341 return TOK_QUOTE;
2300 2342
2301 case ';': 2343 case ';':
2433 } 2475 }
2434 2476
2435 putcharacter (SCHEME_A_ '"'); 2477 putcharacter (SCHEME_A_ '"');
2436} 2478}
2437 2479
2438
2439/* print atoms */ 2480/* print atoms */
2440static void 2481static void
2441printatom (SCHEME_P_ pointer l, int f) 2482printatom (SCHEME_P_ pointer l, int f)
2442{ 2483{
2443 char *p; 2484 char *p;
2444 int len; 2485 int len;
2445 2486
2446 atom2str (SCHEME_A_ l, f, &p, &len); 2487 atom2str (SCHEME_A_ l, f, &p, &len);
2447 putchars (SCHEME_A_ p, len); 2488 putchars (SCHEME_A_ p, len);
2448} 2489}
2449
2450 2490
2451/* Uses internal buffer unless string pointer is already available */ 2491/* Uses internal buffer unless string pointer is already available */
2452static void 2492static void
2453atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454{ 2494{
2615#endif 2655#endif
2616 } 2656 }
2617 else if (is_continuation (l)) 2657 else if (is_continuation (l))
2618 p = "#<CONTINUATION>"; 2658 p = "#<CONTINUATION>";
2619 else 2659 else
2660 {
2661#if USE_PRINTF
2662 p = SCHEME_V->strbuff;
2663 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2664#else
2620 p = "#<ERROR>"; 2665 p = "#<ERROR>";
2666#endif
2667 }
2621 2668
2622 *pp = p; 2669 *pp = p;
2623 *plen = strlen (p); 2670 *plen = strlen (p);
2624} 2671}
2625 2672
2769/* () is #t in R5RS */ 2816/* () is #t in R5RS */
2770#define is_true(p) ((p) != S_F) 2817#define is_true(p) ((p) != S_F)
2771#define is_false(p) ((p) == S_F) 2818#define is_false(p) ((p) == S_F)
2772 2819
2773/* ========== Environment implementation ========== */ 2820/* ========== Environment implementation ========== */
2774
2775#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777static int
2778hash_fn (const char *key, int table_size)
2779{
2780 const unsigned char *p = key;
2781 uint32_t hash = 2166136261;
2782
2783 while (*p)
2784 hash = (hash ^ *p++) * 16777619;
2785
2786 return hash % table_size;
2787}
2788#endif
2789 2821
2790#ifndef USE_ALIST_ENV 2822#ifndef USE_ALIST_ENV
2791 2823
2792/* 2824/*
2793 * In this implementation, each frame of the environment may be 2825 * In this implementation, each frame of the environment may be
2810 2842
2811 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2843 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812 setenvironment (SCHEME_V->envir); 2844 setenvironment (SCHEME_V->envir);
2813} 2845}
2814 2846
2847static uint32_t
2848sym_hash (pointer sym, uint32_t size)
2849{
2850 uintptr_t ptr = (uintptr_t)sym;
2851
2852#if 0
2853 /* table size is prime, so why mix */
2854 ptr += ptr >> 32;
2855 ptr += ptr >> 16;
2856 ptr += ptr >> 8;
2857#endif
2858
2859 return ptr % size;
2860}
2861
2815ecb_inline void 2862ecb_inline void
2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2863new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817{ 2864{
2818 pointer slot = immutable_cons (variable, value); 2865 pointer slot = immutable_cons (variable, value);
2819 2866
2820 if (is_vector (car (env))) 2867 if (is_vector (car (env)))
2821 { 2868 {
2822 int location = hash_fn (symname (variable), veclength (car (env))); 2869 int location = sym_hash (variable, veclength (car (env)));
2823
2824 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2870 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825 } 2871 }
2826 else 2872 else
2827 set_car (env, immutable_cons (slot, car (env))); 2873 set_car (env, immutable_cons (slot, car (env)));
2828} 2874}
2829 2875
2830static pointer 2876static pointer
2831find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2877find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832{ 2878{
2833 pointer x, y; 2879 pointer x, y;
2834 int location;
2835 2880
2836 for (x = env; x != NIL; x = cdr (x)) 2881 for (x = env; x != NIL; x = cdr (x))
2837 { 2882 {
2838 if (is_vector (car (x))) 2883 if (is_vector (car (x)))
2839 { 2884 {
2840 location = hash_fn (symname (hdl), veclength (car (x))); 2885 int location = sym_hash (hdl, veclength (car (x)));
2841 y = vector_elem (car (x), location); 2886 y = vector_get (car (x), location);
2842 } 2887 }
2843 else 2888 else
2844 y = car (x); 2889 y = car (x);
2845 2890
2846 for (; y != NIL; y = cdr (y)) 2891 for (; y != NIL; y = cdr (y))
2847 if (caar (y) == hdl) 2892 if (caar (y) == hdl)
2848 break; 2893 break;
2849 2894
2850 if (y != NIL) 2895 if (y != NIL)
2896 return car (y);
2897
2898 if (!all)
2851 break; 2899 break;
2852
2853 if (!all)
2854 return NIL;
2855 } 2900 }
2856
2857 if (x != NIL)
2858 return car (y);
2859 2901
2860 return NIL; 2902 return NIL;
2861} 2903}
2862 2904
2863#else /* USE_ALIST_ENV */ 2905#else /* USE_ALIST_ENV */
2885 for (y = car (x); y != NIL; y = cdr (y)) 2927 for (y = car (x); y != NIL; y = cdr (y))
2886 if (caar (y) == hdl) 2928 if (caar (y) == hdl)
2887 break; 2929 break;
2888 2930
2889 if (y != NIL) 2931 if (y != NIL)
2932 return car (y);
2890 break; 2933 break;
2891 2934
2892 if (!all) 2935 if (!all)
2893 return NIL; 2936 break;
2894 } 2937 }
2895
2896 if (x != NIL)
2897 return car (y);
2898 2938
2899 return NIL; 2939 return NIL;
2900} 2940}
2901 2941
2902#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
3119 int i = 0; 3159 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3160 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3161
3122 while (cont != NIL) 3162 while (cont != NIL)
3123 { 3163 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3164 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3165 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3166 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3167 frame->code = car (cont) ; cont = cdr (cont);
3128 3168
3129 ++frame; 3169 ++frame;
3130 ++i; 3170 ++i;
3131 } 3171 }
3132 3172
3161 SCHEME_V->value = a; 3201 SCHEME_V->value = a;
3162 3202
3163 if (dump == NIL) 3203 if (dump == NIL)
3164 return -1; 3204 return -1;
3165 3205
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3206 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3210
3171 SCHEME_V->dump = dump; 3211 SCHEME_V->dump = dump;
3172 3212
3173 return 0; 3213 return 0;
3174} 3214}
3343 } 3383 }
3344 else 3384 else
3345 s_return (SCHEME_V->code); 3385 s_return (SCHEME_V->code);
3346 3386
3347 case OP_E0ARGS: /* eval arguments */ 3387 case OP_E0ARGS: /* eval arguments */
3348 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3388 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349 { 3389 {
3350 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3390 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3391 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352 SCHEME_V->code = SCHEME_V->value; 3392 SCHEME_V->code = SCHEME_V->value;
3353 s_goto (OP_APPLY); 3393 s_goto (OP_APPLY);
3380 3420
3381 case OP_TRACING: 3421 case OP_TRACING:
3382 { 3422 {
3383 int tr = SCHEME_V->tracing; 3423 int tr = SCHEME_V->tracing;
3384 3424
3385 SCHEME_V->tracing = ivalue (car (args)); 3425 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3426 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3427 }
3388 3428
3389#endif 3429#endif
3390 3430
3614 case OP_LET2: /* let */ 3654 case OP_LET2: /* let */
3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3616 3656
3617 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 3657 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3618 y != NIL; x = cdr (x), y = cdr (y)) 3658 y != NIL; x = cdr (x), y = cdr (y))
3659 { if (is_pair(caar(x))){debug(SCHEME_A_ 0, SCHEME_V->code);};//D
3660 pointer z = caar (x);
3661 if(is_pair(z)) z = car(z);//D
3662 new_slot_in_env (SCHEME_A_ z, car (y));
3663 }
3619 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3664 //new_slot_in_env (SCHEME_A_ caar (x), car (y));
3620 3665
3621 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3666 if (is_symbol (car (SCHEME_V->code))) /* named let */
3622 { 3667 {
3623 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 3668 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3624 { 3669 {
3909{ 3954{
3910 pointer args = SCHEME_V->args; 3955 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 3956 pointer x = car (args);
3912 num v; 3957 num v;
3913 3958
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 3959 switch (op)
3919 { 3960 {
3920#if USE_MATH 3961#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 3962 case OP_INEX2EX: /* inexact->exact */
3963 {
3922 if (is_integer (x)) 3964 if (is_integer (x))
3923 s_return (x); 3965 s_return (x);
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 3966
3967 RVALUE r = rvalue_unchecked (x);
3968
3969 if (r == (RVALUE)(IVALUE)r)
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3970 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3926 else 3971 else
3927 Error_1 ("inexact->exact: not integral:", x); 3972 Error_1 ("inexact->exact: not integral:", x);
3973 }
3928 3974
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3975 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)))); 3976 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)))); 3977 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)))); 3978 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3966 /* If the test fails, result is too big for integer. */ 4012 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4013 if (!real_result)
3968 { 4014 {
3969 long result_as_long = result; 4015 long result_as_long = result;
3970 4016
3971 if (result != (RVALUE) result_as_long) 4017 if (result != result_as_long)
3972 real_result = 1; 4018 real_result = 1;
3973 } 4019 }
3974 4020
3975 if (real_result) 4021 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4022 s_return (mk_real (SCHEME_A_ result));
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4027 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)))); 4028 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983 4029
3984 case OP_TRUNCATE: 4030 case OP_TRUNCATE:
3985 { 4031 {
3986 RVALUE rvalue_of_x; 4032 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))); 4033 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 } 4034 }
3995 4035
3996 case OP_ROUND: 4036 case OP_ROUND:
3997 if (num_is_integer (x)) 4037 if (is_integer (x))
3998 s_return (x); 4038 s_return (x);
3999 4039
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4040 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4041#endif
4002 4042
4122 } 4162 }
4123 else 4163 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4164 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4165
4126 case OP_CHAR2INT: /* char->integer */ 4166 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4167 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4168
4129 case OP_INT2CHAR: /* integer->char */ 4169 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4170 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4171
4132 case OP_CHARUPCASE: 4172 case OP_CHARUPCASE:
4133 { 4173 {
4134 unsigned char c = ivalue (x); 4174 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4175 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4176 s_return (mk_character (SCHEME_A_ c));
4137 } 4177 }
4138 4178
4139 case OP_CHARDNCASE: 4179 case OP_CHARDNCASE:
4140 { 4180 {
4141 unsigned char c = ivalue (x); 4181 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4182 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4183 s_return (mk_character (SCHEME_A_ c));
4144 } 4184 }
4145 4185
4146 case OP_STR2SYM: /* string->symbol */ 4186 case OP_STR2SYM: /* string->symbol */
4223 Error_1 ("atom->string: not an atom:", x); 4263 Error_1 ("atom->string: not an atom:", x);
4224 } 4264 }
4225 4265
4226 case OP_MKSTRING: /* make-string */ 4266 case OP_MKSTRING: /* make-string */
4227 { 4267 {
4228 int fill = ' '; 4268 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4269 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4270
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4271 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4272 }
4238 4273
4239 case OP_STRLEN: /* string-length */ 4274 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4275 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4276
4242 case OP_STRREF: /* string-ref */ 4277 case OP_STRREF: /* string-ref */
4243 { 4278 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4279 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4280 int index = ivalue_unchecked (cadr (args));
4250 4281
4251 if (index >= strlength (x)) 4282 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4283 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4284
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4285 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4286 }
4256 4287
4257 case OP_STRSET: /* string-set! */ 4288 case OP_STRSET: /* string-set! */
4258 { 4289 {
4259 char *str; 4290 char *str = strvalue (x);
4260 int index; 4291 int index = ivalue_unchecked (cadr (args));
4261 int c; 4292 int c;
4262 4293
4263 if (is_immutable (x)) 4294 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4295 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4296
4270 if (index >= strlength (x)) 4297 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4298 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4299
4273 c = charvalue (caddr (args)); 4300 c = charvalue (caddr (args));
4296 s_return (newstr); 4323 s_return (newstr);
4297 } 4324 }
4298 4325
4299 case OP_SUBSTR: /* substring */ 4326 case OP_SUBSTR: /* substring */
4300 { 4327 {
4301 char *str; 4328 char *str = strvalue (x);
4302 int index0; 4329 int index0 = ivalue_unchecked (cadr (args));
4303 int index1; 4330 int index1;
4304 int len; 4331 int len;
4305 4332
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4333 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4334 Error_1 ("substring: start out of bounds:", cadr (args));
4312 4335
4313 if (cddr (args) != NIL) 4336 if (cddr (args) != NIL)
4314 { 4337 {
4315 index1 = ivalue (caddr (args)); 4338 index1 = ivalue_unchecked (caddr (args));
4316 4339
4317 if (index1 > strlength (x) || index1 < index0) 4340 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4341 Error_1 ("substring: end out of bounds:", caddr (args));
4319 } 4342 }
4320 else 4343 else
4343 if (SCHEME_V->no_memory) 4366 if (SCHEME_V->no_memory)
4344 s_return (S_SINK); 4367 s_return (S_SINK);
4345#endif 4368#endif
4346 4369
4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4370 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348 set_vector_elem (vec, i, car (x)); 4371 vector_set (vec, i, car (x));
4349 4372
4350 s_return (vec); 4373 s_return (vec);
4351 } 4374 }
4352 4375
4353 case OP_MKVECTOR: /* make-vector */ 4376 case OP_MKVECTOR: /* make-vector */
4354 { 4377 {
4355 pointer fill = NIL; 4378 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4379 pointer vec;
4358
4359 len = ivalue (x); 4380 int len = ivalue_unchecked (x);
4360 4381
4361 if (cdr (args) != NIL) 4382 if (cdr (args) != NIL)
4362 fill = cadr (args); 4383 fill = cadr (args);
4363 4384
4364 vec = mk_vector (SCHEME_A_ len); 4385 vec = mk_vector (SCHEME_A_ len);
4367 if (SCHEME_V->no_memory) 4388 if (SCHEME_V->no_memory)
4368 s_return (S_SINK); 4389 s_return (S_SINK);
4369#endif 4390#endif
4370 4391
4371 if (fill != NIL) 4392 if (fill != NIL)
4372 fill_vector (vec, fill); 4393 fill_vector (vec, 0, fill);
4373 4394
4374 s_return (vec); 4395 s_return (vec);
4375 } 4396 }
4376 4397
4377 case OP_VECLEN: /* vector-length */ 4398 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4399 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4400
4401 case OP_VECRESIZE:
4402 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4403 s_return (x);
4404
4380 case OP_VECREF: /* vector-ref */ 4405 case OP_VECREF: /* vector-ref */
4381 { 4406 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4407 int index = ivalue_unchecked (cadr (args));
4385 4408
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4409 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4410 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4411
4389 s_return (vector_elem (x, index)); 4412 s_return (vector_get (x, index));
4390 } 4413 }
4391 4414
4392 case OP_VECSET: /* vector-set! */ 4415 case OP_VECSET: /* vector-set! */
4393 { 4416 {
4394 int index; 4417 int index = ivalue_unchecked (cadr (args));
4395 4418
4396 if (is_immutable (x)) 4419 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4420 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398 4421
4399 index = ivalue (cadr (args));
4400
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4422 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4423 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4424
4404 set_vector_elem (x, index, caddr (args)); 4425 vector_set (x, index, caddr (args));
4405 s_return (x); 4426 s_return (x);
4406 } 4427 }
4407 } 4428 }
4408 4429
4409 if (USE_ERROR_CHECKING) abort (); 4430 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} 4431}
4465 4432
4466static int 4433static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4434opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4435{
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4481 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4482 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4483 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4484
4518#if USE_CHAR_CLASSIFIERS 4485#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4486 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4487 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4488 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4489 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4490 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4491#endif
4525 4492
4526#if USE_PORTS 4493#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4494 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4495 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4729 4696
4730 case OP_NEWSEGMENT: /* new-segment */ 4697 case OP_NEWSEGMENT: /* new-segment */
4731 if (!is_pair (args) || !is_number (a)) 4698 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 4699 Error_0 ("new-segment: argument must be a number");
4733 4700
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4701 alloc_cellseg (SCHEME_A_ ivalue (a));
4735 4702
4736 s_return (S_T); 4703 s_return (S_T);
4737 4704
4738 case OP_OBLIST: /* oblist */ 4705 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 4706 s_return (oblist_all_symbols (SCHEME_A));
4997 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4964 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 4965 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 4966 s_goto (OP_RDSEXPR);
5000 4967
5001 case TOK_ATOM: 4968 case TOK_ATOM:
5002 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4969 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4970
4971 case TOK_DOTATOM:
4972 SCHEME_V->strbuff[0] = '.';
4973 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4974
4975 case TOK_STRATOM:
4976 x = readstrexp (SCHEME_A_ '|');
4977 //TODO: haven't checked whether the garbage collector could interfere
4978 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003 4979
5004 case TOK_DQUOTE: 4980 case TOK_DQUOTE:
5005 x = readstrexp (SCHEME_A); 4981 x = readstrexp (SCHEME_A_ '"');
5006 4982
5007 if (x == S_F) 4983 if (x == S_F)
5008 Error_0 ("Error reading string"); 4984 Error_0 ("Error reading string");
5009 4985
5010 setimmutable (x); 4986 setimmutable (x);
5022 s_goto (OP_EVAL); 4998 s_goto (OP_EVAL);
5023 } 4999 }
5024 } 5000 }
5025 5001
5026 case TOK_SHARP_CONST: 5002 case TOK_SHARP_CONST:
5027 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5003 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028 Error_0 ("undefined sharp expression"); 5004 Error_0 ("undefined sharp expression");
5029 else 5005 else
5030 s_return (x); 5006 s_return (x);
5031 5007
5032 default: 5008 default:
5184 putstr (SCHEME_A_ ")"); 5160 putstr (SCHEME_A_ ")");
5185 s_return (S_T); 5161 s_return (S_T);
5186 } 5162 }
5187 else 5163 else
5188 { 5164 {
5189 pointer elem = vector_elem (vec, i); 5165 pointer elem = vector_get (vec, i);
5190 5166
5191 ivalue_unchecked (cdr (args)) = i + 1; 5167 ivalue_unchecked (cdr (args)) = i + 1;
5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5168 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193 SCHEME_V->args = elem; 5169 SCHEME_V->args = elem;
5194 5170
5254 5230
5255 case OP_CLOSUREP: /* closure? */ 5231 case OP_CLOSUREP: /* closure? */
5256 /* 5232 /*
5257 * Note, macro object is also a closure. 5233 * Note, macro object is also a closure.
5258 * Therefore, (closure? <#MACRO>) ==> #t 5234 * Therefore, (closure? <#MACRO>) ==> #t
5235 * (schmorp) well, obviously not, fix? TODO
5259 */ 5236 */
5260 s_retbool (is_closure (a)); 5237 s_retbool (is_closure (a));
5261 5238
5262 case OP_MACROP: /* macro? */ 5239 case OP_MACROP: /* macro? */
5263 s_retbool (is_macro (a)); 5240 s_retbool (is_macro (a));
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5246/* 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); 5247typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5248
5272typedef int (*test_predicate)(pointer); 5249typedef int (*test_predicate)(pointer);
5273static int 5250static int
5274is_any (pointer p) 5251tst_any (pointer p)
5275{ 5252{
5276 return 1; 5253 return 1;
5277} 5254}
5278 5255
5279static int 5256static int
5280is_nonneg (pointer p) 5257tst_inonneg (pointer p)
5281{ 5258{
5282 return ivalue (p) >= 0 && is_integer (p); 5259 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5260}
5284 5261
5285static int 5262static int
5286tst_is_list (pointer p) 5263tst_is_list (SCHEME_P_ pointer p)
5287{ 5264{
5288 return p == NIL || is_pair (p); 5265 return p == NIL || is_pair (p);
5289} 5266}
5290 5267
5291/* Correspond carefully with following defines! */ 5268/* Correspond carefully with following defines! */
5292static struct 5269static struct
5293{ 5270{
5294 test_predicate fct; 5271 test_predicate fct;
5295 const char *kind; 5272 const char *kind;
5296} tests[] = 5273} tests[] = {
5297{
5298 { is_any, 0 }, 5274 { tst_any , 0 },
5299 { is_string, "string" }, 5275 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5276 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5277 { is_port , "port" },
5302 { is_inport, "input port" }, 5278 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5279 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5280 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5281 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5282 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5283 { is_character , "character" },
5308 { is_vector, "vector" }, 5284 { is_vector , "vector" },
5309 { is_number, "number" }, 5285 { is_number , "number" },
5310 { is_integer, "integer" }, 5286 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5287 { tst_inonneg , "non-negative integer" }
5312}; 5288};
5313 5289
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5290#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5291#define TST_ANY "\001"
5316#define TST_STRING "\002" 5292#define TST_STRING "\002"
5357typedef struct 5333typedef struct
5358{ 5334{
5359 uint8_t func; 5335 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5336 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5337 uint8_t builtin;
5338#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5339 uint8_t min_arity;
5363 uint8_t max_arity; 5340 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5341 char arg_tests_encoding[3];
5342#endif
5365} op_code_info; 5343} op_code_info;
5366 5344
5367static const op_code_info dispatch_table[] = { 5345static const op_code_info dispatch_table[] = {
5346#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5348#else
5349#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5350#endif
5369#include "opdefines.h" 5351#include "opdefines.h"
5370#undef OP_DEF 5352#undef OP_DEF
5371 {0} 5353 {0}
5372}; 5354};
5373 5355
5415 { 5397 {
5416 pointer arg = car (arglist); 5398 pointer arg = car (arglist);
5417 5399
5418 j = t[0]; 5400 j = t[0];
5419 5401
5402 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5403 if (j == TST_LIST[0])
5404 {
5405 if (!tst_is_list (SCHEME_A_ arg))
5406 break;
5407 }
5408 else
5409 {
5420 if (!tests[j - 1].fct (arg)) 5410 if (!tests[j - 1].fct (arg))
5421 break; 5411 break;
5412 }
5422 5413
5423 if (t[1]) /* last test is replicated as necessary */ 5414 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424 t++; 5415 t++;
5425 5416
5426 arglist = cdr (arglist); 5417 arglist = cdr (arglist);
5427 i++; 5418 i++;
5428 } 5419 }
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5474mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5475{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5476 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5477 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5478 ivalue_unchecked (y) = op;
5488 set_num_integer (y);
5489 return y; 5479 return y;
5490} 5480}
5491 5481
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5482/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5483static int
5494syntaxnum (pointer p) 5484syntaxnum (pointer p)
5495{ 5485{
5496 const char *s = strvalue (car (p)); 5486 const char *s = strvalue (p);
5497 5487
5498 switch (strlength (car (p))) 5488 switch (strlength (p))
5499 { 5489 {
5500 case 2: 5490 case 2:
5501 if (s[0] == 'i') 5491 if (s[0] == 'i')
5502 return OP_IF0; /* if */ 5492 return OP_IF0; /* if */
5503 else 5493 else
5939# endif 5929# endif
5940 int fin; 5930 int fin;
5941 char *file_name = InitFile; 5931 char *file_name = InitFile;
5942 int retcode; 5932 int retcode;
5943 int isfile = 1; 5933 int isfile = 1;
5934 system ("ps v $PPID");//D
5944 5935
5945 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5936 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946 { 5937 {
5947 xwrstr ("Usage: tinyscheme -?\n"); 5938 xwrstr ("Usage: tinyscheme -?\n");
5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5939 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines