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.14 by root, Thu Nov 26 08:56:32 2015 UTC vs.
Revision 1.54 by root, Tue Dec 1 02:42:35 2015 UTC

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

Diff Legend

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