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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.64 by root, Wed Dec 2 17:01:18 2015 UTC

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

Diff Legend

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