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.53 by root, Tue Dec 1 02:21: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 255#if USE_MATH
220static double round_per_R5RS (double x); 256static double round_per_R5RS (double x);
221#endif 257#endif
222static int is_zero_rvalue (RVALUE x); 258static int is_zero_rvalue (RVALUE x);
223 259
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229
230static num num_zero; 260static num num_zero;
231static num num_one; 261static num num_one;
232 262
263/* convert "pointer" to cell* / cell* to pointer */
264#define CELL(p) ((struct cell *)(p) + 0)
265#define POINTER(c) ((void *)((c) - 0))
266
233/* macros for cell operations */ 267/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 268#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 269#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 270#define type(p) (typeflag (p) & T_MASKTYPE)
237 271
238INTERFACE INLINE int 272INTERFACE int
239is_string (pointer p) 273is_string (pointer p)
240{ 274{
241 return type (p) == T_STRING; 275 return type (p) == T_STRING;
242} 276}
243 277
244#define strvalue(p) ((p)->object.string.svalue) 278#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 279#define strlength(p) (CELL(p)->object.string.length)
246 280
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 281INTERFACE int
249is_vector (pointer p) 282is_vector (pointer p)
250{ 283{
251 return type (p) == T_VECTOR; 284 return type (p) == T_VECTOR;
252} 285}
253 286
254#define vecvalue(p) ((p)->object.vector.vvalue) 287#define vecvalue(p) (CELL(p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 288#define veclength(p) (CELL(p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 289INTERFACE 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); 290INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 291INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 292
261INTERFACE uint32_t 293INTERFACE int
262vector_length (pointer vec) 294is_integer (pointer p)
263{ 295{
264 return vec->object.vector.length; 296 return type (p) == T_INTEGER;
265} 297}
266 298
299/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 300INTERFACE int
301is_real (pointer p)
302{
303 return type (p) == T_REAL;
304}
305
306INTERFACE int
268is_number (pointer p) 307is_number (pointer p)
269{ 308{
270 return type (p) == T_NUMBER; 309 return is_integer (p) || is_real (p);
271} 310}
272 311
273INTERFACE INLINE int 312INTERFACE 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) 313is_character (pointer p)
293{ 314{
294 return type (p) == T_CHARACTER; 315 return type (p) == T_CHARACTER;
295} 316}
296 317
297INTERFACE INLINE char * 318INTERFACE char *
298string_value (pointer p) 319string_value (pointer p)
299{ 320{
300 return strvalue (p); 321 return strvalue (p);
301} 322}
302 323
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) 324#define ivalue_unchecked(p) CELL(p)->object.ivalue
325#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
326
334#if USE_REAL 327#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 328#define rvalue_unchecked(p) CELL(p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 329#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 330#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 331#define rvalue_unchecked(p) CELL(p)->object.ivalue
340# define set_num_integer(p) 0 332#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 333#endif
334
343INTERFACE long 335INTERFACE long
344charvalue (pointer p) 336charvalue (pointer p)
345{ 337{
346 return ivalue_unchecked (p); 338 return ivalue_unchecked (p);
347} 339}
348 340
341#define port(p) CELL(p)->object.port
342#define set_port(p,v) port(p) = (v)
349INTERFACE INLINE int 343INTERFACE int
350is_port (pointer p) 344is_port (pointer p)
351{ 345{
352 return type (p) == T_PORT; 346 return type (p) == T_PORT;
353} 347}
354 348
355INTERFACE INLINE int 349INTERFACE int
356is_inport (pointer p) 350is_inport (pointer p)
357{ 351{
358 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && port (p)->kind & port_input;
359} 353}
360 354
361INTERFACE INLINE int 355INTERFACE int
362is_outport (pointer p) 356is_outport (pointer p)
363{ 357{
364 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && port (p)->kind & port_output;
365} 359}
366 360
367INTERFACE INLINE int 361INTERFACE int
368is_pair (pointer p) 362is_pair (pointer p)
369{ 363{
370 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
371} 365}
372 366
373#define car(p) ((p)->object.cons.car + 0) 367#define car(p) (POINTER (CELL(p)->object.cons.car))
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
375 369
376#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 374
381#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 378
385INTERFACE void 379INTERFACE void
386set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
387{ 381{
388 p->object.cons.car = q; 382 CELL(p)->object.cons.car = CELL (q);
389} 383}
390 384
391INTERFACE void 385INTERFACE void
392set_cdr (pointer p, pointer q) 386set_cdr (pointer p, pointer q)
393{ 387{
394 p->object.cons.cdr = q; 388 CELL(p)->object.cons.cdr = CELL (q);
395} 389}
396 390
397INTERFACE pointer 391INTERFACE pointer
398pair_car (pointer p) 392pair_car (pointer p)
399{ 393{
… …
404pair_cdr (pointer p) 398pair_cdr (pointer p)
405{ 399{
406 return cdr (p); 400 return cdr (p);
407} 401}
408 402
409INTERFACE INLINE int 403INTERFACE int
410is_symbol (pointer p) 404is_symbol (pointer p)
411{ 405{
412 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
413} 407}
414 408
415INTERFACE INLINE char * 409INTERFACE char *
416symname (pointer p) 410symname (pointer p)
417{ 411{
418 return strvalue (car (p)); 412 return strvalue (p);
419} 413}
420 414
421#if USE_PLIST 415#if USE_PLIST
416#error plists are broken because symbols are no longer pairs
417#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 418SCHEME_EXPORT int
423hasprop (pointer p) 419hasprop (pointer p)
424{ 420{
425 return typeflag (p) & T_SYMBOL; 421 return typeflag (p) & T_SYMBOL;
426} 422}
427
428# define symprop(p) cdr(p)
429#endif 423#endif
430 424
431INTERFACE INLINE int 425INTERFACE int
432is_syntax (pointer p) 426is_syntax (pointer p)
433{ 427{
434 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
435} 429}
436 430
437INTERFACE INLINE int 431INTERFACE int
438is_proc (pointer p) 432is_proc (pointer p)
439{ 433{
440 return type (p) == T_PROC; 434 return type (p) == T_PROC;
441} 435}
442 436
443INTERFACE INLINE int 437INTERFACE int
444is_foreign (pointer p) 438is_foreign (pointer p)
445{ 439{
446 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
447} 441}
448 442
449INTERFACE INLINE char * 443INTERFACE char *
450syntaxname (pointer p) 444syntaxname (pointer p)
451{ 445{
452 return strvalue (car (p)); 446 return strvalue (p);
453} 447}
454 448
455#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 450static const char *procname (pointer x);
457 451
458INTERFACE INLINE int 452INTERFACE int
459is_closure (pointer p) 453is_closure (pointer p)
460{ 454{
461 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
462} 456}
463 457
464INTERFACE INLINE int 458INTERFACE int
465is_macro (pointer p) 459is_macro (pointer p)
466{ 460{
467 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
468} 462}
469 463
470INTERFACE INLINE pointer 464INTERFACE pointer
471closure_code (pointer p) 465closure_code (pointer p)
472{ 466{
473 return car (p); 467 return car (p);
474} 468}
475 469
476INTERFACE INLINE pointer 470INTERFACE pointer
477closure_env (pointer p) 471closure_env (pointer p)
478{ 472{
479 return cdr (p); 473 return cdr (p);
480} 474}
481 475
482INTERFACE INLINE int 476INTERFACE int
483is_continuation (pointer p) 477is_continuation (pointer p)
484{ 478{
485 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
486} 480}
487 481
488#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
490 484
491/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 486INTERFACE int
493is_promise (pointer p) 487is_promise (pointer p)
494{ 488{
495 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
496} 490}
497 491
498INTERFACE INLINE int 492INTERFACE int
499is_environment (pointer p) 493is_environment (pointer p)
500{ 494{
501 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
502} 496}
503 497
… …
509 503
510#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 507
514INTERFACE INLINE int 508INTERFACE int
515is_immutable (pointer p) 509is_immutable (pointer p)
516{ 510{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 512}
519 513
520INTERFACE INLINE void 514INTERFACE void
521setimmutable (pointer p) 515setimmutable (pointer p)
522{ 516{
523#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 519#endif
526} 520}
527 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
528#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
529static INLINE int 577ecb_inline int
530Cisalpha (int c) 578Cisalpha (int c)
531{ 579{
532 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
533} 581}
534 582
535static INLINE int 583ecb_inline int
536Cisdigit (int c) 584Cisdigit (int c)
537{ 585{
538 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
539} 587}
540 588
541static INLINE int 589ecb_inline int
542Cisspace (int c) 590Cisspace (int c)
543{ 591{
544 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
545} 593}
546 594
547static INLINE int 595ecb_inline int
548Cisupper (int c) 596Cisupper (int c)
549{ 597{
550 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
551} 599}
552 600
553static INLINE int 601ecb_inline int
554Cislower (int c) 602Cislower (int c)
555{ 603{
556 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
557} 605}
558#endif 606#endif
… …
619#endif 667#endif
620 668
621static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P);
626static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
629static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
630static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
631static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
646static void mark (pointer a); 694static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 702static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
656static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
657static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
753
678static num 754static num
679num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
680{ 756{
681 num ret; 757 num ret;
682 758
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 760
685 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 762 {
763 switch (op)
764 {
765 case NUM_ADD: a.ivalue += b.ivalue; break;
766 case NUM_SUB: a.ivalue -= b.ivalue; break;
767 case NUM_MUL: a.ivalue *= b.ivalue; break;
768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
769 }
770
771 num_set_ivalue (ret, a.ivalue);
772 }
773#if USE_REAL
687 else 774 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 775 {
776 switch (op)
777 {
778 case NUM_ADD: a.rvalue += b.rvalue; break;
779 case NUM_SUB: a.rvalue -= b.rvalue; break;
780 case NUM_MUL: a.rvalue *= b.rvalue; break;
781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
782 }
689 783
690 return ret; 784 num_set_rvalue (ret, a.rvalue);
691} 785 }
692 786#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 787
705 return ret; 788 return ret;
706} 789}
707 790
708static num 791static num
709num_div (num a, num b) 792num_div (num a, num b)
710{ 793{
711 num ret; 794 num ret;
712 795
713 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
714 797
715 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 800 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 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 802
750 return ret; 803 return ret;
751} 804}
752 805
753static num 806static num
… …
755{ 808{
756 num ret; 809 num ret;
757 long e1, e2, res; 810 long e1, e2, res;
758 811
759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 812 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
760 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
762 res = e1 % e2; 815 res = e1 % e2;
763 816
764 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
765 if (res > 0) 818 if (res > 0)
766 { 819 {
… …
782{ 835{
783 num ret; 836 num ret;
784 long e1, e2, res; 837 long e1, e2, res;
785 838
786 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 839 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
787 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
789 res = e1 % e2; 842 res = e1 % e2;
790 843
791 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 845 if (res * e2 < 0)
793 res += e2; 846 res += e2;
794 847
795 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
796 return ret; 849 return ret;
797} 850}
798 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 853static int
800num_eq (num a, num b) 854num_cmp (num a, num b)
801{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 857 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 858
805 if (is_fixnum) 859 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 860 {
861 IVALUE av = num_ivalue (a);
862 IVALUE bv = num_ivalue (b);
863
864 ret = av == bv ? 0 : av < bv ? -1 : +1;
865 }
807 else 866 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 867 {
868 RVALUE av = num_rvalue (a);
869 RVALUE bv = num_rvalue (b);
870
871 ret = av == bv ? 0 : av < bv ? -1 : +1;
872 }
809 873
810 return ret; 874 return ret;
811}
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} 875}
853 876
854#if USE_MATH 877#if USE_MATH
855 878
856/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
866 return ce; 889 return ce;
867 else if (dfl < dce) 890 else if (dfl < dce)
868 return fl; 891 return fl;
869 else 892 else
870 { 893 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 895 return fl;
873 else 896 else
874 return ce; 897 return ce;
875 } 898 }
876} 899}
877#endif 900#endif
878 901
879static int 902static int
880is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
881{ 904{
905 return x == 0;
906#if 0
882#if USE_REAL 907#if USE_REAL
883 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
884#else 909#else
885 return x == 0; 910 return x == 0;
886#endif 911#endif
912#endif
887} 913}
888 914
889/* allocate new cell segment */ 915/* allocate new cell segment */
890static int 916static int
891alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P)
892{ 918{
893 pointer newp; 919 struct cell *newp;
894 pointer last; 920 struct cell *last;
895 pointer p; 921 struct cell *p;
896 char *cp; 922 char *cp;
897 long i; 923 long i;
898 int k; 924 int k;
899 925
900 static int segsize = CELL_SEGSIZE >> 1; 926 static int segsize = CELL_SEGSIZE >> 1;
901 segsize <<= 1; 927 segsize <<= 1;
902 928
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)); 929 cp = malloc (segsize * sizeof (struct cell));
909 930
910 if (!cp && USE_ERROR_CHECKING) 931 if (!cp && USE_ERROR_CHECKING)
911 return k; 932 return k;
912 933
913 i = ++SCHEME_V->last_cell_seg; 934 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 935 SCHEME_V->alloc_seg[i] = cp;
915 936
916 /* insert new segment in address order */ 937 newp = (struct cell *)cp;
917 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 938 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 939 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; 940 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 941 last = newp + segsize - 1;
937 942
938 for (p = newp; p <= last; p++) 943 for (p = newp; p <= last; p++)
939 { 944 {
945 pointer cp = POINTER (p);
940 set_typeflag (p, T_FREE); 946 set_typeflag (cp, T_PAIR);
941 set_car (p, NIL); 947 set_car (cp, NIL);
942 set_cdr (p, p + 1); 948 set_cdr (cp, POINTER (p + 1));
943 } 949 }
944 950
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); 951 set_cdr (POINTER (last), SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 952 SCHEME_V->free_cell = POINTER (newp);
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954 953
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; 954 return 1;
964} 955}
965 956
966/* get new cell. parameter a, b is marked by gc. */ 957/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 958ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 959get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 960{
970 if (SCHEME_V->free_cell == NIL) 961 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 962 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 964 return S_SINK;
974 965
975 if (SCHEME_V->free_cell == NIL) 966 if (SCHEME_V->free_cell == NIL)
976 { 967 {
977 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 968 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
978 969
979 gc (SCHEME_A_ a, b); 970 gc (SCHEME_A_ a, b);
980 971
981 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
982 { 973 {
983 /* if only a few recovered, get more to avoid fruitless gc's */ 974 /* if only a few recovered, get more to avoid fruitless gc's */
984 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 975 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
985 { 976 {
986#if USE_ERROR_CHECKING 977#if USE_ERROR_CHECKING
987 SCHEME_V->no_memory = 1; 978 SCHEME_V->no_memory = 1;
988 return S_SINK; 979 return S_SINK;
989#endif 980#endif
… …
1001 } 992 }
1002} 993}
1003 994
1004/* To retain recent allocs before interpreter knows about them - 995/* To retain recent allocs before interpreter knows about them -
1005 Tehom */ 996 Tehom */
1006
1007static void 997static void
1008push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1009{ 999{
1010 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1011 1001
… …
1033} 1023}
1034 1024
1035static pointer 1025static pointer
1036get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1026get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1037{ 1027{
1038 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1028 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1039 pointer *e = malloc (len * sizeof (pointer)); 1029 pointer *e = malloc (len * sizeof (pointer));
1040 1030
1041 if (!e && USE_ERROR_CHECKING) 1031 if (!e && USE_ERROR_CHECKING)
1042 return S_SINK; 1032 return S_SINK;
1043 1033
1044 /* Record it as a vector so that gc understands it. */ 1034 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1035 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1036
1047 v->object.vector.vvalue = e; 1037 CELL(v)->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1038 CELL(v)->object.vector.length = len;
1049 fill_vector (v, init); 1039 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1040 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1041
1052 return v; 1042 return v;
1053} 1043}
1054 1044
1055static INLINE void 1045ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1046ok_to_freely_gc (SCHEME_P)
1057{ 1047{
1058 set_car (S_SINK, NIL); 1048 set_car (S_SINK, NIL);
1059} 1049}
1060 1050
… …
1062static void 1052static void
1063check_cell_alloced (pointer p, int expect_alloced) 1053check_cell_alloced (pointer p, int expect_alloced)
1064{ 1054{
1065 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1055 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1066 if (typeflag (p) & !expect_alloced) 1056 if (typeflag (p) & !expect_alloced)
1067 xwrstr ("Cell is already allocated!\n"); 1057 putstr (SCHEME_A_ "Cell is already allocated!\n");
1068 1058
1069 if (!(typeflag (p)) & expect_alloced) 1059 if (!(typeflag (p)) & expect_alloced)
1070 xwrstr ("Cell is not allocated!\n"); 1060 putstr (SCHEME_A_ "Cell is not allocated!\n");
1071} 1061}
1072 1062
1073static void 1063static void
1074check_range_alloced (pointer p, int n, int expect_alloced) 1064check_range_alloced (pointer p, int n, int expect_alloced)
1075{ 1065{
… …
1097 set_cdr (x, b); 1087 set_cdr (x, b);
1098 1088
1099 return x; 1089 return x;
1100} 1090}
1101 1091
1092static pointer
1093generate_symbol (SCHEME_P_ const char *name)
1094{
1095 pointer x = mk_string (SCHEME_A_ name);
1096 setimmutable (x);
1097 set_typeflag (x, T_SYMBOL | T_ATOM);
1098 return x;
1099}
1100
1102/* ========== oblist implementation ========== */ 1101/* ========== oblist implementation ========== */
1103 1102
1104#ifndef USE_OBJECT_LIST 1103#ifndef USE_OBJECT_LIST
1105 1104
1105static int
1106static int hash_fn (const char *key, int table_size); 1106hash_fn (const char *key, int table_size)
1107{
1108 const unsigned char *p = key;
1109 uint32_t hash = 2166136261;
1110
1111 while (*p)
1112 hash = (hash ^ *p++) * 16777619;
1113
1114 return hash % table_size;
1115}
1107 1116
1108static pointer 1117static pointer
1109oblist_initial_value (SCHEME_P) 1118oblist_initial_value (SCHEME_P)
1110{ 1119{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1122
1114/* returns the new symbol */ 1123/* returns the new symbol */
1115static pointer 1124static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1125oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1126{
1118 int location; 1127 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)); 1128 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))); 1129 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1130 return x;
1127} 1131}
1128 1132
1129static INLINE pointer 1133ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1134oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1135{
1132 int location; 1136 int location;
1133 pointer x; 1137 pointer x;
1134 char *s; 1138 char *s;
1135 1139
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1140 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1141
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1142 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1143 {
1140 s = symname (car (x)); 1144 s = symname (car (x));
1141 1145
1142 /* case-insensitive, per R5RS section 2 */ 1146 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1147 if (stricmp (name, s) == 0)
… …
1153 int i; 1157 int i;
1154 pointer x; 1158 pointer x;
1155 pointer ob_list = NIL; 1159 pointer ob_list = NIL;
1156 1160
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1161 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1162 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1163 ob_list = cons (x, ob_list);
1160 1164
1161 return ob_list; 1165 return ob_list;
1162} 1166}
1163 1167
… …
1167oblist_initial_value (SCHEME_P) 1171oblist_initial_value (SCHEME_P)
1168{ 1172{
1169 return NIL; 1173 return NIL;
1170} 1174}
1171 1175
1172static INLINE pointer 1176ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1177oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1178{
1175 pointer x; 1179 pointer x;
1176 char *s; 1180 char *s;
1177 1181
… …
1189 1193
1190/* returns the new symbol */ 1194/* returns the new symbol */
1191static pointer 1195static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1196oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1197{
1194 pointer x; 1198 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); 1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1200 return x;
1201} 1201}
1202 1202
1203static pointer 1203static pointer
… …
1213mk_port (SCHEME_P_ port *p) 1213mk_port (SCHEME_P_ port *p)
1214{ 1214{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1215 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1216
1217 set_typeflag (x, T_PORT | T_ATOM); 1217 set_typeflag (x, T_PORT | T_ATOM);
1218 x->object.port = p; 1218 set_port (x, p);
1219 1219
1220 return x; 1220 return x;
1221} 1221}
1222#endif 1222#endif
1223 1223
1224pointer 1224pointer
1225mk_foreign_func (SCHEME_P_ foreign_func f) 1225mk_foreign_func (SCHEME_P_ foreign_func f)
1226{ 1226{
1227 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1227 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1228 1228
1229 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1229 set_typeflag (x, T_FOREIGN | T_ATOM);
1230 x->object.ff = f; 1230 CELL(x)->object.ff = f;
1231 1231
1232 return x; 1232 return x;
1233} 1233}
1234 1234
1235INTERFACE pointer 1235INTERFACE pointer
1236mk_character (SCHEME_P_ int c) 1236mk_character (SCHEME_P_ int c)
1237{ 1237{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1238 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1239
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1240 set_typeflag (x, T_CHARACTER | T_ATOM);
1241 ivalue_unchecked (x) = c & 0xff; 1241 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1242
1243 return x; 1243 return x;
1244} 1244}
1245 1245
1246/* get number atom (integer) */ 1246/* get number atom (integer) */
1247INTERFACE pointer 1247INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1248mk_integer (SCHEME_P_ long n)
1249{ 1249{
1250 pointer p = 0;
1251 pointer *pp = &p;
1252
1253#if USE_INTCACHE
1254 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1255 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1256#endif
1257
1258 if (!*pp)
1259 {
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1260 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1261
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1262 set_typeflag (x, T_INTEGER | T_ATOM);
1253 ivalue_unchecked (x) = num; 1263 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1254 set_num_integer (x); 1264 set_ivalue (x, n);
1265
1266 *pp = x;
1267 }
1268
1255 return x; 1269 return *pp;
1256} 1270}
1257 1271
1258INTERFACE pointer 1272INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1273mk_real (SCHEME_P_ RVALUE n)
1260{ 1274{
1275#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1276 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1277
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1278 set_typeflag (x, T_REAL | T_ATOM);
1264 rvalue_unchecked (x) = n; 1279 set_rvalue (x, n);
1265 set_num_real (x); 1280
1266 return x; 1281 return x;
1282#else
1283 return mk_integer (SCHEME_A_ n);
1284#endif
1267} 1285}
1268 1286
1269static pointer 1287static pointer
1270mk_number (SCHEME_P_ const num n) 1288mk_number (SCHEME_P_ const num n)
1271{ 1289{
1290#if USE_REAL
1272 if (num_is_fixnum (n)) 1291 return num_is_fixnum (n)
1292 ? mk_integer (SCHEME_A_ num_ivalue (n))
1293 : mk_real (SCHEME_A_ num_rvalue (n));
1294#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1295 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1296#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1297}
1277 1298
1278/* allocate name to string area */ 1299/* allocate name to string area */
1279static char * 1300static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1301store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1286 SCHEME_V->no_memory = 1; 1307 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1308 return SCHEME_V->strbuff;
1288 } 1309 }
1289 1310
1290 if (str) 1311 if (str)
1291 { 1312 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 1313 else
1301 {
1302 memset (q, fill, len_str); 1314 memset (q, fill, len_str);
1315
1303 q[len_str] = 0; 1316 q[len_str] = 0;
1304 }
1305 1317
1306 return q; 1318 return q;
1307} 1319}
1308 1320
1309INTERFACE pointer 1321INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1336
1325 set_typeflag (x, T_STRING | T_ATOM); 1337 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1339 strlength (x) = len;
1340
1328 return x; 1341 return x;
1329} 1342}
1330 1343
1331INTERFACE pointer 1344INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1345mk_string (SCHEME_P_ const char *str)
… …
1339{ 1352{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1353 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1354}
1342 1355
1343INTERFACE void 1356INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1357fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1358{
1346 int i; 1359 int i;
1347 1360
1348 for (i = 0; i < vec->object.vector.length; i++) 1361 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1362 vecvalue (vec)[i] = obj;
1350} 1363}
1351 1364
1365INTERFACE void
1366vector_resize (pointer vec, uint32_t newsize, pointer fill)
1367{
1368 uint32_t oldsize = veclength (vec);
1369 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1370 veclength (vec) = newsize;
1371 fill_vector (vec, oldsize, fill);
1372}
1373
1352INTERFACE pointer 1374INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1375vector_get (pointer vec, uint32_t ielem)
1354{ 1376{
1355 return vecvalue(vec)[ielem]; 1377 return vecvalue(vec)[ielem];
1356} 1378}
1357 1379
1358INTERFACE void 1380INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1381vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1382{
1361 vecvalue(vec)[ielem] = a; 1383 vecvalue(vec)[ielem] = a;
1362} 1384}
1363 1385
1364/* get new symbol */ 1386/* get new symbol */
… …
1376 1398
1377INTERFACE pointer 1399INTERFACE pointer
1378gensym (SCHEME_P) 1400gensym (SCHEME_P)
1379{ 1401{
1380 pointer x; 1402 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1403 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1404 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1386 1405
1387 /* first check oblist */ 1406 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name); 1407}
1389 1408
1390 if (x == NIL) 1409static int
1391 { 1410is_gensym (SCHEME_P_ pointer x)
1392 x = oblist_add_by_name (SCHEME_A_ name); 1411{
1393 return x; 1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1413}
1399 1414
1400/* make symbol or number atom from string */ 1415/* make symbol or number atom from string */
1401static pointer 1416static pointer
1402mk_atom (SCHEME_P_ char *q) 1417mk_atom (SCHEME_P_ char *q)
… …
1456 } 1471 }
1457 else if ((c == 'e') || (c == 'E')) 1472 else if ((c == 'e') || (c == 'E'))
1458 { 1473 {
1459 if (!has_fp_exp) 1474 if (!has_fp_exp)
1460 { 1475 {
1461 has_dec_point = 1; /* decimal point illegal 1476 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1477 p++;
1464 1478
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1479 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1480 continue;
1467 } 1481 }
… …
1481 1495
1482/* make constant */ 1496/* make constant */
1483static pointer 1497static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1498mk_sharp_const (SCHEME_P_ char *name)
1485{ 1499{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1500 if (!strcmp (name, "t"))
1490 return S_T; 1501 return S_T;
1491 else if (!strcmp (name, "f")) 1502 else if (!strcmp (name, "f"))
1492 return S_F; 1503 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1504 else if (*name == '\\') /* #\w (character) */
1494 { 1505 {
1495 int c = 0; 1506 int c;
1496 1507
1497 if (stricmp (name + 1, "space") == 0) 1508 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1509 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1510 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1511 c = '\n';
… …
1502 c = '\r'; 1513 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1514 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1515 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1516 else if (name[1] == 'x' && name[2] != 0)
1506 { 1517 {
1507 int c1 = strtol (name + 2, 0, 16); 1518 long c1 = strtol (name + 2, 0, 16);
1508 1519
1509 if (c1 <= UCHAR_MAX) 1520 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1521 c = c1;
1511 else 1522 else
1512 return NIL; 1523 return NIL;
1513 1524 }
1514#if USE_ASCII_NAMES 1525#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1526 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1527 /* nothing */;
1519#endif 1528#endif
1520 }
1521 else if (name[2] == 0) 1529 else if (name[2] == 0)
1522 c = name[1]; 1530 c = name[1];
1523 else 1531 else
1524 return NIL; 1532 return NIL;
1525 1533
… …
1542 1550
1543/*-- 1551/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1552 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1553 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1554 * for marking.
1555 *
1556 * The exception is vectors - vectors are currently marked recursively,
1557 * which is inherited form tinyscheme and could be fixed by having another
1558 * word of context in the vector
1547 */ 1559 */
1548static void 1560static void
1549mark (pointer a) 1561mark (pointer a)
1550{ 1562{
1551 pointer t, q, p; 1563 pointer t, q, p;
… …
1553 t = 0; 1565 t = 0;
1554 p = a; 1566 p = a;
1555E2: 1567E2:
1556 setmark (p); 1568 setmark (p);
1557 1569
1558 if (is_vector (p)) 1570 if (ecb_expect_false (is_vector (p)))
1559 { 1571 {
1560 int i; 1572 int i;
1561 1573
1562 for (i = 0; i < p->object.vector.length; i++) 1574 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1575 mark (vecvalue (p)[i]);
1564 } 1576 }
1565 1577
1566 if (is_atom (p)) 1578 if (is_atom (p))
1567 goto E6; 1579 goto E6;
… …
1614 1626
1615/* garbage collection. parameter a, b is marked. */ 1627/* garbage collection. parameter a, b is marked. */
1616static void 1628static void
1617gc (SCHEME_P_ pointer a, pointer b) 1629gc (SCHEME_P_ pointer a, pointer b)
1618{ 1630{
1619 pointer p;
1620 int i; 1631 int i;
1621 1632
1622 if (SCHEME_V->gc_verbose) 1633 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1634 putstr (SCHEME_A_ "gc...");
1624 1635
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1651 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1652 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1653 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1654 mark (SCHEME_V->c_nest);
1644 1655
1656#if USE_INTCACHE
1657 /* mark intcache */
1658 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1659 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1660 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1661#endif
1662
1645 /* mark variables a, b */ 1663 /* mark variables a, b */
1646 mark (a); 1664 mark (a);
1647 mark (b); 1665 mark (b);
1648 1666
1649 /* garbage collect */ 1667 /* garbage collect */
1650 clrmark (NIL); 1668 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1669 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1670 SCHEME_V->free_cell = NIL;
1653 1671
1654 /* free-list is kept sorted by address so as to maintain consecutive 1672 if (SCHEME_V->gc_verbose)
1655 ranges, if possible, for use with vectors. Here we scan the cells 1673 putstr (SCHEME_A_ "freeing...");
1656 (which are also kept sorted by address) downwards to build the 1674
1657 free-list in sorted order. 1675 uint32_t total = 0;
1658 */ 1676
1677 /* Here we scan the cells to build the free-list. */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 { 1679 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1680 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1681 struct cell *p;
1682 total += SCHEME_V->cell_segsize [i];
1662 1683
1663 while (--p >= SCHEME_V->cell_seg[i]) 1684 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 { 1685 {
1686 pointer c = POINTER (p);
1687
1665 if (is_mark (p)) 1688 if (is_mark (c))
1666 clrmark (p); 1689 clrmark (c);
1667 else 1690 else
1668 { 1691 {
1669 /* reclaim cell */ 1692 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1693 if (typeflag (c) != T_PAIR)
1671 { 1694 {
1672 finalize_cell (SCHEME_A_ p); 1695 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (p, T_FREE); 1696 set_typeflag (c, T_PAIR);
1674 set_car (p, NIL); 1697 set_car (c, NIL);
1675 } 1698 }
1676 1699
1677 ++SCHEME_V->fcells; 1700 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1701 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p; 1702 SCHEME_V->free_cell = c;
1680 } 1703 }
1681 } 1704 }
1682 } 1705 }
1683 1706
1684 if (SCHEME_V->gc_verbose) 1707 if (SCHEME_V->gc_verbose)
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1708 {
1709 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");
1710 }
1686} 1711}
1687 1712
1688static void 1713static void
1689finalize_cell (SCHEME_P_ pointer a) 1714finalize_cell (SCHEME_P_ pointer a)
1690{ 1715{
1691 if (is_string (a)) 1716 /* TODO, fast bitmap check? */
1717 if (is_string (a) || is_symbol (a))
1692 free (strvalue (a)); 1718 free (strvalue (a));
1693 else if (is_vector (a)) 1719 else if (is_vector (a))
1694 free (vecvalue (a)); 1720 free (vecvalue (a));
1695#if USE_PORTS 1721#if USE_PORTS
1696 else if (is_port (a)) 1722 else if (is_port (a))
1697 { 1723 {
1698 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1724 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1699 port_close (SCHEME_A_ a, port_input | port_output); 1725 port_close (SCHEME_A_ a, port_input | port_output);
1700 1726
1701 free (a->object.port); 1727 free (port (a));
1702 } 1728 }
1703#endif 1729#endif
1704} 1730}
1705 1731
1706/* ========== Routines for Reading ========== */ 1732/* ========== Routines for Reading ========== */
… …
1722 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1748 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1723 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1749 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; 1750 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; 1751 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1726 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1752 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1727 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1753 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1728 1754
1729#if SHOW_ERROR_LINE 1755#if SHOW_ERROR_LINE
1730 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1731 1757
1732 if (fname) 1758 if (fname)
… …
1749 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1750#if USE_PORTS 1776#if USE_PORTS
1751 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1777 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1752#endif 1778#endif
1753 SCHEME_V->file_i--; 1779 SCHEME_V->file_i--;
1754 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1780 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1755 } 1781 }
1756} 1782}
1757 1783
1758static int 1784static int
1759file_interactive (SCHEME_P) 1785file_interactive (SCHEME_P)
1760{ 1786{
1761#if USE_PORTS 1787#if USE_PORTS
1762 return SCHEME_V->file_i == 0 1788 return SCHEME_V->file_i == 0
1763 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1764 && (SCHEME_V->inport->object.port->kind & port_file); 1790 && (port (SCHEME_V->inport)->kind & port_file);
1765#else 1791#else
1766 return 0; 1792 return 0;
1767#endif 1793#endif
1768} 1794}
1769 1795
… …
1903} 1929}
1904 1930
1905static void 1931static void
1906port_close (SCHEME_P_ pointer p, int flag) 1932port_close (SCHEME_P_ pointer p, int flag)
1907{ 1933{
1908 port *pt = p->object.port; 1934 port *pt = port (p);
1909 1935
1910 pt->kind &= ~flag; 1936 pt->kind &= ~flag;
1911 1937
1912 if ((pt->kind & (port_input | port_output)) == 0) 1938 if ((pt->kind & (port_input | port_output)) == 0)
1913 { 1939 {
… …
1934/* get new character from input file */ 1960/* get new character from input file */
1935static int 1961static int
1936inchar (SCHEME_P) 1962inchar (SCHEME_P)
1937{ 1963{
1938 int c; 1964 int c;
1939 port *pt; 1965 port *pt = port (SCHEME_V->inport);
1940
1941 pt = SCHEME_V->inport->object.port;
1942 1966
1943 if (pt->kind & port_saw_EOF) 1967 if (pt->kind & port_saw_EOF)
1944 return EOF; 1968 return EOF;
1945 1969
1946 c = basic_inchar (pt); 1970 c = basic_inchar (pt);
… …
2013 port *pt; 2037 port *pt;
2014 2038
2015 if (c == EOF) 2039 if (c == EOF)
2016 return; 2040 return;
2017 2041
2018 pt = SCHEME_V->inport->object.port; 2042 pt = port (SCHEME_V->inport);
2019 pt->unget = c; 2043 pt->unget = c;
2020#else 2044#else
2021 if (c == EOF) 2045 if (c == EOF)
2022 return; 2046 return;
2023 2047
… …
2051 2075
2052INTERFACE void 2076INTERFACE void
2053putstr (SCHEME_P_ const char *s) 2077putstr (SCHEME_P_ const char *s)
2054{ 2078{
2055#if USE_PORTS 2079#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port; 2080 port *pt = port (SCHEME_V->outport);
2057 2081
2058 if (pt->kind & port_file) 2082 if (pt->kind & port_file)
2059 write (pt->rep.stdio.file, s, strlen (s)); 2083 write (pt->rep.stdio.file, s, strlen (s));
2060 else 2084 else
2061 for (; *s; s++) 2085 for (; *s; s++)
… …
2063 *pt->rep.string.curr++ = *s; 2087 *pt->rep.string.curr++ = *s;
2064 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2065 *pt->rep.string.curr++ = *s; 2089 *pt->rep.string.curr++ = *s;
2066 2090
2067#else 2091#else
2068 xwrstr (s); 2092 write (pt->rep.stdio.file, s, strlen (s));
2069#endif 2093#endif
2070} 2094}
2071 2095
2072static void 2096static void
2073putchars (SCHEME_P_ const char *s, int len) 2097putchars (SCHEME_P_ const char *s, int len)
2074{ 2098{
2075#if USE_PORTS 2099#if USE_PORTS
2076 port *pt = SCHEME_V->outport->object.port; 2100 port *pt = port (SCHEME_V->outport);
2077 2101
2078 if (pt->kind & port_file) 2102 if (pt->kind & port_file)
2079 write (pt->rep.stdio.file, s, len); 2103 write (pt->rep.stdio.file, s, len);
2080 else 2104 else
2081 { 2105 {
… …
2095 2119
2096INTERFACE void 2120INTERFACE void
2097putcharacter (SCHEME_P_ int c) 2121putcharacter (SCHEME_P_ int c)
2098{ 2122{
2099#if USE_PORTS 2123#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port; 2124 port *pt = port (SCHEME_V->outport);
2101 2125
2102 if (pt->kind & port_file) 2126 if (pt->kind & port_file)
2103 { 2127 {
2104 char cc = c; 2128 char cc = c;
2105 write (pt->rep.stdio.file, &cc, 1); 2129 write (pt->rep.stdio.file, &cc, 1);
… …
2118#endif 2142#endif
2119} 2143}
2120 2144
2121/* read characters up to delimiter, but cater to character constants */ 2145/* read characters up to delimiter, but cater to character constants */
2122static char * 2146static char *
2123readstr_upto (SCHEME_P_ char *delim) 2147readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2148{
2125 char *p = SCHEME_V->strbuff; 2149 char *p = SCHEME_V->strbuff + skip;
2126 2150
2127 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2151 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2128 2152
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2154 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2161 return SCHEME_V->strbuff;
2138} 2162}
2139 2163
2140/* read string expression "xxx...xxx" */ 2164/* read string expression "xxx...xxx" */
2141static pointer 2165static pointer
2142readstrexp (SCHEME_P) 2166readstrexp (SCHEME_P_ char delim)
2143{ 2167{
2144 char *p = SCHEME_V->strbuff; 2168 char *p = SCHEME_V->strbuff;
2145 int c; 2169 int c;
2146 int c1 = 0; 2170 int c1 = 0;
2147 enum
2148 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2171 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2149 2172
2150 for (;;) 2173 for (;;)
2151 { 2174 {
2152 c = inchar (SCHEME_A); 2175 c = inchar (SCHEME_A);
2153 2176
… …
2155 return S_F; 2178 return S_F;
2156 2179
2157 switch (state) 2180 switch (state)
2158 { 2181 {
2159 case st_ok: 2182 case st_ok:
2160 switch (c) 2183 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); 2184 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2169 2185
2170 default: 2186 if (ecb_expect_false (c == '\\'))
2187 state = st_bsl;
2188 else
2171 *p++ = c; 2189 *p++ = c;
2172 break;
2173 }
2174 2190
2175 break; 2191 break;
2176 2192
2177 case st_bsl: 2193 case st_bsl:
2178 switch (c) 2194 switch (c)
… …
2208 case 'r': 2224 case 'r':
2209 *p++ = '\r'; 2225 *p++ = '\r';
2210 state = st_ok; 2226 state = st_ok;
2211 break; 2227 break;
2212 2228
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2229 default:
2219 *p++ = c; 2230 *p++ = c;
2220 state = st_ok; 2231 state = st_ok;
2221 break; 2232 break;
2222 } 2233 }
2223 2234
2224 break; 2235 break;
2225 2236
2226 case st_x1: 2237 case st_x1:
2227 case st_x2: 2238 case st_x2:
2228 c = toupper (c); 2239 c = tolower (c);
2229 2240
2230 if (c >= '0' && c <= 'F') 2241 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2242 c1 = (c1 << 4) + c - '0';
2234 else 2243 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2244 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 2245 else
2246 return S_F; 2246 return S_F;
2247
2248 if (state == st_x1)
2249 state = st_x2;
2250 else
2251 {
2252 *p++ = c1;
2253 state = st_ok;
2254 }
2247 2255
2248 break; 2256 break;
2249 2257
2250 case st_oct1: 2258 case st_oct1:
2251 case st_oct2: 2259 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2263 backchar (SCHEME_A_ c);
2256 state = st_ok; 2264 state = st_ok;
2257 } 2265 }
2258 else 2266 else
2259 { 2267 {
2260 if (state == st_oct2 && c1 >= 32) 2268 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2269 return S_F;
2262 2270
2263 c1 = (c1 << 3) + (c - '0'); 2271 c1 = (c1 << 3) + (c - '0');
2264 2272
2265 if (state == st_oct1) 2273 if (state == st_oct1)
… …
2270 state = st_ok; 2278 state = st_ok;
2271 } 2279 }
2272 } 2280 }
2273 2281
2274 break; 2282 break;
2275
2276 } 2283 }
2277 } 2284 }
2278} 2285}
2279 2286
2280/* check c is in chars */ 2287/* check c is in chars */
2281static INLINE int 2288ecb_inline int
2282is_one_of (char *s, int c) 2289is_one_of (const char *s, int c)
2283{ 2290{
2284 if (c == EOF)
2285 return 1;
2286
2287 return !!strchr (s, c); 2291 return c == EOF || !!strchr (s, c);
2288} 2292}
2289 2293
2290/* skip white characters */ 2294/* skip white characters */
2291static INLINE int 2295ecb_inline int
2292skipspace (SCHEME_P) 2296skipspace (SCHEME_P)
2293{ 2297{
2294 int c, curr_line = 0; 2298 int c, curr_line = 0;
2295 2299
2296 do 2300 do
2297 { 2301 {
2298 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2303
2299#if SHOW_ERROR_LINE 2304#if SHOW_ERROR_LINE
2300 if (c == '\n') 2305 if (ecb_expect_false (c == '\n'))
2301 curr_line++; 2306 curr_line++;
2302#endif 2307#endif
2308
2309 if (ecb_expect_false (c == EOF))
2310 return c;
2303 } 2311 }
2304 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2312 while (is_one_of (WHITESPACE, c));
2305 2313
2306 /* record it */ 2314 /* record it */
2307#if SHOW_ERROR_LINE 2315#if SHOW_ERROR_LINE
2308 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2316 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; 2317 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2310#endif 2318#endif
2311 2319
2312 if (c != EOF)
2313 {
2314 backchar (SCHEME_A_ c); 2320 backchar (SCHEME_A_ c);
2315 return 1; 2321 return 1;
2316 }
2317 else
2318 return EOF;
2319} 2322}
2320 2323
2321/* get token */ 2324/* get token */
2322static int 2325static int
2323token (SCHEME_P) 2326token (SCHEME_P)
… …
2339 return TOK_RPAREN; 2342 return TOK_RPAREN;
2340 2343
2341 case '.': 2344 case '.':
2342 c = inchar (SCHEME_A); 2345 c = inchar (SCHEME_A);
2343 2346
2344 if (is_one_of (" \n\t", c)) 2347 if (is_one_of (WHITESPACE, c))
2345 return TOK_DOT; 2348 return TOK_DOT;
2346 else 2349 else
2347 { 2350 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2351 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2352 return TOK_DOTATOM;
2352 } 2353 }
2354
2355 case '|':
2356 return TOK_STRATOM;
2353 2357
2354 case '\'': 2358 case '\'':
2355 return TOK_QUOTE; 2359 return TOK_QUOTE;
2356 2360
2357 case ';': 2361 case ';':
… …
2489 } 2493 }
2490 2494
2491 putcharacter (SCHEME_A_ '"'); 2495 putcharacter (SCHEME_A_ '"');
2492} 2496}
2493 2497
2494
2495/* print atoms */ 2498/* print atoms */
2496static void 2499static void
2497printatom (SCHEME_P_ pointer l, int f) 2500printatom (SCHEME_P_ pointer l, int f)
2498{ 2501{
2499 char *p; 2502 char *p;
2500 int len; 2503 int len;
2501 2504
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2505 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2506 putchars (SCHEME_A_ p, len);
2504} 2507}
2505
2506 2508
2507/* Uses internal buffer unless string pointer is already available */ 2509/* Uses internal buffer unless string pointer is already available */
2508static void 2510static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2512{
… …
2524 { 2526 {
2525 p = SCHEME_V->strbuff; 2527 p = SCHEME_V->strbuff;
2526 2528
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2529 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2530 {
2529 if (num_is_integer (l)) 2531 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2532 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2533#if USE_REAL
2532 else 2534 else
2533 { 2535 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2536 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2671#endif 2673#endif
2672 } 2674 }
2673 else if (is_continuation (l)) 2675 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2676 p = "#<CONTINUATION>";
2675 else 2677 else
2678 {
2679#if USE_PRINTF
2680 p = SCHEME_V->strbuff;
2681 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2682#else
2676 p = "#<ERROR>"; 2683 p = "#<ERROR>";
2684#endif
2685 }
2677 2686
2678 *pp = p; 2687 *pp = p;
2679 *plen = strlen (p); 2688 *plen = strlen (p);
2680} 2689}
2681 2690
… …
2789 return 0; 2798 return 0;
2790 } 2799 }
2791 else if (is_number (a)) 2800 else if (is_number (a))
2792 { 2801 {
2793 if (is_number (b)) 2802 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2803 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2804
2797 return 0; 2805 return 0;
2798 } 2806 }
2799 else if (is_character (a)) 2807 else if (is_character (a))
2800 { 2808 {
… …
2826/* () is #t in R5RS */ 2834/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2835#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2836#define is_false(p) ((p) == S_F)
2829 2837
2830/* ========== Environment implementation ========== */ 2838/* ========== 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 2839
2847#ifndef USE_ALIST_ENV 2840#ifndef USE_ALIST_ENV
2848 2841
2849/* 2842/*
2850 * In this implementation, each frame of the environment may be 2843 * In this implementation, each frame of the environment may be
… …
2867 2860
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2861 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2862 setenvironment (SCHEME_V->envir);
2870} 2863}
2871 2864
2872static INLINE void 2865static uint32_t
2866sym_hash (pointer sym, uint32_t size)
2867{
2868 uintptr_t ptr = (uintptr_t)sym;
2869
2870#if 0
2871 /* table size is prime, so why mix */
2872 ptr += ptr >> 32;
2873 ptr += ptr >> 16;
2874 ptr += ptr >> 8;
2875#endif
2876
2877 return ptr % size;
2878}
2879
2880ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2881new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2882{
2875 pointer slot = immutable_cons (variable, value); 2883 pointer slot = immutable_cons (variable, value);
2876 2884
2877 if (is_vector (car (env))) 2885 if (is_vector (car (env)))
2878 { 2886 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2887 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2888 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2889 }
2883 else 2890 else
2884 set_car (env, immutable_cons (slot, car (env))); 2891 set_car (env, immutable_cons (slot, car (env)));
2885} 2892}
2886 2893
2887static pointer 2894static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2896{
2890 pointer x, y; 2897 pointer x, y;
2891 int location;
2892 2898
2893 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
2894 { 2900 {
2895 if (is_vector (car (x))) 2901 if (is_vector (car (x)))
2896 { 2902 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2903 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2904 y = vector_get (car (x), location);
2899 } 2905 }
2900 else 2906 else
2901 y = car (x); 2907 y = car (x);
2902 2908
2903 for (; y != NIL; y = cdr (y)) 2909 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2910 if (caar (y) == hdl)
2905 break; 2911 break;
2906 2912
2907 if (y != NIL) 2913 if (y != NIL)
2914 return car (y);
2915
2916 if (!all)
2908 break; 2917 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2918 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2919
2917 return NIL; 2920 return NIL;
2918} 2921}
2919 2922
2920#else /* USE_ALIST_ENV */ 2923#else /* USE_ALIST_ENV */
2921 2924
2922static INLINE void 2925ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2926new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2927{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2928 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2929 setenvironment (SCHEME_V->envir);
2927} 2930}
2928 2931
2929static INLINE void 2932ecb_inline void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2933new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2934{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2936}
2934 2937
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2945 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2946 if (caar (y) == hdl)
2944 break; 2947 break;
2945 2948
2946 if (y != NIL) 2949 if (y != NIL)
2950 return car (y);
2947 break; 2951 break;
2948 2952
2949 if (!all) 2953 if (!all)
2950 return NIL; 2954 break;
2951 } 2955 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2956
2956 return NIL; 2957 return NIL;
2957} 2958}
2958 2959
2959#endif /* USE_ALIST_ENV else */ 2960#endif /* USE_ALIST_ENV else */
2960 2961
2961static INLINE void 2962ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2964{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2966 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2967}
2966 2968
2967static INLINE void 2969ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2971{
2970 set_cdr (slot, value); 2972 set_cdr (slot, value);
2971} 2973}
2972 2974
2973static INLINE pointer 2975ecb_inline pointer
2974slot_value_in_env (pointer slot) 2976slot_value_in_env (pointer slot)
2975{ 2977{
2976 return cdr (slot); 2978 return cdr (slot);
2977} 2979}
2978 2980
2979/* ========== Evaluation Cycle ========== */ 2981/* ========== Evaluation Cycle ========== */
2980 2982
2981static pointer 2983static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2984xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2985{
2984#if USE_ERROR_HOOK 2986#if USE_ERROR_HOOK
2985 pointer x; 2987 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2988 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 3023 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 3024 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 3025 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 3026 SCHEME_V->op = OP_EVAL;
3025 3027
3026 return S_T; 3028 return 0;
3027 } 3029 }
3028#endif 3030#endif
3029 3031
3030 if (a) 3032 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3033 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3035 SCHEME_V->args = NIL;
3034 3036
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3037 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3038 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3039 SCHEME_V->op = OP_ERR0;
3040
3038 return S_T; 3041 return 0;
3039} 3042}
3040 3043
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3044#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3045#define Error_0(s) Error_1 (s, 0)
3043 3046
3044/* Too small to turn into function */ 3047/* Too small to turn into function */
3045#define BEGIN do { 3048#define BEGIN do {
3046#define END } while (0) 3049#define END } while (0)
3047#define s_goto(a) BEGIN \ 3050#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3051 SCHEME_V->op = a; \
3049 return S_T; END 3052 return 0; END
3050 3053
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3054#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3055
3053#ifndef USE_SCHEME_STACK 3056#ifndef USE_SCHEME_STACK
3054 3057
… …
3068{ 3071{
3069 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3070 struct dump_stack_frame *next_frame; 3073 struct dump_stack_frame *next_frame;
3071 3074
3072 /* enough room for the next frame? */ 3075 /* enough room for the next frame? */
3073 if (nframes >= SCHEME_V->dump_size) 3076 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3074 { 3077 {
3075 SCHEME_V->dump_size += STACK_GROWTH; 3078 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); 3079 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3077 } 3080 }
3078 3081
3079 next_frame = SCHEME_V->dump_base + nframes; 3082 next_frame = SCHEME_V->dump_base + nframes;
3080 3083
3081 next_frame->op = op; 3084 next_frame->op = op;
3082 next_frame->args = args; 3085 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3086 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3087 next_frame->code = code;
3085 3088
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3089 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3090}
3088 3091
3089static pointer 3092static int
3090xs_return (SCHEME_P_ pointer a) 3093xs_return (SCHEME_P_ pointer a)
3091{ 3094{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3096 struct dump_stack_frame *frame;
3094 3097
3095 SCHEME_V->value = a; 3098 SCHEME_V->value = a;
3096 3099
3097 if (nframes <= 0) 3100 if (nframes <= 0)
3098 return NIL; 3101 return -1;
3099 3102
3100 frame = &SCHEME_V->dump_base[--nframes]; 3103 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3104 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3105 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3106 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3107 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3109
3107 return S_T; 3110 return 0;
3108} 3111}
3109 3112
3110static INLINE void 3113ecb_inline void
3111dump_stack_reset (SCHEME_P) 3114dump_stack_reset (SCHEME_P)
3112{ 3115{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3116 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3117 SCHEME_V->dump = (pointer)+0;
3115} 3118}
3116 3119
3117static INLINE void 3120ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3121dump_stack_initialize (SCHEME_P)
3119{ 3122{
3120 SCHEME_V->dump_size = 0; 3123 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3124 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3125 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3178 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3179 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3180
3178 while (cont != NIL) 3181 while (cont != NIL)
3179 { 3182 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3183 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3184 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3185 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3186 frame->code = car (cont) ; cont = cdr (cont);
3184 3187
3185 ++frame; 3188 ++frame;
3186 ++i; 3189 ++i;
3187 } 3190 }
3188 3191
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3192 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3193}
3191 3194
3192#else 3195#else
3193 3196
3194static INLINE void 3197ecb_inline void
3195dump_stack_reset (SCHEME_P) 3198dump_stack_reset (SCHEME_P)
3196{ 3199{
3197 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3198} 3201}
3199 3202
3200static INLINE void 3203ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3204dump_stack_initialize (SCHEME_P)
3202{ 3205{
3203 dump_stack_reset (SCHEME_A); 3206 dump_stack_reset (SCHEME_A);
3204} 3207}
3205 3208
… …
3207dump_stack_free (SCHEME_P) 3210dump_stack_free (SCHEME_P)
3208{ 3211{
3209 SCHEME_V->dump = NIL; 3212 SCHEME_V->dump = NIL;
3210} 3213}
3211 3214
3212static pointer 3215static int
3213xs_return (SCHEME_P_ pointer a) 3216xs_return (SCHEME_P_ pointer a)
3214{ 3217{
3215 pointer dump = SCHEME_V->dump; 3218 pointer dump = SCHEME_V->dump;
3216 3219
3217 SCHEME_V->value = a; 3220 SCHEME_V->value = a;
3218 3221
3219 if (dump == NIL) 3222 if (dump == NIL)
3220 return NIL; 3223 return -1;
3221 3224
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3225 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3226 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3227 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3228 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3229
3227 SCHEME_V->dump = dump; 3230 SCHEME_V->dump = dump;
3228 3231
3229 return S_T; 3232 return 0;
3230} 3233}
3231 3234
3232static void 3235static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3236s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3237{
… …
3259 3262
3260#endif 3263#endif
3261 3264
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3266
3267#if EXPERIMENT
3264static pointer 3268static int
3269debug (SCHEME_P_ int indent, pointer x)
3270{
3271 int c;
3272
3273 if (is_syntax (x))
3274 {
3275 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3276 return 8 + 8;
3277 }
3278
3279 if (x == NIL)
3280 {
3281 printf ("%*sNIL\n", indent, "");
3282 return 3;
3283 }
3284
3285 switch (type (x))
3286 {
3287 case T_INTEGER:
3288 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3289 return 32+8;
3290
3291 case T_SYMBOL:
3292 printf ("%*sS<%s>\n", indent, "", symname (x));
3293 return 24+8;
3294
3295 case T_CLOSURE:
3296 printf ("%*sS<%s>\n", indent, "", "closure");
3297 debug (SCHEME_A_ indent + 3, cdr(x));
3298 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3299
3300 case T_PAIR:
3301 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3302 c = debug (SCHEME_A_ indent + 3, car (x));
3303 c += debug (SCHEME_A_ indent + 3, cdr (x));
3304 return c + 1;
3305
3306 case T_PORT:
3307 printf ("%*sS<%s>\n", indent, "", "port");
3308 return 24+8;
3309
3310 case T_VECTOR:
3311 printf ("%*sS<%s>\n", indent, "", "vector");
3312 return 24+8;
3313
3314 case T_ENVIRONMENT:
3315 printf ("%*sS<%s>\n", indent, "", "environment");
3316 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3317
3318 default:
3319 printf ("unhandled type %d\n", type (x));
3320 break;
3321 }
3322}
3323#endif
3324
3325static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3326opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3327{
3328 pointer args = SCHEME_V->args;
3267 pointer x, y; 3329 pointer x, y;
3268 3330
3269 switch (op) 3331 switch (op)
3270 { 3332 {
3333#if EXPERIMENT //D
3334 case OP_DEBUG:
3335 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3336 printf ("\n");
3337 s_return (S_T);
3338#endif
3271 case OP_LOAD: /* load */ 3339 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3340 if (file_interactive (SCHEME_A))
3273 { 3341 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3342 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))); 3343 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3344 }
3277 3345
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3346 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3347 Error_1 ("unable to open", car (args));
3280 else 3348 else
3281 { 3349 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3350 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3351 s_goto (OP_T0LVL);
3284 } 3352 }
3285 3353
3286 case OP_T0LVL: /* top level */ 3354 case OP_T0LVL: /* top level */
3287 3355
3288 /* If we reached the end of file, this loop is done. */ 3356 /* If we reached the end of file, this loop is done. */
3289 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3290 { 3358 {
3291 if (SCHEME_V->file_i == 0) 3359 if (SCHEME_V->file_i == 0)
3292 { 3360 {
3293 SCHEME_V->args = NIL; 3361 SCHEME_V->args = NIL;
3294 s_goto (OP_QUIT); 3362 s_goto (OP_QUIT);
… …
3358 case OP_EVAL: /* main part of evaluation */ 3426 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3427#if USE_TRACING
3360 if (SCHEME_V->tracing) 3428 if (SCHEME_V->tracing)
3361 { 3429 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3430 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3431 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3432 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3433 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3434 s_goto (OP_P0LIST);
3367 } 3435 }
3368 3436
… …
3372#endif 3440#endif
3373 if (is_symbol (SCHEME_V->code)) /* symbol */ 3441 if (is_symbol (SCHEME_V->code)) /* symbol */
3374 { 3442 {
3375 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3443 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3376 3444
3377 if (x != NIL) 3445 if (x == NIL)
3378 s_return (slot_value_in_env (x));
3379 else
3380 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3446 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3447
3448 s_return (slot_value_in_env (x));
3381 } 3449 }
3382 else if (is_pair (SCHEME_V->code)) 3450 else if (is_pair (SCHEME_V->code))
3383 { 3451 {
3384 x = car (SCHEME_V->code); 3452 x = car (SCHEME_V->code);
3385 3453
… …
3398 } 3466 }
3399 else 3467 else
3400 s_return (SCHEME_V->code); 3468 s_return (SCHEME_V->code);
3401 3469
3402 case OP_E0ARGS: /* eval arguments */ 3470 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3472 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3474 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3475 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3476 s_goto (OP_APPLY);
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3480 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3481 s_goto (OP_E1ARGS);
3414 } 3482 }
3415 3483
3416 case OP_E1ARGS: /* eval arguments */ 3484 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3485 args = cons (SCHEME_V->value, args);
3418 3486
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3487 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3488 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3489 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3490 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3491 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3492 s_goto (OP_EVAL);
3425 } 3493 }
3426 else /* end */ 3494 else /* end */
3427 { 3495 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3496 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3497 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3498 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3432 } 3500 }
3433 3501
3434#if USE_TRACING 3502#if USE_TRACING
3435 3503
3436 case OP_TRACING: 3504 case OP_TRACING:
3437 { 3505 {
3438 int tr = SCHEME_V->tracing; 3506 int tr = SCHEME_V->tracing;
3439 3507
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3508 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3509 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3510 }
3443 3511
3444#endif 3512#endif
3445 3513
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3514 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3515#if USE_TRACING
3448 if (SCHEME_V->tracing) 3516 if (SCHEME_V->tracing)
3449 { 3517 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3518 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3519 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3520 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3521 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3522 s_goto (OP_P0LIST);
3455 } 3523 }
3456 3524
3457 /* fall through */ 3525 /* fall through */
3458 3526
3459 case OP_REAL_APPLY: 3527 case OP_REAL_APPLY:
3460#endif 3528#endif
3461 if (is_proc (SCHEME_V->code)) 3529 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3530 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3531 else if (is_foreign (SCHEME_V->code))
3466 { 3532 {
3467 /* Keep nested calls from GC'ing the arglist */ 3533 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3534 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3535 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3470 3536
3471 s_return (x); 3537 s_return (x);
3472 } 3538 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3539 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3540 {
3475 /* Should not accept promise */ 3541 /* Should not accept promise */
3476 /* make environment */ 3542 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3543 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3544
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3545 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3546 {
3481 if (y == NIL) 3547 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3548 Error_0 ("not enough arguments");
3483 else 3549 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3550 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3568 s_goto (OP_BEGIN);
3503 } 3569 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3570 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3571 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3572 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3573 s_return (args != NIL ? car (args) : NIL);
3508 } 3574 }
3509 else 3575 else
3510 Error_0 ("illegal function"); 3576 Error_0 ("illegal function");
3511 3577
3512 case OP_DOMACRO: /* do macro */ 3578 case OP_DOMACRO: /* do macro */
3513 SCHEME_V->code = SCHEME_V->value; 3579 SCHEME_V->code = SCHEME_V->value;
3514 s_goto (OP_EVAL); 3580 s_goto (OP_EVAL);
3515
3516#if 1
3517 3581
3518 case OP_LAMBDA: /* lambda */ 3582 case OP_LAMBDA: /* lambda */
3519 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3583 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3520 set SCHEME_V->value fall thru */ 3584 set SCHEME_V->value fall thru */
3521 { 3585 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3586 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3587
3524 if (f != NIL) 3588 if (f != NIL)
3525 { 3589 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3590 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3591 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3592 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3593 s_goto (OP_APPLY);
3530 } 3594 }
3531 3595
3532 SCHEME_V->value = SCHEME_V->code; 3596 SCHEME_V->value = SCHEME_V->code;
3533 /* Fallthru */
3534 } 3597 }
3598 /* Fallthru */
3535 3599
3536 case OP_LAMBDA1: 3600 case OP_LAMBDA1:
3537 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3601 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3538 3602
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 */ 3603 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3604 x = car (args);
3548 3605
3549 if (car (x) == SCHEME_V->LAMBDA) 3606 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3607 x = cdr (x);
3551 3608
3552 if (cdr (SCHEME_V->args) == NIL) 3609 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3610 y = SCHEME_V->envir;
3554 else 3611 else
3555 y = cadr (SCHEME_V->args); 3612 y = cadr (args);
3556 3613
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3614 s_return (mk_closure (SCHEME_A_ x, y));
3558 3615
3559 case OP_QUOTE: /* quote */ 3616 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3617 s_return (car (SCHEME_V->code));
… …
3592 3649
3593 3650
3594 case OP_DEFP: /* defined? */ 3651 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3652 x = SCHEME_V->envir;
3596 3653
3597 if (cdr (SCHEME_V->args) != NIL) 3654 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3655 x = cadr (args);
3599 3656
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3657 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3658
3602 case OP_SET0: /* set! */ 3659 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3660 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3661 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3662
… …
3636 3693
3637 case OP_IF1: /* if */ 3694 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3695 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3696 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3697 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3698 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3699 s_goto (OP_EVAL);
3645 3700
3646 case OP_LET0: /* let */ 3701 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3702 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3703 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3704 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 3705 s_goto (OP_LET1);
3651 3706
3652 case OP_LET1: /* let (calculate parameters) */ 3707 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3708 args = cons (SCHEME_V->value, args);
3654 3709
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3711 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3712 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)); 3713 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3659 3714
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3715 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3716 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3718 s_goto (OP_EVAL);
3664 } 3719 }
3665 else /* end */ 3720 else /* end */
3666 { 3721 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3722 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3723 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3724 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3725 s_goto (OP_LET2);
3671 } 3726 }
3672 3727
3673 case OP_LET2: /* let */ 3728 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3729 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3730
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3731 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)) 3732 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3733 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3734
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3735 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3736 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3737 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 3738 {
3684 if (!is_pair (x)) 3739 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3740 Error_1 ("Bad syntax of binding in let :", x);
3686 3741
3687 if (!is_list (SCHEME_A_ car (x))) 3742 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3743 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3744
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3745 args = cons (caar (x), args);
3691 } 3746 }
3692 3747
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3748 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 3749 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3750 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3751 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3752 }
3700 else 3753 else
3701 { 3754 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3755 SCHEME_V->code = cdr (SCHEME_V->code);
3756 }
3757
3703 SCHEME_V->args = NIL; 3758 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3759 s_goto (OP_BEGIN);
3707 3760
3708 case OP_LET0AST: /* let* */ 3761 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3762 if (car (SCHEME_V->code) == NIL)
3710 { 3763 {
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3781 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3782 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3783
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3784 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3785 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3786 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3787 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3788 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3789 s_goto (OP_EVAL);
3737 } 3790 }
3738 else /* end */ 3791 else /* end */
3739 { 3792 {
3740 SCHEME_V->code = SCHEME_V->args; 3793 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3794 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3795 s_goto (OP_BEGIN);
3743 } 3796 }
3744 3797
3745 case OP_LET0REC: /* letrec */ 3798 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3801 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3802 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3803 s_goto (OP_LET1REC);
3751 3804
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3805 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3806 args = cons (SCHEME_V->value, args);
3754 3807
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3808 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3809 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3810 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)); 3811 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759 3812
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3813 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3814 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3815 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3816 s_goto (OP_EVAL);
3764 } 3817 }
3765 else /* end */ 3818 else /* end */
3766 { 3819 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3820 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3821 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3822 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3823 s_goto (OP_LET2REC);
3771 } 3824 }
3772 3825
3773 case OP_LET2REC: /* letrec */ 3826 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3827 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)); 3828 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3829
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3830 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3831 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3832 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3918 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3919 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3920 s_goto (OP_EVAL);
3868 3921
3869 case OP_C1STREAM: /* cons-stream */ 3922 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3923 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); 3924 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 3925 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3926 s_return (cons (args, x));
3874 3927
3875 case OP_MACRO0: /* macro */ 3928 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3929 if (is_pair (car (SCHEME_V->code)))
3877 { 3930 {
3878 x = caar (SCHEME_V->code); 3931 x = caar (SCHEME_V->code);
… …
3911 { 3964 {
3912 if (!is_pair (y = caar (x))) 3965 if (!is_pair (y = caar (x)))
3913 break; 3966 break;
3914 3967
3915 for (; y != NIL; y = cdr (y)) 3968 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3969 if (eqv (car (y), SCHEME_V->value))
3918 break; 3970 break;
3919 }
3920 3971
3921 if (y != NIL) 3972 if (y != NIL)
3922 break; 3973 break;
3923 } 3974 }
3924 3975
… …
3944 s_goto (OP_BEGIN); 3995 s_goto (OP_BEGIN);
3945 else 3996 else
3946 s_return (NIL); 3997 s_return (NIL);
3947 3998
3948 case OP_PAPPLY: /* apply */ 3999 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 4000 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4001 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4002 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
3953 4004
3954 case OP_PEVAL: /* eval */ 4005 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 4006 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 4007 SCHEME_V->envir = cadr (args);
3957 4008
3958 SCHEME_V->code = car (SCHEME_V->args); 4009 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 4010 s_goto (OP_EVAL);
3960 4011
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 4012 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 4013 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4014 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 4015 s_goto (OP_APPLY);
3965 } 4016 }
3966 4017
3967 return S_T; 4018 if (USE_ERROR_CHECKING) abort ();
3968} 4019}
3969 4020
3970static pointer 4021static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4022opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 4023{
3973 pointer x; 4024 pointer args = SCHEME_V->args;
4025 pointer x = car (args);
3974 num v; 4026 num v;
3975 4027
4028 switch (op)
4029 {
3976#if USE_MATH 4030#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4031 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 4032 {
3986
3987 if (num_is_integer (x)) 4033 if (is_integer (x))
3988 s_return (x); 4034 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4035
4036 RVALUE r = rvalue_unchecked (x);
4037
4038 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 4040 else
3992 Error_1 ("inexact->exact: not integral:", x); 4041 Error_1 ("inexact->exact: not integral:", x);
4042 }
3993 4043
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4044 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)))); 4045 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4046 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)))); 4047 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)))); 4048 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)))); 4049 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)))); 4050 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4051
4022 case OP_ATAN: 4052 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 4053 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4054 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 4055 else
4028 { 4056 {
4029 pointer y = cadr (SCHEME_V->args); 4057 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4058 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 4059 }
4033 4060
4034 case OP_SQRT: 4061 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4062 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 4063
4038 case OP_EXPT: 4064 case OP_EXPT:
4039 { 4065 {
4040 RVALUE result; 4066 RVALUE result;
4041 int real_result = 1; 4067 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4068 pointer y = cadr (args);
4043 4069
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4070 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4071 real_result = 0;
4048 4072
4049 /* This 'if' is an R5RS compatibility fix. */ 4073 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4074 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4075 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4076 result = 0;
4053 else 4077 else
4054 result = pow (rvalue (x), rvalue (y)); 4078 result = pow (rvalue (x), rvalue (y));
4055 4079
4056 /* Before returning integer result make sure we can. */ 4080 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4081 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4082 if (!real_result)
4059 { 4083 {
4060 long result_as_long = (long) result; 4084 long result_as_long = result;
4061 4085
4062 if (result != (RVALUE) result_as_long) 4086 if (result != result_as_long)
4063 real_result = 1; 4087 real_result = 1;
4064 } 4088 }
4065 4089
4066 if (real_result) 4090 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4091 s_return (mk_real (SCHEME_A_ result));
4068 else 4092 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4093 s_return (mk_integer (SCHEME_A_ result));
4070 } 4094 }
4071 4095
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4096 case OP_FLOOR: 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)))); 4097 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4098
4080 case OP_TRUNCATE: 4099 case OP_TRUNCATE:
4081 { 4100 {
4082 RVALUE rvalue_of_x; 4101 RVALUE n = rvalue (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))); 4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4103 }
4092 4104
4093 case OP_ROUND: 4105 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4106 if (is_integer (x))
4097 s_return (x); 4107 s_return (x);
4098 4108
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4110#endif
4101 4111
4102 case OP_ADD: /* + */ 4112 case OP_ADD: /* + */
4103 v = num_zero; 4113 v = num_zero;
4104 4114
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4115 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4116 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4117
4108 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4109 4119
4110 case OP_MUL: /* * */ 4120 case OP_MUL: /* * */
4111 v = num_one; 4121 v = num_one;
4112 4122
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4124 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4125
4116 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4117 4127
4118 case OP_SUB: /* - */ 4128 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4129 if (cdr (args) == NIL)
4120 { 4130 {
4121 x = SCHEME_V->args; 4131 x = args;
4122 v = num_zero; 4132 v = num_zero;
4123 } 4133 }
4124 else 4134 else
4125 { 4135 {
4126 x = cdr (SCHEME_V->args); 4136 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4137 v = nvalue (car (args));
4128 } 4138 }
4129 4139
4130 for (; x != NIL; x = cdr (x)) 4140 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4141 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4142
4133 s_return (mk_number (SCHEME_A_ v)); 4143 s_return (mk_number (SCHEME_A_ v));
4134 4144
4135 case OP_DIV: /* / */ 4145 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4146 if (cdr (args) == NIL)
4137 { 4147 {
4138 x = SCHEME_V->args; 4148 x = args;
4139 v = num_one; 4149 v = num_one;
4140 } 4150 }
4141 else 4151 else
4142 { 4152 {
4143 x = cdr (SCHEME_V->args); 4153 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4154 v = nvalue (car (args));
4145 } 4155 }
4146 4156
4147 for (; x != NIL; x = cdr (x)) 4157 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4158 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4159 v = num_div (v, nvalue (car (x)));
4151 else 4160 else
4152 Error_0 ("/: division by zero"); 4161 Error_0 ("/: division by zero");
4153 }
4154 4162
4155 s_return (mk_number (SCHEME_A_ v)); 4163 s_return (mk_number (SCHEME_A_ v));
4156 4164
4157 case OP_INTDIV: /* quotient */ 4165 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4166 if (cdr (args) == NIL)
4159 { 4167 {
4160 x = SCHEME_V->args; 4168 x = args;
4161 v = num_one; 4169 v = num_one;
4162 } 4170 }
4163 else 4171 else
4164 { 4172 {
4165 x = cdr (SCHEME_V->args); 4173 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4174 v = nvalue (car (args));
4167 } 4175 }
4168 4176
4169 for (; x != NIL; x = cdr (x)) 4177 for (; x != NIL; x = cdr (x))
4170 { 4178 {
4171 if (ivalue (car (x)) != 0) 4179 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4180 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4181 else
4174 Error_0 ("quotient: division by zero"); 4182 Error_0 ("quotient: division by zero");
4175 } 4183 }
4176 4184
4177 s_return (mk_number (SCHEME_A_ v)); 4185 s_return (mk_number (SCHEME_A_ v));
4178 4186
4179 case OP_REM: /* remainder */ 4187 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4188 v = nvalue (x);
4181 4189
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4190 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4191 v = num_rem (v, nvalue (cadr (args)));
4184 else 4192 else
4185 Error_0 ("remainder: division by zero"); 4193 Error_0 ("remainder: division by zero");
4186 4194
4187 s_return (mk_number (SCHEME_A_ v)); 4195 s_return (mk_number (SCHEME_A_ v));
4188 4196
4189 case OP_MOD: /* modulo */ 4197 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4198 v = nvalue (x);
4191 4199
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4200 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4201 v = num_mod (v, nvalue (cadr (args)));
4194 else 4202 else
4195 Error_0 ("modulo: division by zero"); 4203 Error_0 ("modulo: division by zero");
4196 4204
4197 s_return (mk_number (SCHEME_A_ v)); 4205 s_return (mk_number (SCHEME_A_ v));
4198 4206
4199 case OP_CAR: /* car */ 4207 /* the compiler will optimize this mess... */
4200 s_return (caar (SCHEME_V->args)); 4208 case OP_CAR: op_car: s_return (car (x));
4201 4209 case OP_CDR: op_cdr: s_return (cdr (x));
4202 case OP_CDR: /* cdr */ 4210 case OP_CAAR: op_caar: x = car (x); goto op_car;
4203 s_return (cdar (SCHEME_V->args)); 4211 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4212 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4213 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4214 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4215 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4216 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4217 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4218 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4219 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4220 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4221 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4222 case OP_CAAAAR: x = car (x); goto op_caaar;
4223 case OP_CAAADR: x = cdr (x); goto op_caaar;
4224 case OP_CAADAR: x = car (x); goto op_caadr;
4225 case OP_CAADDR: x = cdr (x); goto op_caadr;
4226 case OP_CADAAR: x = car (x); goto op_cadar;
4227 case OP_CADADR: x = cdr (x); goto op_cadar;
4228 case OP_CADDAR: x = car (x); goto op_caddr;
4229 case OP_CADDDR: x = cdr (x); goto op_caddr;
4230 case OP_CDAAAR: x = car (x); goto op_cdaar;
4231 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4232 case OP_CDADAR: x = car (x); goto op_cdadr;
4233 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4234 case OP_CDDAAR: x = car (x); goto op_cddar;
4235 case OP_CDDADR: x = cdr (x); goto op_cddar;
4236 case OP_CDDDAR: x = car (x); goto op_cdddr;
4237 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4204 4238
4205 case OP_CONS: /* cons */ 4239 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4240 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4241 s_return (args);
4208 4242
4209 case OP_SETCAR: /* set-car! */ 4243 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4244 if (!is_immutable (x))
4211 { 4245 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4246 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4247 s_return (car (args));
4214 } 4248 }
4215 else 4249 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4250 Error_0 ("set-car!: unable to alter immutable pair");
4217 4251
4218 case OP_SETCDR: /* set-cdr! */ 4252 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4253 if (!is_immutable (x))
4220 { 4254 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4255 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4256 s_return (car (args));
4223 } 4257 }
4224 else 4258 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4259 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4260
4227 case OP_CHAR2INT: /* char->integer */ 4261 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4262 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4263
4230 case OP_INT2CHAR: /* integer->char */ 4264 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4265 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4266
4233 case OP_CHARUPCASE: 4267 case OP_CHARUPCASE:
4234 { 4268 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4269 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4270 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4271 s_return (mk_character (SCHEME_A_ c));
4238 } 4272 }
4239 4273
4240 case OP_CHARDNCASE: 4274 case OP_CHARDNCASE:
4241 { 4275 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4276 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4277 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4278 s_return (mk_character (SCHEME_A_ c));
4245 } 4279 }
4246 4280
4247 case OP_STR2SYM: /* string->symbol */ 4281 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4282 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4283
4250 case OP_STR2ATOM: /* string->atom */ 4284 case OP_STR2ATOM: /* string->atom */
4251 { 4285 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4286 char *s = strvalue (x);
4253 long pf = 0; 4287 long pf = 0;
4254 4288
4255 if (cdr (SCHEME_V->args) != NIL) 4289 if (cdr (args) != NIL)
4256 { 4290 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4291 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4292 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4293 pf = ivalue_unchecked (cadr (args));
4260 4294
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4295 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4296 {
4263 /* base is OK */ 4297 /* base is OK */
4264 } 4298 }
4265 else 4299 else
4266 pf = -1; 4300 pf = -1;
4267 } 4301 }
4268 4302
4269 if (pf < 0) 4303 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4304 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4305 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4306 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4307 else
4274 { 4308 {
4275 if (pf == 0 || pf == 10) 4309 if (pf == 0 || pf == 10)
… …
4286 } 4320 }
4287 } 4321 }
4288 } 4322 }
4289 4323
4290 case OP_SYM2STR: /* symbol->string */ 4324 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4325 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4326 setimmutable (x);
4293 s_return (x); 4327 s_return (x);
4294 4328
4295 case OP_ATOM2STR: /* atom->string */ 4329 case OP_ATOM2STR: /* atom->string */
4296 { 4330 {
4297 long pf = 0; 4331 long pf = 0;
4298 4332
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4333 if (cdr (args) != NIL)
4302 { 4334 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4335 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4336 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4337 pf = ivalue_unchecked (cadr (args));
4306 4338
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4339 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4340 {
4309 /* base is OK */ 4341 /* base is OK */
4310 } 4342 }
4311 else 4343 else
4312 pf = -1; 4344 pf = -1;
4313 } 4345 }
4314 4346
4315 if (pf < 0) 4347 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4348 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4349 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4350 {
4319 char *p; 4351 char *p;
4320 int len; 4352 int len;
4321 4353
… …
4326 Error_1 ("atom->string: not an atom:", x); 4358 Error_1 ("atom->string: not an atom:", x);
4327 } 4359 }
4328 4360
4329 case OP_MKSTRING: /* make-string */ 4361 case OP_MKSTRING: /* make-string */
4330 { 4362 {
4331 int fill = ' '; 4363 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4364 int len = ivalue_unchecked (x);
4333 4365
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)); 4366 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4367 }
4341 4368
4342 case OP_STRLEN: /* string-length */ 4369 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4370 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4371
4345 case OP_STRREF: /* string-ref */ 4372 case OP_STRREF: /* string-ref */
4346 { 4373 {
4347 char *str; 4374 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4375 int index = ivalue_unchecked (cadr (args));
4353 4376
4354 if (index >= strlength (car (SCHEME_V->args))) 4377 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4378 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4379
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4380 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4381 }
4359 4382
4360 case OP_STRSET: /* string-set! */ 4383 case OP_STRSET: /* string-set! */
4361 { 4384 {
4362 char *str; 4385 char *str = strvalue (x);
4363 int index; 4386 int index = ivalue_unchecked (cadr (args));
4364 int c; 4387 int c;
4365 4388
4366 if (is_immutable (car (SCHEME_V->args))) 4389 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4390 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4391
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4392 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4393 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4394
4376 c = charvalue (caddr (SCHEME_V->args)); 4395 c = charvalue (caddr (args));
4377 4396
4378 str[index] = (char) c; 4397 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4398 s_return (car (args));
4380 } 4399 }
4381 4400
4382 case OP_STRAPPEND: /* string-append */ 4401 case OP_STRAPPEND: /* string-append */
4383 { 4402 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4403 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4404 int len = 0;
4386 pointer newstr; 4405 pointer newstr;
4387 char *pos; 4406 char *pos;
4388 4407
4389 /* compute needed length for new string */ 4408 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4409 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4410 len += strlength (car (x));
4392 4411
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4412 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4413
4395 /* store the contents of the argument strings into the new string */ 4414 /* 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)) 4415 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4416 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4417
4399 s_return (newstr); 4418 s_return (newstr);
4400 } 4419 }
4401 4420
4402 case OP_SUBSTR: /* substring */ 4421 case OP_SUBSTR: /* substring */
4403 { 4422 {
4404 char *str; 4423 char *str = strvalue (x);
4405 int index0; 4424 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4425 int index1;
4407 int len; 4426 int len;
4408 4427
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4428 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4429 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4430
4416 if (cddr (SCHEME_V->args) != NIL) 4431 if (cddr (args) != NIL)
4417 { 4432 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4433 index1 = ivalue_unchecked (caddr (args));
4419 4434
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4435 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4436 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4437 }
4423 else 4438 else
4424 index1 = strlength (car (SCHEME_V->args)); 4439 index1 = strlength (x);
4425 4440
4426 len = index1 - index0; 4441 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4442 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4443 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4444 strvalue (x)[len] = 0;
… …
4433 4448
4434 case OP_VECTOR: /* vector */ 4449 case OP_VECTOR: /* vector */
4435 { 4450 {
4436 int i; 4451 int i;
4437 pointer vec; 4452 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4453 int len = list_length (SCHEME_A_ args);
4439 4454
4440 if (len < 0) 4455 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4456 Error_1 ("vector: not a proper list:", args);
4442 4457
4443 vec = mk_vector (SCHEME_A_ len); 4458 vec = mk_vector (SCHEME_A_ len);
4444 4459
4445#if USE_ERROR_CHECKING 4460#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4461 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4462 s_return (S_SINK);
4448#endif 4463#endif
4449 4464
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4465 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4466 vector_set (vec, i, car (x));
4452 4467
4453 s_return (vec); 4468 s_return (vec);
4454 } 4469 }
4455 4470
4456 case OP_MKVECTOR: /* make-vector */ 4471 case OP_MKVECTOR: /* make-vector */
4457 { 4472 {
4458 pointer fill = NIL; 4473 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4474 pointer vec;
4475 int len = ivalue_unchecked (x);
4461 4476
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4477 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4478 fill = cadr (args);
4466 4479
4467 vec = mk_vector (SCHEME_A_ len); 4480 vec = mk_vector (SCHEME_A_ len);
4468 4481
4469#if USE_ERROR_CHECKING 4482#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4483 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4484 s_return (S_SINK);
4472#endif 4485#endif
4473 4486
4474 if (fill != NIL) 4487 if (fill != NIL)
4475 fill_vector (vec, fill); 4488 fill_vector (vec, 0, fill);
4476 4489
4477 s_return (vec); 4490 s_return (vec);
4478 } 4491 }
4479 4492
4480 case OP_VECLEN: /* vector-length */ 4493 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4494 s_return (mk_integer (SCHEME_A_ veclength (x)));
4495
4496 case OP_VECRESIZE:
4497 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4498 s_return (x);
4482 4499
4483 case OP_VECREF: /* vector-ref */ 4500 case OP_VECREF: /* vector-ref */
4484 { 4501 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4502 int index = ivalue_unchecked (cadr (args));
4488 4503
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4504 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4505 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4506
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4507 s_return (vector_get (x, index));
4493 } 4508 }
4494 4509
4495 case OP_VECSET: /* vector-set! */ 4510 case OP_VECSET: /* vector-set! */
4496 { 4511 {
4497 int index; 4512 int index = ivalue_unchecked (cadr (args));
4498 4513
4499 if (is_immutable (car (SCHEME_V->args))) 4514 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4515 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4516
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4517 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4518 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4519
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4520 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4521 s_return (x);
4509 } 4522 }
4510 } 4523 }
4511 4524
4512 return S_T; 4525 if (USE_ERROR_CHECKING) abort ();
4513} 4526}
4514 4527
4515INTERFACE int 4528static int
4516is_list (SCHEME_P_ pointer a) 4529opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4530{
4518 return list_length (SCHEME_A_ a) >= 0; 4531 pointer x = SCHEME_V->args;
4519}
4520 4532
4521/* Result is: 4533 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 { 4534 {
4535 num v = nvalue (car (x));
4536 x = cdr (x);
4537
4537 if (fast == NIL) 4538 if (x == NIL)
4538 return i; 4539 break;
4539 4540
4540 if (!is_pair (fast)) 4541 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4542
4543 fast = cdr (fast); 4543 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 { 4544 {
4561 /* the fast pointer has looped back around and caught up 4545 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4546 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4547 case OP_GRE: r = r > 0; break;
4564 return -1; 4548 case OP_LEQ: r = r <= 0; break;
4549 case OP_GEQ: r = r >= 0; break;
4565 } 4550 }
4566 }
4567}
4568 4551
4552 if (!r)
4553 s_return (S_F);
4554 }
4555
4556 s_return (S_T);
4557}
4558
4569static pointer 4559static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4560opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4561{
4572 pointer x; 4562 pointer args = SCHEME_V->args;
4573 num v; 4563 pointer a = car (args);
4574 int (*comp_func) (num, num); 4564 pointer d = cdr (args);
4565 int r;
4575 4566
4576 switch (op) 4567 switch (op)
4577 { 4568 {
4578 case OP_NOT: /* not */ 4569 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4570 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4571 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4572 case OP_NULLP: /* null? */ r = a == NIL ; break;
4573 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4574 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4575 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4576 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4577 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4578 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4579 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4580
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 4581#if USE_CHAR_CLASSIFIERS
4650 4582 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4583 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4584 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4585 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4586 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 4587#endif
4588
4666#if USE_PORTS 4589#if USE_PORTS
4667 4590 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? */ 4591 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? */ 4592 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4593#endif
4677 4594
4678 case OP_PROCP: /* procedure? */ 4595 case OP_PROCP: /* procedure? */
4679 4596
4680 /*-- 4597 /*--
4681 * continuation should be procedure by the example 4598 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4599 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4600 * in R^3 report sec. 6.9
4684 */ 4601 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4602 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))); 4603 break;
4687 4604
4688 case OP_PAIRP: /* pair? */ 4605 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4606 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4607 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4608 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4609 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4610 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 } 4611 }
4706 4612
4707 return S_T; 4613 s_retbool (r);
4708} 4614}
4709 4615
4710static pointer 4616static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4617opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4618{
4619 pointer args = SCHEME_V->args;
4620 pointer a = car (args);
4713 pointer x, y; 4621 pointer x, y;
4714 4622
4715 switch (op) 4623 switch (op)
4716 { 4624 {
4717 case OP_FORCE: /* force */ 4625 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4626 SCHEME_V->code = a;
4719 4627
4720 if (is_promise (SCHEME_V->code)) 4628 if (is_promise (SCHEME_V->code))
4721 { 4629 {
4722 /* Should change type to closure here */ 4630 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4631 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4726 } 4634 }
4727 else 4635 else
4728 s_return (SCHEME_V->code); 4636 s_return (SCHEME_V->code);
4729 4637
4730 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4731 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4732 s_return (SCHEME_V->value); 4640 s_return (SCHEME_V->value);
4733 4641
4734#if USE_PORTS 4642#if USE_PORTS
4735 4643
4736 case OP_WRITE: /* write */ 4644 case OP_WRITE: /* write */
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4652 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4653 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4654 }
4747 } 4655 }
4748 4656
4749 SCHEME_V->args = car (SCHEME_V->args); 4657 SCHEME_V->args = a;
4750 4658
4751 if (op == OP_WRITE) 4659 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4660 SCHEME_V->print_flag = 1;
4753 else 4661 else
4754 SCHEME_V->print_flag = 0; 4662 SCHEME_V->print_flag = 0;
4755 4663
4756 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
4757 4665
4758 case OP_NEWLINE: /* newline */ 4666 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4667 if (is_pair (args))
4760 { 4668 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4669 if (a != SCHEME_V->outport)
4762 { 4670 {
4763 x = cons (SCHEME_V->outport, NIL); 4671 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4672 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4673 SCHEME_V->outport = a;
4766 } 4674 }
4767 } 4675 }
4768 4676
4769 putstr (SCHEME_A_ "\n"); 4677 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4678 s_return (S_T);
4771#endif 4679#endif
4772 4680
4773 case OP_ERR0: /* error */ 4681 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4682 SCHEME_V->retcode = -1;
4775 4683
4776 if (!is_string (car (SCHEME_V->args))) 4684 if (!is_string (a))
4777 { 4685 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4686 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4687 setimmutable (car (args));
4780 } 4688 }
4781 4689
4782 putstr (SCHEME_A_ "Error: "); 4690 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4691 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4692 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4693 s_goto (OP_ERR1);
4786 4694
4787 case OP_ERR1: /* error */ 4695 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4696 putstr (SCHEME_A_ " ");
4789 4697
4790 if (SCHEME_V->args != NIL) 4698 if (args != NIL)
4791 { 4699 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4700 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4701 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4702 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4703 s_goto (OP_P0LIST);
4796 } 4704 }
4797 else 4705 else
4798 { 4706 {
4799 putstr (SCHEME_A_ "\n"); 4707 putstr (SCHEME_A_ "\n");
4800 4708
4801 if (SCHEME_V->interactive_repl) 4709 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4710 s_goto (OP_T0LVL);
4803 else 4711 else
4804 return NIL; 4712 return -1;
4805 } 4713 }
4806 4714
4807 case OP_REVERSE: /* reverse */ 4715 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4716 s_return (reverse (SCHEME_A_ a));
4809 4717
4810 case OP_LIST_STAR: /* list* */ 4718 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4719 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4720
4813 case OP_APPEND: /* append */ 4721 case OP_APPEND: /* append */
4814 x = NIL; 4722 x = NIL;
4815 y = SCHEME_V->args; 4723 y = args;
4816 4724
4817 if (y == x) 4725 if (y == x)
4818 s_return (x); 4726 s_return (x);
4819 4727
4820 /* cdr() in the while condition is not a typo. If car() */ 4728 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4739 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4740
4833#if USE_PLIST 4741#if USE_PLIST
4834 4742
4835 case OP_PUT: /* put */ 4743 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4744 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4745 Error_0 ("illegal use of put");
4838 4746
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4747 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4748 {
4841 if (caar (x) == y) 4749 if (caar (x) == y)
4842 break; 4750 break;
4843 } 4751 }
4844 4752
4845 if (x != NIL) 4753 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4754 cdar (x) = caddr (args);
4847 else 4755 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4756 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4757
4850 s_return (S_T); 4758 s_return (S_T);
4851 4759
4852 case OP_GET: /* get */ 4760 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4761 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4762 Error_0 ("illegal use of get");
4855 4763
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4764 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4765 if (caar (x) == y)
4858 break; 4766 break;
4859 4767
4860 if (x != NIL) 4768 if (x != NIL)
4861 s_return (cdar (x)); 4769 s_return (cdar (x));
… …
4863 s_return (NIL); 4771 s_return (NIL);
4864 4772
4865#endif /* USE_PLIST */ 4773#endif /* USE_PLIST */
4866 4774
4867 case OP_QUIT: /* quit */ 4775 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4776 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4777 SCHEME_V->retcode = ivalue (a);
4870 4778
4871 return NIL; 4779 return -1;
4872 4780
4873 case OP_GC: /* gc */ 4781 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4782 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4783 s_return (S_T);
4876 4784
4877 case OP_GCVERB: /* gc-verbose */ 4785 case OP_GCVERB: /* gc-verbose */
4878 { 4786 {
4879 int was = SCHEME_V->gc_verbose; 4787 int was = SCHEME_V->gc_verbose;
4880 4788
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4789 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4790 s_retbool (was);
4883 } 4791 }
4884 4792
4885 case OP_NEWSEGMENT: /* new-segment */ 4793 case OP_NEWSEGMENT: /* new-segment */
4794#if 0
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4795 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4796 Error_0 ("new-segment: argument must be a number");
4888 4797#endif
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4798 s_retbool (alloc_cellseg (SCHEME_A));
4890
4891 s_return (S_T);
4892 4799
4893 case OP_OBLIST: /* oblist */ 4800 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4801 s_return (oblist_all_symbols (SCHEME_A));
4895 4802
4896#if USE_PORTS 4803#if USE_PORTS
… …
4921 case OP_OPEN_INOUTFILE: 4828 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4829 prop = port_input | port_output;
4923 break; 4830 break;
4924 } 4831 }
4925 4832
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4833 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4834
4928 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4836 }
4933 4837
4934# if USE_STRING_PORTS 4838# if USE_STRING_PORTS
4935 4839
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4840 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4852 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4853 prop = port_input | port_output;
4950 break; 4854 break;
4951 } 4855 }
4952 4856
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4857 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4858 strvalue (a) + strlength (a), prop);
4955 4859
4956 if (p == NIL) 4860 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4861 }
4961 4862
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4863 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4864 {
4964 pointer p; 4865 pointer p;
4965 4866
4966 if (car (SCHEME_V->args) == NIL) 4867 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4868 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4869 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4870 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4871 strvalue (a) + strlength (a), port_output);
4977 4872
4978 if (p == NIL) 4873 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4874 }
4984 4875
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4876 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4877 {
4987 port *p; 4878 port *p = port (a);
4988 4879
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4880 if (p->kind & port_string)
4990 { 4881 {
4991 off_t size; 4882 off_t size;
4992 char *str; 4883 char *str;
4993 4884
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4885 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4901 }
5011 4902
5012# endif 4903# endif
5013 4904
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4905 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4906 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4907 s_return (S_T);
5017 4908
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4909 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4910 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4911 s_return (S_T);
5021#endif 4912#endif
5022 4913
5023 case OP_INT_ENV: /* interaction-environment */ 4914 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4915 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4917 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4918 s_return (SCHEME_V->envir);
5028 4919
5029 } 4920 }
5030 4921
5031 return S_T; 4922 if (USE_ERROR_CHECKING) abort ();
5032} 4923}
5033 4924
5034static pointer 4925static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4926opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4927{
4928 pointer args = SCHEME_V->args;
5037 pointer x; 4929 pointer x;
5038 4930
5039 if (SCHEME_V->nesting != 0) 4931 if (SCHEME_V->nesting != 0)
5040 { 4932 {
5041 int n = SCHEME_V->nesting; 4933 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4940 switch (op)
5049 { 4941 {
5050 /* ========== reading part ========== */ 4942 /* ========== reading part ========== */
5051#if USE_PORTS 4943#if USE_PORTS
5052 case OP_READ: 4944 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4945 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4946 s_goto (OP_READ_INTERNAL);
5055 4947
5056 if (!is_inport (car (SCHEME_V->args))) 4948 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4949 Error_1 ("read: not an input port:", car (args));
5058 4950
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4951 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
5061 4953
5062 x = SCHEME_V->inport; 4954 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4955 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4956 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4957 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
5067 4959
5068 case OP_READ_CHAR: /* read-char */ 4960 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4961 case OP_PEEK_CHAR: /* peek-char */
5070 { 4962 {
5071 int c; 4963 int c;
5072 4964
5073 if (is_pair (SCHEME_V->args)) 4965 if (is_pair (args))
5074 { 4966 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4967 if (car (args) != SCHEME_V->inport)
5076 { 4968 {
5077 x = SCHEME_V->inport; 4969 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4970 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4971 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4972 SCHEME_V->inport = car (args);
5081 } 4973 }
5082 } 4974 }
5083 4975
5084 c = inchar (SCHEME_A); 4976 c = inchar (SCHEME_A);
5085 4977
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4987 case OP_CHAR_READY: /* char-ready? */
5096 { 4988 {
5097 pointer p = SCHEME_V->inport; 4989 pointer p = SCHEME_V->inport;
5098 int res; 4990 int res;
5099 4991
5100 if (is_pair (SCHEME_V->args)) 4992 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4993 p = car (args);
5102 4994
5103 res = p->object.port->kind & port_string; 4995 res = port (p)->kind & port_string;
5104 4996
5105 s_retbool (res); 4997 s_retbool (res);
5106 } 4998 }
5107 4999
5108 case OP_SET_INPORT: /* set-input-port */ 5000 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 5001 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 5002 s_return (SCHEME_V->value);
5111 5003
5112 case OP_SET_OUTPORT: /* set-output-port */ 5004 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 5005 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 5006 s_return (SCHEME_V->value);
5115#endif 5007#endif
5116 5008
5117 case OP_RDSEXPR: 5009 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 5010 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5059 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5060 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5061 s_goto (OP_RDSEXPR);
5170 5062
5171 case TOK_ATOM: 5063 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5064 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5065
5066 case TOK_DOTATOM:
5067 SCHEME_V->strbuff[0] = '.';
5068 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5069
5070 case TOK_STRATOM:
5071 x = readstrexp (SCHEME_A_ '|');
5072 //TODO: haven't checked whether the garbage collector could interfere
5073 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5074
5174 case TOK_DQUOTE: 5075 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5076 x = readstrexp (SCHEME_A_ '"');
5176 5077
5177 if (x == S_F) 5078 if (x == S_F)
5178 Error_0 ("Error reading string"); 5079 Error_0 ("Error reading string");
5179 5080
5180 setimmutable (x); 5081 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 5093 s_goto (OP_EVAL);
5193 } 5094 }
5194 } 5095 }
5195 5096
5196 case TOK_SHARP_CONST: 5097 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5098 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5099 Error_0 ("undefined sharp expression");
5199 else 5100 else
5200 s_return (x); 5101 s_return (x);
5201 5102
5202 default: 5103 default:
… …
5204 } 5105 }
5205 5106
5206 break; 5107 break;
5207 5108
5208 case OP_RDLIST: 5109 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5110 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5111 SCHEME_V->tok = token (SCHEME_A);
5211 5112
5212 switch (SCHEME_V->tok) 5113 switch (SCHEME_V->tok)
5213 { 5114 {
5214 case TOK_EOF: 5115 case TOK_EOF:
… …
5242 case OP_RDDOT: 5143 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5144 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5145 Error_0 ("syntax error: illegal dot expression");
5245 5146
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5147 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5148 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5149
5249 case OP_RDQUOTE: 5150 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5151 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5152
5252 case OP_RDQQUOTE: 5153 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5175 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5176 s_goto (OP_VECTOR);
5276 5177
5277 /* ========== printing part ========== */ 5178 /* ========== printing part ========== */
5278 case OP_P0LIST: 5179 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5180 if (is_vector (args))
5280 { 5181 {
5281 putstr (SCHEME_A_ "#("); 5182 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5183 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5184 s_goto (OP_PVECFROM);
5284 } 5185 }
5285 else if (is_environment (SCHEME_V->args)) 5186 else if (is_environment (args))
5286 { 5187 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5188 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5189 s_return (S_T);
5289 } 5190 }
5290 else if (!is_pair (SCHEME_V->args)) 5191 else if (!is_pair (args))
5291 { 5192 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5193 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5194 s_return (S_T);
5294 } 5195 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5196 else
5296 { 5197 {
5198 pointer a = car (args);
5199 pointer b = cdr (args);
5200 int ok_abbr = ok_abbrev (b);
5201 SCHEME_V->args = car (b);
5202
5203 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5204 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5205 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5206 putstr (SCHEME_A_ "`");
5207 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5208 putstr (SCHEME_A_ ",");
5209 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5210 putstr (SCHEME_A_ ",@");
5211 else
5212 {
5213 putstr (SCHEME_A_ "(");
5214 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5215 SCHEME_V->args = a;
5216 }
5217
5299 s_goto (OP_P0LIST); 5218 s_goto (OP_P0LIST);
5300 } 5219 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5220
5221 case OP_P1LIST:
5222 if (is_pair (args))
5302 { 5223 {
5224 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5225 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5226 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5306 } 5228 }
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)) 5229 else if (is_vector (args))
5336 { 5230 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5231 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5232 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5340 } 5234 }
5341 else 5235 else
5342 { 5236 {
5343 if (SCHEME_V->args != NIL) 5237 if (args != NIL)
5344 { 5238 {
5345 putstr (SCHEME_A_ " . "); 5239 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5240 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5241 }
5348 5242
5349 putstr (SCHEME_A_ ")"); 5243 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5244 s_return (S_T);
5351 } 5245 }
5352 5246
5353 case OP_PVECFROM: 5247 case OP_PVECFROM:
5354 { 5248 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5249 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5250 pointer vec = car (args);
5357 int len = veclength (vec); 5251 int len = veclength (vec);
5358 5252
5359 if (i == len) 5253 if (i == len)
5360 { 5254 {
5361 putstr (SCHEME_A_ ")"); 5255 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5256 s_return (S_T);
5363 } 5257 }
5364 else 5258 else
5365 { 5259 {
5366 pointer elem = vector_elem (vec, i); 5260 pointer elem = vector_get (vec, i);
5367 5261
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5262 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5264 SCHEME_V->args = elem;
5371 5265
5372 if (i > 0) 5266 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5267 putstr (SCHEME_A_ " ");
5374 5268
5375 s_goto (OP_P0LIST); 5269 s_goto (OP_P0LIST);
5376 } 5270 }
5377 } 5271 }
5378 } 5272 }
5379 5273
5380 return S_T; 5274 if (USE_ERROR_CHECKING) abort ();
5381} 5275}
5382 5276
5383static pointer 5277static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5278opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5279{
5280 pointer args = SCHEME_V->args;
5281 pointer a = car (args);
5386 pointer x, y; 5282 pointer x, y;
5387 5283
5388 switch (op) 5284 switch (op)
5389 { 5285 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5286 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5287 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5288 long v = list_length (SCHEME_A_ a);
5393 5289
5394 if (v < 0) 5290 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5291 Error_1 ("length: not a list:", a);
5396 5292
5397 s_return (mk_integer (SCHEME_A_ v)); 5293 s_return (mk_integer (SCHEME_A_ v));
5398 } 5294 }
5399 5295
5400 case OP_ASSQ: /* assq *//* a.k */ 5296 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5297 x = a;
5402 5298
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5299 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5300 {
5405 if (!is_pair (car (y))) 5301 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5302 Error_0 ("unable to handle non pair element");
5407 5303
5408 if (x == caar (y)) 5304 if (x == caar (y))
… …
5414 else 5310 else
5415 s_return (S_F); 5311 s_return (S_F);
5416 5312
5417 5313
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5314 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5315 SCHEME_V->args = a;
5420 5316
5421 if (SCHEME_V->args == NIL) 5317 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5318 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5319 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5320 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5429 5325
5430 case OP_CLOSUREP: /* closure? */ 5326 case OP_CLOSUREP: /* closure? */
5431 /* 5327 /*
5432 * Note, macro object is also a closure. 5328 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5329 * Therefore, (closure? <#MACRO>) ==> #t
5330 * (schmorp) well, obviously not, fix? TODO
5434 */ 5331 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5332 s_retbool (is_closure (a));
5436 5333
5437 case OP_MACROP: /* macro? */ 5334 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5335 s_retbool (is_macro (a));
5439 } 5336 }
5440 5337
5441 return S_T; /* NOTREACHED */ 5338 if (USE_ERROR_CHECKING) abort ();
5442} 5339}
5443 5340
5341/* 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); 5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5343
5446typedef int (*test_predicate) (pointer); 5344typedef int (*test_predicate)(pointer);
5447static int 5345static int
5448is_any (pointer p) 5346tst_any (pointer p)
5449{ 5347{
5450 return 1; 5348 return 1;
5451} 5349}
5452 5350
5453static int 5351static int
5454is_nonneg (pointer p) 5352tst_inonneg (pointer p)
5455{ 5353{
5456 return ivalue (p) >= 0 && is_integer (p); 5354 return is_integer (p) && ivalue_unchecked (p) >= 0;
5355}
5356
5357static int
5358tst_is_list (SCHEME_P_ pointer p)
5359{
5360 return p == NIL || is_pair (p);
5457} 5361}
5458 5362
5459/* Correspond carefully with following defines! */ 5363/* Correspond carefully with following defines! */
5460static struct 5364static struct
5461{ 5365{
5462 test_predicate fct; 5366 test_predicate fct;
5463 const char *kind; 5367 const char *kind;
5464} tests[] = 5368} tests[] = {
5465{ 5369 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5370 { is_string , "string" },
5467 { is_any, 0}, 5371 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5372 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5373 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5374 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5375 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5376 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5377 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5378 { is_character , "character" },
5477 { is_vector, "vector" }, 5379 { is_vector , "vector" },
5478 { is_number, "number" }, 5380 { is_number , "number" },
5479 { is_integer, "integer" }, 5381 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5382 { tst_inonneg , "non-negative integer" }
5481}; 5383};
5482 5384
5483#define TST_NONE 0 5385#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5386#define TST_ANY "\001"
5485#define TST_STRING "\002" 5387#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5388#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5389#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5390#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5391#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5392#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5393#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5394#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5395#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5396#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5397#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5398#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5399#define TST_NATURAL "\016"
5400
5401#define INF_ARG 0xff
5402#define UNNAMED_OP ""
5403
5404static const char opnames[] =
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5406#include "opdefines.h"
5407#undef OP_DEF
5408;
5409
5410static const char *
5411opname (int idx)
5412{
5413 const char *name = opnames;
5414
5415 /* should do this at compile time, but would require external program, right? */
5416 while (idx--)
5417 name += strlen (name) + 1;
5418
5419 return *name ? name : "ILLEGAL";
5420}
5421
5422static const char *
5423procname (pointer x)
5424{
5425 return opname (procnum (x));
5426}
5498 5427
5499typedef struct 5428typedef struct
5500{ 5429{
5501 dispatch_func func; 5430 uint8_t func;
5502 char *name; 5431 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5432 uint8_t builtin;
5433#if USE_ERROR_CHECKING
5503 int min_arity; 5434 uint8_t min_arity;
5504 int max_arity; 5435 uint8_t max_arity;
5505 char *arg_tests_encoding; 5436 char arg_tests_encoding[3];
5437#endif
5506} op_code_info; 5438} op_code_info;
5507 5439
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5440static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5441#if USE_ERROR_CHECKING
5442#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5443#else
5444#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5445#endif
5512#include "opdefines.h" 5446#include "opdefines.h"
5447#undef OP_DEF
5513 {0} 5448 {0}
5514}; 5449};
5515 5450
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 */ 5451/* kernel of this interpreter */
5529static void 5452static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5454{
5532 SCHEME_V->op = op; 5455 SCHEME_V->op = op;
5533 5456
5534 for (;;) 5457 for (;;)
5535 { 5458 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5459 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5460
5538#if USE_ERROR_CHECKING 5461#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5462 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5463 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5464 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5465 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5466
5545 /* Check number of arguments */ 5467 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5468 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5469 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5470 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5471 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5472 xError_1 (SCHEME_A_ msg, 0);
5473 continue;
5551 } 5474 }
5552 5475 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5476 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5477 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5478 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5479 xError_1 (SCHEME_A_ msg, 0);
5480 continue;
5558 } 5481 }
5559 5482 else
5560 if (ok)
5561 { 5483 {
5562 if (pcd->arg_tests_encoding) 5484 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5485 {
5564 int i = 0; 5486 int i = 0;
5565 int j; 5487 int j;
5566 const char *t = pcd->arg_tests_encoding; 5488 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5489 pointer arglist = SCHEME_V->args;
5568 5490
5569 do 5491 do
5570 { 5492 {
5571 pointer arg = car (arglist); 5493 pointer arg = car (arglist);
5572 5494
5573 j = (int) t[0]; 5495 j = t[0];
5574 5496
5497 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5498 if (j == TST_LIST[0])
5576 { 5499 {
5577 if (arg != NIL && !is_pair (arg)) 5500 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5501 break;
5579 } 5502 }
5580 else 5503 else
5581 { 5504 {
5582 if (!tests[j].fct (arg)) 5505 if (!tests[j - 1].fct (arg))
5583 break; 5506 break;
5584 } 5507 }
5585 5508
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5509 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5510 t++;
5588 5511
5589 arglist = cdr (arglist); 5512 arglist = cdr (arglist);
5590 i++; 5513 i++;
5591 } 5514 }
5592 while (i < n); 5515 while (i < n);
5593 5516
5594 if (i < n) 5517 if (i < n)
5595 { 5518 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5519 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5520 xError_1 (SCHEME_A_ msg, 0);
5521 continue;
5598 } 5522 }
5599 } 5523 }
5600 } 5524 }
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 } 5525 }
5610#endif 5526#endif
5611 5527
5612 ok_to_freely_gc (SCHEME_A); 5528 ok_to_freely_gc (SCHEME_A);
5613 5529
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5530 static const dispatch_func dispatch_funcs[] = {
5531 opexe_0,
5532 opexe_1,
5533 opexe_2,
5534 opexe_3,
5535 opexe_4,
5536 opexe_5,
5537 opexe_6,
5538 };
5539
5540 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5541 return;
5616 5542
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5543 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5544 {
5619 xwrstr ("No memory!\n"); 5545 putstr (SCHEME_A_ "No memory!\n");
5620 return; 5546 return;
5621 } 5547 }
5622 } 5548 }
5623} 5549}
5624 5550
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5569mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5570{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5571 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5572 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5573 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5574 return y;
5650} 5575}
5651 5576
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5577/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5578static int
5654syntaxnum (pointer p) 5579syntaxnum (pointer p)
5655{ 5580{
5656 const char *s = strvalue (car (p)); 5581 const char *s = strvalue (p);
5657 5582
5658 switch (strlength (car (p))) 5583 switch (strlength (p))
5659 { 5584 {
5660 case 2: 5585 case 2:
5661 if (s[0] == 'i') 5586 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5587 return OP_IF0; /* if */
5663 else 5588 else
… …
5677 5602
5678 case 'd': 5603 case 'd':
5679 return OP_COND0; /* cond */ 5604 return OP_COND0; /* cond */
5680 5605
5681 case '*': 5606 case '*':
5682 return OP_LET0AST; /* let* */ 5607 return OP_LET0AST;/* let* */
5683 5608
5684 default: 5609 default:
5685 return OP_SET0; /* set! */ 5610 return OP_SET0; /* set! */
5686 } 5611 }
5687 5612
… …
5709 5634
5710 case 'f': 5635 case 'f':
5711 return OP_DEF0; /* define */ 5636 return OP_DEF0; /* define */
5712 5637
5713 default: 5638 default:
5714 return OP_LET0REC; /* letrec */ 5639 return OP_LET0REC;/* letrec */
5715 } 5640 }
5716 5641
5717 default: 5642 default:
5718 return OP_C0STREAM; /* cons-stream */ 5643 return OP_C0STREAM; /* cons-stream */
5719 } 5644 }
5720} 5645}
5721 5646
5722#if USE_MULTIPLICITY 5647#if USE_MULTIPLICITY
5723scheme * 5648ecb_cold scheme *
5724scheme_init_new () 5649scheme_init_new ()
5725{ 5650{
5726 scheme *sc = malloc (sizeof (scheme)); 5651 scheme *sc = malloc (sizeof (scheme));
5727 5652
5728 if (!scheme_init (SCHEME_A)) 5653 if (!scheme_init (SCHEME_A))
… …
5733 else 5658 else
5734 return sc; 5659 return sc;
5735} 5660}
5736#endif 5661#endif
5737 5662
5738int 5663ecb_cold int
5739scheme_init (SCHEME_P) 5664scheme_init (SCHEME_P)
5740{ 5665{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5666 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5667 pointer x;
5668
5669 /* this memset is not strictly correct, as we assume (intcache)
5670 * that memset 0 will also set pointers to 0, but memset does
5671 * of course not guarantee that. screw such systems.
5672 */
5673 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5743 5674
5744 num_set_fixnum (num_zero, 1); 5675 num_set_fixnum (num_zero, 1);
5745 num_set_ivalue (num_zero, 0); 5676 num_set_ivalue (num_zero, 0);
5746 num_set_fixnum (num_one, 1); 5677 num_set_fixnum (num_one, 1);
5747 num_set_ivalue (num_one, 1); 5678 num_set_ivalue (num_one, 1);
… …
5759 SCHEME_V->save_inport = NIL; 5690 SCHEME_V->save_inport = NIL;
5760 SCHEME_V->loadport = NIL; 5691 SCHEME_V->loadport = NIL;
5761 SCHEME_V->nesting = 0; 5692 SCHEME_V->nesting = 0;
5762 SCHEME_V->interactive_repl = 0; 5693 SCHEME_V->interactive_repl = 0;
5763 5694
5764 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5695 if (!alloc_cellseg (SCHEME_A))
5765 { 5696 {
5766#if USE_ERROR_CHECKING 5697#if USE_ERROR_CHECKING
5767 SCHEME_V->no_memory = 1; 5698 SCHEME_V->no_memory = 1;
5768 return 0; 5699 return 0;
5769#endif 5700#endif
… …
5816 5747
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5748 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5749 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5750 }
5820 5751
5752 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5753 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5754 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5755 assign_proc (SCHEME_A_ i, opname (i));
5824 5756
5825 /* initialization of global pointers to special symbols */ 5757 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5758 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5759 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5760 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5799scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5800{
5869 SCHEME_V->ext_data = p; 5801 SCHEME_V->ext_data = p;
5870} 5802}
5871 5803
5872void 5804ecb_cold void
5873scheme_deinit (SCHEME_P) 5805scheme_deinit (SCHEME_P)
5874{ 5806{
5875 int i; 5807 int i;
5876 5808
5877#if SHOW_ERROR_LINE 5809#if SHOW_ERROR_LINE
… …
5969{ 5901{
5970 dump_stack_reset (SCHEME_A); 5902 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5903 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5904 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5905 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 */ 5906 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); 5907 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; 5908 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5909#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5910 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5911#endif
5980 SCHEME_V->retcode = 0; 5912 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5913 SCHEME_V->interactive_repl = 0;
… …
6098# endif 6030# endif
6099 int fin; 6031 int fin;
6100 char *file_name = InitFile; 6032 char *file_name = InitFile;
6101 int retcode; 6033 int retcode;
6102 int isfile = 1; 6034 int isfile = 1;
6035 system ("ps v $PPID");//D
6103 6036
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6037 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 6038 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6108 xwrstr ("followed by\n"); 6041 putstr (SCHEME_A_ "followed by\n");
6109 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6042 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6110 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6043 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6111 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6044 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6112 xwrstr ("Use - as filename for stdin.\n"); 6045 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6113 return 1; 6046 return 1;
6114 } 6047 }
6115 6048
6116 if (!scheme_init (SCHEME_A)) 6049 if (!scheme_init (SCHEME_A))
6117 { 6050 {
6118 xwrstr ("Could not initialize!\n"); 6051 putstr (SCHEME_A_ "Could not initialize!\n");
6119 return 2; 6052 return 2;
6120 } 6053 }
6121 6054
6122# if USE_PORTS 6055# if USE_PORTS
6123 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6056 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6168 fin = open (file_name, O_RDONLY); 6101 fin = open (file_name, O_RDONLY);
6169#endif 6102#endif
6170 6103
6171 if (isfile && fin < 0) 6104 if (isfile && fin < 0)
6172 { 6105 {
6173 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6106 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6174 } 6107 }
6175 else 6108 else
6176 { 6109 {
6177 if (isfile) 6110 if (isfile)
6178 scheme_load_named_file (SCHEME_A_ fin, file_name); 6111 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6182#if USE_PORTS 6115#if USE_PORTS
6183 if (!isfile || fin != STDIN_FILENO) 6116 if (!isfile || fin != STDIN_FILENO)
6184 { 6117 {
6185 if (SCHEME_V->retcode != 0) 6118 if (SCHEME_V->retcode != 0)
6186 { 6119 {
6187 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6120 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6188 } 6121 }
6189 6122
6190 if (isfile) 6123 if (isfile)
6191 close (fin); 6124 close (fin);
6192 } 6125 }

Diff Legend

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