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.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57:49 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,
181 T_FREE, 198 T_REAL,
182 T_STRING, 199 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 200 T_SYMBOL,
185 T_PROC, 201 T_PROC,
186 T_PAIR, 202 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 203 T_CLOSURE,
188 T_CONTINUATION, 204 T_CONTINUATION,
189 T_FOREIGN, 205 T_FOREIGN,
190 T_CHARACTER, 206 T_CHARACTER,
191 T_PORT, 207 T_PORT,
… …
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 INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
629static 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);
630static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
631static 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);
… …
646static void mark (pointer a); 691static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 699static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
656static 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);
657static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
667static 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);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 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
678static num 751static num
679num_add (num a, num b) 752num_op (enum num_op op, num a, num b)
680{ 753{
681 num ret; 754 num ret;
682 755
683 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));
684 757
685 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
686 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
687 else 771 else
688 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 }
689 780
690 return ret; 781 num_set_rvalue (ret, a.rvalue);
691} 782 }
692 783#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 784
705 return ret; 785 return ret;
706} 786}
707 787
708static num 788static num
709num_div (num a, num b) 789num_div (num a, num b)
710{ 790{
711 num ret; 791 num ret;
712 792
713 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);
714 794
715 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 797 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 799
750 return ret; 800 return ret;
751} 801}
752 802
753static num 803static num
… …
755{ 805{
756 num ret; 806 num ret;
757 long e1, e2, res; 807 long e1, e2, res;
758 808
759 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));
760 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
762 res = e1 % e2; 812 res = e1 % e2;
763 813
764 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
765 if (res > 0) 815 if (res > 0)
766 { 816 {
… …
782{ 832{
783 num ret; 833 num ret;
784 long e1, e2, res; 834 long e1, e2, res;
785 835
786 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));
787 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
789 res = e1 % e2; 839 res = e1 % e2;
790 840
791 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 842 if (res * e2 < 0)
793 res += e2; 843 res += e2;
794 844
795 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
796 return ret; 846 return ret;
797} 847}
798 848
849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 850static int
800num_eq (num a, num b) 851num_cmp (num a, num b)
801{ 852{
853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 854 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 855
805 if (is_fixnum) 856 if (is_fixnum)
806 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 }
807 else 863 else
808 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 }
809 870
810 return ret; 871 return ret;
811} 872}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852}
853
854#if USE_MATH
855
856/* Round to nearest. Round to even if midway */
857static double
858round_per_R5RS (double x)
859{
860 double fl = floor (x);
861 double ce = ceil (x);
862 double dfl = x - fl;
863 double dce = ce - x;
864
865 if (dfl > dce)
866 return ce;
867 else if (dfl < dce)
868 return fl;
869 else
870 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
872 return fl;
873 else
874 return ce;
875 }
876}
877#endif
878 873
879static int 874static int
880is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
881{ 876{
877 return x == 0;
878#if 0
882#if USE_REAL 879#if USE_REAL
883 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. */
884#else 881#else
885 return x == 0; 882 return x == 0;
886#endif 883#endif
884#endif
887} 885}
888 886
889/* allocate new cell segment */ 887/* allocate new cell segment */
890static int 888static int
891alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
892{ 890{
893 pointer newp; 891 struct cell *newp;
894 pointer last; 892 struct cell *last;
895 pointer p; 893 struct cell *p;
896 char *cp; 894 char *cp;
897 long i; 895 long i;
898 int k; 896 int k;
899 897
900 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
901 segsize <<= 1; 899 segsize <<= 1;
902 900
903 for (k = 0; k < n; k++)
904 {
905 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
906 return k;
907
908 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
909 902
910 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
911 return k; 904 return k;
912 905
913 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
915 908
916 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
917 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 913 last = newp + segsize - 1;
937 914
938 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
939 { 916 {
917 pointer cp = POINTER (p);
940 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
941 set_car (p, NIL); 919 set_car (cp, NIL);
942 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
943 } 921 }
944 922
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954 925
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 }
962
963 return n; 926 return 1;
964} 927}
965 928
966/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 930ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 932{
970 if (SCHEME_V->free_cell == NIL) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 934 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 936 return S_SINK;
974 937
975 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
976 { 939 {
977 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;
978 941
979 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
980 943
981 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)
982 { 945 {
983 /* 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 */
984 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
985 { 948 {
986#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
987 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
988 return S_SINK; 951 return S_SINK;
989#endif 952#endif
… …
1001 } 964 }
1002} 965}
1003 966
1004/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1005 Tehom */ 968 Tehom */
1006
1007static void 969static void
1008push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1009{ 971{
1010 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1011 973
… …
1033} 995}
1034 996
1035static pointer 997static pointer
1036get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1037{ 999{
1038 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1039 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1040 1002
1041 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1042 return S_SINK; 1004 return S_SINK;
1043 1005
1044 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1008
1047 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1049 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1013
1052 return v; 1014 return v;
1053} 1015}
1054 1016
1055static INLINE void 1017ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1057{ 1019{
1058 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1059} 1021}
1060 1022
… …
1062static void 1024static void
1063check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1064{ 1026{
1065 /* 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. */
1066 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1067 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1068 1030
1069 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1070 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1071} 1033}
1072 1034
1073static void 1035static void
1074check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1075{ 1037{
… …
1097 set_cdr (x, b); 1059 set_cdr (x, b);
1098 1060
1099 return x; 1061 return x;
1100} 1062}
1101 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
1102/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1103 1074
1104#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1105 1076
1077static int
1106static 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}
1107 1088
1108static pointer 1089static pointer
1109oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1110{ 1091{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1094
1114/* returns the new symbol */ 1095/* returns the new symbol */
1115static pointer 1096static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1098{
1118 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1119
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x));
1123
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 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)));
1126 return x; 1102 return x;
1127} 1103}
1128 1104
1129static INLINE pointer 1105ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1107{
1132 int location; 1108 int location;
1133 pointer x; 1109 pointer x;
1134 char *s; 1110 char *s;
1135 1111
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1113
1138 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))
1139 { 1115 {
1140 s = symname (car (x)); 1116 s = symname (car (x));
1141 1117
1142 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1153 int i; 1129 int i;
1154 pointer x; 1130 pointer x;
1155 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1156 1132
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 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))
1159 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1160 1136
1161 return ob_list; 1137 return ob_list;
1162} 1138}
1163 1139
… …
1167oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1168{ 1144{
1169 return NIL; 1145 return NIL;
1170} 1146}
1171 1147
1172static INLINE pointer 1148ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1150{
1175 pointer x; 1151 pointer x;
1176 char *s; 1152 char *s;
1177 1153
… …
1189 1165
1190/* returns the new symbol */ 1166/* returns the new symbol */
1191static pointer 1167static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1169{
1194 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x));
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1172 return x;
1201} 1173}
1202 1174
1203static pointer 1175static pointer
… …
1213mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1214{ 1186{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1188
1217 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1218 x->object.port = p; 1190 set_port (x, p);
1219 1191
1220 return x; 1192 return x;
1221} 1193}
1222#endif 1194#endif
1223 1195
1224pointer 1196pointer
1225mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1226{ 1198{
1227 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1228 1200
1229 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1230 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1231 1203
1232 return x; 1204 return x;
1233} 1205}
1234 1206
1235INTERFACE pointer 1207INTERFACE pointer
1236mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1237{ 1209{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1211
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1241 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1214
1243 return x; 1215 return x;
1244} 1216}
1245 1217
1246/* get number atom (integer) */ 1218/* get number atom (integer) */
1247INTERFACE pointer 1219INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1249{ 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 {
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1233
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1253 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1254 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1255 return x; 1241 return *pp;
1256} 1242}
1257 1243
1258INTERFACE pointer 1244INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1260{ 1246{
1247#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1249
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1264 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1265 set_num_real (x); 1252
1266 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1267} 1257}
1268 1258
1269static pointer 1259static pointer
1270mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1271{ 1261{
1262#if USE_REAL
1272 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
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1268#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1269}
1277 1270
1278/* allocate name to string area */ 1271/* allocate name to string area */
1279static char * 1272static char *
1280store_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)
… …
1286 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1288 } 1281 }
1289 1282
1290 if (str) 1283 if (str)
1291 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1285 else
1301 {
1302 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1303 q[len_str] = 0; 1288 q[len_str] = 0;
1304 }
1305 1289
1306 return q; 1290 return q;
1307} 1291}
1308 1292
1309INTERFACE pointer 1293INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1308
1325 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1311 strlength (x) = len;
1312
1328 return x; 1313 return x;
1329} 1314}
1330 1315
1331INTERFACE pointer 1316INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1339{ 1324{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1326}
1342 1327
1343INTERFACE void 1328INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1330{
1346 int i; 1331 int i;
1347 1332
1348 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1350} 1335}
1351 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
1352INTERFACE pointer 1346INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1354{ 1348{
1355 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1356} 1350}
1357 1351
1358INTERFACE void 1352INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1354{
1361 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1362} 1356}
1363 1357
1364/* get new symbol */ 1358/* get new symbol */
… …
1376 1370
1377INTERFACE pointer 1371INTERFACE pointer
1378gensym (SCHEME_P) 1372gensym (SCHEME_P)
1379{ 1373{
1380 pointer x; 1374 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1386 1377
1387 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1389 1380
1390 if (x == NIL) 1381static int
1391 { 1382is_gensym (SCHEME_P_ pointer x)
1392 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1393 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1385}
1399 1386
1400/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1401static pointer 1388static pointer
1402mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
… …
1456 } 1443 }
1457 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1458 { 1445 {
1459 if (!has_fp_exp) 1446 if (!has_fp_exp)
1460 { 1447 {
1461 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1449 p++;
1464 1450
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1452 continue;
1467 } 1453 }
… …
1481 1467
1482/* make constant */ 1468/* make constant */
1483static pointer 1469static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1485{ 1471{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1490 return S_T; 1473 return S_T;
1491 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1492 return S_F; 1475 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1494 { 1477 {
1495 int c = 0; 1478 int c;
1496 1479
1480 // TODO: optimise
1497 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1482 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1484 c = '\n';
1501 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1502 c = '\r'; 1486 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1504 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;
1505 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1506 { 1500 {
1507 int c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1508 1502
1509 if (c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1504 c = c1;
1511 else 1505 else
1512 return NIL; 1506 return NIL;
1513 1507 }
1514#if USE_ASCII_NAMES 1508#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1509 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1510 /* nothing */;
1519#endif 1511#endif
1520 }
1521 else if (name[2] == 0) 1512 else if (name[2] == 0)
1522 c = name[1]; 1513 c = name[1];
1523 else 1514 else
1524 return NIL; 1515 return NIL;
1525 1516
… …
1542 1533
1543/*-- 1534/*--
1544 * 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,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1536 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * 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
1547 */ 1542 */
1548static void 1543static void
1549mark (pointer a) 1544mark (pointer a)
1550{ 1545{
1551 pointer t, q, p; 1546 pointer t, q, p;
… …
1553 t = 0; 1548 t = 0;
1554 p = a; 1549 p = a;
1555E2: 1550E2:
1556 setmark (p); 1551 setmark (p);
1557 1552
1558 if (is_vector (p)) 1553 if (ecb_expect_false (is_vector (p)))
1559 { 1554 {
1560 int i; 1555 int i;
1561 1556
1562 for (i = 0; i < p->object.vector.length; i++) 1557 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1558 mark (vecvalue (p)[i]);
1564 } 1559 }
1565 1560
1566 if (is_atom (p)) 1561 if (is_atom (p))
1567 goto E6; 1562 goto E6;
… …
1614 1609
1615/* garbage collection. parameter a, b is marked. */ 1610/* garbage collection. parameter a, b is marked. */
1616static void 1611static void
1617gc (SCHEME_P_ pointer a, pointer b) 1612gc (SCHEME_P_ pointer a, pointer b)
1618{ 1613{
1619 pointer p;
1620 int i; 1614 int i;
1621 1615
1622 if (SCHEME_V->gc_verbose) 1616 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1617 putstr (SCHEME_A_ "gc...");
1624 1618
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1634 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1635 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1636 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1637 mark (SCHEME_V->c_nest);
1644 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
1645 /* mark variables a, b */ 1646 /* mark variables a, b */
1646 mark (a); 1647 mark (a);
1647 mark (b); 1648 mark (b);
1648 1649
1649 /* garbage collect */ 1650 /* garbage collect */
1650 clrmark (NIL); 1651 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1652 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1653 SCHEME_V->free_cell = NIL;
1653 1654
1654 /* free-list is kept sorted by address so as to maintain consecutive 1655 if (SCHEME_V->gc_verbose)
1655 ranges, if possible, for use with vectors. Here we scan the cells 1656 putstr (SCHEME_A_ "freeing...");
1656 (which are also kept sorted by address) downwards to build the 1657
1657 free-list in sorted order. 1658 uint32_t total = 0;
1658 */ 1659
1660 /* Here we scan the cells to build the free-list. */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1661 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 { 1662 {
1661 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];
1662 1666
1663 while (--p >= SCHEME_V->cell_seg[i]) 1667 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 { 1668 {
1669 pointer c = POINTER (p);
1670
1665 if (is_mark (p)) 1671 if (is_mark (c))
1666 clrmark (p); 1672 clrmark (c);
1667 else 1673 else
1668 { 1674 {
1669 /* reclaim cell */ 1675 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1676 if (typeflag (c) != T_PAIR)
1671 { 1677 {
1672 finalize_cell (SCHEME_A_ p); 1678 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (p, T_FREE); 1679 set_typeflag (c, T_PAIR);
1674 set_car (p, NIL); 1680 set_car (c, NIL);
1675 } 1681 }
1676 1682
1677 ++SCHEME_V->fcells; 1683 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1684 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p; 1685 SCHEME_V->free_cell = c;
1680 } 1686 }
1681 } 1687 }
1682 } 1688 }
1683 1689
1684 if (SCHEME_V->gc_verbose) 1690 if (SCHEME_V->gc_verbose)
1685 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 }
1686} 1694}
1687 1695
1688static void 1696static void
1689finalize_cell (SCHEME_P_ pointer a) 1697finalize_cell (SCHEME_P_ pointer a)
1690{ 1698{
1691 if (is_string (a)) 1699 /* TODO, fast bitmap check? */
1700 if (is_string (a) || is_symbol (a))
1692 free (strvalue (a)); 1701 free (strvalue (a));
1693 else if (is_vector (a)) 1702 else if (is_vector (a))
1694 free (vecvalue (a)); 1703 free (vecvalue (a));
1695#if USE_PORTS 1704#if USE_PORTS
1696 else if (is_port (a)) 1705 else if (is_port (a))
1697 { 1706 {
1698 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)
1699 port_close (SCHEME_A_ a, port_input | port_output); 1708 port_close (SCHEME_A_ a, port_input | port_output);
1700 1709
1701 free (a->object.port); 1710 free (port (a));
1702 } 1711 }
1703#endif 1712#endif
1704} 1713}
1705 1714
1706/* ========== Routines for Reading ========== */ 1715/* ========== Routines for Reading ========== */
… …
1722 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1731 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1723 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;
1724 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;
1725 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;
1726 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1735 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1727 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);
1728 1737
1729#if SHOW_ERROR_LINE 1738#if SHOW_ERROR_LINE
1730 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;
1731 1740
1732 if (fname) 1741 if (fname)
… …
1749 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1758 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1750#if USE_PORTS 1759#if USE_PORTS
1751 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1760 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1752#endif 1761#endif
1753 SCHEME_V->file_i--; 1762 SCHEME_V->file_i--;
1754 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);
1755 } 1764 }
1756} 1765}
1757 1766
1758static int 1767static int
1759file_interactive (SCHEME_P) 1768file_interactive (SCHEME_P)
1760{ 1769{
1761#if USE_PORTS 1770#if USE_PORTS
1762 return SCHEME_V->file_i == 0 1771 return SCHEME_V->file_i == 0
1763 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1772 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1764 && (SCHEME_V->inport->object.port->kind & port_file); 1773 && (port (SCHEME_V->inport)->kind & port_file);
1765#else 1774#else
1766 return 0; 1775 return 0;
1767#endif 1776#endif
1768} 1777}
1769 1778
… …
1903} 1912}
1904 1913
1905static void 1914static void
1906port_close (SCHEME_P_ pointer p, int flag) 1915port_close (SCHEME_P_ pointer p, int flag)
1907{ 1916{
1908 port *pt = p->object.port; 1917 port *pt = port (p);
1909 1918
1910 pt->kind &= ~flag; 1919 pt->kind &= ~flag;
1911 1920
1912 if ((pt->kind & (port_input | port_output)) == 0) 1921 if ((pt->kind & (port_input | port_output)) == 0)
1913 { 1922 {
… …
1934/* get new character from input file */ 1943/* get new character from input file */
1935static int 1944static int
1936inchar (SCHEME_P) 1945inchar (SCHEME_P)
1937{ 1946{
1938 int c; 1947 int c;
1939 port *pt; 1948 port *pt = port (SCHEME_V->inport);
1940
1941 pt = SCHEME_V->inport->object.port;
1942 1949
1943 if (pt->kind & port_saw_EOF) 1950 if (pt->kind & port_saw_EOF)
1944 return EOF; 1951 return EOF;
1945 1952
1946 c = basic_inchar (pt); 1953 c = basic_inchar (pt);
… …
2013 port *pt; 2020 port *pt;
2014 2021
2015 if (c == EOF) 2022 if (c == EOF)
2016 return; 2023 return;
2017 2024
2018 pt = SCHEME_V->inport->object.port; 2025 pt = port (SCHEME_V->inport);
2019 pt->unget = c; 2026 pt->unget = c;
2020#else 2027#else
2021 if (c == EOF) 2028 if (c == EOF)
2022 return; 2029 return;
2023 2030
… …
2051 2058
2052INTERFACE void 2059INTERFACE void
2053putstr (SCHEME_P_ const char *s) 2060putstr (SCHEME_P_ const char *s)
2054{ 2061{
2055#if USE_PORTS 2062#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port; 2063 port *pt = port (SCHEME_V->outport);
2057 2064
2058 if (pt->kind & port_file) 2065 if (pt->kind & port_file)
2059 write (pt->rep.stdio.file, s, strlen (s)); 2066 write (pt->rep.stdio.file, s, strlen (s));
2060 else 2067 else
2061 for (; *s; s++) 2068 for (; *s; s++)
… …
2063 *pt->rep.string.curr++ = *s; 2070 *pt->rep.string.curr++ = *s;
2064 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))
2065 *pt->rep.string.curr++ = *s; 2072 *pt->rep.string.curr++ = *s;
2066 2073
2067#else 2074#else
2068 xwrstr (s); 2075 write (pt->rep.stdio.file, s, strlen (s));
2069#endif 2076#endif
2070} 2077}
2071 2078
2072static void 2079static void
2073putchars (SCHEME_P_ const char *s, int len) 2080putchars (SCHEME_P_ const char *s, int len)
2074{ 2081{
2075#if USE_PORTS 2082#if USE_PORTS
2076 port *pt = SCHEME_V->outport->object.port; 2083 port *pt = port (SCHEME_V->outport);
2077 2084
2078 if (pt->kind & port_file) 2085 if (pt->kind & port_file)
2079 write (pt->rep.stdio.file, s, len); 2086 write (pt->rep.stdio.file, s, len);
2080 else 2087 else
2081 { 2088 {
… …
2095 2102
2096INTERFACE void 2103INTERFACE void
2097putcharacter (SCHEME_P_ int c) 2104putcharacter (SCHEME_P_ int c)
2098{ 2105{
2099#if USE_PORTS 2106#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port; 2107 port *pt = port (SCHEME_V->outport);
2101 2108
2102 if (pt->kind & port_file) 2109 if (pt->kind & port_file)
2103 { 2110 {
2104 char cc = c; 2111 char cc = c;
2105 write (pt->rep.stdio.file, &cc, 1); 2112 write (pt->rep.stdio.file, &cc, 1);
… …
2118#endif 2125#endif
2119} 2126}
2120 2127
2121/* read characters up to delimiter, but cater to character constants */ 2128/* read characters up to delimiter, but cater to character constants */
2122static char * 2129static char *
2123readstr_upto (SCHEME_P_ char *delim) 2130readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2131{
2125 char *p = SCHEME_V->strbuff; 2132 char *p = SCHEME_V->strbuff + skip;
2126 2133
2127 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))));
2128 2135
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2136 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2137 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2144 return SCHEME_V->strbuff;
2138} 2145}
2139 2146
2140/* read string expression "xxx...xxx" */ 2147/* read string expression "xxx...xxx" */
2141static pointer 2148static pointer
2142readstrexp (SCHEME_P) 2149readstrexp (SCHEME_P_ char delim)
2143{ 2150{
2144 char *p = SCHEME_V->strbuff; 2151 char *p = SCHEME_V->strbuff;
2145 int c; 2152 int c;
2146 int c1 = 0; 2153 int c1 = 0;
2147 enum
2148 { 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;
2149 2155
2150 for (;;) 2156 for (;;)
2151 { 2157 {
2152 c = inchar (SCHEME_A); 2158 c = inchar (SCHEME_A);
2153 2159
… …
2155 return S_F; 2161 return S_F;
2156 2162
2157 switch (state) 2163 switch (state)
2158 { 2164 {
2159 case st_ok: 2165 case st_ok:
2160 switch (c) 2166 if (ecb_expect_false (c == delim))
2161 {
2162 case '\\':
2163 state = st_bsl;
2164 break;
2165
2166 case '"':
2167 *p = 0;
2168 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);
2169 2168
2170 default: 2169 if (ecb_expect_false (c == '\\'))
2170 state = st_bsl;
2171 else
2171 *p++ = c; 2172 *p++ = c;
2172 break;
2173 }
2174 2173
2175 break; 2174 break;
2176 2175
2177 case st_bsl: 2176 case st_bsl:
2178 switch (c) 2177 switch (c)
… …
2187 case '7': 2186 case '7':
2188 state = st_oct1; 2187 state = st_oct1;
2189 c1 = c - '0'; 2188 c1 = c - '0';
2190 break; 2189 break;
2191 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
2192 case 'x': 2199 case 'x':
2193 case 'X': 2200 case 'X':
2194 state = st_x1; 2201 state = st_x1;
2195 c1 = 0; 2202 c1 = 0;
2196 break; 2203 break;
2197 2204
2198 case 'n':
2199 *p++ = '\n';
2200 state = st_ok;
2201 break;
2202
2203 case 't':
2204 *p++ = '\t';
2205 state = st_ok;
2206 break;
2207
2208 case 'r':
2209 *p++ = '\r';
2210 state = st_ok;
2211 break;
2212
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2205 default:
2219 *p++ = c; 2206 *p++ = c;
2220 state = st_ok; 2207 state = st_ok;
2221 break; 2208 break;
2222 } 2209 }
2223 2210
2224 break; 2211 break;
2225 2212
2226 case st_x1: 2213 case st_x1:
2227 case st_x2: 2214 case st_x2:
2228 c = toupper (c); 2215 c = tolower (c);
2229 2216
2230 if (c >= '0' && c <= 'F') 2217 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2218 c1 = (c1 << 4) + c - '0';
2234 else 2219 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2220 c1 = (c1 << 4) + c - 'a' + 10;
2236
2237 if (state == st_x1)
2238 state = st_x2;
2239 else
2240 {
2241 *p++ = c1;
2242 state = st_ok;
2243 }
2244 }
2245 else 2221 else
2246 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 }
2247 2231
2248 break; 2232 break;
2249 2233
2250 case st_oct1: 2234 case st_oct1:
2251 case st_oct2: 2235 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2239 backchar (SCHEME_A_ c);
2256 state = st_ok; 2240 state = st_ok;
2257 } 2241 }
2258 else 2242 else
2259 { 2243 {
2260 if (state == st_oct2 && c1 >= 32) 2244 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2245 return S_F;
2262 2246
2263 c1 = (c1 << 3) + (c - '0'); 2247 c1 = (c1 << 3) + (c - '0');
2264 2248
2265 if (state == st_oct1) 2249 if (state == st_oct1)
… …
2270 state = st_ok; 2254 state = st_ok;
2271 } 2255 }
2272 } 2256 }
2273 2257
2274 break; 2258 break;
2275
2276 } 2259 }
2277 } 2260 }
2278} 2261}
2279 2262
2280/* check c is in chars */ 2263/* check c is in chars */
2281static INLINE int 2264ecb_inline int
2282is_one_of (char *s, int c) 2265is_one_of (const char *s, int c)
2283{ 2266{
2284 if (c == EOF)
2285 return 1;
2286
2287 return !!strchr (s, c); 2267 return c == EOF || !!strchr (s, c);
2288} 2268}
2289 2269
2290/* skip white characters */ 2270/* skip white characters */
2291static INLINE int 2271ecb_inline int
2292skipspace (SCHEME_P) 2272skipspace (SCHEME_P)
2293{ 2273{
2294 int c, curr_line = 0; 2274 int c, curr_line = 0;
2295 2275
2296 do 2276 do
2297 { 2277 {
2298 c = inchar (SCHEME_A); 2278 c = inchar (SCHEME_A);
2279
2299#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2300 if (c == '\n') 2281 if (ecb_expect_false (c == '\n'))
2301 curr_line++; 2282 curr_line++;
2302#endif 2283#endif
2284
2285 if (ecb_expect_false (c == EOF))
2286 return c;
2303 } 2287 }
2304 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2288 while (is_one_of (WHITESPACE, c));
2305 2289
2306 /* record it */ 2290 /* record it */
2307#if SHOW_ERROR_LINE 2291#if SHOW_ERROR_LINE
2308 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)
2309 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;
2310#endif 2294#endif
2311 2295
2312 if (c != EOF)
2313 {
2314 backchar (SCHEME_A_ c); 2296 backchar (SCHEME_A_ c);
2315 return 1; 2297 return 1;
2316 }
2317 else
2318 return EOF;
2319} 2298}
2320 2299
2321/* get token */ 2300/* get token */
2322static int 2301static int
2323token (SCHEME_P) 2302token (SCHEME_P)
… …
2339 return TOK_RPAREN; 2318 return TOK_RPAREN;
2340 2319
2341 case '.': 2320 case '.':
2342 c = inchar (SCHEME_A); 2321 c = inchar (SCHEME_A);
2343 2322
2344 if (is_one_of (" \n\t", c)) 2323 if (is_one_of (WHITESPACE, c))
2345 return TOK_DOT; 2324 return TOK_DOT;
2346 else 2325 else
2347 { 2326 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2327 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2328 return TOK_DOTATOM;
2352 } 2329 }
2330
2331 case '|':
2332 return TOK_STRATOM;
2353 2333
2354 case '\'': 2334 case '\'':
2355 return TOK_QUOTE; 2335 return TOK_QUOTE;
2356 2336
2357 case ';': 2337 case ';':
… …
2489 } 2469 }
2490 2470
2491 putcharacter (SCHEME_A_ '"'); 2471 putcharacter (SCHEME_A_ '"');
2492} 2472}
2493 2473
2494
2495/* print atoms */ 2474/* print atoms */
2496static void 2475static void
2497printatom (SCHEME_P_ pointer l, int f) 2476printatom (SCHEME_P_ pointer l, int f)
2498{ 2477{
2499 char *p; 2478 char *p;
2500 int len; 2479 int len;
2501 2480
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2481 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2482 putchars (SCHEME_A_ p, len);
2504} 2483}
2505
2506 2484
2507/* Uses internal buffer unless string pointer is already available */ 2485/* Uses internal buffer unless string pointer is already available */
2508static void 2486static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2488{
… …
2524 { 2502 {
2525 p = SCHEME_V->strbuff; 2503 p = SCHEME_V->strbuff;
2526 2504
2527 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 */
2528 { 2506 {
2529 if (num_is_integer (l)) 2507 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2508 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2509#if USE_REAL
2532 else 2510 else
2533 { 2511 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2512 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2671#endif 2649#endif
2672 } 2650 }
2673 else if (is_continuation (l)) 2651 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2652 p = "#<CONTINUATION>";
2675 else 2653 else
2654 {
2655#if USE_PRINTF
2656 p = SCHEME_V->strbuff;
2657 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2658#else
2676 p = "#<ERROR>"; 2659 p = "#<ERROR>";
2660#endif
2661 }
2677 2662
2678 *pp = p; 2663 *pp = p;
2679 *plen = strlen (p); 2664 *plen = strlen (p);
2680} 2665}
2681 2666
… …
2789 return 0; 2774 return 0;
2790 } 2775 }
2791 else if (is_number (a)) 2776 else if (is_number (a))
2792 { 2777 {
2793 if (is_number (b)) 2778 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2779 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2780
2797 return 0; 2781 return 0;
2798 } 2782 }
2799 else if (is_character (a)) 2783 else if (is_character (a))
2800 { 2784 {
… …
2826/* () is #t in R5RS */ 2810/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2811#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2812#define is_false(p) ((p) == S_F)
2829 2813
2830/* ========== Environment implementation ========== */ 2814/* ========== Environment implementation ========== */
2831
2832#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2833
2834static int
2835hash_fn (const char *key, int table_size)
2836{
2837 const unsigned char *p = key;
2838 uint32_t hash = 2166136261;
2839
2840 while (*p)
2841 hash = (hash ^ *p++) * 16777619;
2842
2843 return hash % table_size;
2844}
2845#endif
2846 2815
2847#ifndef USE_ALIST_ENV 2816#ifndef USE_ALIST_ENV
2848 2817
2849/* 2818/*
2850 * In this implementation, each frame of the environment may be 2819 * In this implementation, each frame of the environment may be
… …
2867 2836
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2837 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2838 setenvironment (SCHEME_V->envir);
2870} 2839}
2871 2840
2872static 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
2873new_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)
2874{ 2858{
2875 pointer slot = immutable_cons (variable, value); 2859 pointer slot = immutable_cons (variable, value);
2876 2860
2877 if (is_vector (car (env))) 2861 if (is_vector (car (env)))
2878 { 2862 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2863 int location = sym_hash (variable, veclength (car (env)));
2880
2881 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)));
2882 } 2865 }
2883 else 2866 else
2884 set_car (env, immutable_cons (slot, car (env))); 2867 set_car (env, immutable_cons (slot, car (env)));
2885} 2868}
2886 2869
2887static pointer 2870static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2871find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2872{
2890 pointer x, y; 2873 pointer x, y;
2891 int location;
2892 2874
2893 for (x = env; x != NIL; x = cdr (x)) 2875 for (x = env; x != NIL; x = cdr (x))
2894 { 2876 {
2895 if (is_vector (car (x))) 2877 if (is_vector (car (x)))
2896 { 2878 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2879 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2880 y = vector_get (car (x), location);
2899 } 2881 }
2900 else 2882 else
2901 y = car (x); 2883 y = car (x);
2902 2884
2903 for (; y != NIL; y = cdr (y)) 2885 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2886 if (caar (y) == hdl)
2905 break; 2887 break;
2906 2888
2907 if (y != NIL) 2889 if (y != NIL)
2890 return car (y);
2891
2892 if (!all)
2908 break; 2893 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2894 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2895
2917 return NIL; 2896 return NIL;
2918} 2897}
2919 2898
2920#else /* USE_ALIST_ENV */ 2899#else /* USE_ALIST_ENV */
2921 2900
2922static INLINE void 2901ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2902new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2903{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2904 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2905 setenvironment (SCHEME_V->envir);
2927} 2906}
2928 2907
2929static INLINE void 2908ecb_inline void
2930new_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)
2931{ 2910{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2911 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2912}
2934 2913
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2921 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2922 if (caar (y) == hdl)
2944 break; 2923 break;
2945 2924
2946 if (y != NIL) 2925 if (y != NIL)
2926 return car (y);
2947 break; 2927 break;
2948 2928
2949 if (!all) 2929 if (!all)
2950 return NIL; 2930 break;
2951 } 2931 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2932
2956 return NIL; 2933 return NIL;
2957} 2934}
2958 2935
2959#endif /* USE_ALIST_ENV else */ 2936#endif /* USE_ALIST_ENV else */
2960 2937
2961static INLINE void 2938ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2939new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2940{
2941 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 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);
2965} 2943}
2966 2944
2967static INLINE void 2945ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2946set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2947{
2970 set_cdr (slot, value); 2948 set_cdr (slot, value);
2971} 2949}
2972 2950
2973static INLINE pointer 2951ecb_inline pointer
2974slot_value_in_env (pointer slot) 2952slot_value_in_env (pointer slot)
2975{ 2953{
2976 return cdr (slot); 2954 return cdr (slot);
2977} 2955}
2978 2956
2979/* ========== Evaluation Cycle ========== */ 2957/* ========== Evaluation Cycle ========== */
2980 2958
2981static pointer 2959static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2960xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2961{
2984#if USE_ERROR_HOOK 2962#if USE_ERROR_HOOK
2985 pointer x; 2963 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2964 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 2999 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 3000 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 3001 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 3002 SCHEME_V->op = OP_EVAL;
3025 3003
3026 return S_T; 3004 return 0;
3027 } 3005 }
3028#endif 3006#endif
3029 3007
3030 if (a) 3008 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3009 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3011 SCHEME_V->args = NIL;
3034 3012
3035 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);
3036 setimmutable (car (SCHEME_V->args)); 3014 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3015 SCHEME_V->op = OP_ERR0;
3016
3038 return S_T; 3017 return 0;
3039} 3018}
3040 3019
3041#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)
3042#define Error_0(s) Error_1 (s, 0) 3021#define Error_0(s) Error_1 (s, 0)
3043 3022
3044/* Too small to turn into function */ 3023/* Too small to turn into function */
3045#define BEGIN do { 3024#define BEGIN do {
3046#define END } while (0) 3025#define END } while (0)
3047#define s_goto(a) BEGIN \ 3026#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3027 SCHEME_V->op = a; \
3049 return S_T; END 3028 return 0; END
3050 3029
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3030#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3031
3053#ifndef USE_SCHEME_STACK 3032#ifndef USE_SCHEME_STACK
3054 3033
… …
3068{ 3047{
3069 int nframes = (uintptr_t)SCHEME_V->dump; 3048 int nframes = (uintptr_t)SCHEME_V->dump;
3070 struct dump_stack_frame *next_frame; 3049 struct dump_stack_frame *next_frame;
3071 3050
3072 /* enough room for the next frame? */ 3051 /* enough room for the next frame? */
3073 if (nframes >= SCHEME_V->dump_size) 3052 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3074 { 3053 {
3075 SCHEME_V->dump_size += STACK_GROWTH; 3054 SCHEME_V->dump_size += STACK_GROWTH;
3076 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);
3077 } 3056 }
3078 3057
3079 next_frame = SCHEME_V->dump_base + nframes; 3058 next_frame = SCHEME_V->dump_base + nframes;
3080 3059
3081 next_frame->op = op; 3060 next_frame->op = op;
3082 next_frame->args = args; 3061 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3062 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3063 next_frame->code = code;
3085 3064
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3065 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3066}
3088 3067
3089static pointer 3068static int
3090xs_return (SCHEME_P_ pointer a) 3069xs_return (SCHEME_P_ pointer a)
3091{ 3070{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3071 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3072 struct dump_stack_frame *frame;
3094 3073
3095 SCHEME_V->value = a; 3074 SCHEME_V->value = a;
3096 3075
3097 if (nframes <= 0) 3076 if (nframes <= 0)
3098 return NIL; 3077 return -1;
3099 3078
3100 frame = &SCHEME_V->dump_base[--nframes]; 3079 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3080 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3081 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3082 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3083 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3084 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3085
3107 return S_T; 3086 return 0;
3108} 3087}
3109 3088
3110static INLINE void 3089ecb_inline void
3111dump_stack_reset (SCHEME_P) 3090dump_stack_reset (SCHEME_P)
3112{ 3091{
3113 /* 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 */
3114 SCHEME_V->dump = (pointer)+0; 3093 SCHEME_V->dump = (pointer)+0;
3115} 3094}
3116 3095
3117static INLINE void 3096ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3097dump_stack_initialize (SCHEME_P)
3119{ 3098{
3120 SCHEME_V->dump_size = 0; 3099 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3100 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3101 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3154 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3155 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3156
3178 while (cont != NIL) 3157 while (cont != NIL)
3179 { 3158 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3159 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3160 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3161 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3162 frame->code = car (cont) ; cont = cdr (cont);
3184 3163
3185 ++frame; 3164 ++frame;
3186 ++i; 3165 ++i;
3187 } 3166 }
3188 3167
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3168 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3169}
3191 3170
3192#else 3171#else
3193 3172
3194static INLINE void 3173ecb_inline void
3195dump_stack_reset (SCHEME_P) 3174dump_stack_reset (SCHEME_P)
3196{ 3175{
3197 SCHEME_V->dump = NIL; 3176 SCHEME_V->dump = NIL;
3198} 3177}
3199 3178
3200static INLINE void 3179ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3180dump_stack_initialize (SCHEME_P)
3202{ 3181{
3203 dump_stack_reset (SCHEME_A); 3182 dump_stack_reset (SCHEME_A);
3204} 3183}
3205 3184
… …
3207dump_stack_free (SCHEME_P) 3186dump_stack_free (SCHEME_P)
3208{ 3187{
3209 SCHEME_V->dump = NIL; 3188 SCHEME_V->dump = NIL;
3210} 3189}
3211 3190
3212static pointer 3191static int
3213xs_return (SCHEME_P_ pointer a) 3192xs_return (SCHEME_P_ pointer a)
3214{ 3193{
3215 pointer dump = SCHEME_V->dump; 3194 pointer dump = SCHEME_V->dump;
3216 3195
3217 SCHEME_V->value = a; 3196 SCHEME_V->value = a;
3218 3197
3219 if (dump == NIL) 3198 if (dump == NIL)
3220 return NIL; 3199 return -1;
3221 3200
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3201 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3202 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3203 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3204 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3205
3227 SCHEME_V->dump = dump; 3206 SCHEME_V->dump = dump;
3228 3207
3229 return S_T; 3208 return 0;
3230} 3209}
3231 3210
3232static void 3211static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3212s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3213{
… …
3259 3238
3260#endif 3239#endif
3261 3240
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3241#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3242
3243#if EXPERIMENT
3264static 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
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3302opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3303{
3304 pointer args = SCHEME_V->args;
3267 pointer x, y; 3305 pointer x, y;
3268 3306
3269 switch (op) 3307 switch (op)
3270 { 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
3271 case OP_LOAD: /* load */ 3315 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3316 if (file_interactive (SCHEME_A))
3273 { 3317 {
3274 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");
3275 //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)));
3276 } 3320 }
3277 3321
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3322 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3323 Error_1 ("unable to open", car (args));
3280 else 3324 else
3281 { 3325 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3326 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3327 s_goto (OP_T0LVL);
3284 } 3328 }
3285 3329
3286 case OP_T0LVL: /* top level */ 3330 case OP_T0LVL: /* top level */
3287 3331
3288 /* If we reached the end of file, this loop is done. */ 3332 /* If we reached the end of file, this loop is done. */
3289 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3333 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3290 { 3334 {
3291 if (SCHEME_V->file_i == 0) 3335 if (SCHEME_V->file_i == 0)
3292 { 3336 {
3293 SCHEME_V->args = NIL; 3337 SCHEME_V->args = NIL;
3294 s_goto (OP_QUIT); 3338 s_goto (OP_QUIT);
… …
3358 case OP_EVAL: /* main part of evaluation */ 3402 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3403#if USE_TRACING
3360 if (SCHEME_V->tracing) 3404 if (SCHEME_V->tracing)
3361 { 3405 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3406 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 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);
3364 SCHEME_V->args = SCHEME_V->code; 3408 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3409 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3410 s_goto (OP_P0LIST);
3367 } 3411 }
3368 3412
… …
3372#endif 3416#endif
3373 if (is_symbol (SCHEME_V->code)) /* symbol */ 3417 if (is_symbol (SCHEME_V->code)) /* symbol */
3374 { 3418 {
3375 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);
3376 3420
3377 if (x != NIL) 3421 if (x == NIL)
3378 s_return (slot_value_in_env (x));
3379 else
3380 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));
3381 } 3425 }
3382 else if (is_pair (SCHEME_V->code)) 3426 else if (is_pair (SCHEME_V->code))
3383 { 3427 {
3384 x = car (SCHEME_V->code); 3428 x = car (SCHEME_V->code);
3385 3429
… …
3398 } 3442 }
3399 else 3443 else
3400 s_return (SCHEME_V->code); 3444 s_return (SCHEME_V->code);
3401 3445
3402 case OP_E0ARGS: /* eval arguments */ 3446 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3447 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3448 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3449 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3450 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3451 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3452 s_goto (OP_APPLY);
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3456 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3457 s_goto (OP_E1ARGS);
3414 } 3458 }
3415 3459
3416 case OP_E1ARGS: /* eval arguments */ 3460 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3461 args = cons (SCHEME_V->value, args);
3418 3462
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3463 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3464 {
3421 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));
3422 SCHEME_V->code = car (SCHEME_V->code); 3466 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3467 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3468 s_goto (OP_EVAL);
3425 } 3469 }
3426 else /* end */ 3470 else /* end */
3427 { 3471 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3472 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3473 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3474 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3475 s_goto (OP_APPLY);
3432 } 3476 }
3433 3477
3434#if USE_TRACING 3478#if USE_TRACING
3435 3479
3436 case OP_TRACING: 3480 case OP_TRACING:
3437 { 3481 {
3438 int tr = SCHEME_V->tracing; 3482 int tr = SCHEME_V->tracing;
3439 3483
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3484 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3485 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3486 }
3443 3487
3444#endif 3488#endif
3445 3489
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3490 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3491#if USE_TRACING
3448 if (SCHEME_V->tracing) 3492 if (SCHEME_V->tracing)
3449 { 3493 {
3450 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);
3451 SCHEME_V->print_flag = 1; 3495 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3496 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3497 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3498 s_goto (OP_P0LIST);
3455 } 3499 }
3456 3500
3457 /* fall through */ 3501 /* fall through */
3458 3502
3459 case OP_REAL_APPLY: 3503 case OP_REAL_APPLY:
3460#endif 3504#endif
3461 if (is_proc (SCHEME_V->code)) 3505 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3506 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3507 else if (is_foreign (SCHEME_V->code))
3466 { 3508 {
3467 /* Keep nested calls from GC'ing the arglist */ 3509 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3510 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3511 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3470 3512
3471 s_return (x); 3513 s_return (x);
3472 } 3514 }
3473 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 */
3474 { 3516 {
3475 /* Should not accept promise */ 3517 /* Should not accept promise */
3476 /* make environment */ 3518 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3519 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3520
3479 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))
3480 { 3522 {
3481 if (y == NIL) 3523 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3524 Error_0 ("not enough arguments");
3483 else 3525 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3526 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3544 s_goto (OP_BEGIN);
3503 } 3545 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3546 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3547 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3548 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3549 s_return (args != NIL ? car (args) : NIL);
3508 } 3550 }
3509 else 3551 else
3510 Error_0 ("illegal function"); 3552 Error_0 ("illegal function");
3511 3553
3512 case OP_DOMACRO: /* do macro */ 3554 case OP_DOMACRO: /* do macro */
3513 SCHEME_V->code = SCHEME_V->value; 3555 SCHEME_V->code = SCHEME_V->value;
3514 s_goto (OP_EVAL); 3556 s_goto (OP_EVAL);
3515
3516#if 1
3517 3557
3518 case OP_LAMBDA: /* lambda */ 3558 case OP_LAMBDA: /* lambda */
3519 /* 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
3520 set SCHEME_V->value fall thru */ 3560 set SCHEME_V->value fall thru */
3521 { 3561 {
3522 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);
3523 3563
3524 if (f != NIL) 3564 if (f != NIL)
3525 { 3565 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3566 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3567 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3568 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3569 s_goto (OP_APPLY);
3530 } 3570 }
3531 3571
3532 SCHEME_V->value = SCHEME_V->code; 3572 SCHEME_V->value = SCHEME_V->code;
3533 /* Fallthru */
3534 } 3573 }
3574 /* Fallthru */
3535 3575
3536 case OP_LAMBDA1: 3576 case OP_LAMBDA1:
3537 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));
3538 3578
3539#else
3540
3541 case OP_LAMBDA: /* lambda */
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543
3544#endif
3545
3546 case OP_MKCLOSURE: /* make-closure */ 3579 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3580 x = car (args);
3548 3581
3549 if (car (x) == SCHEME_V->LAMBDA) 3582 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3583 x = cdr (x);
3551 3584
3552 if (cdr (SCHEME_V->args) == NIL) 3585 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3586 y = SCHEME_V->envir;
3554 else 3587 else
3555 y = cadr (SCHEME_V->args); 3588 y = cadr (args);
3556 3589
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3590 s_return (mk_closure (SCHEME_A_ x, y));
3558 3591
3559 case OP_QUOTE: /* quote */ 3592 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3593 s_return (car (SCHEME_V->code));
… …
3592 3625
3593 3626
3594 case OP_DEFP: /* defined? */ 3627 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3628 x = SCHEME_V->envir;
3596 3629
3597 if (cdr (SCHEME_V->args) != NIL) 3630 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3631 x = cadr (args);
3599 3632
3600 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);
3601 3634
3602 case OP_SET0: /* set! */ 3635 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3636 if (is_immutable (car (SCHEME_V->code)))
3604 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));
3605 3638
… …
3636 3669
3637 case OP_IF1: /* if */ 3670 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3671 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3672 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3673 else
3641 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 */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3645 3676
3646 case OP_LET0: /* let */ 3677 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3678 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3679 SCHEME_V->value = SCHEME_V->code;
3649 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);
3650 s_goto (OP_LET1); 3681 s_goto (OP_LET1);
3651 3682
3652 case OP_LET1: /* let (calculate parameters) */ 3683 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3684 args = cons (SCHEME_V->value, args);
3654 3685
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3686 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3687 {
3657 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)))
3658 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));
3659 3690
3660 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));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3692 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3694 s_goto (OP_EVAL);
3664 } 3695 }
3665 else /* end */ 3696 else /* end */
3666 { 3697 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3698 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3699 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3700 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3701 s_goto (OP_LET2);
3671 } 3702 }
3672 3703
3673 case OP_LET2: /* let */ 3704 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3705 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3706
3676 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;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3708 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3709 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3710
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3711 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3712 {
3682 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))
3683 { 3714 {
3684 if (!is_pair (x)) 3715 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3716 Error_1 ("Bad syntax of binding in let :", x);
3686 3717
3687 if (!is_list (SCHEME_A_ car (x))) 3718 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3719 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3720
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3721 args = cons (caar (x), args);
3691 } 3722 }
3692 3723
3693 x =
3694 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)),
3695 SCHEME_V->envir); 3725 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3726 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3727 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3728 }
3700 else 3729 else
3701 { 3730 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3731 SCHEME_V->code = cdr (SCHEME_V->code);
3732 }
3733
3703 SCHEME_V->args = NIL; 3734 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3735 s_goto (OP_BEGIN);
3707 3736
3708 case OP_LET0AST: /* let* */ 3737 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3738 if (car (SCHEME_V->code) == NIL)
3710 { 3739 {
… …
3728 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);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3758 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3759
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3760 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3761 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3762 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3763 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3764 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3765 s_goto (OP_EVAL);
3737 } 3766 }
3738 else /* end */ 3767 else /* end */
3739 { 3768 {
3740 SCHEME_V->code = SCHEME_V->args; 3769 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3770 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3771 s_goto (OP_BEGIN);
3743 } 3772 }
3744 3773
3745 case OP_LET0REC: /* letrec */ 3774 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3777 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3778 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3779 s_goto (OP_LET1REC);
3751 3780
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3781 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3782 args = cons (SCHEME_V->value, args);
3754 3783
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3784 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3785 {
3757 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)))
3758 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));
3759 3788
3760 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));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3790 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3791 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3764 } 3793 }
3765 else /* end */ 3794 else /* end */
3766 { 3795 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3796 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3797 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3798 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3799 s_goto (OP_LET2REC);
3771 } 3800 }
3772 3801
3773 case OP_LET2REC: /* letrec */ 3802 case OP_LET2REC: /* letrec */
3774 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))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3804 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3805
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3806 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3807 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3808 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3895 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3896 s_goto (OP_EVAL);
3868 3897
3869 case OP_C1STREAM: /* cons-stream */ 3898 case OP_C1STREAM: /* cons-stream */
3870 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 */
3871 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);
3872 set_typeflag (x, T_PROMISE); 3901 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3902 s_return (cons (args, x));
3874 3903
3875 case OP_MACRO0: /* macro */ 3904 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3905 if (is_pair (car (SCHEME_V->code)))
3877 { 3906 {
3878 x = caar (SCHEME_V->code); 3907 x = caar (SCHEME_V->code);
… …
3911 { 3940 {
3912 if (!is_pair (y = caar (x))) 3941 if (!is_pair (y = caar (x)))
3913 break; 3942 break;
3914 3943
3915 for (; y != NIL; y = cdr (y)) 3944 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3945 if (eqv (car (y), SCHEME_V->value))
3918 break; 3946 break;
3919 }
3920 3947
3921 if (y != NIL) 3948 if (y != NIL)
3922 break; 3949 break;
3923 } 3950 }
3924 3951
… …
3944 s_goto (OP_BEGIN); 3971 s_goto (OP_BEGIN);
3945 else 3972 else
3946 s_return (NIL); 3973 s_return (NIL);
3947 3974
3948 case OP_PAPPLY: /* apply */ 3975 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3976 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3977 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3978 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3979 s_goto (OP_APPLY);
3953 3980
3954 case OP_PEVAL: /* eval */ 3981 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3982 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3983 SCHEME_V->envir = cadr (args);
3957 3984
3958 SCHEME_V->code = car (SCHEME_V->args); 3985 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3986 s_goto (OP_EVAL);
3960 3987
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3988 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3989 SCHEME_V->code = car (args);
3963 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);
3964 s_goto (OP_APPLY); 3991 s_goto (OP_APPLY);
3965 } 3992 }
3966 3993
3967 return S_T; 3994 if (USE_ERROR_CHECKING) abort ();
3968} 3995}
3969 3996
3970static pointer 3997static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3998opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3999{
3973 pointer x; 4000 pointer args = SCHEME_V->args;
4001 pointer x = car (args);
3974 num v; 4002 num v;
3975 4003
4004 switch (op)
4005 {
3976#if USE_MATH 4006#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4007 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args);
3986
3987 if (num_is_integer (x)) 4008 if (!is_integer (x))
3988 s_return (x); 4009 {
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4010 RVALUE r = rvalue_unchecked (x);
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4011
4012 if (r == (RVALUE)(IVALUE)r)
4013 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3991 else 4014 else
3992 Error_1 ("inexact->exact: not integral:", x); 4015 Error_1 ("inexact->exact: not integral:", x);
4016 }
3993 4017
3994 case OP_EXP: 4018 s_return (x);
3995 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))));
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4026 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4027 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4001 4028 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4029 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4030 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4031 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4032 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4033 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4034
4022 case OP_ATAN: 4035 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else
4028 {
4029 pointer y = cadr (SCHEME_V->args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 }
4033
4034 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 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)))));
4037 4040
4038 case OP_EXPT: 4041 case OP_EXPT:
4039 { 4042 {
4040 RVALUE result; 4043 RVALUE result;
4041 int real_result = 1; 4044 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4045 pointer y = cadr (args);
4043 4046
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4047 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4048 real_result = 0;
4048 4049
4049 /* This 'if' is an R5RS compatibility fix. */ 4050 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4051 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4052 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4053 result = 0;
4053 else 4054 else
4054 result = pow (rvalue (x), rvalue (y)); 4055 result = pow (rvalue (x), rvalue (y));
4055 4056
4056 /* Before returning integer result make sure we can. */ 4057 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4058 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4059 if (!real_result)
4059 { 4060 {
4060 long result_as_long = (long) result; 4061 long result_as_long = result;
4061 4062
4062 if (result != (RVALUE) result_as_long) 4063 if (result != result_as_long)
4063 real_result = 1; 4064 real_result = 1;
4064 } 4065 }
4065 4066
4066 if (real_result) 4067 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4068 s_return (mk_real (SCHEME_A_ result));
4068 else 4069 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4070 s_return (mk_integer (SCHEME_A_ result));
4070 } 4071 }
4071
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079
4080 case OP_TRUNCATE:
4081 {
4082 RVALUE rvalue_of_x;
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 }
4092
4093 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x))
4097 s_return (x);
4098
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4072#endif
4101 4073
4102 case OP_ADD: /* + */ 4074 case OP_ADD: /* + */
4103 v = num_zero; 4075 v = num_zero;
4104 4076
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4077 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4078 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4079
4108 s_return (mk_number (SCHEME_A_ v)); 4080 s_return (mk_number (SCHEME_A_ v));
4109 4081
4110 case OP_MUL: /* * */ 4082 case OP_MUL: /* * */
4111 v = num_one; 4083 v = num_one;
4112 4084
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4085 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4086 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4087
4116 s_return (mk_number (SCHEME_A_ v)); 4088 s_return (mk_number (SCHEME_A_ v));
4117 4089
4118 case OP_SUB: /* - */ 4090 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4091 if (cdr (args) == NIL)
4120 { 4092 {
4121 x = SCHEME_V->args; 4093 x = args;
4122 v = num_zero; 4094 v = num_zero;
4123 } 4095 }
4124 else 4096 else
4125 { 4097 {
4126 x = cdr (SCHEME_V->args); 4098 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4099 v = nvalue (car (args));
4128 } 4100 }
4129 4101
4130 for (; x != NIL; x = cdr (x)) 4102 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4103 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4104
4133 s_return (mk_number (SCHEME_A_ v)); 4105 s_return (mk_number (SCHEME_A_ v));
4134 4106
4135 case OP_DIV: /* / */ 4107 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4108 if (cdr (args) == NIL)
4137 { 4109 {
4138 x = SCHEME_V->args; 4110 x = args;
4139 v = num_one; 4111 v = num_one;
4140 } 4112 }
4141 else 4113 else
4142 { 4114 {
4143 x = cdr (SCHEME_V->args); 4115 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4116 v = nvalue (car (args));
4145 } 4117 }
4146 4118
4147 for (; x != NIL; x = cdr (x)) 4119 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4120 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4121 v = num_div (v, nvalue (car (x)));
4151 else 4122 else
4152 Error_0 ("/: division by zero"); 4123 Error_0 ("/: division by zero");
4153 }
4154 4124
4155 s_return (mk_number (SCHEME_A_ v)); 4125 s_return (mk_number (SCHEME_A_ v));
4156 4126
4157 case OP_INTDIV: /* quotient */ 4127 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4128 if (cdr (args) == NIL)
4159 { 4129 {
4160 x = SCHEME_V->args; 4130 x = args;
4161 v = num_one; 4131 v = num_one;
4162 } 4132 }
4163 else 4133 else
4164 { 4134 {
4165 x = cdr (SCHEME_V->args); 4135 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4136 v = nvalue (car (args));
4167 } 4137 }
4168 4138
4169 for (; x != NIL; x = cdr (x)) 4139 for (; x != NIL; x = cdr (x))
4170 { 4140 {
4171 if (ivalue (car (x)) != 0) 4141 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4142 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4143 else
4174 Error_0 ("quotient: division by zero"); 4144 Error_0 ("quotient: division by zero");
4175 } 4145 }
4176 4146
4177 s_return (mk_number (SCHEME_A_ v)); 4147 s_return (mk_number (SCHEME_A_ v));
4178 4148
4179 case OP_REM: /* remainder */ 4149 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4150 v = nvalue (x);
4181 4151
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4152 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4153 v = num_rem (v, nvalue (cadr (args)));
4184 else 4154 else
4185 Error_0 ("remainder: division by zero"); 4155 Error_0 ("remainder: division by zero");
4186 4156
4187 s_return (mk_number (SCHEME_A_ v)); 4157 s_return (mk_number (SCHEME_A_ v));
4188 4158
4189 case OP_MOD: /* modulo */ 4159 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4160 v = nvalue (x);
4191 4161
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4162 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4163 v = num_mod (v, nvalue (cadr (args)));
4194 else 4164 else
4195 Error_0 ("modulo: division by zero"); 4165 Error_0 ("modulo: division by zero");
4196 4166
4197 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4198 4168
4199 case OP_CAR: /* car */ 4169 /* the compiler will optimize this mess... */
4200 s_return (caar (SCHEME_V->args)); 4170 case OP_CAR: op_car: s_return (car (x));
4201 4171 case OP_CDR: op_cdr: s_return (cdr (x));
4202 case OP_CDR: /* cdr */ 4172 case OP_CAAR: op_caar: x = car (x); goto op_car;
4203 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;
4204 4200
4205 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4203 s_return (args);
4208 4204
4209 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4211 { 4207 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4214 } 4210 }
4215 else 4211 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4217 4213
4218 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4220 { 4216 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4223 } 4219 }
4224 else 4220 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4222
4227 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4225
4230 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4228
4233 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4234 { 4230 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4231 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4232 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4238 } 4234 }
4239 4235
4240 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4241 { 4237 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4239 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4245 } 4241 }
4246 4242
4247 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4245
4250 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4251 { 4247 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4253 long pf = 0; 4249 long pf = 0;
4254 4250
4255 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4256 { 4252 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4260 4256
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4258 {
4263 /* base is OK */ 4259 /* base is OK */
4264 } 4260 }
4265 else 4261 else
4266 pf = -1; 4262 pf = -1;
4267 } 4263 }
4268 4264
4269 if (pf < 0) 4265 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4269 else
4274 { 4270 {
4275 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
… …
4286 } 4282 }
4287 } 4283 }
4288 } 4284 }
4289 4285
4290 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4288 setimmutable (x);
4293 s_return (x); 4289 s_return (x);
4294 4290
4295 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4296 { 4292 {
4297 long pf = 0; 4293 long pf = 0;
4298 4294
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4302 { 4296 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4306 4300
4307 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))
4308 { 4302 {
4309 /* base is OK */ 4303 /* base is OK */
4310 } 4304 }
4311 else 4305 else
4312 pf = -1; 4306 pf = -1;
4313 } 4307 }
4314 4308
4315 if (pf < 0) 4309 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4317 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))
4318 { 4312 {
4319 char *p; 4313 char *p;
4320 int len; 4314 int len;
4321 4315
… …
4326 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4327 } 4321 }
4328 4322
4329 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4330 { 4324 {
4331 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4326 int len = ivalue_unchecked (x);
4333 4327
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4329 }
4341 4330
4342 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4333
4345 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4346 { 4335 {
4347 char *str; 4336 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4353 4338
4354 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4341
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4343 }
4359 4344
4360 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4361 { 4346 {
4362 char *str; 4347 char *str = strvalue (x);
4363 int index; 4348 int index = ivalue_unchecked (cadr (args));
4364 int c; 4349 int c;
4365 4350
4366 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4353
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4356
4376 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4377 4358
4378 str[index] = (char) c; 4359 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4380 } 4361 }
4381 4362
4382 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4383 { 4364 {
4384 /* 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 */
4385 int len = 0; 4366 int len = 0;
4386 pointer newstr; 4367 pointer newstr;
4387 char *pos; 4368 char *pos;
4388 4369
4389 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4372 len += strlength (car (x));
4392 4373
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4375
4395 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4396 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))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4379
4399 s_return (newstr); 4380 s_return (newstr);
4400 } 4381 }
4401 4382
4402 case OP_SUBSTR: /* substring */ 4383 case OP_STRING_COPY: /* substring/string-copy */
4403 { 4384 {
4404 char *str; 4385 char *str = strvalue (x);
4405 int index0; 4386 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4406 int index1; 4387 int index1;
4407 int len; 4388 int len;
4408 4389
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4391 Error_1 ("string->copy: start out of bounds:", cadr (args));
4415 4392
4416 if (cddr (SCHEME_V->args) != NIL) 4393 if (cddr (args) != NIL)
4417 { 4394 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4419 4396
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("string->copy: end out of bounds:", caddr (args));
4422 } 4399 }
4423 else 4400 else
4424 index1 = strlength (car (SCHEME_V->args)); 4401 index1 = strlength (x);
4425 4402
4426 len = index1 - index0; 4403 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_counted_string (SCHEME_A_ str + index0, len);
4428 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0;
4430 4405
4431 s_return (x); 4406 s_return (x);
4432 } 4407 }
4433 4408
4434 case OP_VECTOR: /* vector */ 4409 case OP_VECTOR: /* vector */
4435 { 4410 {
4436 int i; 4411 int i;
4437 pointer vec; 4412 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4413 int len = list_length (SCHEME_A_ args);
4439 4414
4440 if (len < 0) 4415 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4416 Error_1 ("vector: not a proper list:", args);
4442 4417
4443 vec = mk_vector (SCHEME_A_ len); 4418 vec = mk_vector (SCHEME_A_ len);
4444 4419
4445#if USE_ERROR_CHECKING 4420#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4421 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4422 s_return (S_SINK);
4448#endif 4423#endif
4449 4424
4450 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++)
4451 set_vector_elem (vec, i, car (x)); 4426 vector_set (vec, i, car (x));
4452 4427
4453 s_return (vec); 4428 s_return (vec);
4454 } 4429 }
4455 4430
4456 case OP_MKVECTOR: /* make-vector */ 4431 case OP_MKVECTOR: /* make-vector */
4457 { 4432 {
4458 pointer fill = NIL; 4433 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4434 pointer vec;
4435 int len = ivalue_unchecked (x);
4461 4436
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4437 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4438 fill = cadr (args);
4466 4439
4467 vec = mk_vector (SCHEME_A_ len); 4440 vec = mk_vector (SCHEME_A_ len);
4468 4441
4469#if USE_ERROR_CHECKING 4442#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4443 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4444 s_return (S_SINK);
4472#endif 4445#endif
4473 4446
4474 if (fill != NIL) 4447 if (fill != NIL)
4475 fill_vector (vec, fill); 4448 fill_vector (vec, 0, fill);
4476 4449
4477 s_return (vec); 4450 s_return (vec);
4478 } 4451 }
4479 4452
4480 case OP_VECLEN: /* vector-length */ 4453 case OP_VECLEN: /* vector-length */
4481 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);
4482 4459
4483 case OP_VECREF: /* vector-ref */ 4460 case OP_VECREF: /* vector-ref */
4484 { 4461 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4462 int index = ivalue_unchecked (cadr (args));
4488 4463
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4464 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4465 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4466
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4467 s_return (vector_get (x, index));
4493 } 4468 }
4494 4469
4495 case OP_VECSET: /* vector-set! */ 4470 case OP_VECSET: /* vector-set! */
4496 { 4471 {
4497 int index; 4472 int index = ivalue_unchecked (cadr (args));
4498 4473
4499 if (is_immutable (car (SCHEME_V->args))) 4474 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4475 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4476
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4477 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4478 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4479
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4480 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4481 s_return (x);
4509 } 4482 }
4510 } 4483 }
4511 4484
4512 return S_T; 4485 if (USE_ERROR_CHECKING) abort ();
4513} 4486}
4514 4487
4515INTERFACE int 4488static int
4516is_list (SCHEME_P_ pointer a) 4489opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4490{
4518 return list_length (SCHEME_A_ a) >= 0; 4491 pointer x = SCHEME_V->args;
4519}
4520 4492
4521/* Result is: 4493 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4494 {
4495 num v = nvalue (car (x));
4496 x = cdr (x);
4497
4537 if (fast == NIL) 4498 if (x == NIL)
4538 return i; 4499 break;
4539 4500
4540 if (!is_pair (fast)) 4501 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4502
4543 fast = cdr (fast); 4503 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4504 {
4561 /* the fast pointer has looped back around and caught up 4505 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4506 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4507 case OP_GRE: r = r > 0; break;
4564 return -1; 4508 case OP_LEQ: r = r <= 0; break;
4509 case OP_GEQ: r = r >= 0; break;
4565 } 4510 }
4566 }
4567}
4568 4511
4512 if (!r)
4513 s_return (S_F);
4514 }
4515
4516 s_return (S_T);
4517}
4518
4569static pointer 4519static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4520opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4521{
4572 pointer x; 4522 pointer args = SCHEME_V->args;
4573 num v; 4523 pointer a = car (args);
4574 int (*comp_func) (num, num); 4524 pointer d = cdr (args);
4525 int r;
4575 4526
4576 switch (op) 4527 switch (op)
4577 { 4528 {
4578 case OP_NOT: /* not */ 4529 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 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;
4580 4540
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4541#if USE_CHAR_CLASSIFIERS
4650 4542 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4543 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4544 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4545 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4546 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4547#endif
4548
4666#if USE_PORTS 4549#if USE_PORTS
4667 4550 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4551 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4552 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4553#endif
4677 4554
4678 case OP_PROCP: /* procedure? */ 4555 case OP_PROCP: /* procedure? */
4679 4556
4680 /*-- 4557 /*--
4681 * continuation should be procedure by the example 4558 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4559 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4560 * in R^3 report sec. 6.9
4684 */ 4561 */
4685 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);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4563 break;
4687 4564
4688 case OP_PAIRP: /* pair? */ 4565 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4566 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4567 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4568 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4569 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4570 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4571 }
4706 4572
4707 return S_T; 4573 s_retbool (r);
4708} 4574}
4709 4575
4710static pointer 4576static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4577opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4578{
4579 pointer args = SCHEME_V->args;
4580 pointer a = car (args);
4713 pointer x, y; 4581 pointer x, y;
4714 4582
4715 switch (op) 4583 switch (op)
4716 { 4584 {
4717 case OP_FORCE: /* force */ 4585 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4586 SCHEME_V->code = a;
4719 4587
4720 if (is_promise (SCHEME_V->code)) 4588 if (is_promise (SCHEME_V->code))
4721 { 4589 {
4722 /* Should change type to closure here */ 4590 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4591 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4726 } 4594 }
4727 else 4595 else
4728 s_return (SCHEME_V->code); 4596 s_return (SCHEME_V->code);
4729 4597
4730 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4598 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4731 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4599 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4732 s_return (SCHEME_V->value); 4600 s_return (SCHEME_V->value);
4733 4601
4734#if USE_PORTS 4602#if USE_PORTS
4735 4603
4736 case OP_WRITE: /* write */ 4604 case OP_WRITE: /* write */
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4612 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4613 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4614 }
4747 } 4615 }
4748 4616
4749 SCHEME_V->args = car (SCHEME_V->args); 4617 SCHEME_V->args = a;
4750 4618
4751 if (op == OP_WRITE) 4619 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4620 SCHEME_V->print_flag = 1;
4753 else 4621 else
4754 SCHEME_V->print_flag = 0; 4622 SCHEME_V->print_flag = 0;
4755 4623
4756 s_goto (OP_P0LIST); 4624 s_goto (OP_P0LIST);
4757 4625
4758 case OP_NEWLINE: /* newline */ 4626 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4627 if (is_pair (args))
4760 { 4628 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4629 if (a != SCHEME_V->outport)
4762 { 4630 {
4763 x = cons (SCHEME_V->outport, NIL); 4631 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4632 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4633 SCHEME_V->outport = a;
4766 } 4634 }
4767 } 4635 }
4768 4636
4769 putstr (SCHEME_A_ "\n"); 4637 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4638 s_return (S_T);
4771#endif 4639#endif
4772 4640
4773 case OP_ERR0: /* error */ 4641 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4642 SCHEME_V->retcode = -1;
4775 4643
4776 if (!is_string (car (SCHEME_V->args))) 4644 if (!is_string (a))
4777 { 4645 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4646 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4647 setimmutable (car (args));
4780 } 4648 }
4781 4649
4782 putstr (SCHEME_A_ "Error: "); 4650 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4651 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4652 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4653 s_goto (OP_ERR1);
4786 4654
4787 case OP_ERR1: /* error */ 4655 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4656 putstr (SCHEME_A_ " ");
4789 4657
4790 if (SCHEME_V->args != NIL) 4658 if (args != NIL)
4791 { 4659 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4660 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4661 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4662 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4663 s_goto (OP_P0LIST);
4796 } 4664 }
4797 else 4665 else
4798 { 4666 {
4799 putstr (SCHEME_A_ "\n"); 4667 putstr (SCHEME_A_ "\n");
4800 4668
4801 if (SCHEME_V->interactive_repl) 4669 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4670 s_goto (OP_T0LVL);
4803 else 4671 else
4804 return NIL; 4672 return -1;
4805 } 4673 }
4806 4674
4807 case OP_REVERSE: /* reverse */ 4675 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4676 s_return (reverse (SCHEME_A_ a));
4809 4677
4810 case OP_LIST_STAR: /* list* */ 4678 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4679 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4680
4813 case OP_APPEND: /* append */ 4681 case OP_APPEND: /* append */
4814 x = NIL; 4682 x = NIL;
4815 y = SCHEME_V->args; 4683 y = args;
4816 4684
4817 if (y == x) 4685 if (y == x)
4818 s_return (x); 4686 s_return (x);
4819 4687
4820 /* cdr() in the while condition is not a typo. If car() */ 4688 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4699 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4700
4833#if USE_PLIST 4701#if USE_PLIST
4834 4702
4835 case OP_PUT: /* put */ 4703 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4704 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4705 Error_0 ("illegal use of put");
4838 4706
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4707 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4708 {
4841 if (caar (x) == y) 4709 if (caar (x) == y)
4842 break; 4710 break;
4843 } 4711 }
4844 4712
4845 if (x != NIL) 4713 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4714 cdar (x) = caddr (args);
4847 else 4715 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4716 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4717
4850 s_return (S_T); 4718 s_return (S_T);
4851 4719
4852 case OP_GET: /* get */ 4720 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4721 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4722 Error_0 ("illegal use of get");
4855 4723
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4724 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4725 if (caar (x) == y)
4858 break; 4726 break;
4859 4727
4860 if (x != NIL) 4728 if (x != NIL)
4861 s_return (cdar (x)); 4729 s_return (cdar (x));
… …
4863 s_return (NIL); 4731 s_return (NIL);
4864 4732
4865#endif /* USE_PLIST */ 4733#endif /* USE_PLIST */
4866 4734
4867 case OP_QUIT: /* quit */ 4735 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4736 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4737 SCHEME_V->retcode = ivalue (a);
4870 4738
4871 return NIL; 4739 return -1;
4872 4740
4873 case OP_GC: /* gc */ 4741 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4742 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4743 s_return (S_T);
4876 4744
4877 case OP_GCVERB: /* gc-verbose */ 4745 case OP_GCVERB: /* gc-verbose */
4878 { 4746 {
4879 int was = SCHEME_V->gc_verbose; 4747 int was = SCHEME_V->gc_verbose;
4880 4748
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4749 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4750 s_retbool (was);
4883 } 4751 }
4884 4752
4885 case OP_NEWSEGMENT: /* new-segment */ 4753 case OP_NEWSEGMENT: /* new-segment */
4754#if 0
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4755 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
4888 4757#endif
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4758 s_retbool (alloc_cellseg (SCHEME_A));
4890
4891 s_return (S_T);
4892 4759
4893 case OP_OBLIST: /* oblist */ 4760 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4761 s_return (oblist_all_symbols (SCHEME_A));
4895 4762
4896#if USE_PORTS 4763#if USE_PORTS
… …
4921 case OP_OPEN_INOUTFILE: 4788 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4789 prop = port_input | port_output;
4923 break; 4790 break;
4924 } 4791 }
4925 4792
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4793 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4794
4928 if (p == NIL) 4795 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4796 }
4933 4797
4934# if USE_STRING_PORTS 4798# if USE_STRING_PORTS
4935 4799
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4800 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4812 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4813 prop = port_input | port_output;
4950 break; 4814 break;
4951 } 4815 }
4952 4816
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4817 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4818 strvalue (a) + strlength (a), prop);
4955 4819
4956 if (p == NIL) 4820 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4821 }
4961 4822
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4823 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4824 {
4964 pointer p; 4825 pointer p;
4965 4826
4966 if (car (SCHEME_V->args) == NIL) 4827 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4828 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4829 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4830 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4831 strvalue (a) + strlength (a), port_output);
4977 4832
4978 if (p == NIL) 4833 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4834 }
4984 4835
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4836 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4837 {
4987 port *p; 4838 port *p = port (a);
4988 4839
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4840 if (p->kind & port_string)
4990 { 4841 {
4991 off_t size; 4842 off_t size;
4992 char *str; 4843 char *str;
4993 4844
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4845 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4861 }
5011 4862
5012# endif 4863# endif
5013 4864
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4865 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4866 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4867 s_return (S_T);
5017 4868
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4869 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4870 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4871 s_return (S_T);
5021#endif 4872#endif
5022 4873
5023 case OP_INT_ENV: /* interaction-environment */ 4874 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4875 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4877 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4878 s_return (SCHEME_V->envir);
5028 4879
5029 } 4880 }
5030 4881
5031 return S_T; 4882 if (USE_ERROR_CHECKING) abort ();
5032} 4883}
5033 4884
5034static pointer 4885static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4886opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4887{
4888 pointer args = SCHEME_V->args;
5037 pointer x; 4889 pointer x;
5038 4890
5039 if (SCHEME_V->nesting != 0) 4891 if (SCHEME_V->nesting != 0)
5040 { 4892 {
5041 int n = SCHEME_V->nesting; 4893 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4900 switch (op)
5049 { 4901 {
5050 /* ========== reading part ========== */ 4902 /* ========== reading part ========== */
5051#if USE_PORTS 4903#if USE_PORTS
5052 case OP_READ: 4904 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4905 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4906 s_goto (OP_READ_INTERNAL);
5055 4907
5056 if (!is_inport (car (SCHEME_V->args))) 4908 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4909 Error_1 ("read: not an input port:", car (args));
5058 4910
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4911 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4912 s_goto (OP_READ_INTERNAL);
5061 4913
5062 x = SCHEME_V->inport; 4914 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4915 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4916 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4917 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4918 s_goto (OP_READ_INTERNAL);
5067 4919
5068 case OP_READ_CHAR: /* read-char */ 4920 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4921 case OP_PEEK_CHAR: /* peek-char */
5070 { 4922 {
5071 int c; 4923 int c;
5072 4924
5073 if (is_pair (SCHEME_V->args)) 4925 if (is_pair (args))
5074 { 4926 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4927 if (car (args) != SCHEME_V->inport)
5076 { 4928 {
5077 x = SCHEME_V->inport; 4929 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4930 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4931 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4932 SCHEME_V->inport = car (args);
5081 } 4933 }
5082 } 4934 }
5083 4935
5084 c = inchar (SCHEME_A); 4936 c = inchar (SCHEME_A);
5085 4937
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4947 case OP_CHAR_READY: /* char-ready? */
5096 { 4948 {
5097 pointer p = SCHEME_V->inport; 4949 pointer p = SCHEME_V->inport;
5098 int res; 4950 int res;
5099 4951
5100 if (is_pair (SCHEME_V->args)) 4952 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4953 p = car (args);
5102 4954
5103 res = p->object.port->kind & port_string; 4955 res = port (p)->kind & port_string;
5104 4956
5105 s_retbool (res); 4957 s_retbool (res);
5106 } 4958 }
5107 4959
5108 case OP_SET_INPORT: /* set-input-port */ 4960 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4961 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4962 s_return (SCHEME_V->value);
5111 4963
5112 case OP_SET_OUTPORT: /* set-output-port */ 4964 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4965 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4966 s_return (SCHEME_V->value);
5115#endif 4967#endif
5116 4968
5117 case OP_RDSEXPR: 4969 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4970 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5019 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5020 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5021 s_goto (OP_RDSEXPR);
5170 5022
5171 case TOK_ATOM: 5023 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5024 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5025
5026 case TOK_DOTATOM:
5027 SCHEME_V->strbuff[0] = '.';
5028 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5029
5030 case TOK_STRATOM:
5031 x = readstrexp (SCHEME_A_ '|');
5032 //TODO: haven't checked whether the garbage collector could interfere
5033 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5034
5174 case TOK_DQUOTE: 5035 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5036 x = readstrexp (SCHEME_A_ '"');
5176 5037
5177 if (x == S_F) 5038 if (x == S_F)
5178 Error_0 ("Error reading string"); 5039 Error_0 ("Error reading string");
5179 5040
5180 setimmutable (x); 5041 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 5053 s_goto (OP_EVAL);
5193 } 5054 }
5194 } 5055 }
5195 5056
5196 case TOK_SHARP_CONST: 5057 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5058 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5059 Error_0 ("undefined sharp expression");
5199 else 5060 else
5200 s_return (x); 5061 s_return (x);
5201 5062
5202 default: 5063 default:
… …
5204 } 5065 }
5205 5066
5206 break; 5067 break;
5207 5068
5208 case OP_RDLIST: 5069 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5070 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5071 SCHEME_V->tok = token (SCHEME_A);
5211 5072
5212 switch (SCHEME_V->tok) 5073 switch (SCHEME_V->tok)
5213 { 5074 {
5214 case TOK_EOF: 5075 case TOK_EOF:
… …
5242 case OP_RDDOT: 5103 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5104 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5105 Error_0 ("syntax error: illegal dot expression");
5245 5106
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5107 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5108 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5109
5249 case OP_RDQUOTE: 5110 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5111 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5112
5252 case OP_RDQQUOTE: 5113 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5135 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5136 s_goto (OP_VECTOR);
5276 5137
5277 /* ========== printing part ========== */ 5138 /* ========== printing part ========== */
5278 case OP_P0LIST: 5139 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5140 if (is_vector (args))
5280 { 5141 {
5281 putstr (SCHEME_A_ "#("); 5142 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5143 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5144 s_goto (OP_PVECFROM);
5284 } 5145 }
5285 else if (is_environment (SCHEME_V->args)) 5146 else if (is_environment (args))
5286 { 5147 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5148 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5149 s_return (S_T);
5289 } 5150 }
5290 else if (!is_pair (SCHEME_V->args)) 5151 else if (!is_pair (args))
5291 { 5152 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5153 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5154 s_return (S_T);
5294 } 5155 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5156 else
5296 { 5157 {
5158 pointer a = car (args);
5159 pointer b = cdr (args);
5160 int ok_abbr = ok_abbrev (b);
5161 SCHEME_V->args = car (b);
5162
5163 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5164 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5165 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5166 putstr (SCHEME_A_ "`");
5167 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ ",");
5169 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5170 putstr (SCHEME_A_ ",@");
5171 else
5172 {
5173 putstr (SCHEME_A_ "(");
5174 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5175 SCHEME_V->args = a;
5176 }
5177
5299 s_goto (OP_P0LIST); 5178 s_goto (OP_P0LIST);
5300 } 5179 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5180
5181 case OP_P1LIST:
5182 if (is_pair (args))
5302 { 5183 {
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5185 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5186 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5187 s_goto (OP_P0LIST);
5306 } 5188 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5189 else if (is_vector (args))
5336 { 5190 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5191 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5192 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5193 s_goto (OP_P0LIST);
5340 } 5194 }
5341 else 5195 else
5342 { 5196 {
5343 if (SCHEME_V->args != NIL) 5197 if (args != NIL)
5344 { 5198 {
5345 putstr (SCHEME_A_ " . "); 5199 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5200 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5201 }
5348 5202
5349 putstr (SCHEME_A_ ")"); 5203 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5204 s_return (S_T);
5351 } 5205 }
5352 5206
5353 case OP_PVECFROM: 5207 case OP_PVECFROM:
5354 { 5208 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5209 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5210 pointer vec = car (args);
5357 int len = veclength (vec); 5211 int len = veclength (vec);
5358 5212
5359 if (i == len) 5213 if (i == len)
5360 { 5214 {
5361 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5216 s_return (S_T);
5363 } 5217 }
5364 else 5218 else
5365 { 5219 {
5366 pointer elem = vector_elem (vec, i); 5220 pointer elem = vector_get (vec, i);
5367 5221
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5222 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5224 SCHEME_V->args = elem;
5371 5225
5372 if (i > 0) 5226 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5227 putstr (SCHEME_A_ " ");
5374 5228
5375 s_goto (OP_P0LIST); 5229 s_goto (OP_P0LIST);
5376 } 5230 }
5377 } 5231 }
5378 } 5232 }
5379 5233
5380 return S_T; 5234 if (USE_ERROR_CHECKING) abort ();
5381} 5235}
5382 5236
5383static pointer 5237static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5238opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5239{
5240 pointer args = SCHEME_V->args;
5241 pointer a = car (args);
5386 pointer x, y; 5242 pointer x, y;
5387 5243
5388 switch (op) 5244 switch (op)
5389 { 5245 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5246 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5247 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5248 long v = list_length (SCHEME_A_ a);
5393 5249
5394 if (v < 0) 5250 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5251 Error_1 ("length: not a list:", a);
5396 5252
5397 s_return (mk_integer (SCHEME_A_ v)); 5253 s_return (mk_integer (SCHEME_A_ v));
5398 } 5254 }
5399 5255
5400 case OP_ASSQ: /* assq *//* a.k */ 5256 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5257 x = a;
5402 5258
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5259 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5260 {
5405 if (!is_pair (car (y))) 5261 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5262 Error_0 ("unable to handle non pair element");
5407 5263
5408 if (x == caar (y)) 5264 if (x == caar (y))
… …
5414 else 5270 else
5415 s_return (S_F); 5271 s_return (S_F);
5416 5272
5417 5273
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5274 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5275 SCHEME_V->args = a;
5420 5276
5421 if (SCHEME_V->args == NIL) 5277 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5278 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5279 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5280 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5429 5285
5430 case OP_CLOSUREP: /* closure? */ 5286 case OP_CLOSUREP: /* closure? */
5431 /* 5287 /*
5432 * Note, macro object is also a closure. 5288 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5289 * Therefore, (closure? <#MACRO>) ==> #t
5290 * (schmorp) well, obviously not, fix? TODO
5434 */ 5291 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5292 s_retbool (is_closure (a));
5436 5293
5437 case OP_MACROP: /* macro? */ 5294 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5295 s_retbool (is_macro (a));
5439 } 5296 }
5440 5297
5441 return S_T; /* NOTREACHED */ 5298 if (USE_ERROR_CHECKING) abort ();
5442} 5299}
5443 5300
5301/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5302typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5303
5446typedef int (*test_predicate) (pointer); 5304typedef int (*test_predicate)(pointer);
5447static int 5305static int
5448is_any (pointer p) 5306tst_any (pointer p)
5449{ 5307{
5450 return 1; 5308 return 1;
5451} 5309}
5452 5310
5453static int 5311static int
5454is_nonneg (pointer p) 5312tst_inonneg (pointer p)
5455{ 5313{
5456 return ivalue (p) >= 0 && is_integer (p); 5314 return is_integer (p) && ivalue_unchecked (p) >= 0;
5315}
5316
5317static int
5318tst_is_list (SCHEME_P_ pointer p)
5319{
5320 return p == NIL || is_pair (p);
5457} 5321}
5458 5322
5459/* Correspond carefully with following defines! */ 5323/* Correspond carefully with following defines! */
5460static struct 5324static struct
5461{ 5325{
5462 test_predicate fct; 5326 test_predicate fct;
5463 const char *kind; 5327 const char *kind;
5464} tests[] = 5328} tests[] = {
5465{ 5329 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5330 { is_string , "string" },
5467 { is_any, 0}, 5331 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5332 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5333 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5334 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5335 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5336 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5337 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5338 { is_character , "character" },
5477 { is_vector, "vector" }, 5339 { is_vector , "vector" },
5478 { is_number, "number" }, 5340 { is_number , "number" },
5479 { is_integer, "integer" }, 5341 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5342 { tst_inonneg , "non-negative integer" }
5481}; 5343};
5482 5344
5483#define TST_NONE 0 5345#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5346#define TST_ANY "\001"
5485#define TST_STRING "\002" 5347#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5348#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5349#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5350#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5351#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5352#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5353#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5354#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5355#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5356#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5357#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5358#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5359#define TST_NATURAL "\016"
5360
5361#define INF_ARG 0xff
5362#define UNNAMED_OP ""
5363
5364static const char opnames[] =
5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5366#include "opdefines.h"
5367#undef OP_DEF
5368;
5369
5370static const char *
5371opname (int idx)
5372{
5373 const char *name = opnames;
5374
5375 /* should do this at compile time, but would require external program, right? */
5376 while (idx--)
5377 name += strlen (name) + 1;
5378
5379 return *name ? name : "ILLEGAL";
5380}
5381
5382static const char *
5383procname (pointer x)
5384{
5385 return opname (procnum (x));
5386}
5498 5387
5499typedef struct 5388typedef struct
5500{ 5389{
5501 dispatch_func func; 5390 uint8_t func;
5502 char *name; 5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5392 uint8_t builtin;
5393#if USE_ERROR_CHECKING
5503 int min_arity; 5394 uint8_t min_arity;
5504 int max_arity; 5395 uint8_t max_arity;
5505 char *arg_tests_encoding; 5396 char arg_tests_encoding[3];
5397#endif
5506} op_code_info; 5398} op_code_info;
5507 5399
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5400static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5401#if USE_ERROR_CHECKING
5402#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5403#else
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5405#endif
5512#include "opdefines.h" 5406#include "opdefines.h"
5407#undef OP_DEF
5513 {0} 5408 {0}
5514}; 5409};
5515 5410
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5411/* kernel of this interpreter */
5529static void 5412static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5413Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5414{
5532 SCHEME_V->op = op; 5415 SCHEME_V->op = op;
5533 5416
5534 for (;;) 5417 for (;;)
5535 { 5418 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5419 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5420
5538#if USE_ERROR_CHECKING 5421#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5422 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5423 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5424 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5425 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5426
5545 /* Check number of arguments */ 5427 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5428 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5429 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5430 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5431 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5432 xError_1 (SCHEME_A_ msg, 0);
5433 continue;
5551 } 5434 }
5552 5435 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5436 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5437 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5438 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5439 xError_1 (SCHEME_A_ msg, 0);
5440 continue;
5558 } 5441 }
5559 5442 else
5560 if (ok)
5561 { 5443 {
5562 if (pcd->arg_tests_encoding) 5444 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5445 {
5564 int i = 0; 5446 int i = 0;
5565 int j; 5447 int j;
5566 const char *t = pcd->arg_tests_encoding; 5448 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5449 pointer arglist = SCHEME_V->args;
5568 5450
5569 do 5451 do
5570 { 5452 {
5571 pointer arg = car (arglist); 5453 pointer arg = car (arglist);
5572 5454
5573 j = (int) t[0]; 5455 j = t[0];
5574 5456
5457 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5458 if (j == TST_LIST[0])
5576 { 5459 {
5577 if (arg != NIL && !is_pair (arg)) 5460 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5461 break;
5579 } 5462 }
5580 else 5463 else
5581 { 5464 {
5582 if (!tests[j].fct (arg)) 5465 if (!tests[j - 1].fct (arg))
5583 break; 5466 break;
5584 } 5467 }
5585 5468
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5469 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5470 t++;
5588 5471
5589 arglist = cdr (arglist); 5472 arglist = cdr (arglist);
5590 i++; 5473 i++;
5591 } 5474 }
5592 while (i < n); 5475 while (i < n);
5593 5476
5594 if (i < n) 5477 if (i < n)
5595 { 5478 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5479 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5480 xError_1 (SCHEME_A_ msg, 0);
5481 continue;
5598 } 5482 }
5599 } 5483 }
5600 } 5484 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5485 }
5610#endif 5486#endif
5611 5487
5612 ok_to_freely_gc (SCHEME_A); 5488 ok_to_freely_gc (SCHEME_A);
5613 5489
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5490 static const dispatch_func dispatch_funcs[] = {
5491 opexe_0,
5492 opexe_1,
5493 opexe_2,
5494 opexe_3,
5495 opexe_4,
5496 opexe_5,
5497 opexe_6,
5498 };
5499
5500 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5501 return;
5616 5502
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5503 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5504 {
5619 xwrstr ("No memory!\n"); 5505 putstr (SCHEME_A_ "No memory!\n");
5620 return; 5506 return;
5621 } 5507 }
5622 } 5508 }
5623} 5509}
5624 5510
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5529mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5530{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5531 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5532 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5533 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5534 return y;
5650} 5535}
5651 5536
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5537/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5538static int
5654syntaxnum (pointer p) 5539syntaxnum (pointer p)
5655{ 5540{
5656 const char *s = strvalue (car (p)); 5541 const char *s = strvalue (p);
5657 5542
5658 switch (strlength (car (p))) 5543 switch (strlength (p))
5659 { 5544 {
5660 case 2: 5545 case 2:
5661 if (s[0] == 'i') 5546 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5547 return OP_IF0; /* if */
5663 else 5548 else
… …
5677 5562
5678 case 'd': 5563 case 'd':
5679 return OP_COND0; /* cond */ 5564 return OP_COND0; /* cond */
5680 5565
5681 case '*': 5566 case '*':
5682 return OP_LET0AST; /* let* */ 5567 return OP_LET0AST;/* let* */
5683 5568
5684 default: 5569 default:
5685 return OP_SET0; /* set! */ 5570 return OP_SET0; /* set! */
5686 } 5571 }
5687 5572
… …
5709 5594
5710 case 'f': 5595 case 'f':
5711 return OP_DEF0; /* define */ 5596 return OP_DEF0; /* define */
5712 5597
5713 default: 5598 default:
5714 return OP_LET0REC; /* letrec */ 5599 return OP_LET0REC;/* letrec */
5715 } 5600 }
5716 5601
5717 default: 5602 default:
5718 return OP_C0STREAM; /* cons-stream */ 5603 return OP_C0STREAM; /* cons-stream */
5719 } 5604 }
5720} 5605}
5721 5606
5722#if USE_MULTIPLICITY 5607#if USE_MULTIPLICITY
5723scheme * 5608ecb_cold scheme *
5724scheme_init_new () 5609scheme_init_new ()
5725{ 5610{
5726 scheme *sc = malloc (sizeof (scheme)); 5611 scheme *sc = malloc (sizeof (scheme));
5727 5612
5728 if (!scheme_init (SCHEME_A)) 5613 if (!scheme_init (SCHEME_A))
… …
5733 else 5618 else
5734 return sc; 5619 return sc;
5735} 5620}
5736#endif 5621#endif
5737 5622
5738int 5623ecb_cold int
5739scheme_init (SCHEME_P) 5624scheme_init (SCHEME_P)
5740{ 5625{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5626 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5627 pointer x;
5628
5629 /* this memset is not strictly correct, as we assume (intcache)
5630 * that memset 0 will also set pointers to 0, but memset does
5631 * of course not guarantee that. screw such systems.
5632 */
5633 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5743 5634
5744 num_set_fixnum (num_zero, 1); 5635 num_set_fixnum (num_zero, 1);
5745 num_set_ivalue (num_zero, 0); 5636 num_set_ivalue (num_zero, 0);
5746 num_set_fixnum (num_one, 1); 5637 num_set_fixnum (num_one, 1);
5747 num_set_ivalue (num_one, 1); 5638 num_set_ivalue (num_one, 1);
… …
5759 SCHEME_V->save_inport = NIL; 5650 SCHEME_V->save_inport = NIL;
5760 SCHEME_V->loadport = NIL; 5651 SCHEME_V->loadport = NIL;
5761 SCHEME_V->nesting = 0; 5652 SCHEME_V->nesting = 0;
5762 SCHEME_V->interactive_repl = 0; 5653 SCHEME_V->interactive_repl = 0;
5763 5654
5764 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5655 if (!alloc_cellseg (SCHEME_A))
5765 { 5656 {
5766#if USE_ERROR_CHECKING 5657#if USE_ERROR_CHECKING
5767 SCHEME_V->no_memory = 1; 5658 SCHEME_V->no_memory = 1;
5768 return 0; 5659 return 0;
5769#endif 5660#endif
… …
5816 5707
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5708 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5709 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5710 }
5820 5711
5712 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5713 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5714 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5715 assign_proc (SCHEME_A_ i, opname (i));
5824 5716
5825 /* initialization of global pointers to special symbols */ 5717 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5718 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5719 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5720 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5759scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5760{
5869 SCHEME_V->ext_data = p; 5761 SCHEME_V->ext_data = p;
5870} 5762}
5871 5763
5872void 5764ecb_cold void
5873scheme_deinit (SCHEME_P) 5765scheme_deinit (SCHEME_P)
5874{ 5766{
5875 int i; 5767 int i;
5876 5768
5877#if SHOW_ERROR_LINE 5769#if SHOW_ERROR_LINE
… …
5969{ 5861{
5970 dump_stack_reset (SCHEME_A); 5862 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5863 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5864 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5865 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5866 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5867 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5868 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5869#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5870 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5871#endif
5980 SCHEME_V->retcode = 0; 5872 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5873 SCHEME_V->interactive_repl = 0;
… …
6098# endif 5990# endif
6099 int fin; 5991 int fin;
6100 char *file_name = InitFile; 5992 char *file_name = InitFile;
6101 int retcode; 5993 int retcode;
6102 int isfile = 1; 5994 int isfile = 1;
5995 system ("ps v $PPID");//D
6103 5996
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5997 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 5998 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 5999 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6000 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6108 xwrstr ("followed by\n"); 6001 putstr (SCHEME_A_ "followed by\n");
6109 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6002 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6110 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6003 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6111 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6004 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6112 xwrstr ("Use - as filename for stdin.\n"); 6005 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6113 return 1; 6006 return 1;
6114 } 6007 }
6115 6008
6116 if (!scheme_init (SCHEME_A)) 6009 if (!scheme_init (SCHEME_A))
6117 { 6010 {
6118 xwrstr ("Could not initialize!\n"); 6011 putstr (SCHEME_A_ "Could not initialize!\n");
6119 return 2; 6012 return 2;
6120 } 6013 }
6121 6014
6122# if USE_PORTS 6015# if USE_PORTS
6123 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6016 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6168 fin = open (file_name, O_RDONLY); 6061 fin = open (file_name, O_RDONLY);
6169#endif 6062#endif
6170 6063
6171 if (isfile && fin < 0) 6064 if (isfile && fin < 0)
6172 { 6065 {
6173 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6066 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6174 } 6067 }
6175 else 6068 else
6176 { 6069 {
6177 if (isfile) 6070 if (isfile)
6178 scheme_load_named_file (SCHEME_A_ fin, file_name); 6071 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6182#if USE_PORTS 6075#if USE_PORTS
6183 if (!isfile || fin != STDIN_FILENO) 6076 if (!isfile || fin != STDIN_FILENO)
6184 { 6077 {
6185 if (SCHEME_V->retcode != 0) 6078 if (SCHEME_V->retcode != 0)
6186 { 6079 {
6187 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6080 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6188 } 6081 }
6189 6082
6190 if (isfile) 6083 if (isfile)
6191 close (fin); 6084 close (fin);
6192 } 6085 }

Diff Legend

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