ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/microscheme/scheme.c
(Generate patch)

Comparing microscheme/scheme.c (file contents):
Revision 1.12 by root, Thu Nov 26 07:30:25 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 2015 UTC

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

Diff Legend

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