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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

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

Diff Legend

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