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.33 by root, Sat Nov 28 10:59:14 2015 UTC vs.
Revision 1.54 by root, Tue Dec 1 02:42:35 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
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
34 38
35#include <sys/types.h> 39#include <sys/types.h>
36#include <sys/stat.h> 40#include <sys/stat.h>
37#include <fcntl.h> 41#include <fcntl.h>
38 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
39#include <string.h> 49#include <string.h>
40#include <stdlib.h>
41 50
42#include <limits.h> 51#include <limits.h>
43#include <inttypes.h> 52#include <inttypes.h>
44#include <float.h> 53#include <float.h>
45//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
46 63
47enum { 64enum {
48 TOK_EOF, 65 TOK_EOF,
49 TOK_LPAREN, 66 TOK_LPAREN,
50 TOK_RPAREN, 67 TOK_RPAREN,
51 TOK_DOT, 68 TOK_DOT,
52 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 72 TOK_QUOTE,
54 TOK_DQUOTE, 73 TOK_DQUOTE,
55 TOK_BQUOTE, 74 TOK_BQUOTE,
56 TOK_COMMA, 75 TOK_COMMA,
57 TOK_ATMARK, 76 TOK_ATMARK,
59 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
60 TOK_VEC 79 TOK_VEC
61}; 80};
62 81
63#define BACKQUOTE '`' 82#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
65 85
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 91
72#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
73static scheme sc; 93static scheme sc;
74#endif 94#endif
75 95
83 } 103 }
84 104
85 char *p = s; 105 char *p = s;
86 106
87 do { 107 do {
88 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 109 n /= base;
90 } while (n); 110 } while (n);
91 111
92 *p-- = 0; 112 *p-- = 0;
93 113
103{ 123{
104 xbase (s, n, 10); 124 xbase (s, n, 10);
105} 125}
106 126
107static void 127static void
108xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 129{
116 char buf[64]; 130 char buf[64];
117 131
118 xnum (buf, n); 132 xnum (buf, n);
119 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
120} 134}
121 135
122static char 136static char
123xtoupper (char c) 137xtoupper (char c)
124{ 138{
174# define prompt "ts> " 188# define prompt "ts> "
175#endif 189#endif
176 190
177#ifndef InitFile 191#ifndef InitFile
178# define InitFile "init.scm" 192# define InitFile "init.scm"
179#endif
180
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif 193#endif
184 194
185enum scheme_types 195enum scheme_types
186{ 196{
187 T_INTEGER, 197 T_INTEGER,
240static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
241static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
242static num num_rem (num a, num b); 252static num num_rem (num a, num b);
243static num num_mod (num a, num b); 253static num num_mod (num a, num b);
244 254
245#if USE_MATH
246static double round_per_R5RS (double x);
247#endif
248static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
249 256
250static num num_zero; 257static num num_zero;
251static num num_one; 258static num num_one;
252 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
253/* macros for cell operations */ 264/* macros for cell operations */
254#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
255#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
256#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
257 268
258INTERFACE int 269INTERFACE int
259is_string (pointer p) 270is_string (pointer p)
260{ 271{
261 return type (p) == T_STRING; 272 return type (p) == T_STRING;
262} 273}
263 274
264#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
265#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
266 277
267INTERFACE int 278INTERFACE int
268is_vector (pointer p) 279is_vector (pointer p)
269{ 280{
270 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
271} 282}
272 283
273#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
274#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
278 289
279INTERFACE int 290INTERFACE int
305string_value (pointer p) 316string_value (pointer p)
306{ 317{
307 return strvalue (p); 318 return strvalue (p);
308} 319}
309 320
310#define ivalue_unchecked(p) (p)->object.ivalue 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
311#define set_ivalue(p,v) (p)->object.ivalue = (v) 322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
312 323
313#if USE_REAL 324#if USE_REAL
314#define rvalue_unchecked(p) (p)->object.rvalue 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
315#define set_rvalue(p,v) (p)->object.rvalue = (v) 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
316#else 327#else
317#define rvalue_unchecked(p) (p)->object.ivalue 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
318#define set_rvalue(p,v) (p)->object.ivalue = (v) 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
319#endif 330#endif
320 331
321INTERFACE long 332INTERFACE long
322charvalue (pointer p) 333charvalue (pointer p)
323{ 334{
324 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
325} 336}
326 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
327INTERFACE int 340INTERFACE int
328is_port (pointer p) 341is_port (pointer p)
329{ 342{
330 return type (p) == T_PORT; 343 return type (p) == T_PORT;
331} 344}
332 345
333INTERFACE int 346INTERFACE int
334is_inport (pointer p) 347is_inport (pointer p)
335{ 348{
336 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
337} 350}
338 351
339INTERFACE int 352INTERFACE int
340is_outport (pointer p) 353is_outport (pointer p)
341{ 354{
342 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
343} 356}
344 357
345INTERFACE int 358INTERFACE int
346is_pair (pointer p) 359is_pair (pointer p)
347{ 360{
348 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
349} 362}
350 363
351#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
352#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
353 366
354static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
355static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
356static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
357static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
361static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 375
363INTERFACE void 376INTERFACE void
364set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
365{ 378{
366 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
367} 380}
368 381
369INTERFACE void 382INTERFACE void
370set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
371{ 384{
372 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
373} 386}
374 387
375INTERFACE pointer 388INTERFACE pointer
376pair_car (pointer p) 389pair_car (pointer p)
377{ 390{
391} 404}
392 405
393INTERFACE char * 406INTERFACE char *
394symname (pointer p) 407symname (pointer p)
395{ 408{
396 return strvalue (car (p)); 409 return strvalue (p);
397} 410}
398 411
399#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
400SCHEME_EXPORT int 415SCHEME_EXPORT int
401hasprop (pointer p) 416hasprop (pointer p)
402{ 417{
403 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
404} 419}
405
406# define symprop(p) cdr(p)
407#endif 420#endif
408 421
409INTERFACE int 422INTERFACE int
410is_syntax (pointer p) 423is_syntax (pointer p)
411{ 424{
425} 438}
426 439
427INTERFACE char * 440INTERFACE char *
428syntaxname (pointer p) 441syntaxname (pointer p)
429{ 442{
430 return strvalue (car (p)); 443 return strvalue (p);
431} 444}
432 445
433#define procnum(p) ivalue_unchecked (p) 446#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 447static const char *procname (pointer x);
435 448
651#endif 664#endif
652 665
653static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
654static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
655static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
656ecb_inline int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
657static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
660static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
662static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
678static void mark (pointer a); 691static void mark (pointer a);
679static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
680static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
681static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
682static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
683static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
685ecb_inline int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
686static int token (SCHEME_P); 699static int token (SCHEME_P);
687static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
856 } 869 }
857 870
858 return ret; 871 return ret;
859} 872}
860 873
861#if USE_MATH
862
863/* Round to nearest. Round to even if midway */
864static double
865round_per_R5RS (double x)
866{
867 double fl = floor (x);
868 double ce = ceil (x);
869 double dfl = x - fl;
870 double dce = ce - x;
871
872 if (dfl > dce)
873 return ce;
874 else if (dfl < dce)
875 return fl;
876 else
877 {
878 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl;
880 else
881 return ce;
882 }
883}
884#endif
885
886static int 874static int
887is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
888{ 876{
889 return x == 0; 877 return x == 0;
890#if 0 878#if 0
896#endif 884#endif
897} 885}
898 886
899/* allocate new cell segment */ 887/* allocate new cell segment */
900static int 888static int
901alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
902{ 890{
903 pointer newp; 891 struct cell *newp;
904 pointer last; 892 struct cell *last;
905 pointer p; 893 struct cell *p;
906 char *cp; 894 char *cp;
907 long i; 895 long i;
908 int k; 896 int k;
909 897
910 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
911 segsize <<= 1; 899 segsize <<= 1;
912 900
913 for (k = 0; k < n; k++)
914 {
915 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
916 return k;
917
918 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
919 902
920 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
921 return k; 904 return k;
922 905
923 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
924 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
925 908
926 newp = (pointer)cp; 909 newp = (struct cell *)cp;
927 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
928 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
929 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
930 last = newp + segsize - 1; 913 last = newp + segsize - 1;
931 914
932 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
933 { 916 {
917 pointer cp = POINTER (p);
934 set_typeflag (p, T_PAIR); 918 set_typeflag (cp, T_PAIR);
935 set_car (p, NIL); 919 set_car (cp, NIL);
936 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
937 } 921 }
938 922
939 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
940 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
941 }
942 925
943 return n; 926 return 1;
944} 927}
945 928
946/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
947ecb_inline pointer 930ecb_inline pointer
948get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953 return S_SINK; 936 return S_SINK;
954 937
955 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
956 { 939 {
957 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
958 941
959 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
960 943
961 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
962 { 945 {
963 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
964 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
965 { 948 {
966#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
967 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
968 return S_SINK; 951 return S_SINK;
969#endif 952#endif
981 } 964 }
982} 965}
983 966
984/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
985 Tehom */ 968 Tehom */
986
987static void 969static void
988push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
989{ 971{
990 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
991 973
1013} 995}
1014 996
1015static pointer 997static pointer
1016get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017{ 999{
1018 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1020 1002
1021 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1022 return S_SINK; 1004 return S_SINK;
1023 1005
1024 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1025 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1026 1008
1027 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1028 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1029 fill_vector (v, 0, init); 1011 fill_vector (v, 0, init);
1030 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1031 1013
1032 return v; 1014 return v;
1033} 1015}
1042static void 1024static void
1043check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1044{ 1026{
1045 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1046 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1047 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1048 1030
1049 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1050 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1051} 1033}
1052 1034
1053static void 1035static void
1054check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1055{ 1037{
1077 set_cdr (x, b); 1059 set_cdr (x, b);
1078 1060
1079 return x; 1061 return x;
1080} 1062}
1081 1063
1064static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1082/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1083 1074
1084#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1085 1076
1086static int 1077static int
1103 1094
1104/* returns the new symbol */ 1095/* returns the new symbol */
1105static pointer 1096static pointer
1106oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1107{ 1098{
1108 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1109
1110 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1111 set_typeflag (x, T_SYMBOL);
1112 setimmutable (car (x));
1113
1114 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1115 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1116 return x; 1102 return x;
1117} 1103}
1118 1104
1119ecb_inline pointer 1105ecb_inline pointer
1179 1165
1180/* returns the new symbol */ 1166/* returns the new symbol */
1181static pointer 1167static pointer
1182oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1183{ 1169{
1184 pointer x = mk_string (SCHEME_A_ name); 1170 pointer x = generate_symbol (SCHEME_A_ name);
1185 set_typeflag (x, T_SYMBOL);
1186 setimmutable (x);
1187 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1188 return x; 1172 return x;
1189} 1173}
1190 1174
1191static pointer 1175static pointer
1201mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1202{ 1186{
1203 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1204 1188
1205 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1206 x->object.port = p; 1190 set_port (x, p);
1207 1191
1208 return x; 1192 return x;
1209} 1193}
1210#endif 1194#endif
1211 1195
1212pointer 1196pointer
1213mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1214{ 1198{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1200
1217 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1218 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1219 1203
1220 return x; 1204 return x;
1221} 1205}
1222 1206
1223INTERFACE pointer 1207INTERFACE pointer
1224mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1225{ 1209{
1226 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1227 1211
1228 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1229 set_ivalue (x, c & 0xff); 1213 set_ivalue (x, c & 0xff);
1230 1214
1231 return x; 1215 return x;
1232} 1216}
1233 1217
1234/* get number atom (integer) */ 1218/* get number atom (integer) */
1235INTERFACE pointer 1219INTERFACE pointer
1236mk_integer (SCHEME_P_ long n) 1220mk_integer (SCHEME_P_ long n)
1237{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1233
1240 set_typeflag (x, (T_INTEGER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1241 set_ivalue (x, n); 1236 set_ivalue (x, n);
1242 1237
1238 *pp = x;
1239 }
1240
1243 return x; 1241 return *pp;
1244} 1242}
1245 1243
1246INTERFACE pointer 1244INTERFACE pointer
1247mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1248{ 1246{
1249#if USE_REAL 1247#if USE_REAL
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1249
1252 set_typeflag (x, (T_REAL | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1253 set_rvalue (x, n); 1251 set_rvalue (x, n);
1254 1252
1255 return x; 1253 return x;
1256#else 1254#else
1257 return mk_integer (SCHEME_A_ n); 1255 return mk_integer (SCHEME_A_ n);
1281 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1282 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1283 } 1281 }
1284 1282
1285 if (str) 1283 if (str)
1286 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1287 int l = strlen (str);
1288
1289 if (l > len_str)
1290 l = len_str;
1291
1292 memcpy (q, str, l);
1293 q[l] = 0;
1294 }
1295 else 1285 else
1296 {
1297 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1298 q[len_str] = 0; 1288 q[len_str] = 0;
1299 }
1300 1289
1301 return q; 1290 return q;
1302} 1291}
1303 1292
1304INTERFACE pointer 1293INTERFACE pointer
1318 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1319 1308
1320 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1321 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1322 strlength (x) = len; 1311 strlength (x) = len;
1312
1323 return x; 1313 return x;
1324} 1314}
1325 1315
1326INTERFACE pointer 1316INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
1340{ 1330{
1341 int i; 1331 int i;
1342 1332
1343 for (i = start; i < veclength (vec); i++) 1333 for (i = start; i < veclength (vec); i++)
1344 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1335}
1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1345} 1344}
1346 1345
1347INTERFACE pointer 1346INTERFACE pointer
1348vector_get (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1349{ 1348{
1371 1370
1372INTERFACE pointer 1371INTERFACE pointer
1373gensym (SCHEME_P) 1372gensym (SCHEME_P)
1374{ 1373{
1375 pointer x; 1374 pointer x;
1376
1377 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1378 {
1379 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1380 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1381 1377
1382 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1383 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1384 1380
1385 if (x == NIL) 1381static int
1386 { 1382is_gensym (SCHEME_P_ pointer x)
1387 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1388 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1389 }
1390 }
1391
1392 return NIL;
1393} 1385}
1394 1386
1395/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1396static pointer 1388static pointer
1397mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1606 1598
1607/* garbage collection. parameter a, b is marked. */ 1599/* garbage collection. parameter a, b is marked. */
1608static void 1600static void
1609gc (SCHEME_P_ pointer a, pointer b) 1601gc (SCHEME_P_ pointer a, pointer b)
1610{ 1602{
1611 pointer p;
1612 int i; 1603 int i;
1613 1604
1614 if (SCHEME_V->gc_verbose) 1605 if (SCHEME_V->gc_verbose)
1615 putstr (SCHEME_A_ "gc..."); 1606 putstr (SCHEME_A_ "gc...");
1616 1607
1632 /* Mark recent objects the interpreter doesn't know about yet. */ 1623 /* Mark recent objects the interpreter doesn't know about yet. */
1633 mark (car (S_SINK)); 1624 mark (car (S_SINK));
1634 /* Mark any older stuff above nested C calls */ 1625 /* Mark any older stuff above nested C calls */
1635 mark (SCHEME_V->c_nest); 1626 mark (SCHEME_V->c_nest);
1636 1627
1628#if USE_INTCACHE
1629 /* mark intcache */
1630 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1631 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1632 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1633#endif
1634
1637 /* mark variables a, b */ 1635 /* mark variables a, b */
1638 mark (a); 1636 mark (a);
1639 mark (b); 1637 mark (b);
1640 1638
1641 /* garbage collect */ 1639 /* garbage collect */
1642 clrmark (NIL); 1640 clrmark (NIL);
1643 SCHEME_V->fcells = 0; 1641 SCHEME_V->fcells = 0;
1644 SCHEME_V->free_cell = NIL; 1642 SCHEME_V->free_cell = NIL;
1645 1643
1646 /* free-list is kept sorted by address so as to maintain consecutive 1644 if (SCHEME_V->gc_verbose)
1647 ranges, if possible, for use with vectors. Here we scan the cells 1645 putstr (SCHEME_A_ "freeing...");
1648 (which are also kept sorted by address) downwards to build the 1646
1649 free-list in sorted order. 1647 uint32_t total = 0;
1650 */ 1648
1649 /* Here we scan the cells to build the free-list. */
1651 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1652 { 1651 {
1653 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1652 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1653 struct cell *p;
1654 total += SCHEME_V->cell_segsize [i];
1654 1655
1655 while (--p >= SCHEME_V->cell_seg[i]) 1656 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1656 { 1657 {
1658 pointer c = POINTER (p);
1659
1657 if (is_mark (p)) 1660 if (is_mark (c))
1658 clrmark (p); 1661 clrmark (c);
1659 else 1662 else
1660 { 1663 {
1661 /* reclaim cell */ 1664 /* reclaim cell */
1662 if (typeflag (p) != T_PAIR) 1665 if (typeflag (c) != T_PAIR)
1663 { 1666 {
1664 finalize_cell (SCHEME_A_ p); 1667 finalize_cell (SCHEME_A_ c);
1665 set_typeflag (p, T_PAIR); 1668 set_typeflag (c, T_PAIR);
1666 set_car (p, NIL); 1669 set_car (c, NIL);
1667 } 1670 }
1668 1671
1669 ++SCHEME_V->fcells; 1672 ++SCHEME_V->fcells;
1670 set_cdr (p, SCHEME_V->free_cell); 1673 set_cdr (c, SCHEME_V->free_cell);
1671 SCHEME_V->free_cell = p; 1674 SCHEME_V->free_cell = c;
1672 } 1675 }
1673 } 1676 }
1674 } 1677 }
1675 1678
1676 if (SCHEME_V->gc_verbose) 1679 if (SCHEME_V->gc_verbose)
1677 { 1680 {
1678 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1681 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1679 } 1682 }
1680} 1683}
1681 1684
1682static void 1685static void
1683finalize_cell (SCHEME_P_ pointer a) 1686finalize_cell (SCHEME_P_ pointer a)
1684{ 1687{
1685 /* TODO, fast bitmap check? */ 1688 /* TODO, fast bitmap check? */
1686 if (is_string (a)) 1689 if (is_string (a) || is_symbol (a))
1687 free (strvalue (a)); 1690 free (strvalue (a));
1688 else if (is_vector (a)) 1691 else if (is_vector (a))
1689 free (vecvalue (a)); 1692 free (vecvalue (a));
1690#if USE_PORTS 1693#if USE_PORTS
1691 else if (is_port (a)) 1694 else if (is_port (a))
1692 { 1695 {
1693 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1696 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1694 port_close (SCHEME_A_ a, port_input | port_output); 1697 port_close (SCHEME_A_ a, port_input | port_output);
1695 1698
1696 free (a->object.port); 1699 free (port (a));
1697 } 1700 }
1698#endif 1701#endif
1699} 1702}
1700 1703
1701/* ========== Routines for Reading ========== */ 1704/* ========== Routines for Reading ========== */
1717 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1720 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1718 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1721 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1719 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1722 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1720 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1723 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1721 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1724 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1722 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1725 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1723 1726
1724#if SHOW_ERROR_LINE 1727#if SHOW_ERROR_LINE
1725 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1726 1729
1727 if (fname) 1730 if (fname)
1744 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1747 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1745#if USE_PORTS 1748#if USE_PORTS
1746 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1749 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1747#endif 1750#endif
1748 SCHEME_V->file_i--; 1751 SCHEME_V->file_i--;
1749 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1752 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1750 } 1753 }
1751} 1754}
1752 1755
1753static int 1756static int
1754file_interactive (SCHEME_P) 1757file_interactive (SCHEME_P)
1755{ 1758{
1756#if USE_PORTS 1759#if USE_PORTS
1757 return SCHEME_V->file_i == 0 1760 return SCHEME_V->file_i == 0
1758 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1761 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1759 && (SCHEME_V->inport->object.port->kind & port_file); 1762 && (port (SCHEME_V->inport)->kind & port_file);
1760#else 1763#else
1761 return 0; 1764 return 0;
1762#endif 1765#endif
1763} 1766}
1764 1767
1898} 1901}
1899 1902
1900static void 1903static void
1901port_close (SCHEME_P_ pointer p, int flag) 1904port_close (SCHEME_P_ pointer p, int flag)
1902{ 1905{
1903 port *pt = p->object.port; 1906 port *pt = port (p);
1904 1907
1905 pt->kind &= ~flag; 1908 pt->kind &= ~flag;
1906 1909
1907 if ((pt->kind & (port_input | port_output)) == 0) 1910 if ((pt->kind & (port_input | port_output)) == 0)
1908 { 1911 {
1929/* get new character from input file */ 1932/* get new character from input file */
1930static int 1933static int
1931inchar (SCHEME_P) 1934inchar (SCHEME_P)
1932{ 1935{
1933 int c; 1936 int c;
1934 port *pt; 1937 port *pt = port (SCHEME_V->inport);
1935
1936 pt = SCHEME_V->inport->object.port;
1937 1938
1938 if (pt->kind & port_saw_EOF) 1939 if (pt->kind & port_saw_EOF)
1939 return EOF; 1940 return EOF;
1940 1941
1941 c = basic_inchar (pt); 1942 c = basic_inchar (pt);
2008 port *pt; 2009 port *pt;
2009 2010
2010 if (c == EOF) 2011 if (c == EOF)
2011 return; 2012 return;
2012 2013
2013 pt = SCHEME_V->inport->object.port; 2014 pt = port (SCHEME_V->inport);
2014 pt->unget = c; 2015 pt->unget = c;
2015#else 2016#else
2016 if (c == EOF) 2017 if (c == EOF)
2017 return; 2018 return;
2018 2019
2046 2047
2047INTERFACE void 2048INTERFACE void
2048putstr (SCHEME_P_ const char *s) 2049putstr (SCHEME_P_ const char *s)
2049{ 2050{
2050#if USE_PORTS 2051#if USE_PORTS
2051 port *pt = SCHEME_V->outport->object.port; 2052 port *pt = port (SCHEME_V->outport);
2052 2053
2053 if (pt->kind & port_file) 2054 if (pt->kind & port_file)
2054 write (pt->rep.stdio.file, s, strlen (s)); 2055 write (pt->rep.stdio.file, s, strlen (s));
2055 else 2056 else
2056 for (; *s; s++) 2057 for (; *s; s++)
2058 *pt->rep.string.curr++ = *s; 2059 *pt->rep.string.curr++ = *s;
2059 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2060 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2060 *pt->rep.string.curr++ = *s; 2061 *pt->rep.string.curr++ = *s;
2061 2062
2062#else 2063#else
2063 xwrstr (s); 2064 write (pt->rep.stdio.file, s, strlen (s));
2064#endif 2065#endif
2065} 2066}
2066 2067
2067static void 2068static void
2068putchars (SCHEME_P_ const char *s, int len) 2069putchars (SCHEME_P_ const char *s, int len)
2069{ 2070{
2070#if USE_PORTS 2071#if USE_PORTS
2071 port *pt = SCHEME_V->outport->object.port; 2072 port *pt = port (SCHEME_V->outport);
2072 2073
2073 if (pt->kind & port_file) 2074 if (pt->kind & port_file)
2074 write (pt->rep.stdio.file, s, len); 2075 write (pt->rep.stdio.file, s, len);
2075 else 2076 else
2076 { 2077 {
2090 2091
2091INTERFACE void 2092INTERFACE void
2092putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2093{ 2094{
2094#if USE_PORTS 2095#if USE_PORTS
2095 port *pt = SCHEME_V->outport->object.port; 2096 port *pt = port (SCHEME_V->outport);
2096 2097
2097 if (pt->kind & port_file) 2098 if (pt->kind & port_file)
2098 { 2099 {
2099 char cc = c; 2100 char cc = c;
2100 write (pt->rep.stdio.file, &cc, 1); 2101 write (pt->rep.stdio.file, &cc, 1);
2113#endif 2114#endif
2114} 2115}
2115 2116
2116/* read characters up to delimiter, but cater to character constants */ 2117/* read characters up to delimiter, but cater to character constants */
2117static char * 2118static char *
2118readstr_upto (SCHEME_P_ char *delim) 2119readstr_upto (SCHEME_P_ int skip, const char *delim)
2119{ 2120{
2120 char *p = SCHEME_V->strbuff; 2121 char *p = SCHEME_V->strbuff + skip;
2121 2122
2122 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2123 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2123 2124
2124 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2125 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2125 *p = 0; 2126 *p = 0;
2132 return SCHEME_V->strbuff; 2133 return SCHEME_V->strbuff;
2133} 2134}
2134 2135
2135/* read string expression "xxx...xxx" */ 2136/* read string expression "xxx...xxx" */
2136static pointer 2137static pointer
2137readstrexp (SCHEME_P) 2138readstrexp (SCHEME_P_ char delim)
2138{ 2139{
2139 char *p = SCHEME_V->strbuff; 2140 char *p = SCHEME_V->strbuff;
2140 int c; 2141 int c;
2141 int c1 = 0; 2142 int c1 = 0;
2142 enum
2143 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2143 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2144 2144
2145 for (;;) 2145 for (;;)
2146 { 2146 {
2147 c = inchar (SCHEME_A); 2147 c = inchar (SCHEME_A);
2148 2148
2150 return S_F; 2150 return S_F;
2151 2151
2152 switch (state) 2152 switch (state)
2153 { 2153 {
2154 case st_ok: 2154 case st_ok:
2155 switch (c) 2155 if (ecb_expect_false (c == delim))
2156 {
2157 case '\\':
2158 state = st_bsl;
2159 break;
2160
2161 case '"':
2162 *p = 0;
2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2156 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2164 2157
2165 default: 2158 if (ecb_expect_false (c == '\\'))
2159 state = st_bsl;
2160 else
2166 *p++ = c; 2161 *p++ = c;
2167 break;
2168 }
2169 2162
2170 break; 2163 break;
2171 2164
2172 case st_bsl: 2165 case st_bsl:
2173 switch (c) 2166 switch (c)
2203 case 'r': 2196 case 'r':
2204 *p++ = '\r'; 2197 *p++ = '\r';
2205 state = st_ok; 2198 state = st_ok;
2206 break; 2199 break;
2207 2200
2208 case '"':
2209 *p++ = '"';
2210 state = st_ok;
2211 break;
2212
2213 default: 2201 default:
2214 *p++ = c; 2202 *p++ = c;
2215 state = st_ok; 2203 state = st_ok;
2216 break; 2204 break;
2217 } 2205 }
2218 2206
2219 break; 2207 break;
2220 2208
2221 case st_x1: 2209 case st_x1:
2222 case st_x2: 2210 case st_x2:
2223 c = toupper (c); 2211 c = tolower (c);
2224 2212
2225 if (c >= '0' && c <= 'F') 2213 if (c >= '0' && c <= '9')
2226 {
2227 if (c <= '9')
2228 c1 = (c1 << 4) + c - '0'; 2214 c1 = (c1 << 4) + c - '0';
2229 else 2215 else if (c >= 'a' && c <= 'f')
2230 c1 = (c1 << 4) + c - 'A' + 10; 2216 c1 = (c1 << 4) + c - 'a' + 10;
2231
2232 if (state == st_x1)
2233 state = st_x2;
2234 else
2235 {
2236 *p++ = c1;
2237 state = st_ok;
2238 }
2239 }
2240 else 2217 else
2241 return S_F; 2218 return S_F;
2219
2220 if (state == st_x1)
2221 state = st_x2;
2222 else
2223 {
2224 *p++ = c1;
2225 state = st_ok;
2226 }
2242 2227
2243 break; 2228 break;
2244 2229
2245 case st_oct1: 2230 case st_oct1:
2246 case st_oct2: 2231 case st_oct2:
2250 backchar (SCHEME_A_ c); 2235 backchar (SCHEME_A_ c);
2251 state = st_ok; 2236 state = st_ok;
2252 } 2237 }
2253 else 2238 else
2254 { 2239 {
2255 if (state == st_oct2 && c1 >= 32) 2240 if (state == st_oct2 && c1 >= ' ')
2256 return S_F; 2241 return S_F;
2257 2242
2258 c1 = (c1 << 3) + (c - '0'); 2243 c1 = (c1 << 3) + (c - '0');
2259 2244
2260 if (state == st_oct1) 2245 if (state == st_oct1)
2265 state = st_ok; 2250 state = st_ok;
2266 } 2251 }
2267 } 2252 }
2268 2253
2269 break; 2254 break;
2270
2271 } 2255 }
2272 } 2256 }
2273} 2257}
2274 2258
2275/* check c is in chars */ 2259/* check c is in chars */
2276ecb_inline int 2260ecb_inline int
2277is_one_of (char *s, int c) 2261is_one_of (const char *s, int c)
2278{ 2262{
2279 if (c == EOF)
2280 return 1;
2281
2282 return !!strchr (s, c); 2263 return c == EOF || !!strchr (s, c);
2283} 2264}
2284 2265
2285/* skip white characters */ 2266/* skip white characters */
2286ecb_inline int 2267ecb_inline int
2287skipspace (SCHEME_P) 2268skipspace (SCHEME_P)
2289 int c, curr_line = 0; 2270 int c, curr_line = 0;
2290 2271
2291 do 2272 do
2292 { 2273 {
2293 c = inchar (SCHEME_A); 2274 c = inchar (SCHEME_A);
2275
2294#if SHOW_ERROR_LINE 2276#if SHOW_ERROR_LINE
2295 if (c == '\n') 2277 if (ecb_expect_false (c == '\n'))
2296 curr_line++; 2278 curr_line++;
2297#endif 2279#endif
2280
2281 if (ecb_expect_false (c == EOF))
2282 return c;
2298 } 2283 }
2299 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2284 while (is_one_of (WHITESPACE, c));
2300 2285
2301 /* record it */ 2286 /* record it */
2302#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2303 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2288 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2304 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2289 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2305#endif 2290#endif
2306 2291
2307 if (c != EOF)
2308 {
2309 backchar (SCHEME_A_ c); 2292 backchar (SCHEME_A_ c);
2310 return 1; 2293 return 1;
2311 }
2312 else
2313 return EOF;
2314} 2294}
2315 2295
2316/* get token */ 2296/* get token */
2317static int 2297static int
2318token (SCHEME_P) 2298token (SCHEME_P)
2334 return TOK_RPAREN; 2314 return TOK_RPAREN;
2335 2315
2336 case '.': 2316 case '.':
2337 c = inchar (SCHEME_A); 2317 c = inchar (SCHEME_A);
2338 2318
2339 if (is_one_of (" \n\t", c)) 2319 if (is_one_of (WHITESPACE, c))
2340 return TOK_DOT; 2320 return TOK_DOT;
2341 else 2321 else
2342 { 2322 {
2343 //TODO: ungetc twice in a row is not supported in C
2344 backchar (SCHEME_A_ c); 2323 backchar (SCHEME_A_ c);
2345 backchar (SCHEME_A_ '.');
2346 return TOK_ATOM; 2324 return TOK_DOTATOM;
2347 } 2325 }
2326
2327 case '|':
2328 return TOK_STRATOM;
2348 2329
2349 case '\'': 2330 case '\'':
2350 return TOK_QUOTE; 2331 return TOK_QUOTE;
2351 2332
2352 case ';': 2333 case ';':
2484 } 2465 }
2485 2466
2486 putcharacter (SCHEME_A_ '"'); 2467 putcharacter (SCHEME_A_ '"');
2487} 2468}
2488 2469
2489
2490/* print atoms */ 2470/* print atoms */
2491static void 2471static void
2492printatom (SCHEME_P_ pointer l, int f) 2472printatom (SCHEME_P_ pointer l, int f)
2493{ 2473{
2494 char *p; 2474 char *p;
2495 int len; 2475 int len;
2496 2476
2497 atom2str (SCHEME_A_ l, f, &p, &len); 2477 atom2str (SCHEME_A_ l, f, &p, &len);
2498 putchars (SCHEME_A_ p, len); 2478 putchars (SCHEME_A_ p, len);
2499} 2479}
2500
2501 2480
2502/* Uses internal buffer unless string pointer is already available */ 2481/* Uses internal buffer unless string pointer is already available */
2503static void 2482static void
2504atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2483atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2505{ 2484{
2666#endif 2645#endif
2667 } 2646 }
2668 else if (is_continuation (l)) 2647 else if (is_continuation (l))
2669 p = "#<CONTINUATION>"; 2648 p = "#<CONTINUATION>";
2670 else 2649 else
2650 {
2651#if USE_PRINTF
2652 p = SCHEME_V->strbuff;
2653 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2654#else
2671 p = "#<ERROR>"; 2655 p = "#<ERROR>";
2656#endif
2657 }
2672 2658
2673 *pp = p; 2659 *pp = p;
2674 *plen = strlen (p); 2660 *plen = strlen (p);
2675} 2661}
2676 2662
2946#endif /* USE_ALIST_ENV else */ 2932#endif /* USE_ALIST_ENV else */
2947 2933
2948ecb_inline void 2934ecb_inline void
2949new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2935new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2950{ 2936{
2937 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2951 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2938 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2952} 2939}
2953 2940
2954ecb_inline void 2941ecb_inline void
2955set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2942set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3056{ 3043{
3057 int nframes = (uintptr_t)SCHEME_V->dump; 3044 int nframes = (uintptr_t)SCHEME_V->dump;
3058 struct dump_stack_frame *next_frame; 3045 struct dump_stack_frame *next_frame;
3059 3046
3060 /* enough room for the next frame? */ 3047 /* enough room for the next frame? */
3061 if (nframes >= SCHEME_V->dump_size) 3048 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3062 { 3049 {
3063 SCHEME_V->dump_size += STACK_GROWTH; 3050 SCHEME_V->dump_size += STACK_GROWTH;
3064 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3051 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3065 } 3052 }
3066 3053
3247 3234
3248#endif 3235#endif
3249 3236
3250#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3237#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3251 3238
3239#if EXPERIMENT
3240static int
3241debug (SCHEME_P_ int indent, pointer x)
3242{
3243 int c;
3244
3245 if (is_syntax (x))
3246 {
3247 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3248 return 8 + 8;
3249 }
3250
3251 if (x == NIL)
3252 {
3253 printf ("%*sNIL\n", indent, "");
3254 return 3;
3255 }
3256
3257 switch (type (x))
3258 {
3259 case T_INTEGER:
3260 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3261 return 32+8;
3262
3263 case T_SYMBOL:
3264 printf ("%*sS<%s>\n", indent, "", symname (x));
3265 return 24+8;
3266
3267 case T_CLOSURE:
3268 printf ("%*sS<%s>\n", indent, "", "closure");
3269 debug (SCHEME_A_ indent + 3, cdr(x));
3270 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3271
3272 case T_PAIR:
3273 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3274 c = debug (SCHEME_A_ indent + 3, car (x));
3275 c += debug (SCHEME_A_ indent + 3, cdr (x));
3276 return c + 1;
3277
3278 case T_PORT:
3279 printf ("%*sS<%s>\n", indent, "", "port");
3280 return 24+8;
3281
3282 case T_VECTOR:
3283 printf ("%*sS<%s>\n", indent, "", "vector");
3284 return 24+8;
3285
3286 case T_ENVIRONMENT:
3287 printf ("%*sS<%s>\n", indent, "", "environment");
3288 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3289
3290 default:
3291 printf ("unhandled type %d\n", type (x));
3292 break;
3293 }
3294}
3295#endif
3296
3252static int 3297static int
3253opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3298opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3254{ 3299{
3255 pointer args = SCHEME_V->args; 3300 pointer args = SCHEME_V->args;
3256 pointer x, y; 3301 pointer x, y;
3257 3302
3258 switch (op) 3303 switch (op)
3259 { 3304 {
3305#if EXPERIMENT //D
3306 case OP_DEBUG:
3307 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3308 printf ("\n");
3309 s_return (S_T);
3310#endif
3260 case OP_LOAD: /* load */ 3311 case OP_LOAD: /* load */
3261 if (file_interactive (SCHEME_A)) 3312 if (file_interactive (SCHEME_A))
3262 { 3313 {
3263 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3314 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3264 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3315 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3265 } 3316 }
3266 3317
3267 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3318 if (!file_push (SCHEME_A_ strvalue (car (args))))
3268 Error_1 ("unable to open", car (args)); 3319 Error_1 ("unable to open", car (args));
3269 else 3320 else
3273 } 3324 }
3274 3325
3275 case OP_T0LVL: /* top level */ 3326 case OP_T0LVL: /* top level */
3276 3327
3277 /* If we reached the end of file, this loop is done. */ 3328 /* If we reached the end of file, this loop is done. */
3278 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3329 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3279 { 3330 {
3280 if (SCHEME_V->file_i == 0) 3331 if (SCHEME_V->file_i == 0)
3281 { 3332 {
3282 SCHEME_V->args = NIL; 3333 SCHEME_V->args = NIL;
3283 s_goto (OP_QUIT); 3334 s_goto (OP_QUIT);
3361#endif 3412#endif
3362 if (is_symbol (SCHEME_V->code)) /* symbol */ 3413 if (is_symbol (SCHEME_V->code)) /* symbol */
3363 { 3414 {
3364 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3415 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3365 3416
3366 if (x != NIL) 3417 if (x == NIL)
3367 s_return (slot_value_in_env (x));
3368 else
3369 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3418 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3419
3420 s_return (slot_value_in_env (x));
3370 } 3421 }
3371 else if (is_pair (SCHEME_V->code)) 3422 else if (is_pair (SCHEME_V->code))
3372 { 3423 {
3373 x = car (SCHEME_V->code); 3424 x = car (SCHEME_V->code);
3374 3425
3387 } 3438 }
3388 else 3439 else
3389 s_return (SCHEME_V->code); 3440 s_return (SCHEME_V->code);
3390 3441
3391 case OP_E0ARGS: /* eval arguments */ 3442 case OP_E0ARGS: /* eval arguments */
3392 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3443 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3393 { 3444 {
3394 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3445 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3395 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3446 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3396 SCHEME_V->code = SCHEME_V->value; 3447 SCHEME_V->code = SCHEME_V->value;
3397 s_goto (OP_APPLY); 3448 s_goto (OP_APPLY);
3451 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3502 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3452 else if (is_foreign (SCHEME_V->code)) 3503 else if (is_foreign (SCHEME_V->code))
3453 { 3504 {
3454 /* Keep nested calls from GC'ing the arglist */ 3505 /* Keep nested calls from GC'ing the arglist */
3455 push_recent_alloc (SCHEME_A_ args, NIL); 3506 push_recent_alloc (SCHEME_A_ args, NIL);
3456 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3507 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3457 3508
3458 s_return (x); 3509 s_return (x);
3459 } 3510 }
3460 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3511 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3461 { 3512 {
3498 3549
3499 case OP_DOMACRO: /* do macro */ 3550 case OP_DOMACRO: /* do macro */
3500 SCHEME_V->code = SCHEME_V->value; 3551 SCHEME_V->code = SCHEME_V->value;
3501 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3502 3553
3503#if 1
3504
3505 case OP_LAMBDA: /* lambda */ 3554 case OP_LAMBDA: /* lambda */
3506 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3555 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3507 set SCHEME_V->value fall thru */ 3556 set SCHEME_V->value fall thru */
3508 { 3557 {
3509 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3558 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3515 SCHEME_V->code = slot_value_in_env (f); 3564 SCHEME_V->code = slot_value_in_env (f);
3516 s_goto (OP_APPLY); 3565 s_goto (OP_APPLY);
3517 } 3566 }
3518 3567
3519 SCHEME_V->value = SCHEME_V->code; 3568 SCHEME_V->value = SCHEME_V->code;
3520 /* Fallthru */
3521 } 3569 }
3570 /* Fallthru */
3522 3571
3523 case OP_LAMBDA1: 3572 case OP_LAMBDA1:
3524 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3573 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3525
3526#else
3527
3528 case OP_LAMBDA: /* lambda */
3529 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3530
3531#endif
3532 3574
3533 case OP_MKCLOSURE: /* make-closure */ 3575 case OP_MKCLOSURE: /* make-closure */
3534 x = car (args); 3576 x = car (args);
3535 3577
3536 if (car (x) == SCHEME_V->LAMBDA) 3578 if (car (x) == SCHEME_V->LAMBDA)
4021 s_return (mk_real (SCHEME_A_ result)); 4063 s_return (mk_real (SCHEME_A_ result));
4022 else 4064 else
4023 s_return (mk_integer (SCHEME_A_ result)); 4065 s_return (mk_integer (SCHEME_A_ result));
4024 } 4066 }
4025 4067
4026 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4068 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4027 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4069 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4028
4029 case OP_TRUNCATE:
4030 {
4031 RVALUE n = rvalue (x);
4032 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4033 }
4034
4035 case OP_ROUND:
4036 if (is_integer (x))
4037 s_return (x);
4038
4039 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4070 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4071 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4040#endif 4072#endif
4041 4073
4042 case OP_ADD: /* + */ 4074 case OP_ADD: /* + */
4043 v = num_zero; 4075 v = num_zero;
4044 4076
4132 else 4164 else
4133 Error_0 ("modulo: division by zero"); 4165 Error_0 ("modulo: division by zero");
4134 4166
4135 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4136 4168
4137 case OP_CAR: /* car */ 4169 /* the compiler will optimize this mess... */
4138 s_return (caar (args)); 4170 case OP_CAR: op_car: s_return (car (x));
4139 4171 case OP_CDR: op_cdr: s_return (cdr (x));
4140 case OP_CDR: /* cdr */ 4172 case OP_CAAR: op_caar: x = car (x); goto op_car;
4141 s_return (cdar (args)); 4173 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4174 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4175 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4176 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4177 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4178 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4179 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4180 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4181 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4182 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4183 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4184 case OP_CAAAAR: x = car (x); goto op_caaar;
4185 case OP_CAAADR: x = cdr (x); goto op_caaar;
4186 case OP_CAADAR: x = car (x); goto op_caadr;
4187 case OP_CAADDR: x = cdr (x); goto op_caadr;
4188 case OP_CADAAR: x = car (x); goto op_cadar;
4189 case OP_CADADR: x = cdr (x); goto op_cadar;
4190 case OP_CADDAR: x = car (x); goto op_caddr;
4191 case OP_CADDDR: x = cdr (x); goto op_caddr;
4192 case OP_CDAAAR: x = car (x); goto op_cdaar;
4193 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4194 case OP_CDADAR: x = car (x); goto op_cdadr;
4195 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4196 case OP_CDDAAR: x = car (x); goto op_cddar;
4197 case OP_CDDADR: x = cdr (x); goto op_cddar;
4198 case OP_CDDDAR: x = car (x); goto op_cdddr;
4199 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4142 4200
4143 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4144 set_cdr (args, cadr (args)); 4202 set_cdr (args, cadr (args));
4145 s_return (args); 4203 s_return (args);
4146 4204
4395 } 4453 }
4396 4454
4397 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4398 s_return (mk_integer (SCHEME_A_ veclength (x))); 4456 s_return (mk_integer (SCHEME_A_ veclength (x)));
4399 4457
4458 case OP_VECRESIZE:
4459 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4460 s_return (x);
4461
4400 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4401 { 4463 {
4402 int index = ivalue_unchecked (cadr (args)); 4464 int index = ivalue_unchecked (cadr (args));
4403 4465
4404 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4464 pointer d = cdr (args); 4526 pointer d = cdr (args);
4465 int r; 4527 int r;
4466 4528
4467 switch (op) 4529 switch (op)
4468 { 4530 {
4469 case OP_NOT: /* not */ r = is_false (a) ; break; 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4470 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4471 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4472 case OP_NULLP: /* null? */ r = a == NIL ; break; 4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4473 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4474 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4475 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4476 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4477 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4478 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4479 4542
4480#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4481 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4482 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4483 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4533 } 4596 }
4534 else 4597 else
4535 s_return (SCHEME_V->code); 4598 s_return (SCHEME_V->code);
4536 4599
4537 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4538 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4601 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4539 s_return (SCHEME_V->value); 4602 s_return (SCHEME_V->value);
4540 4603
4541#if USE_PORTS 4604#if USE_PORTS
4542 4605
4543 case OP_WRITE: /* write */ 4606 case OP_WRITE: /* write */
4688 SCHEME_V->gc_verbose = (a != S_F); 4751 SCHEME_V->gc_verbose = (a != S_F);
4689 s_retbool (was); 4752 s_retbool (was);
4690 } 4753 }
4691 4754
4692 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
4756#if 0
4693 if (!is_pair (args) || !is_number (a)) 4757 if (!is_pair (args) || !is_number (a))
4694 Error_0 ("new-segment: argument must be a number"); 4758 Error_0 ("new-segment: argument must be a number");
4695 4759#endif
4696 alloc_cellseg (SCHEME_A_ ivalue (a)); 4760 s_retbool (alloc_cellseg (SCHEME_A));
4697
4698 s_return (S_T);
4699 4761
4700 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
4701 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
4702 4764
4703#if USE_PORTS 4765#if USE_PORTS
4773 s_return (p == NIL ? S_F : p); 4835 s_return (p == NIL ? S_F : p);
4774 } 4836 }
4775 4837
4776 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
4777 { 4839 {
4778 port *p; 4840 port *p = port (a);
4779 4841
4780 if ((p = a->object.port)->kind & port_string) 4842 if (p->kind & port_string)
4781 { 4843 {
4782 off_t size; 4844 off_t size;
4783 char *str; 4845 char *str;
4784 4846
4785 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
4890 int res; 4952 int res;
4891 4953
4892 if (is_pair (args)) 4954 if (is_pair (args))
4893 p = car (args); 4955 p = car (args);
4894 4956
4895 res = p->object.port->kind & port_string; 4957 res = port (p)->kind & port_string;
4896 4958
4897 s_retbool (res); 4959 s_retbool (res);
4898 } 4960 }
4899 4961
4900 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
4959 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4960 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
4961 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
4962 5024
4963 case TOK_ATOM: 5025 case TOK_ATOM:
4964 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5026 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5027
5028 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031
5032 case TOK_STRATOM:
5033 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4965 5036
4966 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
4967 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
4968 5039
4969 if (x == S_F) 5040 if (x == S_F)
4970 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
4971 5042
4972 setimmutable (x); 5043 setimmutable (x);
4984 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
4985 } 5056 }
4986 } 5057 }
4987 5058
4988 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
4989 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4990 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
4991 else 5062 else
4992 s_return (x); 5063 s_return (x);
4993 5064
4994 default: 5065 default:
5216 5287
5217 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5218 /* 5289 /*
5219 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5220 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5221 */ 5293 */
5222 s_retbool (is_closure (a)); 5294 s_retbool (is_closure (a));
5223 5295
5224 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5225 s_retbool (is_macro (a)); 5297 s_retbool (is_macro (a));
5430 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5431 return; 5503 return;
5432 5504
5433 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5434 { 5506 {
5435 xwrstr ("No memory!\n"); 5507 putstr (SCHEME_A_ "No memory!\n");
5436 return; 5508 return;
5437 } 5509 }
5438 } 5510 }
5439} 5511}
5440 5512
5466 5538
5467/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5468static int 5540static int
5469syntaxnum (pointer p) 5541syntaxnum (pointer p)
5470{ 5542{
5471 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
5472 5544
5473 switch (strlength (car (p))) 5545 switch (strlength (p))
5474 { 5546 {
5475 case 2: 5547 case 2:
5476 if (s[0] == 'i') 5548 if (s[0] == 'i')
5477 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
5478 else 5550 else
5553ecb_cold int 5625ecb_cold int
5554scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
5555{ 5627{
5556 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5557 pointer x; 5629 pointer x;
5630
5631 /* this memset is not strictly correct, as we assume (intcache)
5632 * that memset 0 will also set pointers to 0, but memset does
5633 * of course not guarantee that. screw such systems.
5634 */
5635 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5558 5636
5559 num_set_fixnum (num_zero, 1); 5637 num_set_fixnum (num_zero, 1);
5560 num_set_ivalue (num_zero, 0); 5638 num_set_ivalue (num_zero, 0);
5561 num_set_fixnum (num_one, 1); 5639 num_set_fixnum (num_one, 1);
5562 num_set_ivalue (num_one, 1); 5640 num_set_ivalue (num_one, 1);
5574 SCHEME_V->save_inport = NIL; 5652 SCHEME_V->save_inport = NIL;
5575 SCHEME_V->loadport = NIL; 5653 SCHEME_V->loadport = NIL;
5576 SCHEME_V->nesting = 0; 5654 SCHEME_V->nesting = 0;
5577 SCHEME_V->interactive_repl = 0; 5655 SCHEME_V->interactive_repl = 0;
5578 5656
5579 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5657 if (!alloc_cellseg (SCHEME_A))
5580 { 5658 {
5581#if USE_ERROR_CHECKING 5659#if USE_ERROR_CHECKING
5582 SCHEME_V->no_memory = 1; 5660 SCHEME_V->no_memory = 1;
5583 return 0; 5661 return 0;
5584#endif 5662#endif
5914# endif 5992# endif
5915 int fin; 5993 int fin;
5916 char *file_name = InitFile; 5994 char *file_name = InitFile;
5917 int retcode; 5995 int retcode;
5918 int isfile = 1; 5996 int isfile = 1;
5997 system ("ps v $PPID");//D
5919 5998
5920 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5999 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5921 { 6000 {
5922 xwrstr ("Usage: tinyscheme -?\n"); 6001 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5923 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6002 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5924 xwrstr ("followed by\n"); 6003 putstr (SCHEME_A_ "followed by\n");
5925 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6004 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5926 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6005 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5927 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6006 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5928 xwrstr ("Use - as filename for stdin.\n"); 6007 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5929 return 1; 6008 return 1;
5930 } 6009 }
5931 6010
5932 if (!scheme_init (SCHEME_A)) 6011 if (!scheme_init (SCHEME_A))
5933 { 6012 {
5934 xwrstr ("Could not initialize!\n"); 6013 putstr (SCHEME_A_ "Could not initialize!\n");
5935 return 2; 6014 return 2;
5936 } 6015 }
5937 6016
5938# if USE_PORTS 6017# if USE_PORTS
5939 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6018 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
5984 fin = open (file_name, O_RDONLY); 6063 fin = open (file_name, O_RDONLY);
5985#endif 6064#endif
5986 6065
5987 if (isfile && fin < 0) 6066 if (isfile && fin < 0)
5988 { 6067 {
5989 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6068 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5990 } 6069 }
5991 else 6070 else
5992 { 6071 {
5993 if (isfile) 6072 if (isfile)
5994 scheme_load_named_file (SCHEME_A_ fin, file_name); 6073 scheme_load_named_file (SCHEME_A_ fin, file_name);
5998#if USE_PORTS 6077#if USE_PORTS
5999 if (!isfile || fin != STDIN_FILENO) 6078 if (!isfile || fin != STDIN_FILENO)
6000 { 6079 {
6001 if (SCHEME_V->retcode != 0) 6080 if (SCHEME_V->retcode != 0)
6002 { 6081 {
6003 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6082 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6004 } 6083 }
6005 6084
6006 if (isfile) 6085 if (isfile)
6007 close (fin); 6086 close (fin);
6008 } 6087 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines