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.64 by root, Wed Dec 2 17:01:18 2015 UTC

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

Diff Legend

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