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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.59 by root, Tue Dec 1 07:13:25 2015 UTC

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

Diff Legend

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