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.13 by root, Thu Nov 26 07:59:42 2015 UTC vs.
Revision 1.54 by root, Tue Dec 1 02:42:35 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
222/* num, for generic arithmetic */
223struct num
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
213static num num_op (char op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
214static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
215static num num_rem (num a, num b); 252static num num_rem (num a, num b);
216static num num_mod (num a, num b); 253static num num_mod (num a, num b);
217static int num_eq (num a, num b);
218static int num_gt (num a, num b);
219static int num_ge (num a, num b);
220static int num_lt (num a, num b);
221static int num_le (num a, num b);
222 254
223#if USE_MATH
224static double round_per_R5RS (double x);
225#endif
226static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 256
234static num num_zero; 257static num num_zero;
235static num num_one; 258static num num_one;
236 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
237/* macros for cell operations */ 264/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
241 268
242INTERFACE INLINE int 269INTERFACE int
243is_string (pointer p) 270is_string (pointer p)
244{ 271{
245 return type (p) == T_STRING; 272 return type (p) == T_STRING;
246} 273}
247 274
248#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
250 277
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 278INTERFACE int
253is_vector (pointer p) 279is_vector (pointer p)
254{ 280{
255 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
256} 282}
257 283
258#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 289
265INTERFACE uint32_t 290INTERFACE int
266vector_length (pointer vec) 291is_integer (pointer p)
267{ 292{
268 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
269} 294}
270 295
296/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
301}
302
303INTERFACE int
272is_number (pointer p) 304is_number (pointer p)
273{ 305{
274 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
275} 307}
276 308
277INTERFACE INLINE int 309INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 310is_character (pointer p)
297{ 311{
298 return type (p) == T_CHARACTER; 312 return type (p) == T_CHARACTER;
299} 313}
300 314
301INTERFACE INLINE char * 315INTERFACE char *
302string_value (pointer p) 316string_value (pointer p)
303{ 317{
304 return strvalue (p); 318 return strvalue (p);
305} 319}
306 320
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
338#if USE_REAL 324#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 327#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
344# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 330#endif
331
347INTERFACE long 332INTERFACE long
348charvalue (pointer p) 333charvalue (pointer p)
349{ 334{
350 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
351} 336}
352 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
353INTERFACE INLINE int 340INTERFACE int
354is_port (pointer p) 341is_port (pointer p)
355{ 342{
356 return type (p) == T_PORT; 343 return type (p) == T_PORT;
357} 344}
358 345
359INTERFACE INLINE int 346INTERFACE int
360is_inport (pointer p) 347is_inport (pointer p)
361{ 348{
362 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
363} 350}
364 351
365INTERFACE INLINE int 352INTERFACE int
366is_outport (pointer p) 353is_outport (pointer p)
367{ 354{
368 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
369} 356}
370 357
371INTERFACE INLINE int 358INTERFACE int
372is_pair (pointer p) 359is_pair (pointer p)
373{ 360{
374 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
375} 362}
376 363
377#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
378#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
379 366
380static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
381static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
382static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
383static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
387static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
388 375
389INTERFACE void 376INTERFACE void
390set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
391{ 378{
392 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
393} 380}
394 381
395INTERFACE void 382INTERFACE void
396set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
397{ 384{
398 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
399} 386}
400 387
401INTERFACE pointer 388INTERFACE pointer
402pair_car (pointer p) 389pair_car (pointer p)
403{ 390{
… …
408pair_cdr (pointer p) 395pair_cdr (pointer p)
409{ 396{
410 return cdr (p); 397 return cdr (p);
411} 398}
412 399
413INTERFACE INLINE int 400INTERFACE int
414is_symbol (pointer p) 401is_symbol (pointer p)
415{ 402{
416 return type (p) == T_SYMBOL; 403 return type (p) == T_SYMBOL;
417} 404}
418 405
419INTERFACE INLINE char * 406INTERFACE char *
420symname (pointer p) 407symname (pointer p)
421{ 408{
422 return strvalue (car (p)); 409 return strvalue (p);
423} 410}
424 411
425#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
427hasprop (pointer p) 416hasprop (pointer p)
428{ 417{
429 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
430} 419}
431
432# define symprop(p) cdr(p)
433#endif 420#endif
434 421
435INTERFACE INLINE int 422INTERFACE int
436is_syntax (pointer p) 423is_syntax (pointer p)
437{ 424{
438 return typeflag (p) & T_SYNTAX; 425 return typeflag (p) & T_SYNTAX;
439} 426}
440 427
441INTERFACE INLINE int 428INTERFACE int
442is_proc (pointer p) 429is_proc (pointer p)
443{ 430{
444 return type (p) == T_PROC; 431 return type (p) == T_PROC;
445} 432}
446 433
447INTERFACE INLINE int 434INTERFACE int
448is_foreign (pointer p) 435is_foreign (pointer p)
449{ 436{
450 return type (p) == T_FOREIGN; 437 return type (p) == T_FOREIGN;
451} 438}
452 439
453INTERFACE INLINE char * 440INTERFACE char *
454syntaxname (pointer p) 441syntaxname (pointer p)
455{ 442{
456 return strvalue (car (p)); 443 return strvalue (p);
457} 444}
458 445
459#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 447static const char *procname (pointer x);
461 448
462INTERFACE INLINE int 449INTERFACE int
463is_closure (pointer p) 450is_closure (pointer p)
464{ 451{
465 return type (p) == T_CLOSURE; 452 return type (p) == T_CLOSURE;
466} 453}
467 454
468INTERFACE INLINE int 455INTERFACE int
469is_macro (pointer p) 456is_macro (pointer p)
470{ 457{
471 return type (p) == T_MACRO; 458 return type (p) == T_MACRO;
472} 459}
473 460
474INTERFACE INLINE pointer 461INTERFACE pointer
475closure_code (pointer p) 462closure_code (pointer p)
476{ 463{
477 return car (p); 464 return car (p);
478} 465}
479 466
480INTERFACE INLINE pointer 467INTERFACE pointer
481closure_env (pointer p) 468closure_env (pointer p)
482{ 469{
483 return cdr (p); 470 return cdr (p);
484} 471}
485 472
486INTERFACE INLINE int 473INTERFACE int
487is_continuation (pointer p) 474is_continuation (pointer p)
488{ 475{
489 return type (p) == T_CONTINUATION; 476 return type (p) == T_CONTINUATION;
490} 477}
491 478
492#define cont_dump(p) cdr (p) 479#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 480#define set_cont_dump(p,v) set_cdr ((p), (v))
494 481
495/* To do: promise should be forced ONCE only */ 482/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 483INTERFACE int
497is_promise (pointer p) 484is_promise (pointer p)
498{ 485{
499 return type (p) == T_PROMISE; 486 return type (p) == T_PROMISE;
500} 487}
501 488
502INTERFACE INLINE int 489INTERFACE int
503is_environment (pointer p) 490is_environment (pointer p)
504{ 491{
505 return type (p) == T_ENVIRONMENT; 492 return type (p) == T_ENVIRONMENT;
506} 493}
507 494
… …
513 500
514#define is_mark(p) (typeflag (p) & T_MARK) 501#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 504
518INTERFACE INLINE int 505INTERFACE int
519is_immutable (pointer p) 506is_immutable (pointer p)
520{ 507{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 509}
523 510
524INTERFACE INLINE void 511INTERFACE void
525setimmutable (pointer p) 512setimmutable (pointer p)
526{ 513{
527#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 516#endif
530} 517}
531 518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
571}
572
532#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
533static INLINE int 574ecb_inline int
534Cisalpha (int c) 575Cisalpha (int c)
535{ 576{
536 return isascii (c) && isalpha (c); 577 return isascii (c) && isalpha (c);
537} 578}
538 579
539static INLINE int 580ecb_inline int
540Cisdigit (int c) 581Cisdigit (int c)
541{ 582{
542 return isascii (c) && isdigit (c); 583 return isascii (c) && isdigit (c);
543} 584}
544 585
545static INLINE int 586ecb_inline int
546Cisspace (int c) 587Cisspace (int c)
547{ 588{
548 return isascii (c) && isspace (c); 589 return isascii (c) && isspace (c);
549} 590}
550 591
551static INLINE int 592ecb_inline int
552Cisupper (int c) 593Cisupper (int c)
553{ 594{
554 return isascii (c) && isupper (c); 595 return isascii (c) && isupper (c);
555} 596}
556 597
557static INLINE int 598ecb_inline int
558Cislower (int c) 599Cislower (int c)
559{ 600{
560 return isascii (c) && islower (c); 601 return isascii (c) && islower (c);
561} 602}
562#endif 603#endif
… …
623#endif 664#endif
624 665
625static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 691static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 699static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
713static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
677static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
678static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
679static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
680static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
681 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
682static num 751static num
683num_op (char op, num a, num b) 752num_op (enum num_op op, num a, num b)
684{ 753{
685 num ret; 754 num ret;
686 755
687 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
688 757
689 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
690 { 759 {
691 IVALUE av = num_get_ivalue (a);
692 IVALUE bv = num_get_ivalue (b);
693
694 switch (op) 760 switch (op)
695 { 761 {
696 case '+': av += bv; break; 762 case NUM_ADD: a.ivalue += b.ivalue; break;
697 case '-': av -= bv; break; 763 case NUM_SUB: a.ivalue -= b.ivalue; break;
698 case '*': av *= bv; break; 764 case NUM_MUL: a.ivalue *= b.ivalue; break;
699 case '/': av /= bv; break; 765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
700 } 766 }
701 767
702 num_set_ivalue (ret, av); 768 num_set_ivalue (ret, a.ivalue);
703 } 769 }
770#if USE_REAL
704 else 771 else
705 { 772 {
706 RVALUE av = num_get_rvalue (a);
707 RVALUE bv = num_get_rvalue (b);
708
709 switch (op) 773 switch (op)
710 { 774 {
711 case '+': av += bv; break; 775 case NUM_ADD: a.rvalue += b.rvalue; break;
712 case '-': av -= bv; break; 776 case NUM_SUB: a.rvalue -= b.rvalue; break;
713 case '*': av *= bv; break; 777 case NUM_MUL: a.rvalue *= b.rvalue; break;
714 case '/': av /= bv; break; 778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
715 } 779 }
716 780
717 num_set_rvalue (ret, av); 781 num_set_rvalue (ret, a.rvalue);
718 } 782 }
783#endif
719 784
720 return ret; 785 return ret;
721} 786}
722 787
723static num 788static num
724num_div (num a, num b) 789num_div (num a, num b)
725{ 790{
726 num ret; 791 num ret;
727 792
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
729 794
730 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
732 else 797 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
734 799
735 return ret; 800 return ret;
736} 801}
737 802
738static num 803static num
… …
740{ 805{
741 num ret; 806 num ret;
742 long e1, e2, res; 807 long e1, e2, res;
743 808
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
746 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
747 res = e1 % e2; 812 res = e1 % e2;
748 813
749 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
750 if (res > 0) 815 if (res > 0)
751 { 816 {
… …
767{ 832{
768 num ret; 833 num ret;
769 long e1, e2, res; 834 long e1, e2, res;
770 835
771 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
772 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
773 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
774 res = e1 % e2; 839 res = e1 % e2;
775 840
776 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
777 if (res * e2 < 0) 842 if (res * e2 < 0)
778 res += e2; 843 res += e2;
779 844
780 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
781 return ret; 846 return ret;
782} 847}
783 848
849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
784static int 850static int
785num_eq (num a, num b) 851num_cmp (num a, num b)
786{ 852{
853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 854 int ret;
788 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
789 855
790 if (is_fixnum) 856 if (is_fixnum)
791 ret = num_get_ivalue (a) == num_get_ivalue (b); 857 {
858 IVALUE av = num_ivalue (a);
859 IVALUE bv = num_ivalue (b);
860
861 ret = av == bv ? 0 : av < bv ? -1 : +1;
862 }
792 else 863 else
793 ret = num_get_rvalue (a) == num_get_rvalue (b); 864 {
865 RVALUE av = num_rvalue (a);
866 RVALUE bv = num_rvalue (b);
867
868 ret = av == bv ? 0 : av < bv ? -1 : +1;
869 }
794 870
795 return ret; 871 return ret;
796} 872}
797
798
799static int
800num_gt (num a, num b)
801{
802 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804
805 if (is_fixnum)
806 ret = num_get_ivalue (a) > num_get_ivalue (b);
807 else
808 ret = num_get_rvalue (a) > num_get_rvalue (b);
809
810 return ret;
811}
812
813static int
814num_ge (num a, num b)
815{
816 return !num_lt (a, b);
817}
818
819static int
820num_lt (num a, num b)
821{
822 int ret;
823 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
824
825 if (is_fixnum)
826 ret = num_get_ivalue (a) < num_get_ivalue (b);
827 else
828 ret = num_get_rvalue (a) < num_get_rvalue (b);
829
830 return ret;
831}
832
833static int
834num_le (num a, num b)
835{
836 return !num_gt (a, b);
837}
838
839#if USE_MATH
840
841/* Round to nearest. Round to even if midway */
842static double
843round_per_R5RS (double x)
844{
845 double fl = floor (x);
846 double ce = ceil (x);
847 double dfl = x - fl;
848 double dce = ce - x;
849
850 if (dfl > dce)
851 return ce;
852 else if (dfl < dce)
853 return fl;
854 else
855 {
856 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
857 return fl;
858 else
859 return ce;
860 }
861}
862#endif
863 873
864static int 874static int
865is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
866{ 876{
877 return x == 0;
878#if 0
867#if USE_REAL 879#if USE_REAL
868 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 880 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
869#else 881#else
870 return x == 0; 882 return x == 0;
871#endif 883#endif
884#endif
872} 885}
873 886
874/* allocate new cell segment */ 887/* allocate new cell segment */
875static int 888static int
876alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
877{ 890{
878 pointer newp; 891 struct cell *newp;
879 pointer last; 892 struct cell *last;
880 pointer p; 893 struct cell *p;
881 char *cp; 894 char *cp;
882 long i; 895 long i;
883 int k; 896 int k;
884 897
885 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
886 segsize <<= 1; 899 segsize <<= 1;
887 900
888 for (k = 0; k < n; k++)
889 {
890 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
891 return k;
892
893 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
894 902
895 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
896 return k; 904 return k;
897 905
898 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
899 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
900 908
901 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
902 newp = (pointer)cp;
903 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
904 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
905
906 //TODO: insert, not swap
907 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
908 {
909 p = SCHEME_V->cell_seg[i];
910 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
911 SCHEME_V->cell_seg[i - 1] = p;
912
913 k = SCHEME_V->cell_segsize[i];
914 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
915 SCHEME_V->cell_segsize[i - 1] = k;
916
917 --i;
918 }
919
920 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
921 last = newp + segsize - 1; 913 last = newp + segsize - 1;
922 914
923 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
924 { 916 {
917 pointer cp = POINTER (p);
925 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
926 set_car (p, NIL); 919 set_car (cp, NIL);
927 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
928 } 921 }
929 922
930 /* insert new cells in address order on free list */
931 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
932 {
933 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
934 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
935 }
936 else
937 {
938 p = SCHEME_V->free_cell;
939 925
940 while (cdr (p) != NIL && newp > cdr (p))
941 p = cdr (p);
942
943 set_cdr (last, cdr (p));
944 set_cdr (p, newp);
945 }
946 }
947
948 return n; 926 return 1;
949} 927}
950 928
951/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
952static INLINE pointer 930ecb_inline pointer
953get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
954{ 932{
955 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
956 { 934 {
957 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
958 return S_SINK; 936 return S_SINK;
959 937
960 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
961 { 939 {
962 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
963 941
964 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
965 943
966 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
967 { 945 {
968 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
969 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
970 { 948 {
971#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
972 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
973 return S_SINK; 951 return S_SINK;
974#endif 952#endif
… …
986 } 964 }
987} 965}
988 966
989/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
990 Tehom */ 968 Tehom */
991
992static void 969static void
993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
994{ 971{
995 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
996 973
… …
1018} 995}
1019 996
1020static pointer 997static pointer
1021get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1022{ 999{
1023 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1024 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1025 1002
1026 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1027 return S_SINK; 1004 return S_SINK;
1028 1005
1029 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1030 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1031 1008
1032 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1033 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1034 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1035 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1036 1013
1037 return v; 1014 return v;
1038} 1015}
1039 1016
1040static INLINE void 1017ecb_inline void
1041ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1042{ 1019{
1043 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1044} 1021}
1045 1022
… …
1047static void 1024static void
1048check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1049{ 1026{
1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1051 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1052 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1053 1030
1054 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1055 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1056} 1033}
1057 1034
1058static void 1035static void
1059check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1060{ 1037{
… …
1082 set_cdr (x, b); 1059 set_cdr (x, b);
1083 1060
1084 return x; 1061 return x;
1085} 1062}
1086 1063
1064static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1087/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1088 1074
1089#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1090 1076
1077static int
1091static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1092 1088
1093static pointer 1089static pointer
1094oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1095{ 1091{
1096 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1098 1094
1099/* returns the new symbol */ 1095/* returns the new symbol */
1100static pointer 1096static pointer
1101oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1102{ 1098{
1103 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1104
1105 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1106 set_typeflag (x, T_SYMBOL);
1107 setimmutable (car (x));
1108
1109 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1110 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1111 return x; 1102 return x;
1112} 1103}
1113 1104
1114static INLINE pointer 1105ecb_inline pointer
1115oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1116{ 1107{
1117 int location; 1108 int location;
1118 pointer x; 1109 pointer x;
1119 char *s; 1110 char *s;
1120 1111
1121 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1122 1113
1123 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1124 { 1115 {
1125 s = symname (car (x)); 1116 s = symname (car (x));
1126 1117
1127 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1128 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1138 int i; 1129 int i;
1139 pointer x; 1130 pointer x;
1140 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1141 1132
1142 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1143 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1144 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1145 1136
1146 return ob_list; 1137 return ob_list;
1147} 1138}
1148 1139
… …
1152oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1153{ 1144{
1154 return NIL; 1145 return NIL;
1155} 1146}
1156 1147
1157static INLINE pointer 1148ecb_inline pointer
1158oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1159{ 1150{
1160 pointer x; 1151 pointer x;
1161 char *s; 1152 char *s;
1162 1153
… …
1174 1165
1175/* returns the new symbol */ 1166/* returns the new symbol */
1176static pointer 1167static pointer
1177oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1178{ 1169{
1179 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1180
1181 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1182 set_typeflag (x, T_SYMBOL);
1183 setimmutable (car (x));
1184 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1185 return x; 1172 return x;
1186} 1173}
1187 1174
1188static pointer 1175static pointer
… …
1198mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1199{ 1186{
1200 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1201 1188
1202 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1203 x->object.port = p; 1190 set_port (x, p);
1204 1191
1205 return x; 1192 return x;
1206} 1193}
1207#endif 1194#endif
1208 1195
1209pointer 1196pointer
1210mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1211{ 1198{
1212 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1213 1200
1214 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1215 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1216 1203
1217 return x; 1204 return x;
1218} 1205}
1219 1206
1220INTERFACE pointer 1207INTERFACE pointer
1221mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1222{ 1209{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1211
1225 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1226 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1227 set_num_integer (x); 1214
1228 return x; 1215 return x;
1229} 1216}
1230 1217
1231/* get number atom (integer) */ 1218/* get number atom (integer) */
1232INTERFACE pointer 1219INTERFACE pointer
1233mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1234{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1233
1237 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1238 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1239 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1240 return x; 1241 return *pp;
1241} 1242}
1242 1243
1243INTERFACE pointer 1244INTERFACE pointer
1244mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1245{ 1246{
1247#if USE_REAL
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1249
1248 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1249 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1250 set_num_real (x); 1252
1251 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1252} 1257}
1253 1258
1254static pointer 1259static pointer
1255mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1256{ 1261{
1262#if USE_REAL
1257 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1258 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1259 else 1268#endif
1260 return mk_real (SCHEME_A_ num_get_rvalue (n));
1261} 1269}
1262 1270
1263/* allocate name to string area */ 1271/* allocate name to string area */
1264static char * 1272static char *
1265store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1271 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1272 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1273 } 1281 }
1274 1282
1275 if (str) 1283 if (str)
1276 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1277 int l = strlen (str);
1278
1279 if (l > len_str)
1280 l = len_str;
1281
1282 memcpy (q, str, l);
1283 q[l] = 0;
1284 }
1285 else 1285 else
1286 {
1287 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1288 q[len_str] = 0; 1288 q[len_str] = 0;
1289 }
1290 1289
1291 return q; 1290 return q;
1292} 1291}
1293 1292
1294INTERFACE pointer 1293INTERFACE pointer
… …
1308 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1309 1308
1310 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1311 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1312 strlength (x) = len; 1311 strlength (x) = len;
1312
1313 return x; 1313 return x;
1314} 1314}
1315 1315
1316INTERFACE pointer 1316INTERFACE pointer
1317mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1324{ 1324{
1325 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1326} 1326}
1327 1327
1328INTERFACE void 1328INTERFACE void
1329fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1330{ 1330{
1331 int i; 1331 int i;
1332 1332
1333 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1334 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1335} 1335}
1336 1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1344}
1345
1337INTERFACE pointer 1346INTERFACE pointer
1338vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1339{ 1348{
1340 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1341} 1350}
1342 1351
1343INTERFACE void 1352INTERFACE void
1344set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1345{ 1354{
1346 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1347} 1356}
1348 1357
1349/* get new symbol */ 1358/* get new symbol */
… …
1361 1370
1362INTERFACE pointer 1371INTERFACE pointer
1363gensym (SCHEME_P) 1372gensym (SCHEME_P)
1364{ 1373{
1365 pointer x; 1374 pointer x;
1366
1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1368 {
1369 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1370 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1371 1377
1372 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1373 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1374 1380
1375 if (x == NIL) 1381static int
1376 { 1382is_gensym (SCHEME_P_ pointer x)
1377 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1378 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1379 }
1380 }
1381
1382 return NIL;
1383} 1385}
1384 1386
1385/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1386static pointer 1388static pointer
1387mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
… …
1441 } 1443 }
1442 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1443 { 1445 {
1444 if (!has_fp_exp) 1446 if (!has_fp_exp)
1445 { 1447 {
1446 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1447 from now on */
1448 p++; 1449 p++;
1449 1450
1450 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1451 continue; 1452 continue;
1452 } 1453 }
… …
1540 1541
1541 if (ecb_expect_false (is_vector (p))) 1542 if (ecb_expect_false (is_vector (p)))
1542 { 1543 {
1543 int i; 1544 int i;
1544 1545
1545 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1546 mark (vecvalue (p)[i]); 1547 mark (vecvalue (p)[i]);
1547 } 1548 }
1548 1549
1549 if (is_atom (p)) 1550 if (is_atom (p))
1550 goto E6; 1551 goto E6;
… …
1597 1598
1598/* garbage collection. parameter a, b is marked. */ 1599/* garbage collection. parameter a, b is marked. */
1599static void 1600static void
1600gc (SCHEME_P_ pointer a, pointer b) 1601gc (SCHEME_P_ pointer a, pointer b)
1601{ 1602{
1602 pointer p;
1603 int i; 1603 int i;
1604 1604
1605 if (SCHEME_V->gc_verbose) 1605 if (SCHEME_V->gc_verbose)
1606 putstr (SCHEME_A_ "gc..."); 1606 putstr (SCHEME_A_ "gc...");
1607 1607
… …
1623 /* Mark recent objects the interpreter doesn't know about yet. */ 1623 /* Mark recent objects the interpreter doesn't know about yet. */
1624 mark (car (S_SINK)); 1624 mark (car (S_SINK));
1625 /* Mark any older stuff above nested C calls */ 1625 /* Mark any older stuff above nested C calls */
1626 mark (SCHEME_V->c_nest); 1626 mark (SCHEME_V->c_nest);
1627 1627
1628#if USE_INTCACHE
1629 /* mark intcache */
1630 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1631 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1632 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1633#endif
1634
1628 /* mark variables a, b */ 1635 /* mark variables a, b */
1629 mark (a); 1636 mark (a);
1630 mark (b); 1637 mark (b);
1631 1638
1632 /* garbage collect */ 1639 /* garbage collect */
1633 clrmark (NIL); 1640 clrmark (NIL);
1634 SCHEME_V->fcells = 0; 1641 SCHEME_V->fcells = 0;
1635 SCHEME_V->free_cell = NIL; 1642 SCHEME_V->free_cell = NIL;
1636 1643
1637 /* free-list is kept sorted by address so as to maintain consecutive 1644 if (SCHEME_V->gc_verbose)
1638 ranges, if possible, for use with vectors. Here we scan the cells 1645 putstr (SCHEME_A_ "freeing...");
1639 (which are also kept sorted by address) downwards to build the 1646
1640 free-list in sorted order. 1647 uint32_t total = 0;
1641 */ 1648
1649 /* Here we scan the cells to build the free-list. */
1642 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1643 { 1651 {
1644 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1652 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1653 struct cell *p;
1654 total += SCHEME_V->cell_segsize [i];
1645 1655
1646 while (--p >= SCHEME_V->cell_seg[i]) 1656 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1647 { 1657 {
1658 pointer c = POINTER (p);
1659
1648 if (is_mark (p)) 1660 if (is_mark (c))
1649 clrmark (p); 1661 clrmark (c);
1650 else 1662 else
1651 { 1663 {
1652 /* reclaim cell */ 1664 /* reclaim cell */
1653 if (typeflag (p) != T_FREE) 1665 if (typeflag (c) != T_PAIR)
1654 { 1666 {
1655 finalize_cell (SCHEME_A_ p); 1667 finalize_cell (SCHEME_A_ c);
1656 set_typeflag (p, T_FREE); 1668 set_typeflag (c, T_PAIR);
1657 set_car (p, NIL); 1669 set_car (c, NIL);
1658 } 1670 }
1659 1671
1660 ++SCHEME_V->fcells; 1672 ++SCHEME_V->fcells;
1661 set_cdr (p, SCHEME_V->free_cell); 1673 set_cdr (c, SCHEME_V->free_cell);
1662 SCHEME_V->free_cell = p; 1674 SCHEME_V->free_cell = c;
1663 } 1675 }
1664 } 1676 }
1665 } 1677 }
1666 1678
1667 if (SCHEME_V->gc_verbose) 1679 if (SCHEME_V->gc_verbose)
1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1680 {
1681 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");
1682 }
1669} 1683}
1670 1684
1671static void 1685static void
1672finalize_cell (SCHEME_P_ pointer a) 1686finalize_cell (SCHEME_P_ pointer a)
1673{ 1687{
1674 /* TODO, fast bitmap check? */ 1688 /* TODO, fast bitmap check? */
1675 if (is_string (a)) 1689 if (is_string (a) || is_symbol (a))
1676 free (strvalue (a)); 1690 free (strvalue (a));
1677 else if (is_vector (a)) 1691 else if (is_vector (a))
1678 free (vecvalue (a)); 1692 free (vecvalue (a));
1679#if USE_PORTS 1693#if USE_PORTS
1680 else if (is_port (a)) 1694 else if (is_port (a))
1681 { 1695 {
1682 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1696 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1683 port_close (SCHEME_A_ a, port_input | port_output); 1697 port_close (SCHEME_A_ a, port_input | port_output);
1684 1698
1685 free (a->object.port); 1699 free (port (a));
1686 } 1700 }
1687#endif 1701#endif
1688} 1702}
1689 1703
1690/* ========== Routines for Reading ========== */ 1704/* ========== Routines for Reading ========== */
… …
1706 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1720 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1707 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1721 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1708 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1722 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1709 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1723 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1710 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1724 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1711 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1725 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1712 1726
1713#if SHOW_ERROR_LINE 1727#if SHOW_ERROR_LINE
1714 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1715 1729
1716 if (fname) 1730 if (fname)
… …
1733 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1747 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1734#if USE_PORTS 1748#if USE_PORTS
1735 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1749 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1736#endif 1750#endif
1737 SCHEME_V->file_i--; 1751 SCHEME_V->file_i--;
1738 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1752 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1739 } 1753 }
1740} 1754}
1741 1755
1742static int 1756static int
1743file_interactive (SCHEME_P) 1757file_interactive (SCHEME_P)
1744{ 1758{
1745#if USE_PORTS 1759#if USE_PORTS
1746 return SCHEME_V->file_i == 0 1760 return SCHEME_V->file_i == 0
1747 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1761 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1748 && (SCHEME_V->inport->object.port->kind & port_file); 1762 && (port (SCHEME_V->inport)->kind & port_file);
1749#else 1763#else
1750 return 0; 1764 return 0;
1751#endif 1765#endif
1752} 1766}
1753 1767
… …
1887} 1901}
1888 1902
1889static void 1903static void
1890port_close (SCHEME_P_ pointer p, int flag) 1904port_close (SCHEME_P_ pointer p, int flag)
1891{ 1905{
1892 port *pt = p->object.port; 1906 port *pt = port (p);
1893 1907
1894 pt->kind &= ~flag; 1908 pt->kind &= ~flag;
1895 1909
1896 if ((pt->kind & (port_input | port_output)) == 0) 1910 if ((pt->kind & (port_input | port_output)) == 0)
1897 { 1911 {
… …
1918/* get new character from input file */ 1932/* get new character from input file */
1919static int 1933static int
1920inchar (SCHEME_P) 1934inchar (SCHEME_P)
1921{ 1935{
1922 int c; 1936 int c;
1923 port *pt; 1937 port *pt = port (SCHEME_V->inport);
1924
1925 pt = SCHEME_V->inport->object.port;
1926 1938
1927 if (pt->kind & port_saw_EOF) 1939 if (pt->kind & port_saw_EOF)
1928 return EOF; 1940 return EOF;
1929 1941
1930 c = basic_inchar (pt); 1942 c = basic_inchar (pt);
… …
1997 port *pt; 2009 port *pt;
1998 2010
1999 if (c == EOF) 2011 if (c == EOF)
2000 return; 2012 return;
2001 2013
2002 pt = SCHEME_V->inport->object.port; 2014 pt = port (SCHEME_V->inport);
2003 pt->unget = c; 2015 pt->unget = c;
2004#else 2016#else
2005 if (c == EOF) 2017 if (c == EOF)
2006 return; 2018 return;
2007 2019
… …
2035 2047
2036INTERFACE void 2048INTERFACE void
2037putstr (SCHEME_P_ const char *s) 2049putstr (SCHEME_P_ const char *s)
2038{ 2050{
2039#if USE_PORTS 2051#if USE_PORTS
2040 port *pt = SCHEME_V->outport->object.port; 2052 port *pt = port (SCHEME_V->outport);
2041 2053
2042 if (pt->kind & port_file) 2054 if (pt->kind & port_file)
2043 write (pt->rep.stdio.file, s, strlen (s)); 2055 write (pt->rep.stdio.file, s, strlen (s));
2044 else 2056 else
2045 for (; *s; s++) 2057 for (; *s; s++)
… …
2047 *pt->rep.string.curr++ = *s; 2059 *pt->rep.string.curr++ = *s;
2048 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2060 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2049 *pt->rep.string.curr++ = *s; 2061 *pt->rep.string.curr++ = *s;
2050 2062
2051#else 2063#else
2052 xwrstr (s); 2064 write (pt->rep.stdio.file, s, strlen (s));
2053#endif 2065#endif
2054} 2066}
2055 2067
2056static void 2068static void
2057putchars (SCHEME_P_ const char *s, int len) 2069putchars (SCHEME_P_ const char *s, int len)
2058{ 2070{
2059#if USE_PORTS 2071#if USE_PORTS
2060 port *pt = SCHEME_V->outport->object.port; 2072 port *pt = port (SCHEME_V->outport);
2061 2073
2062 if (pt->kind & port_file) 2074 if (pt->kind & port_file)
2063 write (pt->rep.stdio.file, s, len); 2075 write (pt->rep.stdio.file, s, len);
2064 else 2076 else
2065 { 2077 {
… …
2079 2091
2080INTERFACE void 2092INTERFACE void
2081putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2082{ 2094{
2083#if USE_PORTS 2095#if USE_PORTS
2084 port *pt = SCHEME_V->outport->object.port; 2096 port *pt = port (SCHEME_V->outport);
2085 2097
2086 if (pt->kind & port_file) 2098 if (pt->kind & port_file)
2087 { 2099 {
2088 char cc = c; 2100 char cc = c;
2089 write (pt->rep.stdio.file, &cc, 1); 2101 write (pt->rep.stdio.file, &cc, 1);
… …
2102#endif 2114#endif
2103} 2115}
2104 2116
2105/* read characters up to delimiter, but cater to character constants */ 2117/* read characters up to delimiter, but cater to character constants */
2106static char * 2118static char *
2107readstr_upto (SCHEME_P_ char *delim) 2119readstr_upto (SCHEME_P_ int skip, const char *delim)
2108{ 2120{
2109 char *p = SCHEME_V->strbuff; 2121 char *p = SCHEME_V->strbuff + skip;
2110 2122
2111 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2123 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2112 2124
2113 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2125 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2114 *p = 0; 2126 *p = 0;
… …
2121 return SCHEME_V->strbuff; 2133 return SCHEME_V->strbuff;
2122} 2134}
2123 2135
2124/* read string expression "xxx...xxx" */ 2136/* read string expression "xxx...xxx" */
2125static pointer 2137static pointer
2126readstrexp (SCHEME_P) 2138readstrexp (SCHEME_P_ char delim)
2127{ 2139{
2128 char *p = SCHEME_V->strbuff; 2140 char *p = SCHEME_V->strbuff;
2129 int c; 2141 int c;
2130 int c1 = 0; 2142 int c1 = 0;
2131 enum
2132 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2143 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2133 2144
2134 for (;;) 2145 for (;;)
2135 { 2146 {
2136 c = inchar (SCHEME_A); 2147 c = inchar (SCHEME_A);
2137 2148
… …
2139 return S_F; 2150 return S_F;
2140 2151
2141 switch (state) 2152 switch (state)
2142 { 2153 {
2143 case st_ok: 2154 case st_ok:
2144 switch (c) 2155 if (ecb_expect_false (c == delim))
2145 {
2146 case '\\':
2147 state = st_bsl;
2148 break;
2149
2150 case '"':
2151 *p = 0;
2152 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2156 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2153 2157
2154 default: 2158 if (ecb_expect_false (c == '\\'))
2159 state = st_bsl;
2160 else
2155 *p++ = c; 2161 *p++ = c;
2156 break;
2157 }
2158 2162
2159 break; 2163 break;
2160 2164
2161 case st_bsl: 2165 case st_bsl:
2162 switch (c) 2166 switch (c)
… …
2192 case 'r': 2196 case 'r':
2193 *p++ = '\r'; 2197 *p++ = '\r';
2194 state = st_ok; 2198 state = st_ok;
2195 break; 2199 break;
2196 2200
2197 case '"':
2198 *p++ = '"';
2199 state = st_ok;
2200 break;
2201
2202 default: 2201 default:
2203 *p++ = c; 2202 *p++ = c;
2204 state = st_ok; 2203 state = st_ok;
2205 break; 2204 break;
2206 } 2205 }
2207 2206
2208 break; 2207 break;
2209 2208
2210 case st_x1: 2209 case st_x1:
2211 case st_x2: 2210 case st_x2:
2212 c = toupper (c); 2211 c = tolower (c);
2213 2212
2214 if (c >= '0' && c <= 'F') 2213 if (c >= '0' && c <= '9')
2215 {
2216 if (c <= '9')
2217 c1 = (c1 << 4) + c - '0'; 2214 c1 = (c1 << 4) + c - '0';
2218 else 2215 else if (c >= 'a' && c <= 'f')
2219 c1 = (c1 << 4) + c - 'A' + 10; 2216 c1 = (c1 << 4) + c - 'a' + 10;
2220
2221 if (state == st_x1)
2222 state = st_x2;
2223 else
2224 {
2225 *p++ = c1;
2226 state = st_ok;
2227 }
2228 }
2229 else 2217 else
2230 return S_F; 2218 return S_F;
2219
2220 if (state == st_x1)
2221 state = st_x2;
2222 else
2223 {
2224 *p++ = c1;
2225 state = st_ok;
2226 }
2231 2227
2232 break; 2228 break;
2233 2229
2234 case st_oct1: 2230 case st_oct1:
2235 case st_oct2: 2231 case st_oct2:
… …
2239 backchar (SCHEME_A_ c); 2235 backchar (SCHEME_A_ c);
2240 state = st_ok; 2236 state = st_ok;
2241 } 2237 }
2242 else 2238 else
2243 { 2239 {
2244 if (state == st_oct2 && c1 >= 32) 2240 if (state == st_oct2 && c1 >= ' ')
2245 return S_F; 2241 return S_F;
2246 2242
2247 c1 = (c1 << 3) + (c - '0'); 2243 c1 = (c1 << 3) + (c - '0');
2248 2244
2249 if (state == st_oct1) 2245 if (state == st_oct1)
… …
2254 state = st_ok; 2250 state = st_ok;
2255 } 2251 }
2256 } 2252 }
2257 2253
2258 break; 2254 break;
2259
2260 } 2255 }
2261 } 2256 }
2262} 2257}
2263 2258
2264/* check c is in chars */ 2259/* check c is in chars */
2265static INLINE int 2260ecb_inline int
2266is_one_of (char *s, int c) 2261is_one_of (const char *s, int c)
2267{ 2262{
2268 if (c == EOF)
2269 return 1;
2270
2271 return !!strchr (s, c); 2263 return c == EOF || !!strchr (s, c);
2272} 2264}
2273 2265
2274/* skip white characters */ 2266/* skip white characters */
2275static INLINE int 2267ecb_inline int
2276skipspace (SCHEME_P) 2268skipspace (SCHEME_P)
2277{ 2269{
2278 int c, curr_line = 0; 2270 int c, curr_line = 0;
2279 2271
2280 do 2272 do
2281 { 2273 {
2282 c = inchar (SCHEME_A); 2274 c = inchar (SCHEME_A);
2275
2283#if SHOW_ERROR_LINE 2276#if SHOW_ERROR_LINE
2284 if (c == '\n') 2277 if (ecb_expect_false (c == '\n'))
2285 curr_line++; 2278 curr_line++;
2286#endif 2279#endif
2280
2281 if (ecb_expect_false (c == EOF))
2282 return c;
2287 } 2283 }
2288 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2284 while (is_one_of (WHITESPACE, c));
2289 2285
2290 /* record it */ 2286 /* record it */
2291#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2292 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2288 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2293 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2289 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2294#endif 2290#endif
2295 2291
2296 if (c != EOF)
2297 {
2298 backchar (SCHEME_A_ c); 2292 backchar (SCHEME_A_ c);
2299 return 1; 2293 return 1;
2300 }
2301 else
2302 return EOF;
2303} 2294}
2304 2295
2305/* get token */ 2296/* get token */
2306static int 2297static int
2307token (SCHEME_P) 2298token (SCHEME_P)
… …
2323 return TOK_RPAREN; 2314 return TOK_RPAREN;
2324 2315
2325 case '.': 2316 case '.':
2326 c = inchar (SCHEME_A); 2317 c = inchar (SCHEME_A);
2327 2318
2328 if (is_one_of (" \n\t", c)) 2319 if (is_one_of (WHITESPACE, c))
2329 return TOK_DOT; 2320 return TOK_DOT;
2330 else 2321 else
2331 { 2322 {
2332 //TODO: ungetc twice in a row is not supported in C
2333 backchar (SCHEME_A_ c); 2323 backchar (SCHEME_A_ c);
2334 backchar (SCHEME_A_ '.');
2335 return TOK_ATOM; 2324 return TOK_DOTATOM;
2336 } 2325 }
2326
2327 case '|':
2328 return TOK_STRATOM;
2337 2329
2338 case '\'': 2330 case '\'':
2339 return TOK_QUOTE; 2331 return TOK_QUOTE;
2340 2332
2341 case ';': 2333 case ';':
… …
2473 } 2465 }
2474 2466
2475 putcharacter (SCHEME_A_ '"'); 2467 putcharacter (SCHEME_A_ '"');
2476} 2468}
2477 2469
2478
2479/* print atoms */ 2470/* print atoms */
2480static void 2471static void
2481printatom (SCHEME_P_ pointer l, int f) 2472printatom (SCHEME_P_ pointer l, int f)
2482{ 2473{
2483 char *p; 2474 char *p;
2484 int len; 2475 int len;
2485 2476
2486 atom2str (SCHEME_A_ l, f, &p, &len); 2477 atom2str (SCHEME_A_ l, f, &p, &len);
2487 putchars (SCHEME_A_ p, len); 2478 putchars (SCHEME_A_ p, len);
2488} 2479}
2489
2490 2480
2491/* Uses internal buffer unless string pointer is already available */ 2481/* Uses internal buffer unless string pointer is already available */
2492static void 2482static void
2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2483atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2494{ 2484{
… …
2508 { 2498 {
2509 p = SCHEME_V->strbuff; 2499 p = SCHEME_V->strbuff;
2510 2500
2511 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2501 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2512 { 2502 {
2513 if (num_is_integer (l)) 2503 if (is_integer (l))
2514 xnum (p, ivalue_unchecked (l)); 2504 xnum (p, ivalue_unchecked (l));
2515#if USE_REAL 2505#if USE_REAL
2516 else 2506 else
2517 { 2507 {
2518 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2508 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2655#endif 2645#endif
2656 } 2646 }
2657 else if (is_continuation (l)) 2647 else if (is_continuation (l))
2658 p = "#<CONTINUATION>"; 2648 p = "#<CONTINUATION>";
2659 else 2649 else
2650 {
2651#if USE_PRINTF
2652 p = SCHEME_V->strbuff;
2653 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2654#else
2660 p = "#<ERROR>"; 2655 p = "#<ERROR>";
2656#endif
2657 }
2661 2658
2662 *pp = p; 2659 *pp = p;
2663 *plen = strlen (p); 2660 *plen = strlen (p);
2664} 2661}
2665 2662
… …
2773 return 0; 2770 return 0;
2774 } 2771 }
2775 else if (is_number (a)) 2772 else if (is_number (a))
2776 { 2773 {
2777 if (is_number (b)) 2774 if (is_number (b))
2778 if (num_is_integer (a) == num_is_integer (b))
2779 return num_eq (nvalue (a), nvalue (b)); 2775 return num_cmp (nvalue (a), nvalue (b)) == 0;
2780 2776
2781 return 0; 2777 return 0;
2782 } 2778 }
2783 else if (is_character (a)) 2779 else if (is_character (a))
2784 { 2780 {
… …
2810/* () is #t in R5RS */ 2806/* () is #t in R5RS */
2811#define is_true(p) ((p) != S_F) 2807#define is_true(p) ((p) != S_F)
2812#define is_false(p) ((p) == S_F) 2808#define is_false(p) ((p) == S_F)
2813 2809
2814/* ========== Environment implementation ========== */ 2810/* ========== Environment implementation ========== */
2815
2816#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2817
2818static int
2819hash_fn (const char *key, int table_size)
2820{
2821 const unsigned char *p = key;
2822 uint32_t hash = 2166136261;
2823
2824 while (*p)
2825 hash = (hash ^ *p++) * 16777619;
2826
2827 return hash % table_size;
2828}
2829#endif
2830 2811
2831#ifndef USE_ALIST_ENV 2812#ifndef USE_ALIST_ENV
2832 2813
2833/* 2814/*
2834 * In this implementation, each frame of the environment may be 2815 * In this implementation, each frame of the environment may be
… …
2851 2832
2852 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2833 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2853 setenvironment (SCHEME_V->envir); 2834 setenvironment (SCHEME_V->envir);
2854} 2835}
2855 2836
2856static INLINE void 2837static uint32_t
2838sym_hash (pointer sym, uint32_t size)
2839{
2840 uintptr_t ptr = (uintptr_t)sym;
2841
2842#if 0
2843 /* table size is prime, so why mix */
2844 ptr += ptr >> 32;
2845 ptr += ptr >> 16;
2846 ptr += ptr >> 8;
2847#endif
2848
2849 return ptr % size;
2850}
2851
2852ecb_inline void
2857new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2853new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2858{ 2854{
2859 pointer slot = immutable_cons (variable, value); 2855 pointer slot = immutable_cons (variable, value);
2860 2856
2861 if (is_vector (car (env))) 2857 if (is_vector (car (env)))
2862 { 2858 {
2863 int location = hash_fn (symname (variable), veclength (car (env))); 2859 int location = sym_hash (variable, veclength (car (env)));
2864
2865 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2860 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2866 } 2861 }
2867 else 2862 else
2868 set_car (env, immutable_cons (slot, car (env))); 2863 set_car (env, immutable_cons (slot, car (env)));
2869} 2864}
2870 2865
2871static pointer 2866static pointer
2872find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2867find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2873{ 2868{
2874 pointer x, y; 2869 pointer x, y;
2875 int location;
2876 2870
2877 for (x = env; x != NIL; x = cdr (x)) 2871 for (x = env; x != NIL; x = cdr (x))
2878 { 2872 {
2879 if (is_vector (car (x))) 2873 if (is_vector (car (x)))
2880 { 2874 {
2881 location = hash_fn (symname (hdl), veclength (car (x))); 2875 int location = sym_hash (hdl, veclength (car (x)));
2882 y = vector_elem (car (x), location); 2876 y = vector_get (car (x), location);
2883 } 2877 }
2884 else 2878 else
2885 y = car (x); 2879 y = car (x);
2886 2880
2887 for (; y != NIL; y = cdr (y)) 2881 for (; y != NIL; y = cdr (y))
2888 if (caar (y) == hdl) 2882 if (caar (y) == hdl)
2889 break; 2883 break;
2890 2884
2891 if (y != NIL) 2885 if (y != NIL)
2886 return car (y);
2887
2888 if (!all)
2892 break; 2889 break;
2893
2894 if (!all)
2895 return NIL;
2896 } 2890 }
2897
2898 if (x != NIL)
2899 return car (y);
2900 2891
2901 return NIL; 2892 return NIL;
2902} 2893}
2903 2894
2904#else /* USE_ALIST_ENV */ 2895#else /* USE_ALIST_ENV */
2905 2896
2906static INLINE void 2897ecb_inline void
2907new_frame_in_env (SCHEME_P_ pointer old_env) 2898new_frame_in_env (SCHEME_P_ pointer old_env)
2908{ 2899{
2909 SCHEME_V->envir = immutable_cons (NIL, old_env); 2900 SCHEME_V->envir = immutable_cons (NIL, old_env);
2910 setenvironment (SCHEME_V->envir); 2901 setenvironment (SCHEME_V->envir);
2911} 2902}
2912 2903
2913static INLINE void 2904ecb_inline void
2914new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2905new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2915{ 2906{
2916 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2907 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2917} 2908}
2918 2909
… …
2926 for (y = car (x); y != NIL; y = cdr (y)) 2917 for (y = car (x); y != NIL; y = cdr (y))
2927 if (caar (y) == hdl) 2918 if (caar (y) == hdl)
2928 break; 2919 break;
2929 2920
2930 if (y != NIL) 2921 if (y != NIL)
2922 return car (y);
2931 break; 2923 break;
2932 2924
2933 if (!all) 2925 if (!all)
2934 return NIL; 2926 break;
2935 } 2927 }
2936
2937 if (x != NIL)
2938 return car (y);
2939 2928
2940 return NIL; 2929 return NIL;
2941} 2930}
2942 2931
2943#endif /* USE_ALIST_ENV else */ 2932#endif /* USE_ALIST_ENV else */
2944 2933
2945static INLINE void 2934ecb_inline void
2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2935new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2947{ 2936{
2937 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2948 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2938 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2949} 2939}
2950 2940
2951static INLINE void 2941ecb_inline void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2942set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2943{
2954 set_cdr (slot, value); 2944 set_cdr (slot, value);
2955} 2945}
2956 2946
2957static INLINE pointer 2947ecb_inline pointer
2958slot_value_in_env (pointer slot) 2948slot_value_in_env (pointer slot)
2959{ 2949{
2960 return cdr (slot); 2950 return cdr (slot);
2961} 2951}
2962 2952
2963/* ========== Evaluation Cycle ========== */ 2953/* ========== Evaluation Cycle ========== */
2964 2954
2965static pointer 2955static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2956xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2957{
2968#if USE_ERROR_HOOK 2958#if USE_ERROR_HOOK
2969 pointer x; 2959 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK; 2960 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3005 code = cons (mk_string (SCHEME_A_ s), code); 2995 code = cons (mk_string (SCHEME_A_ s), code);
3006 setimmutable (car (code)); 2996 setimmutable (car (code));
3007 SCHEME_V->code = cons (slot_value_in_env (x), code); 2997 SCHEME_V->code = cons (slot_value_in_env (x), code);
3008 SCHEME_V->op = OP_EVAL; 2998 SCHEME_V->op = OP_EVAL;
3009 2999
3010 return S_T; 3000 return 0;
3011 } 3001 }
3012#endif 3002#endif
3013 3003
3014 if (a) 3004 if (a)
3015 SCHEME_V->args = cons (a, NIL); 3005 SCHEME_V->args = cons (a, NIL);
… …
3017 SCHEME_V->args = NIL; 3007 SCHEME_V->args = NIL;
3018 3008
3019 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3009 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3020 setimmutable (car (SCHEME_V->args)); 3010 setimmutable (car (SCHEME_V->args));
3021 SCHEME_V->op = OP_ERR0; 3011 SCHEME_V->op = OP_ERR0;
3012
3022 return S_T; 3013 return 0;
3023} 3014}
3024 3015
3025#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3016#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3026#define Error_0(s) Error_1 (s, 0) 3017#define Error_0(s) Error_1 (s, 0)
3027 3018
3028/* Too small to turn into function */ 3019/* Too small to turn into function */
3029#define BEGIN do { 3020#define BEGIN do {
3030#define END } while (0) 3021#define END } while (0)
3031#define s_goto(a) BEGIN \ 3022#define s_goto(a) BEGIN \
3032 SCHEME_V->op = a; \ 3023 SCHEME_V->op = a; \
3033 return S_T; END 3024 return 0; END
3034 3025
3035#define s_return(a) return xs_return (SCHEME_A_ a) 3026#define s_return(a) return xs_return (SCHEME_A_ a)
3036 3027
3037#ifndef USE_SCHEME_STACK 3028#ifndef USE_SCHEME_STACK
3038 3029
… …
3052{ 3043{
3053 int nframes = (uintptr_t)SCHEME_V->dump; 3044 int nframes = (uintptr_t)SCHEME_V->dump;
3054 struct dump_stack_frame *next_frame; 3045 struct dump_stack_frame *next_frame;
3055 3046
3056 /* enough room for the next frame? */ 3047 /* enough room for the next frame? */
3057 if (nframes >= SCHEME_V->dump_size) 3048 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058 { 3049 {
3059 SCHEME_V->dump_size += STACK_GROWTH; 3050 SCHEME_V->dump_size += STACK_GROWTH;
3060 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3051 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061 } 3052 }
3062 3053
3063 next_frame = SCHEME_V->dump_base + nframes; 3054 next_frame = SCHEME_V->dump_base + nframes;
3064 3055
3065 next_frame->op = op; 3056 next_frame->op = op;
3066 next_frame->args = args; 3057 next_frame->args = args;
3067 next_frame->envir = SCHEME_V->envir; 3058 next_frame->envir = SCHEME_V->envir;
3068 next_frame->code = code; 3059 next_frame->code = code;
3069 3060
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3061 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3062}
3072 3063
3073static pointer 3064static int
3074xs_return (SCHEME_P_ pointer a) 3065xs_return (SCHEME_P_ pointer a)
3075{ 3066{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3067 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3068 struct dump_stack_frame *frame;
3078 3069
3079 SCHEME_V->value = a; 3070 SCHEME_V->value = a;
3080 3071
3081 if (nframes <= 0) 3072 if (nframes <= 0)
3082 return NIL; 3073 return -1;
3083 3074
3084 frame = &SCHEME_V->dump_base[--nframes]; 3075 frame = &SCHEME_V->dump_base[--nframes];
3085 SCHEME_V->op = frame->op; 3076 SCHEME_V->op = frame->op;
3086 SCHEME_V->args = frame->args; 3077 SCHEME_V->args = frame->args;
3087 SCHEME_V->envir = frame->envir; 3078 SCHEME_V->envir = frame->envir;
3088 SCHEME_V->code = frame->code; 3079 SCHEME_V->code = frame->code;
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3080 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3081
3091 return S_T; 3082 return 0;
3092} 3083}
3093 3084
3094static INLINE void 3085ecb_inline void
3095dump_stack_reset (SCHEME_P) 3086dump_stack_reset (SCHEME_P)
3096{ 3087{
3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3088 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3098 SCHEME_V->dump = (pointer)+0; 3089 SCHEME_V->dump = (pointer)+0;
3099} 3090}
3100 3091
3101static INLINE void 3092ecb_inline void
3102dump_stack_initialize (SCHEME_P) 3093dump_stack_initialize (SCHEME_P)
3103{ 3094{
3104 SCHEME_V->dump_size = 0; 3095 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3096 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3097 dump_stack_reset (SCHEME_A);
… …
3159 int i = 0; 3150 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3151 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3152
3162 while (cont != NIL) 3153 while (cont != NIL)
3163 { 3154 {
3164 frame->op = ivalue (car (cont)); cont = cdr (cont); 3155 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3165 frame->args = car (cont) ; cont = cdr (cont); 3156 frame->args = car (cont) ; cont = cdr (cont);
3166 frame->envir = car (cont) ; cont = cdr (cont); 3157 frame->envir = car (cont) ; cont = cdr (cont);
3167 frame->code = car (cont) ; cont = cdr (cont); 3158 frame->code = car (cont) ; cont = cdr (cont);
3168 3159
3169 ++frame; 3160 ++frame;
3170 ++i; 3161 ++i;
3171 } 3162 }
3172 3163
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3164 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3165}
3175 3166
3176#else 3167#else
3177 3168
3178static INLINE void 3169ecb_inline void
3179dump_stack_reset (SCHEME_P) 3170dump_stack_reset (SCHEME_P)
3180{ 3171{
3181 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3182} 3173}
3183 3174
3184static INLINE void 3175ecb_inline void
3185dump_stack_initialize (SCHEME_P) 3176dump_stack_initialize (SCHEME_P)
3186{ 3177{
3187 dump_stack_reset (SCHEME_A); 3178 dump_stack_reset (SCHEME_A);
3188} 3179}
3189 3180
… …
3191dump_stack_free (SCHEME_P) 3182dump_stack_free (SCHEME_P)
3192{ 3183{
3193 SCHEME_V->dump = NIL; 3184 SCHEME_V->dump = NIL;
3194} 3185}
3195 3186
3196static pointer 3187static int
3197xs_return (SCHEME_P_ pointer a) 3188xs_return (SCHEME_P_ pointer a)
3198{ 3189{
3199 pointer dump = SCHEME_V->dump; 3190 pointer dump = SCHEME_V->dump;
3200 3191
3201 SCHEME_V->value = a; 3192 SCHEME_V->value = a;
3202 3193
3203 if (dump == NIL) 3194 if (dump == NIL)
3204 return NIL; 3195 return -1;
3205 3196
3206 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3197 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3207 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3198 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3199 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3209 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3200 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3210 3201
3211 SCHEME_V->dump = dump; 3202 SCHEME_V->dump = dump;
3212 3203
3213 return S_T; 3204 return 0;
3214} 3205}
3215 3206
3216static void 3207static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3208s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3209{
… …
3243 3234
3244#endif 3235#endif
3245 3236
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3237#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3238
3239#if EXPERIMENT
3248static pointer 3240static int
3241debug (SCHEME_P_ int indent, pointer x)
3242{
3243 int c;
3244
3245 if (is_syntax (x))
3246 {
3247 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3248 return 8 + 8;
3249 }
3250
3251 if (x == NIL)
3252 {
3253 printf ("%*sNIL\n", indent, "");
3254 return 3;
3255 }
3256
3257 switch (type (x))
3258 {
3259 case T_INTEGER:
3260 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3261 return 32+8;
3262
3263 case T_SYMBOL:
3264 printf ("%*sS<%s>\n", indent, "", symname (x));
3265 return 24+8;
3266
3267 case T_CLOSURE:
3268 printf ("%*sS<%s>\n", indent, "", "closure");
3269 debug (SCHEME_A_ indent + 3, cdr(x));
3270 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3271
3272 case T_PAIR:
3273 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3274 c = debug (SCHEME_A_ indent + 3, car (x));
3275 c += debug (SCHEME_A_ indent + 3, cdr (x));
3276 return c + 1;
3277
3278 case T_PORT:
3279 printf ("%*sS<%s>\n", indent, "", "port");
3280 return 24+8;
3281
3282 case T_VECTOR:
3283 printf ("%*sS<%s>\n", indent, "", "vector");
3284 return 24+8;
3285
3286 case T_ENVIRONMENT:
3287 printf ("%*sS<%s>\n", indent, "", "environment");
3288 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3289
3290 default:
3291 printf ("unhandled type %d\n", type (x));
3292 break;
3293 }
3294}
3295#endif
3296
3297static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3298opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3299{
3300 pointer args = SCHEME_V->args;
3251 pointer x, y; 3301 pointer x, y;
3252 3302
3253 switch (op) 3303 switch (op)
3254 { 3304 {
3305#if EXPERIMENT //D
3306 case OP_DEBUG:
3307 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3308 printf ("\n");
3309 s_return (S_T);
3310#endif
3255 case OP_LOAD: /* load */ 3311 case OP_LOAD: /* load */
3256 if (file_interactive (SCHEME_A)) 3312 if (file_interactive (SCHEME_A))
3257 { 3313 {
3258 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3314 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3259 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3315 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3260 } 3316 }
3261 3317
3262 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3318 if (!file_push (SCHEME_A_ strvalue (car (args))))
3263 Error_1 ("unable to open", car (SCHEME_V->args)); 3319 Error_1 ("unable to open", car (args));
3264 else 3320 else
3265 { 3321 {
3266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3322 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3267 s_goto (OP_T0LVL); 3323 s_goto (OP_T0LVL);
3268 } 3324 }
3269 3325
3270 case OP_T0LVL: /* top level */ 3326 case OP_T0LVL: /* top level */
3271 3327
3272 /* If we reached the end of file, this loop is done. */ 3328 /* If we reached the end of file, this loop is done. */
3273 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3329 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3274 { 3330 {
3275 if (SCHEME_V->file_i == 0) 3331 if (SCHEME_V->file_i == 0)
3276 { 3332 {
3277 SCHEME_V->args = NIL; 3333 SCHEME_V->args = NIL;
3278 s_goto (OP_QUIT); 3334 s_goto (OP_QUIT);
… …
3342 case OP_EVAL: /* main part of evaluation */ 3398 case OP_EVAL: /* main part of evaluation */
3343#if USE_TRACING 3399#if USE_TRACING
3344 if (SCHEME_V->tracing) 3400 if (SCHEME_V->tracing)
3345 { 3401 {
3346 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3402 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3347 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3403 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3348 SCHEME_V->args = SCHEME_V->code; 3404 SCHEME_V->args = SCHEME_V->code;
3349 putstr (SCHEME_A_ "\nEval: "); 3405 putstr (SCHEME_A_ "\nEval: ");
3350 s_goto (OP_P0LIST); 3406 s_goto (OP_P0LIST);
3351 } 3407 }
3352 3408
… …
3356#endif 3412#endif
3357 if (is_symbol (SCHEME_V->code)) /* symbol */ 3413 if (is_symbol (SCHEME_V->code)) /* symbol */
3358 { 3414 {
3359 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3415 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3360 3416
3361 if (x != NIL) 3417 if (x == NIL)
3362 s_return (slot_value_in_env (x));
3363 else
3364 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3418 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3419
3420 s_return (slot_value_in_env (x));
3365 } 3421 }
3366 else if (is_pair (SCHEME_V->code)) 3422 else if (is_pair (SCHEME_V->code))
3367 { 3423 {
3368 x = car (SCHEME_V->code); 3424 x = car (SCHEME_V->code);
3369 3425
… …
3382 } 3438 }
3383 else 3439 else
3384 s_return (SCHEME_V->code); 3440 s_return (SCHEME_V->code);
3385 3441
3386 case OP_E0ARGS: /* eval arguments */ 3442 case OP_E0ARGS: /* eval arguments */
3387 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3443 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3388 { 3444 {
3389 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3445 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3390 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3446 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3391 SCHEME_V->code = SCHEME_V->value; 3447 SCHEME_V->code = SCHEME_V->value;
3392 s_goto (OP_APPLY); 3448 s_goto (OP_APPLY);
… …
3396 SCHEME_V->code = cdr (SCHEME_V->code); 3452 SCHEME_V->code = cdr (SCHEME_V->code);
3397 s_goto (OP_E1ARGS); 3453 s_goto (OP_E1ARGS);
3398 } 3454 }
3399 3455
3400 case OP_E1ARGS: /* eval arguments */ 3456 case OP_E1ARGS: /* eval arguments */
3401 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3457 args = cons (SCHEME_V->value, args);
3402 3458
3403 if (is_pair (SCHEME_V->code)) /* continue */ 3459 if (is_pair (SCHEME_V->code)) /* continue */
3404 { 3460 {
3405 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3461 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3406 SCHEME_V->code = car (SCHEME_V->code); 3462 SCHEME_V->code = car (SCHEME_V->code);
3407 SCHEME_V->args = NIL; 3463 SCHEME_V->args = NIL;
3408 s_goto (OP_EVAL); 3464 s_goto (OP_EVAL);
3409 } 3465 }
3410 else /* end */ 3466 else /* end */
3411 { 3467 {
3412 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3468 args = reverse_in_place (SCHEME_A_ NIL, args);
3413 SCHEME_V->code = car (SCHEME_V->args); 3469 SCHEME_V->code = car (args);
3414 SCHEME_V->args = cdr (SCHEME_V->args); 3470 SCHEME_V->args = cdr (args);
3415 s_goto (OP_APPLY); 3471 s_goto (OP_APPLY);
3416 } 3472 }
3417 3473
3418#if USE_TRACING 3474#if USE_TRACING
3419 3475
3420 case OP_TRACING: 3476 case OP_TRACING:
3421 { 3477 {
3422 int tr = SCHEME_V->tracing; 3478 int tr = SCHEME_V->tracing;
3423 3479
3424 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3480 SCHEME_V->tracing = ivalue_unchecked (car (args));
3425 s_return (mk_integer (SCHEME_A_ tr)); 3481 s_return (mk_integer (SCHEME_A_ tr));
3426 } 3482 }
3427 3483
3428#endif 3484#endif
3429 3485
3430 case OP_APPLY: /* apply 'code' to 'args' */ 3486 case OP_APPLY: /* apply 'code' to 'args' */
3431#if USE_TRACING 3487#if USE_TRACING
3432 if (SCHEME_V->tracing) 3488 if (SCHEME_V->tracing)
3433 { 3489 {
3434 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3490 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3435 SCHEME_V->print_flag = 1; 3491 SCHEME_V->print_flag = 1;
3436 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3492 /* args=cons(SCHEME_V->code,args); */
3437 putstr (SCHEME_A_ "\nApply to: "); 3493 putstr (SCHEME_A_ "\nApply to: ");
3438 s_goto (OP_P0LIST); 3494 s_goto (OP_P0LIST);
3439 } 3495 }
3440 3496
3441 /* fall through */ 3497 /* fall through */
3442 3498
3443 case OP_REAL_APPLY: 3499 case OP_REAL_APPLY:
3444#endif 3500#endif
3445 if (is_proc (SCHEME_V->code)) 3501 if (is_proc (SCHEME_V->code))
3446 {
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3502 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 }
3449 else if (is_foreign (SCHEME_V->code)) 3503 else if (is_foreign (SCHEME_V->code))
3450 { 3504 {
3451 /* Keep nested calls from GC'ing the arglist */ 3505 /* Keep nested calls from GC'ing the arglist */
3452 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3506 push_recent_alloc (SCHEME_A_ args, NIL);
3453 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3507 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3454 3508
3455 s_return (x); 3509 s_return (x);
3456 } 3510 }
3457 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3511 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3458 { 3512 {
3459 /* Should not accept promise */ 3513 /* Should not accept promise */
3460 /* make environment */ 3514 /* make environment */
3461 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3515 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3462 3516
3463 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3517 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3464 { 3518 {
3465 if (y == NIL) 3519 if (y == NIL)
3466 Error_0 ("not enough arguments"); 3520 Error_0 ("not enough arguments");
3467 else 3521 else
3468 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3522 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3486 s_goto (OP_BEGIN); 3540 s_goto (OP_BEGIN);
3487 } 3541 }
3488 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3542 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3489 { 3543 {
3490 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3544 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3491 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3545 s_return (args != NIL ? car (args) : NIL);
3492 } 3546 }
3493 else 3547 else
3494 Error_0 ("illegal function"); 3548 Error_0 ("illegal function");
3495 3549
3496 case OP_DOMACRO: /* do macro */ 3550 case OP_DOMACRO: /* do macro */
3497 SCHEME_V->code = SCHEME_V->value; 3551 SCHEME_V->code = SCHEME_V->value;
3498 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3499
3500#if 1
3501 3553
3502 case OP_LAMBDA: /* lambda */ 3554 case OP_LAMBDA: /* lambda */
3503 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3555 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3504 set SCHEME_V->value fall thru */ 3556 set SCHEME_V->value fall thru */
3505 { 3557 {
3506 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3558 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3507 3559
3508 if (f != NIL) 3560 if (f != NIL)
3509 { 3561 {
3510 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3562 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3511 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3563 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3512 SCHEME_V->code = slot_value_in_env (f); 3564 SCHEME_V->code = slot_value_in_env (f);
3513 s_goto (OP_APPLY); 3565 s_goto (OP_APPLY);
3514 } 3566 }
3515 3567
3516 SCHEME_V->value = SCHEME_V->code; 3568 SCHEME_V->value = SCHEME_V->code;
3517 /* Fallthru */
3518 } 3569 }
3570 /* Fallthru */
3519 3571
3520 case OP_LAMBDA1: 3572 case OP_LAMBDA1:
3521 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3573 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3522 3574
3523#else
3524
3525 case OP_LAMBDA: /* lambda */
3526 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3527
3528#endif
3529
3530 case OP_MKCLOSURE: /* make-closure */ 3575 case OP_MKCLOSURE: /* make-closure */
3531 x = car (SCHEME_V->args); 3576 x = car (args);
3532 3577
3533 if (car (x) == SCHEME_V->LAMBDA) 3578 if (car (x) == SCHEME_V->LAMBDA)
3534 x = cdr (x); 3579 x = cdr (x);
3535 3580
3536 if (cdr (SCHEME_V->args) == NIL) 3581 if (cdr (args) == NIL)
3537 y = SCHEME_V->envir; 3582 y = SCHEME_V->envir;
3538 else 3583 else
3539 y = cadr (SCHEME_V->args); 3584 y = cadr (args);
3540 3585
3541 s_return (mk_closure (SCHEME_A_ x, y)); 3586 s_return (mk_closure (SCHEME_A_ x, y));
3542 3587
3543 case OP_QUOTE: /* quote */ 3588 case OP_QUOTE: /* quote */
3544 s_return (car (SCHEME_V->code)); 3589 s_return (car (SCHEME_V->code));
… …
3576 3621
3577 3622
3578 case OP_DEFP: /* defined? */ 3623 case OP_DEFP: /* defined? */
3579 x = SCHEME_V->envir; 3624 x = SCHEME_V->envir;
3580 3625
3581 if (cdr (SCHEME_V->args) != NIL) 3626 if (cdr (args) != NIL)
3582 x = cadr (SCHEME_V->args); 3627 x = cadr (args);
3583 3628
3584 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3585 3630
3586 case OP_SET0: /* set! */ 3631 case OP_SET0: /* set! */
3587 if (is_immutable (car (SCHEME_V->code))) 3632 if (is_immutable (car (SCHEME_V->code)))
3588 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3589 3634
… …
3620 3665
3621 case OP_IF1: /* if */ 3666 case OP_IF1: /* if */
3622 if (is_true (SCHEME_V->value)) 3667 if (is_true (SCHEME_V->value))
3623 SCHEME_V->code = car (SCHEME_V->code); 3668 SCHEME_V->code = car (SCHEME_V->code);
3624 else 3669 else
3625 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3626
3627 * car(NIL) = NIL */
3628 s_goto (OP_EVAL); 3671 s_goto (OP_EVAL);
3629 3672
3630 case OP_LET0: /* let */ 3673 case OP_LET0: /* let */
3631 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3632 SCHEME_V->value = SCHEME_V->code; 3675 SCHEME_V->value = SCHEME_V->code;
3633 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3676 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3634 s_goto (OP_LET1); 3677 s_goto (OP_LET1);
3635 3678
3636 case OP_LET1: /* let (calculate parameters) */ 3679 case OP_LET1: /* let (calculate parameters) */
3637 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3680 args = cons (SCHEME_V->value, args);
3638 3681
3639 if (is_pair (SCHEME_V->code)) /* continue */ 3682 if (is_pair (SCHEME_V->code)) /* continue */
3640 { 3683 {
3641 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3684 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3642 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3685 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3643 3686
3644 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3687 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3645 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3646 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3647 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3648 } 3691 }
3649 else /* end */ 3692 else /* end */
3650 { 3693 {
3651 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3694 args = reverse_in_place (SCHEME_A_ NIL, args);
3652 SCHEME_V->code = car (SCHEME_V->args); 3695 SCHEME_V->code = car (args);
3653 SCHEME_V->args = cdr (SCHEME_V->args); 3696 SCHEME_V->args = cdr (args);
3654 s_goto (OP_LET2); 3697 s_goto (OP_LET2);
3655 } 3698 }
3656 3699
3657 case OP_LET2: /* let */ 3700 case OP_LET2: /* let */
3658 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3701 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3659 3702
3660 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3703 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3661 y != NIL; x = cdr (x), y = cdr (y)) 3704 y != NIL; x = cdr (x), y = cdr (y))
3662 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3705 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3663 3706
3664 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3707 if (is_symbol (car (SCHEME_V->code))) /* named let */
3665 { 3708 {
3666 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3709 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3667 { 3710 {
3668 if (!is_pair (x)) 3711 if (!is_pair (x))
3669 Error_1 ("Bad syntax of binding in let :", x); 3712 Error_1 ("Bad syntax of binding in let :", x);
3670 3713
3671 if (!is_list (SCHEME_A_ car (x))) 3714 if (!is_list (SCHEME_A_ car (x)))
3672 Error_1 ("Bad syntax of binding in let :", car (x)); 3715 Error_1 ("Bad syntax of binding in let :", car (x));
3673 3716
3674 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3717 args = cons (caar (x), args);
3675 } 3718 }
3676 3719
3677 x =
3678 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3720 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3679 SCHEME_V->envir); 3721 SCHEME_V->envir);
3680 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3722 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3681 SCHEME_V->code = cddr (SCHEME_V->code); 3723 SCHEME_V->code = cddr (SCHEME_V->code);
3682 SCHEME_V->args = NIL;
3683 } 3724 }
3684 else 3725 else
3685 { 3726 {
3686 SCHEME_V->code = cdr (SCHEME_V->code); 3727 SCHEME_V->code = cdr (SCHEME_V->code);
3728 }
3729
3687 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3688 }
3689
3690 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
3691 3732
3692 case OP_LET0AST: /* let* */ 3733 case OP_LET0AST: /* let* */
3693 if (car (SCHEME_V->code) == NIL) 3734 if (car (SCHEME_V->code) == NIL)
3694 { 3735 {
… …
3712 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3753 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3713 SCHEME_V->code = cdr (SCHEME_V->code); 3754 SCHEME_V->code = cdr (SCHEME_V->code);
3714 3755
3715 if (is_pair (SCHEME_V->code)) /* continue */ 3756 if (is_pair (SCHEME_V->code)) /* continue */
3716 { 3757 {
3717 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3758 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3718 SCHEME_V->code = cadar (SCHEME_V->code); 3759 SCHEME_V->code = cadar (SCHEME_V->code);
3719 SCHEME_V->args = NIL; 3760 SCHEME_V->args = NIL;
3720 s_goto (OP_EVAL); 3761 s_goto (OP_EVAL);
3721 } 3762 }
3722 else /* end */ 3763 else /* end */
3723 { 3764 {
3724 SCHEME_V->code = SCHEME_V->args; 3765 SCHEME_V->code = args;
3725 SCHEME_V->args = NIL; 3766 SCHEME_V->args = NIL;
3726 s_goto (OP_BEGIN); 3767 s_goto (OP_BEGIN);
3727 } 3768 }
3728 3769
3729 case OP_LET0REC: /* letrec */ 3770 case OP_LET0REC: /* letrec */
… …
3732 SCHEME_V->value = SCHEME_V->code; 3773 SCHEME_V->value = SCHEME_V->code;
3733 SCHEME_V->code = car (SCHEME_V->code); 3774 SCHEME_V->code = car (SCHEME_V->code);
3734 s_goto (OP_LET1REC); 3775 s_goto (OP_LET1REC);
3735 3776
3736 case OP_LET1REC: /* letrec (calculate parameters) */ 3777 case OP_LET1REC: /* letrec (calculate parameters) */
3737 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3778 args = cons (SCHEME_V->value, args);
3738 3779
3739 if (is_pair (SCHEME_V->code)) /* continue */ 3780 if (is_pair (SCHEME_V->code)) /* continue */
3740 { 3781 {
3741 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3782 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3742 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3783 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3743 3784
3744 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3785 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3745 SCHEME_V->code = cadar (SCHEME_V->code); 3786 SCHEME_V->code = cadar (SCHEME_V->code);
3746 SCHEME_V->args = NIL; 3787 SCHEME_V->args = NIL;
3747 s_goto (OP_EVAL); 3788 s_goto (OP_EVAL);
3748 } 3789 }
3749 else /* end */ 3790 else /* end */
3750 { 3791 {
3751 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3792 args = reverse_in_place (SCHEME_A_ NIL, args);
3752 SCHEME_V->code = car (SCHEME_V->args); 3793 SCHEME_V->code = car (args);
3753 SCHEME_V->args = cdr (SCHEME_V->args); 3794 SCHEME_V->args = cdr (args);
3754 s_goto (OP_LET2REC); 3795 s_goto (OP_LET2REC);
3755 } 3796 }
3756 3797
3757 case OP_LET2REC: /* letrec */ 3798 case OP_LET2REC: /* letrec */
3758 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3799 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3759 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3800 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3760 3801
3761 SCHEME_V->code = cdr (SCHEME_V->code); 3802 SCHEME_V->code = cdr (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3763 s_goto (OP_BEGIN); 3804 s_goto (OP_BEGIN);
… …
3849 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3890 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3850 SCHEME_V->code = car (SCHEME_V->code); 3891 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3892 s_goto (OP_EVAL);
3852 3893
3853 case OP_C1STREAM: /* cons-stream */ 3894 case OP_C1STREAM: /* cons-stream */
3854 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3895 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3855 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3896 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3856 set_typeflag (x, T_PROMISE); 3897 set_typeflag (x, T_PROMISE);
3857 s_return (cons (SCHEME_V->args, x)); 3898 s_return (cons (args, x));
3858 3899
3859 case OP_MACRO0: /* macro */ 3900 case OP_MACRO0: /* macro */
3860 if (is_pair (car (SCHEME_V->code))) 3901 if (is_pair (car (SCHEME_V->code)))
3861 { 3902 {
3862 x = caar (SCHEME_V->code); 3903 x = caar (SCHEME_V->code);
… …
3895 { 3936 {
3896 if (!is_pair (y = caar (x))) 3937 if (!is_pair (y = caar (x)))
3897 break; 3938 break;
3898 3939
3899 for (; y != NIL; y = cdr (y)) 3940 for (; y != NIL; y = cdr (y))
3900 {
3901 if (eqv (car (y), SCHEME_V->value)) 3941 if (eqv (car (y), SCHEME_V->value))
3902 break; 3942 break;
3903 }
3904 3943
3905 if (y != NIL) 3944 if (y != NIL)
3906 break; 3945 break;
3907 } 3946 }
3908 3947
… …
3928 s_goto (OP_BEGIN); 3967 s_goto (OP_BEGIN);
3929 else 3968 else
3930 s_return (NIL); 3969 s_return (NIL);
3931 3970
3932 case OP_PAPPLY: /* apply */ 3971 case OP_PAPPLY: /* apply */
3933 SCHEME_V->code = car (SCHEME_V->args); 3972 SCHEME_V->code = car (args);
3934 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3973 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3935 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3974 /*SCHEME_V->args = cadr(args); */
3936 s_goto (OP_APPLY); 3975 s_goto (OP_APPLY);
3937 3976
3938 case OP_PEVAL: /* eval */ 3977 case OP_PEVAL: /* eval */
3939 if (cdr (SCHEME_V->args) != NIL) 3978 if (cdr (args) != NIL)
3940 SCHEME_V->envir = cadr (SCHEME_V->args); 3979 SCHEME_V->envir = cadr (args);
3941 3980
3942 SCHEME_V->code = car (SCHEME_V->args); 3981 SCHEME_V->code = car (args);
3943 s_goto (OP_EVAL); 3982 s_goto (OP_EVAL);
3944 3983
3945 case OP_CONTINUATION: /* call-with-current-continuation */ 3984 case OP_CONTINUATION: /* call-with-current-continuation */
3946 SCHEME_V->code = car (SCHEME_V->args); 3985 SCHEME_V->code = car (args);
3947 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3986 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3948 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3949 } 3988 }
3950 3989
3951 return S_T; 3990 if (USE_ERROR_CHECKING) abort ();
3952} 3991}
3953 3992
3954static pointer 3993static int
3955opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3994opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3956{ 3995{
3957 pointer x; 3996 pointer args = SCHEME_V->args;
3997 pointer x = car (args);
3958 num v; 3998 num v;
3959 3999
4000 switch (op)
4001 {
3960#if USE_MATH 4002#if USE_MATH
3961 RVALUE dd;
3962#endif
3963
3964 switch (op)
3965 {
3966#if USE_MATH
3967
3968 case OP_INEX2EX: /* inexact->exact */ 4003 case OP_INEX2EX: /* inexact->exact */
3969 x = car (SCHEME_V->args); 4004 {
3970
3971 if (num_is_integer (x)) 4005 if (is_integer (x))
3972 s_return (x); 4006 s_return (x);
3973 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4007
4008 RVALUE r = rvalue_unchecked (x);
4009
4010 if (r == (RVALUE)(IVALUE)r)
3974 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4011 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3975 else 4012 else
3976 Error_1 ("inexact->exact: not integral:", x); 4013 Error_1 ("inexact->exact: not integral:", x);
4014 }
3977 4015
3978 case OP_EXP:
3979 x = car (SCHEME_V->args);
3980 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4016 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3981
3982 case OP_LOG:
3983 x = car (SCHEME_V->args);
3984 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4017 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3985
3986 case OP_SIN:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4018 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3989
3990 case OP_COS:
3991 x = car (SCHEME_V->args);
3992 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4019 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3993
3994 case OP_TAN:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4020 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3997
3998 case OP_ASIN:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4021 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4001
4002 case OP_ACOS:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4022 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4005 4023
4006 case OP_ATAN: 4024 case OP_ATAN:
4007 x = car (SCHEME_V->args);
4008
4009 if (cdr (SCHEME_V->args) == NIL) 4025 if (cdr (args) == NIL)
4010 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4011 else 4027 else
4012 { 4028 {
4013 pointer y = cadr (SCHEME_V->args); 4029 pointer y = cadr (args);
4014
4015 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4030 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4016 } 4031 }
4017 4032
4018 case OP_SQRT: 4033 case OP_SQRT:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4034 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4021 4035
4022 case OP_EXPT: 4036 case OP_EXPT:
4023 { 4037 {
4024 RVALUE result; 4038 RVALUE result;
4025 int real_result = 1; 4039 int real_result = 1;
4026 pointer y = cadr (SCHEME_V->args); 4040 pointer y = cadr (args);
4027 4041
4028 x = car (SCHEME_V->args);
4029
4030 if (num_is_integer (x) && num_is_integer (y)) 4042 if (is_integer (x) && is_integer (y))
4031 real_result = 0; 4043 real_result = 0;
4032 4044
4033 /* This 'if' is an R5RS compatibility fix. */ 4045 /* This 'if' is an R5RS compatibility fix. */
4034 /* NOTE: Remove this 'if' fix for R6RS. */ 4046 /* NOTE: Remove this 'if' fix for R6RS. */
4035 if (rvalue (x) == 0 && rvalue (y) < 0) 4047 if (rvalue (x) == 0 && rvalue (y) < 0)
4036 result = 0.0; 4048 result = 0;
4037 else 4049 else
4038 result = pow (rvalue (x), rvalue (y)); 4050 result = pow (rvalue (x), rvalue (y));
4039 4051
4040 /* Before returning integer result make sure we can. */ 4052 /* Before returning integer result make sure we can. */
4041 /* If the test fails, result is too big for integer. */ 4053 /* If the test fails, result is too big for integer. */
4042 if (!real_result) 4054 if (!real_result)
4043 { 4055 {
4044 long result_as_long = (long) result; 4056 long result_as_long = result;
4045 4057
4046 if (result != (RVALUE) result_as_long) 4058 if (result != result_as_long)
4047 real_result = 1; 4059 real_result = 1;
4048 } 4060 }
4049 4061
4050 if (real_result) 4062 if (real_result)
4051 s_return (mk_real (SCHEME_A_ result)); 4063 s_return (mk_real (SCHEME_A_ result));
4052 else 4064 else
4053 s_return (mk_integer (SCHEME_A_ result)); 4065 s_return (mk_integer (SCHEME_A_ result));
4054 } 4066 }
4055 4067
4056 case OP_FLOOR:
4057 x = car (SCHEME_V->args);
4058 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4068 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4059
4060 case OP_CEILING:
4061 x = car (SCHEME_V->args);
4062 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4069 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4063 4070 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4064 case OP_TRUNCATE:
4065 {
4066 RVALUE rvalue_of_x;
4067
4068 x = car (SCHEME_V->args);
4069 rvalue_of_x = rvalue (x);
4070
4071 if (rvalue_of_x > 0)
4072 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4073 else
4074 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4071 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4075 }
4076
4077 case OP_ROUND:
4078 x = car (SCHEME_V->args);
4079
4080 if (num_is_integer (x))
4081 s_return (x);
4082
4083 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4084#endif 4072#endif
4085 4073
4086 case OP_ADD: /* + */ 4074 case OP_ADD: /* + */
4087 v = num_zero; 4075 v = num_zero;
4088 4076
4089 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4077 for (x = args; x != NIL; x = cdr (x))
4090 v = num_op ('+', v, nvalue (car (x))); 4078 v = num_op (NUM_ADD, v, nvalue (car (x)));
4091 4079
4092 s_return (mk_number (SCHEME_A_ v)); 4080 s_return (mk_number (SCHEME_A_ v));
4093 4081
4094 case OP_MUL: /* * */ 4082 case OP_MUL: /* * */
4095 v = num_one; 4083 v = num_one;
4096 4084
4097 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4085 for (x = args; x != NIL; x = cdr (x))
4098 v = num_op ('+', v, nvalue (car (x))); 4086 v = num_op (NUM_MUL, v, nvalue (car (x)));
4099 4087
4100 s_return (mk_number (SCHEME_A_ v)); 4088 s_return (mk_number (SCHEME_A_ v));
4101 4089
4102 case OP_SUB: /* - */ 4090 case OP_SUB: /* - */
4103 if (cdr (SCHEME_V->args) == NIL) 4091 if (cdr (args) == NIL)
4104 { 4092 {
4105 x = SCHEME_V->args; 4093 x = args;
4106 v = num_zero; 4094 v = num_zero;
4107 } 4095 }
4108 else 4096 else
4109 { 4097 {
4110 x = cdr (SCHEME_V->args); 4098 x = cdr (args);
4111 v = nvalue (car (SCHEME_V->args)); 4099 v = nvalue (car (args));
4112 } 4100 }
4113 4101
4114 for (; x != NIL; x = cdr (x)) 4102 for (; x != NIL; x = cdr (x))
4115 v = num_op ('+', v, nvalue (car (x))); 4103 v = num_op (NUM_SUB, v, nvalue (car (x)));
4116 4104
4117 s_return (mk_number (SCHEME_A_ v)); 4105 s_return (mk_number (SCHEME_A_ v));
4118 4106
4119 case OP_DIV: /* / */ 4107 case OP_DIV: /* / */
4120 if (cdr (SCHEME_V->args) == NIL) 4108 if (cdr (args) == NIL)
4121 { 4109 {
4122 x = SCHEME_V->args; 4110 x = args;
4123 v = num_one; 4111 v = num_one;
4124 } 4112 }
4125 else 4113 else
4126 { 4114 {
4127 x = cdr (SCHEME_V->args); 4115 x = cdr (args);
4128 v = nvalue (car (SCHEME_V->args)); 4116 v = nvalue (car (args));
4129 } 4117 }
4130 4118
4131 for (; x != NIL; x = cdr (x)) 4119 for (; x != NIL; x = cdr (x))
4132 {
4133 if (!is_zero_rvalue (rvalue (car (x)))) 4120 if (!is_zero_rvalue (rvalue (car (x))))
4134 v = num_div (v, nvalue (car (x))); 4121 v = num_div (v, nvalue (car (x)));
4135 else 4122 else
4136 Error_0 ("/: division by zero"); 4123 Error_0 ("/: division by zero");
4137 }
4138 4124
4139 s_return (mk_number (SCHEME_A_ v)); 4125 s_return (mk_number (SCHEME_A_ v));
4140 4126
4141 case OP_INTDIV: /* quotient */ 4127 case OP_INTDIV: /* quotient */
4142 if (cdr (SCHEME_V->args) == NIL) 4128 if (cdr (args) == NIL)
4143 { 4129 {
4144 x = SCHEME_V->args; 4130 x = args;
4145 v = num_one; 4131 v = num_one;
4146 } 4132 }
4147 else 4133 else
4148 { 4134 {
4149 x = cdr (SCHEME_V->args); 4135 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4136 v = nvalue (car (args));
4151 } 4137 }
4152 4138
4153 for (; x != NIL; x = cdr (x)) 4139 for (; x != NIL; x = cdr (x))
4154 { 4140 {
4155 if (ivalue (car (x)) != 0) 4141 if (ivalue (car (x)) != 0)
4156 v = num_op ('/', v, nvalue (car (x))); 4142 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4157 else 4143 else
4158 Error_0 ("quotient: division by zero"); 4144 Error_0 ("quotient: division by zero");
4159 } 4145 }
4160 4146
4161 s_return (mk_number (SCHEME_A_ v)); 4147 s_return (mk_number (SCHEME_A_ v));
4162 4148
4163 case OP_REM: /* remainder */ 4149 case OP_REM: /* remainder */
4164 v = nvalue (car (SCHEME_V->args)); 4150 v = nvalue (x);
4165 4151
4166 if (ivalue (cadr (SCHEME_V->args)) != 0) 4152 if (ivalue (cadr (args)) != 0)
4167 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4153 v = num_rem (v, nvalue (cadr (args)));
4168 else 4154 else
4169 Error_0 ("remainder: division by zero"); 4155 Error_0 ("remainder: division by zero");
4170 4156
4171 s_return (mk_number (SCHEME_A_ v)); 4157 s_return (mk_number (SCHEME_A_ v));
4172 4158
4173 case OP_MOD: /* modulo */ 4159 case OP_MOD: /* modulo */
4174 v = nvalue (car (SCHEME_V->args)); 4160 v = nvalue (x);
4175 4161
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4162 if (ivalue (cadr (args)) != 0)
4177 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4163 v = num_mod (v, nvalue (cadr (args)));
4178 else 4164 else
4179 Error_0 ("modulo: division by zero"); 4165 Error_0 ("modulo: division by zero");
4180 4166
4181 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4182 4168
4183 case OP_CAR: /* car */ 4169 /* the compiler will optimize this mess... */
4184 s_return (caar (SCHEME_V->args)); 4170 case OP_CAR: op_car: s_return (car (x));
4185 4171 case OP_CDR: op_cdr: s_return (cdr (x));
4186 case OP_CDR: /* cdr */ 4172 case OP_CAAR: op_caar: x = car (x); goto op_car;
4187 s_return (cdar (SCHEME_V->args)); 4173 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4174 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4175 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4176 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4177 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4178 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4179 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4180 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4181 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4182 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4183 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4184 case OP_CAAAAR: x = car (x); goto op_caaar;
4185 case OP_CAAADR: x = cdr (x); goto op_caaar;
4186 case OP_CAADAR: x = car (x); goto op_caadr;
4187 case OP_CAADDR: x = cdr (x); goto op_caadr;
4188 case OP_CADAAR: x = car (x); goto op_cadar;
4189 case OP_CADADR: x = cdr (x); goto op_cadar;
4190 case OP_CADDAR: x = car (x); goto op_caddr;
4191 case OP_CADDDR: x = cdr (x); goto op_caddr;
4192 case OP_CDAAAR: x = car (x); goto op_cdaar;
4193 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4194 case OP_CDADAR: x = car (x); goto op_cdadr;
4195 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4196 case OP_CDDAAR: x = car (x); goto op_cddar;
4197 case OP_CDDADR: x = cdr (x); goto op_cddar;
4198 case OP_CDDDAR: x = car (x); goto op_cdddr;
4199 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4188 4200
4189 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4190 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4191 s_return (SCHEME_V->args); 4203 s_return (args);
4192 4204
4193 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4194 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4195 { 4207 {
4196 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4197 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4198 } 4210 }
4199 else 4211 else
4200 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4201 4213
4202 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4203 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4204 { 4216 {
4205 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4206 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4207 } 4219 }
4208 else 4220 else
4209 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4210 4222
4211 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4212 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4213 4225
4214 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4215 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4216 4228
4217 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4218 { 4230 {
4219 unsigned char c = ivalue (car (SCHEME_V->args)); 4231 unsigned char c = ivalue_unchecked (x);
4220 c = toupper (c); 4232 c = toupper (c);
4221 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4222 } 4234 }
4223 4235
4224 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4225 { 4237 {
4226 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4227 c = tolower (c); 4239 c = tolower (c);
4228 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4229 } 4241 }
4230 4242
4231 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4232 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4233 4245
4234 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4235 { 4247 {
4236 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4237 long pf = 0; 4249 long pf = 0;
4238 4250
4239 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4240 { 4252 {
4241 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4242 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4243 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4244 4256
4245 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4246 { 4258 {
4247 /* base is OK */ 4259 /* base is OK */
4248 } 4260 }
4249 else 4261 else
4250 pf = -1; 4262 pf = -1;
4251 } 4263 }
4252 4264
4253 if (pf < 0) 4265 if (pf < 0)
4254 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4255 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4256 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4257 else 4269 else
4258 { 4270 {
4259 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
… …
4270 } 4282 }
4271 } 4283 }
4272 } 4284 }
4273 4285
4274 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4275 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4276 setimmutable (x); 4288 setimmutable (x);
4277 s_return (x); 4289 s_return (x);
4278 4290
4279 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4280 { 4292 {
4281 long pf = 0; 4293 long pf = 0;
4282 4294
4283 x = car (SCHEME_V->args);
4284
4285 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4286 { 4296 {
4287 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4288 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4289 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4290 4300
4291 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4292 { 4302 {
4293 /* base is OK */ 4303 /* base is OK */
4294 } 4304 }
4295 else 4305 else
4296 pf = -1; 4306 pf = -1;
4297 } 4307 }
4298 4308
4299 if (pf < 0) 4309 if (pf < 0)
4300 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4301 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4302 { 4312 {
4303 char *p; 4313 char *p;
4304 int len; 4314 int len;
4305 4315
… …
4310 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4311 } 4321 }
4312 4322
4313 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4314 { 4324 {
4315 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4316 int len; 4326 int len = ivalue_unchecked (x);
4317 4327
4318 len = ivalue (car (SCHEME_V->args));
4319
4320 if (cdr (SCHEME_V->args) != NIL)
4321 fill = charvalue (cadr (SCHEME_V->args));
4322
4323 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4324 } 4329 }
4325 4330
4326 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4327 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4328 4333
4329 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4330 { 4335 {
4331 char *str; 4336 char *str = strvalue (x);
4332 int index;
4333
4334 str = strvalue (car (SCHEME_V->args));
4335
4336 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4337 4338
4338 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4339 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4340 4341
4341 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4342 } 4343 }
4343 4344
4344 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4345 { 4346 {
4346 char *str; 4347 char *str = strvalue (x);
4347 int index; 4348 int index = ivalue_unchecked (cadr (args));
4348 int c; 4349 int c;
4349 4350
4350 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4351 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4352 4353
4353 str = strvalue (car (SCHEME_V->args));
4354
4355 index = ivalue (cadr (SCHEME_V->args));
4356
4357 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4358 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4359 4356
4360 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4361 4358
4362 str[index] = (char) c; 4359 str[index] = c;
4363 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4364 } 4361 }
4365 4362
4366 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4367 { 4364 {
4368 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4365 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4369 int len = 0; 4366 int len = 0;
4370 pointer newstr; 4367 pointer newstr;
4371 char *pos; 4368 char *pos;
4372 4369
4373 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4374 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4375 len += strlength (car (x)); 4372 len += strlength (car (x));
4376 4373
4377 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4378 4375
4379 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4380 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4377 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4379
4383 s_return (newstr); 4380 s_return (newstr);
4384 } 4381 }
4385 4382
4386 case OP_SUBSTR: /* substring */ 4383 case OP_SUBSTR: /* substring */
4387 { 4384 {
4388 char *str; 4385 char *str = strvalue (x);
4389 int index0; 4386 int index0 = ivalue_unchecked (cadr (args));
4390 int index1; 4387 int index1;
4391 int len; 4388 int len;
4392 4389
4393 str = strvalue (car (SCHEME_V->args));
4394
4395 index0 = ivalue (cadr (SCHEME_V->args));
4396
4397 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4398 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4391 Error_1 ("substring: start out of bounds:", cadr (args));
4399 4392
4400 if (cddr (SCHEME_V->args) != NIL) 4393 if (cddr (args) != NIL)
4401 { 4394 {
4402 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4403 4396
4404 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4405 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("substring: end out of bounds:", caddr (args));
4406 } 4399 }
4407 else 4400 else
4408 index1 = strlength (car (SCHEME_V->args)); 4401 index1 = strlength (x);
4409 4402
4410 len = index1 - index0; 4403 len = index1 - index0;
4411 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_empty_string (SCHEME_A_ len, ' ');
4412 memcpy (strvalue (x), str + index0, len); 4405 memcpy (strvalue (x), str + index0, len);
4413 strvalue (x)[len] = 0; 4406 strvalue (x)[len] = 0;
… …
4417 4410
4418 case OP_VECTOR: /* vector */ 4411 case OP_VECTOR: /* vector */
4419 { 4412 {
4420 int i; 4413 int i;
4421 pointer vec; 4414 pointer vec;
4422 int len = list_length (SCHEME_A_ SCHEME_V->args); 4415 int len = list_length (SCHEME_A_ args);
4423 4416
4424 if (len < 0) 4417 if (len < 0)
4425 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4418 Error_1 ("vector: not a proper list:", args);
4426 4419
4427 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4428 4421
4429#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4430 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
4431 s_return (S_SINK); 4424 s_return (S_SINK);
4432#endif 4425#endif
4433 4426
4434 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4427 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4435 set_vector_elem (vec, i, car (x)); 4428 vector_set (vec, i, car (x));
4436 4429
4437 s_return (vec); 4430 s_return (vec);
4438 } 4431 }
4439 4432
4440 case OP_MKVECTOR: /* make-vector */ 4433 case OP_MKVECTOR: /* make-vector */
4441 { 4434 {
4442 pointer fill = NIL; 4435 pointer fill = NIL;
4443 int len;
4444 pointer vec; 4436 pointer vec;
4437 int len = ivalue_unchecked (x);
4445 4438
4446 len = ivalue (car (SCHEME_V->args));
4447
4448 if (cdr (SCHEME_V->args) != NIL) 4439 if (cdr (args) != NIL)
4449 fill = cadr (SCHEME_V->args); 4440 fill = cadr (args);
4450 4441
4451 vec = mk_vector (SCHEME_A_ len); 4442 vec = mk_vector (SCHEME_A_ len);
4452 4443
4453#if USE_ERROR_CHECKING 4444#if USE_ERROR_CHECKING
4454 if (SCHEME_V->no_memory) 4445 if (SCHEME_V->no_memory)
4455 s_return (S_SINK); 4446 s_return (S_SINK);
4456#endif 4447#endif
4457 4448
4458 if (fill != NIL) 4449 if (fill != NIL)
4459 fill_vector (vec, fill); 4450 fill_vector (vec, 0, fill);
4460 4451
4461 s_return (vec); 4452 s_return (vec);
4462 } 4453 }
4463 4454
4464 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4465 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4456 s_return (mk_integer (SCHEME_A_ veclength (x)));
4457
4458 case OP_VECRESIZE:
4459 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4460 s_return (x);
4466 4461
4467 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4468 { 4463 {
4469 int index;
4470
4471 index = ivalue (cadr (SCHEME_V->args)); 4464 int index = ivalue_unchecked (cadr (args));
4472 4465
4473 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4474 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4467 Error_1 ("vector-ref: out of bounds:", cadr (args));
4475 4468
4476 s_return (vector_elem (car (SCHEME_V->args), index)); 4469 s_return (vector_get (x, index));
4477 } 4470 }
4478 4471
4479 case OP_VECSET: /* vector-set! */ 4472 case OP_VECSET: /* vector-set! */
4480 { 4473 {
4481 int index; 4474 int index = ivalue_unchecked (cadr (args));
4482 4475
4483 if (is_immutable (car (SCHEME_V->args))) 4476 if (is_immutable (x))
4484 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4477 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4485 4478
4486 index = ivalue (cadr (SCHEME_V->args));
4487
4488 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4479 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4489 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4480 Error_1 ("vector-set!: out of bounds:", cadr (args));
4490 4481
4491 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4482 vector_set (x, index, caddr (args));
4492 s_return (car (SCHEME_V->args)); 4483 s_return (x);
4493 } 4484 }
4494 } 4485 }
4495 4486
4496 return S_T; 4487 if (USE_ERROR_CHECKING) abort ();
4497} 4488}
4498 4489
4499INTERFACE int 4490static int
4500is_list (SCHEME_P_ pointer a) 4491opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4501{ 4492{
4502 return list_length (SCHEME_A_ a) >= 0; 4493 pointer x = SCHEME_V->args;
4503}
4504 4494
4505/* Result is: 4495 for (;;)
4506 proper list: length
4507 circular list: -1
4508 not even a pair: -2
4509 dotted list: -2 minus length before dot
4510*/
4511INTERFACE int
4512list_length (SCHEME_P_ pointer a)
4513{
4514 int i = 0;
4515 pointer slow, fast;
4516
4517 slow = fast = a;
4518
4519 while (1)
4520 { 4496 {
4497 num v = nvalue (car (x));
4498 x = cdr (x);
4499
4521 if (fast == NIL) 4500 if (x == NIL)
4522 return i; 4501 break;
4523 4502
4524 if (!is_pair (fast)) 4503 int r = num_cmp (v, nvalue (car (x)));
4525 return -2 - i;
4526 4504
4527 fast = cdr (fast); 4505 switch (op)
4528 ++i;
4529
4530 if (fast == NIL)
4531 return i;
4532
4533 if (!is_pair (fast))
4534 return -2 - i;
4535
4536 ++i;
4537 fast = cdr (fast);
4538
4539 /* Safe because we would have already returned if `fast'
4540 encountered a non-pair. */
4541 slow = cdr (slow);
4542
4543 if (fast == slow)
4544 { 4506 {
4545 /* the fast pointer has looped back around and caught up 4507 case OP_NUMEQ: r = r == 0; break;
4546 with the slow pointer, hence the structure is circular, 4508 case OP_LESS: r = r < 0; break;
4547 not of finite length, and therefore not a list */ 4509 case OP_GRE: r = r > 0; break;
4548 return -1; 4510 case OP_LEQ: r = r <= 0; break;
4511 case OP_GEQ: r = r >= 0; break;
4549 } 4512 }
4550 }
4551}
4552 4513
4514 if (!r)
4515 s_return (S_F);
4516 }
4517
4518 s_return (S_T);
4519}
4520
4553static pointer 4521static int
4554opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4522opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4523{
4556 pointer x; 4524 pointer args = SCHEME_V->args;
4557 num v; 4525 pointer a = car (args);
4558 int (*comp_func) (num, num); 4526 pointer d = cdr (args);
4527 int r;
4559 4528
4560 switch (op) 4529 switch (op)
4561 { 4530 {
4562 case OP_NOT: /* not */ 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 s_retbool (is_false (car (SCHEME_V->args))); 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4564 4542
4565 case OP_BOOLP: /* boolean? */
4566 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4567
4568 case OP_EOFOBJP: /* boolean? */
4569 s_retbool (car (SCHEME_V->args) == S_EOF);
4570
4571 case OP_NULLP: /* null? */
4572 s_retbool (car (SCHEME_V->args) == NIL);
4573
4574 case OP_NUMEQ: /* = */
4575 case OP_LESS: /* < */
4576 case OP_GRE: /* > */
4577 case OP_LEQ: /* <= */
4578 case OP_GEQ: /* >= */
4579 switch (op)
4580 {
4581 case OP_NUMEQ:
4582 comp_func = num_eq;
4583 break;
4584
4585 case OP_LESS:
4586 comp_func = num_lt;
4587 break;
4588
4589 case OP_GRE:
4590 comp_func = num_gt;
4591 break;
4592
4593 case OP_LEQ:
4594 comp_func = num_le;
4595 break;
4596
4597 case OP_GEQ:
4598 comp_func = num_ge;
4599 break;
4600 }
4601
4602 x = SCHEME_V->args;
4603 v = nvalue (car (x));
4604 x = cdr (x);
4605
4606 for (; x != NIL; x = cdr (x))
4607 {
4608 if (!comp_func (v, nvalue (car (x))))
4609 s_retbool (0);
4610
4611 v = nvalue (car (x));
4612 }
4613
4614 s_retbool (1);
4615
4616 case OP_SYMBOLP: /* symbol? */
4617 s_retbool (is_symbol (car (SCHEME_V->args)));
4618
4619 case OP_NUMBERP: /* number? */
4620 s_retbool (is_number (car (SCHEME_V->args)));
4621
4622 case OP_STRINGP: /* string? */
4623 s_retbool (is_string (car (SCHEME_V->args)));
4624
4625 case OP_INTEGERP: /* integer? */
4626 s_retbool (is_integer (car (SCHEME_V->args)));
4627
4628 case OP_REALP: /* real? */
4629 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4630
4631 case OP_CHARP: /* char? */
4632 s_retbool (is_character (car (SCHEME_V->args)));
4633#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4634 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4635 case OP_CHARAP: /* char-alphabetic? */ 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4636 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4637 4547 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4638 case OP_CHARNP: /* char-numeric? */ 4548 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4639 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4640
4641 case OP_CHARWP: /* char-whitespace? */
4642 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4643
4644 case OP_CHARUP: /* char-upper-case? */
4645 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4646
4647 case OP_CHARLP: /* char-lower-case? */
4648 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4649#endif 4549#endif
4550
4650#if USE_PORTS 4551#if USE_PORTS
4651 4552 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4652 case OP_PORTP: /* port? */
4653 s_retbool (is_port (car (SCHEME_V->args)));
4654
4655 case OP_INPORTP: /* input-port? */ 4553 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4656 s_retbool (is_inport (car (SCHEME_V->args)));
4657
4658 case OP_OUTPORTP: /* output-port? */ 4554 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4659 s_retbool (is_outport (car (SCHEME_V->args)));
4660#endif 4555#endif
4661 4556
4662 case OP_PROCP: /* procedure? */ 4557 case OP_PROCP: /* procedure? */
4663 4558
4664 /*-- 4559 /*--
4665 * continuation should be procedure by the example 4560 * continuation should be procedure by the example
4666 * (call-with-current-continuation procedure?) ==> #t 4561 * (call-with-current-continuation procedure?) ==> #t
4667 * in R^3 report sec. 6.9 4562 * in R^3 report sec. 6.9
4668 */ 4563 */
4669 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4564 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4670 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4565 break;
4671 4566
4672 case OP_PAIRP: /* pair? */ 4567 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4673 s_retbool (is_pair (car (SCHEME_V->args))); 4568 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4674 4569 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4675 case OP_LISTP: /* list? */ 4570 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4676 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4571 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4677 4572 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4678 case OP_ENVP: /* environment? */
4679 s_retbool (is_environment (car (SCHEME_V->args)));
4680
4681 case OP_VECTORP: /* vector? */
4682 s_retbool (is_vector (car (SCHEME_V->args)));
4683
4684 case OP_EQ: /* eq? */
4685 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4686
4687 case OP_EQV: /* eqv? */
4688 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4689 } 4573 }
4690 4574
4691 return S_T; 4575 s_retbool (r);
4692} 4576}
4693 4577
4694static pointer 4578static int
4695opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4579opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4696{ 4580{
4581 pointer args = SCHEME_V->args;
4582 pointer a = car (args);
4697 pointer x, y; 4583 pointer x, y;
4698 4584
4699 switch (op) 4585 switch (op)
4700 { 4586 {
4701 case OP_FORCE: /* force */ 4587 case OP_FORCE: /* force */
4702 SCHEME_V->code = car (SCHEME_V->args); 4588 SCHEME_V->code = a;
4703 4589
4704 if (is_promise (SCHEME_V->code)) 4590 if (is_promise (SCHEME_V->code))
4705 { 4591 {
4706 /* Should change type to closure here */ 4592 /* Should change type to closure here */
4707 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4593 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4710 } 4596 }
4711 else 4597 else
4712 s_return (SCHEME_V->code); 4598 s_return (SCHEME_V->code);
4713 4599
4714 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4715 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4601 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4716 s_return (SCHEME_V->value); 4602 s_return (SCHEME_V->value);
4717 4603
4718#if USE_PORTS 4604#if USE_PORTS
4719 4605
4720 case OP_WRITE: /* write */ 4606 case OP_WRITE: /* write */
… …
4728 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4614 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4729 SCHEME_V->outport = cadr (SCHEME_V->args); 4615 SCHEME_V->outport = cadr (SCHEME_V->args);
4730 } 4616 }
4731 } 4617 }
4732 4618
4733 SCHEME_V->args = car (SCHEME_V->args); 4619 SCHEME_V->args = a;
4734 4620
4735 if (op == OP_WRITE) 4621 if (op == OP_WRITE)
4736 SCHEME_V->print_flag = 1; 4622 SCHEME_V->print_flag = 1;
4737 else 4623 else
4738 SCHEME_V->print_flag = 0; 4624 SCHEME_V->print_flag = 0;
4739 4625
4740 s_goto (OP_P0LIST); 4626 s_goto (OP_P0LIST);
4741 4627
4742 case OP_NEWLINE: /* newline */ 4628 case OP_NEWLINE: /* newline */
4743 if (is_pair (SCHEME_V->args)) 4629 if (is_pair (args))
4744 { 4630 {
4745 if (car (SCHEME_V->args) != SCHEME_V->outport) 4631 if (a != SCHEME_V->outport)
4746 { 4632 {
4747 x = cons (SCHEME_V->outport, NIL); 4633 x = cons (SCHEME_V->outport, NIL);
4748 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4749 SCHEME_V->outport = car (SCHEME_V->args); 4635 SCHEME_V->outport = a;
4750 } 4636 }
4751 } 4637 }
4752 4638
4753 putstr (SCHEME_A_ "\n"); 4639 putstr (SCHEME_A_ "\n");
4754 s_return (S_T); 4640 s_return (S_T);
4755#endif 4641#endif
4756 4642
4757 case OP_ERR0: /* error */ 4643 case OP_ERR0: /* error */
4758 SCHEME_V->retcode = -1; 4644 SCHEME_V->retcode = -1;
4759 4645
4760 if (!is_string (car (SCHEME_V->args))) 4646 if (!is_string (a))
4761 { 4647 {
4762 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4648 args = cons (mk_string (SCHEME_A_ " -- "), args);
4763 setimmutable (car (SCHEME_V->args)); 4649 setimmutable (car (args));
4764 } 4650 }
4765 4651
4766 putstr (SCHEME_A_ "Error: "); 4652 putstr (SCHEME_A_ "Error: ");
4767 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4653 putstr (SCHEME_A_ strvalue (car (args)));
4768 SCHEME_V->args = cdr (SCHEME_V->args); 4654 SCHEME_V->args = cdr (args);
4769 s_goto (OP_ERR1); 4655 s_goto (OP_ERR1);
4770 4656
4771 case OP_ERR1: /* error */ 4657 case OP_ERR1: /* error */
4772 putstr (SCHEME_A_ " "); 4658 putstr (SCHEME_A_ " ");
4773 4659
4774 if (SCHEME_V->args != NIL) 4660 if (args != NIL)
4775 { 4661 {
4776 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4777 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4778 SCHEME_V->print_flag = 1; 4664 SCHEME_V->print_flag = 1;
4779 s_goto (OP_P0LIST); 4665 s_goto (OP_P0LIST);
4780 } 4666 }
4781 else 4667 else
4782 { 4668 {
4783 putstr (SCHEME_A_ "\n"); 4669 putstr (SCHEME_A_ "\n");
4784 4670
4785 if (SCHEME_V->interactive_repl) 4671 if (SCHEME_V->interactive_repl)
4786 s_goto (OP_T0LVL); 4672 s_goto (OP_T0LVL);
4787 else 4673 else
4788 return NIL; 4674 return -1;
4789 } 4675 }
4790 4676
4791 case OP_REVERSE: /* reverse */ 4677 case OP_REVERSE: /* reverse */
4792 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4678 s_return (reverse (SCHEME_A_ a));
4793 4679
4794 case OP_LIST_STAR: /* list* */ 4680 case OP_LIST_STAR: /* list* */
4795 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4681 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4796 4682
4797 case OP_APPEND: /* append */ 4683 case OP_APPEND: /* append */
4798 x = NIL; 4684 x = NIL;
4799 y = SCHEME_V->args; 4685 y = args;
4800 4686
4801 if (y == x) 4687 if (y == x)
4802 s_return (x); 4688 s_return (x);
4803 4689
4804 /* cdr() in the while condition is not a typo. If car() */ 4690 /* cdr() in the while condition is not a typo. If car() */
… …
4815 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4701 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4816 4702
4817#if USE_PLIST 4703#if USE_PLIST
4818 4704
4819 case OP_PUT: /* put */ 4705 case OP_PUT: /* put */
4820 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4706 if (!hasprop (a) || !hasprop (cadr (args)))
4821 Error_0 ("illegal use of put"); 4707 Error_0 ("illegal use of put");
4822 4708
4823 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4709 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4824 { 4710 {
4825 if (caar (x) == y) 4711 if (caar (x) == y)
4826 break; 4712 break;
4827 } 4713 }
4828 4714
4829 if (x != NIL) 4715 if (x != NIL)
4830 cdar (x) = caddr (SCHEME_V->args); 4716 cdar (x) = caddr (args);
4831 else 4717 else
4832 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4718 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4833 4719
4834 s_return (S_T); 4720 s_return (S_T);
4835 4721
4836 case OP_GET: /* get */ 4722 case OP_GET: /* get */
4837 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4723 if (!hasprop (a) || !hasprop (cadr (args)))
4838 Error_0 ("illegal use of get"); 4724 Error_0 ("illegal use of get");
4839 4725
4840 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4726 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4841 if (caar (x) == y) 4727 if (caar (x) == y)
4842 break; 4728 break;
4843 4729
4844 if (x != NIL) 4730 if (x != NIL)
4845 s_return (cdar (x)); 4731 s_return (cdar (x));
… …
4847 s_return (NIL); 4733 s_return (NIL);
4848 4734
4849#endif /* USE_PLIST */ 4735#endif /* USE_PLIST */
4850 4736
4851 case OP_QUIT: /* quit */ 4737 case OP_QUIT: /* quit */
4852 if (is_pair (SCHEME_V->args)) 4738 if (is_pair (args))
4853 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4739 SCHEME_V->retcode = ivalue (a);
4854 4740
4855 return NIL; 4741 return -1;
4856 4742
4857 case OP_GC: /* gc */ 4743 case OP_GC: /* gc */
4858 gc (SCHEME_A_ NIL, NIL); 4744 gc (SCHEME_A_ NIL, NIL);
4859 s_return (S_T); 4745 s_return (S_T);
4860 4746
4861 case OP_GCVERB: /* gc-verbose */ 4747 case OP_GCVERB: /* gc-verbose */
4862 { 4748 {
4863 int was = SCHEME_V->gc_verbose; 4749 int was = SCHEME_V->gc_verbose;
4864 4750
4865 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4751 SCHEME_V->gc_verbose = (a != S_F);
4866 s_retbool (was); 4752 s_retbool (was);
4867 } 4753 }
4868 4754
4869 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
4756#if 0
4870 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4757 if (!is_pair (args) || !is_number (a))
4871 Error_0 ("new-segment: argument must be a number"); 4758 Error_0 ("new-segment: argument must be a number");
4872 4759#endif
4873 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4760 s_retbool (alloc_cellseg (SCHEME_A));
4874
4875 s_return (S_T);
4876 4761
4877 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
4878 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
4879 4764
4880#if USE_PORTS 4765#if USE_PORTS
… …
4905 case OP_OPEN_INOUTFILE: 4790 case OP_OPEN_INOUTFILE:
4906 prop = port_input | port_output; 4791 prop = port_input | port_output;
4907 break; 4792 break;
4908 } 4793 }
4909 4794
4910 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4795 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4911 4796
4912 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
4913 s_return (S_F);
4914
4915 s_return (p);
4916 } 4798 }
4917 4799
4918# if USE_STRING_PORTS 4800# if USE_STRING_PORTS
4919 4801
4920 case OP_OPEN_INSTRING: /* open-input-string */ 4802 case OP_OPEN_INSTRING: /* open-input-string */
… …
4932 case OP_OPEN_INOUTSTRING: 4814 case OP_OPEN_INOUTSTRING:
4933 prop = port_input | port_output; 4815 prop = port_input | port_output;
4934 break; 4816 break;
4935 } 4817 }
4936 4818
4937 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4819 p = port_from_string (SCHEME_A_ strvalue (a),
4938 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4820 strvalue (a) + strlength (a), prop);
4939 4821
4940 if (p == NIL) 4822 s_return (p == NIL ? S_F : p);
4941 s_return (S_F);
4942
4943 s_return (p);
4944 } 4823 }
4945 4824
4946 case OP_OPEN_OUTSTRING: /* open-output-string */ 4825 case OP_OPEN_OUTSTRING: /* open-output-string */
4947 { 4826 {
4948 pointer p; 4827 pointer p;
4949 4828
4950 if (car (SCHEME_V->args) == NIL) 4829 if (a == NIL)
4951 {
4952 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4953
4954 if (p == NIL)
4955 s_return (S_F);
4956 }
4957 else 4831 else
4958 {
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4833 strvalue (a) + strlength (a), port_output);
4961 4834
4962 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964 }
4965
4966 s_return (p);
4967 } 4836 }
4968 4837
4969 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
4970 { 4839 {
4971 port *p; 4840 port *p = port (a);
4972 4841
4973 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4842 if (p->kind & port_string)
4974 { 4843 {
4975 off_t size; 4844 off_t size;
4976 char *str; 4845 char *str;
4977 4846
4978 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4994 } 4863 }
4995 4864
4996# endif 4865# endif
4997 4866
4998 case OP_CLOSE_INPORT: /* close-input-port */ 4867 case OP_CLOSE_INPORT: /* close-input-port */
4999 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4868 port_close (SCHEME_A_ a, port_input);
5000 s_return (S_T); 4869 s_return (S_T);
5001 4870
5002 case OP_CLOSE_OUTPORT: /* close-output-port */ 4871 case OP_CLOSE_OUTPORT: /* close-output-port */
5003 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4872 port_close (SCHEME_A_ a, port_output);
5004 s_return (S_T); 4873 s_return (S_T);
5005#endif 4874#endif
5006 4875
5007 case OP_INT_ENV: /* interaction-environment */ 4876 case OP_INT_ENV: /* interaction-environment */
5008 s_return (SCHEME_V->global_env); 4877 s_return (SCHEME_V->global_env);
… …
5010 case OP_CURR_ENV: /* current-environment */ 4879 case OP_CURR_ENV: /* current-environment */
5011 s_return (SCHEME_V->envir); 4880 s_return (SCHEME_V->envir);
5012 4881
5013 } 4882 }
5014 4883
5015 return S_T; 4884 if (USE_ERROR_CHECKING) abort ();
5016} 4885}
5017 4886
5018static pointer 4887static int
5019opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4888opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5020{ 4889{
4890 pointer args = SCHEME_V->args;
5021 pointer x; 4891 pointer x;
5022 4892
5023 if (SCHEME_V->nesting != 0) 4893 if (SCHEME_V->nesting != 0)
5024 { 4894 {
5025 int n = SCHEME_V->nesting; 4895 int n = SCHEME_V->nesting;
… …
5032 switch (op) 4902 switch (op)
5033 { 4903 {
5034 /* ========== reading part ========== */ 4904 /* ========== reading part ========== */
5035#if USE_PORTS 4905#if USE_PORTS
5036 case OP_READ: 4906 case OP_READ:
5037 if (!is_pair (SCHEME_V->args)) 4907 if (!is_pair (args))
5038 s_goto (OP_READ_INTERNAL); 4908 s_goto (OP_READ_INTERNAL);
5039 4909
5040 if (!is_inport (car (SCHEME_V->args))) 4910 if (!is_inport (car (args)))
5041 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4911 Error_1 ("read: not an input port:", car (args));
5042 4912
5043 if (car (SCHEME_V->args) == SCHEME_V->inport) 4913 if (car (args) == SCHEME_V->inport)
5044 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5045 4915
5046 x = SCHEME_V->inport; 4916 x = SCHEME_V->inport;
5047 SCHEME_V->inport = car (SCHEME_V->args); 4917 SCHEME_V->inport = car (args);
5048 x = cons (x, NIL); 4918 x = cons (x, NIL);
5049 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4919 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5050 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5051 4921
5052 case OP_READ_CHAR: /* read-char */ 4922 case OP_READ_CHAR: /* read-char */
5053 case OP_PEEK_CHAR: /* peek-char */ 4923 case OP_PEEK_CHAR: /* peek-char */
5054 { 4924 {
5055 int c; 4925 int c;
5056 4926
5057 if (is_pair (SCHEME_V->args)) 4927 if (is_pair (args))
5058 { 4928 {
5059 if (car (SCHEME_V->args) != SCHEME_V->inport) 4929 if (car (args) != SCHEME_V->inport)
5060 { 4930 {
5061 x = SCHEME_V->inport; 4931 x = SCHEME_V->inport;
5062 x = cons (x, NIL); 4932 x = cons (x, NIL);
5063 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5064 SCHEME_V->inport = car (SCHEME_V->args); 4934 SCHEME_V->inport = car (args);
5065 } 4935 }
5066 } 4936 }
5067 4937
5068 c = inchar (SCHEME_A); 4938 c = inchar (SCHEME_A);
5069 4939
… …
5079 case OP_CHAR_READY: /* char-ready? */ 4949 case OP_CHAR_READY: /* char-ready? */
5080 { 4950 {
5081 pointer p = SCHEME_V->inport; 4951 pointer p = SCHEME_V->inport;
5082 int res; 4952 int res;
5083 4953
5084 if (is_pair (SCHEME_V->args)) 4954 if (is_pair (args))
5085 p = car (SCHEME_V->args); 4955 p = car (args);
5086 4956
5087 res = p->object.port->kind & port_string; 4957 res = port (p)->kind & port_string;
5088 4958
5089 s_retbool (res); 4959 s_retbool (res);
5090 } 4960 }
5091 4961
5092 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
5093 SCHEME_V->inport = car (SCHEME_V->args); 4963 SCHEME_V->inport = car (args);
5094 s_return (SCHEME_V->value); 4964 s_return (SCHEME_V->value);
5095 4965
5096 case OP_SET_OUTPORT: /* set-output-port */ 4966 case OP_SET_OUTPORT: /* set-output-port */
5097 SCHEME_V->outport = car (SCHEME_V->args); 4967 SCHEME_V->outport = car (args);
5098 s_return (SCHEME_V->value); 4968 s_return (SCHEME_V->value);
5099#endif 4969#endif
5100 4970
5101 case OP_RDSEXPR: 4971 case OP_RDSEXPR:
5102 switch (SCHEME_V->tok) 4972 switch (SCHEME_V->tok)
… …
5151 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5152 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
5153 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
5154 5024
5155 case TOK_ATOM: 5025 case TOK_ATOM:
5156 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5026 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5027
5028 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031
5032 case TOK_STRATOM:
5033 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5157 5036
5158 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
5159 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
5160 5039
5161 if (x == S_F) 5040 if (x == S_F)
5162 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
5163 5042
5164 setimmutable (x); 5043 setimmutable (x);
… …
5176 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
5177 } 5056 }
5178 } 5057 }
5179 5058
5180 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
5181 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5182 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
5183 else 5062 else
5184 s_return (x); 5063 s_return (x);
5185 5064
5186 default: 5065 default:
… …
5188 } 5067 }
5189 5068
5190 break; 5069 break;
5191 5070
5192 case OP_RDLIST: 5071 case OP_RDLIST:
5193 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5072 SCHEME_V->args = cons (SCHEME_V->value, args);
5194 SCHEME_V->tok = token (SCHEME_A); 5073 SCHEME_V->tok = token (SCHEME_A);
5195 5074
5196 switch (SCHEME_V->tok) 5075 switch (SCHEME_V->tok)
5197 { 5076 {
5198 case TOK_EOF: 5077 case TOK_EOF:
… …
5226 case OP_RDDOT: 5105 case OP_RDDOT:
5227 if (token (SCHEME_A) != TOK_RPAREN) 5106 if (token (SCHEME_A) != TOK_RPAREN)
5228 Error_0 ("syntax error: illegal dot expression"); 5107 Error_0 ("syntax error: illegal dot expression");
5229 5108
5230 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5109 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5231 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5110 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5232 5111
5233 case OP_RDQUOTE: 5112 case OP_RDQUOTE:
5234 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5113 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5235 5114
5236 case OP_RDQQUOTE: 5115 case OP_RDQQUOTE:
… …
5258 SCHEME_V->args = SCHEME_V->value; 5137 SCHEME_V->args = SCHEME_V->value;
5259 s_goto (OP_VECTOR); 5138 s_goto (OP_VECTOR);
5260 5139
5261 /* ========== printing part ========== */ 5140 /* ========== printing part ========== */
5262 case OP_P0LIST: 5141 case OP_P0LIST:
5263 if (is_vector (SCHEME_V->args)) 5142 if (is_vector (args))
5264 { 5143 {
5265 putstr (SCHEME_A_ "#("); 5144 putstr (SCHEME_A_ "#(");
5266 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5145 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5267 s_goto (OP_PVECFROM); 5146 s_goto (OP_PVECFROM);
5268 } 5147 }
5269 else if (is_environment (SCHEME_V->args)) 5148 else if (is_environment (args))
5270 { 5149 {
5271 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5150 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5272 s_return (S_T); 5151 s_return (S_T);
5273 } 5152 }
5274 else if (!is_pair (SCHEME_V->args)) 5153 else if (!is_pair (args))
5275 { 5154 {
5276 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5155 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5277 s_return (S_T); 5156 s_return (S_T);
5278 } 5157 }
5279 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5158 else
5280 { 5159 {
5160 pointer a = car (args);
5161 pointer b = cdr (args);
5162 int ok_abbr = ok_abbrev (b);
5163 SCHEME_V->args = car (b);
5164
5165 if (a == SCHEME_V->QUOTE && ok_abbr)
5281 putstr (SCHEME_A_ "'"); 5166 putstr (SCHEME_A_ "'");
5282 SCHEME_V->args = cadr (SCHEME_V->args); 5167 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ "`");
5169 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5170 putstr (SCHEME_A_ ",");
5171 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5172 putstr (SCHEME_A_ ",@");
5173 else
5174 {
5175 putstr (SCHEME_A_ "(");
5176 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5177 SCHEME_V->args = a;
5178 }
5179
5283 s_goto (OP_P0LIST); 5180 s_goto (OP_P0LIST);
5284 } 5181 }
5285 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5182
5183 case OP_P1LIST:
5184 if (is_pair (args))
5286 { 5185 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5287 putstr (SCHEME_A_ "`"); 5187 putstr (SCHEME_A_ " ");
5288 SCHEME_V->args = cadr (SCHEME_V->args); 5188 SCHEME_V->args = car (args);
5289 s_goto (OP_P0LIST); 5189 s_goto (OP_P0LIST);
5290 } 5190 }
5291 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5292 {
5293 putstr (SCHEME_A_ ",");
5294 SCHEME_V->args = cadr (SCHEME_V->args);
5295 s_goto (OP_P0LIST);
5296 }
5297 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5298 {
5299 putstr (SCHEME_A_ ",@");
5300 SCHEME_V->args = cadr (SCHEME_V->args);
5301 s_goto (OP_P0LIST);
5302 }
5303 else
5304 {
5305 putstr (SCHEME_A_ "(");
5306 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5307 SCHEME_V->args = car (SCHEME_V->args);
5308 s_goto (OP_P0LIST);
5309 }
5310
5311 case OP_P1LIST:
5312 if (is_pair (SCHEME_V->args))
5313 {
5314 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5315 putstr (SCHEME_A_ " ");
5316 SCHEME_V->args = car (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (is_vector (SCHEME_V->args)) 5191 else if (is_vector (args))
5320 { 5192 {
5321 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5193 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5322 putstr (SCHEME_A_ " . "); 5194 putstr (SCHEME_A_ " . ");
5323 s_goto (OP_P0LIST); 5195 s_goto (OP_P0LIST);
5324 } 5196 }
5325 else 5197 else
5326 { 5198 {
5327 if (SCHEME_V->args != NIL) 5199 if (args != NIL)
5328 { 5200 {
5329 putstr (SCHEME_A_ " . "); 5201 putstr (SCHEME_A_ " . ");
5330 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5331 } 5203 }
5332 5204
5333 putstr (SCHEME_A_ ")"); 5205 putstr (SCHEME_A_ ")");
5334 s_return (S_T); 5206 s_return (S_T);
5335 } 5207 }
5336 5208
5337 case OP_PVECFROM: 5209 case OP_PVECFROM:
5338 { 5210 {
5339 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5211 int i = ivalue_unchecked (cdr (args));
5340 pointer vec = car (SCHEME_V->args); 5212 pointer vec = car (args);
5341 int len = veclength (vec); 5213 int len = veclength (vec);
5342 5214
5343 if (i == len) 5215 if (i == len)
5344 { 5216 {
5345 putstr (SCHEME_A_ ")"); 5217 putstr (SCHEME_A_ ")");
5346 s_return (S_T); 5218 s_return (S_T);
5347 } 5219 }
5348 else 5220 else
5349 { 5221 {
5350 pointer elem = vector_elem (vec, i); 5222 pointer elem = vector_get (vec, i);
5351 5223
5352 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5224 ivalue_unchecked (cdr (args)) = i + 1;
5353 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5354 SCHEME_V->args = elem; 5226 SCHEME_V->args = elem;
5355 5227
5356 if (i > 0) 5228 if (i > 0)
5357 putstr (SCHEME_A_ " "); 5229 putstr (SCHEME_A_ " ");
5358 5230
5359 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5360 } 5232 }
5361 } 5233 }
5362 } 5234 }
5363 5235
5364 return S_T; 5236 if (USE_ERROR_CHECKING) abort ();
5365} 5237}
5366 5238
5367static pointer 5239static int
5368opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5240opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5369{ 5241{
5242 pointer args = SCHEME_V->args;
5243 pointer a = car (args);
5370 pointer x, y; 5244 pointer x, y;
5371 5245
5372 switch (op) 5246 switch (op)
5373 { 5247 {
5374 case OP_LIST_LENGTH: /* length *//* a.k */ 5248 case OP_LIST_LENGTH: /* length *//* a.k */
5375 { 5249 {
5376 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5250 long v = list_length (SCHEME_A_ a);
5377 5251
5378 if (v < 0) 5252 if (v < 0)
5379 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5253 Error_1 ("length: not a list:", a);
5380 5254
5381 s_return (mk_integer (SCHEME_A_ v)); 5255 s_return (mk_integer (SCHEME_A_ v));
5382 } 5256 }
5383 5257
5384 case OP_ASSQ: /* assq *//* a.k */ 5258 case OP_ASSQ: /* assq *//* a.k */
5385 x = car (SCHEME_V->args); 5259 x = a;
5386 5260
5387 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5261 for (y = cadr (args); is_pair (y); y = cdr (y))
5388 { 5262 {
5389 if (!is_pair (car (y))) 5263 if (!is_pair (car (y)))
5390 Error_0 ("unable to handle non pair element"); 5264 Error_0 ("unable to handle non pair element");
5391 5265
5392 if (x == caar (y)) 5266 if (x == caar (y))
… …
5398 else 5272 else
5399 s_return (S_F); 5273 s_return (S_F);
5400 5274
5401 5275
5402 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5403 SCHEME_V->args = car (SCHEME_V->args); 5277 SCHEME_V->args = a;
5404 5278
5405 if (SCHEME_V->args == NIL) 5279 if (SCHEME_V->args == NIL)
5406 s_return (S_F); 5280 s_return (S_F);
5407 else if (is_closure (SCHEME_V->args)) 5281 else if (is_closure (SCHEME_V->args))
5408 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5413 5287
5414 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5415 /* 5289 /*
5416 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5417 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5418 */ 5293 */
5419 s_retbool (is_closure (car (SCHEME_V->args))); 5294 s_retbool (is_closure (a));
5420 5295
5421 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5422 s_retbool (is_macro (car (SCHEME_V->args))); 5297 s_retbool (is_macro (a));
5423 } 5298 }
5424 5299
5425 return S_T; /* NOTREACHED */ 5300 if (USE_ERROR_CHECKING) abort ();
5426} 5301}
5427 5302
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5428typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5429 5305
5430typedef int (*test_predicate) (pointer); 5306typedef int (*test_predicate)(pointer);
5431static int 5307static int
5432is_any (pointer p) 5308tst_any (pointer p)
5433{ 5309{
5434 return 1; 5310 return 1;
5435} 5311}
5436 5312
5437static int 5313static int
5438is_nonneg (pointer p) 5314tst_inonneg (pointer p)
5439{ 5315{
5440 return ivalue (p) >= 0 && is_integer (p); 5316 return is_integer (p) && ivalue_unchecked (p) >= 0;
5317}
5318
5319static int
5320tst_is_list (SCHEME_P_ pointer p)
5321{
5322 return p == NIL || is_pair (p);
5441} 5323}
5442 5324
5443/* Correspond carefully with following defines! */ 5325/* Correspond carefully with following defines! */
5444static struct 5326static struct
5445{ 5327{
5446 test_predicate fct; 5328 test_predicate fct;
5447 const char *kind; 5329 const char *kind;
5448} tests[] = 5330} tests[] = {
5449{ 5331 { tst_any , 0 },
5450 { 0, 0}, /* unused */ 5332 { is_string , "string" },
5451 { is_any, 0}, 5333 { is_symbol , "symbol" },
5452 { is_string, "string" }, 5334 { is_port , "port" },
5453 { is_symbol, "symbol" },
5454 { is_port, "port" },
5455 { is_inport, "input port" }, 5335 { is_inport , "input port" },
5456 { is_outport, "output port" }, 5336 { is_outport , "output port" },
5457 { is_environment, "environment" }, 5337 { is_environment, "environment" },
5458 { is_pair, "pair" }, 5338 { is_pair , "pair" },
5459 { 0, "pair or '()" }, 5339 { 0 , "pair or '()" },
5460 { is_character, "character" }, 5340 { is_character , "character" },
5461 { is_vector, "vector" }, 5341 { is_vector , "vector" },
5462 { is_number, "number" }, 5342 { is_number , "number" },
5463 { is_integer, "integer" }, 5343 { is_integer , "integer" },
5464 { is_nonneg, "non-negative integer" } 5344 { tst_inonneg , "non-negative integer" }
5465}; 5345};
5466 5346
5467#define TST_NONE 0 5347#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5468#define TST_ANY "\001" 5348#define TST_ANY "\001"
5469#define TST_STRING "\002" 5349#define TST_STRING "\002"
5470#define TST_SYMBOL "\003" 5350#define TST_SYMBOL "\003"
5471#define TST_PORT "\004" 5351#define TST_PORT "\004"
5472#define TST_INPORT "\005" 5352#define TST_INPORT "\005"
5473#define TST_OUTPORT "\006" 5353#define TST_OUTPORT "\006"
5474#define TST_ENVIRONMENT "\007" 5354#define TST_ENVIRONMENT "\007"
5475#define TST_PAIR "\010" 5355#define TST_PAIR "\010"
5476#define TST_LIST "\011" 5356#define TST_LIST "\011"
5477#define TST_CHAR "\012" 5357#define TST_CHAR "\012"
5478#define TST_VECTOR "\013" 5358#define TST_VECTOR "\013"
5479#define TST_NUMBER "\014" 5359#define TST_NUMBER "\014"
5480#define TST_INTEGER "\015" 5360#define TST_INTEGER "\015"
5481#define TST_NATURAL "\016" 5361#define TST_NATURAL "\016"
5362
5363#define INF_ARG 0xff
5364#define UNNAMED_OP ""
5365
5366static const char opnames[] =
5367#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5368#include "opdefines.h"
5369#undef OP_DEF
5370;
5371
5372static const char *
5373opname (int idx)
5374{
5375 const char *name = opnames;
5376
5377 /* should do this at compile time, but would require external program, right? */
5378 while (idx--)
5379 name += strlen (name) + 1;
5380
5381 return *name ? name : "ILLEGAL";
5382}
5383
5384static const char *
5385procname (pointer x)
5386{
5387 return opname (procnum (x));
5388}
5482 5389
5483typedef struct 5390typedef struct
5484{ 5391{
5485 dispatch_func func; 5392 uint8_t func;
5486 char *name; 5393 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5394 uint8_t builtin;
5395#if USE_ERROR_CHECKING
5487 int min_arity; 5396 uint8_t min_arity;
5488 int max_arity; 5397 uint8_t max_arity;
5489 char *arg_tests_encoding; 5398 char arg_tests_encoding[3];
5399#endif
5490} op_code_info; 5400} op_code_info;
5491 5401
5492#define INF_ARG 0xffff
5493
5494static op_code_info dispatch_table[] = { 5402static const op_code_info dispatch_table[] = {
5495#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5403#if USE_ERROR_CHECKING
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5405#else
5406#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5407#endif
5496#include "opdefines.h" 5408#include "opdefines.h"
5409#undef OP_DEF
5497 {0} 5410 {0}
5498}; 5411};
5499 5412
5500static const char *
5501procname (pointer x)
5502{
5503 int n = procnum (x);
5504 const char *name = dispatch_table[n].name;
5505
5506 if (name == 0)
5507 name = "ILLEGAL!";
5508
5509 return name;
5510}
5511
5512/* kernel of this interpreter */ 5413/* kernel of this interpreter */
5513static void 5414static void ecb_hot
5514Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5515{ 5416{
5516 SCHEME_V->op = op; 5417 SCHEME_V->op = op;
5517 5418
5518 for (;;) 5419 for (;;)
5519 { 5420 {
5520 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5421 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5521 5422
5522#if USE_ERROR_CHECKING 5423#if USE_ERROR_CHECKING
5523 if (pcd->name) /* if built-in function, check arguments */ 5424 if (pcd->builtin) /* if built-in function, check arguments */
5524 { 5425 {
5525 int ok = 1;
5526 char msg[STRBUFFSIZE]; 5426 char msg[STRBUFFSIZE];
5527 int n = list_length (SCHEME_A_ SCHEME_V->args); 5427 int n = list_length (SCHEME_A_ SCHEME_V->args);
5528 5428
5529 /* Check number of arguments */ 5429 /* Check number of arguments */
5530 if (ecb_expect_false (n < pcd->min_arity)) 5430 if (ecb_expect_false (n < pcd->min_arity))
5531 { 5431 {
5532 ok = 0;
5533 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5432 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5534 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5433 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5535 } 5436 }
5536 else if (ecb_excpect_false (n > pcd->max_arity)) 5437 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5537 { 5438 {
5538 ok = 0;
5539 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5439 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5540 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5440 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5441 xError_1 (SCHEME_A_ msg, 0);
5442 continue;
5541 } 5443 }
5542 5444 else
5543 if (ecb_expect_false (ok))
5544 { 5445 {
5545 if (pcd->arg_tests_encoding) 5446 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5546 { 5447 {
5547 int i = 0; 5448 int i = 0;
5548 int j; 5449 int j;
5549 const char *t = pcd->arg_tests_encoding; 5450 const char *t = pcd->arg_tests_encoding;
5550 pointer arglist = SCHEME_V->args; 5451 pointer arglist = SCHEME_V->args;
5551 5452
5552 do 5453 do
5553 { 5454 {
5554 pointer arg = car (arglist); 5455 pointer arg = car (arglist);
5555 5456
5556 j = (int) t[0]; 5457 j = t[0];
5557 5458
5459 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5558 if (j == TST_LIST[0]) 5460 if (j == TST_LIST[0])
5559 { 5461 {
5560 if (arg != NIL && !is_pair (arg)) 5462 if (!tst_is_list (SCHEME_A_ arg))
5561 break; 5463 break;
5562 } 5464 }
5563 else 5465 else
5564 { 5466 {
5565 if (!tests[j].fct (arg)) 5467 if (!tests[j - 1].fct (arg))
5566 break; 5468 break;
5567 } 5469 }
5568 5470
5569 if (t[1] != 0) /* last test is replicated as necessary */ 5471 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5570 t++; 5472 t++;
5571 5473
5572 arglist = cdr (arglist); 5474 arglist = cdr (arglist);
5573 i++; 5475 i++;
5574 } 5476 }
5575 while (i < n); 5477 while (i < n);
5576 5478
5577 if (i < n) 5479 if (i < n)
5578 { 5480 {
5579 ok = 0;
5580 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5481 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5482 xError_1 (SCHEME_A_ msg, 0);
5483 continue;
5581 } 5484 }
5582 } 5485 }
5583 } 5486 }
5584
5585 if (!ok)
5586 {
5587 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5588 return;
5589
5590 pcd = dispatch_table + SCHEME_V->op;
5591 }
5592 } 5487 }
5593#endif 5488#endif
5594 5489
5595 ok_to_freely_gc (SCHEME_A); 5490 ok_to_freely_gc (SCHEME_A);
5596 5491
5492 static const dispatch_func dispatch_funcs[] = {
5493 opexe_0,
5494 opexe_1,
5495 opexe_2,
5496 opexe_3,
5497 opexe_4,
5498 opexe_5,
5499 opexe_6,
5500 };
5501
5597 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5598 return; 5503 return;
5599 5504
5600 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5601 { 5506 {
5602 xwrstr ("No memory!\n"); 5507 putstr (SCHEME_A_ "No memory!\n");
5603 return; 5508 return;
5604 } 5509 }
5605 } 5510 }
5606} 5511}
5607 5512
… …
5626mk_proc (SCHEME_P_ enum scheme_opcodes op) 5531mk_proc (SCHEME_P_ enum scheme_opcodes op)
5627{ 5532{
5628 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5533 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5629 set_typeflag (y, (T_PROC | T_ATOM)); 5534 set_typeflag (y, (T_PROC | T_ATOM));
5630 ivalue_unchecked (y) = op; 5535 ivalue_unchecked (y) = op;
5631 set_num_integer (y);
5632 return y; 5536 return y;
5633} 5537}
5634 5538
5635/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5636static int 5540static int
5637syntaxnum (pointer p) 5541syntaxnum (pointer p)
5638{ 5542{
5639 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
5640 5544
5641 switch (strlength (car (p))) 5545 switch (strlength (p))
5642 { 5546 {
5643 case 2: 5547 case 2:
5644 if (s[0] == 'i') 5548 if (s[0] == 'i')
5645 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
5646 else 5550 else
… …
5701 return OP_C0STREAM; /* cons-stream */ 5605 return OP_C0STREAM; /* cons-stream */
5702 } 5606 }
5703} 5607}
5704 5608
5705#if USE_MULTIPLICITY 5609#if USE_MULTIPLICITY
5706scheme * 5610ecb_cold scheme *
5707scheme_init_new () 5611scheme_init_new ()
5708{ 5612{
5709 scheme *sc = malloc (sizeof (scheme)); 5613 scheme *sc = malloc (sizeof (scheme));
5710 5614
5711 if (!scheme_init (SCHEME_A)) 5615 if (!scheme_init (SCHEME_A))
… …
5716 else 5620 else
5717 return sc; 5621 return sc;
5718} 5622}
5719#endif 5623#endif
5720 5624
5721int 5625ecb_cold int
5722scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
5723{ 5627{
5724 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5725 pointer x; 5629 pointer x;
5630
5631 /* this memset is not strictly correct, as we assume (intcache)
5632 * that memset 0 will also set pointers to 0, but memset does
5633 * of course not guarantee that. screw such systems.
5634 */
5635 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5726 5636
5727 num_set_fixnum (num_zero, 1); 5637 num_set_fixnum (num_zero, 1);
5728 num_set_ivalue (num_zero, 0); 5638 num_set_ivalue (num_zero, 0);
5729 num_set_fixnum (num_one, 1); 5639 num_set_fixnum (num_one, 1);
5730 num_set_ivalue (num_one, 1); 5640 num_set_ivalue (num_one, 1);
… …
5742 SCHEME_V->save_inport = NIL; 5652 SCHEME_V->save_inport = NIL;
5743 SCHEME_V->loadport = NIL; 5653 SCHEME_V->loadport = NIL;
5744 SCHEME_V->nesting = 0; 5654 SCHEME_V->nesting = 0;
5745 SCHEME_V->interactive_repl = 0; 5655 SCHEME_V->interactive_repl = 0;
5746 5656
5747 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5657 if (!alloc_cellseg (SCHEME_A))
5748 { 5658 {
5749#if USE_ERROR_CHECKING 5659#if USE_ERROR_CHECKING
5750 SCHEME_V->no_memory = 1; 5660 SCHEME_V->no_memory = 1;
5751 return 0; 5661 return 0;
5752#endif 5662#endif
… …
5799 5709
5800 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5710 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5801 assign_syntax (SCHEME_A_ syntax_names[i]); 5711 assign_syntax (SCHEME_A_ syntax_names[i]);
5802 } 5712 }
5803 5713
5714 // TODO: should iterate via strlen, to avoid n² complexity
5804 for (i = 0; i < n; i++) 5715 for (i = 0; i < n; i++)
5805 if (dispatch_table[i].name != 0) 5716 if (dispatch_table[i].builtin)
5806 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5717 assign_proc (SCHEME_A_ i, opname (i));
5807 5718
5808 /* initialization of global pointers to special symbols */ 5719 /* initialization of global pointers to special symbols */
5809 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5720 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5810 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5721 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5811 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5722 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5850scheme_set_external_data (SCHEME_P_ void *p) 5761scheme_set_external_data (SCHEME_P_ void *p)
5851{ 5762{
5852 SCHEME_V->ext_data = p; 5763 SCHEME_V->ext_data = p;
5853} 5764}
5854 5765
5855void 5766ecb_cold void
5856scheme_deinit (SCHEME_P) 5767scheme_deinit (SCHEME_P)
5857{ 5768{
5858 int i; 5769 int i;
5859 5770
5860#if SHOW_ERROR_LINE 5771#if SHOW_ERROR_LINE
… …
5952{ 5863{
5953 dump_stack_reset (SCHEME_A); 5864 dump_stack_reset (SCHEME_A);
5954 SCHEME_V->envir = SCHEME_V->global_env; 5865 SCHEME_V->envir = SCHEME_V->global_env;
5955 SCHEME_V->file_i = 0; 5866 SCHEME_V->file_i = 0;
5956 SCHEME_V->load_stack[0].kind = port_input | port_string; 5867 SCHEME_V->load_stack[0].kind = port_input | port_string;
5957 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5868 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5958 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5869 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5959 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5870 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5960#if USE_PORTS 5871#if USE_PORTS
5961 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5872 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5962#endif 5873#endif
5963 SCHEME_V->retcode = 0; 5874 SCHEME_V->retcode = 0;
5964 SCHEME_V->interactive_repl = 0; 5875 SCHEME_V->interactive_repl = 0;
… …
6081# endif 5992# endif
6082 int fin; 5993 int fin;
6083 char *file_name = InitFile; 5994 char *file_name = InitFile;
6084 int retcode; 5995 int retcode;
6085 int isfile = 1; 5996 int isfile = 1;
5997 system ("ps v $PPID");//D
6086 5998
6087 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5999 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6088 { 6000 {
6089 xwrstr ("Usage: tinyscheme -?\n"); 6001 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6090 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6002 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6091 xwrstr ("followed by\n"); 6003 putstr (SCHEME_A_ "followed by\n");
6092 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6004 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6093 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6005 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6094 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6006 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6095 xwrstr ("Use - as filename for stdin.\n"); 6007 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6096 return 1; 6008 return 1;
6097 } 6009 }
6098 6010
6099 if (!scheme_init (SCHEME_A)) 6011 if (!scheme_init (SCHEME_A))
6100 { 6012 {
6101 xwrstr ("Could not initialize!\n"); 6013 putstr (SCHEME_A_ "Could not initialize!\n");
6102 return 2; 6014 return 2;
6103 } 6015 }
6104 6016
6105# if USE_PORTS 6017# if USE_PORTS
6106 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6018 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6151 fin = open (file_name, O_RDONLY); 6063 fin = open (file_name, O_RDONLY);
6152#endif 6064#endif
6153 6065
6154 if (isfile && fin < 0) 6066 if (isfile && fin < 0)
6155 { 6067 {
6156 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6068 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6157 } 6069 }
6158 else 6070 else
6159 { 6071 {
6160 if (isfile) 6072 if (isfile)
6161 scheme_load_named_file (SCHEME_A_ fin, file_name); 6073 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6165#if USE_PORTS 6077#if USE_PORTS
6166 if (!isfile || fin != STDIN_FILENO) 6078 if (!isfile || fin != STDIN_FILENO)
6167 { 6079 {
6168 if (SCHEME_V->retcode != 0) 6080 if (SCHEME_V->retcode != 0)
6169 { 6081 {
6170 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6082 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6171 } 6083 }
6172 6084
6173 if (isfile) 6085 if (isfile)
6174 close (fin); 6086 close (fin);
6175 } 6087 }

Diff Legend

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