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

Diff Legend

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