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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.62 by root, Wed Dec 2 07:59:15 2015 UTC

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

Diff Legend

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