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.16 by root, Thu Nov 26 10:02:58 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

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

Diff Legend

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