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.17 by root, Thu Nov 26 10:15:51 2015 UTC vs.
Revision 1.61 by root, Wed Dec 2 07:43:46 2015 UTC

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

Diff Legend

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