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

Diff Legend

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