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

Diff Legend

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