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

Diff Legend

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