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

Diff Legend

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