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

Diff Legend

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