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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.67 by root, Mon Dec 7 19:49:35 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52
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
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
46 68
47enum { 69enum {
48 TOK_EOF, 70 TOK_EOF,
49 TOK_LPAREN, 71 TOK_LPAREN,
50 TOK_RPAREN, 72 TOK_RPAREN,
51 TOK_DOT, 73 TOK_DOT,
52 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 77 TOK_QUOTE,
54 TOK_DQUOTE, 78 TOK_DQUOTE,
55 TOK_BQUOTE, 79 TOK_BQUOTE,
56 TOK_COMMA, 80 TOK_COMMA,
57 TOK_ATMARK, 81 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
60 TOK_VEC 84 TOK_VEC
61}; 85};
62 86
63#define BACKQUOTE '`' 87#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
65 90
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 96
72#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
73static scheme sc; 98static scheme sc;
74#endif 99#endif
75 100
76static void 101ecb_cold static void
77xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
78{ 103{
79 if (n < 0) 104 if (n < 0)
80 { 105 {
81 *s++ = '-'; 106 *s++ = '-';
… …
83 } 108 }
84 109
85 char *p = s; 110 char *p = s;
86 111
87 do { 112 do {
88 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 114 n /= base;
90 } while (n); 115 } while (n);
91 116
92 *p-- = 0; 117 *p-- = 0;
93 118
… …
96 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
97 --p; ++s; 122 --p; ++s;
98 } 123 }
99} 124}
100 125
101static void 126ecb_cold static void
102xnum (char *s, long n) 127xnum (char *s, long n)
103{ 128{
104 xbase (s, n, 10); 129 xbase (s, n, 10);
105} 130}
106 131
107static void 132ecb_cold static void
108xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 134{
116 char buf[64]; 135 char buf[64];
117 136
118 xnum (buf, n); 137 xnum (buf, n);
119 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
120} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
121 144
122static char 145static char
123xtoupper (char c) 146xtoupper (char c)
124{ 147{
125 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
145 168
146#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
149 172
173#endif
174
150#if USE_IGNORECASE 175#if USE_IGNORECASE
151static const char * 176ecb_cold static const char *
152xstrlwr (char *s) 177xstrlwr (char *s)
153{ 178{
154 const char *p = s; 179 const char *p = s;
155 180
156 while (*s) 181 while (*s)
… …
169# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
170# define strlwr(s) (s) 195# define strlwr(s) (s)
171#endif 196#endif
172 197
173#ifndef prompt 198#ifndef prompt
174# define prompt "ts> " 199# define prompt "ms> "
175#endif 200#endif
176 201
177#ifndef InitFile 202#ifndef InitFile
178# define InitFile "init.scm" 203# define InitFile "init.scm"
179#endif 204#endif
180 205
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 206enum scheme_types
186{ 207{
208 T_INTEGER,
209 T_CHARACTER,
187 T_FREE, 210 T_REAL,
188 T_STRING, 211 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 212 T_SYMBOL,
191 T_PROC, 213 T_PROC,
192 T_PAIR, 214 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
194 T_CONTINUATION, 218 T_CONTINUATION,
195 T_FOREIGN, 219 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 220 T_PORT,
198 T_VECTOR, 221 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 222 T_PROMISE,
201 T_ENVIRONMENT, 223 T_ENVIRONMENT,
202 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
203 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
204}; 227};
205 228
206#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
207#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
208#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
209#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
234
235/* num, for generic arithmetic */
236struct num
237{
238 IVALUE ivalue;
239#if USE_REAL
240 RVALUE rvalue;
241 char is_fixnum;
242#endif
243};
244
245#if USE_REAL
246# define num_is_fixnum(n) (n).is_fixnum
247# define num_set_fixnum(n,f) (n).is_fixnum = (f)
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).rvalue
250# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).rvalue = (r)
252#else
253# define num_is_fixnum(n) 1
254# define num_set_fixnum(n,f) 0
255# define num_ivalue(n) (n).ivalue
256# define num_rvalue(n) (n).ivalue
257# define num_set_ivalue(n,i) (n).ivalue = (i)
258# define num_set_rvalue(n,r) (n).ivalue = (r)
259#endif
211 260
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 261enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 262
214static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 265static num num_rem (num a, num b);
217static num num_mod (num a, num b); 266static num num_mod (num a, num b);
218 267
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
223 269
224static num num_zero; 270static num num_zero;
225static num num_one; 271static num num_one;
226 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
227/* macros for cell operations */ 277/* macros for cell operations */
228#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
229#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
230#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
231 281
232INTERFACE int 282INTERFACE int
233is_string (pointer p) 283is_string (pointer p)
234{ 284{
235 return type (p) == T_STRING; 285 return type (p) == T_STRING;
236} 286}
237 287
238#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
240
241INTERFACE int is_list (SCHEME_P_ pointer p);
242 290
243INTERFACE int 291INTERFACE int
244is_vector (pointer p) 292is_vector (pointer p)
245{ 293{
246 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
247} 295}
248 296
249#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
251INTERFACE void fill_vector (pointer vec, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252INTERFACE uint32_t vector_length (pointer vec);
253INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255 302
256INTERFACE uint32_t 303INTERFACE int
257vector_length (pointer vec) 304is_integer (pointer p)
258{ 305{
259 return vec->object.vector.length; 306 return type (p) == T_INTEGER;
307}
308
309/* not the same as in scheme, where integers are (correctly :) reals */
310INTERFACE int
311is_real (pointer p)
312{
313 return type (p) == T_REAL;
260} 314}
261 315
262INTERFACE int 316INTERFACE int
263is_number (pointer p) 317is_number (pointer p)
264{ 318{
265 return type (p) == T_NUMBER; 319 return is_integer (p) || is_real (p);
266}
267
268INTERFACE int
269is_integer (pointer p)
270{
271 return is_number (p) && num_is_fixnum (p->object.number);
272}
273
274INTERFACE int
275is_real (pointer p)
276{
277 return is_number (p) && !num_is_fixnum (p->object.number);
278} 320}
279 321
280INTERFACE int 322INTERFACE int
281is_character (pointer p) 323is_character (pointer p)
282{ 324{
… …
287string_value (pointer p) 329string_value (pointer p)
288{ 330{
289 return strvalue (p); 331 return strvalue (p);
290} 332}
291 333
292ecb_inline num
293nvalue (pointer p)
294{
295 return (p)->object.number;
296}
297
298static IVALUE
299num_get_ivalue (const num n)
300{
301 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302}
303
304static RVALUE
305num_get_rvalue (const num n)
306{
307 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308}
309
310INTERFACE IVALUE
311ivalue (pointer p)
312{
313 return num_get_ivalue (p->object.number);
314}
315
316INTERFACE RVALUE
317rvalue (pointer p)
318{
319 return num_get_rvalue (p->object.number);
320}
321
322#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 334#define ivalue_unchecked(p) (CELL(p)->object.ivalue + 0)
335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
336
323#if USE_REAL 337#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 340#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
329# define set_num_integer(p) 0 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 343#endif
332 344
333INTERFACE long 345INTERFACE long
334charvalue (pointer p) 346charvalue (pointer p)
335{ 347{
336 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
337} 349}
338 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
339INTERFACE int 353INTERFACE int
340is_port (pointer p) 354is_port (pointer p)
341{ 355{
342 return type (p) == T_PORT; 356 return type (p) == T_PORT;
343} 357}
344 358
345INTERFACE int 359INTERFACE int
346is_inport (pointer p) 360is_inport (pointer p)
347{ 361{
348 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
349} 363}
350 364
351INTERFACE int 365INTERFACE int
352is_outport (pointer p) 366is_outport (pointer p)
353{ 367{
354 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
355} 369}
356 370
357INTERFACE int 371INTERFACE int
358is_pair (pointer p) 372is_pair (pointer p)
359{ 373{
360 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
361} 375}
362 376
363#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
364#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
365 379
366static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
367static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
368static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
369static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
370 384
371static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
372static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
373static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
374 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
375INTERFACE void 391INTERFACE void
376set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
377{ 393{
378 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
379} 395}
380 396
381INTERFACE void 397INTERFACE void
382set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
383{ 399{
384 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
385} 401}
386 402
387INTERFACE pointer 403INTERFACE pointer
388pair_car (pointer p) 404pair_car (pointer p)
389{ 405{
… …
403} 419}
404 420
405INTERFACE char * 421INTERFACE char *
406symname (pointer p) 422symname (pointer p)
407{ 423{
408 return strvalue (car (p)); 424 return strvalue (p);
409} 425}
410 426
411#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
412SCHEME_EXPORT int 430SCHEME_EXPORT int
413hasprop (pointer p) 431hasprop (pointer p)
414{ 432{
415 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
416} 434}
417
418# define symprop(p) cdr(p)
419#endif 435#endif
420 436
421INTERFACE int 437INTERFACE int
422is_syntax (pointer p) 438is_syntax (pointer p)
423{ 439{
… …
437} 453}
438 454
439INTERFACE char * 455INTERFACE char *
440syntaxname (pointer p) 456syntaxname (pointer p)
441{ 457{
442 return strvalue (car (p)); 458 return strvalue (p);
443} 459}
444 460
445#define procnum(p) ivalue (p) 461#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 462static const char *procname (pointer x);
447 463
448INTERFACE int 464INTERFACE int
449is_closure (pointer p) 465is_closure (pointer p)
450{ 466{
… …
495 511
496#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
497#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
498#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
499 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
500#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
501#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
502#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
503 525
504INTERFACE int 526INTERFACE int
505is_immutable (pointer p) 527is_immutable (pointer p)
506{ 528{
507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
513#if USE_ERROR_CHECKING 535#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 536 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 537#endif
516} 538}
517 539
540/* Result is:
541 proper list: length
542 circular list: -1
543 not even a pair: -2
544 dotted list: -2 minus length before dot
545*/
546ecb_hot INTERFACE int
547list_length (SCHEME_P_ pointer a)
548{
549 int i = 0;
550 pointer slow, fast;
551
552 slow = fast = a;
553
554 while (1)
555 {
556 if (fast == NIL)
557 return i;
558
559 if (!is_pair (fast))
560 return -2 - i;
561
562 fast = cdr (fast);
563 ++i;
564
565 if (fast == NIL)
566 return i;
567
568 if (!is_pair (fast))
569 return -2 - i;
570
571 ++i;
572 fast = cdr (fast);
573
574 /* Safe because we would have already returned if `fast'
575 encountered a non-pair. */
576 slow = cdr (slow);
577
578 if (fast == slow)
579 {
580 /* the fast pointer has looped back around and caught up
581 with the slow pointer, hence the structure is circular,
582 not of finite length, and therefore not a list */
583 return -1;
584 }
585 }
586}
587
588INTERFACE int
589is_list (SCHEME_P_ pointer a)
590{
591 return list_length (SCHEME_A_ a) >= 0;
592}
593
518#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
519ecb_inline int 596ecb_inline int
520Cisalpha (int c) 597Cisalpha (int c)
521{ 598{
522 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
523} 600}
… …
581 "gs", 658 "gs",
582 "rs", 659 "rs",
583 "us" 660 "us"
584}; 661};
585 662
586static int 663ecb_cold static int
587is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
588{ 665{
589 int i; 666 int i;
590 667
591 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
609#endif 686#endif
610 687
611static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
614ecb_inline int is_one_of (char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
618static int count_consecutive_cells (pointer x, int needed);
619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
620static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
621static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
622static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
623static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
624static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
625 701
702static pointer mk_port (SCHEME_P_ port *p);
703
626#if USE_PORTS 704#if USE_PORTS
627static pointer mk_port (SCHEME_P_ port *p);
628static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
629static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
630static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
631static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
632static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
633static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
634static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
635#endif 712#endif
713
636static void mark (pointer a); 714static void mark (pointer a);
637static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
638static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
639static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
640static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
641static char *readstr_upto (SCHEME_P_ char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642static pointer readstrexp (SCHEME_P); 720static pointer readstrexp (SCHEME_P_ char delim);
643ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
644static int token (SCHEME_P); 722static int token (SCHEME_P);
645static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 742static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 743static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 744static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 745static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 746
747static IVALUE
748ivalue (pointer x)
749{
750 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
751}
752
753static RVALUE
754rvalue (pointer x)
755{
756 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
757}
758
759INTERFACE num
760nvalue (pointer x)
761{
762 num n;
763
764 num_set_fixnum (n, is_integer (x));
765
766 if (num_is_fixnum (n))
767 num_set_ivalue (n, ivalue_unchecked (x));
768 else
769 num_set_rvalue (n, rvalue_unchecked (x));
770
771 return n;
772}
773
669static num 774static num
670num_op (enum num_op op, num a, num b) 775num_op (enum num_op op, num a, num b)
671{ 776{
672 num ret; 777 num ret;
673 778
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 779 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 780
676 if (num_is_fixnum (ret)) 781 if (num_is_fixnum (ret))
677 { 782 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 783 switch (op)
682 { 784 {
683 case NUM_ADD: av += bv; break; 785 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 786 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 787 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 788 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 789 }
688 790
689 num_set_ivalue (ret, av); 791 num_set_ivalue (ret, a.ivalue);
690 } 792 }
793#if USE_REAL
691 else 794 else
692 { 795 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 796 switch (op)
697 { 797 {
698 case NUM_ADD: av += bv; break; 798 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 799 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 800 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 801 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 802 }
703 803
704 num_set_rvalue (ret, av); 804 num_set_rvalue (ret, a.rvalue);
705 } 805 }
806#endif
706 807
707 return ret; 808 return ret;
708} 809}
709 810
710static num 811static num
711num_div (num a, num b) 812num_div (num a, num b)
712{ 813{
713 num ret; 814 num ret;
714 815
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 816 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 817
717 if (num_is_fixnum (ret)) 818 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 819 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 820 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 821 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 822
722 return ret; 823 return ret;
723} 824}
724 825
725static num 826static num
… …
727{ 828{
728 num ret; 829 num ret;
729 long e1, e2, res; 830 long e1, e2, res;
730 831
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 832 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 833 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 834 e2 = num_ivalue (b);
734 res = e1 % e2; 835 res = e1 % e2;
735 836
736 /* remainder should have same sign as second operand */ 837 /* remainder should have same sign as second operand */
737 if (res > 0) 838 if (res > 0)
738 { 839 {
… …
754{ 855{
755 num ret; 856 num ret;
756 long e1, e2, res; 857 long e1, e2, res;
757 858
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 859 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 860 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 861 e2 = num_ivalue (b);
761 res = e1 % e2; 862 res = e1 % e2;
762 863
763 /* modulo should have same sign as second operand */ 864 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 865 if (res * e2 < 0)
765 res += e2; 866 res += e2;
… …
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 876 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 877 int ret;
777 878
778 if (is_fixnum) 879 if (is_fixnum)
779 { 880 {
780 IVALUE av = num_get_ivalue (a); 881 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 882 IVALUE bv = num_ivalue (b);
782 883
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 884 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 885 }
785 else 886 else
786 { 887 {
787 RVALUE av = num_get_rvalue (a); 888 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 889 RVALUE bv = num_rvalue (b);
789 890
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 891 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 892 }
792 893
793 return ret; 894 return ret;
794} 895}
795
796#if USE_MATH
797
798/* Round to nearest. Round to even if midway */
799static double
800round_per_R5RS (double x)
801{
802 double fl = floor (x);
803 double ce = ceil (x);
804 double dfl = x - fl;
805 double dce = ce - x;
806
807 if (dfl > dce)
808 return ce;
809 else if (dfl < dce)
810 return fl;
811 else
812 {
813 if (fmod (fl, 2) == 0) /* I imagine this holds */
814 return fl;
815 else
816 return ce;
817 }
818}
819#endif
820 896
821static int 897static int
822is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
823{ 899{
824 return x == 0; 900 return x == 0;
… …
830#endif 906#endif
831#endif 907#endif
832} 908}
833 909
834/* allocate new cell segment */ 910/* allocate new cell segment */
835static int 911ecb_cold static int
836alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
837{ 913{
838 pointer newp; 914 struct cell *newp;
839 pointer last; 915 struct cell *last;
840 pointer p; 916 struct cell *p;
841 char *cp; 917 char *cp;
842 long i; 918 long i;
843 int k; 919 int k;
844 920
845 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
846 segsize <<= 1; 922 segsize <<= 1;
847 923
848 for (k = 0; k < n; k++)
849 {
850 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
851 return k;
852
853 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
854 925
855 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
856 return k; 927 return k;
857 928
858 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
859 SCHEME_V->alloc_seg[i] = cp;
860 930
861 /* insert new segment in address order */ 931 newp = (struct cell *)cp;
862 newp = (pointer)cp;
863 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
864 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
865
866 //TODO: insert, not swap
867 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868 {
869 p = SCHEME_V->cell_seg[i];
870 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871 SCHEME_V->cell_seg[i - 1] = p;
872
873 k = SCHEME_V->cell_segsize[i];
874 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875 SCHEME_V->cell_segsize[i - 1] = k;
876
877 --i;
878 }
879
880 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 935 last = newp + segsize - 1;
882 936
883 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
884 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
885 set_typeflag (p, T_FREE); 941 set_typeflag (cp, T_PAIR);
886 set_car (p, NIL); 942 set_car (cp, NIL);
887 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
888 } 944 }
889 945
890 /* insert new cells in address order on free list */
891 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892 {
893 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
894 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
895 }
896 else
897 {
898 p = SCHEME_V->free_cell;
899 948
900 while (cdr (p) != NIL && newp > cdr (p))
901 p = cdr (p);
902
903 set_cdr (last, cdr (p));
904 set_cdr (p, newp);
905 }
906 }
907
908 return n; 949 return 1;
909} 950}
910 951
911/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
912ecb_inline pointer 953ecb_inline pointer
913get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
918 return S_SINK; 959 return S_SINK;
919 960
920 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
921 { 962 {
922 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
923 964
924 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
925 966
926 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
927 { 968 {
928 /* if only a few recovered, get more to avoid fruitless gc's */ 969 /* if only a few recovered, get more to avoid fruitless gc's */
929 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
930 { 971 {
931#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
932 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
933 return S_SINK; 974 return S_SINK;
934#endif 975#endif
… …
946 } 987 }
947} 988}
948 989
949/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
950 Tehom */ 991 Tehom */
951 992ecb_hot static void
952static void
953push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
954{ 994{
955 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
956 996
957 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
959 set_car (holder, recent); 999 set_car (holder, recent);
960 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
961 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
962} 1002}
963 1003
964static pointer 1004ecb_hot static pointer
965get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
966{ 1006{
967 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
968 1008
969 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
978} 1018}
979 1019
980static pointer 1020static pointer
981get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
982{ 1022{
983 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
984 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
985 1025
986 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
987 return S_SINK; 1027 return S_SINK;
988 1028
989 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
990 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
991 1031
992 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
993 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
994 fill_vector (v, init); 1034 fill_vector (v, 0, init);
995 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
996 1036
997 return v; 1037 return v;
998} 1038}
999 1039
… …
1007static void 1047static void
1008check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1009{ 1049{
1010 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1011 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1012 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1013 1053
1014 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1015 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1016} 1056}
1017 1057
1018static void 1058static void
1019check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1020{ 1060{
… …
1026#endif 1066#endif
1027 1067
1028/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1029 1069
1030/* get new cons cell */ 1070/* get new cons cell */
1031pointer 1071ecb_hot static pointer
1032xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1033{ 1073{
1034 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1035 1075
1036 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1037
1038 if (immutable)
1039 setimmutable (x);
1040 1077
1041 set_car (x, a); 1078 set_car (x, a);
1042 set_cdr (x, b); 1079 set_cdr (x, b);
1043 1080
1044 return x; 1081 return x;
1045} 1082}
1046 1083
1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1096generate_symbol (SCHEME_P_ const char *name)
1097{
1098 pointer x = mk_string (SCHEME_A_ name);
1099 setimmutable (x);
1100 set_typeflag (x, T_SYMBOL | T_ATOM);
1101 return x;
1102}
1103
1047/* ========== oblist implementation ========== */ 1104/* ========== oblist implementation ========== */
1048 1105
1049#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1050 1107
1108static int
1051static int hash_fn (const char *key, int table_size); 1109hash_fn (const char *key, int table_size)
1110{
1111 const unsigned char *p = (unsigned char *)key;
1112 uint32_t hash = 2166136261U;
1052 1113
1114 while (*p)
1115 hash = (hash ^ *p++) * 16777619;
1116
1117 return hash % table_size;
1118}
1119
1053static pointer 1120ecb_cold static pointer
1054oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1055{ 1122{
1056 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1057} 1124}
1058 1125
1059/* returns the new symbol */ 1126/* returns the new symbol */
1060static pointer 1127ecb_cold static pointer
1061oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1062{ 1129{
1063 int location; 1130 pointer x = generate_symbol (SCHEME_A_ name);
1064
1065 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066 set_typeflag (x, T_SYMBOL);
1067 setimmutable (car (x));
1068
1069 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071 return x; 1133 return x;
1072} 1134}
1073 1135
1074ecb_inline pointer 1136ecb_cold static pointer
1075oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1076{ 1138{
1077 int location; 1139 int location;
1078 pointer x; 1140 pointer x;
1079 char *s; 1141 char *s;
1080 1142
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1143 location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 1144
1083 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1145 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084 { 1146 {
1085 s = symname (car (x)); 1147 s = symname (car (x));
1086 1148
1087 /* case-insensitive, per R5RS section 2 */ 1149 /* case-insensitive, per R5RS section 2 */
1088 if (stricmp (name, s) == 0) 1150 if (stricmp (name, s) == 0)
… …
1090 } 1152 }
1091 1153
1092 return NIL; 1154 return NIL;
1093} 1155}
1094 1156
1095static pointer 1157ecb_cold static pointer
1096oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1097{ 1159{
1098 int i; 1160 int i;
1099 pointer x; 1161 pointer x;
1100 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
1101 1163
1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1165 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104 ob_list = cons (x, ob_list); 1166 ob_list = cons (x, ob_list);
1105 1167
1106 return ob_list; 1168 return ob_list;
1107} 1169}
1108 1170
1109#else 1171#else
1110 1172
1111static pointer 1173ecb_cold static pointer
1112oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1113{ 1175{
1114 return NIL; 1176 return NIL;
1115} 1177}
1116 1178
1117ecb_inline pointer 1179ecb_cold static pointer
1118oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1119{ 1181{
1120 pointer x; 1182 pointer x;
1121 char *s; 1183 char *s;
1122 1184
… …
1131 1193
1132 return NIL; 1194 return NIL;
1133} 1195}
1134 1196
1135/* returns the new symbol */ 1197/* returns the new symbol */
1136static pointer 1198ecb_cold static pointer
1137oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1138{ 1200{
1139 pointer x; 1201 pointer x = generate_symbol (SCHEME_A_ name);
1140
1141 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142 set_typeflag (x, T_SYMBOL);
1143 setimmutable (car (x));
1144 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145 return x; 1203 return x;
1146} 1204}
1147 1205
1148static pointer 1206ecb_cold static pointer
1149oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1150{ 1208{
1151 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1152} 1210}
1153 1211
1154#endif 1212#endif
1155 1213
1156#if USE_PORTS
1157static pointer 1214ecb_cold static pointer
1158mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1159{ 1216{
1160 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1161 1218
1162 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1163 x->object.port = p; 1220 set_port (x, p);
1164 1221
1165 return x; 1222 return x;
1166} 1223}
1167#endif
1168 1224
1169pointer 1225ecb_cold pointer
1170mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1171{ 1227{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1229
1174 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1175 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1176 1232
1177 return x; 1233 return x;
1178} 1234}
1179 1235
1180INTERFACE pointer 1236INTERFACE pointer
1181mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1182{ 1238{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1240
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1186 ivalue_unchecked (x) = c & 0xff; 1242 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1243
1188 return x; 1244 return x;
1189} 1245}
1190 1246
1191/* get number atom (integer) */ 1247/* get number atom (integer) */
1192INTERFACE pointer 1248INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1249mk_integer (SCHEME_P_ long n)
1194{ 1250{
1251 pointer p = 0;
1252 pointer *pp = &p;
1253
1254#if USE_INTCACHE
1255 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1256 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1257#endif
1258
1259 if (!*pp)
1260 {
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1262
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1198 ivalue_unchecked (x) = num; 1264 setimmutable (x); /* shouldn't do anything, doesn't cost anything */
1199 set_num_integer (x); 1265 set_ivalue (x, n);
1266
1267 *pp = x;
1268 }
1269
1200 return x; 1270 return *pp;
1201} 1271}
1202 1272
1203INTERFACE pointer 1273INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1205{ 1275{
1276#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1278
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1209 rvalue_unchecked (x) = n; 1280 set_rvalue (x, n);
1210 set_num_real (x); 1281
1211 return x; 1282 return x;
1283#else
1284 return mk_integer (SCHEME_A_ n);
1285#endif
1212} 1286}
1213 1287
1214static pointer 1288static pointer
1215mk_number (SCHEME_P_ const num n) 1289mk_number (SCHEME_P_ const num n)
1216{ 1290{
1291#if USE_REAL
1217 if (num_is_fixnum (n)) 1292 return num_is_fixnum (n)
1293 ? mk_integer (SCHEME_A_ num_ivalue (n))
1294 : mk_real (SCHEME_A_ num_rvalue (n));
1295#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1296 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1297#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1298}
1222 1299
1223/* allocate name to string area */ 1300/* allocate name to string area */
1224static char * 1301static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1302store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1231 SCHEME_V->no_memory = 1; 1308 SCHEME_V->no_memory = 1;
1232 return SCHEME_V->strbuff; 1309 return SCHEME_V->strbuff;
1233 } 1310 }
1234 1311
1235 if (str) 1312 if (str)
1236 { 1313 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237 int l = strlen (str);
1238
1239 if (l > len_str)
1240 l = len_str;
1241
1242 memcpy (q, str, l);
1243 q[l] = 0;
1244 }
1245 else 1314 else
1246 {
1247 memset (q, fill, len_str); 1315 memset (q, fill, len_str);
1316
1248 q[len_str] = 0; 1317 q[len_str] = 0;
1249 }
1250 1318
1251 return q; 1319 return q;
1252} 1320}
1253 1321
1254INTERFACE pointer 1322INTERFACE pointer
… …
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1336 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1337
1270 set_typeflag (x, T_STRING | T_ATOM); 1338 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1339 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272 strlength (x) = len; 1340 strlength (x) = len;
1341
1273 return x; 1342 return x;
1274} 1343}
1275 1344
1276INTERFACE pointer 1345INTERFACE pointer
1277mk_string (SCHEME_P_ const char *str) 1346mk_string (SCHEME_P_ const char *str)
… …
1284{ 1353{
1285 return get_vector_object (SCHEME_A_ len, NIL); 1354 return get_vector_object (SCHEME_A_ len, NIL);
1286} 1355}
1287 1356
1288INTERFACE void 1357INTERFACE void
1289fill_vector (pointer vec, pointer obj) 1358fill_vector (pointer vec, uint32_t start, pointer obj)
1290{ 1359{
1291 int i; 1360 int i;
1292 1361
1293 for (i = 0; i < vec->object.vector.length; i++) 1362 for (i = start; i < veclength (vec); i++)
1294 vecvalue (vec)[i] = obj; 1363 vecvalue (vec)[i] = obj;
1295} 1364}
1296 1365
1366INTERFACE void
1367vector_resize (pointer vec, uint32_t newsize, pointer fill)
1368{
1369 uint32_t oldsize = veclength (vec);
1370 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1371 veclength (vec) = newsize;
1372 fill_vector (vec, oldsize, fill);
1373}
1374
1297INTERFACE pointer 1375INTERFACE pointer
1298vector_elem (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1299{ 1377{
1300 return vecvalue(vec)[ielem]; 1378 return vecvalue(vec)[ielem];
1301} 1379}
1302 1380
1303INTERFACE void 1381INTERFACE void
1304set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1382vector_set (pointer vec, uint32_t ielem, pointer a)
1305{ 1383{
1306 vecvalue(vec)[ielem] = a; 1384 vecvalue(vec)[ielem] = a;
1307} 1385}
1308 1386
1309/* get new symbol */ 1387/* get new symbol */
… …
1317 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1318 1396
1319 return x; 1397 return x;
1320} 1398}
1321 1399
1322INTERFACE pointer 1400ecb_cold INTERFACE pointer
1323gensym (SCHEME_P) 1401gensym (SCHEME_P)
1324{ 1402{
1325 pointer x; 1403 pointer x;
1326
1327 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328 {
1329 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1330 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331 1406
1332 /* first check oblist */ 1407 return generate_symbol (SCHEME_A_ name);
1333 x = oblist_find_by_name (SCHEME_A_ name); 1408}
1334 1409
1335 if (x == NIL) 1410static int
1336 { 1411is_gensym (SCHEME_P_ pointer x)
1337 x = oblist_add_by_name (SCHEME_A_ name); 1412{
1338 return x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1339 }
1340 }
1341
1342 return NIL;
1343} 1414}
1344 1415
1345/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1346static pointer 1417ecb_cold static pointer
1347mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1348{ 1419{
1349 char c, *p; 1420 char c, *p;
1350 int has_dec_point = 0; 1421 int has_dec_point = 0;
1351 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1401 } 1472 }
1402 else if ((c == 'e') || (c == 'E')) 1473 else if ((c == 'e') || (c == 'E'))
1403 { 1474 {
1404 if (!has_fp_exp) 1475 if (!has_fp_exp)
1405 { 1476 {
1406 has_dec_point = 1; /* decimal point illegal 1477 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1478 p++;
1409 1479
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1480 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1481 continue;
1412 } 1482 }
… …
1423 1493
1424 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1425} 1495}
1426 1496
1427/* make constant */ 1497/* make constant */
1428static pointer 1498ecb_cold static pointer
1429mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1430{ 1500{
1431 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1432 return S_T; 1502 return S_T;
1433 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1434 return S_F; 1504 return S_F;
1435 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1436 { 1506 {
1437 int c; 1507 int c;
1438 1508
1509 // TODO: optimise
1439 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1440 c = ' '; 1511 c = ' ';
1441 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1442 c = '\n'; 1513 c = '\n';
1443 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1444 c = '\r'; 1515 c = '\r';
1445 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1446 c = '\t'; 1517 c = '\t';
1518 else if (stricmp (name + 1, "alarm") == 0)
1519 c = 0x07;
1520 else if (stricmp (name + 1, "backspace") == 0)
1521 c = 0x08;
1522 else if (stricmp (name + 1, "escape") == 0)
1523 c = 0x1b;
1524 else if (stricmp (name + 1, "delete") == 0)
1525 c = 0x7f;
1526 else if (stricmp (name + 1, "null") == 0)
1527 c = 0;
1447 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1448 { 1529 {
1449 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1450 1531
1451 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1465 return mk_character (SCHEME_A_ c); 1546 return mk_character (SCHEME_A_ c);
1466 } 1547 }
1467 else 1548 else
1468 { 1549 {
1469 /* identify base by string index */ 1550 /* identify base by string index */
1470 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x"; 1551 const char baseidx[18] = "ffbf" "ffff" "ofdf" "ffff" "x";
1471 char *base = strchr (baseidx, *name); 1552 char *base = strchr (baseidx, *name);
1472 1553
1473 if (base) 1554 if (base && *base)
1474 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx)); 1555 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1475 1556
1476 return NIL; 1557 return NIL;
1477 } 1558 }
1478} 1559}
1479 1560
1480/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1481 1581
1482/*-- 1582/*--
1483 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1484 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1485 * for marking. 1585 * for marking.
1486 * 1586 *
1487 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1488 * which is inherited form tinyscheme and could be fixed by having another 1588 * which is inherited form tinyscheme and could be fixed by having another
1489 * word of context in the vector 1589 * word of context in the vector
1490 */ 1590 */
1491static void 1591ecb_hot static void
1492mark (pointer a) 1592mark (pointer a)
1493{ 1593{
1494 pointer t, q, p; 1594 pointer t, q, p;
1495 1595
1496 t = 0; 1596 t = 0;
… …
1500 1600
1501 if (ecb_expect_false (is_vector (p))) 1601 if (ecb_expect_false (is_vector (p)))
1502 { 1602 {
1503 int i; 1603 int i;
1504 1604
1505 for (i = 0; i < p->object.vector.length; i++) 1605 for (i = 0; i < veclength (p); i++)
1506 mark (vecvalue (p)[i]); 1606 mark (vecvalue (p)[i]);
1507 } 1607 }
1508 1608
1509 if (is_atom (p)) 1609 if (is_atom (p))
1510 goto E6; 1610 goto E6;
… …
1553 p = q; 1653 p = q;
1554 goto E6; 1654 goto E6;
1555 } 1655 }
1556} 1656}
1557 1657
1658ecb_hot static void
1659gc_free (SCHEME_P)
1660{
1661 int i;
1662 uint32_t total = 0;
1663
1664 /* Here we scan the cells to build the free-list. */
1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1666 {
1667 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1668 struct cell *p;
1669 total += SCHEME_V->cell_segsize [i];
1670
1671 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1672 {
1673 pointer c = POINTER (p);
1674
1675 if (is_mark (c))
1676 clrmark (c);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (c) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ c);
1683 set_typeflag (c, T_PAIR);
1684 set_car (c, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (c, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = c;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 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");
1697 }
1698}
1699
1558/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1559static void 1701ecb_cold static void
1560gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1561{ 1703{
1562 pointer p;
1563 int i; 1704 int i;
1564 1705
1565 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1566 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1567 1708
… …
1583 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1584 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1585 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1586 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1587 1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1734#endif
1735
1588 /* mark variables a, b */ 1736 /* mark variables a, b */
1589 mark (a); 1737 mark (a);
1590 mark (b); 1738 mark (b);
1591 1739
1592 /* garbage collect */ 1740 /* garbage collect */
1593 clrmark (NIL); 1741 clrmark (NIL);
1594 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1595 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1596 1744
1597 /* free-list is kept sorted by address so as to maintain consecutive
1598 ranges, if possible, for use with vectors. Here we scan the cells
1599 (which are also kept sorted by address) downwards to build the
1600 free-list in sorted order.
1601 */
1602 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1603 {
1604 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1605
1606 while (--p >= SCHEME_V->cell_seg[i])
1607 {
1608 if (is_mark (p))
1609 clrmark (p);
1610 else
1611 {
1612 /* reclaim cell */
1613 if (typeflag (p) != T_FREE)
1614 {
1615 finalize_cell (SCHEME_A_ p);
1616 set_typeflag (p, T_FREE);
1617 set_car (p, NIL);
1618 }
1619
1620 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell);
1622 SCHEME_V->free_cell = p;
1623 }
1624 }
1625 }
1626
1627 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1746 putstr (SCHEME_A_ "freeing...");
1629}
1630 1747
1631static void 1748 gc_free (SCHEME_A);
1632finalize_cell (SCHEME_P_ pointer a)
1633{
1634 /* TODO, fast bitmap check? */
1635 if (is_string (a))
1636 free (strvalue (a));
1637 else if (is_vector (a))
1638 free (vecvalue (a));
1639#if USE_PORTS
1640 else if (is_port (a))
1641 {
1642 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1643 port_close (SCHEME_A_ a, port_input | port_output);
1644
1645 free (a->object.port);
1646 }
1647#endif
1648} 1749}
1649 1750
1650/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1651 1752
1652static int 1753ecb_cold static int
1653file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1654{ 1755{
1655#if USE_PORTS
1656 int fin; 1756 int fin;
1657 1757
1658 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1659 return 0; 1759 return 0;
1660 1760
… …
1666 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1667 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1767 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1668 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1669 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1670 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1671 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1771 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1672 1772
1673#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1674 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1774 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1675 1775
1676 if (fname) 1776 if (fname)
1677 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1678#endif 1778#endif
1679 } 1779 }
1680 1780
1681 return fin >= 0; 1781 return fin >= 0;
1682
1683#else
1684 return 1;
1685#endif
1686} 1782}
1687 1783
1688static void 1784ecb_cold static void
1689file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1690{ 1786{
1691 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1692 { 1788 {
1693 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1694#if USE_PORTS 1790#if USE_PORTS
1695 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1696#endif 1792#endif
1697 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1698 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1699 } 1795 }
1700} 1796}
1701 1797
1702static int 1798ecb_cold static int
1703file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1704{ 1800{
1705#if USE_PORTS 1801#if USE_PORTS
1706 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1707 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1708 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1709#else 1805#else
1710 return 0; 1806 return 0;
1711#endif 1807#endif
1712} 1808}
1713 1809
1714#if USE_PORTS 1810#if USE_PORTS
1715static port * 1811ecb_cold static port *
1716port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1717{ 1813{
1718 int fd; 1814 int fd;
1719 int flags; 1815 int flags;
1720 char *rw; 1816 char *rw;
… …
1743# endif 1839# endif
1744 1840
1745 return pt; 1841 return pt;
1746} 1842}
1747 1843
1748static pointer 1844ecb_cold static pointer
1749port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1750{ 1846{
1751 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1752 1848
1753 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1754 return NIL; 1850 return NIL;
1755 1851
1756 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1757} 1853}
1758 1854
1759static port * 1855ecb_cold static port *
1760port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1761{ 1857{
1762 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1763 1859
1764 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1769 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1770 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1771 return pt; 1867 return pt;
1772} 1868}
1773 1869
1774static pointer 1870ecb_cold static pointer
1775port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1776{ 1872{
1777 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1778 1874
1779 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1780 return NIL; 1876 return NIL;
1781 1877
1782 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1783} 1879}
1784 1880
1785static port * 1881ecb_cold static port *
1786port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1787{ 1883{
1788 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1789 1885
1790 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1796 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1797 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1798 return pt; 1894 return pt;
1799} 1895}
1800 1896
1801static pointer 1897ecb_cold static pointer
1802port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1803{ 1899{
1804 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1805 1901
1806 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1809 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1810} 1906}
1811 1907
1812# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1813 1909
1814static port * 1910ecb_cold static port *
1815port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1816{ 1912{
1817 char *start; 1913 char *start;
1818 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1819 1915
… …
1833 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1834 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1835 return pt; 1931 return pt;
1836} 1932}
1837 1933
1838static pointer 1934ecb_cold static pointer
1839port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1840{ 1936{
1841 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1842 1938
1843 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1844 return NIL; 1940 return NIL;
1845 1941
1846 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1847} 1943}
1848 1944
1849static void 1945ecb_cold static void
1850port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1851{ 1947{
1852 port *pt = p->object.port; 1948 port *pt = port (p);
1853 1949
1854 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1855 1951
1856 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1857 { 1953 {
… …
1874 } 1970 }
1875} 1971}
1876#endif 1972#endif
1877 1973
1878/* get new character from input file */ 1974/* get new character from input file */
1879static int 1975ecb_cold static int
1880inchar (SCHEME_P) 1976inchar (SCHEME_P)
1881{ 1977{
1882 int c; 1978 int c;
1883 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1884
1885 pt = SCHEME_V->inport->object.port;
1886 1980
1887 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1888 return EOF; 1982 return EOF;
1889 1983
1890 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1900 } 1994 }
1901 1995
1902 return c; 1996 return c;
1903} 1997}
1904 1998
1905static int ungot = -1; 1999ecb_cold static int
1906
1907static int
1908basic_inchar (port *pt) 2000basic_inchar (port *pt)
1909{ 2001{
1910#if USE_PORTS
1911 if (pt->unget != -1) 2002 if (pt->unget != -1)
1912 { 2003 {
1913 int r = pt->unget; 2004 int r = pt->unget;
1914 pt->unget = -1; 2005 pt->unget = -1;
1915 return r; 2006 return r;
1916 } 2007 }
1917 2008
2009#if USE_PORTS
1918 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1919 { 2011 {
1920 char c; 2012 char c;
1921 2013
1922 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1930 return EOF; 2022 return EOF;
1931 else 2023 else
1932 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1933 } 2025 }
1934#else 2026#else
1935 if (ungot == -1)
1936 {
1937 char c; 2027 char c;
1938 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1939 return EOF; 2030 return EOF;
1940 2031
1941 ungot = c;
1942 }
1943
1944 {
1945 int r = ungot;
1946 ungot = -1;
1947 return r; 2032 return c;
1948 }
1949#endif 2033#endif
1950} 2034}
1951 2035
1952/* back character to input buffer */ 2036/* back character to input buffer */
1953static void 2037ecb_cold static void
1954backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
1955{ 2039{
1956#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
1957 port *pt;
1958 2041
1959 if (c == EOF) 2042 if (c == EOF)
1960 return; 2043 return;
1961 2044
1962 pt = SCHEME_V->inport->object.port;
1963 pt->unget = c; 2045 pt->unget = c;
1964#else
1965 if (c == EOF)
1966 return;
1967
1968 ungot = c;
1969#endif
1970} 2046}
1971 2047
1972#if USE_PORTS 2048#if USE_PORTS
1973static int 2049ecb_cold static int
1974realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
1975{ 2051{
1976 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
1977 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
1978 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
1991 else 2067 else
1992 return 0; 2068 return 0;
1993} 2069}
1994#endif 2070#endif
1995 2071
1996INTERFACE void 2072ecb_cold static void
1997putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
1998{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
1999#if USE_PORTS 2077#if USE_PORTS
2000 port *pt = SCHEME_V->outport->object.port;
2001
2002 if (pt->kind & port_file)
2003 write (pt->rep.stdio.file, s, strlen (s));
2004 else
2005 for (; *s; s++)
2006 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2007 *pt->rep.string.curr++ = *s;
2008 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2009 *pt->rep.string.curr++ = *s;
2010
2011#else
2012 xwrstr (s);
2013#endif
2014}
2015
2016static void
2017putchars (SCHEME_P_ const char *s, int len)
2018{
2019#if USE_PORTS
2020 port *pt = SCHEME_V->outport->object.port;
2021
2022 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2023 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2024 else 2080 else
2025 { 2081 {
2026 for (; len; len--) 2082 for (; len; len--)
… …
2031 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2032 } 2088 }
2033 } 2089 }
2034 2090
2035#else 2091#else
2036 write (1, s, len); 2092 write (1, s, len); // output not initialised
2037#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2038} 2100}
2039 2101
2040INTERFACE void 2102INTERFACE void
2041putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2042{ 2104{
2043#if USE_PORTS
2044 port *pt = SCHEME_V->outport->object.port;
2045
2046 if (pt->kind & port_file)
2047 {
2048 char cc = c;
2049 write (pt->rep.stdio.file, &cc, 1);
2050 }
2051 else
2052 {
2053 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2054 *pt->rep.string.curr++ = c;
2055 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2056 *pt->rep.string.curr++ = c;
2057 }
2058
2059#else
2060 char cc = c; 2105 char cc = c;
2061 write (1, &c, 1); 2106
2062#endif 2107 putchars (SCHEME_A_ &cc, 1);
2063} 2108}
2064 2109
2065/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2066static char * 2111ecb_cold static char *
2067readstr_upto (SCHEME_P_ char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2068{ 2113{
2069 char *p = SCHEME_V->strbuff; 2114 char *p = SCHEME_V->strbuff + skip;
2070 2115
2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072 2117
2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2118 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074 *p = 0; 2119 *p = 0;
… …
2080 2125
2081 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2082} 2127}
2083 2128
2084/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2085static pointer 2130ecb_cold static pointer
2086readstrexp (SCHEME_P) 2131readstrexp (SCHEME_P_ char delim)
2087{ 2132{
2088 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2089 int c; 2134 int c;
2090 int c1 = 0; 2135 int c1 = 0;
2091 enum
2092 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2136 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093 2137
2094 for (;;) 2138 for (;;)
2095 { 2139 {
2096 c = inchar (SCHEME_A); 2140 c = inchar (SCHEME_A);
2097 2141
… …
2099 return S_F; 2143 return S_F;
2100 2144
2101 switch (state) 2145 switch (state)
2102 { 2146 {
2103 case st_ok: 2147 case st_ok:
2104 switch (c) 2148 if (ecb_expect_false (c == delim))
2105 {
2106 case '\\':
2107 state = st_bsl;
2108 break;
2109
2110 case '"':
2111 *p = 0;
2112 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2149 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113 2150
2114 default: 2151 if (ecb_expect_false (c == '\\'))
2152 state = st_bsl;
2153 else
2115 *p++ = c; 2154 *p++ = c;
2116 break;
2117 }
2118 2155
2119 break; 2156 break;
2120 2157
2121 case st_bsl: 2158 case st_bsl:
2122 switch (c) 2159 switch (c)
… …
2131 case '7': 2168 case '7':
2132 state = st_oct1; 2169 state = st_oct1;
2133 c1 = c - '0'; 2170 c1 = c - '0';
2134 break; 2171 break;
2135 2172
2173 case 'a': *p++ = '\a'; state = st_ok; break;
2174 case 'n': *p++ = '\n'; state = st_ok; break;
2175 case 'r': *p++ = '\r'; state = st_ok; break;
2176 case 't': *p++ = '\t'; state = st_ok; break;
2177
2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2186
2187 //TODO: x should end in ;, not two-digit hex
2136 case 'x': 2188 case 'x':
2137 case 'X': 2189 case 'X':
2138 state = st_x1; 2190 state = st_x1;
2139 c1 = 0; 2191 c1 = 0;
2140 break; 2192 break;
2141 2193
2142 case 'n':
2143 *p++ = '\n';
2144 state = st_ok;
2145 break;
2146
2147 case 't':
2148 *p++ = '\t';
2149 state = st_ok;
2150 break;
2151
2152 case 'r':
2153 *p++ = '\r';
2154 state = st_ok;
2155 break;
2156
2157 case '"':
2158 *p++ = '"';
2159 state = st_ok;
2160 break;
2161
2162 default: 2194 default:
2163 *p++ = c; 2195 *p++ = c;
2164 state = st_ok; 2196 state = st_ok;
2165 break; 2197 break;
2166 } 2198 }
2167 2199
2168 break; 2200 break;
2169 2201
2170 case st_x1: 2202 case st_x1:
2171 case st_x2: 2203 case st_x2:
2172 c = toupper (c); 2204 c = tolower (c);
2173 2205
2174 if (c >= '0' && c <= 'F') 2206 if (c >= '0' && c <= '9')
2175 {
2176 if (c <= '9')
2177 c1 = (c1 << 4) + c - '0'; 2207 c1 = (c1 << 4) + c - '0';
2178 else 2208 else if (c >= 'a' && c <= 'f')
2179 c1 = (c1 << 4) + c - 'A' + 10; 2209 c1 = (c1 << 4) + c - 'a' + 10;
2180
2181 if (state == st_x1)
2182 state = st_x2;
2183 else
2184 {
2185 *p++ = c1;
2186 state = st_ok;
2187 }
2188 }
2189 else 2210 else
2190 return S_F; 2211 return S_F;
2212
2213 if (state == st_x1)
2214 state = st_x2;
2215 else
2216 {
2217 *p++ = c1;
2218 state = st_ok;
2219 }
2191 2220
2192 break; 2221 break;
2193 2222
2194 case st_oct1: 2223 case st_oct1:
2195 case st_oct2: 2224 case st_oct2:
… …
2199 backchar (SCHEME_A_ c); 2228 backchar (SCHEME_A_ c);
2200 state = st_ok; 2229 state = st_ok;
2201 } 2230 }
2202 else 2231 else
2203 { 2232 {
2204 if (state == st_oct2 && c1 >= 32) 2233 if (state == st_oct2 && c1 >= ' ')
2205 return S_F; 2234 return S_F;
2206 2235
2207 c1 = (c1 << 3) + (c - '0'); 2236 c1 = (c1 << 3) + (c - '0');
2208 2237
2209 if (state == st_oct1) 2238 if (state == st_oct1)
… …
2214 state = st_ok; 2243 state = st_ok;
2215 } 2244 }
2216 } 2245 }
2217 2246
2218 break; 2247 break;
2219
2220 } 2248 }
2221 } 2249 }
2222} 2250}
2223 2251
2224/* check c is in chars */ 2252/* check c is in chars */
2225ecb_inline int 2253ecb_cold int
2226is_one_of (char *s, int c) 2254is_one_of (const char *s, int c)
2227{ 2255{
2228 if (c == EOF)
2229 return 1;
2230
2231 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2232} 2257}
2233 2258
2234/* skip white characters */ 2259/* skip white characters */
2235ecb_inline int 2260ecb_cold int
2236skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2237{ 2262{
2238 int c, curr_line = 0; 2263 int c, curr_line = 0;
2239 2264
2240 do 2265 do
2241 { 2266 {
2242 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2243#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2244 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2245 curr_line++; 2271 curr_line++;
2246#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2247 } 2276 }
2248 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2249 2278
2250 /* record it */ 2279 /* record it */
2251#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2252 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2281 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2282 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254#endif 2283#endif
2255 2284
2256 if (c != EOF)
2257 {
2258 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2259 return 1; 2286 return 1;
2260 }
2261 else
2262 return EOF;
2263} 2287}
2264 2288
2265/* get token */ 2289/* get token */
2266static int 2290ecb_cold static int
2267token (SCHEME_P) 2291token (SCHEME_P)
2268{ 2292{
2269 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2270 2294
2271 if (c == EOF) 2295 if (c == EOF)
… …
2283 return TOK_RPAREN; 2307 return TOK_RPAREN;
2284 2308
2285 case '.': 2309 case '.':
2286 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2287 2311
2288 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2289 return TOK_DOT; 2313 return TOK_DOT;
2290 else 2314 else
2291 { 2315 {
2292 //TODO: ungetc twice in a row is not supported in C
2293 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2294 backchar (SCHEME_A_ '.');
2295 return TOK_ATOM; 2317 return TOK_DOTATOM;
2296 } 2318 }
2319
2320 case '|':
2321 return TOK_STRATOM;
2297 2322
2298 case '\'': 2323 case '\'':
2299 return TOK_QUOTE; 2324 return TOK_QUOTE;
2300 2325
2301 case ';': 2326 case ';':
… …
2368} 2393}
2369 2394
2370/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2371#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2372 2397
2373static void 2398ecb_cold static void
2374printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2375{ 2400{
2376 int i; 2401 int i;
2377 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2378 2403
… …
2433 } 2458 }
2434 2459
2435 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2436} 2461}
2437 2462
2438
2439/* print atoms */ 2463/* print atoms */
2440static void 2464ecb_cold static void
2441printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2442{ 2466{
2443 char *p; 2467 char *p;
2444 int len; 2468 int len;
2445 2469
2446 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2447 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2448} 2472}
2449 2473
2450
2451/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2452static void 2475ecb_cold static void
2453atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454{ 2477{
2455 char *p; 2478 char *p;
2456 2479
2457 if (l == NIL) 2480 if (l == NIL)
… …
2590 } 2613 }
2591 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2592 p = symname (l); 2615 p = symname (l);
2593 else if (is_proc (l)) 2616 else if (is_proc (l))
2594 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2595#if USE_PRINTF 2620#if USE_PRINTF
2596 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2597 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2598#else 2623#else
2599 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2600#endif 2626#endif
2601 } 2627 }
2602 else if (is_macro (l)) 2628 else if (is_macro (l))
2603 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2604 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2615#endif 2641#endif
2616 } 2642 }
2617 else if (is_continuation (l)) 2643 else if (is_continuation (l))
2618 p = "#<CONTINUATION>"; 2644 p = "#<CONTINUATION>";
2619 else 2645 else
2646 {
2647#if USE_PRINTF
2648 p = SCHEME_V->strbuff;
2649 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2650#else
2620 p = "#<ERROR>"; 2651 p = "#<ERROR>";
2652#endif
2653 }
2621 2654
2622 *pp = p; 2655 *pp = p;
2623 *plen = strlen (p); 2656 *plen = strlen (p);
2624} 2657}
2625 2658
… …
2657 return car (d); 2690 return car (d);
2658 2691
2659 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2660 q = p; 2693 q = p;
2661 2694
2662 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2663 { 2696 {
2664 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2665 2698
2666 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2667 p = cdr (d); 2700 p = cdr (d);
2668 } 2701 }
2669 2702
2670 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2671 return q; 2704 return q;
2672} 2705}
2673 2706
2674/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2675static pointer 2708ecb_hot static pointer
2676reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2677{ 2710{
2678 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2679 pointer p = NIL; 2712 pointer p = NIL;
2680 2713
… …
2683 2716
2684 return p; 2717 return p;
2685} 2718}
2686 2719
2687/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2688static pointer 2721ecb_hot static pointer
2689reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2690{ 2723{
2691 pointer result = term; 2724 pointer result = term;
2692 pointer p = list; 2725 pointer p = list;
2693 2726
… …
2701 2734
2702 return result; 2735 return result;
2703} 2736}
2704 2737
2705/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2706static pointer 2739ecb_hot static pointer
2707revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2708{ 2741{
2709 pointer result = a; 2742 pointer result = a;
2710 pointer p = b; 2743 pointer p = b;
2711 2744
… …
2720 2753
2721 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2722} 2755}
2723 2756
2724/* equivalence of atoms */ 2757/* equivalence of atoms */
2725int 2758ecb_hot int
2726eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2727{ 2760{
2728 if (is_string (a)) 2761 if (is_string (a))
2729 { 2762 {
2730 if (is_string (b)) 2763 if (is_string (b))
… …
2769/* () is #t in R5RS */ 2802/* () is #t in R5RS */
2770#define is_true(p) ((p) != S_F) 2803#define is_true(p) ((p) != S_F)
2771#define is_false(p) ((p) == S_F) 2804#define is_false(p) ((p) == S_F)
2772 2805
2773/* ========== Environment implementation ========== */ 2806/* ========== Environment implementation ========== */
2774
2775#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777static int
2778hash_fn (const char *key, int table_size)
2779{
2780 const unsigned char *p = key;
2781 uint32_t hash = 2166136261;
2782
2783 while (*p)
2784 hash = (hash ^ *p++) * 16777619;
2785
2786 return hash % table_size;
2787}
2788#endif
2789 2807
2790#ifndef USE_ALIST_ENV 2808#ifndef USE_ALIST_ENV
2791 2809
2792/* 2810/*
2793 * In this implementation, each frame of the environment may be 2811 * In this implementation, each frame of the environment may be
… …
2810 2828
2811 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2829 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812 setenvironment (SCHEME_V->envir); 2830 setenvironment (SCHEME_V->envir);
2813} 2831}
2814 2832
2833static uint32_t
2834sym_hash (pointer sym, uint32_t size)
2835{
2836 uintptr_t ptr = (uintptr_t)sym;
2837
2838#if 0
2839 /* table size is prime, so why mix */
2840 ptr += ptr >> 32;
2841 ptr += ptr >> 16;
2842 ptr += ptr >> 8;
2843#endif
2844
2845 return ptr % size;
2846}
2847
2815ecb_inline void 2848ecb_inline void
2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2849new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817{ 2850{
2818 pointer slot = immutable_cons (variable, value); 2851 pointer slot = immutable_cons (variable, value);
2819 2852
2820 if (is_vector (car (env))) 2853 if (is_vector (car (env)))
2821 { 2854 {
2822 int location = hash_fn (symname (variable), veclength (car (env))); 2855 int location = sym_hash (variable, veclength (car (env)));
2823
2824 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2856 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825 } 2857 }
2826 else 2858 else
2827 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2828} 2860}
2829 2861
2830static pointer 2862ecb_hot static pointer
2831find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832{ 2864{
2833 pointer x, y; 2865 pointer x, y;
2834 int location;
2835 2866
2836 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
2837 { 2868 {
2838 if (is_vector (car (x))) 2869 if (is_vector (car (x)))
2839 { 2870 {
2840 location = hash_fn (symname (hdl), veclength (car (x))); 2871 int location = sym_hash (hdl, veclength (car (x)));
2841 y = vector_elem (car (x), location); 2872 y = vector_get (car (x), location);
2842 } 2873 }
2843 else 2874 else
2844 y = car (x); 2875 y = car (x);
2845 2876
2846 for (; y != NIL; y = cdr (y)) 2877 for (; y != NIL; y = cdr (y))
2847 if (caar (y) == hdl) 2878 if (caar (y) == hdl)
2848 break; 2879 break;
2849 2880
2850 if (y != NIL) 2881 if (y != NIL)
2882 return car (y);
2883
2884 if (!all)
2851 break; 2885 break;
2852
2853 if (!all)
2854 return NIL;
2855 } 2886 }
2856
2857 if (x != NIL)
2858 return car (y);
2859 2887
2860 return NIL; 2888 return NIL;
2861} 2889}
2862 2890
2863#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2864 2892
2865ecb_inline void 2893static void
2866new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2867{ 2895{
2868 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2869 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2870} 2898}
2871 2899
2872ecb_inline void 2900static void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2901new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2902{
2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2876} 2904}
2877 2905
2878static pointer 2906ecb_hot static pointer
2879find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2880{ 2908{
2881 pointer x, y; 2909 pointer x, y;
2882 2910
2883 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2885 for (y = car (x); y != NIL; y = cdr (y)) 2913 for (y = car (x); y != NIL; y = cdr (y))
2886 if (caar (y) == hdl) 2914 if (caar (y) == hdl)
2887 break; 2915 break;
2888 2916
2889 if (y != NIL) 2917 if (y != NIL)
2918 return car (y);
2890 break; 2919 break;
2891 2920
2892 if (!all) 2921 if (!all)
2893 return NIL; 2922 break;
2894 } 2923 }
2895
2896 if (x != NIL)
2897 return car (y);
2898 2924
2899 return NIL; 2925 return NIL;
2900} 2926}
2901 2927
2902#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2903 2929
2904ecb_inline void 2930static void
2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906{ 2932{
2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908} 2935}
2909 2936
2910ecb_inline void 2937static void
2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2912{ 2939{
2913 set_cdr (slot, value); 2940 set_cdr (slot, value);
2914} 2941}
2915 2942
2916ecb_inline pointer 2943static pointer
2917slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2918{ 2945{
2919 return cdr (slot); 2946 return cdr (slot);
2920} 2947}
2921 2948
2922/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2923 2950
2924static int 2951ecb_cold static int
2925xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2926{ 2953{
2927#if USE_ERROR_HOOK
2928 pointer x;
2929 pointer hdl = SCHEME_V->ERROR_HOOK;
2930#endif
2931
2932#if USE_PRINTF 2954#if USE_PRINTF
2933#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2934 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2935 2957
2936 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
2951 } 2973 }
2952#endif 2974#endif
2953#endif 2975#endif
2954 2976
2955#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
2956 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2978 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2957 2979
2958 if (x != NIL) 2980 if (x != NIL)
2959 { 2981 {
2960 pointer code = a 2982 pointer code = a
2961 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3005 pointer code; 3027 pointer code;
3006}; 3028};
3007 3029
3008# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3009 3031
3010static void 3032ecb_hot static void
3011s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3012{ 3034{
3013 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3014 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3015 3037
3016 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3017 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3018 { 3040 {
3019 SCHEME_V->dump_size += STACK_GROWTH; 3041 SCHEME_V->dump_size += STACK_GROWTH;
3020 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3042 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3021 } 3043 }
3022 3044
… …
3028 next_frame->code = code; 3050 next_frame->code = code;
3029 3051
3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3031} 3053}
3032 3054
3033static int 3055static ecb_hot int
3034xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3035{ 3057{
3036 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3037 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3038 3060
… …
3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3050 3072
3051 return 0; 3073 return 0;
3052} 3074}
3053 3075
3054ecb_inline void 3076ecb_cold void
3055dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3056{ 3078{
3057 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3079 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3058 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3059} 3081}
3060 3082
3061ecb_inline void 3083ecb_cold void
3062dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3063{ 3085{
3064 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3065 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3066 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3067} 3089}
3068 3090
3069static void 3091ecb_cold static void
3070dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3071{ 3093{
3072 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3073 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3074 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3075 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3076} 3098}
3077 3099
3078static void 3100ecb_cold static void
3079dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3080{ 3102{
3081 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3082 int i; 3104 int i;
3083 3105
… …
3089 mark (frame->envir); 3111 mark (frame->envir);
3090 mark (frame->code); 3112 mark (frame->code);
3091 } 3113 }
3092} 3114}
3093 3115
3094static pointer 3116ecb_cold static pointer
3095ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3096{ 3118{
3097 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3098 int i; 3120 int i;
3099 3121
… …
3111 } 3133 }
3112 3134
3113 return cont; 3135 return cont;
3114} 3136}
3115 3137
3116static void 3138ecb_cold static void
3117ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3118{ 3140{
3119 int i = 0; 3141 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3143
3122 while (cont != NIL) 3144 while (cont != NIL)
3123 { 3145 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3146 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3147 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3148 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3149 frame->code = car (cont) ; cont = cdr (cont);
3128 3150
3129 ++frame; 3151 ++frame;
3130 ++i; 3152 ++i;
3131 } 3153 }
3132 3154
3133 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3134} 3156}
3135 3157
3136#else 3158#else
3137 3159
3138ecb_inline void 3160ecb_cold void
3139dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3140{ 3162{
3141 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3142} 3164}
3143 3165
3144ecb_inline void 3166ecb_cold void
3145dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3146{ 3168{
3147 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3148} 3170}
3149 3171
3150static void 3172ecb_cold static void
3151dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3152{ 3174{
3153 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3154} 3176}
3155 3177
3156static int 3178ecb_hot static int
3157xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3158{ 3180{
3159 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3160 3182
3161 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
3162 3184
3163 if (dump == NIL) 3185 if (dump == NIL)
3164 return -1; 3186 return -1;
3165 3187
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3188 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3189 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3190 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3191 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3192
3171 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3172 3194
3173 return 0; 3195 return 0;
3174} 3196}
3175 3197
3176static void 3198ecb_hot static void
3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3178{ 3200{
3179 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3180 cons (args, 3202 cons (args,
3181 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3182 cons (code, 3204 cons (code,
3183 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3184} 3206}
3185 3207
3208ecb_cold static void
3209dump_stack_mark (SCHEME_P)
3210{
3211 mark (SCHEME_V->dump);
3212}
3213
3214ecb_cold static pointer
3215ss_get_cont (SCHEME_P)
3216{
3217 return SCHEME_V->dump;
3218}
3219
3220ecb_cold static void
3221ss_set_cont (SCHEME_P_ pointer cont)
3222{
3223 SCHEME_V->dump = cont;
3224}
3225
3226#endif
3227
3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3229
3230#if EXPERIMENT
3231
3232static int
3233dtree (SCHEME_P_ int indent, pointer x)
3234{
3235 int c;
3236
3237 if (is_syntax (x))
3238 {
3239 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3240 return 8 + 8;
3241 }
3242
3243 if (x == NIL)
3244 {
3245 printf ("%*sNIL\n", indent, "");
3246 return 3;
3247 }
3248
3249 switch (type (x))
3250 {
3251 case T_INTEGER:
3252 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3253 return 32+8;
3254
3255 case T_SYMBOL:
3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3257 return 24+8;
3258
3259 case T_CLOSURE:
3260 printf ("%*sS<%s>\n", indent, "", "closure");
3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3263
3264 case T_PAIR:
3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3268 return c + 1;
3269
3270 case T_PORT:
3271 printf ("%*sS<%s>\n", indent, "", "port");
3272 return 24+8;
3273
3274 case T_VECTOR:
3275 printf ("%*sS<%s>\n", indent, "", "vector");
3276 return 24+8;
3277
3278 case T_ENVIRONMENT:
3279 printf ("%*sS<%s>\n", indent, "", "environment");
3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3281
3282 default:
3283 printf ("unhandled type %d\n", type (x));
3284 break;
3285 }
3286}
3287
3288#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3289
3290typedef void *stream[1];
3291
3292#define stream_init() { 0 }
3293#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3294#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3295#define stream_free(s) free (s[0])
3296
3297ecb_cold static void
3298stream_put (stream s, uint8_t byte)
3299{
3300 uint32_t *sp = *s;
3301 uint32_t size = sizeof (uint32_t) * 2;
3302 uint32_t offs = size;
3303
3304 if (ecb_expect_true (sp))
3305 {
3306 offs = sp[0];
3307 size = sp[1];
3308 }
3309
3310 if (ecb_expect_false (offs == size))
3311 {
3312 size *= 2;
3313 sp = realloc (sp, size);
3314 *s = sp;
3315 sp[1] = size;
3316
3317 }
3318
3319 ((uint8_t *)sp)[offs++] = byte;
3320 sp[0] = offs;
3321}
3322
3323ecb_cold static void
3324stream_put_v (stream s, uint32_t v)
3325{
3326 while (v > 0x7f)
3327 {
3328 stream_put (s, v | 0x80);
3329 v >>= 7;
3330 }
3331
3332 stream_put (s, v);
3333}
3334
3335ecb_cold static void
3336stream_put_tv (stream s, int bop, uint32_t v)
3337{
3338 printf ("put tv %d %d\n", bop, v);//D
3339 stream_put (s, bop);
3340 stream_put_v (s, v);
3341}
3342
3343ecb_cold static void
3344stream_put_stream (stream s, stream o)
3345{
3346 uint32_t i;
3347
3348 for (i = 0; i < stream_size (o); ++i)
3349 stream_put (s, stream_data (o)[i]);
3350
3351 stream_free (o);
3352}
3353
3354ecb_cold static uint32_t
3355cell_id (SCHEME_P_ pointer x)
3356{
3357 struct cell *p = CELL (x);
3358 int i;
3359
3360 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3361 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3362 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3363
3364 abort ();
3365}
3366
3367// calculates a (preferably small) integer that makes it possible to find
3368// the symbol again. if pointers were offsets into a memory area... until
3369// then, we return segment number in the low bits, and offset in the high
3370// bits.
3371// also, this function must never return 0.
3372ecb_cold static uint32_t
3373symbol_id (SCHEME_P_ pointer sym)
3374{
3375 return cell_id (SCHEME_A_ sym);
3376}
3377
3378enum byteop
3379{
3380 BOP_NIL,
3381 BOP_INTEGER,
3382 BOP_SYMBOL,
3383 BOP_DATUM,
3384 BOP_LIST_BEG,
3385 BOP_LIST_END,
3386 BOP_IF,
3387 BOP_AND,
3388 BOP_OR,
3389 BOP_CASE,
3390 BOP_COND,
3391 BOP_LET,
3392 BOP_LETAST,
3393 BOP_LETREC,
3394 BOP_DEFINE,
3395 BOP_MACRO,
3396 BOP_SET,
3397 BOP_BEGIN,
3398 BOP_LAMBDA,
3399 BOP_OP,
3400};
3401
3402ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3403
3404ecb_cold static void
3405compile_list (SCHEME_P_ stream s, pointer x)
3406{
3407 // TODO: improper list
3408
3409 for (; x != NIL; x = cdr (x))
3410 {
3411 stream t = stream_init ();
3412 compile_expr (SCHEME_A_ t, car (x));
3413 stream_put_v (s, stream_size (t));
3414 stream_put_stream (s, t);
3415 }
3416
3417 stream_put_v (s, 0);
3418}
3419
3186static void 3420static void
3187dump_stack_mark (SCHEME_P) 3421compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3188{ 3422{
3189 mark (SCHEME_V->dump); 3423 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3424
3425 stream_put (s, BOP_IF);
3426 compile_expr (SCHEME_A_ s, cond);
3427 stream_put_v (s, stream_size (sift));
3428 stream_put_stream (s, sift);
3429 compile_expr (SCHEME_A_ s, iff);
3430}
3431
3432typedef uint32_t stream_fixup;
3433
3434static stream_fixup
3435stream_put_fixup (stream s)
3436{
3437 stream_put (s, 0);
3438 stream_put (s, 0);
3439
3440 return stream_size (s);
3441}
3442
3443static void
3444stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3445{
3446 target -= fixup;
3447 assert (target < (1 << 14));
3448 stream_data (s)[fixup - 2] = target | 0x80;
3449 stream_data (s)[fixup - 1] = target >> 7;
3450}
3451
3452static void
3453compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3454{
3455 for (; cdr (x) != NIL; x = cdr (x))
3456 {
3457 stream t = stream_init ();
3458 compile_expr (SCHEME_A_ t, car (x));
3459 stream_put_v (s, stream_size (t));
3460 stream_put_stream (s, t);
3461 }
3462
3463 stream_put_v (s, 0);
3464}
3465
3466static void
3467compile_case (SCHEME_P_ stream s, pointer x)
3468{
3469 compile_expr (SCHEME_A_ s, caar (x));
3470
3471 for (;;)
3472 {
3473 x = cdr (x);
3474
3475 if (x == NIL)
3476 break;
3477
3478 compile_expr (SCHEME_A_ s, caar (x));
3479 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3480 stream_put_v (s, stream_size (t));
3481 stream_put_stream (s, t);
3482 }
3483
3484 stream_put_v (s, 0);
3485}
3486
3487static void
3488compile_cond (SCHEME_P_ stream s, pointer x)
3489{
3490 for ( ; x != NIL; x = cdr (x))
3491 {
3492 compile_expr (SCHEME_A_ s, caar (x));
3493 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3494 stream_put_v (s, stream_size (t));
3495 stream_put_stream (s, t);
3496 }
3497
3498 stream_put_v (s, 0);
3190} 3499}
3191 3500
3192static pointer 3501static pointer
3193ss_get_cont (SCHEME_P) 3502lookup (SCHEME_P_ pointer x)
3194{ 3503{
3195 return SCHEME_V->dump; 3504 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3196}
3197 3505
3198static void 3506 if (x != NIL)
3199ss_set_cont (SCHEME_P_ pointer cont) 3507 x = slot_value_in_env (x);
3200{
3201 SCHEME_V->dump = cont;
3202}
3203 3508
3204#endif 3509 return x;
3510}
3205 3511
3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3512ecb_cold static void
3513compile_expr (SCHEME_P_ stream s, pointer x)
3514{
3515 if (x == NIL)
3516 {
3517 stream_put (s, BOP_NIL);
3518 return;
3519 }
3207 3520
3208static int 3521 if (is_pair (x))
3522 {
3523 pointer head = car (x);
3524
3525 if (is_syntax (head))
3526 {
3527 x = cdr (x);
3528
3529 switch (syntaxnum (head))
3530 {
3531 case OP_IF0: /* if */
3532 stream_put_v (s, BOP_IF);
3533 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3534 break;
3535
3536 case OP_OR0: /* or */
3537 stream_put_v (s, BOP_OR);
3538 compile_and_or (SCHEME_A_ s, 0, x);
3539 break;
3540
3541 case OP_AND0: /* and */
3542 stream_put_v (s, BOP_AND);
3543 compile_and_or (SCHEME_A_ s, 1, x);
3544 break;
3545
3546 case OP_CASE0: /* case */
3547 stream_put_v (s, BOP_CASE);
3548 compile_case (SCHEME_A_ s, x);
3549 break;
3550
3551 case OP_COND0: /* cond */
3552 stream_put_v (s, BOP_COND);
3553 compile_cond (SCHEME_A_ s, x);
3554 break;
3555
3556 case OP_LET0: /* let */
3557 case OP_LET0AST: /* let* */
3558 case OP_LET0REC: /* letrec */
3559 switch (syntaxnum (head))
3560 {
3561 case OP_LET0: stream_put (s, BOP_LET ); break;
3562 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3563 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3564 }
3565
3566 {
3567 pointer bindings = car (x);
3568 pointer body = cadr (x);
3569
3570 for (x = bindings; x != NIL; x = cdr (x))
3571 {
3572 pointer init = NIL;
3573 pointer var = car (x);
3574
3575 if (is_pair (var))
3576 {
3577 init = cdr (var);
3578 var = car (var);
3579 }
3580
3581 stream_put_v (s, symbol_id (SCHEME_A_ var));
3582 compile_expr (SCHEME_A_ s, init);
3583 }
3584
3585 stream_put_v (s, 0);
3586 compile_expr (SCHEME_A_ s, body);
3587 }
3588 break;
3589
3590 case OP_DEF0: /* define */
3591 case OP_MACRO0: /* macro */
3592 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3593 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3594 compile_expr (SCHEME_A_ s, cadr (x));
3595 break;
3596
3597 case OP_SET0: /* set! */
3598 stream_put (s, BOP_SET);
3599 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3600 compile_expr (SCHEME_A_ s, cadr (x));
3601 break;
3602
3603 case OP_BEGIN: /* begin */
3604 stream_put (s, BOP_BEGIN);
3605 compile_list (SCHEME_A_ s, x);
3606 return;
3607
3608 case OP_DELAY: /* delay */
3609 abort ();
3610 break;
3611
3612 case OP_QUOTE: /* quote */
3613 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3614 break;
3615
3616 case OP_LAMBDA: /* lambda */
3617 {
3618 pointer formals = car (x);
3619 pointer body = cadr (x);
3620
3621 stream_put (s, BOP_LAMBDA);
3622
3623 for (; is_pair (formals); formals = cdr (formals))
3624 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3625
3626 stream_put_v (s, 0);
3627 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3628
3629 compile_expr (SCHEME_A_ s, body);
3630 }
3631 break;
3632
3633 case OP_C0STREAM:/* cons-stream */
3634 abort ();
3635 break;
3636 }
3637
3638 return;
3639 }
3640
3641 pointer m = lookup (SCHEME_A_ head);
3642
3643 if (is_macro (m))
3644 {
3645 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3646 SCHEME_V->code = m;
3647 SCHEME_V->args = cons (x, NIL);
3648 Eval_Cycle (SCHEME_A_ OP_APPLY);
3649 x = SCHEME_V->value;
3650 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3651 return;
3652 }
3653
3654 stream_put (s, BOP_LIST_BEG);
3655
3656 for (; x != NIL; x = cdr (x))
3657 compile_expr (SCHEME_A_ s, car (x));
3658
3659 stream_put (s, BOP_LIST_END);
3660 return;
3661 }
3662
3663 switch (type (x))
3664 {
3665 case T_INTEGER:
3666 {
3667 IVALUE iv = ivalue_unchecked (x);
3668 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3669 stream_put_tv (s, BOP_INTEGER, iv);
3670 }
3671 return;
3672
3673 case T_SYMBOL:
3674 if (0)
3675 {
3676 // no can do without more analysis
3677 pointer m = lookup (SCHEME_A_ x);
3678
3679 if (is_proc (m))
3680 {
3681 printf ("compile proc %s %d\n", procname(m), procnum(m));
3682 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3683 }
3684 else
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 }
3687
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 return;
3690
3691 default:
3692 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3693 break;
3694 }
3695}
3696
3697ecb_cold static int
3698compile_closure (SCHEME_P_ pointer p)
3699{
3700 stream s = stream_init ();
3701
3702 compile_list (SCHEME_A_ s, cdar (p));
3703
3704 FILE *xxd = popen ("xxd", "we");
3705 fwrite (stream_data (s), 1, stream_size (s), xxd);
3706 fclose (xxd);
3707
3708 return stream_size (s);
3709}
3710
3711#endif
3712
3713/* syntax, eval, core, ... */
3714ecb_hot static int
3209opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3715opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210{ 3716{
3211 pointer args = SCHEME_V->args; 3717 pointer args = SCHEME_V->args;
3212 pointer x, y; 3718 pointer x, y;
3213 3719
3214 switch (op) 3720 switch (op)
3215 { 3721 {
3722#if EXPERIMENT //D
3723 case OP_DEBUG:
3724 {
3725 uint32_t len = compile_closure (SCHEME_A_ car (args));
3726 printf ("len = %d\n", len);
3727 printf ("\n");
3728 s_return (S_T);
3729 }
3730
3731 case OP_DEBUG2:
3732 return -1;
3733#endif
3734
3216 case OP_LOAD: /* load */ 3735 case OP_LOAD: /* load */
3217 if (file_interactive (SCHEME_A)) 3736 if (file_interactive (SCHEME_A))
3218 { 3737 {
3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3738 putstr (SCHEME_A_ "Loading ");
3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3739 putstr (SCHEME_A_ strvalue (car (args)));
3740 putcharacter (SCHEME_A_ '\n');
3221 } 3741 }
3222 3742
3223 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3743 if (!file_push (SCHEME_A_ strvalue (car (args))))
3224 Error_1 ("unable to open", car (args)); 3744 Error_1 ("unable to open", car (args));
3225 else 3745
3226 {
3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3746 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3228 s_goto (OP_T0LVL); 3747 s_goto (OP_T0LVL);
3229 }
3230 3748
3231 case OP_T0LVL: /* top level */ 3749 case OP_T0LVL: /* top level */
3232 3750
3233 /* If we reached the end of file, this loop is done. */ 3751 /* If we reached the end of file, this loop is done. */
3234 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3752 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3235 { 3753 {
3236 if (SCHEME_V->file_i == 0) 3754 if (SCHEME_V->file_i == 0)
3237 { 3755 {
3238 SCHEME_V->args = NIL; 3756 SCHEME_V->args = NIL;
3239 s_goto (OP_QUIT); 3757 s_goto (OP_QUIT);
… …
3250 /* If interactive, be nice to user. */ 3768 /* If interactive, be nice to user. */
3251 if (file_interactive (SCHEME_A)) 3769 if (file_interactive (SCHEME_A))
3252 { 3770 {
3253 SCHEME_V->envir = SCHEME_V->global_env; 3771 SCHEME_V->envir = SCHEME_V->global_env;
3254 dump_stack_reset (SCHEME_A); 3772 dump_stack_reset (SCHEME_A);
3255 putstr (SCHEME_A_ "\n"); 3773 putcharacter (SCHEME_A_ '\n');
3774#if EXPERIMENT
3775 system ("ps v $PPID");
3776#endif
3256 putstr (SCHEME_A_ prompt); 3777 putstr (SCHEME_A_ prompt);
3257 } 3778 }
3258 3779
3259 /* Set up another iteration of REPL */ 3780 /* Set up another iteration of REPL */
3260 SCHEME_V->nesting = 0; 3781 SCHEME_V->nesting = 0;
… …
3295 { 3816 {
3296 SCHEME_V->print_flag = 1; 3817 SCHEME_V->print_flag = 1;
3297 SCHEME_V->args = SCHEME_V->value; 3818 SCHEME_V->args = SCHEME_V->value;
3298 s_goto (OP_P0LIST); 3819 s_goto (OP_P0LIST);
3299 } 3820 }
3300 else 3821
3301 s_return (SCHEME_V->value); 3822 s_return (SCHEME_V->value);
3302 3823
3303 case OP_EVAL: /* main part of evaluation */ 3824 case OP_EVAL: /* main part of evaluation */
3304#if USE_TRACING 3825#if USE_TRACING
3305 if (SCHEME_V->tracing) 3826 if (SCHEME_V->tracing)
3306 { 3827 {
… …
3317#endif 3838#endif
3318 if (is_symbol (SCHEME_V->code)) /* symbol */ 3839 if (is_symbol (SCHEME_V->code)) /* symbol */
3319 { 3840 {
3320 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3841 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3321 3842
3322 if (x != NIL) 3843 if (x == NIL)
3323 s_return (slot_value_in_env (x));
3324 else
3325 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3844 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3845
3846 s_return (slot_value_in_env (x));
3326 } 3847 }
3327 else if (is_pair (SCHEME_V->code)) 3848 else if (is_pair (SCHEME_V->code))
3328 { 3849 {
3329 x = car (SCHEME_V->code); 3850 x = car (SCHEME_V->code);
3330 3851
… …
3339 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3860 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3340 SCHEME_V->code = x; 3861 SCHEME_V->code = x;
3341 s_goto (OP_EVAL); 3862 s_goto (OP_EVAL);
3342 } 3863 }
3343 } 3864 }
3344 else 3865
3345 s_return (SCHEME_V->code); 3866 s_return (SCHEME_V->code);
3346 3867
3347 case OP_E0ARGS: /* eval arguments */ 3868 case OP_E0ARGS: /* eval arguments */
3348 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3869 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349 { 3870 {
3350 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3871 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3872 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352 SCHEME_V->code = SCHEME_V->value; 3873 SCHEME_V->code = SCHEME_V->value;
3353 s_goto (OP_APPLY); 3874 s_goto (OP_APPLY);
3354 } 3875 }
3355 else 3876
3356 {
3357 SCHEME_V->code = cdr (SCHEME_V->code); 3877 SCHEME_V->code = cdr (SCHEME_V->code);
3358 s_goto (OP_E1ARGS); 3878 s_goto (OP_E1ARGS);
3359 }
3360 3879
3361 case OP_E1ARGS: /* eval arguments */ 3880 case OP_E1ARGS: /* eval arguments */
3362 args = cons (SCHEME_V->value, args); 3881 args = cons (SCHEME_V->value, args);
3363 3882
3364 if (is_pair (SCHEME_V->code)) /* continue */ 3883 if (is_pair (SCHEME_V->code)) /* continue */
… …
3375 SCHEME_V->args = cdr (args); 3894 SCHEME_V->args = cdr (args);
3376 s_goto (OP_APPLY); 3895 s_goto (OP_APPLY);
3377 } 3896 }
3378 3897
3379#if USE_TRACING 3898#if USE_TRACING
3380
3381 case OP_TRACING: 3899 case OP_TRACING:
3382 { 3900 {
3383 int tr = SCHEME_V->tracing; 3901 int tr = SCHEME_V->tracing;
3384 3902
3385 SCHEME_V->tracing = ivalue (car (args)); 3903 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3904 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3905 }
3388
3389#endif 3906#endif
3390 3907
3391 case OP_APPLY: /* apply 'code' to 'args' */ 3908 case OP_APPLY: /* apply 'code' to 'args' */
3392#if USE_TRACING 3909#if USE_TRACING
3393 if (SCHEME_V->tracing) 3910 if (SCHEME_V->tracing)
… …
3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3924 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3408 else if (is_foreign (SCHEME_V->code)) 3925 else if (is_foreign (SCHEME_V->code))
3409 { 3926 {
3410 /* Keep nested calls from GC'ing the arglist */ 3927 /* Keep nested calls from GC'ing the arglist */
3411 push_recent_alloc (SCHEME_A_ args, NIL); 3928 push_recent_alloc (SCHEME_A_ args, NIL);
3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3929 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3413 3930
3414 s_return (x); 3931 s_return (x);
3415 } 3932 }
3416 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3933 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3417 { 3934 {
… …
3447 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3964 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3448 { 3965 {
3449 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3966 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3450 s_return (args != NIL ? car (args) : NIL); 3967 s_return (args != NIL ? car (args) : NIL);
3451 } 3968 }
3452 else 3969
3453 Error_0 ("illegal function"); 3970 Error_0 ("illegal function");
3454 3971
3455 case OP_DOMACRO: /* do macro */ 3972 case OP_DOMACRO: /* do macro */
3456 SCHEME_V->code = SCHEME_V->value; 3973 SCHEME_V->code = SCHEME_V->value;
3457 s_goto (OP_EVAL); 3974 s_goto (OP_EVAL);
3458
3459#if 1
3460 3975
3461 case OP_LAMBDA: /* lambda */ 3976 case OP_LAMBDA: /* lambda */
3462 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3977 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3463 set SCHEME_V->value fall thru */ 3978 set SCHEME_V->value fall thru */
3464 { 3979 {
… …
3471 SCHEME_V->code = slot_value_in_env (f); 3986 SCHEME_V->code = slot_value_in_env (f);
3472 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3473 } 3988 }
3474 3989
3475 SCHEME_V->value = SCHEME_V->code; 3990 SCHEME_V->value = SCHEME_V->code;
3476 /* Fallthru */
3477 } 3991 }
3992 /* Fallthru */
3478 3993
3479 case OP_LAMBDA1: 3994 case OP_LAMBDA1:
3480 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3995 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3481
3482#else
3483
3484 case OP_LAMBDA: /* lambda */
3485 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3486
3487#endif
3488 3996
3489 case OP_MKCLOSURE: /* make-closure */ 3997 case OP_MKCLOSURE: /* make-closure */
3490 x = car (args); 3998 x = car (args);
3491 3999
3492 if (car (x) == SCHEME_V->LAMBDA) 4000 if (car (x) == SCHEME_V->LAMBDA)
… …
3531 else 4039 else
3532 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4040 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3533 4041
3534 s_return (SCHEME_V->code); 4042 s_return (SCHEME_V->code);
3535 4043
3536
3537 case OP_DEFP: /* defined? */ 4044 case OP_DEFP: /* defined? */
3538 x = SCHEME_V->envir; 4045 x = SCHEME_V->envir;
3539 4046
3540 if (cdr (args) != NIL) 4047 if (cdr (args) != NIL)
3541 x = cadr (args); 4048 x = cadr (args);
… …
3559 s_return (SCHEME_V->value); 4066 s_return (SCHEME_V->value);
3560 } 4067 }
3561 else 4068 else
3562 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4069 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3563 4070
3564
3565 case OP_BEGIN: /* begin */ 4071 case OP_BEGIN: /* begin */
3566 if (!is_pair (SCHEME_V->code)) 4072 if (!is_pair (SCHEME_V->code))
3567 s_return (SCHEME_V->code); 4073 s_return (SCHEME_V->code);
3568 4074
3569 if (cdr (SCHEME_V->code) != NIL) 4075 if (cdr (SCHEME_V->code) != NIL)
… …
3580 case OP_IF1: /* if */ 4086 case OP_IF1: /* if */
3581 if (is_true (SCHEME_V->value)) 4087 if (is_true (SCHEME_V->value))
3582 SCHEME_V->code = car (SCHEME_V->code); 4088 SCHEME_V->code = car (SCHEME_V->code);
3583 else 4089 else
3584 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4090 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4091
3585 s_goto (OP_EVAL); 4092 s_goto (OP_EVAL);
3586 4093
3587 case OP_LET0: /* let */ 4094 case OP_LET0: /* let */
3588 SCHEME_V->args = NIL; 4095 SCHEME_V->args = NIL;
3589 SCHEME_V->value = SCHEME_V->code; 4096 SCHEME_V->value = SCHEME_V->code;
3590 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4097 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3591 s_goto (OP_LET1); 4098 s_goto (OP_LET1);
3592 4099
3593 case OP_LET1: /* let (calculate parameters) */ 4100 case OP_LET1: /* let (calculate parameters) */
4101 case OP_LET1REC: /* letrec (calculate parameters) */
3594 args = cons (SCHEME_V->value, args); 4102 args = cons (SCHEME_V->value, args);
3595 4103
3596 if (is_pair (SCHEME_V->code)) /* continue */ 4104 if (is_pair (SCHEME_V->code)) /* continue */
3597 { 4105 {
3598 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4106 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3599 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4107 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3600 4108
3601 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4109 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3602 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3603 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3604 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3605 } 4113 }
3606 else /* end */ 4114
3607 { 4115 /* end */
3608 args = reverse_in_place (SCHEME_A_ NIL, args); 4116 args = reverse_in_place (SCHEME_A_ NIL, args);
3609 SCHEME_V->code = car (args); 4117 SCHEME_V->code = car (args);
3610 SCHEME_V->args = cdr (args); 4118 SCHEME_V->args = cdr (args);
3611 s_goto (OP_LET2); 4119 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3612 }
3613 4120
3614 case OP_LET2: /* let */ 4121 case OP_LET2: /* let */
3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3616 4123
3617 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4124 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3621 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4128 if (is_symbol (car (SCHEME_V->code))) /* named let */
3622 { 4129 {
3623 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4130 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3624 { 4131 {
3625 if (!is_pair (x)) 4132 if (!is_pair (x))
3626 Error_1 ("Bad syntax of binding in let :", x); 4133 Error_1 ("Bad syntax of binding in let:", x);
3627 4134
3628 if (!is_list (SCHEME_A_ car (x))) 4135 if (!is_list (SCHEME_A_ car (x)))
3629 Error_1 ("Bad syntax of binding in let :", car (x)); 4136 Error_1 ("Bad syntax of binding in let:", car (x));
3630 4137
3631 args = cons (caar (x), args); 4138 args = cons (caar (x), args);
3632 } 4139 }
3633 4140
3634 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4141 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3651 SCHEME_V->code = cdr (SCHEME_V->code); 4158 SCHEME_V->code = cdr (SCHEME_V->code);
3652 s_goto (OP_BEGIN); 4159 s_goto (OP_BEGIN);
3653 } 4160 }
3654 4161
3655 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4162 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3656 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4163 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3657 4164
3658 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4165 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3659 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4166 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3660 s_goto (OP_EVAL); 4167 s_goto (OP_EVAL);
3661 4168
… …
3672 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4179 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3673 SCHEME_V->code = cadar (SCHEME_V->code); 4180 SCHEME_V->code = cadar (SCHEME_V->code);
3674 SCHEME_V->args = NIL; 4181 SCHEME_V->args = NIL;
3675 s_goto (OP_EVAL); 4182 s_goto (OP_EVAL);
3676 } 4183 }
3677 else /* end */ 4184
4185 /* end */
3678 { 4186
3679 SCHEME_V->code = args; 4187 SCHEME_V->code = args;
3680 SCHEME_V->args = NIL; 4188 SCHEME_V->args = NIL;
3681 s_goto (OP_BEGIN); 4189 s_goto (OP_BEGIN);
3682 }
3683 4190
3684 case OP_LET0REC: /* letrec */ 4191 case OP_LET0REC: /* letrec */
3685 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4192 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3686 SCHEME_V->args = NIL; 4193 SCHEME_V->args = NIL;
3687 SCHEME_V->value = SCHEME_V->code; 4194 SCHEME_V->value = SCHEME_V->code;
3688 SCHEME_V->code = car (SCHEME_V->code); 4195 SCHEME_V->code = car (SCHEME_V->code);
3689 s_goto (OP_LET1REC); 4196 s_goto (OP_LET1REC);
3690 4197
3691 case OP_LET1REC: /* letrec (calculate parameters) */ 4198 /* OP_LET1REC handled by OP_LET1 */
3692 args = cons (SCHEME_V->value, args);
3693
3694 if (is_pair (SCHEME_V->code)) /* continue */
3695 {
3696 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3697 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3698
3699 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3700 SCHEME_V->code = cadar (SCHEME_V->code);
3701 SCHEME_V->args = NIL;
3702 s_goto (OP_EVAL);
3703 }
3704 else /* end */
3705 {
3706 args = reverse_in_place (SCHEME_A_ NIL, args);
3707 SCHEME_V->code = car (args);
3708 SCHEME_V->args = cdr (args);
3709 s_goto (OP_LET2REC);
3710 }
3711 4199
3712 case OP_LET2REC: /* letrec */ 4200 case OP_LET2REC: /* letrec */
3713 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4201 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3714 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4202 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3715 4203
… …
3745 } 4233 }
3746 else 4234 else
3747 { 4235 {
3748 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4236 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3749 s_return (NIL); 4237 s_return (NIL);
3750 else 4238
3751 {
3752 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4239 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3753 SCHEME_V->code = caar (SCHEME_V->code); 4240 SCHEME_V->code = caar (SCHEME_V->code);
3754 s_goto (OP_EVAL); 4241 s_goto (OP_EVAL);
3755 }
3756 } 4242 }
3757 4243
3758 case OP_DELAY: /* delay */ 4244 case OP_DELAY: /* delay */
3759 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4245 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3760 set_typeflag (x, T_PROMISE); 4246 set_typeflag (x, T_PROMISE);
… …
3771 case OP_AND1: /* and */ 4257 case OP_AND1: /* and */
3772 if (is_false (SCHEME_V->value)) 4258 if (is_false (SCHEME_V->value))
3773 s_return (SCHEME_V->value); 4259 s_return (SCHEME_V->value);
3774 else if (SCHEME_V->code == NIL) 4260 else if (SCHEME_V->code == NIL)
3775 s_return (SCHEME_V->value); 4261 s_return (SCHEME_V->value);
3776 else 4262
3777 {
3778 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4263 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3779 SCHEME_V->code = car (SCHEME_V->code); 4264 SCHEME_V->code = car (SCHEME_V->code);
3780 s_goto (OP_EVAL); 4265 s_goto (OP_EVAL);
3781 }
3782 4266
3783 case OP_OR0: /* or */ 4267 case OP_OR0: /* or */
3784 if (SCHEME_V->code == NIL) 4268 if (SCHEME_V->code == NIL)
3785 s_return (S_F); 4269 s_return (S_F);
3786 4270
… …
3791 case OP_OR1: /* or */ 4275 case OP_OR1: /* or */
3792 if (is_true (SCHEME_V->value)) 4276 if (is_true (SCHEME_V->value))
3793 s_return (SCHEME_V->value); 4277 s_return (SCHEME_V->value);
3794 else if (SCHEME_V->code == NIL) 4278 else if (SCHEME_V->code == NIL)
3795 s_return (SCHEME_V->value); 4279 s_return (SCHEME_V->value);
3796 else 4280
3797 {
3798 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4281 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3799 SCHEME_V->code = car (SCHEME_V->code); 4282 SCHEME_V->code = car (SCHEME_V->code);
3800 s_goto (OP_EVAL); 4283 s_goto (OP_EVAL);
3801 }
3802 4284
3803 case OP_C0STREAM: /* cons-stream */ 4285 case OP_C0STREAM: /* cons-stream */
3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4286 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3805 SCHEME_V->code = car (SCHEME_V->code); 4287 SCHEME_V->code = car (SCHEME_V->code);
3806 s_goto (OP_EVAL); 4288 s_goto (OP_EVAL);
… …
3871 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4353 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3872 SCHEME_V->code = caar (x); 4354 SCHEME_V->code = caar (x);
3873 s_goto (OP_EVAL); 4355 s_goto (OP_EVAL);
3874 } 4356 }
3875 } 4357 }
3876 else 4358
3877 s_return (NIL); 4359 s_return (NIL);
3878 4360
3879 case OP_CASE2: /* case */ 4361 case OP_CASE2: /* case */
3880 if (is_true (SCHEME_V->value)) 4362 if (is_true (SCHEME_V->value))
3881 s_goto (OP_BEGIN); 4363 s_goto (OP_BEGIN);
3882 else 4364
3883 s_return (NIL); 4365 s_return (NIL);
3884 4366
3885 case OP_PAPPLY: /* apply */ 4367 case OP_PAPPLY: /* apply */
3886 SCHEME_V->code = car (args); 4368 SCHEME_V->code = car (args);
3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4369 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3888 /*SCHEME_V->args = cadr(args); */ 4370 /*SCHEME_V->args = cadr(args); */
… …
3902 } 4384 }
3903 4385
3904 if (USE_ERROR_CHECKING) abort (); 4386 if (USE_ERROR_CHECKING) abort ();
3905} 4387}
3906 4388
3907static int 4389/* math, cxr */
4390ecb_hot static int
3908opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4391opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3909{ 4392{
3910 pointer args = SCHEME_V->args; 4393 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 4394 pointer x = car (args);
3912 num v; 4395 num v;
3913 4396
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 4397 switch (op)
3919 { 4398 {
3920#if USE_MATH 4399#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 4400 case OP_INEX2EX: /* inexact->exact */
3922 if (is_integer (x)) 4401 if (!is_integer (x))
3923 s_return (x); 4402 {
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 4403 RVALUE r = rvalue_unchecked (x);
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4404
4405 if (r == (RVALUE)(IVALUE)r)
4406 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3926 else 4407 else
3927 Error_1 ("inexact->exact: not integral:", x); 4408 Error_1 ("inexact->exact: not integral:", x);
4409 }
3928 4410
4411 s_return (x);
4412
4413 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4414 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4415 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4416 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4417
4418 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4419 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4420 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4421 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4422 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4423 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4424 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4425 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4426 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3936 4427
3937 case OP_ATAN: 4428 case OP_ATAN:
4429 s_return (mk_real (SCHEME_A_
3938 if (cdr (args) == NIL) 4430 cdr (args) == NIL
3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4431 ? atan (rvalue (x))
3940 else 4432 : atan2 (rvalue (x), rvalue (cadr (args)))));
3941 {
3942 pointer y = cadr (args);
3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3944 }
3945
3946 case OP_SQRT:
3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3948 4433
3949 case OP_EXPT: 4434 case OP_EXPT:
3950 { 4435 {
3951 RVALUE result; 4436 RVALUE result;
3952 int real_result = 1; 4437 int real_result = 1;
… …
3966 /* If the test fails, result is too big for integer. */ 4451 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4452 if (!real_result)
3968 { 4453 {
3969 long result_as_long = result; 4454 long result_as_long = result;
3970 4455
3971 if (result != (RVALUE) result_as_long) 4456 if (result != result_as_long)
3972 real_result = 1; 4457 real_result = 1;
3973 } 4458 }
3974 4459
3975 if (real_result) 4460 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4461 s_return (mk_real (SCHEME_A_ result));
3977 else 4462 else
3978 s_return (mk_integer (SCHEME_A_ result)); 4463 s_return (mk_integer (SCHEME_A_ result));
3979 } 4464 }
3980
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983
3984 case OP_TRUNCATE:
3985 {
3986 RVALUE rvalue_of_x;
3987
3988 rvalue_of_x = rvalue (x);
3989
3990 if (rvalue_of_x > 0)
3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
3992 else
3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994 }
3995
3996 case OP_ROUND:
3997 if (num_is_integer (x))
3998 s_return (x);
3999
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4465#endif
4002 4466
4003 case OP_ADD: /* + */ 4467 case OP_ADD: /* + */
4004 v = num_zero; 4468 v = num_zero;
4005 4469
… …
4093 else 4557 else
4094 Error_0 ("modulo: division by zero"); 4558 Error_0 ("modulo: division by zero");
4095 4559
4096 s_return (mk_number (SCHEME_A_ v)); 4560 s_return (mk_number (SCHEME_A_ v));
4097 4561
4098 case OP_CAR: /* car */ 4562 /* the compiler will optimize this mess... */
4099 s_return (caar (args)); 4563 case OP_CAR: op_car: s_return (car (x));
4100 4564 case OP_CDR: op_cdr: s_return (cdr (x));
4101 case OP_CDR: /* cdr */ 4565 case OP_CAAR: op_caar: x = car (x); goto op_car;
4102 s_return (cdar (args)); 4566 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4567 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4568 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4569 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4570 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4571 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4572 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4573 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4574 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4575 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4576 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4577 case OP_CAAAAR: x = car (x); goto op_caaar;
4578 case OP_CAAADR: x = cdr (x); goto op_caaar;
4579 case OP_CAADAR: x = car (x); goto op_caadr;
4580 case OP_CAADDR: x = cdr (x); goto op_caadr;
4581 case OP_CADAAR: x = car (x); goto op_cadar;
4582 case OP_CADADR: x = cdr (x); goto op_cadar;
4583 case OP_CADDAR: x = car (x); goto op_caddr;
4584 case OP_CADDDR: x = cdr (x); goto op_caddr;
4585 case OP_CDAAAR: x = car (x); goto op_cdaar;
4586 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4587 case OP_CDADAR: x = car (x); goto op_cdadr;
4588 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4589 case OP_CDDAAR: x = car (x); goto op_cddar;
4590 case OP_CDDADR: x = cdr (x); goto op_cddar;
4591 case OP_CDDDAR: x = car (x); goto op_cdddr;
4592 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4103 4593
4104 case OP_CONS: /* cons */ 4594 case OP_CONS: /* cons */
4105 set_cdr (args, cadr (args)); 4595 set_cdr (args, cadr (args));
4106 s_return (args); 4596 s_return (args);
4107 4597
… …
4122 } 4612 }
4123 else 4613 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4614 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4615
4126 case OP_CHAR2INT: /* char->integer */ 4616 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4617 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4618
4129 case OP_INT2CHAR: /* integer->char */ 4619 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4620 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4621
4132 case OP_CHARUPCASE: 4622 case OP_CHARUPCASE:
4133 { 4623 {
4134 unsigned char c = ivalue (x); 4624 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4625 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4626 s_return (mk_character (SCHEME_A_ c));
4137 } 4627 }
4138 4628
4139 case OP_CHARDNCASE: 4629 case OP_CHARDNCASE:
4140 { 4630 {
4141 unsigned char c = ivalue (x); 4631 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4632 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4633 s_return (mk_character (SCHEME_A_ c));
4144 } 4634 }
4145 4635
4146 case OP_STR2SYM: /* string->symbol */ 4636 case OP_STR2SYM: /* string->symbol */
… …
4223 Error_1 ("atom->string: not an atom:", x); 4713 Error_1 ("atom->string: not an atom:", x);
4224 } 4714 }
4225 4715
4226 case OP_MKSTRING: /* make-string */ 4716 case OP_MKSTRING: /* make-string */
4227 { 4717 {
4228 int fill = ' '; 4718 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4719 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4720
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4721 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4722 }
4238 4723
4239 case OP_STRLEN: /* string-length */ 4724 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4725 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4726
4242 case OP_STRREF: /* string-ref */ 4727 case OP_STRREF: /* string-ref */
4243 { 4728 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4729 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4730 int index = ivalue_unchecked (cadr (args));
4250 4731
4251 if (index >= strlength (x)) 4732 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4733 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4734
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4735 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4736 }
4256 4737
4257 case OP_STRSET: /* string-set! */ 4738 case OP_STRSET: /* string-set! */
4258 { 4739 {
4259 char *str; 4740 char *str = strvalue (x);
4260 int index; 4741 int index = ivalue_unchecked (cadr (args));
4261 int c; 4742 int c;
4262 4743
4263 if (is_immutable (x)) 4744 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4745 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4746
4270 if (index >= strlength (x)) 4747 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4748 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4749
4273 c = charvalue (caddr (args)); 4750 c = charvalue (caddr (args));
… …
4294 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4771 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4295 4772
4296 s_return (newstr); 4773 s_return (newstr);
4297 } 4774 }
4298 4775
4299 case OP_SUBSTR: /* substring */ 4776 case OP_STRING_COPY: /* substring/string-copy */
4300 { 4777 {
4301 char *str; 4778 char *str = strvalue (x);
4302 int index0; 4779 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4303 int index1; 4780 int index1;
4304 int len; 4781 int len;
4305 4782
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4783 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4784 Error_1 ("string->copy: start out of bounds:", cadr (args));
4312 4785
4313 if (cddr (args) != NIL) 4786 if (cddr (args) != NIL)
4314 { 4787 {
4315 index1 = ivalue (caddr (args)); 4788 index1 = ivalue_unchecked (caddr (args));
4316 4789
4317 if (index1 > strlength (x) || index1 < index0) 4790 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4791 Error_1 ("string->copy: end out of bounds:", caddr (args));
4319 } 4792 }
4320 else 4793 else
4321 index1 = strlength (x); 4794 index1 = strlength (x);
4322 4795
4323 len = index1 - index0; 4796 len = index1 - index0;
4324 x = mk_empty_string (SCHEME_A_ len, ' '); 4797 x = mk_counted_string (SCHEME_A_ str + index0, len);
4325 memcpy (strvalue (x), str + index0, len);
4326 strvalue (x)[len] = 0;
4327 4798
4328 s_return (x); 4799 s_return (x);
4329 } 4800 }
4330 4801
4331 case OP_VECTOR: /* vector */ 4802 case OP_VECTOR: /* vector */
… …
4343 if (SCHEME_V->no_memory) 4814 if (SCHEME_V->no_memory)
4344 s_return (S_SINK); 4815 s_return (S_SINK);
4345#endif 4816#endif
4346 4817
4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4818 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348 set_vector_elem (vec, i, car (x)); 4819 vector_set (vec, i, car (x));
4349 4820
4350 s_return (vec); 4821 s_return (vec);
4351 } 4822 }
4352 4823
4353 case OP_MKVECTOR: /* make-vector */ 4824 case OP_MKVECTOR: /* make-vector */
4354 { 4825 {
4355 pointer fill = NIL; 4826 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4827 pointer vec;
4358
4359 len = ivalue (x); 4828 int len = ivalue_unchecked (x);
4360 4829
4361 if (cdr (args) != NIL) 4830 if (cdr (args) != NIL)
4362 fill = cadr (args); 4831 fill = cadr (args);
4363 4832
4364 vec = mk_vector (SCHEME_A_ len); 4833 vec = mk_vector (SCHEME_A_ len);
… …
4367 if (SCHEME_V->no_memory) 4836 if (SCHEME_V->no_memory)
4368 s_return (S_SINK); 4837 s_return (S_SINK);
4369#endif 4838#endif
4370 4839
4371 if (fill != NIL) 4840 if (fill != NIL)
4372 fill_vector (vec, fill); 4841 fill_vector (vec, 0, fill);
4373 4842
4374 s_return (vec); 4843 s_return (vec);
4375 } 4844 }
4376 4845
4377 case OP_VECLEN: /* vector-length */ 4846 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4847 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4848
4849 case OP_VECRESIZE:
4850 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4851 s_return (x);
4852
4380 case OP_VECREF: /* vector-ref */ 4853 case OP_VECREF: /* vector-ref */
4381 { 4854 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4855 int index = ivalue_unchecked (cadr (args));
4385 4856
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4857 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4858 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4859
4389 s_return (vector_elem (x, index)); 4860 s_return (vector_get (x, index));
4390 } 4861 }
4391 4862
4392 case OP_VECSET: /* vector-set! */ 4863 case OP_VECSET: /* vector-set! */
4393 { 4864 {
4394 int index; 4865 int index = ivalue_unchecked (cadr (args));
4395 4866
4396 if (is_immutable (x)) 4867 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4868 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398 4869
4399 index = ivalue (cadr (args));
4400
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4870 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4871 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4872
4404 set_vector_elem (x, index, caddr (args)); 4873 vector_set (x, index, caddr (args));
4405 s_return (x); 4874 s_return (x);
4406 } 4875 }
4407 } 4876 }
4408 4877
4409 if (USE_ERROR_CHECKING) abort (); 4878 if (USE_ERROR_CHECKING) abort ();
4410} 4879}
4411 4880
4412INTERFACE int 4881/* relational ops */
4413is_list (SCHEME_P_ pointer a) 4882ecb_hot static int
4414{
4415 return list_length (SCHEME_A_ a) >= 0;
4416}
4417
4418/* Result is:
4419 proper list: length
4420 circular list: -1
4421 not even a pair: -2
4422 dotted list: -2 minus length before dot
4423*/
4424INTERFACE int
4425list_length (SCHEME_P_ pointer a)
4426{
4427 int i = 0;
4428 pointer slow, fast;
4429
4430 slow = fast = a;
4431
4432 while (1)
4433 {
4434 if (fast == NIL)
4435 return i;
4436
4437 if (!is_pair (fast))
4438 return -2 - i;
4439
4440 fast = cdr (fast);
4441 ++i;
4442
4443 if (fast == NIL)
4444 return i;
4445
4446 if (!is_pair (fast))
4447 return -2 - i;
4448
4449 ++i;
4450 fast = cdr (fast);
4451
4452 /* Safe because we would have already returned if `fast'
4453 encountered a non-pair. */
4454 slow = cdr (slow);
4455
4456 if (fast == slow)
4457 {
4458 /* the fast pointer has looped back around and caught up
4459 with the slow pointer, hence the structure is circular,
4460 not of finite length, and therefore not a list */
4461 return -1;
4462 }
4463 }
4464}
4465
4466static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4883opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4884{
4469 pointer x = SCHEME_V->args; 4885 pointer x = SCHEME_V->args;
4470 4886
4471 for (;;) 4887 for (;;)
… …
4492 } 4908 }
4493 4909
4494 s_return (S_T); 4910 s_return (S_T);
4495} 4911}
4496 4912
4497static int 4913/* predicates */
4914ecb_hot static int
4498opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4915opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4499{ 4916{
4500 pointer args = SCHEME_V->args; 4917 pointer args = SCHEME_V->args;
4501 pointer a = car (args); 4918 pointer a = car (args);
4502 pointer d = cdr (args); 4919 pointer d = cdr (args);
4503 int r; 4920 int r;
4504 4921
4505 switch (op) 4922 switch (op)
4506 { 4923 {
4507 case OP_NOT: /* not */ r = is_false (a) ; break; 4924 case OP_NOT: /* not */ r = is_false (a) ; break;
4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4925 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4926 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break; 4927 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4928 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4929 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4930 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4931 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4932 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4933 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4934 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4935
4518#if USE_CHAR_CLASSIFIERS 4936#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4937 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4938 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4939 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4940 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4941 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4942#endif
4525 4943
4526#if USE_PORTS 4944#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4945 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4946 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4548 } 4966 }
4549 4967
4550 s_retbool (r); 4968 s_retbool (r);
4551} 4969}
4552 4970
4553static int 4971/* promises, list ops, ports */
4972ecb_hot static int
4554opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4973opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4974{
4556 pointer args = SCHEME_V->args; 4975 pointer args = SCHEME_V->args;
4557 pointer a = car (args); 4976 pointer a = car (args);
4558 pointer x, y; 4977 pointer x, y;
… …
4571 } 4990 }
4572 else 4991 else
4573 s_return (SCHEME_V->code); 4992 s_return (SCHEME_V->code);
4574 4993
4575 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4994 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4576 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4995 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4577 s_return (SCHEME_V->value); 4996 s_return (SCHEME_V->value);
4578 4997
4579#if USE_PORTS 4998#if USE_PORTS
4999
5000 case OP_EOF_OBJECT: /* eof-object */
5001 s_return (S_EOF);
4580 5002
4581 case OP_WRITE: /* write */ 5003 case OP_WRITE: /* write */
4582 case OP_DISPLAY: /* display */ 5004 case OP_DISPLAY: /* display */
4583 case OP_WRITE_CHAR: /* write-char */ 5005 case OP_WRITE_CHAR: /* write-char */
4584 if (is_pair (cdr (SCHEME_V->args))) 5006 if (is_pair (cdr (SCHEME_V->args)))
… …
4598 else 5020 else
4599 SCHEME_V->print_flag = 0; 5021 SCHEME_V->print_flag = 0;
4600 5022
4601 s_goto (OP_P0LIST); 5023 s_goto (OP_P0LIST);
4602 5024
5025 //TODO: move to scheme
4603 case OP_NEWLINE: /* newline */ 5026 case OP_NEWLINE: /* newline */
4604 if (is_pair (args)) 5027 if (is_pair (args))
4605 { 5028 {
4606 if (a != SCHEME_V->outport) 5029 if (a != SCHEME_V->outport)
4607 { 5030 {
… …
4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5032 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4610 SCHEME_V->outport = a; 5033 SCHEME_V->outport = a;
4611 } 5034 }
4612 } 5035 }
4613 5036
4614 putstr (SCHEME_A_ "\n"); 5037 putcharacter (SCHEME_A_ '\n');
4615 s_return (S_T); 5038 s_return (S_T);
4616#endif 5039#endif
4617 5040
4618 case OP_ERR0: /* error */ 5041 case OP_ERR0: /* error */
4619 SCHEME_V->retcode = -1; 5042 SCHEME_V->retcode = -1;
… …
4628 putstr (SCHEME_A_ strvalue (car (args))); 5051 putstr (SCHEME_A_ strvalue (car (args)));
4629 SCHEME_V->args = cdr (args); 5052 SCHEME_V->args = cdr (args);
4630 s_goto (OP_ERR1); 5053 s_goto (OP_ERR1);
4631 5054
4632 case OP_ERR1: /* error */ 5055 case OP_ERR1: /* error */
4633 putstr (SCHEME_A_ " "); 5056 putcharacter (SCHEME_A_ ' ');
4634 5057
4635 if (args != NIL) 5058 if (args != NIL)
4636 { 5059 {
4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5060 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4638 SCHEME_V->args = a; 5061 SCHEME_V->args = a;
4639 SCHEME_V->print_flag = 1; 5062 SCHEME_V->print_flag = 1;
4640 s_goto (OP_P0LIST); 5063 s_goto (OP_P0LIST);
4641 } 5064 }
4642 else 5065 else
4643 { 5066 {
4644 putstr (SCHEME_A_ "\n"); 5067 putcharacter (SCHEME_A_ '\n');
4645 5068
4646 if (SCHEME_V->interactive_repl) 5069 if (SCHEME_V->interactive_repl)
4647 s_goto (OP_T0LVL); 5070 s_goto (OP_T0LVL);
4648 else 5071 else
4649 return -1; 5072 return -1;
… …
4726 SCHEME_V->gc_verbose = (a != S_F); 5149 SCHEME_V->gc_verbose = (a != S_F);
4727 s_retbool (was); 5150 s_retbool (was);
4728 } 5151 }
4729 5152
4730 case OP_NEWSEGMENT: /* new-segment */ 5153 case OP_NEWSEGMENT: /* new-segment */
5154#if 0
4731 if (!is_pair (args) || !is_number (a)) 5155 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 5156 Error_0 ("new-segment: argument must be a number");
4733 5157#endif
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 5158 s_retbool (alloc_cellseg (SCHEME_A));
4735
4736 s_return (S_T);
4737 5159
4738 case OP_OBLIST: /* oblist */ 5160 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 5161 s_return (oblist_all_symbols (SCHEME_A));
4740 5162
4741#if USE_PORTS 5163#if USE_PORTS
… …
4811 s_return (p == NIL ? S_F : p); 5233 s_return (p == NIL ? S_F : p);
4812 } 5234 }
4813 5235
4814 case OP_GET_OUTSTRING: /* get-output-string */ 5236 case OP_GET_OUTSTRING: /* get-output-string */
4815 { 5237 {
4816 port *p; 5238 port *p = port (a);
4817 5239
4818 if ((p = a->object.port)->kind & port_string) 5240 if (p->kind & port_string)
4819 { 5241 {
4820 off_t size; 5242 off_t size;
4821 char *str; 5243 char *str;
4822 5244
4823 size = p->rep.string.curr - p->rep.string.start + 1; 5245 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4858 } 5280 }
4859 5281
4860 if (USE_ERROR_CHECKING) abort (); 5282 if (USE_ERROR_CHECKING) abort ();
4861} 5283}
4862 5284
4863static int 5285/* reading */
5286ecb_cold static int
4864opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5287opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4865{ 5288{
4866 pointer args = SCHEME_V->args; 5289 pointer args = SCHEME_V->args;
4867 pointer x; 5290 pointer x;
4868 5291
… …
4928 int res; 5351 int res;
4929 5352
4930 if (is_pair (args)) 5353 if (is_pair (args))
4931 p = car (args); 5354 p = car (args);
4932 5355
4933 res = p->object.port->kind & port_string; 5356 res = port (p)->kind & port_string;
4934 5357
4935 s_retbool (res); 5358 s_retbool (res);
4936 } 5359 }
4937 5360
4938 case OP_SET_INPORT: /* set-input-port */ 5361 case OP_SET_INPORT: /* set-input-port */
… …
4947 case OP_RDSEXPR: 5370 case OP_RDSEXPR:
4948 switch (SCHEME_V->tok) 5371 switch (SCHEME_V->tok)
4949 { 5372 {
4950 case TOK_EOF: 5373 case TOK_EOF:
4951 s_return (S_EOF); 5374 s_return (S_EOF);
4952 /* NOTREACHED */
4953 5375
4954 case TOK_VEC: 5376 case TOK_VEC:
4955 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5377 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4956 /* fall through */ 5378 /* fall through */
4957 5379
… …
4960 5382
4961 if (SCHEME_V->tok == TOK_RPAREN) 5383 if (SCHEME_V->tok == TOK_RPAREN)
4962 s_return (NIL); 5384 s_return (NIL);
4963 else if (SCHEME_V->tok == TOK_DOT) 5385 else if (SCHEME_V->tok == TOK_DOT)
4964 Error_0 ("syntax error: illegal dot expression"); 5386 Error_0 ("syntax error: illegal dot expression");
4965 else 5387
4966 {
4967 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5388 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4968 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5389 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4969 s_goto (OP_RDSEXPR); 5390 s_goto (OP_RDSEXPR);
4970 }
4971 5391
4972 case TOK_QUOTE: 5392 case TOK_QUOTE:
4973 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5393 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4974 SCHEME_V->tok = token (SCHEME_A); 5394 SCHEME_V->tok = token (SCHEME_A);
4975 s_goto (OP_RDSEXPR); 5395 s_goto (OP_RDSEXPR);
… …
4981 { 5401 {
4982 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5402 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4983 SCHEME_V->tok = TOK_LPAREN; 5403 SCHEME_V->tok = TOK_LPAREN;
4984 s_goto (OP_RDSEXPR); 5404 s_goto (OP_RDSEXPR);
4985 } 5405 }
4986 else 5406
4987 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5407 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4988
4989 s_goto (OP_RDSEXPR); 5408 s_goto (OP_RDSEXPR);
4990 5409
4991 case TOK_COMMA: 5410 case TOK_COMMA:
4992 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5411 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4993 SCHEME_V->tok = token (SCHEME_A); 5412 SCHEME_V->tok = token (SCHEME_A);
… …
4997 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5416 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 5417 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 5418 s_goto (OP_RDSEXPR);
5000 5419
5001 case TOK_ATOM: 5420 case TOK_ATOM:
5002 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5421 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5422
5423 case TOK_DOTATOM:
5424 SCHEME_V->strbuff[0] = '.';
5425 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5426
5427 case TOK_STRATOM:
5428 //TODO: haven't checked whether the garbage collector could interfere and free x
5429 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5430 x = readstrexp (SCHEME_A_ '|');
5431 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003 5432
5004 case TOK_DQUOTE: 5433 case TOK_DQUOTE:
5005 x = readstrexp (SCHEME_A); 5434 x = readstrexp (SCHEME_A_ '"');
5006 5435
5007 if (x == S_F) 5436 if (x == S_F)
5008 Error_0 ("Error reading string"); 5437 Error_0 ("Error reading string");
5009 5438
5010 setimmutable (x); 5439 setimmutable (x);
… …
5014 { 5443 {
5015 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5444 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5016 5445
5017 if (f == NIL) 5446 if (f == NIL)
5018 Error_0 ("undefined sharp expression"); 5447 Error_0 ("undefined sharp expression");
5019 else 5448
5020 {
5021 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5449 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5022 s_goto (OP_EVAL); 5450 s_goto (OP_EVAL);
5023 }
5024 } 5451 }
5025 5452
5026 case TOK_SHARP_CONST: 5453 case TOK_SHARP_CONST:
5027 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5454 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028 Error_0 ("undefined sharp expression"); 5455 Error_0 ("undefined sharp expression");
5029 else 5456
5030 s_return (x); 5457 s_return (x);
5031 5458
5032 default: 5459 default:
5033 Error_0 ("syntax error: illegal token"); 5460 Error_0 ("syntax error: illegal token");
5034 } 5461 }
5035 5462
… …
5128 pointer b = cdr (args); 5555 pointer b = cdr (args);
5129 int ok_abbr = ok_abbrev (b); 5556 int ok_abbr = ok_abbrev (b);
5130 SCHEME_V->args = car (b); 5557 SCHEME_V->args = car (b);
5131 5558
5132 if (a == SCHEME_V->QUOTE && ok_abbr) 5559 if (a == SCHEME_V->QUOTE && ok_abbr)
5133 putstr (SCHEME_A_ "'"); 5560 putcharacter (SCHEME_A_ '\'');
5134 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5561 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ "`"); 5562 putcharacter (SCHEME_A_ '`');
5136 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5563 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5137 putstr (SCHEME_A_ ","); 5564 putcharacter (SCHEME_A_ ',');
5138 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5565 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5139 putstr (SCHEME_A_ ",@"); 5566 putstr (SCHEME_A_ ",@");
5140 else 5567 else
5141 { 5568 {
5142 putstr (SCHEME_A_ "("); 5569 putcharacter (SCHEME_A_ '(');
5143 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5570 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5144 SCHEME_V->args = a; 5571 SCHEME_V->args = a;
5145 } 5572 }
5146 5573
5147 s_goto (OP_P0LIST); 5574 s_goto (OP_P0LIST);
… …
5149 5576
5150 case OP_P1LIST: 5577 case OP_P1LIST:
5151 if (is_pair (args)) 5578 if (is_pair (args))
5152 { 5579 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5580 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5154 putstr (SCHEME_A_ " "); 5581 putcharacter (SCHEME_A_ ' ');
5155 SCHEME_V->args = car (args); 5582 SCHEME_V->args = car (args);
5156 s_goto (OP_P0LIST); 5583 s_goto (OP_P0LIST);
5157 } 5584 }
5158 else if (is_vector (args)) 5585 else if (is_vector (args))
5159 { 5586 {
… …
5167 { 5594 {
5168 putstr (SCHEME_A_ " . "); 5595 putstr (SCHEME_A_ " . ");
5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5596 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5170 } 5597 }
5171 5598
5172 putstr (SCHEME_A_ ")"); 5599 putcharacter (SCHEME_A_ ')');
5173 s_return (S_T); 5600 s_return (S_T);
5174 } 5601 }
5175 5602
5176 case OP_PVECFROM: 5603 case OP_PVECFROM:
5177 { 5604 {
5178 int i = ivalue_unchecked (cdr (args)); 5605 IVALUE i = ivalue_unchecked (cdr (args));
5179 pointer vec = car (args); 5606 pointer vec = car (args);
5180 int len = veclength (vec); 5607 uint32_t len = veclength (vec);
5181 5608
5182 if (i == len) 5609 if (i == len)
5183 { 5610 {
5184 putstr (SCHEME_A_ ")"); 5611 putcharacter (SCHEME_A_ ')');
5185 s_return (S_T); 5612 s_return (S_T);
5186 } 5613 }
5187 else 5614 else
5188 { 5615 {
5189 pointer elem = vector_elem (vec, i); 5616 pointer elem = vector_get (vec, i);
5190 5617
5191 ivalue_unchecked (cdr (args)) = i + 1; 5618 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5619 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193 SCHEME_V->args = elem; 5620 SCHEME_V->args = elem;
5194 5621
5195 if (i > 0) 5622 if (i > 0)
5196 putstr (SCHEME_A_ " "); 5623 putcharacter (SCHEME_A_ ' ');
5197 5624
5198 s_goto (OP_P0LIST); 5625 s_goto (OP_P0LIST);
5199 } 5626 }
5200 } 5627 }
5201 } 5628 }
5202 5629
5203 if (USE_ERROR_CHECKING) abort (); 5630 if (USE_ERROR_CHECKING) abort ();
5204} 5631}
5205 5632
5206static int 5633/* list ops */
5634ecb_hot static int
5207opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5635opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5208{ 5636{
5209 pointer args = SCHEME_V->args; 5637 pointer args = SCHEME_V->args;
5210 pointer a = car (args); 5638 pointer a = car (args);
5211 pointer x, y; 5639 pointer x, y;
… …
5234 break; 5662 break;
5235 } 5663 }
5236 5664
5237 if (is_pair (y)) 5665 if (is_pair (y))
5238 s_return (car (y)); 5666 s_return (car (y));
5239 else 5667
5240 s_return (S_F); 5668 s_return (S_F);
5241
5242 5669
5243 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5670 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5244 SCHEME_V->args = a; 5671 SCHEME_V->args = a;
5245 5672
5246 if (SCHEME_V->args == NIL) 5673 if (SCHEME_V->args == NIL)
5247 s_return (S_F); 5674 s_return (S_F);
5248 else if (is_closure (SCHEME_V->args)) 5675 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5676 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5250 else if (is_macro (SCHEME_V->args)) 5677
5251 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5252 else
5253 s_return (S_F); 5678 s_return (S_F);
5254 5679
5255 case OP_CLOSUREP: /* closure? */ 5680 case OP_CLOSUREP: /* closure? */
5256 /* 5681 /*
5257 * Note, macro object is also a closure. 5682 * Note, macro object is also a closure.
5258 * Therefore, (closure? <#MACRO>) ==> #t 5683 * Therefore, (closure? <#MACRO>) ==> #t
5684 * (schmorp) well, obviously not, fix? TODO
5259 */ 5685 */
5260 s_retbool (is_closure (a)); 5686 s_retbool (is_closure (a));
5261 5687
5262 case OP_MACROP: /* macro? */ 5688 case OP_MACROP: /* macro? */
5263 s_retbool (is_macro (a)); 5689 s_retbool (is_macro (a));
… …
5268 5694
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5695/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5696typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5697
5272typedef int (*test_predicate)(pointer); 5698typedef int (*test_predicate)(pointer);
5273static int 5699
5700ecb_hot static int
5274is_any (pointer p) 5701tst_any (pointer p)
5275{ 5702{
5276 return 1; 5703 return 1;
5277} 5704}
5278 5705
5279static int 5706ecb_hot static int
5280is_nonneg (pointer p) 5707tst_inonneg (pointer p)
5281{ 5708{
5282 return ivalue (p) >= 0 && is_integer (p); 5709 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5710}
5284 5711
5285static int 5712ecb_hot static int
5286tst_is_list (pointer p) 5713tst_is_list (SCHEME_P_ pointer p)
5287{ 5714{
5288 return p == NIL || is_pair (p); 5715 return p == NIL || is_pair (p);
5289} 5716}
5290 5717
5291/* Correspond carefully with following defines! */ 5718/* Correspond carefully with following defines! */
5292static struct 5719static struct
5293{ 5720{
5294 test_predicate fct; 5721 test_predicate fct;
5295 const char *kind; 5722 const char *kind;
5296} tests[] = 5723} tests[] = {
5297{
5298 { is_any, 0 }, 5724 { tst_any , 0 },
5299 { is_string, "string" }, 5725 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5726 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5727 { is_port , "port" },
5302 { is_inport, "input port" }, 5728 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5729 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5730 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5731 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5732 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5733 { is_character , "character" },
5308 { is_vector, "vector" }, 5734 { is_vector , "vector" },
5309 { is_number, "number" }, 5735 { is_number , "number" },
5310 { is_integer, "integer" }, 5736 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5737 { tst_inonneg , "non-negative integer" }
5312}; 5738};
5313 5739
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5740#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5741#define TST_ANY "\001"
5316#define TST_STRING "\002" 5742#define TST_STRING "\002"
… …
5334#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5760#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5335#include "opdefines.h" 5761#include "opdefines.h"
5336#undef OP_DEF 5762#undef OP_DEF
5337; 5763;
5338 5764
5339static const char * 5765ecb_cold static const char *
5340opname (int idx) 5766opname (int idx)
5341{ 5767{
5342 const char *name = opnames; 5768 const char *name = opnames;
5343 5769
5344 /* should do this at compile time, but would require external program, right? */ 5770 /* should do this at compile time, but would require external program, right? */
… …
5346 name += strlen (name) + 1; 5772 name += strlen (name) + 1;
5347 5773
5348 return *name ? name : "ILLEGAL"; 5774 return *name ? name : "ILLEGAL";
5349} 5775}
5350 5776
5351static const char * 5777ecb_cold static const char *
5352procname (pointer x) 5778procname (pointer x)
5353{ 5779{
5354 return opname (procnum (x)); 5780 return opname (procnum (x));
5355} 5781}
5356 5782
5357typedef struct 5783typedef struct
5358{ 5784{
5359 uint8_t func; 5785 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5786 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5787 uint8_t builtin;
5788#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5789 uint8_t min_arity;
5363 uint8_t max_arity; 5790 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5791 char arg_tests_encoding[3];
5792#endif
5365} op_code_info; 5793} op_code_info;
5366 5794
5367static const op_code_info dispatch_table[] = { 5795static const op_code_info dispatch_table[] = {
5796#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5797#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5798#else
5799#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5800#endif
5369#include "opdefines.h" 5801#include "opdefines.h"
5370#undef OP_DEF 5802#undef OP_DEF
5371 {0} 5803 {0}
5372}; 5804};
5373 5805
5374/* kernel of this interpreter */ 5806/* kernel of this interpreter */
5375static void ecb_hot 5807ecb_hot static void
5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5808Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5377{ 5809{
5378 SCHEME_V->op = op; 5810 SCHEME_V->op = op;
5379 5811
5380 for (;;) 5812 for (;;)
… …
5415 { 5847 {
5416 pointer arg = car (arglist); 5848 pointer arg = car (arglist);
5417 5849
5418 j = t[0]; 5850 j = t[0];
5419 5851
5852 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5853 if (j == TST_LIST[0])
5854 {
5855 if (!tst_is_list (SCHEME_A_ arg))
5856 break;
5857 }
5858 else
5859 {
5420 if (!tests[j - 1].fct (arg)) 5860 if (!tests[j - 1].fct (arg))
5421 break; 5861 break;
5862 }
5422 5863
5423 if (t[1]) /* last test is replicated as necessary */ 5864 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424 t++; 5865 t++;
5425 5866
5426 arglist = cdr (arglist); 5867 arglist = cdr (arglist);
5427 i++; 5868 i++;
5428 } 5869 }
… …
5454 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5895 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5455 return; 5896 return;
5456 5897
5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5898 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5458 { 5899 {
5459 xwrstr ("No memory!\n"); 5900 putstr (SCHEME_A_ "No memory!\n");
5460 return; 5901 return;
5461 } 5902 }
5462 } 5903 }
5463} 5904}
5464 5905
5465/* ========== Initialization of internal keywords ========== */ 5906/* ========== Initialization of internal keywords ========== */
5466 5907
5467static void 5908ecb_cold static void
5468assign_syntax (SCHEME_P_ const char *name) 5909assign_syntax (SCHEME_P_ const char *name)
5469{ 5910{
5470 pointer x = oblist_add_by_name (SCHEME_A_ name); 5911 pointer x = oblist_add_by_name (SCHEME_A_ name);
5471 set_typeflag (x, typeflag (x) | T_SYNTAX); 5912 set_typeflag (x, typeflag (x) | T_SYNTAX);
5472} 5913}
5473 5914
5474static void 5915ecb_cold static void
5475assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5916assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5476{ 5917{
5477 pointer x = mk_symbol (SCHEME_A_ name); 5918 pointer x = mk_symbol (SCHEME_A_ name);
5478 pointer y = mk_proc (SCHEME_A_ op); 5919 pointer y = mk_proc (SCHEME_A_ op);
5479 new_slot_in_env (SCHEME_A_ x, y); 5920 new_slot_in_env (SCHEME_A_ x, y);
… …
5482static pointer 5923static pointer
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5924mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5925{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5926 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5927 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5928 set_ivalue (y, op);
5488 set_num_integer (y);
5489 return y; 5929 return y;
5490} 5930}
5491 5931
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5932/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5933ecb_hot static int
5494syntaxnum (pointer p) 5934syntaxnum (pointer p)
5495{ 5935{
5496 const char *s = strvalue (car (p)); 5936 const char *s = strvalue (p);
5497 5937
5498 switch (strlength (car (p))) 5938 switch (strlength (p))
5499 { 5939 {
5500 case 2: 5940 case 2:
5501 if (s[0] == 'i') 5941 if (s[0] == 'i')
5502 return OP_IF0; /* if */ 5942 return OP_IF0; /* if */
5503 else 5943 else
… …
5577 6017
5578ecb_cold int 6018ecb_cold int
5579scheme_init (SCHEME_P) 6019scheme_init (SCHEME_P)
5580{ 6020{
5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6021 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5582 pointer x; 6022
6023 /* this memset is not strictly correct, as we assume (intcache)
6024 * that memset 0 will also set pointers to 0, but memset does
6025 * of course not guarantee that. screw such systems.
6026 */
6027 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5583 6028
5584 num_set_fixnum (num_zero, 1); 6029 num_set_fixnum (num_zero, 1);
5585 num_set_ivalue (num_zero, 0); 6030 num_set_ivalue (num_zero, 0);
5586 num_set_fixnum (num_one, 1); 6031 num_set_fixnum (num_one, 1);
5587 num_set_ivalue (num_one, 1); 6032 num_set_ivalue (num_one, 1);
… …
5599 SCHEME_V->save_inport = NIL; 6044 SCHEME_V->save_inport = NIL;
5600 SCHEME_V->loadport = NIL; 6045 SCHEME_V->loadport = NIL;
5601 SCHEME_V->nesting = 0; 6046 SCHEME_V->nesting = 0;
5602 SCHEME_V->interactive_repl = 0; 6047 SCHEME_V->interactive_repl = 0;
5603 6048
5604 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6049 if (!alloc_cellseg (SCHEME_A))
5605 { 6050 {
5606#if USE_ERROR_CHECKING 6051#if USE_ERROR_CHECKING
5607 SCHEME_V->no_memory = 1; 6052 SCHEME_V->no_memory = 1;
5608 return 0; 6053 return 0;
5609#endif 6054#endif
5610 } 6055 }
5611 6056
5612 SCHEME_V->gc_verbose = 0; 6057 SCHEME_V->gc_verbose = 0;
5613 dump_stack_initialize (SCHEME_A); 6058 dump_stack_initialize (SCHEME_A);
5614 SCHEME_V->code = NIL; 6059 SCHEME_V->code = NIL;
5615 SCHEME_V->args = NIL; 6060 SCHEME_V->args = NIL;
5616 SCHEME_V->envir = NIL; 6061 SCHEME_V->envir = NIL;
6062 SCHEME_V->value = NIL;
5617 SCHEME_V->tracing = 0; 6063 SCHEME_V->tracing = 0;
5618 6064
5619 /* init NIL */ 6065 /* init NIL */
5620 set_typeflag (NIL, T_ATOM | T_MARK); 6066 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5621 set_car (NIL, NIL); 6067 set_car (NIL, NIL);
5622 set_cdr (NIL, NIL); 6068 set_cdr (NIL, NIL);
5623 /* init T */ 6069 /* init T */
5624 set_typeflag (S_T, T_ATOM | T_MARK); 6070 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5625 set_car (S_T, S_T); 6071 set_car (S_T, S_T);
5626 set_cdr (S_T, S_T); 6072 set_cdr (S_T, S_T);
5627 /* init F */ 6073 /* init F */
5628 set_typeflag (S_F, T_ATOM | T_MARK); 6074 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5629 set_car (S_F, S_F); 6075 set_car (S_F, S_F);
5630 set_cdr (S_F, S_F); 6076 set_cdr (S_F, S_F);
5631 /* init EOF_OBJ */ 6077 /* init EOF_OBJ */
5632 set_typeflag (S_EOF, T_ATOM | T_MARK); 6078 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5633 set_car (S_EOF, S_EOF); 6079 set_car (S_EOF, S_EOF);
5634 set_cdr (S_EOF, S_EOF); 6080 set_cdr (S_EOF, S_EOF);
5635 /* init sink */ 6081 /* init sink */
5636 set_typeflag (S_SINK, T_PAIR | T_MARK); 6082 set_typeflag (S_SINK, T_PAIR);
5637 set_car (S_SINK, NIL); 6083 set_car (S_SINK, NIL);
5638 6084
5639 /* init c_nest */ 6085 /* init c_nest */
5640 SCHEME_V->c_nest = NIL; 6086 SCHEME_V->c_nest = NIL;
5641 6087
5642 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6088 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5643 /* init global_env */ 6089 /* init global_env */
5644 new_frame_in_env (SCHEME_A_ NIL); 6090 new_frame_in_env (SCHEME_A_ NIL);
5645 SCHEME_V->global_env = SCHEME_V->envir; 6091 SCHEME_V->global_env = SCHEME_V->envir;
5646 /* init else */ 6092 /* init else */
5647 x = mk_symbol (SCHEME_A_ "else"); 6093 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5648 new_slot_in_env (SCHEME_A_ x, S_T);
5649 6094
5650 { 6095 {
5651 static const char *syntax_names[] = { 6096 static const char *syntax_names[] = {
5652 "lambda", "quote", "define", "if", "begin", "set!", 6097 "lambda", "quote", "define", "if", "begin", "set!",
5653 "let", "let*", "letrec", "cond", "delay", "and", 6098 "let", "let*", "letrec", "cond", "delay", "and",
… …
5677 6122
5678 return !SCHEME_V->no_memory; 6123 return !SCHEME_V->no_memory;
5679} 6124}
5680 6125
5681#if USE_PORTS 6126#if USE_PORTS
5682void 6127ecb_cold void
5683scheme_set_input_port_file (SCHEME_P_ int fin) 6128scheme_set_input_port_file (SCHEME_P_ int fin)
5684{ 6129{
5685 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6130 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5686} 6131}
5687 6132
5688void 6133ecb_cold void
5689scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6134scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5690{ 6135{
5691 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6136 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5692} 6137}
5693 6138
5694void 6139ecb_cold void
5695scheme_set_output_port_file (SCHEME_P_ int fout) 6140scheme_set_output_port_file (SCHEME_P_ int fout)
5696{ 6141{
5697 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6142 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5698} 6143}
5699 6144
5700void 6145ecb_cold void
5701scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6146scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5702{ 6147{
5703 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6148 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5704} 6149}
5705#endif 6150#endif
5706 6151
5707void 6152ecb_cold void
5708scheme_set_external_data (SCHEME_P_ void *p) 6153scheme_set_external_data (SCHEME_P_ void *p)
5709{ 6154{
5710 SCHEME_V->ext_data = p; 6155 SCHEME_V->ext_data = p;
5711} 6156}
5712 6157
… …
5744 SCHEME_V->loadport = NIL; 6189 SCHEME_V->loadport = NIL;
5745 SCHEME_V->gc_verbose = 0; 6190 SCHEME_V->gc_verbose = 0;
5746 gc (SCHEME_A_ NIL, NIL); 6191 gc (SCHEME_A_ NIL, NIL);
5747 6192
5748 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6193 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5749 free (SCHEME_V->alloc_seg[i]); 6194 free (SCHEME_V->cell_seg[i]);
5750 6195
5751#if SHOW_ERROR_LINE 6196#if SHOW_ERROR_LINE
5752 for (i = 0; i <= SCHEME_V->file_i; i++) 6197 for (i = 0; i <= SCHEME_V->file_i; i++)
5753 {
5754 if (SCHEME_V->load_stack[i].kind & port_file) 6198 if (SCHEME_V->load_stack[i].kind & port_file)
5755 { 6199 {
5756 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6200 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5757 6201
5758 if (fname) 6202 if (fname)
5759 free (fname); 6203 free (fname);
5760 } 6204 }
5761 }
5762#endif 6205#endif
5763} 6206}
5764 6207
5765void 6208ecb_cold void
5766scheme_load_file (SCHEME_P_ int fin) 6209scheme_load_file (SCHEME_P_ int fin)
5767{ 6210{
5768 scheme_load_named_file (SCHEME_A_ fin, 0); 6211 scheme_load_named_file (SCHEME_A_ fin, 0);
5769} 6212}
5770 6213
5771void 6214ecb_cold void
5772scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6215scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5773{ 6216{
5774 dump_stack_reset (SCHEME_A); 6217 dump_stack_reset (SCHEME_A);
5775 SCHEME_V->envir = SCHEME_V->global_env; 6218 SCHEME_V->envir = SCHEME_V->global_env;
5776 SCHEME_V->file_i = 0; 6219 SCHEME_V->file_i = 0;
5777 SCHEME_V->load_stack[0].unget = -1; 6220 SCHEME_V->load_stack[0].unget = -1;
5778 SCHEME_V->load_stack[0].kind = port_input | port_file; 6221 SCHEME_V->load_stack[0].kind = port_input | port_file;
5779 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6222 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5780#if USE_PORTS
5781 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6223 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5782#endif
5783 SCHEME_V->retcode = 0; 6224 SCHEME_V->retcode = 0;
5784 6225
5785#if USE_PORTS
5786 if (fin == STDIN_FILENO) 6226 if (fin == STDIN_FILENO)
5787 SCHEME_V->interactive_repl = 1; 6227 SCHEME_V->interactive_repl = 1;
5788#endif
5789 6228
5790#if USE_PORTS 6229#if USE_PORTS
5791#if SHOW_ERROR_LINE 6230#if SHOW_ERROR_LINE
5792 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6231 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5793 6232
… …
5797#endif 6236#endif
5798 6237
5799 SCHEME_V->inport = SCHEME_V->loadport; 6238 SCHEME_V->inport = SCHEME_V->loadport;
5800 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6239 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5801 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6240 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6241
5802 set_typeflag (SCHEME_V->loadport, T_ATOM); 6242 set_typeflag (SCHEME_V->loadport, T_ATOM);
5803 6243
5804 if (SCHEME_V->retcode == 0) 6244 if (SCHEME_V->retcode == 0)
5805 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6245 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5806} 6246}
5807 6247
5808void 6248ecb_cold void
5809scheme_load_string (SCHEME_P_ const char *cmd) 6249scheme_load_string (SCHEME_P_ const char *cmd)
5810{ 6250{
6251#if USE_PORTs
5811 dump_stack_reset (SCHEME_A); 6252 dump_stack_reset (SCHEME_A);
5812 SCHEME_V->envir = SCHEME_V->global_env; 6253 SCHEME_V->envir = SCHEME_V->global_env;
5813 SCHEME_V->file_i = 0; 6254 SCHEME_V->file_i = 0;
5814 SCHEME_V->load_stack[0].kind = port_input | port_string; 6255 SCHEME_V->load_stack[0].kind = port_input | port_string;
5815 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6256 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5816 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6257 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6258 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5818#if USE_PORTS
5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6259 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5820#endif
5821 SCHEME_V->retcode = 0; 6260 SCHEME_V->retcode = 0;
5822 SCHEME_V->interactive_repl = 0; 6261 SCHEME_V->interactive_repl = 0;
5823 SCHEME_V->inport = SCHEME_V->loadport; 6262 SCHEME_V->inport = SCHEME_V->loadport;
5824 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6263 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5825 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6264 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5826 set_typeflag (SCHEME_V->loadport, T_ATOM); 6265 set_typeflag (SCHEME_V->loadport, T_ATOM);
5827 6266
5828 if (SCHEME_V->retcode == 0) 6267 if (SCHEME_V->retcode == 0)
5829 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6268 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6269#else
6270 abort ();
6271#endif
5830} 6272}
5831 6273
5832void 6274ecb_cold void
5833scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6275scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5834{ 6276{
5835 pointer x; 6277 pointer x;
5836 6278
5837 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6279 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5842 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6284 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5843} 6285}
5844 6286
5845#if !STANDALONE 6287#if !STANDALONE
5846 6288
5847void 6289ecb_cold void
5848scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6290scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5849{ 6291{
5850 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6292 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5851} 6293}
5852 6294
5853void 6295ecb_cold void
5854scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6296scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5855{ 6297{
5856 int i; 6298 int i;
5857 6299
5858 for (i = 0; i < count; i++) 6300 for (i = 0; i < count; i++)
5859 scheme_register_foreign_func (SCHEME_A_ list + i); 6301 scheme_register_foreign_func (SCHEME_A_ list + i);
5860} 6302}
5861 6303
5862pointer 6304ecb_cold pointer
5863scheme_apply0 (SCHEME_P_ const char *procname) 6305scheme_apply0 (SCHEME_P_ const char *procname)
5864{ 6306{
5865 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6307 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5866} 6308}
5867 6309
5868void 6310ecb_cold void
5869save_from_C_call (SCHEME_P) 6311save_from_C_call (SCHEME_P)
5870{ 6312{
5871 pointer saved_data = cons (car (S_SINK), 6313 pointer saved_data = cons (car (S_SINK),
5872 cons (SCHEME_V->envir, 6314 cons (SCHEME_V->envir,
5873 SCHEME_V->dump)); 6315 SCHEME_V->dump));
… …
5877 /* Truncate the dump stack so TS will return here when done, not 6319 /* Truncate the dump stack so TS will return here when done, not
5878 directly resume pre-C-call operations. */ 6320 directly resume pre-C-call operations. */
5879 dump_stack_reset (SCHEME_A); 6321 dump_stack_reset (SCHEME_A);
5880} 6322}
5881 6323
5882void 6324ecb_cold void
5883restore_from_C_call (SCHEME_P) 6325restore_from_C_call (SCHEME_P)
5884{ 6326{
5885 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6327 set_car (S_SINK, caar (SCHEME_V->c_nest));
5886 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6328 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5887 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6329 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5888 /* Pop */ 6330 /* Pop */
5889 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6331 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5890} 6332}
5891 6333
5892/* "func" and "args" are assumed to be already eval'ed. */ 6334/* "func" and "args" are assumed to be already eval'ed. */
5893pointer 6335ecb_cold pointer
5894scheme_call (SCHEME_P_ pointer func, pointer args) 6336scheme_call (SCHEME_P_ pointer func, pointer args)
5895{ 6337{
5896 int old_repl = SCHEME_V->interactive_repl; 6338 int old_repl = SCHEME_V->interactive_repl;
5897 6339
5898 SCHEME_V->interactive_repl = 0; 6340 SCHEME_V->interactive_repl = 0;
… …
5905 SCHEME_V->interactive_repl = old_repl; 6347 SCHEME_V->interactive_repl = old_repl;
5906 restore_from_C_call (SCHEME_A); 6348 restore_from_C_call (SCHEME_A);
5907 return SCHEME_V->value; 6349 return SCHEME_V->value;
5908} 6350}
5909 6351
5910pointer 6352ecb_cold pointer
5911scheme_eval (SCHEME_P_ pointer obj) 6353scheme_eval (SCHEME_P_ pointer obj)
5912{ 6354{
5913 int old_repl = SCHEME_V->interactive_repl; 6355 int old_repl = SCHEME_V->interactive_repl;
5914 6356
5915 SCHEME_V->interactive_repl = 0; 6357 SCHEME_V->interactive_repl = 0;
… …
5927 6369
5928/* ========== Main ========== */ 6370/* ========== Main ========== */
5929 6371
5930#if STANDALONE 6372#if STANDALONE
5931 6373
5932int 6374ecb_cold int
5933main (int argc, char **argv) 6375main (int argc, char **argv)
5934{ 6376{
5935# if USE_MULTIPLICITY 6377# if USE_MULTIPLICITY
5936 scheme ssc; 6378 scheme ssc;
5937 scheme *const SCHEME_V = &ssc; 6379 scheme *const SCHEME_V = &ssc;
… …
5939# endif 6381# endif
5940 int fin; 6382 int fin;
5941 char *file_name = InitFile; 6383 char *file_name = InitFile;
5942 int retcode; 6384 int retcode;
5943 int isfile = 1; 6385 int isfile = 1;
6386#if EXPERIMENT
6387 system ("ps v $PPID");
6388#endif
5944 6389
5945 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6390 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946 { 6391 {
5947 xwrstr ("Usage: tinyscheme -?\n"); 6392 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6393 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5949 xwrstr ("followed by\n"); 6394 putstr (SCHEME_A_ "followed by\n");
5950 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6395 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5951 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6396 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5952 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6397 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5953 xwrstr ("Use - as filename for stdin.\n"); 6398 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5954 return 1; 6399 return 1;
5955 } 6400 }
5956 6401
5957 if (!scheme_init (SCHEME_A)) 6402 if (!scheme_init (SCHEME_A))
5958 { 6403 {
5959 xwrstr ("Could not initialize!\n"); 6404 putstr (SCHEME_A_ "Could not initialize!\n");
5960 return 2; 6405 return 2;
5961 } 6406 }
5962 6407
5963# if USE_PORTS 6408# if USE_PORTS
5964 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6409 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5977 } 6422 }
5978#endif 6423#endif
5979 6424
5980 do 6425 do
5981 { 6426 {
5982#if USE_PORTS
5983 if (strcmp (file_name, "-") == 0) 6427 if (strcmp (file_name, "-") == 0)
5984 fin = STDIN_FILENO; 6428 fin = STDIN_FILENO;
5985 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6429 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5986 { 6430 {
5987 pointer args = NIL; 6431 pointer args = NIL;
… …
6005 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6449 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6006 6450
6007 } 6451 }
6008 else 6452 else
6009 fin = open (file_name, O_RDONLY); 6453 fin = open (file_name, O_RDONLY);
6010#endif
6011 6454
6012 if (isfile && fin < 0) 6455 if (isfile && fin < 0)
6013 { 6456 {
6014 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6457 putstr (SCHEME_A_ "Could not open file ");
6458 putstr (SCHEME_A_ file_name);
6459 putcharacter (SCHEME_A_ '\n');
6015 } 6460 }
6016 else 6461 else
6017 { 6462 {
6018 if (isfile) 6463 if (isfile)
6019 scheme_load_named_file (SCHEME_A_ fin, file_name); 6464 scheme_load_named_file (SCHEME_A_ fin, file_name);
6020 else 6465 else
6021 scheme_load_string (SCHEME_A_ file_name); 6466 scheme_load_string (SCHEME_A_ file_name);
6022 6467
6023#if USE_PORTS
6024 if (!isfile || fin != STDIN_FILENO) 6468 if (!isfile || fin != STDIN_FILENO)
6025 { 6469 {
6026 if (SCHEME_V->retcode != 0) 6470 if (SCHEME_V->retcode != 0)
6027 { 6471 {
6028 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6472 putstr (SCHEME_A_ "Errors encountered reading ");
6473 putstr (SCHEME_A_ file_name);
6474 putcharacter (SCHEME_A_ '\n');
6029 } 6475 }
6030 6476
6031 if (isfile) 6477 if (isfile)
6032 close (fin); 6478 close (fin);
6033 } 6479 }
6034#endif
6035 } 6480 }
6036 6481
6037 file_name = *argv++; 6482 file_name = *argv++;
6038 } 6483 }
6039 while (file_name != 0); 6484 while (file_name != 0);

Diff Legend

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