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

Diff Legend

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