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.44 by root, Mon Nov 30 06:49:11 2015 UTC

16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 24#include "malloc.c"
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52//#include <ctype.h>
53
54#if '1' != '0' + 1 \
55 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
56 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
57 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
58 || 'f' != 'a' + 5
59# error "execution character set digits not consecutive"
60#endif
46 61
47enum { 62enum {
48 TOK_EOF, 63 TOK_EOF,
49 TOK_LPAREN, 64 TOK_LPAREN,
50 TOK_RPAREN, 65 TOK_RPAREN,
51 TOK_DOT, 66 TOK_DOT,
52 TOK_ATOM, 67 TOK_ATOM,
68 TOK_DOTATOM, /* atom name starting with '.' */
69 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 70 TOK_QUOTE,
54 TOK_DQUOTE, 71 TOK_DQUOTE,
55 TOK_BQUOTE, 72 TOK_BQUOTE,
56 TOK_COMMA, 73 TOK_COMMA,
57 TOK_ATMARK, 74 TOK_ATMARK,
59 TOK_SHARP_CONST, 76 TOK_SHARP_CONST,
60 TOK_VEC 77 TOK_VEC
61}; 78};
62 79
63#define BACKQUOTE '`' 80#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 81#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE
65 83
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
69#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK (&SCHEME_V->xsink)
182# define FIRST_CELLSEGS 3 200# define FIRST_CELLSEGS 3
183#endif 201#endif
184 202
185enum scheme_types 203enum scheme_types
186{ 204{
205 T_INTEGER,
187 T_FREE, 206 T_REAL,
188 T_STRING, 207 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 208 T_SYMBOL,
191 T_PROC, 209 T_PROC,
192 T_PAIR, 210 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 211 T_CLOSURE,
194 T_CONTINUATION, 212 T_CONTINUATION,
195 T_FOREIGN, 213 T_FOREIGN,
196 T_CHARACTER, 214 T_CHARACTER,
197 T_PORT, 215 T_PORT,
207#define T_SYNTAX 0x0010 225#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 226#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 227#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 228#define T_MARK 0x0080 /* only for gc */
211 229
230/* num, for generic arithmetic */
231struct num
232{
233 IVALUE ivalue;
234#if USE_REAL
235 RVALUE rvalue;
236 char is_fixnum;
237#endif
238};
239
240#if USE_REAL
241# define num_is_fixnum(n) (n).is_fixnum
242# define num_set_fixnum(n,f) (n).is_fixnum = (f)
243# define num_ivalue(n) (n).ivalue
244# define num_rvalue(n) (n).rvalue
245# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
246# define num_set_rvalue(n,r) (n).rvalue = (r)
247#else
248# define num_is_fixnum(n) 1
249# define num_set_fixnum(n,f) 0
250# define num_ivalue(n) (n).ivalue
251# define num_rvalue(n) (n).ivalue
252# define num_set_ivalue(n,i) (n).ivalue = (i)
253# define num_set_rvalue(n,r) (n).ivalue = (r)
254#endif
255
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 256enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 257
214static num num_op (enum num_op op, num a, num b); 258static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 259static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 260static num num_rem (num a, num b);
236} 280}
237 281
238#define strvalue(p) ((p)->object.string.svalue) 282#define strvalue(p) ((p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 283#define strlength(p) ((p)->object.string.length)
240 284
241INTERFACE int is_list (SCHEME_P_ pointer p);
242
243INTERFACE int 285INTERFACE int
244is_vector (pointer p) 286is_vector (pointer p)
245{ 287{
246 return type (p) == T_VECTOR; 288 return type (p) == T_VECTOR;
247} 289}
248 290
249#define vecvalue(p) ((p)->object.vector.vvalue) 291#define vecvalue(p) ((p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length) 292#define veclength(p) ((p)->object.vector.length)
251INTERFACE void fill_vector (pointer vec, pointer obj); 293INTERFACE 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); 294INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255 296
256INTERFACE uint32_t 297INTERFACE int
257vector_length (pointer vec) 298is_integer (pointer p)
258{ 299{
259 return vec->object.vector.length; 300 return type (p) == T_INTEGER;
301}
302
303/* not the same as in scheme, where integers are (correctly :) reals */
304INTERFACE int
305is_real (pointer p)
306{
307 return type (p) == T_REAL;
260} 308}
261 309
262INTERFACE int 310INTERFACE int
263is_number (pointer p) 311is_number (pointer p)
264{ 312{
265 return type (p) == T_NUMBER; 313 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} 314}
279 315
280INTERFACE int 316INTERFACE int
281is_character (pointer p) 317is_character (pointer p)
282{ 318{
287string_value (pointer p) 323string_value (pointer p)
288{ 324{
289 return strvalue (p); 325 return strvalue (p);
290} 326}
291 327
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) 328#define ivalue_unchecked(p) (p)->object.ivalue
329#define set_ivalue(p,v) (p)->object.ivalue = (v)
330
323#if USE_REAL 331#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 332#define rvalue_unchecked(p) (p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 333#define set_rvalue(p,v) (p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 334#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 335#define rvalue_unchecked(p) (p)->object.ivalue
329# define set_num_integer(p) 0 336#define set_rvalue(p,v) (p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 337#endif
332 338
333INTERFACE long 339INTERFACE long
334charvalue (pointer p) 340charvalue (pointer p)
335{ 341{
403} 409}
404 410
405INTERFACE char * 411INTERFACE char *
406symname (pointer p) 412symname (pointer p)
407{ 413{
408 return strvalue (car (p)); 414 return strvalue (p);
409} 415}
410 416
411#if USE_PLIST 417#if USE_PLIST
418#define symprop(p) cdr(p)
412SCHEME_EXPORT int 419SCHEME_EXPORT int
413hasprop (pointer p) 420hasprop (pointer p)
414{ 421{
415 return typeflag (p) & T_SYMBOL; 422 return typeflag (p) & T_SYMBOL;
416} 423}
417
418# define symprop(p) cdr(p)
419#endif 424#endif
420 425
421INTERFACE int 426INTERFACE int
422is_syntax (pointer p) 427is_syntax (pointer p)
423{ 428{
437} 442}
438 443
439INTERFACE char * 444INTERFACE char *
440syntaxname (pointer p) 445syntaxname (pointer p)
441{ 446{
442 return strvalue (car (p)); 447 return strvalue (p);
443} 448}
444 449
445#define procnum(p) ivalue (p) 450#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 451static const char *procname (pointer x);
447 452
448INTERFACE int 453INTERFACE int
449is_closure (pointer p) 454is_closure (pointer p)
450{ 455{
511setimmutable (pointer p) 516setimmutable (pointer p)
512{ 517{
513#if USE_ERROR_CHECKING 518#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 519 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 520#endif
521}
522
523/* Result is:
524 proper list: length
525 circular list: -1
526 not even a pair: -2
527 dotted list: -2 minus length before dot
528*/
529INTERFACE int
530list_length (SCHEME_P_ pointer a)
531{
532 int i = 0;
533 pointer slow, fast;
534
535 slow = fast = a;
536
537 while (1)
538 {
539 if (fast == NIL)
540 return i;
541
542 if (!is_pair (fast))
543 return -2 - i;
544
545 fast = cdr (fast);
546 ++i;
547
548 if (fast == NIL)
549 return i;
550
551 if (!is_pair (fast))
552 return -2 - i;
553
554 ++i;
555 fast = cdr (fast);
556
557 /* Safe because we would have already returned if `fast'
558 encountered a non-pair. */
559 slow = cdr (slow);
560
561 if (fast == slow)
562 {
563 /* the fast pointer has looped back around and caught up
564 with the slow pointer, hence the structure is circular,
565 not of finite length, and therefore not a list */
566 return -1;
567 }
568 }
569}
570
571INTERFACE int
572is_list (SCHEME_P_ pointer a)
573{
574 return list_length (SCHEME_A_ a) >= 0;
516} 575}
517 576
518#if USE_CHAR_CLASSIFIERS 577#if USE_CHAR_CLASSIFIERS
519ecb_inline int 578ecb_inline int
520Cisalpha (int c) 579Cisalpha (int c)
609#endif 668#endif
610 669
611static int file_push (SCHEME_P_ const char *fname); 670static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 671static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 672static int file_interactive (SCHEME_P);
614ecb_inline int is_one_of (char *s, int c); 673ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 674static int alloc_cellseg (SCHEME_P_ int n);
616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 675ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617static void finalize_cell (SCHEME_P_ pointer a); 676static void finalize_cell (SCHEME_P_ pointer a);
618static int count_consecutive_cells (pointer x, int needed); 677static int count_consecutive_cells (pointer x, int needed);
619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 678static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
636static void mark (pointer a); 695static void mark (pointer a);
637static void gc (SCHEME_P_ pointer a, pointer b); 696static void gc (SCHEME_P_ pointer a, pointer b);
638static int basic_inchar (port *pt); 697static int basic_inchar (port *pt);
639static int inchar (SCHEME_P); 698static int inchar (SCHEME_P);
640static void backchar (SCHEME_P_ int c); 699static void backchar (SCHEME_P_ int c);
641static char *readstr_upto (SCHEME_P_ char *delim); 700static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642static pointer readstrexp (SCHEME_P); 701static pointer readstrexp (SCHEME_P_ char delim);
643ecb_inline int skipspace (SCHEME_P); 702ecb_inline int skipspace (SCHEME_P);
644static int token (SCHEME_P); 703static int token (SCHEME_P);
645static void printslashstring (SCHEME_P_ char *s, int len); 704static void printslashstring (SCHEME_P_ char *s, int len);
646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 705static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647static void printatom (SCHEME_P_ pointer l, int f); 706static void printatom (SCHEME_P_ pointer l, int f);
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 723static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 724static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 725static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 726static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 727
728static IVALUE
729ivalue (pointer x)
730{
731 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
732}
733
734static RVALUE
735rvalue (pointer x)
736{
737 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
738}
739
740INTERFACE num
741nvalue (pointer x)
742{
743 num n;
744
745 num_set_fixnum (n, is_integer (x));
746
747 if (num_is_fixnum (n))
748 num_set_ivalue (n, ivalue_unchecked (x));
749 else
750 num_set_rvalue (n, rvalue_unchecked (x));
751
752 return n;
753}
754
669static num 755static num
670num_op (enum num_op op, num a, num b) 756num_op (enum num_op op, num a, num b)
671{ 757{
672 num ret; 758 num ret;
673 759
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 761
676 if (num_is_fixnum (ret)) 762 if (num_is_fixnum (ret))
677 { 763 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 764 switch (op)
682 { 765 {
683 case NUM_ADD: av += bv; break; 766 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 767 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 768 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 769 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 770 }
688 771
689 num_set_ivalue (ret, av); 772 num_set_ivalue (ret, a.ivalue);
690 } 773 }
774#if USE_REAL
691 else 775 else
692 { 776 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 777 switch (op)
697 { 778 {
698 case NUM_ADD: av += bv; break; 779 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 780 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 781 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 782 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 783 }
703 784
704 num_set_rvalue (ret, av); 785 num_set_rvalue (ret, a.rvalue);
705 } 786 }
787#endif
706 788
707 return ret; 789 return ret;
708} 790}
709 791
710static num 792static num
711num_div (num a, num b) 793num_div (num a, num b)
712{ 794{
713 num ret; 795 num ret;
714 796
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 797 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 798
717 if (num_is_fixnum (ret)) 799 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 800 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 801 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 802 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 803
722 return ret; 804 return ret;
723} 805}
724 806
725static num 807static num
727{ 809{
728 num ret; 810 num ret;
729 long e1, e2, res; 811 long e1, e2, res;
730 812
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 813 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 814 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 815 e2 = num_ivalue (b);
734 res = e1 % e2; 816 res = e1 % e2;
735 817
736 /* remainder should have same sign as second operand */ 818 /* remainder should have same sign as second operand */
737 if (res > 0) 819 if (res > 0)
738 { 820 {
754{ 836{
755 num ret; 837 num ret;
756 long e1, e2, res; 838 long e1, e2, res;
757 839
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 840 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 841 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 842 e2 = num_ivalue (b);
761 res = e1 % e2; 843 res = e1 % e2;
762 844
763 /* modulo should have same sign as second operand */ 845 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 846 if (res * e2 < 0)
765 res += e2; 847 res += e2;
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 857 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 858 int ret;
777 859
778 if (is_fixnum) 860 if (is_fixnum)
779 { 861 {
780 IVALUE av = num_get_ivalue (a); 862 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 863 IVALUE bv = num_ivalue (b);
782 864
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 865 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 866 }
785 else 867 else
786 { 868 {
787 RVALUE av = num_get_rvalue (a); 869 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 870 RVALUE bv = num_rvalue (b);
789 871
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 872 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 873 }
792 874
793 return ret; 875 return ret;
856 return k; 938 return k;
857 939
858 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
859 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
860 942
861 /* insert new segment in address order */
862 newp = (pointer)cp; 943 newp = (pointer)cp;
863 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
864 SCHEME_V->cell_segsize[i] = segsize; 945 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; 946 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 947 last = newp + segsize - 1;
882 948
883 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
884 { 950 {
885 set_typeflag (p, T_FREE); 951 set_typeflag (p, T_PAIR);
886 set_car (p, NIL); 952 set_car (p, NIL);
887 set_cdr (p, p + 1); 953 set_cdr (p, p + 1);
888 } 954 }
889 955
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); 956 set_cdr (last, SCHEME_V->free_cell);
894 SCHEME_V->free_cell = newp; 957 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 } 958 }
907 959
908 return n; 960 return n;
909} 961}
910 962
989 /* Record it as a vector so that gc understands it. */ 1041 /* Record it as a vector so that gc understands it. */
990 set_typeflag (v, T_VECTOR | T_ATOM); 1042 set_typeflag (v, T_VECTOR | T_ATOM);
991 1043
992 v->object.vector.vvalue = e; 1044 v->object.vector.vvalue = e;
993 v->object.vector.length = len; 1045 v->object.vector.length = len;
994 fill_vector (v, init); 1046 fill_vector (v, 0, init);
995 push_recent_alloc (SCHEME_A_ v, NIL); 1047 push_recent_alloc (SCHEME_A_ v, NIL);
996 1048
997 return v; 1049 return v;
998} 1050}
999 1051
1042 set_cdr (x, b); 1094 set_cdr (x, b);
1043 1095
1044 return x; 1096 return x;
1045} 1097}
1046 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
1047/* ========== oblist implementation ========== */ 1108/* ========== oblist implementation ========== */
1048 1109
1049#ifndef USE_OBJECT_LIST 1110#ifndef USE_OBJECT_LIST
1050 1111
1112static int
1051static int hash_fn (const char *key, int table_size); 1113hash_fn (const char *key, int table_size)
1114{
1115 const unsigned char *p = key;
1116 uint32_t hash = 2166136261;
1117
1118 while (*p)
1119 hash = (hash ^ *p++) * 16777619;
1120
1121 return hash % table_size;
1122}
1052 1123
1053static pointer 1124static pointer
1054oblist_initial_value (SCHEME_P) 1125oblist_initial_value (SCHEME_P)
1055{ 1126{
1056 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1058 1129
1059/* returns the new symbol */ 1130/* returns the new symbol */
1060static pointer 1131static pointer
1061oblist_add_by_name (SCHEME_P_ const char *name) 1132oblist_add_by_name (SCHEME_P_ const char *name)
1062{ 1133{
1063 int location; 1134 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)); 1135 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))); 1136 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071 return x; 1137 return x;
1072} 1138}
1073 1139
1074ecb_inline pointer 1140ecb_inline pointer
1075oblist_find_by_name (SCHEME_P_ const char *name) 1141oblist_find_by_name (SCHEME_P_ const char *name)
1078 pointer x; 1144 pointer x;
1079 char *s; 1145 char *s;
1080 1146
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1147 location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 1148
1083 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1149 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084 { 1150 {
1085 s = symname (car (x)); 1151 s = symname (car (x));
1086 1152
1087 /* case-insensitive, per R5RS section 2 */ 1153 /* case-insensitive, per R5RS section 2 */
1088 if (stricmp (name, s) == 0) 1154 if (stricmp (name, s) == 0)
1098 int i; 1164 int i;
1099 pointer x; 1165 pointer x;
1100 pointer ob_list = NIL; 1166 pointer ob_list = NIL;
1101 1167
1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1168 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1169 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104 ob_list = cons (x, ob_list); 1170 ob_list = cons (x, ob_list);
1105 1171
1106 return ob_list; 1172 return ob_list;
1107} 1173}
1108 1174
1134 1200
1135/* returns the new symbol */ 1201/* returns the new symbol */
1136static pointer 1202static pointer
1137oblist_add_by_name (SCHEME_P_ const char *name) 1203oblist_add_by_name (SCHEME_P_ const char *name)
1138{ 1204{
1139 pointer x; 1205 pointer x = mk_string (SCHEME_A_ name);
1140
1141 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142 set_typeflag (x, T_SYMBOL); 1206 set_typeflag (x, T_SYMBOL);
1143 setimmutable (car (x)); 1207 setimmutable (x);
1144 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1208 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145 return x; 1209 return x;
1146} 1210}
1147 1211
1148static pointer 1212static pointer
1181mk_character (SCHEME_P_ int c) 1245mk_character (SCHEME_P_ int c)
1182{ 1246{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1247 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1248
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1249 set_typeflag (x, (T_CHARACTER | T_ATOM));
1186 ivalue_unchecked (x) = c & 0xff; 1250 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1251
1188 return x; 1252 return x;
1189} 1253}
1190 1254
1191/* get number atom (integer) */ 1255/* get number atom (integer) */
1192INTERFACE pointer 1256INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1257mk_integer (SCHEME_P_ long n)
1194{ 1258{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1259 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1260
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1261 set_typeflag (x, (T_INTEGER | T_ATOM));
1198 ivalue_unchecked (x) = num; 1262 set_ivalue (x, n);
1199 set_num_integer (x); 1263
1200 return x; 1264 return x;
1201} 1265}
1202 1266
1203INTERFACE pointer 1267INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1268mk_real (SCHEME_P_ RVALUE n)
1205{ 1269{
1270#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1271 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1272
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1273 set_typeflag (x, (T_REAL | T_ATOM));
1209 rvalue_unchecked (x) = n; 1274 set_rvalue (x, n);
1210 set_num_real (x); 1275
1211 return x; 1276 return x;
1277#else
1278 return mk_integer (SCHEME_A_ n);
1279#endif
1212} 1280}
1213 1281
1214static pointer 1282static pointer
1215mk_number (SCHEME_P_ const num n) 1283mk_number (SCHEME_P_ const num n)
1216{ 1284{
1285#if USE_REAL
1217 if (num_is_fixnum (n)) 1286 return num_is_fixnum (n)
1287 ? mk_integer (SCHEME_A_ num_ivalue (n))
1288 : mk_real (SCHEME_A_ num_rvalue (n));
1289#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1290 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1291#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1292}
1222 1293
1223/* allocate name to string area */ 1294/* allocate name to string area */
1224static char * 1295static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1231 SCHEME_V->no_memory = 1; 1302 SCHEME_V->no_memory = 1;
1232 return SCHEME_V->strbuff; 1303 return SCHEME_V->strbuff;
1233 } 1304 }
1234 1305
1235 if (str) 1306 if (str)
1236 { 1307 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 1308 else
1246 {
1247 memset (q, fill, len_str); 1309 memset (q, fill, len_str);
1310
1248 q[len_str] = 0; 1311 q[len_str] = 0;
1249 }
1250 1312
1251 return q; 1313 return q;
1252} 1314}
1253 1315
1254INTERFACE pointer 1316INTERFACE pointer
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1330 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1331
1270 set_typeflag (x, T_STRING | T_ATOM); 1332 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272 strlength (x) = len; 1334 strlength (x) = len;
1335
1273 return x; 1336 return x;
1274} 1337}
1275 1338
1276INTERFACE pointer 1339INTERFACE pointer
1277mk_string (SCHEME_P_ const char *str) 1340mk_string (SCHEME_P_ const char *str)
1284{ 1347{
1285 return get_vector_object (SCHEME_A_ len, NIL); 1348 return get_vector_object (SCHEME_A_ len, NIL);
1286} 1349}
1287 1350
1288INTERFACE void 1351INTERFACE void
1289fill_vector (pointer vec, pointer obj) 1352fill_vector (pointer vec, uint32_t start, pointer obj)
1290{ 1353{
1291 int i; 1354 int i;
1292 1355
1293 for (i = 0; i < vec->object.vector.length; i++) 1356 for (i = start; i < veclength (vec); i++)
1294 vecvalue (vec)[i] = obj; 1357 vecvalue (vec)[i] = obj;
1295} 1358}
1296 1359
1360INTERFACE void
1361vector_resize (pointer vec, uint32_t newsize, pointer fill)
1362{
1363 uint32_t oldsize = veclength (vec);
1364 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1365 veclength (vec) = newsize;
1366 fill_vector (vec, oldsize, fill);
1367}
1368
1297INTERFACE pointer 1369INTERFACE pointer
1298vector_elem (pointer vec, uint32_t ielem) 1370vector_get (pointer vec, uint32_t ielem)
1299{ 1371{
1300 return vecvalue(vec)[ielem]; 1372 return vecvalue(vec)[ielem];
1301} 1373}
1302 1374
1303INTERFACE void 1375INTERFACE void
1304set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1376vector_set (pointer vec, uint32_t ielem, pointer a)
1305{ 1377{
1306 vecvalue(vec)[ielem] = a; 1378 vecvalue(vec)[ielem] = a;
1307} 1379}
1308 1380
1309/* get new symbol */ 1381/* get new symbol */
1321 1393
1322INTERFACE pointer 1394INTERFACE pointer
1323gensym (SCHEME_P) 1395gensym (SCHEME_P)
1324{ 1396{
1325 pointer x; 1397 pointer x;
1326
1327 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328 {
1329 char name[40] = "gensym-"; 1398 char name[40] = "gensym-";
1330 xnum (name + 7, SCHEME_V->gensym_cnt); 1399 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331 1400
1332 /* first check oblist */ 1401 return generate_symbol (SCHEME_A_ name);
1333 x = oblist_find_by_name (SCHEME_A_ name); 1402}
1334 1403
1335 if (x == NIL) 1404static int
1336 { 1405is_gensym (SCHEME_P_ pointer x)
1337 x = oblist_add_by_name (SCHEME_A_ name); 1406{
1338 return x; 1407 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1339 }
1340 }
1341
1342 return NIL;
1343} 1408}
1344 1409
1345/* make symbol or number atom from string */ 1410/* make symbol or number atom from string */
1346static pointer 1411static pointer
1347mk_atom (SCHEME_P_ char *q) 1412mk_atom (SCHEME_P_ char *q)
1401 } 1466 }
1402 else if ((c == 'e') || (c == 'E')) 1467 else if ((c == 'e') || (c == 'E'))
1403 { 1468 {
1404 if (!has_fp_exp) 1469 if (!has_fp_exp)
1405 { 1470 {
1406 has_dec_point = 1; /* decimal point illegal 1471 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1472 p++;
1409 1473
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1474 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1475 continue;
1412 } 1476 }
1500 1564
1501 if (ecb_expect_false (is_vector (p))) 1565 if (ecb_expect_false (is_vector (p)))
1502 { 1566 {
1503 int i; 1567 int i;
1504 1568
1505 for (i = 0; i < p->object.vector.length; i++) 1569 for (i = 0; i < veclength (p); i++)
1506 mark (vecvalue (p)[i]); 1570 mark (vecvalue (p)[i]);
1507 } 1571 }
1508 1572
1509 if (is_atom (p)) 1573 if (is_atom (p))
1510 goto E6; 1574 goto E6;
1592 /* garbage collect */ 1656 /* garbage collect */
1593 clrmark (NIL); 1657 clrmark (NIL);
1594 SCHEME_V->fcells = 0; 1658 SCHEME_V->fcells = 0;
1595 SCHEME_V->free_cell = NIL; 1659 SCHEME_V->free_cell = NIL;
1596 1660
1597 /* free-list is kept sorted by address so as to maintain consecutive 1661 uint32_t total = 0;
1598 ranges, if possible, for use with vectors. Here we scan the cells 1662
1599 (which are also kept sorted by address) downwards to build the 1663 /* Here we scan the cells to build the free-list. */
1600 free-list in sorted order.
1601 */
1602 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1664 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1603 { 1665 {
1604 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1666 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1667 total += SCHEME_V->cell_segsize [i];
1605 1668
1606 while (--p >= SCHEME_V->cell_seg[i]) 1669 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1607 { 1670 {
1608 if (is_mark (p)) 1671 if (is_mark (p))
1609 clrmark (p); 1672 clrmark (p);
1610 else 1673 else
1611 { 1674 {
1612 /* reclaim cell */ 1675 /* reclaim cell */
1613 if (typeflag (p) != T_FREE) 1676 if (typeflag (p) != T_PAIR)
1614 { 1677 {
1615 finalize_cell (SCHEME_A_ p); 1678 finalize_cell (SCHEME_A_ p);
1616 set_typeflag (p, T_FREE); 1679 set_typeflag (p, T_PAIR);
1617 set_car (p, NIL); 1680 set_car (p, NIL);
1618 } 1681 }
1619 1682
1620 ++SCHEME_V->fcells; 1683 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell); 1684 set_cdr (p, SCHEME_V->free_cell);
1623 } 1686 }
1624 } 1687 }
1625 } 1688 }
1626 1689
1627 if (SCHEME_V->gc_verbose) 1690 if (SCHEME_V->gc_verbose)
1691 {
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1692 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1693 }
1629} 1694}
1630 1695
1631static void 1696static void
1632finalize_cell (SCHEME_P_ pointer a) 1697finalize_cell (SCHEME_P_ pointer a)
1633{ 1698{
1634 /* TODO, fast bitmap check? */ 1699 /* TODO, fast bitmap check? */
1635 if (is_string (a)) 1700 if (is_string (a) || is_symbol (a))
1636 free (strvalue (a)); 1701 free (strvalue (a));
1637 else if (is_vector (a)) 1702 else if (is_vector (a))
1638 free (vecvalue (a)); 1703 free (vecvalue (a));
1639#if USE_PORTS 1704#if USE_PORTS
1640 else if (is_port (a)) 1705 else if (is_port (a))
2062#endif 2127#endif
2063} 2128}
2064 2129
2065/* read characters up to delimiter, but cater to character constants */ 2130/* read characters up to delimiter, but cater to character constants */
2066static char * 2131static char *
2067readstr_upto (SCHEME_P_ char *delim) 2132readstr_upto (SCHEME_P_ int skip, const char *delim)
2068{ 2133{
2069 char *p = SCHEME_V->strbuff; 2134 char *p = SCHEME_V->strbuff + skip;
2070 2135
2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2136 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072 2137
2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2138 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074 *p = 0; 2139 *p = 0;
2081 return SCHEME_V->strbuff; 2146 return SCHEME_V->strbuff;
2082} 2147}
2083 2148
2084/* read string expression "xxx...xxx" */ 2149/* read string expression "xxx...xxx" */
2085static pointer 2150static pointer
2086readstrexp (SCHEME_P) 2151readstrexp (SCHEME_P_ char delim)
2087{ 2152{
2088 char *p = SCHEME_V->strbuff; 2153 char *p = SCHEME_V->strbuff;
2089 int c; 2154 int c;
2090 int c1 = 0; 2155 int c1 = 0;
2091 enum
2092 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2156 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093 2157
2094 for (;;) 2158 for (;;)
2095 { 2159 {
2096 c = inchar (SCHEME_A); 2160 c = inchar (SCHEME_A);
2097 2161
2099 return S_F; 2163 return S_F;
2100 2164
2101 switch (state) 2165 switch (state)
2102 { 2166 {
2103 case st_ok: 2167 case st_ok:
2104 switch (c) 2168 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); 2169 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113 2170
2114 default: 2171 if (ecb_expect_false (c == '\\'))
2172 state = st_bsl;
2173 else
2115 *p++ = c; 2174 *p++ = c;
2116 break;
2117 }
2118 2175
2119 break; 2176 break;
2120 2177
2121 case st_bsl: 2178 case st_bsl:
2122 switch (c) 2179 switch (c)
2152 case 'r': 2209 case 'r':
2153 *p++ = '\r'; 2210 *p++ = '\r';
2154 state = st_ok; 2211 state = st_ok;
2155 break; 2212 break;
2156 2213
2157 case '"':
2158 *p++ = '"';
2159 state = st_ok;
2160 break;
2161
2162 default: 2214 default:
2163 *p++ = c; 2215 *p++ = c;
2164 state = st_ok; 2216 state = st_ok;
2165 break; 2217 break;
2166 } 2218 }
2167 2219
2168 break; 2220 break;
2169 2221
2170 case st_x1: 2222 case st_x1:
2171 case st_x2: 2223 case st_x2:
2172 c = toupper (c); 2224 c = tolower (c);
2173 2225
2174 if (c >= '0' && c <= 'F') 2226 if (c >= '0' && c <= '9')
2175 {
2176 if (c <= '9')
2177 c1 = (c1 << 4) + c - '0'; 2227 c1 = (c1 << 4) + c - '0';
2178 else 2228 else if (c >= 'a' && c <= 'f')
2179 c1 = (c1 << 4) + c - 'A' + 10; 2229 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 2230 else
2190 return S_F; 2231 return S_F;
2232
2233 if (state == st_x1)
2234 state = st_x2;
2235 else
2236 {
2237 *p++ = c1;
2238 state = st_ok;
2239 }
2191 2240
2192 break; 2241 break;
2193 2242
2194 case st_oct1: 2243 case st_oct1:
2195 case st_oct2: 2244 case st_oct2:
2199 backchar (SCHEME_A_ c); 2248 backchar (SCHEME_A_ c);
2200 state = st_ok; 2249 state = st_ok;
2201 } 2250 }
2202 else 2251 else
2203 { 2252 {
2204 if (state == st_oct2 && c1 >= 32) 2253 if (state == st_oct2 && c1 >= ' ')
2205 return S_F; 2254 return S_F;
2206 2255
2207 c1 = (c1 << 3) + (c - '0'); 2256 c1 = (c1 << 3) + (c - '0');
2208 2257
2209 if (state == st_oct1) 2258 if (state == st_oct1)
2214 state = st_ok; 2263 state = st_ok;
2215 } 2264 }
2216 } 2265 }
2217 2266
2218 break; 2267 break;
2219
2220 } 2268 }
2221 } 2269 }
2222} 2270}
2223 2271
2224/* check c is in chars */ 2272/* check c is in chars */
2225ecb_inline int 2273ecb_inline int
2226is_one_of (char *s, int c) 2274is_one_of (const char *s, int c)
2227{ 2275{
2228 if (c == EOF)
2229 return 1;
2230
2231 return !!strchr (s, c); 2276 return c == EOF || !!strchr (s, c);
2232} 2277}
2233 2278
2234/* skip white characters */ 2279/* skip white characters */
2235ecb_inline int 2280ecb_inline int
2236skipspace (SCHEME_P) 2281skipspace (SCHEME_P)
2238 int c, curr_line = 0; 2283 int c, curr_line = 0;
2239 2284
2240 do 2285 do
2241 { 2286 {
2242 c = inchar (SCHEME_A); 2287 c = inchar (SCHEME_A);
2288
2243#if SHOW_ERROR_LINE 2289#if SHOW_ERROR_LINE
2244 if (c == '\n') 2290 if (ecb_expect_false (c == '\n'))
2245 curr_line++; 2291 curr_line++;
2246#endif 2292#endif
2293
2294 if (ecb_expect_false (c == EOF))
2295 return c;
2247 } 2296 }
2248 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2297 while (is_one_of (WHITESPACE, c));
2249 2298
2250 /* record it */ 2299 /* record it */
2251#if SHOW_ERROR_LINE 2300#if SHOW_ERROR_LINE
2252 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2301 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2302 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254#endif 2303#endif
2255 2304
2256 if (c != EOF)
2257 {
2258 backchar (SCHEME_A_ c); 2305 backchar (SCHEME_A_ c);
2259 return 1; 2306 return 1;
2260 }
2261 else
2262 return EOF;
2263} 2307}
2264 2308
2265/* get token */ 2309/* get token */
2266static int 2310static int
2267token (SCHEME_P) 2311token (SCHEME_P)
2283 return TOK_RPAREN; 2327 return TOK_RPAREN;
2284 2328
2285 case '.': 2329 case '.':
2286 c = inchar (SCHEME_A); 2330 c = inchar (SCHEME_A);
2287 2331
2288 if (is_one_of (" \n\t", c)) 2332 if (is_one_of (WHITESPACE, c))
2289 return TOK_DOT; 2333 return TOK_DOT;
2290 else 2334 else
2291 { 2335 {
2292 //TODO: ungetc twice in a row is not supported in C
2293 backchar (SCHEME_A_ c); 2336 backchar (SCHEME_A_ c);
2294 backchar (SCHEME_A_ '.');
2295 return TOK_ATOM; 2337 return TOK_DOTATOM;
2296 } 2338 }
2339
2340 case '|':
2341 return TOK_STRATOM;
2297 2342
2298 case '\'': 2343 case '\'':
2299 return TOK_QUOTE; 2344 return TOK_QUOTE;
2300 2345
2301 case ';': 2346 case ';':
2433 } 2478 }
2434 2479
2435 putcharacter (SCHEME_A_ '"'); 2480 putcharacter (SCHEME_A_ '"');
2436} 2481}
2437 2482
2438
2439/* print atoms */ 2483/* print atoms */
2440static void 2484static void
2441printatom (SCHEME_P_ pointer l, int f) 2485printatom (SCHEME_P_ pointer l, int f)
2442{ 2486{
2443 char *p; 2487 char *p;
2444 int len; 2488 int len;
2445 2489
2446 atom2str (SCHEME_A_ l, f, &p, &len); 2490 atom2str (SCHEME_A_ l, f, &p, &len);
2447 putchars (SCHEME_A_ p, len); 2491 putchars (SCHEME_A_ p, len);
2448} 2492}
2449
2450 2493
2451/* Uses internal buffer unless string pointer is already available */ 2494/* Uses internal buffer unless string pointer is already available */
2452static void 2495static void
2453atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454{ 2497{
2615#endif 2658#endif
2616 } 2659 }
2617 else if (is_continuation (l)) 2660 else if (is_continuation (l))
2618 p = "#<CONTINUATION>"; 2661 p = "#<CONTINUATION>";
2619 else 2662 else
2663 {
2664#if USE_PRINTF
2665 p = SCHEME_V->strbuff;
2666 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2667#else
2620 p = "#<ERROR>"; 2668 p = "#<ERROR>";
2669#endif
2670 }
2621 2671
2622 *pp = p; 2672 *pp = p;
2623 *plen = strlen (p); 2673 *plen = strlen (p);
2624} 2674}
2625 2675
2769/* () is #t in R5RS */ 2819/* () is #t in R5RS */
2770#define is_true(p) ((p) != S_F) 2820#define is_true(p) ((p) != S_F)
2771#define is_false(p) ((p) == S_F) 2821#define is_false(p) ((p) == S_F)
2772 2822
2773/* ========== Environment implementation ========== */ 2823/* ========== 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 2824
2790#ifndef USE_ALIST_ENV 2825#ifndef USE_ALIST_ENV
2791 2826
2792/* 2827/*
2793 * In this implementation, each frame of the environment may be 2828 * In this implementation, each frame of the environment may be
2810 2845
2811 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2846 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812 setenvironment (SCHEME_V->envir); 2847 setenvironment (SCHEME_V->envir);
2813} 2848}
2814 2849
2850static uint32_t
2851sym_hash (pointer sym, uint32_t size)
2852{
2853 uintptr_t ptr = (uintptr_t)sym;
2854
2855#if 0
2856 /* table size is prime, so why mix */
2857 ptr += ptr >> 32;
2858 ptr += ptr >> 16;
2859 ptr += ptr >> 8;
2860#endif
2861
2862 return ptr % size;
2863}
2864
2815ecb_inline void 2865ecb_inline void
2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2866new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817{ 2867{
2818 pointer slot = immutable_cons (variable, value); 2868 pointer slot = immutable_cons (variable, value);
2819 2869
2820 if (is_vector (car (env))) 2870 if (is_vector (car (env)))
2821 { 2871 {
2822 int location = hash_fn (symname (variable), veclength (car (env))); 2872 int location = sym_hash (variable, veclength (car (env)));
2823
2824 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2873 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825 } 2874 }
2826 else 2875 else
2827 set_car (env, immutable_cons (slot, car (env))); 2876 set_car (env, immutable_cons (slot, car (env)));
2828} 2877}
2829 2878
2830static pointer 2879static pointer
2831find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2880find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832{ 2881{
2833 pointer x, y; 2882 pointer x, y;
2834 int location;
2835 2883
2836 for (x = env; x != NIL; x = cdr (x)) 2884 for (x = env; x != NIL; x = cdr (x))
2837 { 2885 {
2838 if (is_vector (car (x))) 2886 if (is_vector (car (x)))
2839 { 2887 {
2840 location = hash_fn (symname (hdl), veclength (car (x))); 2888 int location = sym_hash (hdl, veclength (car (x)));
2841 y = vector_elem (car (x), location); 2889 y = vector_get (car (x), location);
2842 } 2890 }
2843 else 2891 else
2844 y = car (x); 2892 y = car (x);
2845 2893
2846 for (; y != NIL; y = cdr (y)) 2894 for (; y != NIL; y = cdr (y))
2847 if (caar (y) == hdl) 2895 if (caar (y) == hdl)
2848 break; 2896 break;
2849 2897
2850 if (y != NIL) 2898 if (y != NIL)
2899 return car (y);
2900
2901 if (!all)
2851 break; 2902 break;
2852
2853 if (!all)
2854 return NIL;
2855 } 2903 }
2856
2857 if (x != NIL)
2858 return car (y);
2859 2904
2860 return NIL; 2905 return NIL;
2861} 2906}
2862 2907
2863#else /* USE_ALIST_ENV */ 2908#else /* USE_ALIST_ENV */
2885 for (y = car (x); y != NIL; y = cdr (y)) 2930 for (y = car (x); y != NIL; y = cdr (y))
2886 if (caar (y) == hdl) 2931 if (caar (y) == hdl)
2887 break; 2932 break;
2888 2933
2889 if (y != NIL) 2934 if (y != NIL)
2935 return car (y);
2890 break; 2936 break;
2891 2937
2892 if (!all) 2938 if (!all)
2893 return NIL; 2939 break;
2894 } 2940 }
2895
2896 if (x != NIL)
2897 return car (y);
2898 2941
2899 return NIL; 2942 return NIL;
2900} 2943}
2901 2944
2902#endif /* USE_ALIST_ENV else */ 2945#endif /* USE_ALIST_ENV else */
2903 2946
2904ecb_inline void 2947ecb_inline void
2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2948new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906{ 2949{
2950 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2951 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908} 2952}
2909 2953
2910ecb_inline void 2954ecb_inline void
2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2955set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3119 int i = 0; 3163 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3164 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3165
3122 while (cont != NIL) 3166 while (cont != NIL)
3123 { 3167 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3168 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3169 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3170 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3171 frame->code = car (cont) ; cont = cdr (cont);
3128 3172
3129 ++frame; 3173 ++frame;
3130 ++i; 3174 ++i;
3131 } 3175 }
3132 3176
3161 SCHEME_V->value = a; 3205 SCHEME_V->value = a;
3162 3206
3163 if (dump == NIL) 3207 if (dump == NIL)
3164 return -1; 3208 return -1;
3165 3209
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3210 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3211 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3212 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3213 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3214
3171 SCHEME_V->dump = dump; 3215 SCHEME_V->dump = dump;
3172 3216
3173 return 0; 3217 return 0;
3174} 3218}
3203 3247
3204#endif 3248#endif
3205 3249
3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3250#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3207 3251
3252#if EXPERIMENT
3253static int
3254debug (SCHEME_P_ int indent, pointer x)
3255{
3256 int c;
3257
3258 if (is_syntax (x))
3259 {
3260 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3261 return 8 + 8;
3262 }
3263
3264 if (x == NIL)
3265 {
3266 printf ("%*sNIL\n", indent, "");
3267 return 3;
3268 }
3269
3270 switch (type (x))
3271 {
3272 case T_INTEGER:
3273 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3274 return 32+8;
3275
3276 case T_SYMBOL:
3277 printf ("%*sS<%s>\n", indent, "", symname (x));
3278 return 24+8;
3279
3280 case T_CLOSURE:
3281 printf ("%*sS<%s>\n", indent, "", "closure");
3282 debug (SCHEME_A_ indent + 3, cdr(x));
3283 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3284
3285 case T_PAIR:
3286 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3287 c = debug (SCHEME_A_ indent + 3, car (x));
3288 c += debug (SCHEME_A_ indent + 3, cdr (x));
3289 return c + 1;
3290
3291 case T_PORT:
3292 printf ("%*sS<%s>\n", indent, "", "port");
3293 return 24+8;
3294
3295 case T_VECTOR:
3296 printf ("%*sS<%s>\n", indent, "", "vector");
3297 return 24+8;
3298
3299 case T_ENVIRONMENT:
3300 printf ("%*sS<%s>\n", indent, "", "environment");
3301 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3302
3303 default:
3304 printf ("unhandled type %d\n", type (x));
3305 break;
3306 }
3307}
3308#endif
3309
3208static int 3310static int
3209opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3311opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210{ 3312{
3211 pointer args = SCHEME_V->args; 3313 pointer args = SCHEME_V->args;
3212 pointer x, y; 3314 pointer x, y;
3213 3315
3214 switch (op) 3316 switch (op)
3215 { 3317 {
3318#if EXPERIMENT //D
3319 case OP_DEBUG:
3320 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3321 printf ("\n");
3322 s_return (S_T);
3323#endif
3216 case OP_LOAD: /* load */ 3324 case OP_LOAD: /* load */
3217 if (file_interactive (SCHEME_A)) 3325 if (file_interactive (SCHEME_A))
3218 { 3326 {
3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3327 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3328 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3343 } 3451 }
3344 else 3452 else
3345 s_return (SCHEME_V->code); 3453 s_return (SCHEME_V->code);
3346 3454
3347 case OP_E0ARGS: /* eval arguments */ 3455 case OP_E0ARGS: /* eval arguments */
3348 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3456 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349 { 3457 {
3350 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3458 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3459 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352 SCHEME_V->code = SCHEME_V->value; 3460 SCHEME_V->code = SCHEME_V->value;
3353 s_goto (OP_APPLY); 3461 s_goto (OP_APPLY);
3380 3488
3381 case OP_TRACING: 3489 case OP_TRACING:
3382 { 3490 {
3383 int tr = SCHEME_V->tracing; 3491 int tr = SCHEME_V->tracing;
3384 3492
3385 SCHEME_V->tracing = ivalue (car (args)); 3493 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3494 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3495 }
3388 3496
3389#endif 3497#endif
3390 3498
3909{ 4017{
3910 pointer args = SCHEME_V->args; 4018 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 4019 pointer x = car (args);
3912 num v; 4020 num v;
3913 4021
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 4022 switch (op)
3919 { 4023 {
3920#if USE_MATH 4024#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 4025 case OP_INEX2EX: /* inexact->exact */
4026 {
3922 if (is_integer (x)) 4027 if (is_integer (x))
3923 s_return (x); 4028 s_return (x);
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 4029
4030 RVALUE r = rvalue_unchecked (x);
4031
4032 if (r == (RVALUE)(IVALUE)r)
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4033 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3926 else 4034 else
3927 Error_1 ("inexact->exact: not integral:", x); 4035 Error_1 ("inexact->exact: not integral:", x);
4036 }
3928 4037
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4038 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)))); 4039 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)))); 4040 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)))); 4041 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3966 /* If the test fails, result is too big for integer. */ 4075 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4076 if (!real_result)
3968 { 4077 {
3969 long result_as_long = result; 4078 long result_as_long = result;
3970 4079
3971 if (result != (RVALUE) result_as_long) 4080 if (result != result_as_long)
3972 real_result = 1; 4081 real_result = 1;
3973 } 4082 }
3974 4083
3975 if (real_result) 4084 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4085 s_return (mk_real (SCHEME_A_ result));
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4090 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)))); 4091 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983 4092
3984 case OP_TRUNCATE: 4093 case OP_TRUNCATE:
3985 { 4094 {
3986 RVALUE rvalue_of_x; 4095 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))); 4096 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 } 4097 }
3995 4098
3996 case OP_ROUND: 4099 case OP_ROUND:
3997 if (num_is_integer (x)) 4100 if (is_integer (x))
3998 s_return (x); 4101 s_return (x);
3999 4102
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4103 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4104#endif
4002 4105
4122 } 4225 }
4123 else 4226 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4227 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4228
4126 case OP_CHAR2INT: /* char->integer */ 4229 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4230 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4231
4129 case OP_INT2CHAR: /* integer->char */ 4232 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4233 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4234
4132 case OP_CHARUPCASE: 4235 case OP_CHARUPCASE:
4133 { 4236 {
4134 unsigned char c = ivalue (x); 4237 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4238 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4239 s_return (mk_character (SCHEME_A_ c));
4137 } 4240 }
4138 4241
4139 case OP_CHARDNCASE: 4242 case OP_CHARDNCASE:
4140 { 4243 {
4141 unsigned char c = ivalue (x); 4244 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4245 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4246 s_return (mk_character (SCHEME_A_ c));
4144 } 4247 }
4145 4248
4146 case OP_STR2SYM: /* string->symbol */ 4249 case OP_STR2SYM: /* string->symbol */
4223 Error_1 ("atom->string: not an atom:", x); 4326 Error_1 ("atom->string: not an atom:", x);
4224 } 4327 }
4225 4328
4226 case OP_MKSTRING: /* make-string */ 4329 case OP_MKSTRING: /* make-string */
4227 { 4330 {
4228 int fill = ' '; 4331 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4332 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4333
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4334 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4335 }
4238 4336
4239 case OP_STRLEN: /* string-length */ 4337 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4338 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4339
4242 case OP_STRREF: /* string-ref */ 4340 case OP_STRREF: /* string-ref */
4243 { 4341 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4342 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4343 int index = ivalue_unchecked (cadr (args));
4250 4344
4251 if (index >= strlength (x)) 4345 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4346 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4347
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4348 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4349 }
4256 4350
4257 case OP_STRSET: /* string-set! */ 4351 case OP_STRSET: /* string-set! */
4258 { 4352 {
4259 char *str; 4353 char *str = strvalue (x);
4260 int index; 4354 int index = ivalue_unchecked (cadr (args));
4261 int c; 4355 int c;
4262 4356
4263 if (is_immutable (x)) 4357 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4358 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4359
4270 if (index >= strlength (x)) 4360 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4361 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4362
4273 c = charvalue (caddr (args)); 4363 c = charvalue (caddr (args));
4296 s_return (newstr); 4386 s_return (newstr);
4297 } 4387 }
4298 4388
4299 case OP_SUBSTR: /* substring */ 4389 case OP_SUBSTR: /* substring */
4300 { 4390 {
4301 char *str; 4391 char *str = strvalue (x);
4302 int index0; 4392 int index0 = ivalue_unchecked (cadr (args));
4303 int index1; 4393 int index1;
4304 int len; 4394 int len;
4305 4395
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4396 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4397 Error_1 ("substring: start out of bounds:", cadr (args));
4312 4398
4313 if (cddr (args) != NIL) 4399 if (cddr (args) != NIL)
4314 { 4400 {
4315 index1 = ivalue (caddr (args)); 4401 index1 = ivalue_unchecked (caddr (args));
4316 4402
4317 if (index1 > strlength (x) || index1 < index0) 4403 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4404 Error_1 ("substring: end out of bounds:", caddr (args));
4319 } 4405 }
4320 else 4406 else
4343 if (SCHEME_V->no_memory) 4429 if (SCHEME_V->no_memory)
4344 s_return (S_SINK); 4430 s_return (S_SINK);
4345#endif 4431#endif
4346 4432
4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4433 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348 set_vector_elem (vec, i, car (x)); 4434 vector_set (vec, i, car (x));
4349 4435
4350 s_return (vec); 4436 s_return (vec);
4351 } 4437 }
4352 4438
4353 case OP_MKVECTOR: /* make-vector */ 4439 case OP_MKVECTOR: /* make-vector */
4354 { 4440 {
4355 pointer fill = NIL; 4441 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4442 pointer vec;
4358
4359 len = ivalue (x); 4443 int len = ivalue_unchecked (x);
4360 4444
4361 if (cdr (args) != NIL) 4445 if (cdr (args) != NIL)
4362 fill = cadr (args); 4446 fill = cadr (args);
4363 4447
4364 vec = mk_vector (SCHEME_A_ len); 4448 vec = mk_vector (SCHEME_A_ len);
4367 if (SCHEME_V->no_memory) 4451 if (SCHEME_V->no_memory)
4368 s_return (S_SINK); 4452 s_return (S_SINK);
4369#endif 4453#endif
4370 4454
4371 if (fill != NIL) 4455 if (fill != NIL)
4372 fill_vector (vec, fill); 4456 fill_vector (vec, 0, fill);
4373 4457
4374 s_return (vec); 4458 s_return (vec);
4375 } 4459 }
4376 4460
4377 case OP_VECLEN: /* vector-length */ 4461 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4462 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4463
4464 case OP_VECRESIZE:
4465 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4466 s_return (x);
4467
4380 case OP_VECREF: /* vector-ref */ 4468 case OP_VECREF: /* vector-ref */
4381 { 4469 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4470 int index = ivalue_unchecked (cadr (args));
4385 4471
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4472 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4473 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4474
4389 s_return (vector_elem (x, index)); 4475 s_return (vector_get (x, index));
4390 } 4476 }
4391 4477
4392 case OP_VECSET: /* vector-set! */ 4478 case OP_VECSET: /* vector-set! */
4393 { 4479 {
4394 int index; 4480 int index = ivalue_unchecked (cadr (args));
4395 4481
4396 if (is_immutable (x)) 4482 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4483 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398 4484
4399 index = ivalue (cadr (args));
4400
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4485 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4486 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4487
4404 set_vector_elem (x, index, caddr (args)); 4488 vector_set (x, index, caddr (args));
4405 s_return (x); 4489 s_return (x);
4406 } 4490 }
4407 } 4491 }
4408 4492
4409 if (USE_ERROR_CHECKING) abort (); 4493 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} 4494}
4465 4495
4466static int 4496static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4497opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4498{
4502 pointer d = cdr (args); 4532 pointer d = cdr (args);
4503 int r; 4533 int r;
4504 4534
4505 switch (op) 4535 switch (op)
4506 { 4536 {
4507 case OP_NOT: /* not */ r = is_false (a) ; break; 4537 case OP_NOT: /* not */ r = is_false (a) ; break;
4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4538 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4539 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break; 4540 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4541 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4542 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4543 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4544 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4545 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4546 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4547 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4548
4518#if USE_CHAR_CLASSIFIERS 4549#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4550 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4551 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4552 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4553 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4554 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4555#endif
4525 4556
4526#if USE_PORTS 4557#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4558 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4559 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4729 4760
4730 case OP_NEWSEGMENT: /* new-segment */ 4761 case OP_NEWSEGMENT: /* new-segment */
4731 if (!is_pair (args) || !is_number (a)) 4762 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 4763 Error_0 ("new-segment: argument must be a number");
4733 4764
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4765 alloc_cellseg (SCHEME_A_ ivalue (a));
4735 4766
4736 s_return (S_T); 4767 s_return (S_T);
4737 4768
4738 case OP_OBLIST: /* oblist */ 4769 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 4770 s_return (oblist_all_symbols (SCHEME_A));
4997 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5028 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 5029 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 5030 s_goto (OP_RDSEXPR);
5000 5031
5001 case TOK_ATOM: 5032 case TOK_ATOM:
5002 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5033 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5034
5035 case TOK_DOTATOM:
5036 SCHEME_V->strbuff[0] = '.';
5037 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5038
5039 case TOK_STRATOM:
5040 x = readstrexp (SCHEME_A_ '|');
5041 //TODO: haven't checked whether the garbage collector could interfere
5042 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003 5043
5004 case TOK_DQUOTE: 5044 case TOK_DQUOTE:
5005 x = readstrexp (SCHEME_A); 5045 x = readstrexp (SCHEME_A_ '"');
5006 5046
5007 if (x == S_F) 5047 if (x == S_F)
5008 Error_0 ("Error reading string"); 5048 Error_0 ("Error reading string");
5009 5049
5010 setimmutable (x); 5050 setimmutable (x);
5022 s_goto (OP_EVAL); 5062 s_goto (OP_EVAL);
5023 } 5063 }
5024 } 5064 }
5025 5065
5026 case TOK_SHARP_CONST: 5066 case TOK_SHARP_CONST:
5027 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5067 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028 Error_0 ("undefined sharp expression"); 5068 Error_0 ("undefined sharp expression");
5029 else 5069 else
5030 s_return (x); 5070 s_return (x);
5031 5071
5032 default: 5072 default:
5184 putstr (SCHEME_A_ ")"); 5224 putstr (SCHEME_A_ ")");
5185 s_return (S_T); 5225 s_return (S_T);
5186 } 5226 }
5187 else 5227 else
5188 { 5228 {
5189 pointer elem = vector_elem (vec, i); 5229 pointer elem = vector_get (vec, i);
5190 5230
5191 ivalue_unchecked (cdr (args)) = i + 1; 5231 ivalue_unchecked (cdr (args)) = i + 1;
5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5232 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193 SCHEME_V->args = elem; 5233 SCHEME_V->args = elem;
5194 5234
5254 5294
5255 case OP_CLOSUREP: /* closure? */ 5295 case OP_CLOSUREP: /* closure? */
5256 /* 5296 /*
5257 * Note, macro object is also a closure. 5297 * Note, macro object is also a closure.
5258 * Therefore, (closure? <#MACRO>) ==> #t 5298 * Therefore, (closure? <#MACRO>) ==> #t
5299 * (schmorp) well, obviously not, fix? TODO
5259 */ 5300 */
5260 s_retbool (is_closure (a)); 5301 s_retbool (is_closure (a));
5261 5302
5262 case OP_MACROP: /* macro? */ 5303 case OP_MACROP: /* macro? */
5263 s_retbool (is_macro (a)); 5304 s_retbool (is_macro (a));
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5310/* 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); 5311typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5312
5272typedef int (*test_predicate)(pointer); 5313typedef int (*test_predicate)(pointer);
5273static int 5314static int
5274is_any (pointer p) 5315tst_any (pointer p)
5275{ 5316{
5276 return 1; 5317 return 1;
5277} 5318}
5278 5319
5279static int 5320static int
5280is_nonneg (pointer p) 5321tst_inonneg (pointer p)
5281{ 5322{
5282 return ivalue (p) >= 0 && is_integer (p); 5323 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5324}
5284 5325
5285static int 5326static int
5286tst_is_list (pointer p) 5327tst_is_list (SCHEME_P_ pointer p)
5287{ 5328{
5288 return p == NIL || is_pair (p); 5329 return p == NIL || is_pair (p);
5289} 5330}
5290 5331
5291/* Correspond carefully with following defines! */ 5332/* Correspond carefully with following defines! */
5292static struct 5333static struct
5293{ 5334{
5294 test_predicate fct; 5335 test_predicate fct;
5295 const char *kind; 5336 const char *kind;
5296} tests[] = 5337} tests[] = {
5297{
5298 { is_any, 0 }, 5338 { tst_any , 0 },
5299 { is_string, "string" }, 5339 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5340 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5341 { is_port , "port" },
5302 { is_inport, "input port" }, 5342 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5343 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5344 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5345 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5346 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5347 { is_character , "character" },
5308 { is_vector, "vector" }, 5348 { is_vector , "vector" },
5309 { is_number, "number" }, 5349 { is_number , "number" },
5310 { is_integer, "integer" }, 5350 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5351 { tst_inonneg , "non-negative integer" }
5312}; 5352};
5313 5353
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5354#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5355#define TST_ANY "\001"
5316#define TST_STRING "\002" 5356#define TST_STRING "\002"
5357typedef struct 5397typedef struct
5358{ 5398{
5359 uint8_t func; 5399 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5400 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5401 uint8_t builtin;
5402#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5403 uint8_t min_arity;
5363 uint8_t max_arity; 5404 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5405 char arg_tests_encoding[3];
5406#endif
5365} op_code_info; 5407} op_code_info;
5366 5408
5367static const op_code_info dispatch_table[] = { 5409static const op_code_info dispatch_table[] = {
5410#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5411#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5412#else
5413#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5414#endif
5369#include "opdefines.h" 5415#include "opdefines.h"
5370#undef OP_DEF 5416#undef OP_DEF
5371 {0} 5417 {0}
5372}; 5418};
5373 5419
5415 { 5461 {
5416 pointer arg = car (arglist); 5462 pointer arg = car (arglist);
5417 5463
5418 j = t[0]; 5464 j = t[0];
5419 5465
5466 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5467 if (j == TST_LIST[0])
5468 {
5469 if (!tst_is_list (SCHEME_A_ arg))
5470 break;
5471 }
5472 else
5473 {
5420 if (!tests[j - 1].fct (arg)) 5474 if (!tests[j - 1].fct (arg))
5421 break; 5475 break;
5476 }
5422 5477
5423 if (t[1]) /* last test is replicated as necessary */ 5478 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424 t++; 5479 t++;
5425 5480
5426 arglist = cdr (arglist); 5481 arglist = cdr (arglist);
5427 i++; 5482 i++;
5428 } 5483 }
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5538mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5539{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5540 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5541 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5542 ivalue_unchecked (y) = op;
5488 set_num_integer (y);
5489 return y; 5543 return y;
5490} 5544}
5491 5545
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5546/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5547static int
5494syntaxnum (pointer p) 5548syntaxnum (pointer p)
5495{ 5549{
5496 const char *s = strvalue (car (p)); 5550 const char *s = strvalue (p);
5497 5551
5498 switch (strlength (car (p))) 5552 switch (strlength (p))
5499 { 5553 {
5500 case 2: 5554 case 2:
5501 if (s[0] == 'i') 5555 if (s[0] == 'i')
5502 return OP_IF0; /* if */ 5556 return OP_IF0; /* if */
5503 else 5557 else
5939# endif 5993# endif
5940 int fin; 5994 int fin;
5941 char *file_name = InitFile; 5995 char *file_name = InitFile;
5942 int retcode; 5996 int retcode;
5943 int isfile = 1; 5997 int isfile = 1;
5998 system ("ps v $PPID");//D
5944 5999
5945 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6000 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946 { 6001 {
5947 xwrstr ("Usage: tinyscheme -?\n"); 6002 xwrstr ("Usage: tinyscheme -?\n");
5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6003 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines