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

Diff Legend

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