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

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

Diff Legend

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