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

Diff Legend

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