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

Diff Legend

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