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

Diff Legend

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