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

Diff Legend

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