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

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

Diff Legend

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