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.40 by root, Mon Nov 30 05:19:01 2015 UTC vs.
Revision 1.61 by root, Wed Dec 2 07:43:46 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 PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _GNU_SOURCE 1
22#include "malloc.c" 22#define _POSIX_C_SOURCE 200201
23#define _XOPEN_SOURCE 600
24
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
26#ifndef WIN32 28#ifndef WIN32
27# include <unistd.h> 29# include <unistd.h>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
77 86
78#define BACKQUOTE '`' 87#define BACKQUOTE '`'
79#define WHITESPACE " \t\r\n\v\f" 88#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE 89#define DELIMITERS "()\";" WHITESPACE
81 90
82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
85#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
86#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
87 96
88#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
89static scheme sc; 98static scheme sc;
90#endif 99#endif
91 100
92static void 101ecb_cold static void
93xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
94{ 103{
95 if (n < 0) 104 if (n < 0)
96 { 105 {
97 *s++ = '-'; 106 *s++ = '-';
… …
99 } 108 }
100 109
101 char *p = s; 110 char *p = s;
102 111
103 do { 112 do {
104 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
105 n /= base; 114 n /= base;
106 } while (n); 115 } while (n);
107 116
108 *p-- = 0; 117 *p-- = 0;
109 118
… …
112 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
113 --p; ++s; 122 --p; ++s;
114 } 123 }
115} 124}
116 125
117static void 126ecb_cold static void
118xnum (char *s, long n) 127xnum (char *s, long n)
119{ 128{
120 xbase (s, n, 10); 129 xbase (s, n, 10);
121} 130}
122 131
123static void 132ecb_cold static void
124xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
125{
126 write (1, s, strlen (s));
127}
128
129static void
130xwrnum (long n)
131{ 134{
132 char buf[64]; 135 char buf[64];
133 136
134 xnum (buf, n); 137 xnum (buf, n);
135 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
136} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
137 144
138static char 145static char
139xtoupper (char c) 146xtoupper (char c)
140{ 147{
141 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
161 168
162#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
163#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
164#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
165 172
173#endif
174
166#if USE_IGNORECASE 175#if USE_IGNORECASE
167static const char * 176ecb_cold static const char *
168xstrlwr (char *s) 177xstrlwr (char *s)
169{ 178{
170 const char *p = s; 179 const char *p = s;
171 180
172 while (*s) 181 while (*s)
… …
192 201
193#ifndef InitFile 202#ifndef InitFile
194# define InitFile "init.scm" 203# define InitFile "init.scm"
195#endif 204#endif
196 205
197#ifndef FIRST_CELLSEGS
198# define FIRST_CELLSEGS 3
199#endif
200
201enum scheme_types 206enum scheme_types
202{ 207{
203 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
204 T_REAL, 210 T_REAL,
205 T_STRING, 211 T_STRING,
206 T_SYMBOL, 212 T_SYMBOL,
207 T_PROC, 213 T_PROC,
208 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
209 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
210 T_CONTINUATION, 218 T_CONTINUATION,
211 T_FOREIGN, 219 T_FOREIGN,
212 T_CHARACTER,
213 T_PORT, 220 T_PORT,
214 T_VECTOR, 221 T_VECTOR,
215 T_MACRO,
216 T_PROMISE, 222 T_PROMISE,
217 T_ENVIRONMENT, 223 T_ENVIRONMENT,
218 /* one more... */ 224
219 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
220}; 226};
221 227
222#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
223#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
256static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
257static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
258static num num_rem (num a, num b); 264static num num_rem (num a, num b);
259static num num_mod (num a, num b); 265static num num_mod (num a, num b);
260 266
261#if USE_MATH
262static double round_per_R5RS (double x);
263#endif
264static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
265 268
266static num num_zero; 269static num num_zero;
267static num num_one; 270static num num_one;
268 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
269/* macros for cell operations */ 276/* macros for cell operations */
270#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
271#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
272#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
273 280
274INTERFACE int 281INTERFACE int
275is_string (pointer p) 282is_string (pointer p)
276{ 283{
277 return type (p) == T_STRING; 284 return type (p) == T_STRING;
278} 285}
279 286
280#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
281#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
282 289
283INTERFACE int 290INTERFACE int
284is_vector (pointer p) 291is_vector (pointer p)
285{ 292{
286 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
287} 294}
288 295
289#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
292INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
294 301
295INTERFACE int 302INTERFACE int
… …
321string_value (pointer p) 328string_value (pointer p)
322{ 329{
323 return strvalue (p); 330 return strvalue (p);
324} 331}
325 332
326#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
328 335
329#if USE_REAL 336#if USE_REAL
330#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
331#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
332#else 339#else
333#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
334#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
335#endif 342#endif
336 343
337INTERFACE long 344INTERFACE long
338charvalue (pointer p) 345charvalue (pointer p)
339{ 346{
340 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
341} 348}
342 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
343INTERFACE int 352INTERFACE int
344is_port (pointer p) 353is_port (pointer p)
345{ 354{
346 return type (p) == T_PORT; 355 return type (p) == T_PORT;
347} 356}
348 357
349INTERFACE int 358INTERFACE int
350is_inport (pointer p) 359is_inport (pointer p)
351{ 360{
352 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
353} 362}
354 363
355INTERFACE int 364INTERFACE int
356is_outport (pointer p) 365is_outport (pointer p)
357{ 366{
358 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
359} 368}
360 369
361INTERFACE int 370INTERFACE int
362is_pair (pointer p) 371is_pair (pointer p)
363{ 372{
364 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
365} 374}
366 375
367#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
368#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
369 378
370static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
371static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
372static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
373static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
377static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378 387
379INTERFACE void 388INTERFACE void
380set_car (pointer p, pointer q) 389set_car (pointer p, pointer q)
381{ 390{
382 p->object.cons.car = q; 391 CELL(p)->object.cons.car = CELL (q);
383} 392}
384 393
385INTERFACE void 394INTERFACE void
386set_cdr (pointer p, pointer q) 395set_cdr (pointer p, pointer q)
387{ 396{
388 p->object.cons.cdr = q; 397 CELL(p)->object.cons.cdr = CELL (q);
389} 398}
390 399
391INTERFACE pointer 400INTERFACE pointer
392pair_car (pointer p) 401pair_car (pointer p)
393{ 402{
… …
411{ 420{
412 return strvalue (p); 421 return strvalue (p);
413} 422}
414 423
415#if USE_PLIST 424#if USE_PLIST
425#error plists are broken because symbols are no longer pairs
426#define symprop(p) cdr(p)
416SCHEME_EXPORT int 427SCHEME_EXPORT int
417hasprop (pointer p) 428hasprop (pointer p)
418{ 429{
419 return typeflag (p) & T_SYMBOL; 430 return typeflag (p) & T_SYMBOL;
420} 431}
421
422# define symprop(p) cdr(p)
423#endif 432#endif
424 433
425INTERFACE int 434INTERFACE int
426is_syntax (pointer p) 435is_syntax (pointer p)
427{ 436{
… …
523 proper list: length 532 proper list: length
524 circular list: -1 533 circular list: -1
525 not even a pair: -2 534 not even a pair: -2
526 dotted list: -2 minus length before dot 535 dotted list: -2 minus length before dot
527*/ 536*/
528INTERFACE int 537ecb_hot INTERFACE int
529list_length (SCHEME_P_ pointer a) 538list_length (SCHEME_P_ pointer a)
530{ 539{
531 int i = 0; 540 int i = 0;
532 pointer slow, fast; 541 pointer slow, fast;
533 542
… …
572{ 581{
573 return list_length (SCHEME_A_ a) >= 0; 582 return list_length (SCHEME_A_ a) >= 0;
574} 583}
575 584
576#if USE_CHAR_CLASSIFIERS 585#if USE_CHAR_CLASSIFIERS
586
577ecb_inline int 587ecb_inline int
578Cisalpha (int c) 588Cisalpha (int c)
579{ 589{
580 return isascii (c) && isalpha (c); 590 return isascii (c) && isalpha (c);
581} 591}
… …
639 "gs", 649 "gs",
640 "rs", 650 "rs",
641 "us" 651 "us"
642}; 652};
643 653
644static int 654ecb_cold static int
645is_ascii_name (const char *name, int *pc) 655is_ascii_name (const char *name, int *pc)
646{ 656{
647 int i; 657 int i;
648 658
649 for (i = 0; i < 32; i++) 659 for (i = 0; i < 32; i++)
… …
668 678
669static int file_push (SCHEME_P_ const char *fname); 679static int file_push (SCHEME_P_ const char *fname);
670static void file_pop (SCHEME_P); 680static void file_pop (SCHEME_P);
671static int file_interactive (SCHEME_P); 681static int file_interactive (SCHEME_P);
672ecb_inline int is_one_of (const char *s, int c); 682ecb_inline int is_one_of (const char *s, int c);
673static int alloc_cellseg (SCHEME_P_ int n); 683static int alloc_cellseg (SCHEME_P);
674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 684ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675static void finalize_cell (SCHEME_P_ pointer a); 685static void finalize_cell (SCHEME_P_ pointer a);
676static int count_consecutive_cells (pointer x, int needed);
677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 686static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static pointer mk_number (SCHEME_P_ const num n); 687static pointer mk_number (SCHEME_P_ const num n);
679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 688static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
680static pointer mk_vector (SCHEME_P_ uint32_t len); 689static pointer mk_vector (SCHEME_P_ uint32_t len);
681static pointer mk_atom (SCHEME_P_ char *q); 690static pointer mk_atom (SCHEME_P_ char *q);
682static pointer mk_sharp_const (SCHEME_P_ char *name); 691static pointer mk_sharp_const (SCHEME_P_ char *name);
683 692
693static pointer mk_port (SCHEME_P_ port *p);
694
684#if USE_PORTS 695#if USE_PORTS
685static pointer mk_port (SCHEME_P_ port *p);
686static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 696static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
687static pointer port_from_file (SCHEME_P_ int, int prop); 697static pointer port_from_file (SCHEME_P_ int, int prop);
688static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 698static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
689static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 699static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
690static port *port_rep_from_file (SCHEME_P_ int, int prop); 700static port *port_rep_from_file (SCHEME_P_ int, int prop);
691static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 701static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
692static void port_close (SCHEME_P_ pointer p, int flag); 702static void port_close (SCHEME_P_ pointer p, int flag);
693#endif 703#endif
704
694static void mark (pointer a); 705static void mark (pointer a);
695static void gc (SCHEME_P_ pointer a, pointer b); 706static void gc (SCHEME_P_ pointer a, pointer b);
696static int basic_inchar (port *pt); 707static int basic_inchar (port *pt);
697static int inchar (SCHEME_P); 708static int inchar (SCHEME_P);
698static void backchar (SCHEME_P_ int c); 709static void backchar (SCHEME_P_ int c);
… …
872 } 883 }
873 884
874 return ret; 885 return ret;
875} 886}
876 887
877#if USE_MATH
878
879/* Round to nearest. Round to even if midway */
880static double
881round_per_R5RS (double x)
882{
883 double fl = floor (x);
884 double ce = ceil (x);
885 double dfl = x - fl;
886 double dce = ce - x;
887
888 if (dfl > dce)
889 return ce;
890 else if (dfl < dce)
891 return fl;
892 else
893 {
894 if (fmod (fl, 2) == 0) /* I imagine this holds */
895 return fl;
896 else
897 return ce;
898 }
899}
900#endif
901
902static int 888static int
903is_zero_rvalue (RVALUE x) 889is_zero_rvalue (RVALUE x)
904{ 890{
905 return x == 0; 891 return x == 0;
906#if 0 892#if 0
… …
911#endif 897#endif
912#endif 898#endif
913} 899}
914 900
915/* allocate new cell segment */ 901/* allocate new cell segment */
916static int 902ecb_cold static int
917alloc_cellseg (SCHEME_P_ int n) 903alloc_cellseg (SCHEME_P)
918{ 904{
919 pointer newp; 905 struct cell *newp;
920 pointer last; 906 struct cell *last;
921 pointer p; 907 struct cell *p;
922 char *cp; 908 char *cp;
923 long i; 909 long i;
924 int k; 910 int k;
925 911
926 static int segsize = CELL_SEGSIZE >> 1; 912 static int segsize = CELL_SEGSIZE >> 1;
927 segsize <<= 1; 913 segsize <<= 1;
928 914
929 for (k = 0; k < n; k++)
930 {
931 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
932 return k;
933
934 cp = malloc (segsize * sizeof (struct cell)); 915 cp = malloc (segsize * sizeof (struct cell));
935 916
936 if (!cp && USE_ERROR_CHECKING) 917 if (!cp && USE_ERROR_CHECKING)
937 return k; 918 return k;
938 919
939 i = ++SCHEME_V->last_cell_seg; 920 i = ++SCHEME_V->last_cell_seg;
940 SCHEME_V->alloc_seg[i] = cp; 921 SCHEME_V->alloc_seg[i] = cp;
941 922
942 newp = (pointer)cp; 923 newp = (struct cell *)cp;
943 SCHEME_V->cell_seg[i] = newp; 924 SCHEME_V->cell_seg[i] = newp;
944 SCHEME_V->cell_segsize[i] = segsize; 925 SCHEME_V->cell_segsize[i] = segsize;
945 SCHEME_V->fcells += segsize; 926 SCHEME_V->fcells += segsize;
946 last = newp + segsize - 1; 927 last = newp + segsize - 1;
947 928
948 for (p = newp; p <= last; p++) 929 for (p = newp; p <= last; p++)
949 { 930 {
931 pointer cp = POINTER (p);
950 set_typeflag (p, T_PAIR); 932 set_typeflag (cp, T_PAIR);
951 set_car (p, NIL); 933 set_car (cp, NIL);
952 set_cdr (p, p + 1); 934 set_cdr (cp, POINTER (p + 1));
953 } 935 }
954 936
955 set_cdr (last, SCHEME_V->free_cell); 937 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 938 SCHEME_V->free_cell = POINTER (newp);
957 }
958 939
959 return n; 940 return 1;
960} 941}
961 942
962/* get new cell. parameter a, b is marked by gc. */ 943/* get new cell. parameter a, b is marked by gc. */
963ecb_inline pointer 944ecb_inline pointer
964get_cell_x (SCHEME_P_ pointer a, pointer b) 945get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 949 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
969 return S_SINK; 950 return S_SINK;
970 951
971 if (SCHEME_V->free_cell == NIL) 952 if (SCHEME_V->free_cell == NIL)
972 { 953 {
973 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 954 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
974 955
975 gc (SCHEME_A_ a, b); 956 gc (SCHEME_A_ a, b);
976 957
977 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 958 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
978 { 959 {
979 /* if only a few recovered, get more to avoid fruitless gc's */ 960 /* if only a few recovered, get more to avoid fruitless gc's */
980 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 961 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
981 { 962 {
982#if USE_ERROR_CHECKING 963#if USE_ERROR_CHECKING
983 SCHEME_V->no_memory = 1; 964 SCHEME_V->no_memory = 1;
984 return S_SINK; 965 return S_SINK;
985#endif 966#endif
… …
997 } 978 }
998} 979}
999 980
1000/* To retain recent allocs before interpreter knows about them - 981/* To retain recent allocs before interpreter knows about them -
1001 Tehom */ 982 Tehom */
1002 983ecb_hot static void
1003static void
1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 984push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1005{ 985{
1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 986 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1007 987
1008 set_typeflag (holder, T_PAIR); 988 set_typeflag (holder, T_PAIR);
… …
1010 set_car (holder, recent); 990 set_car (holder, recent);
1011 set_cdr (holder, car (S_SINK)); 991 set_cdr (holder, car (S_SINK));
1012 set_car (S_SINK, holder); 992 set_car (S_SINK, holder);
1013} 993}
1014 994
1015static pointer 995ecb_hot static pointer
1016get_cell (SCHEME_P_ pointer a, pointer b) 996get_cell (SCHEME_P_ pointer a, pointer b)
1017{ 997{
1018 pointer cell = get_cell_x (SCHEME_A_ a, b); 998 pointer cell = get_cell_x (SCHEME_A_ a, b);
1019 999
1020 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1000 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1029} 1009}
1030 1010
1031static pointer 1011static pointer
1032get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1012get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1033{ 1013{
1034 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1014 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1035 pointer *e = malloc (len * sizeof (pointer)); 1015 pointer *e = malloc (len * sizeof (pointer));
1036 1016
1037 if (!e && USE_ERROR_CHECKING) 1017 if (!e && USE_ERROR_CHECKING)
1038 return S_SINK; 1018 return S_SINK;
1039 1019
1040 /* Record it as a vector so that gc understands it. */ 1020 /* Record it as a vector so that gc understands it. */
1041 set_typeflag (v, T_VECTOR | T_ATOM); 1021 set_typeflag (v, T_VECTOR | T_ATOM);
1042 1022
1043 v->object.vector.vvalue = e; 1023 CELL(v)->object.vector.vvalue = e;
1044 v->object.vector.length = len; 1024 CELL(v)->object.vector.length = len;
1045 fill_vector (v, 0, init); 1025 fill_vector (v, 0, init);
1046 push_recent_alloc (SCHEME_A_ v, NIL); 1026 push_recent_alloc (SCHEME_A_ v, NIL);
1047 1027
1048 return v; 1028 return v;
1049} 1029}
… …
1058static void 1038static void
1059check_cell_alloced (pointer p, int expect_alloced) 1039check_cell_alloced (pointer p, int expect_alloced)
1060{ 1040{
1061 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1041 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1062 if (typeflag (p) & !expect_alloced) 1042 if (typeflag (p) & !expect_alloced)
1063 xwrstr ("Cell is already allocated!\n"); 1043 putstr (SCHEME_A_ "Cell is already allocated!\n");
1064 1044
1065 if (!(typeflag (p)) & expect_alloced) 1045 if (!(typeflag (p)) & expect_alloced)
1066 xwrstr ("Cell is not allocated!\n"); 1046 putstr (SCHEME_A_ "Cell is not allocated!\n");
1067} 1047}
1068 1048
1069static void 1049static void
1070check_range_alloced (pointer p, int n, int expect_alloced) 1050check_range_alloced (pointer p, int n, int expect_alloced)
1071{ 1051{
… …
1077#endif 1057#endif
1078 1058
1079/* Medium level cell allocation */ 1059/* Medium level cell allocation */
1080 1060
1081/* get new cons cell */ 1061/* get new cons cell */
1082pointer 1062ecb_hot static pointer
1083xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1063xcons (SCHEME_P_ pointer a, pointer b)
1084{ 1064{
1085 pointer x = get_cell (SCHEME_A_ a, b); 1065 pointer x = get_cell (SCHEME_A_ a, b);
1086 1066
1087 set_typeflag (x, T_PAIR); 1067 set_typeflag (x, T_PAIR);
1088
1089 if (immutable)
1090 setimmutable (x);
1091 1068
1092 set_car (x, a); 1069 set_car (x, a);
1093 set_cdr (x, b); 1070 set_cdr (x, b);
1094 1071
1095 return x; 1072 return x;
1096} 1073}
1097 1074
1098/* ========== oblist implementation ========== */
1099
1100static pointer 1075ecb_hot static pointer
1076ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1077{
1078 pointer x = xcons (SCHEME_A_ a, b);
1079 setimmutable (x);
1080 return x;
1081}
1082
1083#define cons(a,b) xcons (SCHEME_A_ a, b)
1084#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1085
1086ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1087generate_symbol (SCHEME_P_ const char *name)
1102{ 1088{
1103 pointer x = mk_string (SCHEME_A_ name); 1089 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1090 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1091 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1092 return x;
1107} 1093}
1108 1094
1095/* ========== oblist implementation ========== */
1096
1109#ifndef USE_OBJECT_LIST 1097#ifndef USE_OBJECT_LIST
1110 1098
1111static int 1099static int
1112hash_fn (const char *key, int table_size) 1100hash_fn (const char *key, int table_size)
1113{ 1101{
1114 const unsigned char *p = key; 1102 const unsigned char *p = (unsigned char *)key;
1115 uint32_t hash = 2166136261; 1103 uint32_t hash = 2166136261;
1116 1104
1117 while (*p) 1105 while (*p)
1118 hash = (hash ^ *p++) * 16777619; 1106 hash = (hash ^ *p++) * 16777619;
1119 1107
1120 return hash % table_size; 1108 return hash % table_size;
1121} 1109}
1122 1110
1123static pointer 1111ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1125{ 1113{
1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1114 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1127} 1115}
1128 1116
1129/* returns the new symbol */ 1117/* returns the new symbol */
1130static pointer 1118ecb_cold static pointer
1131oblist_add_by_name (SCHEME_P_ const char *name) 1119oblist_add_by_name (SCHEME_P_ const char *name)
1132{ 1120{
1133 pointer x = generate_symbol (SCHEME_A_ name); 1121 pointer x = generate_symbol (SCHEME_A_ name);
1134 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1122 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1123 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1136 return x; 1124 return x;
1137} 1125}
1138 1126
1139ecb_inline pointer 1127ecb_cold static pointer
1140oblist_find_by_name (SCHEME_P_ const char *name) 1128oblist_find_by_name (SCHEME_P_ const char *name)
1141{ 1129{
1142 int location; 1130 int location;
1143 pointer x; 1131 pointer x;
1144 char *s; 1132 char *s;
… …
1155 } 1143 }
1156 1144
1157 return NIL; 1145 return NIL;
1158} 1146}
1159 1147
1160static pointer 1148ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1149oblist_all_symbols (SCHEME_P)
1162{ 1150{
1163 int i; 1151 int i;
1164 pointer x; 1152 pointer x;
1165 pointer ob_list = NIL; 1153 pointer ob_list = NIL;
… …
1171 return ob_list; 1159 return ob_list;
1172} 1160}
1173 1161
1174#else 1162#else
1175 1163
1176static pointer 1164ecb_cold static pointer
1177oblist_initial_value (SCHEME_P) 1165oblist_initial_value (SCHEME_P)
1178{ 1166{
1179 return NIL; 1167 return NIL;
1180} 1168}
1181 1169
1182ecb_inline pointer 1170ecb_cold static pointer
1183oblist_find_by_name (SCHEME_P_ const char *name) 1171oblist_find_by_name (SCHEME_P_ const char *name)
1184{ 1172{
1185 pointer x; 1173 pointer x;
1186 char *s; 1174 char *s;
1187 1175
… …
1196 1184
1197 return NIL; 1185 return NIL;
1198} 1186}
1199 1187
1200/* returns the new symbol */ 1188/* returns the new symbol */
1201static pointer 1189ecb_cold static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1190oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1191{
1204 pointer x = mk_string (SCHEME_A_ name); 1192 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1193 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1194 return x;
1209} 1195}
1210 1196
1211static pointer 1197ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1198oblist_all_symbols (SCHEME_P)
1213{ 1199{
1214 return SCHEME_V->oblist; 1200 return SCHEME_V->oblist;
1215} 1201}
1216 1202
1217#endif 1203#endif
1218 1204
1219#if USE_PORTS
1220static pointer 1205ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1206mk_port (SCHEME_P_ port *p)
1222{ 1207{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1208 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1209
1225 set_typeflag (x, T_PORT | T_ATOM); 1210 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1211 set_port (x, p);
1227 1212
1228 return x; 1213 return x;
1229} 1214}
1230#endif
1231 1215
1232pointer 1216ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1217mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1218{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1219 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1220
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1221 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1222 CELL(x)->object.ff = f;
1239 1223
1240 return x; 1224 return x;
1241} 1225}
1242 1226
1243INTERFACE pointer 1227INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1228mk_character (SCHEME_P_ int c)
1245{ 1229{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1231
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1232 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1233 set_ivalue (x, c & 0xff);
1250 1234
1251 return x; 1235 return x;
1252} 1236}
1253 1237
1254/* get number atom (integer) */ 1238/* get number atom (integer) */
1255INTERFACE pointer 1239INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1240mk_integer (SCHEME_P_ long n)
1257{ 1241{
1242 pointer p = 0;
1243 pointer *pp = &p;
1244
1245#if USE_INTCACHE
1246 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1247 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1248#endif
1249
1250 if (!*pp)
1251 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1252 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1253
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1254 set_typeflag (x, T_INTEGER | T_ATOM);
1255 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1256 set_ivalue (x, n);
1262 1257
1258 *pp = x;
1259 }
1260
1263 return x; 1261 return *pp;
1264} 1262}
1265 1263
1266INTERFACE pointer 1264INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1265mk_real (SCHEME_P_ RVALUE n)
1268{ 1266{
1269#if USE_REAL 1267#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1269
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1270 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1271 set_rvalue (x, n);
1274 1272
1275 return x; 1273 return x;
1276#else 1274#else
1277 return mk_integer (SCHEME_A_ n); 1275 return mk_integer (SCHEME_A_ n);
… …
1388 x = oblist_add_by_name (SCHEME_A_ name); 1386 x = oblist_add_by_name (SCHEME_A_ name);
1389 1387
1390 return x; 1388 return x;
1391} 1389}
1392 1390
1393INTERFACE pointer 1391ecb_cold INTERFACE pointer
1394gensym (SCHEME_P) 1392gensym (SCHEME_P)
1395{ 1393{
1396 pointer x; 1394 pointer x;
1397 char name[40] = "gensym-"; 1395 char name[40] = "gensym-";
1398 xnum (name + 7, SCHEME_V->gensym_cnt); 1396 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1397
1400 return generate_symbol (SCHEME_A_ name); 1398 return generate_symbol (SCHEME_A_ name);
1401} 1399}
1402 1400
1401static int
1402is_gensym (SCHEME_P_ pointer x)
1403{
1404 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1405}
1406
1403/* make symbol or number atom from string */ 1407/* make symbol or number atom from string */
1404static pointer 1408ecb_cold static pointer
1405mk_atom (SCHEME_P_ char *q) 1409mk_atom (SCHEME_P_ char *q)
1406{ 1410{
1407 char c, *p; 1411 char c, *p;
1408 int has_dec_point = 0; 1412 int has_dec_point = 0;
1409 int has_fp_exp = 0; 1413 int has_fp_exp = 0;
… …
1480 1484
1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1485 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1482} 1486}
1483 1487
1484/* make constant */ 1488/* make constant */
1485static pointer 1489ecb_cold static pointer
1486mk_sharp_const (SCHEME_P_ char *name) 1490mk_sharp_const (SCHEME_P_ char *name)
1487{ 1491{
1488 if (!strcmp (name, "t")) 1492 if (!strcmp (name, "t"))
1489 return S_T; 1493 return S_T;
1490 else if (!strcmp (name, "f")) 1494 else if (!strcmp (name, "f"))
1491 return S_F; 1495 return S_F;
1492 else if (*name == '\\') /* #\w (character) */ 1496 else if (*name == '\\') /* #\w (character) */
1493 { 1497 {
1494 int c; 1498 int c;
1495 1499
1500 // TODO: optimise
1496 if (stricmp (name + 1, "space") == 0) 1501 if (stricmp (name + 1, "space") == 0)
1497 c = ' '; 1502 c = ' ';
1498 else if (stricmp (name + 1, "newline") == 0) 1503 else if (stricmp (name + 1, "newline") == 0)
1499 c = '\n'; 1504 c = '\n';
1500 else if (stricmp (name + 1, "return") == 0) 1505 else if (stricmp (name + 1, "return") == 0)
1501 c = '\r'; 1506 c = '\r';
1502 else if (stricmp (name + 1, "tab") == 0) 1507 else if (stricmp (name + 1, "tab") == 0)
1503 c = '\t'; 1508 c = '\t';
1509 else if (stricmp (name + 1, "alarm") == 0)
1510 c = 0x07;
1511 else if (stricmp (name + 1, "backspace") == 0)
1512 c = 0x08;
1513 else if (stricmp (name + 1, "escape") == 0)
1514 c = 0x1b;
1515 else if (stricmp (name + 1, "delete") == 0)
1516 c = 0x7f;
1517 else if (stricmp (name + 1, "null") == 0)
1518 c = 0;
1504 else if (name[1] == 'x' && name[2] != 0) 1519 else if (name[1] == 'x' && name[2] != 0)
1505 { 1520 {
1506 long c1 = strtol (name + 2, 0, 16); 1521 long c1 = strtol (name + 2, 0, 16);
1507 1522
1508 if (0 <= c1 && c1 <= UCHAR_MAX) 1523 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1533 return NIL; 1548 return NIL;
1534 } 1549 }
1535} 1550}
1536 1551
1537/* ========== garbage collector ========== */ 1552/* ========== garbage collector ========== */
1553
1554static void
1555finalize_cell (SCHEME_P_ pointer a)
1556{
1557 /* TODO, fast bitmap check? */
1558 if (is_string (a) || is_symbol (a))
1559 free (strvalue (a));
1560 else if (is_vector (a))
1561 free (vecvalue (a));
1562#if USE_PORTS
1563 else if (is_port (a))
1564 {
1565 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1566 port_close (SCHEME_A_ a, port_input | port_output);
1567
1568 free (port (a));
1569 }
1570#endif
1571}
1538 1572
1539/*-- 1573/*--
1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1542 * for marking. 1576 * for marking.
1543 * 1577 *
1544 * The exception is vectors - vectors are currently marked recursively, 1578 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another 1579 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector 1580 * word of context in the vector
1547 */ 1581 */
1548static void 1582ecb_hot static void
1549mark (pointer a) 1583mark (pointer a)
1550{ 1584{
1551 pointer t, q, p; 1585 pointer t, q, p;
1552 1586
1553 t = 0; 1587 t = 0;
… …
1610 p = q; 1644 p = q;
1611 goto E6; 1645 goto E6;
1612 } 1646 }
1613} 1647}
1614 1648
1649ecb_hot static void
1650gc_free (SCHEME_P)
1651{
1652 int i;
1653 uint32_t total = 0;
1654
1655 /* Here we scan the cells to build the free-list. */
1656 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1657 {
1658 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1659 struct cell *p;
1660 total += SCHEME_V->cell_segsize [i];
1661
1662 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1663 {
1664 pointer c = POINTER (p);
1665
1666 if (is_mark (c))
1667 clrmark (c);
1668 else
1669 {
1670 /* reclaim cell */
1671 if (typeflag (c) != T_PAIR)
1672 {
1673 finalize_cell (SCHEME_A_ c);
1674 set_typeflag (c, T_PAIR);
1675 set_car (c, NIL);
1676 }
1677
1678 ++SCHEME_V->fcells;
1679 set_cdr (c, SCHEME_V->free_cell);
1680 SCHEME_V->free_cell = c;
1681 }
1682 }
1683 }
1684
1685 if (SCHEME_V->gc_verbose)
1686 {
1687 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");
1688 }
1689}
1690
1615/* garbage collection. parameter a, b is marked. */ 1691/* garbage collection. parameter a, b is marked. */
1616static void 1692ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1693gc (SCHEME_P_ pointer a, pointer b)
1618{ 1694{
1619 pointer p;
1620 int i; 1695 int i;
1621 1696
1622 if (SCHEME_V->gc_verbose) 1697 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1698 putstr (SCHEME_A_ "gc...");
1624 1699
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1715 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1716 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1717 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1718 mark (SCHEME_V->c_nest);
1644 1719
1720#if USE_INTCACHE
1721 /* mark intcache */
1722 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1723 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1724 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1725#endif
1726
1645 /* mark variables a, b */ 1727 /* mark variables a, b */
1646 mark (a); 1728 mark (a);
1647 mark (b); 1729 mark (b);
1648 1730
1649 /* garbage collect */ 1731 /* garbage collect */
1650 clrmark (NIL); 1732 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1733 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1734 SCHEME_V->free_cell = NIL;
1653 1735
1654 /* free-list is kept sorted by address so as to maintain consecutive
1655 ranges, if possible, for use with vectors. Here we scan the cells
1656 (which are also kept sorted by address) downwards to build the
1657 free-list in sorted order.
1658 */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1662
1663 while (--p >= SCHEME_V->cell_seg[i])
1664 {
1665 if (is_mark (p))
1666 clrmark (p);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (p) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose) 1736 if (SCHEME_V->gc_verbose)
1685 { 1737 putstr (SCHEME_A_ "freeing...");
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1688}
1689 1738
1690static void 1739 gc_free (SCHEME_A);
1691finalize_cell (SCHEME_P_ pointer a)
1692{
1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1698#if USE_PORTS
1699 else if (is_port (a))
1700 {
1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1702 port_close (SCHEME_A_ a, port_input | port_output);
1703
1704 free (a->object.port);
1705 }
1706#endif
1707} 1740}
1708 1741
1709/* ========== Routines for Reading ========== */ 1742/* ========== Routines for Reading ========== */
1710 1743
1711static int 1744ecb_cold static int
1712file_push (SCHEME_P_ const char *fname) 1745file_push (SCHEME_P_ const char *fname)
1713{ 1746{
1714#if USE_PORTS
1715 int fin; 1747 int fin;
1716 1748
1717 if (SCHEME_V->file_i == MAXFIL - 1) 1749 if (SCHEME_V->file_i == MAXFIL - 1)
1718 return 0; 1750 return 0;
1719 1751
… …
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1761 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1762 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1763
1732#if SHOW_ERROR_LINE 1764#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1765 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1766
1735 if (fname) 1767 if (fname)
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1737#endif 1769#endif
1738 } 1770 }
1739 1771
1740 return fin >= 0; 1772 return fin >= 0;
1741
1742#else
1743 return 1;
1744#endif
1745} 1773}
1746 1774
1747static void 1775ecb_cold static void
1748file_pop (SCHEME_P) 1776file_pop (SCHEME_P)
1749{ 1777{
1750 if (SCHEME_V->file_i != 0) 1778 if (SCHEME_V->file_i != 0)
1751 { 1779 {
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1780 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1781#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1782 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1783#endif
1756 SCHEME_V->file_i--; 1784 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1785 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1786 }
1759} 1787}
1760 1788
1761static int 1789ecb_cold static int
1762file_interactive (SCHEME_P) 1790file_interactive (SCHEME_P)
1763{ 1791{
1764#if USE_PORTS 1792#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1793 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1794 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1795 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1796#else
1769 return 0; 1797 return 0;
1770#endif 1798#endif
1771} 1799}
1772 1800
1773#if USE_PORTS 1801#if USE_PORTS
1774static port * 1802ecb_cold static port *
1775port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1803port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1776{ 1804{
1777 int fd; 1805 int fd;
1778 int flags; 1806 int flags;
1779 char *rw; 1807 char *rw;
… …
1802# endif 1830# endif
1803 1831
1804 return pt; 1832 return pt;
1805} 1833}
1806 1834
1807static pointer 1835ecb_cold static pointer
1808port_from_filename (SCHEME_P_ const char *fn, int prop) 1836port_from_filename (SCHEME_P_ const char *fn, int prop)
1809{ 1837{
1810 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1838 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1811 1839
1812 if (!pt && USE_ERROR_CHECKING) 1840 if (!pt && USE_ERROR_CHECKING)
1813 return NIL; 1841 return NIL;
1814 1842
1815 return mk_port (SCHEME_A_ pt); 1843 return mk_port (SCHEME_A_ pt);
1816} 1844}
1817 1845
1818static port * 1846ecb_cold static port *
1819port_rep_from_file (SCHEME_P_ int f, int prop) 1847port_rep_from_file (SCHEME_P_ int f, int prop)
1820{ 1848{
1821 port *pt = malloc (sizeof *pt); 1849 port *pt = malloc (sizeof *pt);
1822 1850
1823 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
… …
1828 pt->rep.stdio.file = f; 1856 pt->rep.stdio.file = f;
1829 pt->rep.stdio.closeit = 0; 1857 pt->rep.stdio.closeit = 0;
1830 return pt; 1858 return pt;
1831} 1859}
1832 1860
1833static pointer 1861ecb_cold static pointer
1834port_from_file (SCHEME_P_ int f, int prop) 1862port_from_file (SCHEME_P_ int f, int prop)
1835{ 1863{
1836 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1864 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1837 1865
1838 if (!pt && USE_ERROR_CHECKING) 1866 if (!pt && USE_ERROR_CHECKING)
1839 return NIL; 1867 return NIL;
1840 1868
1841 return mk_port (SCHEME_A_ pt); 1869 return mk_port (SCHEME_A_ pt);
1842} 1870}
1843 1871
1844static port * 1872ecb_cold static port *
1845port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1873port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1874{
1847 port *pt = malloc (sizeof (port)); 1875 port *pt = malloc (sizeof (port));
1848 1876
1849 if (!pt && USE_ERROR_CHECKING) 1877 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.string.curr = start; 1883 pt->rep.string.curr = start;
1856 pt->rep.string.past_the_end = past_the_end; 1884 pt->rep.string.past_the_end = past_the_end;
1857 return pt; 1885 return pt;
1858} 1886}
1859 1887
1860static pointer 1888ecb_cold static pointer
1861port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1889port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1862{ 1890{
1863 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1891 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1864 1892
1865 if (!pt && USE_ERROR_CHECKING) 1893 if (!pt && USE_ERROR_CHECKING)
… …
1868 return mk_port (SCHEME_A_ pt); 1896 return mk_port (SCHEME_A_ pt);
1869} 1897}
1870 1898
1871# define BLOCK_SIZE 256 1899# define BLOCK_SIZE 256
1872 1900
1873static port * 1901ecb_cold static port *
1874port_rep_from_scratch (SCHEME_P) 1902port_rep_from_scratch (SCHEME_P)
1875{ 1903{
1876 char *start; 1904 char *start;
1877 port *pt = malloc (sizeof (port)); 1905 port *pt = malloc (sizeof (port));
1878 1906
… …
1892 pt->rep.string.curr = start; 1920 pt->rep.string.curr = start;
1893 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1921 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1894 return pt; 1922 return pt;
1895} 1923}
1896 1924
1897static pointer 1925ecb_cold static pointer
1898port_from_scratch (SCHEME_P) 1926port_from_scratch (SCHEME_P)
1899{ 1927{
1900 port *pt = port_rep_from_scratch (SCHEME_A); 1928 port *pt = port_rep_from_scratch (SCHEME_A);
1901 1929
1902 if (!pt && USE_ERROR_CHECKING) 1930 if (!pt && USE_ERROR_CHECKING)
1903 return NIL; 1931 return NIL;
1904 1932
1905 return mk_port (SCHEME_A_ pt); 1933 return mk_port (SCHEME_A_ pt);
1906} 1934}
1907 1935
1908static void 1936ecb_cold static void
1909port_close (SCHEME_P_ pointer p, int flag) 1937port_close (SCHEME_P_ pointer p, int flag)
1910{ 1938{
1911 port *pt = p->object.port; 1939 port *pt = port (p);
1912 1940
1913 pt->kind &= ~flag; 1941 pt->kind &= ~flag;
1914 1942
1915 if ((pt->kind & (port_input | port_output)) == 0) 1943 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1944 {
… …
1933 } 1961 }
1934} 1962}
1935#endif 1963#endif
1936 1964
1937/* get new character from input file */ 1965/* get new character from input file */
1938static int 1966ecb_cold static int
1939inchar (SCHEME_P) 1967inchar (SCHEME_P)
1940{ 1968{
1941 int c; 1969 int c;
1942 port *pt; 1970 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1971
1946 if (pt->kind & port_saw_EOF) 1972 if (pt->kind & port_saw_EOF)
1947 return EOF; 1973 return EOF;
1948 1974
1949 c = basic_inchar (pt); 1975 c = basic_inchar (pt);
… …
1959 } 1985 }
1960 1986
1961 return c; 1987 return c;
1962} 1988}
1963 1989
1964static int ungot = -1; 1990ecb_cold static int
1965
1966static int
1967basic_inchar (port *pt) 1991basic_inchar (port *pt)
1968{ 1992{
1969#if USE_PORTS
1970 if (pt->unget != -1) 1993 if (pt->unget != -1)
1971 { 1994 {
1972 int r = pt->unget; 1995 int r = pt->unget;
1973 pt->unget = -1; 1996 pt->unget = -1;
1974 return r; 1997 return r;
1975 } 1998 }
1976 1999
2000#if USE_PORTS
1977 if (pt->kind & port_file) 2001 if (pt->kind & port_file)
1978 { 2002 {
1979 char c; 2003 char c;
1980 2004
1981 if (!read (pt->rep.stdio.file, &c, 1)) 2005 if (!read (pt->rep.stdio.file, &c, 1))
… …
1989 return EOF; 2013 return EOF;
1990 else 2014 else
1991 return *pt->rep.string.curr++; 2015 return *pt->rep.string.curr++;
1992 } 2016 }
1993#else 2017#else
1994 if (ungot == -1)
1995 {
1996 char c; 2018 char c;
1997 if (!read (0, &c, 1)) 2019
2020 if (!read (pt->rep.stdio.file, &c, 1))
1998 return EOF; 2021 return EOF;
1999 2022
2000 ungot = c;
2001 }
2002
2003 {
2004 int r = ungot;
2005 ungot = -1;
2006 return r; 2023 return c;
2007 }
2008#endif 2024#endif
2009} 2025}
2010 2026
2011/* back character to input buffer */ 2027/* back character to input buffer */
2012static void 2028ecb_cold static void
2013backchar (SCHEME_P_ int c) 2029backchar (SCHEME_P_ int c)
2014{ 2030{
2015#if USE_PORTS 2031 port *pt = port (SCHEME_V->inport);
2016 port *pt;
2017 2032
2018 if (c == EOF) 2033 if (c == EOF)
2019 return; 2034 return;
2020 2035
2021 pt = SCHEME_V->inport->object.port;
2022 pt->unget = c; 2036 pt->unget = c;
2023#else
2024 if (c == EOF)
2025 return;
2026
2027 ungot = c;
2028#endif
2029} 2037}
2030 2038
2031#if USE_PORTS 2039#if USE_PORTS
2032static int 2040ecb_cold static int
2033realloc_port_string (SCHEME_P_ port *p) 2041realloc_port_string (SCHEME_P_ port *p)
2034{ 2042{
2035 char *start = p->rep.string.start; 2043 char *start = p->rep.string.start;
2036 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2044 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2037 char *str = malloc (new_size); 2045 char *str = malloc (new_size);
… …
2050 else 2058 else
2051 return 0; 2059 return 0;
2052} 2060}
2053#endif 2061#endif
2054 2062
2055INTERFACE void 2063ecb_cold static void
2056putstr (SCHEME_P_ const char *s) 2064putchars (SCHEME_P_ const char *s, int len)
2057{ 2065{
2066 port *pt = port (SCHEME_V->outport);
2067
2058#if USE_PORTS 2068#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port;
2060
2061 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s));
2063 else
2064 for (; *s; s++)
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = *s;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = *s;
2069
2070#else
2071 xwrstr (s);
2072#endif
2073}
2074
2075static void
2076putchars (SCHEME_P_ const char *s, int len)
2077{
2078#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port;
2080
2081 if (pt->kind & port_file) 2069 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2070 write (pt->rep.stdio.file, s, len);
2083 else 2071 else
2084 { 2072 {
2085 for (; len; len--) 2073 for (; len; len--)
… …
2090 *pt->rep.string.curr++ = *s++; 2078 *pt->rep.string.curr++ = *s++;
2091 } 2079 }
2092 } 2080 }
2093 2081
2094#else 2082#else
2095 write (1, s, len); 2083 write (1, s, len); // output not initialised
2096#endif 2084#endif
2085}
2086
2087INTERFACE void
2088putstr (SCHEME_P_ const char *s)
2089{
2090 putchars (SCHEME_A_ s, strlen (s));
2097} 2091}
2098 2092
2099INTERFACE void 2093INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2094putcharacter (SCHEME_P_ int c)
2101{ 2095{
2102#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port;
2104
2105 if (pt->kind & port_file)
2106 {
2107 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1);
2109 }
2110 else
2111 {
2112 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2113 *pt->rep.string.curr++ = c;
2114 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2115 *pt->rep.string.curr++ = c;
2116 }
2117
2118#else
2119 char cc = c; 2096 char cc = c;
2120 write (1, &c, 1); 2097
2121#endif 2098 putchars (SCHEME_A_ &cc, 1);
2122} 2099}
2123 2100
2124/* read characters up to delimiter, but cater to character constants */ 2101/* read characters up to delimiter, but cater to character constants */
2125static char * 2102ecb_cold static char *
2126readstr_upto (SCHEME_P_ int skip, const char *delim) 2103readstr_upto (SCHEME_P_ int skip, const char *delim)
2127{ 2104{
2128 char *p = SCHEME_V->strbuff + skip; 2105 char *p = SCHEME_V->strbuff + skip;
2129 2106
2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2107 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2139 2116
2140 return SCHEME_V->strbuff; 2117 return SCHEME_V->strbuff;
2141} 2118}
2142 2119
2143/* read string expression "xxx...xxx" */ 2120/* read string expression "xxx...xxx" */
2144static pointer 2121ecb_cold static pointer
2145readstrexp (SCHEME_P_ char delim) 2122readstrexp (SCHEME_P_ char delim)
2146{ 2123{
2147 char *p = SCHEME_V->strbuff; 2124 char *p = SCHEME_V->strbuff;
2148 int c; 2125 int c;
2149 int c1 = 0; 2126 int c1 = 0;
… …
2182 case '7': 2159 case '7':
2183 state = st_oct1; 2160 state = st_oct1;
2184 c1 = c - '0'; 2161 c1 = c - '0';
2185 break; 2162 break;
2186 2163
2164 case 'a': *p++ = '\a'; state = st_ok; break;
2165 case 'n': *p++ = '\n'; state = st_ok; break;
2166 case 'r': *p++ = '\r'; state = st_ok; break;
2167 case 't': *p++ = '\t'; state = st_ok; break;
2168
2169 case '\\':
2170 skipspace (SCHEME_A);
2171 break;
2172
2173 //TODO: x should end in ;, not two-digit hex
2187 case 'x': 2174 case 'x':
2188 case 'X': 2175 case 'X':
2189 state = st_x1; 2176 state = st_x1;
2190 c1 = 0; 2177 c1 = 0;
2191 break;
2192
2193 case 'n':
2194 *p++ = '\n';
2195 state = st_ok;
2196 break;
2197
2198 case 't':
2199 *p++ = '\t';
2200 state = st_ok;
2201 break;
2202
2203 case 'r':
2204 *p++ = '\r';
2205 state = st_ok;
2206 break; 2178 break;
2207 2179
2208 default: 2180 default:
2209 *p++ = c; 2181 *p++ = c;
2210 state = st_ok; 2182 state = st_ok;
… …
2262 } 2234 }
2263 } 2235 }
2264} 2236}
2265 2237
2266/* check c is in chars */ 2238/* check c is in chars */
2267ecb_inline int 2239ecb_cold int
2268is_one_of (const char *s, int c) 2240is_one_of (const char *s, int c)
2269{ 2241{
2270 return c == EOF || !!strchr (s, c); 2242 return c == EOF || !!strchr (s, c);
2271} 2243}
2272 2244
2273/* skip white characters */ 2245/* skip white characters */
2274ecb_inline int 2246ecb_cold int
2275skipspace (SCHEME_P) 2247skipspace (SCHEME_P)
2276{ 2248{
2277 int c, curr_line = 0; 2249 int c, curr_line = 0;
2278 2250
2279 do 2251 do
2280 { 2252 {
2281 c = inchar (SCHEME_A); 2253 c = inchar (SCHEME_A);
2254
2282#if SHOW_ERROR_LINE 2255#if SHOW_ERROR_LINE
2283 if (c == '\n') 2256 if (ecb_expect_false (c == '\n'))
2284 curr_line++; 2257 curr_line++;
2285#endif 2258#endif
2259
2260 if (ecb_expect_false (c == EOF))
2261 return c;
2286 } 2262 }
2287 while (is_one_of (WHITESPACE, c)); 2263 while (is_one_of (WHITESPACE, c));
2288 2264
2289 /* record it */ 2265 /* record it */
2290#if SHOW_ERROR_LINE 2266#if SHOW_ERROR_LINE
2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2267 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2268 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2293#endif 2269#endif
2294 2270
2295 if (c != EOF)
2296 {
2297 backchar (SCHEME_A_ c); 2271 backchar (SCHEME_A_ c);
2298 return 1; 2272 return 1;
2299 }
2300 else
2301 return EOF;
2302} 2273}
2303 2274
2304/* get token */ 2275/* get token */
2305static int 2276ecb_cold static int
2306token (SCHEME_P) 2277token (SCHEME_P)
2307{ 2278{
2308 int c = skipspace (SCHEME_A); 2279 int c = skipspace (SCHEME_A);
2309 2280
2310 if (c == EOF) 2281 if (c == EOF)
… …
2408} 2379}
2409 2380
2410/* ========== Routines for Printing ========== */ 2381/* ========== Routines for Printing ========== */
2411#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2382#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2412 2383
2413static void 2384ecb_cold static void
2414printslashstring (SCHEME_P_ char *p, int len) 2385printslashstring (SCHEME_P_ char *p, int len)
2415{ 2386{
2416 int i; 2387 int i;
2417 unsigned char *s = (unsigned char *) p; 2388 unsigned char *s = (unsigned char *) p;
2418 2389
… …
2474 2445
2475 putcharacter (SCHEME_A_ '"'); 2446 putcharacter (SCHEME_A_ '"');
2476} 2447}
2477 2448
2478/* print atoms */ 2449/* print atoms */
2479static void 2450ecb_cold static void
2480printatom (SCHEME_P_ pointer l, int f) 2451printatom (SCHEME_P_ pointer l, int f)
2481{ 2452{
2482 char *p; 2453 char *p;
2483 int len; 2454 int len;
2484 2455
2485 atom2str (SCHEME_A_ l, f, &p, &len); 2456 atom2str (SCHEME_A_ l, f, &p, &len);
2486 putchars (SCHEME_A_ p, len); 2457 putchars (SCHEME_A_ p, len);
2487} 2458}
2488 2459
2489/* Uses internal buffer unless string pointer is already available */ 2460/* Uses internal buffer unless string pointer is already available */
2490static void 2461ecb_cold static void
2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2462atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2492{ 2463{
2493 char *p; 2464 char *p;
2494 2465
2495 if (l == NIL) 2466 if (l == NIL)
… …
2702 return car (d); 2673 return car (d);
2703 2674
2704 p = cons (car (d), cdr (d)); 2675 p = cons (car (d), cdr (d));
2705 q = p; 2676 q = p;
2706 2677
2707 while (cdr (cdr (p)) != NIL) 2678 while (cddr (p) != NIL)
2708 { 2679 {
2709 d = cons (car (p), cdr (p)); 2680 d = cons (car (p), cdr (p));
2710 2681
2711 if (cdr (cdr (p)) != NIL) 2682 if (cddr (p) != NIL)
2712 p = cdr (d); 2683 p = cdr (d);
2713 } 2684 }
2714 2685
2715 set_cdr (p, car (cdr (p))); 2686 set_cdr (p, cadr (p));
2716 return q; 2687 return q;
2717} 2688}
2718 2689
2719/* reverse list -- produce new list */ 2690/* reverse list -- produce new list */
2720static pointer 2691ecb_hot static pointer
2721reverse (SCHEME_P_ pointer a) 2692reverse (SCHEME_P_ pointer a)
2722{ 2693{
2723 /* a must be checked by gc */ 2694 /* a must be checked by gc */
2724 pointer p = NIL; 2695 pointer p = NIL;
2725 2696
… …
2728 2699
2729 return p; 2700 return p;
2730} 2701}
2731 2702
2732/* reverse list --- in-place */ 2703/* reverse list --- in-place */
2733static pointer 2704ecb_hot static pointer
2734reverse_in_place (SCHEME_P_ pointer term, pointer list) 2705reverse_in_place (SCHEME_P_ pointer term, pointer list)
2735{ 2706{
2736 pointer result = term; 2707 pointer result = term;
2737 pointer p = list; 2708 pointer p = list;
2738 2709
… …
2746 2717
2747 return result; 2718 return result;
2748} 2719}
2749 2720
2750/* append list -- produce new list (in reverse order) */ 2721/* append list -- produce new list (in reverse order) */
2751static pointer 2722ecb_hot static pointer
2752revappend (SCHEME_P_ pointer a, pointer b) 2723revappend (SCHEME_P_ pointer a, pointer b)
2753{ 2724{
2754 pointer result = a; 2725 pointer result = a;
2755 pointer p = b; 2726 pointer p = b;
2756 2727
… …
2765 2736
2766 return S_F; /* signal an error */ 2737 return S_F; /* signal an error */
2767} 2738}
2768 2739
2769/* equivalence of atoms */ 2740/* equivalence of atoms */
2770int 2741ecb_hot int
2771eqv (pointer a, pointer b) 2742eqv (pointer a, pointer b)
2772{ 2743{
2773 if (is_string (a)) 2744 if (is_string (a))
2774 { 2745 {
2775 if (is_string (b)) 2746 if (is_string (b))
… …
2869 } 2840 }
2870 else 2841 else
2871 set_car (env, immutable_cons (slot, car (env))); 2842 set_car (env, immutable_cons (slot, car (env)));
2872} 2843}
2873 2844
2874static pointer 2845ecb_hot static pointer
2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2846find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2876{ 2847{
2877 pointer x, y; 2848 pointer x, y;
2878 2849
2879 for (x = env; x != NIL; x = cdr (x)) 2850 for (x = env; x != NIL; x = cdr (x))
… …
2900 return NIL; 2871 return NIL;
2901} 2872}
2902 2873
2903#else /* USE_ALIST_ENV */ 2874#else /* USE_ALIST_ENV */
2904 2875
2905ecb_inline void 2876static void
2906new_frame_in_env (SCHEME_P_ pointer old_env) 2877new_frame_in_env (SCHEME_P_ pointer old_env)
2907{ 2878{
2908 SCHEME_V->envir = immutable_cons (NIL, old_env); 2879 SCHEME_V->envir = immutable_cons (NIL, old_env);
2909 setenvironment (SCHEME_V->envir); 2880 setenvironment (SCHEME_V->envir);
2910} 2881}
2911 2882
2912ecb_inline void 2883static void
2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2884new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2914{ 2885{
2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2886 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2916} 2887}
2917 2888
2918static pointer 2889ecb_hot static pointer
2919find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2890find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2920{ 2891{
2921 pointer x, y; 2892 pointer x, y;
2922 2893
2923 for (x = env; x != NIL; x = cdr (x)) 2894 for (x = env; x != NIL; x = cdr (x))
… …
2937 return NIL; 2908 return NIL;
2938} 2909}
2939 2910
2940#endif /* USE_ALIST_ENV else */ 2911#endif /* USE_ALIST_ENV else */
2941 2912
2942ecb_inline void 2913static void
2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2944{ 2915{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2916 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2946 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2917 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2947} 2918}
2948 2919
2949ecb_inline void 2920static void
2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2921set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2951{ 2922{
2952 set_cdr (slot, value); 2923 set_cdr (slot, value);
2953} 2924}
2954 2925
2955ecb_inline pointer 2926static pointer
2956slot_value_in_env (pointer slot) 2927slot_value_in_env (pointer slot)
2957{ 2928{
2958 return cdr (slot); 2929 return cdr (slot);
2959} 2930}
2960 2931
2961/* ========== Evaluation Cycle ========== */ 2932/* ========== Evaluation Cycle ========== */
2962 2933
2963static int 2934ecb_cold static int
2964xError_1 (SCHEME_P_ const char *s, pointer a) 2935xError_1 (SCHEME_P_ const char *s, pointer a)
2965{ 2936{
2966#if USE_ERROR_HOOK 2937#if USE_ERROR_HOOK
2967 pointer x; 2938 pointer x;
2968 pointer hdl = SCHEME_V->ERROR_HOOK; 2939 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3044 pointer code; 3015 pointer code;
3045}; 3016};
3046 3017
3047# define STACK_GROWTH 3 3018# define STACK_GROWTH 3
3048 3019
3049static void 3020ecb_hot static void
3050s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3021s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3051{ 3022{
3052 int nframes = (uintptr_t)SCHEME_V->dump; 3023 int nframes = (uintptr_t)SCHEME_V->dump;
3053 struct dump_stack_frame *next_frame; 3024 struct dump_stack_frame *next_frame;
3054 3025
3055 /* enough room for the next frame? */ 3026 /* enough room for the next frame? */
3056 if (nframes >= SCHEME_V->dump_size) 3027 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3057 { 3028 {
3058 SCHEME_V->dump_size += STACK_GROWTH; 3029 SCHEME_V->dump_size += STACK_GROWTH;
3059 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3030 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3060 } 3031 }
3061 3032
… …
3067 next_frame->code = code; 3038 next_frame->code = code;
3068 3039
3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3040 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3070} 3041}
3071 3042
3072static int 3043static ecb_hot int
3073xs_return (SCHEME_P_ pointer a) 3044xs_return (SCHEME_P_ pointer a)
3074{ 3045{
3075 int nframes = (uintptr_t)SCHEME_V->dump; 3046 int nframes = (uintptr_t)SCHEME_V->dump;
3076 struct dump_stack_frame *frame; 3047 struct dump_stack_frame *frame;
3077 3048
… …
3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3059 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3089 3060
3090 return 0; 3061 return 0;
3091} 3062}
3092 3063
3093ecb_inline void 3064ecb_cold void
3094dump_stack_reset (SCHEME_P) 3065dump_stack_reset (SCHEME_P)
3095{ 3066{
3096 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3067 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3097 SCHEME_V->dump = (pointer)+0; 3068 SCHEME_V->dump = (pointer)+0;
3098} 3069}
3099 3070
3100ecb_inline void 3071ecb_cold void
3101dump_stack_initialize (SCHEME_P) 3072dump_stack_initialize (SCHEME_P)
3102{ 3073{
3103 SCHEME_V->dump_size = 0; 3074 SCHEME_V->dump_size = 0;
3104 SCHEME_V->dump_base = 0; 3075 SCHEME_V->dump_base = 0;
3105 dump_stack_reset (SCHEME_A); 3076 dump_stack_reset (SCHEME_A);
3106} 3077}
3107 3078
3108static void 3079ecb_cold static void
3109dump_stack_free (SCHEME_P) 3080dump_stack_free (SCHEME_P)
3110{ 3081{
3111 free (SCHEME_V->dump_base); 3082 free (SCHEME_V->dump_base);
3112 SCHEME_V->dump_base = 0; 3083 SCHEME_V->dump_base = 0;
3113 SCHEME_V->dump = (pointer)0; 3084 SCHEME_V->dump = (pointer)0;
3114 SCHEME_V->dump_size = 0; 3085 SCHEME_V->dump_size = 0;
3115} 3086}
3116 3087
3117static void 3088ecb_cold static void
3118dump_stack_mark (SCHEME_P) 3089dump_stack_mark (SCHEME_P)
3119{ 3090{
3120 int nframes = (uintptr_t)SCHEME_V->dump; 3091 int nframes = (uintptr_t)SCHEME_V->dump;
3121 int i; 3092 int i;
3122 3093
… …
3128 mark (frame->envir); 3099 mark (frame->envir);
3129 mark (frame->code); 3100 mark (frame->code);
3130 } 3101 }
3131} 3102}
3132 3103
3133static pointer 3104ecb_cold static pointer
3134ss_get_cont (SCHEME_P) 3105ss_get_cont (SCHEME_P)
3135{ 3106{
3136 int nframes = (uintptr_t)SCHEME_V->dump; 3107 int nframes = (uintptr_t)SCHEME_V->dump;
3137 int i; 3108 int i;
3138 3109
… …
3150 } 3121 }
3151 3122
3152 return cont; 3123 return cont;
3153} 3124}
3154 3125
3155static void 3126ecb_cold static void
3156ss_set_cont (SCHEME_P_ pointer cont) 3127ss_set_cont (SCHEME_P_ pointer cont)
3157{ 3128{
3158 int i = 0; 3129 int i = 0;
3159 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3130 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3160 3131
… …
3172 SCHEME_V->dump = (pointer)(uintptr_t)i; 3143 SCHEME_V->dump = (pointer)(uintptr_t)i;
3173} 3144}
3174 3145
3175#else 3146#else
3176 3147
3177ecb_inline void 3148ecb_cold void
3178dump_stack_reset (SCHEME_P) 3149dump_stack_reset (SCHEME_P)
3179{ 3150{
3180 SCHEME_V->dump = NIL; 3151 SCHEME_V->dump = NIL;
3181} 3152}
3182 3153
3183ecb_inline void 3154ecb_cold void
3184dump_stack_initialize (SCHEME_P) 3155dump_stack_initialize (SCHEME_P)
3185{ 3156{
3186 dump_stack_reset (SCHEME_A); 3157 dump_stack_reset (SCHEME_A);
3187} 3158}
3188 3159
3189static void 3160ecb_cold static void
3190dump_stack_free (SCHEME_P) 3161dump_stack_free (SCHEME_P)
3191{ 3162{
3192 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3193} 3164}
3194 3165
3195static int 3166ecb_hot static int
3196xs_return (SCHEME_P_ pointer a) 3167xs_return (SCHEME_P_ pointer a)
3197{ 3168{
3198 pointer dump = SCHEME_V->dump; 3169 pointer dump = SCHEME_V->dump;
3199 3170
3200 SCHEME_V->value = a; 3171 SCHEME_V->value = a;
… …
3210 SCHEME_V->dump = dump; 3181 SCHEME_V->dump = dump;
3211 3182
3212 return 0; 3183 return 0;
3213} 3184}
3214 3185
3215static void 3186ecb_hot static void
3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3187s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3217{ 3188{
3218 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3189 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3219 cons (args, 3190 cons (args,
3220 cons (SCHEME_V->envir, 3191 cons (SCHEME_V->envir,
3221 cons (code, 3192 cons (code,
3222 SCHEME_V->dump)))); 3193 SCHEME_V->dump))));
3223} 3194}
3224 3195
3196ecb_cold static void
3197dump_stack_mark (SCHEME_P)
3198{
3199 mark (SCHEME_V->dump);
3200}
3201
3202ecb_cold static pointer
3203ss_get_cont (SCHEME_P)
3204{
3205 return SCHEME_V->dump;
3206}
3207
3208ecb_cold static void
3209ss_set_cont (SCHEME_P_ pointer cont)
3210{
3211 SCHEME_V->dump = cont;
3212}
3213
3214#endif
3215
3216#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3217
3218#if EXPERIMENT
3219
3220typedef void *stream[1];
3221
3222#define stream_init() { 0 }
3223
3224ecb_cold static void
3225stream_put (void **s, uint8_t byte)
3226{
3227 uint32_t *sp = *s;
3228 uint32_t size = sizeof (uint32_t) * 2;
3229 uint32_t offs = size;
3230
3231 if (ecb_expect_true (sp))
3232 {
3233 offs = sp[0];
3234 size = sp[1];
3235 }
3236
3237 if (ecb_expect_false (offs == size))
3238 {
3239 size *= 2;
3240 sp = realloc (sp, size);
3241 *s = sp;
3242 sp[1] = size;
3243
3244 }
3245
3246 ((uint8_t *)sp)[offs++] = byte;
3247 sp[0] = offs;
3248}
3249
3250#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3251#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3252#define stream_free(s) free (s[0])
3253
3254// calculates a (preferably small) integer that makes it possible to find
3255// the symbol again. if pointers were offsets into a memory area... until
3256// then, we return segment number in the low bits, and offset in the high
3257// bits
3258static uint32_t
3259symbol_id (SCHEME_P_ pointer sym)
3260{
3261 struct cell *p = CELL (sym);
3262 int i;
3263
3264 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3265 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3266 {
3267 printf ("seg %d ofs %d/%d\n",i,(p - SCHEME_V->cell_seg[i]),SCHEME_V->cell_segsize[i]);//D
3268 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3269 }
3270
3271 abort ();
3272}
3273
3225static void 3274static void
3226dump_stack_mark (SCHEME_P) 3275compile (SCHEME_P_ stream s, pointer x)
3227{ 3276{
3228 mark (SCHEME_V->dump); 3277 if (x == NIL)
3229} 3278 {
3279 stream_put (s, 0);
3280 return;
3281 }
3230 3282
3231static pointer 3283 if (is_syntax (x))
3232ss_get_cont (SCHEME_P) 3284 {
3233{ 3285 stream_put (s, 1);
3234 return SCHEME_V->dump; 3286 stream_put (s, syntaxnum (x));
3235} 3287 return;
3288 }
3236 3289
3237static void 3290 switch (type (x))
3238ss_set_cont (SCHEME_P_ pointer cont) 3291 {
3239{ 3292 case T_INTEGER:
3240 SCHEME_V->dump = cont; 3293 stream_put (s, 2);
3241} 3294 stream_put (s, 0);
3295 stream_put (s, 0);
3296 stream_put (s, 0);
3297 stream_put (s, 0);
3298 return;
3242 3299
3243#endif 3300 case T_SYMBOL:
3301 {
3302 uint32_t sym = symbol_id (SCHEME_A_ x);
3303 printf ("sym %x\n", sym);//D
3244 3304
3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3305 stream_put (s, 3);
3246 3306
3247#if 1 3307 while (sym > 0x7f)
3308 {
3309 stream_put (s, sym | 0x80);
3310 sym >>= 8;
3311 }
3312
3313 stream_put (s, sym);
3314 }
3315 return;
3316
3317 case T_PAIR:
3318 stream_put (s, 4);
3319 while (x != NIL)
3320 {
3321 compile (SCHEME_A_ s, car (x));
3322 x = cdr (x);
3323 }
3324 stream_put (s, 0xff);
3325 return;
3326
3327 default:
3328 stream_put (s, 5);
3329 stream_put (s, type (x));
3330 stream_put (s, 0);
3331 stream_put (s, 0);
3332 stream_put (s, 0);
3333 stream_put (s, 0);
3334 break;
3335 }
3336}
3337
3248static int 3338static int
3339compile_closure (SCHEME_P_ pointer p)
3340{
3341 stream s = stream_init ();
3342
3343 printatom (SCHEME_A_ p, 1);//D
3344 compile (SCHEME_A_ s, car (p));
3345
3346 FILE *xxd = popen ("xxd", "we");
3347 fwrite (stream_data (s), 1, stream_size (s), xxd);
3348 fclose (xxd);
3349
3350 return stream_size (s);
3351}
3352
3353static int
3249debug (SCHEME_P_ int indent, pointer x) 3354dtree (SCHEME_P_ int indent, pointer x)
3250{ 3355{
3251 int c; 3356 int c;
3252 3357
3253 if (is_syntax (x)) 3358 if (is_syntax (x))
3254 { 3359 {
… …
3272 printf ("%*sS<%s>\n", indent, "", symname (x)); 3377 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8; 3378 return 24+8;
3274 3379
3275 case T_CLOSURE: 3380 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure"); 3381 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x)); 3382 dtree (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3383 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3279 3384
3280 case T_PAIR: 3385 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3386 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x)); 3387 c = dtree (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3388 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1; 3389 return c + 1;
3285 3390
3286 case T_PORT: 3391 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port"); 3392 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8; 3393 return 24+8;
… …
3291 printf ("%*sS<%s>\n", indent, "", "vector"); 3396 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8; 3397 return 24+8;
3293 3398
3294 case T_ENVIRONMENT: 3399 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment"); 3400 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3401 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3297 3402
3298 default: 3403 default:
3299 printf ("unhandled type %d\n", type (x)); 3404 printf ("unhandled type %d\n", type (x));
3300 break; 3405 break;
3301 } 3406 }
3302} 3407}
3303#endif 3408#endif
3304 3409
3305static int 3410/* syntax, eval, core, ... */
3411ecb_hot static int
3306opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3412opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3307{ 3413{
3308 pointer args = SCHEME_V->args; 3414 pointer args = SCHEME_V->args;
3309 pointer x, y; 3415 pointer x, y;
3310 3416
3311 switch (op) 3417 switch (op)
3312 { 3418 {
3313#if 1 //D 3419#if EXPERIMENT //D
3314 case OP_DEBUG: 3420 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3421 {
3422 uint32_t len = compile_closure (SCHEME_A_ car (args));
3423 printf ("len = %d\n", len);
3316 printf ("\n"); 3424 printf ("\n");
3317 s_return (S_T); 3425 s_return (S_T);
3426 }
3318#endif 3427#endif
3319 case OP_LOAD: /* load */ 3428 case OP_LOAD: /* load */
3320 if (file_interactive (SCHEME_A)) 3429 if (file_interactive (SCHEME_A))
3321 { 3430 {
3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3431 putstr (SCHEME_A_ "Loading ");
3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3432 putstr (SCHEME_A_ strvalue (car (args)));
3433 putcharacter (SCHEME_A_ '\n');
3324 } 3434 }
3325 3435
3326 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3436 if (!file_push (SCHEME_A_ strvalue (car (args))))
3327 Error_1 ("unable to open", car (args)); 3437 Error_1 ("unable to open", car (args));
3328 else 3438
3329 {
3330 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3439 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3331 s_goto (OP_T0LVL); 3440 s_goto (OP_T0LVL);
3332 }
3333 3441
3334 case OP_T0LVL: /* top level */ 3442 case OP_T0LVL: /* top level */
3335 3443
3336 /* If we reached the end of file, this loop is done. */ 3444 /* If we reached the end of file, this loop is done. */
3337 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3445 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3338 { 3446 {
3339 if (SCHEME_V->file_i == 0) 3447 if (SCHEME_V->file_i == 0)
3340 { 3448 {
3341 SCHEME_V->args = NIL; 3449 SCHEME_V->args = NIL;
3342 s_goto (OP_QUIT); 3450 s_goto (OP_QUIT);
… …
3353 /* If interactive, be nice to user. */ 3461 /* If interactive, be nice to user. */
3354 if (file_interactive (SCHEME_A)) 3462 if (file_interactive (SCHEME_A))
3355 { 3463 {
3356 SCHEME_V->envir = SCHEME_V->global_env; 3464 SCHEME_V->envir = SCHEME_V->global_env;
3357 dump_stack_reset (SCHEME_A); 3465 dump_stack_reset (SCHEME_A);
3358 putstr (SCHEME_A_ "\n"); 3466 putcharacter (SCHEME_A_ '\n');
3359 putstr (SCHEME_A_ prompt); 3467 putstr (SCHEME_A_ prompt);
3360 } 3468 }
3361 3469
3362 /* Set up another iteration of REPL */ 3470 /* Set up another iteration of REPL */
3363 SCHEME_V->nesting = 0; 3471 SCHEME_V->nesting = 0;
… …
3398 { 3506 {
3399 SCHEME_V->print_flag = 1; 3507 SCHEME_V->print_flag = 1;
3400 SCHEME_V->args = SCHEME_V->value; 3508 SCHEME_V->args = SCHEME_V->value;
3401 s_goto (OP_P0LIST); 3509 s_goto (OP_P0LIST);
3402 } 3510 }
3403 else 3511
3404 s_return (SCHEME_V->value); 3512 s_return (SCHEME_V->value);
3405 3513
3406 case OP_EVAL: /* main part of evaluation */ 3514 case OP_EVAL: /* main part of evaluation */
3407#if USE_TRACING 3515#if USE_TRACING
3408 if (SCHEME_V->tracing) 3516 if (SCHEME_V->tracing)
3409 { 3517 {
… …
3420#endif 3528#endif
3421 if (is_symbol (SCHEME_V->code)) /* symbol */ 3529 if (is_symbol (SCHEME_V->code)) /* symbol */
3422 { 3530 {
3423 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3531 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3424 3532
3425 if (x != NIL) 3533 if (x == NIL)
3426 s_return (slot_value_in_env (x));
3427 else
3428 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3534 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3535
3536 s_return (slot_value_in_env (x));
3429 } 3537 }
3430 else if (is_pair (SCHEME_V->code)) 3538 else if (is_pair (SCHEME_V->code))
3431 { 3539 {
3432 x = car (SCHEME_V->code); 3540 x = car (SCHEME_V->code);
3433 3541
… …
3442 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3550 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3443 SCHEME_V->code = x; 3551 SCHEME_V->code = x;
3444 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3445 } 3553 }
3446 } 3554 }
3447 else 3555
3448 s_return (SCHEME_V->code); 3556 s_return (SCHEME_V->code);
3449 3557
3450 case OP_E0ARGS: /* eval arguments */ 3558 case OP_E0ARGS: /* eval arguments */
3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3559 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3452 { 3560 {
3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3561 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
… …
3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3618 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3511 else if (is_foreign (SCHEME_V->code)) 3619 else if (is_foreign (SCHEME_V->code))
3512 { 3620 {
3513 /* Keep nested calls from GC'ing the arglist */ 3621 /* Keep nested calls from GC'ing the arglist */
3514 push_recent_alloc (SCHEME_A_ args, NIL); 3622 push_recent_alloc (SCHEME_A_ args, NIL);
3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3623 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3516 3624
3517 s_return (x); 3625 s_return (x);
3518 } 3626 }
3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3627 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3520 { 3628 {
… …
3557 3665
3558 case OP_DOMACRO: /* do macro */ 3666 case OP_DOMACRO: /* do macro */
3559 SCHEME_V->code = SCHEME_V->value; 3667 SCHEME_V->code = SCHEME_V->value;
3560 s_goto (OP_EVAL); 3668 s_goto (OP_EVAL);
3561 3669
3562#if 1
3563
3564 case OP_LAMBDA: /* lambda */ 3670 case OP_LAMBDA: /* lambda */
3565 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3671 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3566 set SCHEME_V->value fall thru */ 3672 set SCHEME_V->value fall thru */
3567 { 3673 {
3568 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3674 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3574 SCHEME_V->code = slot_value_in_env (f); 3680 SCHEME_V->code = slot_value_in_env (f);
3575 s_goto (OP_APPLY); 3681 s_goto (OP_APPLY);
3576 } 3682 }
3577 3683
3578 SCHEME_V->value = SCHEME_V->code; 3684 SCHEME_V->value = SCHEME_V->code;
3579 /* Fallthru */
3580 } 3685 }
3686 /* Fallthru */
3581 3687
3582 case OP_LAMBDA1: 3688 case OP_LAMBDA1:
3583 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3689 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3584
3585#else
3586
3587 case OP_LAMBDA: /* lambda */
3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3589
3590#endif
3591 3690
3592 case OP_MKCLOSURE: /* make-closure */ 3691 case OP_MKCLOSURE: /* make-closure */
3593 x = car (args); 3692 x = car (args);
3594 3693
3595 if (car (x) == SCHEME_V->LAMBDA) 3694 if (car (x) == SCHEME_V->LAMBDA)
… …
3634 else 3733 else
3635 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3734 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3636 3735
3637 s_return (SCHEME_V->code); 3736 s_return (SCHEME_V->code);
3638 3737
3639
3640 case OP_DEFP: /* defined? */ 3738 case OP_DEFP: /* defined? */
3641 x = SCHEME_V->envir; 3739 x = SCHEME_V->envir;
3642 3740
3643 if (cdr (args) != NIL) 3741 if (cdr (args) != NIL)
3644 x = cadr (args); 3742 x = cadr (args);
… …
3661 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3759 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3662 s_return (SCHEME_V->value); 3760 s_return (SCHEME_V->value);
3663 } 3761 }
3664 else 3762 else
3665 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3763 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3666
3667 3764
3668 case OP_BEGIN: /* begin */ 3765 case OP_BEGIN: /* begin */
3669 if (!is_pair (SCHEME_V->code)) 3766 if (!is_pair (SCHEME_V->code))
3670 s_return (SCHEME_V->code); 3767 s_return (SCHEME_V->code);
3671 3768
… …
3683 case OP_IF1: /* if */ 3780 case OP_IF1: /* if */
3684 if (is_true (SCHEME_V->value)) 3781 if (is_true (SCHEME_V->value))
3685 SCHEME_V->code = car (SCHEME_V->code); 3782 SCHEME_V->code = car (SCHEME_V->code);
3686 else 3783 else
3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 3784 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3785
3688 s_goto (OP_EVAL); 3786 s_goto (OP_EVAL);
3689 3787
3690 case OP_LET0: /* let */ 3788 case OP_LET0: /* let */
3691 SCHEME_V->args = NIL; 3789 SCHEME_V->args = NIL;
3692 SCHEME_V->value = SCHEME_V->code; 3790 SCHEME_V->value = SCHEME_V->code;
… …
3848 } 3946 }
3849 else 3947 else
3850 { 3948 {
3851 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3949 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3852 s_return (NIL); 3950 s_return (NIL);
3853 else 3951
3854 {
3855 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3952 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3856 SCHEME_V->code = caar (SCHEME_V->code); 3953 SCHEME_V->code = caar (SCHEME_V->code);
3857 s_goto (OP_EVAL); 3954 s_goto (OP_EVAL);
3858 }
3859 } 3955 }
3860 3956
3861 case OP_DELAY: /* delay */ 3957 case OP_DELAY: /* delay */
3862 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3958 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3863 set_typeflag (x, T_PROMISE); 3959 set_typeflag (x, T_PROMISE);
… …
3874 case OP_AND1: /* and */ 3970 case OP_AND1: /* and */
3875 if (is_false (SCHEME_V->value)) 3971 if (is_false (SCHEME_V->value))
3876 s_return (SCHEME_V->value); 3972 s_return (SCHEME_V->value);
3877 else if (SCHEME_V->code == NIL) 3973 else if (SCHEME_V->code == NIL)
3878 s_return (SCHEME_V->value); 3974 s_return (SCHEME_V->value);
3879 else 3975
3880 {
3881 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3976 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3882 SCHEME_V->code = car (SCHEME_V->code); 3977 SCHEME_V->code = car (SCHEME_V->code);
3883 s_goto (OP_EVAL); 3978 s_goto (OP_EVAL);
3884 }
3885 3979
3886 case OP_OR0: /* or */ 3980 case OP_OR0: /* or */
3887 if (SCHEME_V->code == NIL) 3981 if (SCHEME_V->code == NIL)
3888 s_return (S_F); 3982 s_return (S_F);
3889 3983
… …
3894 case OP_OR1: /* or */ 3988 case OP_OR1: /* or */
3895 if (is_true (SCHEME_V->value)) 3989 if (is_true (SCHEME_V->value))
3896 s_return (SCHEME_V->value); 3990 s_return (SCHEME_V->value);
3897 else if (SCHEME_V->code == NIL) 3991 else if (SCHEME_V->code == NIL)
3898 s_return (SCHEME_V->value); 3992 s_return (SCHEME_V->value);
3899 else 3993
3900 {
3901 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3994 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3902 SCHEME_V->code = car (SCHEME_V->code); 3995 SCHEME_V->code = car (SCHEME_V->code);
3903 s_goto (OP_EVAL); 3996 s_goto (OP_EVAL);
3904 }
3905 3997
3906 case OP_C0STREAM: /* cons-stream */ 3998 case OP_C0STREAM: /* cons-stream */
3907 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3999 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3908 SCHEME_V->code = car (SCHEME_V->code); 4000 SCHEME_V->code = car (SCHEME_V->code);
3909 s_goto (OP_EVAL); 4001 s_goto (OP_EVAL);
… …
3974 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4066 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3975 SCHEME_V->code = caar (x); 4067 SCHEME_V->code = caar (x);
3976 s_goto (OP_EVAL); 4068 s_goto (OP_EVAL);
3977 } 4069 }
3978 } 4070 }
3979 else 4071
3980 s_return (NIL); 4072 s_return (NIL);
3981 4073
3982 case OP_CASE2: /* case */ 4074 case OP_CASE2: /* case */
3983 if (is_true (SCHEME_V->value)) 4075 if (is_true (SCHEME_V->value))
3984 s_goto (OP_BEGIN); 4076 s_goto (OP_BEGIN);
3985 else 4077
3986 s_return (NIL); 4078 s_return (NIL);
3987 4079
3988 case OP_PAPPLY: /* apply */ 4080 case OP_PAPPLY: /* apply */
3989 SCHEME_V->code = car (args); 4081 SCHEME_V->code = car (args);
3990 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4082 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3991 /*SCHEME_V->args = cadr(args); */ 4083 /*SCHEME_V->args = cadr(args); */
… …
4005 } 4097 }
4006 4098
4007 if (USE_ERROR_CHECKING) abort (); 4099 if (USE_ERROR_CHECKING) abort ();
4008} 4100}
4009 4101
4010static int 4102/* math, cxr */
4103ecb_hot static int
4011opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4104opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4012{ 4105{
4013 pointer args = SCHEME_V->args; 4106 pointer args = SCHEME_V->args;
4014 pointer x = car (args); 4107 pointer x = car (args);
4015 num v; 4108 num v;
4016 4109
4017 switch (op) 4110 switch (op)
4018 { 4111 {
4019#if USE_MATH 4112#if USE_MATH
4020 case OP_INEX2EX: /* inexact->exact */ 4113 case OP_INEX2EX: /* inexact->exact */
4021 {
4022 if (is_integer (x)) 4114 if (!is_integer (x))
4023 s_return (x); 4115 {
4024
4025 RVALUE r = rvalue_unchecked (x); 4116 RVALUE r = rvalue_unchecked (x);
4026 4117
4027 if (r == (RVALUE)(IVALUE)r) 4118 if (r == (RVALUE)(IVALUE)r)
4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4119 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4029 else 4120 else
4030 Error_1 ("inexact->exact: not integral:", x); 4121 Error_1 ("inexact->exact: not integral:", x);
4031 } 4122 }
4032 4123
4124 s_return (x);
4125
4126 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4127 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4128 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4129 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4130
4131 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4033 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4132 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4034 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4133 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4134 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4035 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4135 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4136 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4037 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4137 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4038 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4138 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4039 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4139 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4040 4140
4041 case OP_ATAN: 4141 case OP_ATAN:
4142 s_return (mk_real (SCHEME_A_
4042 if (cdr (args) == NIL) 4143 cdr (args) == NIL
4043 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4144 ? atan (rvalue (x))
4044 else 4145 : atan2 (rvalue (x), rvalue (cadr (args)))));
4045 {
4046 pointer y = cadr (args);
4047 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4048 }
4049
4050 case OP_SQRT:
4051 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4052 4146
4053 case OP_EXPT: 4147 case OP_EXPT:
4054 { 4148 {
4055 RVALUE result; 4149 RVALUE result;
4056 int real_result = 1; 4150 int real_result = 1;
… …
4079 if (real_result) 4173 if (real_result)
4080 s_return (mk_real (SCHEME_A_ result)); 4174 s_return (mk_real (SCHEME_A_ result));
4081 else 4175 else
4082 s_return (mk_integer (SCHEME_A_ result)); 4176 s_return (mk_integer (SCHEME_A_ result));
4083 } 4177 }
4084
4085 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4087
4088 case OP_TRUNCATE:
4089 {
4090 RVALUE n = rvalue (x);
4091 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4092 }
4093
4094 case OP_ROUND:
4095 if (is_integer (x))
4096 s_return (x);
4097
4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4099#endif 4178#endif
4100 4179
4101 case OP_ADD: /* + */ 4180 case OP_ADD: /* + */
4102 v = num_zero; 4181 v = num_zero;
4103 4182
… …
4191 else 4270 else
4192 Error_0 ("modulo: division by zero"); 4271 Error_0 ("modulo: division by zero");
4193 4272
4194 s_return (mk_number (SCHEME_A_ v)); 4273 s_return (mk_number (SCHEME_A_ v));
4195 4274
4196 case OP_CAR: /* car */ 4275 /* the compiler will optimize this mess... */
4197 s_return (caar (args)); 4276 case OP_CAR: op_car: s_return (car (x));
4198 4277 case OP_CDR: op_cdr: s_return (cdr (x));
4199 case OP_CDR: /* cdr */ 4278 case OP_CAAR: op_caar: x = car (x); goto op_car;
4200 s_return (cdar (args)); 4279 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4280 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4281 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4282 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4283 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4284 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4285 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4286 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4287 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4288 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4289 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4290 case OP_CAAAAR: x = car (x); goto op_caaar;
4291 case OP_CAAADR: x = cdr (x); goto op_caaar;
4292 case OP_CAADAR: x = car (x); goto op_caadr;
4293 case OP_CAADDR: x = cdr (x); goto op_caadr;
4294 case OP_CADAAR: x = car (x); goto op_cadar;
4295 case OP_CADADR: x = cdr (x); goto op_cadar;
4296 case OP_CADDAR: x = car (x); goto op_caddr;
4297 case OP_CADDDR: x = cdr (x); goto op_caddr;
4298 case OP_CDAAAR: x = car (x); goto op_cdaar;
4299 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4300 case OP_CDADAR: x = car (x); goto op_cdadr;
4301 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4302 case OP_CDDAAR: x = car (x); goto op_cddar;
4303 case OP_CDDADR: x = cdr (x); goto op_cddar;
4304 case OP_CDDDAR: x = car (x); goto op_cdddr;
4305 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4201 4306
4202 case OP_CONS: /* cons */ 4307 case OP_CONS: /* cons */
4203 set_cdr (args, cadr (args)); 4308 set_cdr (args, cadr (args));
4204 s_return (args); 4309 s_return (args);
4205 4310
… …
4379 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4484 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4380 4485
4381 s_return (newstr); 4486 s_return (newstr);
4382 } 4487 }
4383 4488
4384 case OP_SUBSTR: /* substring */ 4489 case OP_STRING_COPY: /* substring/string-copy */
4385 { 4490 {
4386 char *str = strvalue (x); 4491 char *str = strvalue (x);
4387 int index0 = ivalue_unchecked (cadr (args)); 4492 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4388 int index1; 4493 int index1;
4389 int len; 4494 int len;
4390 4495
4391 if (index0 > strlength (x)) 4496 if (index0 > strlength (x))
4392 Error_1 ("substring: start out of bounds:", cadr (args)); 4497 Error_1 ("string->copy: start out of bounds:", cadr (args));
4393 4498
4394 if (cddr (args) != NIL) 4499 if (cddr (args) != NIL)
4395 { 4500 {
4396 index1 = ivalue_unchecked (caddr (args)); 4501 index1 = ivalue_unchecked (caddr (args));
4397 4502
4398 if (index1 > strlength (x) || index1 < index0) 4503 if (index1 > strlength (x) || index1 < index0)
4399 Error_1 ("substring: end out of bounds:", caddr (args)); 4504 Error_1 ("string->copy: end out of bounds:", caddr (args));
4400 } 4505 }
4401 else 4506 else
4402 index1 = strlength (x); 4507 index1 = strlength (x);
4403 4508
4404 len = index1 - index0; 4509 len = index1 - index0;
4405 x = mk_empty_string (SCHEME_A_ len, ' '); 4510 x = mk_counted_string (SCHEME_A_ str + index0, len);
4406 memcpy (strvalue (x), str + index0, len);
4407 strvalue (x)[len] = 0;
4408 4511
4409 s_return (x); 4512 s_return (x);
4410 } 4513 }
4411 4514
4412 case OP_VECTOR: /* vector */ 4515 case OP_VECTOR: /* vector */
… …
4486 } 4589 }
4487 4590
4488 if (USE_ERROR_CHECKING) abort (); 4591 if (USE_ERROR_CHECKING) abort ();
4489} 4592}
4490 4593
4491static int 4594/* relational ops */
4595ecb_hot static int
4492opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4596opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4493{ 4597{
4494 pointer x = SCHEME_V->args; 4598 pointer x = SCHEME_V->args;
4495 4599
4496 for (;;) 4600 for (;;)
… …
4517 } 4621 }
4518 4622
4519 s_return (S_T); 4623 s_return (S_T);
4520} 4624}
4521 4625
4522static int 4626/* predicates */
4627ecb_hot static int
4523opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4628opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4524{ 4629{
4525 pointer args = SCHEME_V->args; 4630 pointer args = SCHEME_V->args;
4526 pointer a = car (args); 4631 pointer a = car (args);
4527 pointer d = cdr (args); 4632 pointer d = cdr (args);
4528 int r; 4633 int r;
4529 4634
4530 switch (op) 4635 switch (op)
4531 { 4636 {
4532 case OP_NOT: /* not */ r = is_false (a) ; break; 4637 case OP_NOT: /* not */ r = is_false (a) ; break;
4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4638 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4639 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break; 4640 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4641 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4642 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4643 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4644 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4645 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4646 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4647 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4542 4648
4543#if USE_CHAR_CLASSIFIERS 4649#if USE_CHAR_CLASSIFIERS
4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4650 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4651 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4652 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4573 } 4679 }
4574 4680
4575 s_retbool (r); 4681 s_retbool (r);
4576} 4682}
4577 4683
4578static int 4684/* promises, list ops, ports */
4685ecb_hot static int
4579opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4686opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4580{ 4687{
4581 pointer args = SCHEME_V->args; 4688 pointer args = SCHEME_V->args;
4582 pointer a = car (args); 4689 pointer a = car (args);
4583 pointer x, y; 4690 pointer x, y;
… …
4596 } 4703 }
4597 else 4704 else
4598 s_return (SCHEME_V->code); 4705 s_return (SCHEME_V->code);
4599 4706
4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4707 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4601 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4708 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4602 s_return (SCHEME_V->value); 4709 s_return (SCHEME_V->value);
4603 4710
4604#if USE_PORTS 4711#if USE_PORTS
4712
4713 case OP_EOF_OBJECT: /* eof-object */
4714 s_return (S_EOF);
4605 4715
4606 case OP_WRITE: /* write */ 4716 case OP_WRITE: /* write */
4607 case OP_DISPLAY: /* display */ 4717 case OP_DISPLAY: /* display */
4608 case OP_WRITE_CHAR: /* write-char */ 4718 case OP_WRITE_CHAR: /* write-char */
4609 if (is_pair (cdr (SCHEME_V->args))) 4719 if (is_pair (cdr (SCHEME_V->args)))
… …
4623 else 4733 else
4624 SCHEME_V->print_flag = 0; 4734 SCHEME_V->print_flag = 0;
4625 4735
4626 s_goto (OP_P0LIST); 4736 s_goto (OP_P0LIST);
4627 4737
4738 //TODO: move to scheme
4628 case OP_NEWLINE: /* newline */ 4739 case OP_NEWLINE: /* newline */
4629 if (is_pair (args)) 4740 if (is_pair (args))
4630 { 4741 {
4631 if (a != SCHEME_V->outport) 4742 if (a != SCHEME_V->outport)
4632 { 4743 {
… …
4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4745 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4635 SCHEME_V->outport = a; 4746 SCHEME_V->outport = a;
4636 } 4747 }
4637 } 4748 }
4638 4749
4639 putstr (SCHEME_A_ "\n"); 4750 putcharacter (SCHEME_A_ '\n');
4640 s_return (S_T); 4751 s_return (S_T);
4641#endif 4752#endif
4642 4753
4643 case OP_ERR0: /* error */ 4754 case OP_ERR0: /* error */
4644 SCHEME_V->retcode = -1; 4755 SCHEME_V->retcode = -1;
… …
4653 putstr (SCHEME_A_ strvalue (car (args))); 4764 putstr (SCHEME_A_ strvalue (car (args)));
4654 SCHEME_V->args = cdr (args); 4765 SCHEME_V->args = cdr (args);
4655 s_goto (OP_ERR1); 4766 s_goto (OP_ERR1);
4656 4767
4657 case OP_ERR1: /* error */ 4768 case OP_ERR1: /* error */
4658 putstr (SCHEME_A_ " "); 4769 putcharacter (SCHEME_A_ ' ');
4659 4770
4660 if (args != NIL) 4771 if (args != NIL)
4661 { 4772 {
4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4773 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4663 SCHEME_V->args = a; 4774 SCHEME_V->args = a;
4664 SCHEME_V->print_flag = 1; 4775 SCHEME_V->print_flag = 1;
4665 s_goto (OP_P0LIST); 4776 s_goto (OP_P0LIST);
4666 } 4777 }
4667 else 4778 else
4668 { 4779 {
4669 putstr (SCHEME_A_ "\n"); 4780 putcharacter (SCHEME_A_ '\n');
4670 4781
4671 if (SCHEME_V->interactive_repl) 4782 if (SCHEME_V->interactive_repl)
4672 s_goto (OP_T0LVL); 4783 s_goto (OP_T0LVL);
4673 else 4784 else
4674 return -1; 4785 return -1;
… …
4751 SCHEME_V->gc_verbose = (a != S_F); 4862 SCHEME_V->gc_verbose = (a != S_F);
4752 s_retbool (was); 4863 s_retbool (was);
4753 } 4864 }
4754 4865
4755 case OP_NEWSEGMENT: /* new-segment */ 4866 case OP_NEWSEGMENT: /* new-segment */
4867#if 0
4756 if (!is_pair (args) || !is_number (a)) 4868 if (!is_pair (args) || !is_number (a))
4757 Error_0 ("new-segment: argument must be a number"); 4869 Error_0 ("new-segment: argument must be a number");
4758 4870#endif
4759 alloc_cellseg (SCHEME_A_ ivalue (a)); 4871 s_retbool (alloc_cellseg (SCHEME_A));
4760
4761 s_return (S_T);
4762 4872
4763 case OP_OBLIST: /* oblist */ 4873 case OP_OBLIST: /* oblist */
4764 s_return (oblist_all_symbols (SCHEME_A)); 4874 s_return (oblist_all_symbols (SCHEME_A));
4765 4875
4766#if USE_PORTS 4876#if USE_PORTS
… …
4836 s_return (p == NIL ? S_F : p); 4946 s_return (p == NIL ? S_F : p);
4837 } 4947 }
4838 4948
4839 case OP_GET_OUTSTRING: /* get-output-string */ 4949 case OP_GET_OUTSTRING: /* get-output-string */
4840 { 4950 {
4841 port *p; 4951 port *p = port (a);
4842 4952
4843 if ((p = a->object.port)->kind & port_string) 4953 if (p->kind & port_string)
4844 { 4954 {
4845 off_t size; 4955 off_t size;
4846 char *str; 4956 char *str;
4847 4957
4848 size = p->rep.string.curr - p->rep.string.start + 1; 4958 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4883 } 4993 }
4884 4994
4885 if (USE_ERROR_CHECKING) abort (); 4995 if (USE_ERROR_CHECKING) abort ();
4886} 4996}
4887 4997
4888static int 4998/* reading */
4999ecb_cold static int
4889opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5000opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4890{ 5001{
4891 pointer args = SCHEME_V->args; 5002 pointer args = SCHEME_V->args;
4892 pointer x; 5003 pointer x;
4893 5004
… …
4953 int res; 5064 int res;
4954 5065
4955 if (is_pair (args)) 5066 if (is_pair (args))
4956 p = car (args); 5067 p = car (args);
4957 5068
4958 res = p->object.port->kind & port_string; 5069 res = port (p)->kind & port_string;
4959 5070
4960 s_retbool (res); 5071 s_retbool (res);
4961 } 5072 }
4962 5073
4963 case OP_SET_INPORT: /* set-input-port */ 5074 case OP_SET_INPORT: /* set-input-port */
… …
5162 pointer b = cdr (args); 5273 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b); 5274 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b); 5275 SCHEME_V->args = car (b);
5165 5276
5166 if (a == SCHEME_V->QUOTE && ok_abbr) 5277 if (a == SCHEME_V->QUOTE && ok_abbr)
5167 putstr (SCHEME_A_ "'"); 5278 putcharacter (SCHEME_A_ '\'');
5168 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5279 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`"); 5280 putcharacter (SCHEME_A_ '`');
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5281 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ","); 5282 putcharacter (SCHEME_A_ ',');
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5283 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@"); 5284 putstr (SCHEME_A_ ",@");
5174 else 5285 else
5175 { 5286 {
5176 putstr (SCHEME_A_ "("); 5287 putcharacter (SCHEME_A_ '(');
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5288 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a; 5289 SCHEME_V->args = a;
5179 } 5290 }
5180 5291
5181 s_goto (OP_P0LIST); 5292 s_goto (OP_P0LIST);
… …
5183 5294
5184 case OP_P1LIST: 5295 case OP_P1LIST:
5185 if (is_pair (args)) 5296 if (is_pair (args))
5186 { 5297 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5298 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5188 putstr (SCHEME_A_ " "); 5299 putcharacter (SCHEME_A_ ' ');
5189 SCHEME_V->args = car (args); 5300 SCHEME_V->args = car (args);
5190 s_goto (OP_P0LIST); 5301 s_goto (OP_P0LIST);
5191 } 5302 }
5192 else if (is_vector (args)) 5303 else if (is_vector (args))
5193 { 5304 {
… …
5201 { 5312 {
5202 putstr (SCHEME_A_ " . "); 5313 putstr (SCHEME_A_ " . ");
5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5314 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5204 } 5315 }
5205 5316
5206 putstr (SCHEME_A_ ")"); 5317 putcharacter (SCHEME_A_ ')');
5207 s_return (S_T); 5318 s_return (S_T);
5208 } 5319 }
5209 5320
5210 case OP_PVECFROM: 5321 case OP_PVECFROM:
5211 { 5322 {
… …
5213 pointer vec = car (args); 5324 pointer vec = car (args);
5214 int len = veclength (vec); 5325 int len = veclength (vec);
5215 5326
5216 if (i == len) 5327 if (i == len)
5217 { 5328 {
5218 putstr (SCHEME_A_ ")"); 5329 putcharacter (SCHEME_A_ ')');
5219 s_return (S_T); 5330 s_return (S_T);
5220 } 5331 }
5221 else 5332 else
5222 { 5333 {
5223 pointer elem = vector_get (vec, i); 5334 pointer elem = vector_get (vec, i);
… …
5225 ivalue_unchecked (cdr (args)) = i + 1; 5336 ivalue_unchecked (cdr (args)) = i + 1;
5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5337 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5227 SCHEME_V->args = elem; 5338 SCHEME_V->args = elem;
5228 5339
5229 if (i > 0) 5340 if (i > 0)
5230 putstr (SCHEME_A_ " "); 5341 putcharacter (SCHEME_A_ ' ');
5231 5342
5232 s_goto (OP_P0LIST); 5343 s_goto (OP_P0LIST);
5233 } 5344 }
5234 } 5345 }
5235 } 5346 }
5236 5347
5237 if (USE_ERROR_CHECKING) abort (); 5348 if (USE_ERROR_CHECKING) abort ();
5238} 5349}
5239 5350
5240static int 5351/* list ops */
5352ecb_hot static int
5241opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5353opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5242{ 5354{
5243 pointer args = SCHEME_V->args; 5355 pointer args = SCHEME_V->args;
5244 pointer a = car (args); 5356 pointer a = car (args);
5245 pointer x, y; 5357 pointer x, y;
… …
5303 5415
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5416/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5417typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5306 5418
5307typedef int (*test_predicate)(pointer); 5419typedef int (*test_predicate)(pointer);
5308static int 5420
5421ecb_hot static int
5309tst_any (pointer p) 5422tst_any (pointer p)
5310{ 5423{
5311 return 1; 5424 return 1;
5312} 5425}
5313 5426
5314static int 5427ecb_hot static int
5315tst_inonneg (pointer p) 5428tst_inonneg (pointer p)
5316{ 5429{
5317 return is_integer (p) && ivalue_unchecked (p) >= 0; 5430 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318} 5431}
5319 5432
5320static int 5433ecb_hot static int
5321tst_is_list (SCHEME_P_ pointer p) 5434tst_is_list (SCHEME_P_ pointer p)
5322{ 5435{
5323 return p == NIL || is_pair (p); 5436 return p == NIL || is_pair (p);
5324} 5437}
5325 5438
… …
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5481#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h" 5482#include "opdefines.h"
5370#undef OP_DEF 5483#undef OP_DEF
5371; 5484;
5372 5485
5373static const char * 5486ecb_cold static const char *
5374opname (int idx) 5487opname (int idx)
5375{ 5488{
5376 const char *name = opnames; 5489 const char *name = opnames;
5377 5490
5378 /* should do this at compile time, but would require external program, right? */ 5491 /* should do this at compile time, but would require external program, right? */
… …
5380 name += strlen (name) + 1; 5493 name += strlen (name) + 1;
5381 5494
5382 return *name ? name : "ILLEGAL"; 5495 return *name ? name : "ILLEGAL";
5383} 5496}
5384 5497
5385static const char * 5498ecb_cold static const char *
5386procname (pointer x) 5499procname (pointer x)
5387{ 5500{
5388 return opname (procnum (x)); 5501 return opname (procnum (x));
5389} 5502}
5390 5503
… …
5410#undef OP_DEF 5523#undef OP_DEF
5411 {0} 5524 {0}
5412}; 5525};
5413 5526
5414/* kernel of this interpreter */ 5527/* kernel of this interpreter */
5415static void ecb_hot 5528ecb_hot static void
5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5529Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5417{ 5530{
5418 SCHEME_V->op = op; 5531 SCHEME_V->op = op;
5419 5532
5420 for (;;) 5533 for (;;)
… …
5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5616 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5504 return; 5617 return;
5505 5618
5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5619 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5507 { 5620 {
5508 xwrstr ("No memory!\n"); 5621 putstr (SCHEME_A_ "No memory!\n");
5509 return; 5622 return;
5510 } 5623 }
5511 } 5624 }
5512} 5625}
5513 5626
5514/* ========== Initialization of internal keywords ========== */ 5627/* ========== Initialization of internal keywords ========== */
5515 5628
5516static void 5629ecb_cold static void
5517assign_syntax (SCHEME_P_ const char *name) 5630assign_syntax (SCHEME_P_ const char *name)
5518{ 5631{
5519 pointer x = oblist_add_by_name (SCHEME_A_ name); 5632 pointer x = oblist_add_by_name (SCHEME_A_ name);
5520 set_typeflag (x, typeflag (x) | T_SYNTAX); 5633 set_typeflag (x, typeflag (x) | T_SYNTAX);
5521} 5634}
5522 5635
5523static void 5636ecb_cold static void
5524assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5637assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5525{ 5638{
5526 pointer x = mk_symbol (SCHEME_A_ name); 5639 pointer x = mk_symbol (SCHEME_A_ name);
5527 pointer y = mk_proc (SCHEME_A_ op); 5640 pointer y = mk_proc (SCHEME_A_ op);
5528 new_slot_in_env (SCHEME_A_ x, y); 5641 new_slot_in_env (SCHEME_A_ x, y);
… …
5536 ivalue_unchecked (y) = op; 5649 ivalue_unchecked (y) = op;
5537 return y; 5650 return y;
5538} 5651}
5539 5652
5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5653/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5541static int 5654ecb_hot static int
5542syntaxnum (pointer p) 5655syntaxnum (pointer p)
5543{ 5656{
5544 const char *s = strvalue (p); 5657 const char *s = strvalue (p);
5545 5658
5546 switch (strlength (p)) 5659 switch (strlength (p))
… …
5626ecb_cold int 5739ecb_cold int
5627scheme_init (SCHEME_P) 5740scheme_init (SCHEME_P)
5628{ 5741{
5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5742 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5630 pointer x; 5743 pointer x;
5744
5745 /* this memset is not strictly correct, as we assume (intcache)
5746 * that memset 0 will also set pointers to 0, but memset does
5747 * of course not guarantee that. screw such systems.
5748 */
5749 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5631 5750
5632 num_set_fixnum (num_zero, 1); 5751 num_set_fixnum (num_zero, 1);
5633 num_set_ivalue (num_zero, 0); 5752 num_set_ivalue (num_zero, 0);
5634 num_set_fixnum (num_one, 1); 5753 num_set_fixnum (num_one, 1);
5635 num_set_ivalue (num_one, 1); 5754 num_set_ivalue (num_one, 1);
… …
5647 SCHEME_V->save_inport = NIL; 5766 SCHEME_V->save_inport = NIL;
5648 SCHEME_V->loadport = NIL; 5767 SCHEME_V->loadport = NIL;
5649 SCHEME_V->nesting = 0; 5768 SCHEME_V->nesting = 0;
5650 SCHEME_V->interactive_repl = 0; 5769 SCHEME_V->interactive_repl = 0;
5651 5770
5652 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5771 if (!alloc_cellseg (SCHEME_A))
5653 { 5772 {
5654#if USE_ERROR_CHECKING 5773#if USE_ERROR_CHECKING
5655 SCHEME_V->no_memory = 1; 5774 SCHEME_V->no_memory = 1;
5656 return 0; 5775 return 0;
5657#endif 5776#endif
5658 } 5777 }
5659 5778
5660 SCHEME_V->gc_verbose = 0; 5779 SCHEME_V->gc_verbose = 0;
5661 dump_stack_initialize (SCHEME_A); 5780 dump_stack_initialize (SCHEME_A);
5662 SCHEME_V->code = NIL; 5781 SCHEME_V->code = NIL;
5663 SCHEME_V->args = NIL; 5782 SCHEME_V->args = NIL;
5664 SCHEME_V->envir = NIL; 5783 SCHEME_V->envir = NIL;
5784 SCHEME_V->value = NIL;
5665 SCHEME_V->tracing = 0; 5785 SCHEME_V->tracing = 0;
5666 5786
5667 /* init NIL */ 5787 /* init NIL */
5668 set_typeflag (NIL, T_ATOM | T_MARK); 5788 set_typeflag (NIL, T_ATOM | T_MARK);
5669 set_car (NIL, NIL); 5789 set_car (NIL, NIL);
… …
5725 5845
5726 return !SCHEME_V->no_memory; 5846 return !SCHEME_V->no_memory;
5727} 5847}
5728 5848
5729#if USE_PORTS 5849#if USE_PORTS
5730void 5850ecb_cold void
5731scheme_set_input_port_file (SCHEME_P_ int fin) 5851scheme_set_input_port_file (SCHEME_P_ int fin)
5732{ 5852{
5733 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5853 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5734} 5854}
5735 5855
5736void 5856ecb_cold void
5737scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5857scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5738{ 5858{
5739 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5859 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5740} 5860}
5741 5861
5742void 5862ecb_cold void
5743scheme_set_output_port_file (SCHEME_P_ int fout) 5863scheme_set_output_port_file (SCHEME_P_ int fout)
5744{ 5864{
5745 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5865 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5746} 5866}
5747 5867
5748void 5868ecb_cold void
5749scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5869scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5750{ 5870{
5751 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5871 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5752} 5872}
5753#endif 5873#endif
5754 5874
5755void 5875ecb_cold void
5756scheme_set_external_data (SCHEME_P_ void *p) 5876scheme_set_external_data (SCHEME_P_ void *p)
5757{ 5877{
5758 SCHEME_V->ext_data = p; 5878 SCHEME_V->ext_data = p;
5759} 5879}
5760 5880
… …
5808 } 5928 }
5809 } 5929 }
5810#endif 5930#endif
5811} 5931}
5812 5932
5813void 5933ecb_cold void
5814scheme_load_file (SCHEME_P_ int fin) 5934scheme_load_file (SCHEME_P_ int fin)
5815{ 5935{
5816 scheme_load_named_file (SCHEME_A_ fin, 0); 5936 scheme_load_named_file (SCHEME_A_ fin, 0);
5817} 5937}
5818 5938
5819void 5939ecb_cold void
5820scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5940scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5821{ 5941{
5822 dump_stack_reset (SCHEME_A); 5942 dump_stack_reset (SCHEME_A);
5823 SCHEME_V->envir = SCHEME_V->global_env; 5943 SCHEME_V->envir = SCHEME_V->global_env;
5824 SCHEME_V->file_i = 0; 5944 SCHEME_V->file_i = 0;
5825 SCHEME_V->load_stack[0].unget = -1; 5945 SCHEME_V->load_stack[0].unget = -1;
5826 SCHEME_V->load_stack[0].kind = port_input | port_file; 5946 SCHEME_V->load_stack[0].kind = port_input | port_file;
5827 SCHEME_V->load_stack[0].rep.stdio.file = fin; 5947 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5828#if USE_PORTS
5829 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5948 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5830#endif
5831 SCHEME_V->retcode = 0; 5949 SCHEME_V->retcode = 0;
5832 5950
5833#if USE_PORTS
5834 if (fin == STDIN_FILENO) 5951 if (fin == STDIN_FILENO)
5835 SCHEME_V->interactive_repl = 1; 5952 SCHEME_V->interactive_repl = 1;
5836#endif
5837 5953
5838#if USE_PORTS 5954#if USE_PORTS
5839#if SHOW_ERROR_LINE 5955#if SHOW_ERROR_LINE
5840 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 5956 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5841 5957
… …
5845#endif 5961#endif
5846 5962
5847 SCHEME_V->inport = SCHEME_V->loadport; 5963 SCHEME_V->inport = SCHEME_V->loadport;
5848 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5964 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5849 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5965 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5966
5850 set_typeflag (SCHEME_V->loadport, T_ATOM); 5967 set_typeflag (SCHEME_V->loadport, T_ATOM);
5851 5968
5852 if (SCHEME_V->retcode == 0) 5969 if (SCHEME_V->retcode == 0)
5853 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5970 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5854} 5971}
5855 5972
5856void 5973ecb_cold void
5857scheme_load_string (SCHEME_P_ const char *cmd) 5974scheme_load_string (SCHEME_P_ const char *cmd)
5858{ 5975{
5976#if USE_PORTs
5859 dump_stack_reset (SCHEME_A); 5977 dump_stack_reset (SCHEME_A);
5860 SCHEME_V->envir = SCHEME_V->global_env; 5978 SCHEME_V->envir = SCHEME_V->global_env;
5861 SCHEME_V->file_i = 0; 5979 SCHEME_V->file_i = 0;
5862 SCHEME_V->load_stack[0].kind = port_input | port_string; 5980 SCHEME_V->load_stack[0].kind = port_input | port_string;
5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 5981 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 5982 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 5983 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5866#if USE_PORTS
5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5984 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5868#endif
5869 SCHEME_V->retcode = 0; 5985 SCHEME_V->retcode = 0;
5870 SCHEME_V->interactive_repl = 0; 5986 SCHEME_V->interactive_repl = 0;
5871 SCHEME_V->inport = SCHEME_V->loadport; 5987 SCHEME_V->inport = SCHEME_V->loadport;
5872 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5988 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5873 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5989 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5874 set_typeflag (SCHEME_V->loadport, T_ATOM); 5990 set_typeflag (SCHEME_V->loadport, T_ATOM);
5875 5991
5876 if (SCHEME_V->retcode == 0) 5992 if (SCHEME_V->retcode == 0)
5877 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5993 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5994#else
5995 abort ();
5996#endif
5878} 5997}
5879 5998
5880void 5999ecb_cold void
5881scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6000scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5882{ 6001{
5883 pointer x; 6002 pointer x;
5884 6003
5885 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6004 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5890 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6009 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5891} 6010}
5892 6011
5893#if !STANDALONE 6012#if !STANDALONE
5894 6013
5895void 6014ecb_cold void
5896scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6015scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5897{ 6016{
5898 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6017 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5899} 6018}
5900 6019
5901void 6020ecb_cold void
5902scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6021scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5903{ 6022{
5904 int i; 6023 int i;
5905 6024
5906 for (i = 0; i < count; i++) 6025 for (i = 0; i < count; i++)
5907 scheme_register_foreign_func (SCHEME_A_ list + i); 6026 scheme_register_foreign_func (SCHEME_A_ list + i);
5908} 6027}
5909 6028
5910pointer 6029ecb_cold pointer
5911scheme_apply0 (SCHEME_P_ const char *procname) 6030scheme_apply0 (SCHEME_P_ const char *procname)
5912{ 6031{
5913 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6032 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5914} 6033}
5915 6034
5916void 6035ecb_cold void
5917save_from_C_call (SCHEME_P) 6036save_from_C_call (SCHEME_P)
5918{ 6037{
5919 pointer saved_data = cons (car (S_SINK), 6038 pointer saved_data = cons (car (S_SINK),
5920 cons (SCHEME_V->envir, 6039 cons (SCHEME_V->envir,
5921 SCHEME_V->dump)); 6040 SCHEME_V->dump));
… …
5925 /* Truncate the dump stack so TS will return here when done, not 6044 /* Truncate the dump stack so TS will return here when done, not
5926 directly resume pre-C-call operations. */ 6045 directly resume pre-C-call operations. */
5927 dump_stack_reset (SCHEME_A); 6046 dump_stack_reset (SCHEME_A);
5928} 6047}
5929 6048
5930void 6049ecb_cold void
5931restore_from_C_call (SCHEME_P) 6050restore_from_C_call (SCHEME_P)
5932{ 6051{
5933 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6052 set_car (S_SINK, caar (SCHEME_V->c_nest));
5934 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6053 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5935 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6054 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5936 /* Pop */ 6055 /* Pop */
5937 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6056 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5938} 6057}
5939 6058
5940/* "func" and "args" are assumed to be already eval'ed. */ 6059/* "func" and "args" are assumed to be already eval'ed. */
5941pointer 6060ecb_cold pointer
5942scheme_call (SCHEME_P_ pointer func, pointer args) 6061scheme_call (SCHEME_P_ pointer func, pointer args)
5943{ 6062{
5944 int old_repl = SCHEME_V->interactive_repl; 6063 int old_repl = SCHEME_V->interactive_repl;
5945 6064
5946 SCHEME_V->interactive_repl = 0; 6065 SCHEME_V->interactive_repl = 0;
… …
5953 SCHEME_V->interactive_repl = old_repl; 6072 SCHEME_V->interactive_repl = old_repl;
5954 restore_from_C_call (SCHEME_A); 6073 restore_from_C_call (SCHEME_A);
5955 return SCHEME_V->value; 6074 return SCHEME_V->value;
5956} 6075}
5957 6076
5958pointer 6077ecb_cold pointer
5959scheme_eval (SCHEME_P_ pointer obj) 6078scheme_eval (SCHEME_P_ pointer obj)
5960{ 6079{
5961 int old_repl = SCHEME_V->interactive_repl; 6080 int old_repl = SCHEME_V->interactive_repl;
5962 6081
5963 SCHEME_V->interactive_repl = 0; 6082 SCHEME_V->interactive_repl = 0;
… …
5975 6094
5976/* ========== Main ========== */ 6095/* ========== Main ========== */
5977 6096
5978#if STANDALONE 6097#if STANDALONE
5979 6098
5980int 6099ecb_cold int
5981main (int argc, char **argv) 6100main (int argc, char **argv)
5982{ 6101{
5983# if USE_MULTIPLICITY 6102# if USE_MULTIPLICITY
5984 scheme ssc; 6103 scheme ssc;
5985 scheme *const SCHEME_V = &ssc; 6104 scheme *const SCHEME_V = &ssc;
… …
5991 int isfile = 1; 6110 int isfile = 1;
5992 system ("ps v $PPID");//D 6111 system ("ps v $PPID");//D
5993 6112
5994 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6113 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5995 { 6114 {
5996 xwrstr ("Usage: tinyscheme -?\n"); 6115 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6116 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5998 xwrstr ("followed by\n"); 6117 putstr (SCHEME_A_ "followed by\n");
5999 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6118 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6000 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6119 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6001 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6120 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6002 xwrstr ("Use - as filename for stdin.\n"); 6121 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6003 return 1; 6122 return 1;
6004 } 6123 }
6005 6124
6006 if (!scheme_init (SCHEME_A)) 6125 if (!scheme_init (SCHEME_A))
6007 { 6126 {
6008 xwrstr ("Could not initialize!\n"); 6127 putstr (SCHEME_A_ "Could not initialize!\n");
6009 return 2; 6128 return 2;
6010 } 6129 }
6011 6130
6012# if USE_PORTS 6131# if USE_PORTS
6013 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6132 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6026 } 6145 }
6027#endif 6146#endif
6028 6147
6029 do 6148 do
6030 { 6149 {
6031#if USE_PORTS
6032 if (strcmp (file_name, "-") == 0) 6150 if (strcmp (file_name, "-") == 0)
6033 fin = STDIN_FILENO; 6151 fin = STDIN_FILENO;
6034 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6152 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6035 { 6153 {
6036 pointer args = NIL; 6154 pointer args = NIL;
… …
6054 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6172 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6055 6173
6056 } 6174 }
6057 else 6175 else
6058 fin = open (file_name, O_RDONLY); 6176 fin = open (file_name, O_RDONLY);
6059#endif
6060 6177
6061 if (isfile && fin < 0) 6178 if (isfile && fin < 0)
6062 { 6179 {
6063 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6180 putstr (SCHEME_A_ "Could not open file ");
6181 putstr (SCHEME_A_ file_name);
6182 putcharacter (SCHEME_A_ '\n');
6064 } 6183 }
6065 else 6184 else
6066 { 6185 {
6067 if (isfile) 6186 if (isfile)
6068 scheme_load_named_file (SCHEME_A_ fin, file_name); 6187 scheme_load_named_file (SCHEME_A_ fin, file_name);
6069 else 6188 else
6070 scheme_load_string (SCHEME_A_ file_name); 6189 scheme_load_string (SCHEME_A_ file_name);
6071 6190
6072#if USE_PORTS
6073 if (!isfile || fin != STDIN_FILENO) 6191 if (!isfile || fin != STDIN_FILENO)
6074 { 6192 {
6075 if (SCHEME_V->retcode != 0) 6193 if (SCHEME_V->retcode != 0)
6076 { 6194 {
6077 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6195 putstr (SCHEME_A_ "Errors encountered reading ");
6196 putstr (SCHEME_A_ file_name);
6197 putcharacter (SCHEME_A_ '\n');
6078 } 6198 }
6079 6199
6080 if (isfile) 6200 if (isfile)
6081 close (fin); 6201 close (fin);
6082 } 6202 }
6083#endif
6084 } 6203 }
6085 6204
6086 file_name = *argv++; 6205 file_name = *argv++;
6087 } 6206 }
6088 while (file_name != 0); 6207 while (file_name != 0);

Diff Legend

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