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.13 by root, Thu Nov 26 07:59:42 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 2015 UTC

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

Diff Legend

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