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

Diff Legend

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