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

Diff Legend

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