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

Diff Legend

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