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.2 by root, Wed Nov 25 10:01:39 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

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

Diff Legend

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