ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.63 by root, Wed Dec 2 12:16:24 2015 UTC

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

Diff Legend

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