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

Diff Legend

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