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.9 by root, Wed Nov 25 22:39:19 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC

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

Diff Legend

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