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

Diff Legend

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