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

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

Diff Legend

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