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.67 by root, Mon Dec 7 19:49:35 2015 UTC

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

Diff Legend

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