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.1 by root, Wed Nov 25 05:02:56 2015 UTC vs.
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
23#endif 28#endif
24#if USE_MATH 29#if USE_MATH
25# include <math.h> 30# include <math.h>
26#endif 31#endif
27 32
33#include "ecb.h"
34
28#include <sys/types.h> 35#include <sys/types.h>
29#include <sys/stat.h> 36#include <sys/stat.h>
30#include <fcntl.h> 37#include <fcntl.h>
38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
45#include <string.h>
31 46
32#include <limits.h> 47#include <limits.h>
33#include <inttypes.h> 48#include <inttypes.h>
34#include <float.h> 49#include <float.h>
35//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
36 59
37enum { 60enum {
38 TOK_EOF, 61 TOK_EOF,
39 TOK_LPAREN, 62 TOK_LPAREN,
40 TOK_RPAREN, 63 TOK_RPAREN,
41 TOK_DOT, 64 TOK_DOT,
42 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
43 TOK_QUOTE, 68 TOK_QUOTE,
44 TOK_DQUOTE, 69 TOK_DQUOTE,
45 TOK_BQUOTE, 70 TOK_BQUOTE,
46 TOK_COMMA, 71 TOK_COMMA,
47 TOK_ATMARK, 72 TOK_ATMARK,
… …
49 TOK_SHARP_CONST, 74 TOK_SHARP_CONST,
50 TOK_VEC 75 TOK_VEC
51}; 76};
52 77
53#define BACKQUOTE '`' 78#define BACKQUOTE '`'
54#define DELIMITERS "()\";\f\t\v\n\r " 79#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE
55 81
56#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
57#define S_T (&SCHEME_V->xT) 83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
58#define S_F (&SCHEME_V->xF) 84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
59#define S_SINK (&SCHEME_V->xsink) 85#define S_SINK (&SCHEME_V->xsink)
60#define S_EOF (&SCHEME_V->xEOF_OBJ) 86#define S_EOF (&SCHEME_V->xEOF_OBJ)
61
62/*
63 * Basic memory allocation units
64 */
65
66#define banner "TinyScheme 1.41-s"
67
68#include <string.h>
69#include <stdlib.h>
70 87
71#if !USE_MULTIPLICITY 88#if !USE_MULTIPLICITY
72static scheme sc; 89static scheme sc;
73#endif 90#endif
74 91
… …
134 c += 'a' - 'A'; 151 c += 'a' - 'A';
135 152
136 return c; 153 return c;
137} 154}
138 155
139#if USE_STRLWR 156static int
157xisdigit (char c)
158{
159 return c >= '0' && c <= '9';
160}
161
162#define toupper(c) xtoupper (c)
163#define tolower(c) xtolower (c)
164#define isdigit(c) xisdigit (c)
165
166#if USE_IGNORECASE
140static const char * 167static const char *
141strlwr (char *s) 168xstrlwr (char *s)
142{ 169{
143 const char *p = s; 170 const char *p = s;
144 171
145 while (*s) 172 while (*s)
146 { 173 {
… …
148 s++; 175 s++;
149 } 176 }
150 177
151 return p; 178 return p;
152} 179}
153#endif
154 180
181#define stricmp(a,b) strcasecmp (a, b)
182#define strlwr(s) xstrlwr (s)
183
184#else
155#define stricmp(a,b) strcmp (a, b) 185# define stricmp(a,b) strcmp (a, b)
156#define strlwr(s) (s) 186# define strlwr(s) (s)
157#define toupper(c) xtoupper(c) 187#endif
158#define tolower(c) xtolower(c)
159 188
160#ifndef prompt 189#ifndef prompt
161# define prompt "ts> " 190# define prompt "ts> "
162#endif 191#endif
163 192
… …
169# define FIRST_CELLSEGS 3 198# define FIRST_CELLSEGS 3
170#endif 199#endif
171 200
172enum scheme_types 201enum scheme_types
173{ 202{
174 T_NULL, 203 T_INTEGER,
204 T_REAL,
175 T_STRING, 205 T_STRING,
176 T_NUMBER,
177 T_SYMBOL, 206 T_SYMBOL,
178 T_PROC, 207 T_PROC,
179 T_PAIR, 208 T_PAIR, /* also used for free cells */
180 T_CLOSURE, 209 T_CLOSURE,
181 T_CONTINUATION, 210 T_CONTINUATION,
182 T_FOREIGN, 211 T_FOREIGN,
183 T_CHARACTER, 212 T_CHARACTER,
184 T_PORT, 213 T_PORT,
185 T_VECTOR, 214 T_VECTOR,
186 T_MACRO, 215 T_MACRO,
187 T_PROMISE, 216 T_PROMISE,
188 T_ENVIRONMENT, 217 T_ENVIRONMENT,
218 /* one more... */
189 T_NUM_SYSTEM_TYPES 219 T_NUM_SYSTEM_TYPES
190}; 220};
191 221
192#define T_MASKTYPE 31 /* 0000000000011111 */ 222#define T_MASKTYPE 0x000f
193#define T_SYNTAX 4096 /* 0001000000000000 */ 223#define T_SYNTAX 0x0010
194#define T_IMMUTABLE 8192 /* 0010000000000000 */ 224#define T_IMMUTABLE 0x0020
195#define T_ATOM 16384 /* 0100000000000000 */ /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
196#define CLRATOM 49151 /* 1011111111111111 */ /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
197#define MARK 32768 /* 1000000000000000 */
198#define UNMARK 32767 /* 0111111111111111 */
199 227
228/* num, for generic arithmetic */
229struct num
230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
200 237
201static num num_add (num a, num b); 238#if USE_REAL
202static num num_mul (num a, num b); 239# define num_is_fixnum(n) (n).is_fixnum
203static num num_div (num a, num b); 240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
255
256static num num_op (enum num_op op, num a, num b);
204static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
205static num num_sub (num a, num b);
206static num num_rem (num a, num b); 258static num num_rem (num a, num b);
207static num num_mod (num a, num b); 259static num num_mod (num a, num b);
208static int num_eq (num a, num b);
209static int num_gt (num a, num b);
210static int num_ge (num a, num b);
211static int num_lt (num a, num b);
212static int num_le (num a, num b);
213 260
214#if USE_MATH 261#if USE_MATH
215static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
216#endif 263#endif
217static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
218
219static INLINE int
220num_is_integer (pointer p)
221{
222 return num_is_fixnum (p->object.number);
223}
224 265
225static num num_zero; 266static num num_zero;
226static num num_one; 267static num num_one;
227 268
228/* macros for cell operations */ 269/* macros for cell operations */
229#define typeflag(p) ((p)->flag + 0) 270#define typeflag(p) ((p)->flag + 0)
230#define set_typeflag(p,v) ((p)->flag = (v)) 271#define set_typeflag(p,v) ((p)->flag = (v))
231#define type(p) (typeflag (p) & T_MASKTYPE) 272#define type(p) (typeflag (p) & T_MASKTYPE)
232 273
233INTERFACE INLINE int 274INTERFACE int
234is_string (pointer p) 275is_string (pointer p)
235{ 276{
236 return type (p) == T_STRING; 277 return type (p) == T_STRING;
237} 278}
238 279
239#define strvalue(p) ((p)->object.string.svalue) 280#define strvalue(p) ((p)->object.string.svalue)
240#define strlength(p) ((p)->object.string.length) 281#define strlength(p) ((p)->object.string.length)
241 282
242INTERFACE int is_list (SCHEME_P_ pointer p);
243INTERFACE INLINE int 283INTERFACE int
244is_vector (pointer p) 284is_vector (pointer p)
245{ 285{
246 return type (p) == T_VECTOR; 286 return type (p) == T_VECTOR;
247} 287}
248 288
289#define vecvalue(p) ((p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length)
249INTERFACE void fill_vector (pointer vec, pointer obj); 291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
250INTERFACE pointer vector_elem (pointer vec, int ielem); 292INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
251INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
252 294
253INTERFACE INLINE int 295INTERFACE int
296is_integer (pointer p)
297{
298 return type (p) == T_INTEGER;
299}
300
301/* not the same as in scheme, where integers are (correctly :) reals */
302INTERFACE int
303is_real (pointer p)
304{
305 return type (p) == T_REAL;
306}
307
308INTERFACE int
254is_number (pointer p) 309is_number (pointer p)
255{ 310{
256 return type (p) == T_NUMBER; 311 return is_integer (p) || is_real (p);
257} 312}
258 313
259INTERFACE INLINE int 314INTERFACE int
260is_integer (pointer p)
261{
262 if (!is_number (p))
263 return 0;
264
265 if (num_is_integer (p) || ivalue (p) == rvalue (p))
266 return 1;
267
268 return 0;
269}
270
271INTERFACE INLINE int
272is_real (pointer p)
273{
274 return is_number (p) && !num_is_fixnum (p->object.number);
275}
276
277INTERFACE INLINE int
278is_character (pointer p) 315is_character (pointer p)
279{ 316{
280 return type (p) == T_CHARACTER; 317 return type (p) == T_CHARACTER;
281} 318}
282 319
283INTERFACE INLINE char * 320INTERFACE char *
284string_value (pointer p) 321string_value (pointer p)
285{ 322{
286 return strvalue (p); 323 return strvalue (p);
287} 324}
288 325
289INLINE num
290nvalue (pointer p)
291{
292 return (p)->object.number;
293}
294
295INTERFACE long
296ivalue (pointer p)
297{
298 return num_is_integer (p) ? num_ivalue ((p)->object.number) : (long) num_rvalue ((p)->object.number);
299}
300
301INTERFACE RVALUE
302rvalue (pointer p)
303{
304 return num_is_integer (p) ? (RVALUE) num_ivalue ((p)->object.number) : num_rvalue ((p)->object.number);
305}
306
307#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 326#define ivalue_unchecked(p) (p)->object.ivalue
308#if USE_FLOAT 327#define set_ivalue(p,v) (p)->object.ivalue = (v)
328
329#if USE_REAL
309# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 330#define rvalue_unchecked(p) (p)->object.rvalue
310# define set_num_integer(p) (p)->object.number.is_fixnum=1; 331#define set_rvalue(p,v) (p)->object.rvalue = (v)
311# define set_num_real(p) (p)->object.number.is_fixnum=0;
312#else 332#else
313# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define rvalue_unchecked(p) (p)->object.ivalue
314# define set_num_integer(p) 0 334#define set_rvalue(p,v) (p)->object.ivalue = (v)
315# define set_num_real(p) 0
316#endif 335#endif
336
317INTERFACE long 337INTERFACE long
318charvalue (pointer p) 338charvalue (pointer p)
319{ 339{
320 return ivalue_unchecked (p); 340 return ivalue_unchecked (p);
321} 341}
322 342
323INTERFACE INLINE int 343INTERFACE int
324is_port (pointer p) 344is_port (pointer p)
325{ 345{
326 return type (p) == T_PORT; 346 return type (p) == T_PORT;
327} 347}
328 348
329INTERFACE INLINE int 349INTERFACE int
330is_inport (pointer p) 350is_inport (pointer p)
331{ 351{
332 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && p->object.port->kind & port_input;
333} 353}
334 354
335INTERFACE INLINE int 355INTERFACE int
336is_outport (pointer p) 356is_outport (pointer p)
337{ 357{
338 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && p->object.port->kind & port_output;
339} 359}
340 360
341INTERFACE INLINE int 361INTERFACE int
342is_pair (pointer p) 362is_pair (pointer p)
343{ 363{
344 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
345} 365}
346 366
347#define car(p) ((p)->object.cons.car + 0) 367#define car(p) ((p)->object.cons.car + 0)
348#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) ((p)->object.cons.cdr + 0)
349 369
350#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
351#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
352#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
353#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
354 374
355#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
356#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
357#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
358 378
359INTERFACE void 379INTERFACE void
360set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
361{ 381{
362 p->object.cons.car = q; 382 p->object.cons.car = q;
… …
378pair_cdr (pointer p) 398pair_cdr (pointer p)
379{ 399{
380 return cdr (p); 400 return cdr (p);
381} 401}
382 402
383INTERFACE INLINE int 403INTERFACE int
384is_symbol (pointer p) 404is_symbol (pointer p)
385{ 405{
386 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
387} 407}
388 408
389INTERFACE INLINE char * 409INTERFACE char *
390symname (pointer p) 410symname (pointer p)
391{ 411{
392 return strvalue (car (p)); 412 return strvalue (p);
393} 413}
394 414
395#if USE_PLIST 415#if USE_PLIST
396SCHEME_EXPORT INLINE int 416SCHEME_EXPORT int
397hasprop (pointer p) 417hasprop (pointer p)
398{ 418{
399 return typeflag (p) & T_SYMBOL; 419 return typeflag (p) & T_SYMBOL;
400} 420}
401 421
402# define symprop(p) cdr(p) 422# define symprop(p) cdr(p)
403#endif 423#endif
404 424
405INTERFACE INLINE int 425INTERFACE int
406is_syntax (pointer p) 426is_syntax (pointer p)
407{ 427{
408 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
409} 429}
410 430
411INTERFACE INLINE int 431INTERFACE int
412is_proc (pointer p) 432is_proc (pointer p)
413{ 433{
414 return type (p) == T_PROC; 434 return type (p) == T_PROC;
415} 435}
416 436
417INTERFACE INLINE int 437INTERFACE int
418is_foreign (pointer p) 438is_foreign (pointer p)
419{ 439{
420 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
421} 441}
422 442
423INTERFACE INLINE char * 443INTERFACE char *
424syntaxname (pointer p) 444syntaxname (pointer p)
425{ 445{
426 return strvalue (car (p)); 446 return strvalue (p);
427} 447}
428 448
429#define procnum(p) ivalue(p) 449#define procnum(p) ivalue_unchecked (p)
430static const char *procname (pointer x); 450static const char *procname (pointer x);
431 451
432INTERFACE INLINE int 452INTERFACE int
433is_closure (pointer p) 453is_closure (pointer p)
434{ 454{
435 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
436} 456}
437 457
438INTERFACE INLINE int 458INTERFACE int
439is_macro (pointer p) 459is_macro (pointer p)
440{ 460{
441 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
442} 462}
443 463
444INTERFACE INLINE pointer 464INTERFACE pointer
445closure_code (pointer p) 465closure_code (pointer p)
446{ 466{
447 return car (p); 467 return car (p);
448} 468}
449 469
450INTERFACE INLINE pointer 470INTERFACE pointer
451closure_env (pointer p) 471closure_env (pointer p)
452{ 472{
453 return cdr (p); 473 return cdr (p);
454} 474}
455 475
456INTERFACE INLINE int 476INTERFACE int
457is_continuation (pointer p) 477is_continuation (pointer p)
458{ 478{
459 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
460} 480}
461 481
462#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
463#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
464 484
465/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
466INTERFACE INLINE int 486INTERFACE int
467is_promise (pointer p) 487is_promise (pointer p)
468{ 488{
469 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
470} 490}
471 491
472INTERFACE INLINE int 492INTERFACE int
473is_environment (pointer p) 493is_environment (pointer p)
474{ 494{
475 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
476} 496}
477 497
478#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 498#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
479 499
480#define is_atom(p) (typeflag (p) & T_ATOM) 500#define is_atom(p) (typeflag (p) & T_ATOM)
481#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 501#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
482#define clratom(p) set_typeflag ((p), typeflag (p) & CLRATOM) 502#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
483 503
484#define is_mark(p) (typeflag (p) & MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
485#define setmark(p) set_typeflag ((p), typeflag (p) | MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
486#define clrmark(p) set_typeflag ((p), typeflag (p) & UNMARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
487 507
488INTERFACE INLINE int 508INTERFACE int
489is_immutable (pointer p) 509is_immutable (pointer p)
490{ 510{
491 return typeflag (p) & T_IMMUTABLE; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
492} 512}
493 513
494INTERFACE INLINE void 514INTERFACE void
495setimmutable (pointer p) 515setimmutable (pointer p)
496{ 516{
517#if USE_ERROR_CHECKING
497 set_typeflag (p, T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
519#endif
520}
521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
498} 574}
499 575
500#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
501static INLINE int 577ecb_inline int
502Cisalpha (int c) 578Cisalpha (int c)
503{ 579{
504 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
505} 581}
506 582
507static INLINE int 583ecb_inline int
508Cisdigit (int c) 584Cisdigit (int c)
509{ 585{
510 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
511} 587}
512 588
513static INLINE int 589ecb_inline int
514Cisspace (int c) 590Cisspace (int c)
515{ 591{
516 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
517} 593}
518 594
519static INLINE int 595ecb_inline int
520Cisupper (int c) 596Cisupper (int c)
521{ 597{
522 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
523} 599}
524 600
525static INLINE int 601ecb_inline int
526Cislower (int c) 602Cislower (int c)
527{ 603{
528 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
529} 605}
530#endif 606#endif
… …
591#endif 667#endif
592 668
593static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
594static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
595static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
596static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
597static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P_ int n);
598static long binary_decode (const char *s);
599static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b);
600static pointer xget_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
601static pointer reserve_cells (SCHEME_P_ int n);
602static pointer get_consecutive_cells (SCHEME_P_ int n);
603static pointer find_consecutive_cells (SCHEME_P_ int n);
604static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
605static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
606static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
607static pointer mk_number (SCHEME_P_ num n); 678static pointer mk_number (SCHEME_P_ const num n);
608static char *store_string (SCHEME_P_ int len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
609static pointer mk_vector (SCHEME_P_ int len); 680static pointer mk_vector (SCHEME_P_ uint32_t len);
610static pointer mk_atom (SCHEME_P_ char *q); 681static pointer mk_atom (SCHEME_P_ char *q);
611static pointer mk_sharp_const (SCHEME_P_ char *name); 682static pointer mk_sharp_const (SCHEME_P_ char *name);
612 683
613#if USE_PORTS 684#if USE_PORTS
614static pointer mk_port (SCHEME_P_ port *p); 685static pointer mk_port (SCHEME_P_ port *p);
… …
623static void mark (pointer a); 694static void mark (pointer a);
624static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
625static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
626static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
627static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
628static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
629static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
630static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
631static int token (SCHEME_P); 702static int token (SCHEME_P);
632static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
633static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
634static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
635static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
639static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
640static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
641static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
642static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
643static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
644static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
645static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
646static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
647static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
648static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
649static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
650static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
651static void assign_syntax (SCHEME_P_ char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
652static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
653static void assign_proc (SCHEME_P_ enum scheme_opcodes, char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
654 753
655static num 754static num
656num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
657{ 756{
658 num ret; 757 num ret;
659 758
660 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
661 760
662 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
663 num_set_ivalue (ret, a.value.ivalue + b.value.ivalue); 762 {
763 switch (op)
764 {
765 case NUM_ADD: a.ivalue += b.ivalue; break;
766 case NUM_SUB: a.ivalue -= b.ivalue; break;
767 case NUM_MUL: a.ivalue *= b.ivalue; break;
768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
769 }
770
771 num_set_ivalue (ret, a.ivalue);
772 }
773#if USE_REAL
664 else 774 else
665 num_set_rvalue (ret, num_rvalue (a) + num_rvalue (b)); 775 {
776 switch (op)
777 {
778 case NUM_ADD: a.rvalue += b.rvalue; break;
779 case NUM_SUB: a.rvalue -= b.rvalue; break;
780 case NUM_MUL: a.rvalue *= b.rvalue; break;
781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
782 }
666 783
667 return ret; 784 num_set_rvalue (ret, a.rvalue);
668} 785 }
669 786#endif
670static num
671num_mul (num a, num b)
672{
673 num ret;
674
675 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
676
677 if (num_is_fixnum (ret))
678 num_set_ivalue (ret, a.value.ivalue * b.value.ivalue);
679 else
680 num_set_rvalue (ret, num_rvalue (a) * num_rvalue (b));
681 787
682 return ret; 788 return ret;
683} 789}
684 790
685static num 791static num
686num_div (num a, num b) 792num_div (num a, num b)
687{ 793{
688 num ret; 794 num ret;
689 795
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && a.value.ivalue % b.value.ivalue == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
691 797
692 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
694 else 800 else
695 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
696
697 return ret;
698}
699
700static num
701num_intdiv (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue);
709 else
710 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
711
712 return ret;
713}
714
715static num
716num_sub (num a, num b)
717{
718 num ret;
719
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
721
722 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, a.value.ivalue - b.value.ivalue);
724 else
725 num_set_rvalue (ret, num_rvalue (a) - num_rvalue (b));
726 802
727 return ret; 803 return ret;
728} 804}
729 805
730static num 806static num
… …
771 847
772 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
773 return ret; 849 return ret;
774} 850}
775 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
776static int 853static int
777num_eq (num a, num b) 854num_cmp (num a, num b)
778{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
779 int ret; 857 int ret;
780 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
781 858
782 if (is_fixnum) 859 if (is_fixnum)
783 ret = a.value.ivalue == b.value.ivalue; 860 {
861 IVALUE av = num_ivalue (a);
862 IVALUE bv = num_ivalue (b);
863
864 ret = av == bv ? 0 : av < bv ? -1 : +1;
865 }
784 else 866 else
785 ret = num_rvalue (a) == num_rvalue (b); 867 {
868 RVALUE av = num_rvalue (a);
869 RVALUE bv = num_rvalue (b);
870
871 ret = av == bv ? 0 : av < bv ? -1 : +1;
872 }
786 873
787 return ret; 874 return ret;
788}
789
790
791static int
792num_gt (num a, num b)
793{
794 int ret;
795 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796
797 if (is_fixnum)
798 ret = a.value.ivalue > b.value.ivalue;
799 else
800 ret = num_rvalue (a) > num_rvalue (b);
801
802 return ret;
803}
804
805static int
806num_ge (num a, num b)
807{
808 return !num_lt (a, b);
809}
810
811static int
812num_lt (num a, num b)
813{
814 int ret;
815 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
816
817 if (is_fixnum)
818 ret = a.value.ivalue < b.value.ivalue;
819 else
820 ret = num_rvalue (a) < num_rvalue (b);
821
822 return ret;
823}
824
825static int
826num_le (num a, num b)
827{
828 return !num_gt (a, b);
829} 875}
830 876
831#if USE_MATH 877#if USE_MATH
832 878
833/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
843 return ce; 889 return ce;
844 else if (dfl < dce) 890 else if (dfl < dce)
845 return fl; 891 return fl;
846 else 892 else
847 { 893 {
848 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
849 return fl; 895 return fl;
850 else 896 else
851 return ce; 897 return ce;
852 } 898 }
853} 899}
854#endif 900#endif
855 901
856static int 902static int
857is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
858{ 904{
859#if USE_FLOAT 905 return x == 0;
906#if 0
907#if USE_REAL
860 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
861#else 909#else
862 return x == 0; 910 return x == 0;
863#endif 911#endif
864} 912#endif
865
866static long
867binary_decode (const char *s)
868{
869 long x = 0;
870
871 while (*s != 0 && (*s == '1' || *s == '0'))
872 {
873 x <<= 1;
874 x += *s - '0';
875 s++;
876 }
877
878 return x;
879} 913}
880 914
881/* allocate new cell segment */ 915/* allocate new cell segment */
882static int 916static int
883alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P_ int n)
… …
903 return k; 937 return k;
904 938
905 i = ++SCHEME_V->last_cell_seg; 939 i = ++SCHEME_V->last_cell_seg;
906 SCHEME_V->alloc_seg[i] = cp; 940 SCHEME_V->alloc_seg[i] = cp;
907 941
908 /* insert new segment in address order */
909 newp = (pointer)cp; 942 newp = (pointer)cp;
910 SCHEME_V->cell_seg[i] = newp; 943 SCHEME_V->cell_seg[i] = newp;
911 SCHEME_V->cell_segsize[i] = segsize; 944 SCHEME_V->cell_segsize[i] = segsize;
912
913 //TODO: insert, not swap
914 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
915 {
916 p = SCHEME_V->cell_seg[i];
917 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
918 SCHEME_V->cell_seg[i - 1] = p;
919
920 k = SCHEME_V->cell_segsize[i];
921 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
922 SCHEME_V->cell_segsize[i - 1] = k;
923
924 --i;
925 }
926
927 SCHEME_V->fcells += segsize; 945 SCHEME_V->fcells += segsize;
928 last = newp + segsize - 1; 946 last = newp + segsize - 1;
929 947
930 for (p = newp; p <= last; p++) 948 for (p = newp; p <= last; p++)
931 { 949 {
932 set_typeflag (p, 0); 950 set_typeflag (p, T_PAIR);
951 set_car (p, NIL);
933 set_cdr (p, p + 1); 952 set_cdr (p, p + 1);
934 set_car (p, NIL);
935 } 953 }
936 954
937 /* insert new cells in address order on free list */
938 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
939 {
940 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (last, SCHEME_V->free_cell);
941 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = newp;
942 }
943 else
944 {
945 p = SCHEME_V->free_cell;
946
947 while (cdr (p) != NIL && newp > cdr (p))
948 p = cdr (p);
949
950 set_cdr (last, cdr (p));
951 set_cdr (p, newp);
952 }
953 } 957 }
954 958
955 return n; 959 return n;
956} 960}
957 961
958/* get new cell. parameter a, b is marked by gc. */ 962/* get new cell. parameter a, b is marked by gc. */
959static INLINE pointer 963ecb_inline pointer
960get_cell_x (SCHEME_P_ pointer a, pointer b) 964get_cell_x (SCHEME_P_ pointer a, pointer b)
961{ 965{
962 if (SCHEME_V->free_cell == NIL) 966 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
963 { 967 {
964 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
965 return S_SINK; 969 return S_SINK;
966 970
967 if (SCHEME_V->free_cell == NIL) 971 if (SCHEME_V->free_cell == NIL)
… …
991 --SCHEME_V->fcells; 995 --SCHEME_V->fcells;
992 return x; 996 return x;
993 } 997 }
994} 998}
995 999
996/* make sure that there is a given number of cells free */
997static pointer
998reserve_cells (SCHEME_P_ int n)
999{
1000 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1001 return NIL;
1002
1003 /* Are there enough cells available? */
1004 if (SCHEME_V->fcells < n)
1005 {
1006 /* If not, try gc'ing some */
1007 gc (SCHEME_A_ NIL, NIL);
1008
1009 if (SCHEME_V->fcells < n)
1010 {
1011 /* If there still aren't, try getting more heap */
1012 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1013 {
1014 SCHEME_V->no_memory = 1;
1015 return NIL;
1016 }
1017 }
1018
1019 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1020 {
1021 /* If all fail, report failure */
1022 SCHEME_V->no_memory = 1;
1023 return NIL;
1024 }
1025 }
1026
1027 return S_T;
1028}
1029
1030static pointer
1031get_consecutive_cells (SCHEME_P_ int n)
1032{
1033 pointer x;
1034
1035 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1036 return S_SINK;
1037
1038 /* Are there any cells available? */
1039 x = find_consecutive_cells (SCHEME_A_ n);
1040
1041 if (x != NIL)
1042 return x;
1043
1044 /* If not, try gc'ing some */
1045 gc (SCHEME_A_ NIL, NIL);
1046
1047 for (;;)
1048 {
1049 x = find_consecutive_cells (SCHEME_A_ n);
1050
1051 if (x != NIL)
1052 return x;
1053
1054 /* If there still aren't, try getting more heap */
1055 if (!alloc_cellseg (SCHEME_A_ 1))
1056 {
1057#if USE_ERROR_CHECKING
1058 SCHEME_V->no_memory = 1;
1059 return S_SINK;
1060#endif
1061 }
1062 }
1063}
1064
1065static int
1066count_consecutive_cells (pointer x, int needed)
1067{
1068 int n = 1;
1069
1070 while (cdr (x) == x + 1)
1071 {
1072 x = cdr (x);
1073 n++;
1074
1075 if (n > needed)
1076 return n;
1077 }
1078
1079 return n;
1080}
1081
1082static pointer
1083find_consecutive_cells (SCHEME_P_ int n)
1084{
1085 pointer *pp;
1086 int cnt;
1087
1088 pp = &SCHEME_V->free_cell;
1089
1090 while (*pp != NIL)
1091 {
1092 cnt = count_consecutive_cells (*pp, n);
1093
1094 if (cnt >= n)
1095 {
1096 pointer x = *pp;
1097
1098 *pp = cdr (*pp + n - 1);
1099 SCHEME_V->fcells -= n;
1100 return x;
1101 }
1102
1103 pp = &cdr (*pp + cnt - 1);
1104 }
1105
1106 return NIL;
1107}
1108
1109/* To retain recent allocs before interpreter knows about them - 1000/* To retain recent allocs before interpreter knows about them -
1110 Tehom */ 1001 Tehom */
1111 1002
1112static void 1003static void
1113push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1114{ 1005{
1115 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1116 1007
1117 set_typeflag (holder, T_PAIR | T_IMMUTABLE); 1008 set_typeflag (holder, T_PAIR);
1009 setimmutable (holder);
1118 set_car (holder, recent); 1010 set_car (holder, recent);
1119 set_cdr (holder, car (S_SINK)); 1011 set_cdr (holder, car (S_SINK));
1120 set_car (S_SINK, holder); 1012 set_car (S_SINK, holder);
1121} 1013}
1122 1014
… …
1135 1027
1136 return cell; 1028 return cell;
1137} 1029}
1138 1030
1139static pointer 1031static pointer
1140get_vector_object (SCHEME_P_ int len, pointer init) 1032get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1141{ 1033{
1142 pointer cells = get_consecutive_cells (SCHEME_A_ len / 2 + len % 2 + 1); 1034 pointer v = get_cell_x (SCHEME_A_ 0, 0);
1035 pointer *e = malloc (len * sizeof (pointer));
1143 1036
1144#if USE_ERROR_CHECKING 1037 if (!e && USE_ERROR_CHECKING)
1145 if (SCHEME_V->no_memory)
1146 return S_SINK; 1038 return S_SINK;
1147#endif
1148 1039
1149 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1150 set_typeflag (cells, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1151 ivalue_unchecked (cells) = len; 1042
1152 set_num_integer (cells); 1043 v->object.vector.vvalue = e;
1044 v->object.vector.length = len;
1153 fill_vector (cells, init); 1045 fill_vector (v, 0, init);
1154 push_recent_alloc (SCHEME_A_ cells, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1155 1047
1156 return cells; 1048 return v;
1157} 1049}
1158 1050
1159static INLINE void 1051ecb_inline void
1160ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1161{ 1053{
1162 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1163} 1055}
1164 1056
1165#if defined TSGRIND 1057#if defined TSGRIND
1166static void 1058static void
1167check_cell_alloced (pointer p, int expect_alloced) 1059check_cell_alloced (pointer p, int expect_alloced)
1168{ 1060{
1169 /* Can't use putstr(SCHEME_A_ str) because callers have no access to 1061 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1170 sc. */
1171 if (typeflag (p) & !expect_alloced) 1062 if (typeflag (p) & !expect_alloced)
1172 xwrstr ("Cell is already allocated!\n"); 1063 xwrstr ("Cell is already allocated!\n");
1173 1064
1174 if (!(typeflag (p)) & expect_alloced) 1065 if (!(typeflag (p)) & expect_alloced)
1175 xwrstr ("Cell is not allocated!\n"); 1066 xwrstr ("Cell is not allocated!\n");
… …
1198 if (immutable) 1089 if (immutable)
1199 setimmutable (x); 1090 setimmutable (x);
1200 1091
1201 set_car (x, a); 1092 set_car (x, a);
1202 set_cdr (x, b); 1093 set_cdr (x, b);
1094
1203 return x; 1095 return x;
1204} 1096}
1205 1097
1206/* ========== oblist implementation ========== */ 1098/* ========== oblist implementation ========== */
1207 1099
1100static pointer
1101generate_symbol (SCHEME_P_ const char *name)
1102{
1103 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x;
1107}
1108
1208#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1209 1110
1111static int
1210static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1211 1122
1212static pointer 1123static pointer
1213oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1214{ 1125{
1215 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1217 1128
1218/* returns the new symbol */ 1129/* returns the new symbol */
1219static pointer 1130static pointer
1220oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1221{ 1132{
1222 pointer x; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1223 int location;
1224
1225 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1226 set_typeflag (x, T_SYMBOL);
1227 setimmutable (car (x));
1228
1229 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1230 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1231 return x; 1136 return x;
1232} 1137}
1233 1138
1234static INLINE pointer 1139ecb_inline pointer
1235oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1236{ 1141{
1237 int location; 1142 int location;
1238 pointer x; 1143 pointer x;
1239 char *s; 1144 char *s;
1240 1145
1241 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1242 1147
1243 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1244 { 1149 {
1245 s = symname (car (x)); 1150 s = symname (car (x));
1246 1151
1247 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1248 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1257{ 1162{
1258 int i; 1163 int i;
1259 pointer x; 1164 pointer x;
1260 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1261 1166
1262 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1263 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1264 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1265 1170
1266 return ob_list; 1171 return ob_list;
1267} 1172}
1268 1173
… …
1272oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1273{ 1178{
1274 return NIL; 1179 return NIL;
1275} 1180}
1276 1181
1277static INLINE pointer 1182ecb_inline pointer
1278oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1279{ 1184{
1280 pointer x; 1185 pointer x;
1281 char *s; 1186 char *s;
1282 1187
… …
1294 1199
1295/* returns the new symbol */ 1200/* returns the new symbol */
1296static pointer 1201static pointer
1297oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1298{ 1203{
1299 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1300
1301 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1302 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1303 setimmutable (car (x)); 1206 setimmutable (x);
1304 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1305 return x; 1208 return x;
1306} 1209}
1307 1210
1308static pointer 1211static pointer
… …
1341mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1342{ 1245{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1344 1247
1345 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1346 ivalue_unchecked (x) = c; 1249 set_ivalue (x, c & 0xff);
1347 set_num_integer (x); 1250
1348 return x; 1251 return x;
1349} 1252}
1350 1253
1351/* get number atom (integer) */ 1254/* get number atom (integer) */
1352INTERFACE pointer 1255INTERFACE pointer
1353mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1354{ 1257{
1355 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1356 1259
1357 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1358 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1359 set_num_integer (x); 1262
1360 return x; 1263 return x;
1361} 1264}
1362 1265
1363INTERFACE pointer 1266INTERFACE pointer
1364mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1365{ 1268{
1269#if USE_REAL
1366 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1367 1271
1368 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1369 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1370 set_num_real (x); 1274
1371 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1372} 1279}
1373 1280
1374static pointer 1281static pointer
1375mk_number (SCHEME_P_ num n) 1282mk_number (SCHEME_P_ const num n)
1376{ 1283{
1284#if USE_REAL
1377 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1378 { 1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1379 return mk_integer (SCHEME_A_ num_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1380 } 1290#endif
1381 else
1382 {
1383 return mk_real (SCHEME_A_ num_rvalue (n));
1384 }
1385} 1291}
1386 1292
1387/* allocate name to string area */ 1293/* allocate name to string area */
1388static char * 1294static char *
1389store_string (SCHEME_P_ int len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1390{ 1296{
1391 char *q;
1392
1393 q = (char *)malloc (len_str + 1); 1297 char *q = malloc (len_str + 1);
1394 1298
1395 if (q == 0) 1299 if (q == 0 && USE_ERROR_CHECKING)
1396 { 1300 {
1397#if USE_ERROR_CHECKING
1398 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1399 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1400#endif
1401 } 1303 }
1402 1304
1403 if (str) 1305 if (str)
1404 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1405 int l = strlen (str);
1406
1407 if (l > len_str)
1408 l = len_str;
1409
1410 memcpy (q, str, l + 1);
1411 q[l + 1] = 0;
1412 }
1413 else 1307 else
1414 {
1415 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1416 q[len_str] = 0; 1310 q[len_str] = 0;
1417 }
1418 1311
1419 return q; 1312 return q;
1420} 1313}
1421 1314
1422/* get new string */
1423INTERFACE pointer 1315INTERFACE pointer
1424mk_string (SCHEME_P_ const char *str)
1425{
1426 return mk_counted_string (SCHEME_A_ str, strlen (str));
1427}
1428
1429INTERFACE pointer
1430mk_counted_string (SCHEME_P_ const char *str, int len)
1431{
1432 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1433
1434 set_typeflag (x, T_STRING | T_ATOM);
1435 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1436 strlength (x) = len;
1437 return x;
1438}
1439
1440INTERFACE pointer
1441mk_empty_string (SCHEME_P_ int len, char fill) 1316mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1442{ 1317{
1443 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1318 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1444 1319
1445 set_typeflag (x, T_STRING | T_ATOM); 1320 set_typeflag (x, T_STRING | T_ATOM);
1446 strvalue (x) = store_string (SCHEME_A_ len, 0, fill); 1321 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1447 strlength (x) = len; 1322 strlength (x) = len;
1448 return x; 1323 return x;
1449} 1324}
1450 1325
1451INTERFACE pointer 1326INTERFACE pointer
1327mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1328{
1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1330
1331 set_typeflag (x, T_STRING | T_ATOM);
1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1333 strlength (x) = len;
1334
1335 return x;
1336}
1337
1338INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str)
1340{
1341 return mk_counted_string (SCHEME_A_ str, strlen (str));
1342}
1343
1344INTERFACE pointer
1452mk_vector (SCHEME_P_ int len) 1345mk_vector (SCHEME_P_ uint32_t len)
1453{ 1346{
1454 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1455} 1348}
1456 1349
1457INTERFACE void 1350INTERFACE void
1458fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1459{ 1352{
1460 int i; 1353 int i;
1461 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1462 1354
1463 for (i = 0; i < num; i++) 1355 for (i = start; i < veclength (vec); i++)
1464 { 1356 vecvalue (vec)[i] = obj;
1465 set_typeflag (vec + 1 + i, T_PAIR); 1357}
1466 setimmutable (vec + 1 + i); 1358
1467 set_car (vec + 1 + i, obj); 1359INTERFACE void
1468 set_cdr (vec + 1 + i, obj); 1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1469 } 1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1470} 1366}
1471 1367
1472INTERFACE pointer 1368INTERFACE pointer
1473vector_elem (pointer vec, int ielem) 1369vector_get (pointer vec, uint32_t ielem)
1474{ 1370{
1475 int n = ielem / 2; 1371 return vecvalue(vec)[ielem];
1476
1477 if (ielem % 2 == 0)
1478 return car (vec + 1 + n);
1479 else
1480 return cdr (vec + 1 + n);
1481} 1372}
1482 1373
1483INTERFACE void 1374INTERFACE void
1484set_vector_elem (pointer vec, int ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1485{ 1376{
1486 int n = ielem / 2; 1377 vecvalue(vec)[ielem] = a;
1487
1488 if (ielem % 2 == 0)
1489 set_car (vec + 1 + n, a);
1490 else
1491 set_cdr (vec + 1 + n, a);
1492} 1378}
1493 1379
1494/* get new symbol */ 1380/* get new symbol */
1495INTERFACE pointer 1381INTERFACE pointer
1496mk_symbol (SCHEME_P_ const char *name) 1382mk_symbol (SCHEME_P_ const char *name)
1497{ 1383{
1498 pointer x;
1499
1500 /* first check oblist */ 1384 /* first check oblist */
1501 x = oblist_find_by_name (SCHEME_A_ name); 1385 pointer x = oblist_find_by_name (SCHEME_A_ name);
1502 1386
1503 if (x != NIL) 1387 if (x == NIL)
1504 return x;
1505 else
1506 {
1507 x = oblist_add_by_name (SCHEME_A_ name); 1388 x = oblist_add_by_name (SCHEME_A_ name);
1389
1508 return x; 1390 return x;
1509 }
1510} 1391}
1511 1392
1512INTERFACE pointer 1393INTERFACE pointer
1513gensym (SCHEME_P) 1394gensym (SCHEME_P)
1514{ 1395{
1515 pointer x; 1396 pointer x;
1516 char name[40]; 1397 char name[40] = "gensym-";
1517
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 {
1520 strcpy (name, "gensym-");
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1522 1399
1523 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1524 x = oblist_find_by_name (SCHEME_A_ name);
1525
1526 if (x != NIL)
1527 continue;
1528 else
1529 {
1530 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x;
1532 }
1533 }
1534
1535 return NIL;
1536} 1401}
1537 1402
1538/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1539static pointer 1404static pointer
1540mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1542 char c, *p; 1407 char c, *p;
1543 int has_dec_point = 0; 1408 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1409 int has_fp_exp = 0;
1545 1410
1546#if USE_COLON_HOOK 1411#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1412 if ((p = strstr (q, "::")) != 0)
1549 { 1413 {
1550 *p = 0; 1414 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1415 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1416 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1417 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1418 }
1555
1556#endif 1419#endif
1557 1420
1558 p = q; 1421 p = q;
1559 c = *p++; 1422 c = *p++;
1560 1423
… …
1567 has_dec_point = 1; 1430 has_dec_point = 1;
1568 c = *p++; 1431 c = *p++;
1569 } 1432 }
1570 1433
1571 if (!isdigit (c)) 1434 if (!isdigit (c))
1572 {
1573 return mk_symbol (SCHEME_A_ strlwr (q)); 1435 return mk_symbol (SCHEME_A_ strlwr (q));
1574 }
1575 } 1436 }
1576 else if (c == '.') 1437 else if (c == '.')
1577 { 1438 {
1578 has_dec_point = 1; 1439 has_dec_point = 1;
1579 c = *p++; 1440 c = *p++;
1580 1441
1581 if (!isdigit (c)) 1442 if (!isdigit (c))
1582 {
1583 return mk_symbol (SCHEME_A_ strlwr (q)); 1443 return mk_symbol (SCHEME_A_ strlwr (q));
1584 }
1585 } 1444 }
1586 else if (!isdigit (c)) 1445 else if (!isdigit (c))
1587 {
1588 return mk_symbol (SCHEME_A_ strlwr (q)); 1446 return mk_symbol (SCHEME_A_ strlwr (q));
1589 }
1590 1447
1591 for (; (c = *p) != 0; ++p) 1448 for (; (c = *p) != 0; ++p)
1592 { 1449 {
1593 if (!isdigit (c)) 1450 if (!isdigit (c))
1594 { 1451 {
… …
1602 } 1459 }
1603 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1604 { 1461 {
1605 if (!has_fp_exp) 1462 if (!has_fp_exp)
1606 { 1463 {
1607 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1608 from now on */
1609 p++; 1465 p++;
1610 1466
1611 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1612 {
1613 continue; 1468 continue;
1614 }
1615 } 1469 }
1616 } 1470 }
1617 1471
1618 return mk_symbol (SCHEME_A_ strlwr (q)); 1472 return mk_symbol (SCHEME_A_ strlwr (q));
1619 } 1473 }
1620 } 1474 }
1621 1475
1622#if USE_FLOAT 1476#if USE_REAL
1623 if (has_dec_point) 1477 if (has_dec_point)
1624 return mk_real (SCHEME_A_ atof (q)); 1478 return mk_real (SCHEME_A_ atof (q));
1625#endif 1479#endif
1626 1480
1627 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1629 1483
1630/* make constant */ 1484/* make constant */
1631static pointer 1485static pointer
1632mk_sharp_const (SCHEME_P_ char *name) 1486mk_sharp_const (SCHEME_P_ char *name)
1633{ 1487{
1634 long x;
1635 char tmp[STRBUFFSIZE];
1636
1637 if (!strcmp (name, "t")) 1488 if (!strcmp (name, "t"))
1638 return S_T; 1489 return S_T;
1639 else if (!strcmp (name, "f")) 1490 else if (!strcmp (name, "f"))
1640 return S_F; 1491 return S_F;
1641 else if (*name == 'o') /* #o (octal) */
1642 {
1643 x = strtol (name + 1, 0, 8);
1644 return mk_integer (SCHEME_A_ x);
1645 }
1646 else if (*name == 'd') /* #d (decimal) */
1647 {
1648 x = strtol (name + 1, 0, 10);
1649 return mk_integer (SCHEME_A_ x);
1650 }
1651 else if (*name == 'x') /* #x (hex) */
1652 {
1653 x = strtol (name + 1, 0, 16);
1654 return mk_integer (SCHEME_A_ x);
1655 }
1656 else if (*name == 'b') /* #b (binary) */
1657 {
1658 x = binary_decode (name + 1);
1659 return mk_integer (SCHEME_A_ x);
1660 }
1661 else if (*name == '\\') /* #\w (character) */ 1492 else if (*name == '\\') /* #\w (character) */
1662 { 1493 {
1663 int c = 0; 1494 int c;
1664 1495
1665 if (stricmp (name + 1, "space") == 0) 1496 if (stricmp (name + 1, "space") == 0)
1666 c = ' '; 1497 c = ' ';
1667 else if (stricmp (name + 1, "newline") == 0) 1498 else if (stricmp (name + 1, "newline") == 0)
1668 c = '\n'; 1499 c = '\n';
… …
1670 c = '\r'; 1501 c = '\r';
1671 else if (stricmp (name + 1, "tab") == 0) 1502 else if (stricmp (name + 1, "tab") == 0)
1672 c = '\t'; 1503 c = '\t';
1673 else if (name[1] == 'x' && name[2] != 0) 1504 else if (name[1] == 'x' && name[2] != 0)
1674 { 1505 {
1675 int c1 = strtol (name + 2, 0, 16); 1506 long c1 = strtol (name + 2, 0, 16);
1676 1507
1677 if (c1 <= UCHAR_MAX) 1508 if (0 <= c1 && c1 <= UCHAR_MAX)
1678 c = c1; 1509 c = c1;
1679 else 1510 else
1680 return NIL; 1511 return NIL;
1681 1512 }
1682#if USE_ASCII_NAMES 1513#if USE_ASCII_NAMES
1683 }
1684 else if (is_ascii_name (name + 1, &c)) 1514 else if (is_ascii_name (name + 1, &c))
1685 {
1686 /* nothing */ 1515 /* nothing */;
1687#endif 1516#endif
1688 }
1689 else if (name[2] == 0) 1517 else if (name[2] == 0)
1690 c = name[1]; 1518 c = name[1];
1691 else 1519 else
1692 return NIL; 1520 return NIL;
1693 1521
1694 return mk_character (SCHEME_A_ c); 1522 return mk_character (SCHEME_A_ c);
1695 } 1523 }
1696 else 1524 else
1525 {
1526 /* identify base by string index */
1527 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1528 char *base = strchr (baseidx, *name);
1529
1530 if (base)
1531 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1532
1697 return NIL; 1533 return NIL;
1534 }
1698} 1535}
1699 1536
1700/* ========== garbage collector ========== */ 1537/* ========== garbage collector ========== */
1701 1538
1702/*-- 1539/*--
1703 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1704 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1705 * for marking. 1542 * for marking.
1543 *
1544 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector
1706 */ 1547 */
1707static void 1548static void
1708mark (pointer a) 1549mark (pointer a)
1709{ 1550{
1710 pointer t, q, p; 1551 pointer t, q, p;
1711 1552
1712 t = (pointer) 0; 1553 t = 0;
1713 p = a; 1554 p = a;
1714E2: 1555E2:
1715 setmark (p); 1556 setmark (p);
1716 printf ("mark %p %x\n", p, p->flag);//D
1717 1557
1718 if (is_vector (p)) 1558 if (ecb_expect_false (is_vector (p)))
1719 { 1559 {
1720 int i; 1560 int i;
1721 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1722 1561
1723 for (i = 0; i < num; i++) 1562 for (i = 0; i < veclength (p); i++)
1724 { 1563 mark (vecvalue (p)[i]);
1725 /* Vector cells will be treated like ordinary cells */
1726 mark (p + 1 + i);
1727 }
1728 } 1564 }
1729 1565
1730 if (is_atom (p)) 1566 if (is_atom (p))
1731 goto E6; 1567 goto E6;
1732 1568
… …
1742 goto E2; 1578 goto E2;
1743 } 1579 }
1744 1580
1745E5: 1581E5:
1746 q = cdr (p); /* down cdr */ 1582 q = cdr (p); /* down cdr */
1747 printf ("mark+ %p\n", q, q->flag);//D
1748 1583
1749 if (q && !is_mark (q)) 1584 if (q && !is_mark (q))
1750 { 1585 {
1751 set_cdr (p, t); 1586 set_cdr (p, t);
1752 t = p; 1587 t = p;
1753 p = q; 1588 p = q;
1754 goto E2; 1589 goto E2;
1755 } 1590 }
1756 1591
1757E6: /* up. Undo the link switching from steps E4 and E5. */ 1592E6: /* up. Undo the link switching from steps E4 and E5. */
1758
1759 if (!t) 1593 if (!t)
1760 return; 1594 return;
1761 1595
1762 q = t; 1596 q = t;
1763 1597
… …
1831 if (is_mark (p)) 1665 if (is_mark (p))
1832 clrmark (p); 1666 clrmark (p);
1833 else 1667 else
1834 { 1668 {
1835 /* reclaim cell */ 1669 /* reclaim cell */
1836 if (typeflag (p) != 0) 1670 if (typeflag (p) != T_PAIR)
1837 { 1671 {
1838 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1839 set_typeflag (p, 0); 1673 set_typeflag (p, T_PAIR);
1840 set_car (p, NIL); 1674 set_car (p, NIL);
1841 } 1675 }
1842 1676
1843 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1844 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1846 } 1680 }
1847 } 1681 }
1848 } 1682 }
1849 1683
1850 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1851 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1852} 1688}
1853 1689
1854static void 1690static void
1855finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1856{ 1692{
1857 if (is_string (a)) 1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1858 free (strvalue (a)); 1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1859#if USE_PORTS 1698#if USE_PORTS
1860 else if (is_port (a)) 1699 else if (is_port (a))
1861 { 1700 {
1862 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1863 port_close (SCHEME_A_ a, port_input | port_output); 1702 port_close (SCHEME_A_ a, port_input | port_output);
… …
2282#endif 2121#endif
2283} 2122}
2284 2123
2285/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2286static char * 2125static char *
2287readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2288{ 2127{
2289 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2290 2129
2291 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2292 2131
2293 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2294 {
2295 *p = 0; 2133 *p = 0;
2296 }
2297 else 2134 else
2298 { 2135 {
2299 backchar (SCHEME_A_ p[-1]); 2136 backchar (SCHEME_A_ p[-1]);
2300 *--p = '\0'; 2137 *--p = '\0';
2301 } 2138 }
… …
2303 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2304} 2141}
2305 2142
2306/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2307static pointer 2144static pointer
2308readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2309{ 2146{
2310 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2311 int c; 2148 int c;
2312 int c1 = 0; 2149 int c1 = 0;
2313 enum
2314 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2150 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2315 2151
2316 for (;;) 2152 for (;;)
2317 { 2153 {
2318 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2319 2155
2320 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1) 2156 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1)
2321 {
2322 return S_F; 2157 return S_F;
2323 }
2324 2158
2325 switch (state) 2159 switch (state)
2326 { 2160 {
2327 case st_ok: 2161 case st_ok:
2328 switch (c) 2162 if (ecb_expect_false (c == delim))
2329 {
2330 case '\\':
2331 state = st_bsl;
2332 break;
2333
2334 case '"':
2335 *p = 0;
2336 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2337 2164
2338 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2339 *p++ = c; 2168 *p++ = c;
2340 break;
2341 }
2342 2169
2343 break; 2170 break;
2344 2171
2345 case st_bsl: 2172 case st_bsl:
2346 switch (c) 2173 switch (c)
… …
2376 case 'r': 2203 case 'r':
2377 *p++ = '\r'; 2204 *p++ = '\r';
2378 state = st_ok; 2205 state = st_ok;
2379 break; 2206 break;
2380 2207
2381 case '"':
2382 *p++ = '"';
2383 state = st_ok;
2384 break;
2385
2386 default: 2208 default:
2387 *p++ = c; 2209 *p++ = c;
2388 state = st_ok; 2210 state = st_ok;
2389 break; 2211 break;
2390 } 2212 }
2391 2213
2392 break; 2214 break;
2393 2215
2394 case st_x1: 2216 case st_x1:
2395 case st_x2: 2217 case st_x2:
2396 c = toupper (c); 2218 c = tolower (c);
2397 2219
2398 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2399 {
2400 if (c <= '9')
2401 {
2402 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2403 } 2222 else if (c >= 'a' && c <= 'f')
2404 else
2405 {
2406 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2407 } 2224 else
2225 return S_F;
2408 2226
2409 if (state == st_x1) 2227 if (state == st_x1)
2410 {
2411 state = st_x2; 2228 state = st_x2;
2412 }
2413 else
2414 {
2415 *p++ = c1;
2416 state = st_ok;
2417 }
2418 }
2419 else 2229 else
2420 { 2230 {
2421 return S_F; 2231 *p++ = c1;
2232 state = st_ok;
2422 } 2233 }
2423 2234
2424 break; 2235 break;
2425 2236
2426 case st_oct1: 2237 case st_oct1:
… …
2431 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2432 state = st_ok; 2243 state = st_ok;
2433 } 2244 }
2434 else 2245 else
2435 { 2246 {
2436 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2437 return S_F; 2248 return S_F;
2438 2249
2439 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2440 2251
2441 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2446 state = st_ok; 2257 state = st_ok;
2447 } 2258 }
2448 } 2259 }
2449 2260
2450 break; 2261 break;
2451
2452 } 2262 }
2453 } 2263 }
2454} 2264}
2455 2265
2456/* check c is in chars */ 2266/* check c is in chars */
2457static INLINE int 2267ecb_inline int
2458is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2459{ 2269{
2460 if (c == EOF) 2270 return c == EOF || !!strchr (s, c);
2461 return 1;
2462
2463 while (*s)
2464 if (*s++ == c)
2465 return 1;
2466
2467 return 0;
2468} 2271}
2469 2272
2470/* skip white characters */ 2273/* skip white characters */
2471static INLINE int 2274ecb_inline int
2472skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2473{ 2276{
2474 int c, curr_line = 0; 2277 int c, curr_line = 0;
2475 2278
2476 do 2279 do
2477 { 2280 {
2478 c = inchar (SCHEME_A); 2281 c = inchar (SCHEME_A);
2282
2479#if SHOW_ERROR_LINE 2283#if SHOW_ERROR_LINE
2480 if (c == '\n') 2284 if (ecb_expect_false (c == '\n'))
2481 curr_line++; 2285 curr_line++;
2482
2483#endif 2286#endif
2287
2288 if (ecb_expect_false (c == EOF))
2289 return c;
2484 } 2290 }
2485 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2291 while (is_one_of (WHITESPACE, c));
2486 2292
2487 /* record it */ 2293 /* record it */
2488#if SHOW_ERROR_LINE 2294#if SHOW_ERROR_LINE
2489 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2490 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2491#endif 2297#endif
2492 2298
2493 if (c != EOF)
2494 {
2495 backchar (SCHEME_A_ c); 2299 backchar (SCHEME_A_ c);
2496 return 1; 2300 return 1;
2497 }
2498 else
2499 return EOF;
2500} 2301}
2501 2302
2502/* get token */ 2303/* get token */
2503static int 2304static int
2504token (SCHEME_P) 2305token (SCHEME_P)
… …
2520 return TOK_RPAREN; 2321 return TOK_RPAREN;
2521 2322
2522 case '.': 2323 case '.':
2523 c = inchar (SCHEME_A); 2324 c = inchar (SCHEME_A);
2524 2325
2525 if (is_one_of (" \n\t", c)) 2326 if (is_one_of (WHITESPACE, c))
2526 return TOK_DOT; 2327 return TOK_DOT;
2527 else 2328 else
2528 { 2329 {
2529 backchar (SCHEME_A_ c); 2330 backchar (SCHEME_A_ c);
2530 backchar (SCHEME_A_ '.');
2531 return TOK_ATOM; 2331 return TOK_DOTATOM;
2532 } 2332 }
2333
2334 case '|':
2335 return TOK_STRATOM;
2533 2336
2534 case '\'': 2337 case '\'':
2535 return TOK_QUOTE; 2338 return TOK_QUOTE;
2536 2339
2537 case ';': 2340 case ';':
… …
2647 int d = *s / 16; 2450 int d = *s / 16;
2648 2451
2649 putcharacter (SCHEME_A_ 'x'); 2452 putcharacter (SCHEME_A_ 'x');
2650 2453
2651 if (d < 10) 2454 if (d < 10)
2652 {
2653 putcharacter (SCHEME_A_ d + '0'); 2455 putcharacter (SCHEME_A_ d + '0');
2654 }
2655 else 2456 else
2656 {
2657 putcharacter (SCHEME_A_ d - 10 + 'A'); 2457 putcharacter (SCHEME_A_ d - 10 + 'A');
2658 }
2659 2458
2660 d = *s % 16; 2459 d = *s % 16;
2661 2460
2662 if (d < 10) 2461 if (d < 10)
2663 {
2664 putcharacter (SCHEME_A_ d + '0'); 2462 putcharacter (SCHEME_A_ d + '0');
2665 }
2666 else 2463 else
2667 {
2668 putcharacter (SCHEME_A_ d - 10 + 'A'); 2464 putcharacter (SCHEME_A_ d - 10 + 'A');
2669 }
2670 } 2465 }
2671 } 2466 }
2672 } 2467 }
2673 else 2468 else
2674 {
2675 putcharacter (SCHEME_A_ * s); 2469 putcharacter (SCHEME_A_ * s);
2676 }
2677 2470
2678 s++; 2471 s++;
2679 } 2472 }
2680 2473
2681 putcharacter (SCHEME_A_ '"'); 2474 putcharacter (SCHEME_A_ '"');
2682} 2475}
2683
2684 2476
2685/* print atoms */ 2477/* print atoms */
2686static void 2478static void
2687printatom (SCHEME_P_ pointer l, int f) 2479printatom (SCHEME_P_ pointer l, int f)
2688{ 2480{
… …
2690 int len; 2482 int len;
2691 2483
2692 atom2str (SCHEME_A_ l, f, &p, &len); 2484 atom2str (SCHEME_A_ l, f, &p, &len);
2693 putchars (SCHEME_A_ p, len); 2485 putchars (SCHEME_A_ p, len);
2694} 2486}
2695
2696 2487
2697/* Uses internal buffer unless string pointer is already available */ 2488/* Uses internal buffer unless string pointer is already available */
2698static void 2489static void
2699atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2490atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2700{ 2491{
… …
2714 { 2505 {
2715 p = SCHEME_V->strbuff; 2506 p = SCHEME_V->strbuff;
2716 2507
2717 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2508 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2718 { 2509 {
2719 if (num_is_integer (l)) 2510 if (is_integer (l))
2720 xnum (p, ivalue_unchecked (l)); 2511 xnum (p, ivalue_unchecked (l));
2721#if USE_FLOAT 2512#if USE_REAL
2722 else 2513 else
2723 { 2514 {
2724 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2515 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2725 /* r5rs says there must be a '.' (unless 'e'?) */ 2516 /* r5rs says there must be a '.' (unless 'e'?) */
2726 f = strcspn (p, ".e"); 2517 f = strcspn (p, ".e");
… …
2861#endif 2652#endif
2862 } 2653 }
2863 else if (is_continuation (l)) 2654 else if (is_continuation (l))
2864 p = "#<CONTINUATION>"; 2655 p = "#<CONTINUATION>";
2865 else 2656 else
2657 {
2658#if USE_PRINTF
2659 p = SCHEME_V->strbuff;
2660 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2661#else
2866 p = "#<ERROR>"; 2662 p = "#<ERROR>";
2663#endif
2664 }
2867 2665
2868 *pp = p; 2666 *pp = p;
2869 *plen = strlen (p); 2667 *plen = strlen (p);
2870} 2668}
2871 2669
… …
2898list_star (SCHEME_P_ pointer d) 2696list_star (SCHEME_P_ pointer d)
2899{ 2697{
2900 pointer p, q; 2698 pointer p, q;
2901 2699
2902 if (cdr (d) == NIL) 2700 if (cdr (d) == NIL)
2903 {
2904 return car (d); 2701 return car (d);
2905 }
2906 2702
2907 p = cons (car (d), cdr (d)); 2703 p = cons (car (d), cdr (d));
2908 q = p; 2704 q = p;
2909 2705
2910 while (cdr (cdr (p)) != NIL) 2706 while (cdr (cdr (p)) != NIL)
2911 { 2707 {
2912 d = cons (car (p), cdr (p)); 2708 d = cons (car (p), cdr (p));
2913 2709
2914 if (cdr (cdr (p)) != NIL) 2710 if (cdr (cdr (p)) != NIL)
2915 {
2916 p = cdr (d); 2711 p = cdr (d);
2917 }
2918 } 2712 }
2919 2713
2920 set_cdr (p, car (cdr (p))); 2714 set_cdr (p, car (cdr (p)));
2921 return q; 2715 return q;
2922} 2716}
… …
2936 2730
2937/* reverse list --- in-place */ 2731/* reverse list --- in-place */
2938static pointer 2732static pointer
2939reverse_in_place (SCHEME_P_ pointer term, pointer list) 2733reverse_in_place (SCHEME_P_ pointer term, pointer list)
2940{ 2734{
2941 pointer p = list, result = term, q; 2735 pointer result = term;
2736 pointer p = list;
2942 2737
2943 while (p != NIL) 2738 while (p != NIL)
2944 { 2739 {
2945 q = cdr (p); 2740 pointer q = cdr (p);
2946 set_cdr (p, result); 2741 set_cdr (p, result);
2947 result = p; 2742 result = p;
2948 p = q; 2743 p = q;
2949 } 2744 }
2950 2745
… …
2982 return 0; 2777 return 0;
2983 } 2778 }
2984 else if (is_number (a)) 2779 else if (is_number (a))
2985 { 2780 {
2986 if (is_number (b)) 2781 if (is_number (b))
2987 if (num_is_integer (a) == num_is_integer (b))
2988 return num_eq (nvalue (a), nvalue (b)); 2782 return num_cmp (nvalue (a), nvalue (b)) == 0;
2989 2783
2990 return 0; 2784 return 0;
2991 } 2785 }
2992 else if (is_character (a)) 2786 else if (is_character (a))
2993 { 2787 {
… …
3019/* () is #t in R5RS */ 2813/* () is #t in R5RS */
3020#define is_true(p) ((p) != S_F) 2814#define is_true(p) ((p) != S_F)
3021#define is_false(p) ((p) == S_F) 2815#define is_false(p) ((p) == S_F)
3022 2816
3023/* ========== Environment implementation ========== */ 2817/* ========== Environment implementation ========== */
3024
3025#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
3026
3027static int
3028hash_fn (const char *key, int table_size)
3029{
3030 unsigned int hashed = 0;
3031 const char *c;
3032 int bits_per_int = sizeof (unsigned int) * 8;
3033
3034 for (c = key; *c; c++)
3035 {
3036 /* letters have about 5 bits in them */
3037 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
3038 hashed ^= *c;
3039 }
3040
3041 return hashed % table_size;
3042}
3043#endif
3044 2818
3045#ifndef USE_ALIST_ENV 2819#ifndef USE_ALIST_ENV
3046 2820
3047/* 2821/*
3048 * In this implementation, each frame of the environment may be 2822 * In this implementation, each frame of the environment may be
… …
3065 2839
3066 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2840 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3067 setenvironment (SCHEME_V->envir); 2841 setenvironment (SCHEME_V->envir);
3068} 2842}
3069 2843
3070static INLINE void 2844static uint32_t
2845sym_hash (pointer sym, uint32_t size)
2846{
2847 uintptr_t ptr = (uintptr_t)sym;
2848
2849#if 0
2850 /* table size is prime, so why mix */
2851 ptr += ptr >> 32;
2852 ptr += ptr >> 16;
2853 ptr += ptr >> 8;
2854#endif
2855
2856 return ptr % size;
2857}
2858
2859ecb_inline void
3071new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2860new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3072{ 2861{
3073 pointer slot = immutable_cons (variable, value); 2862 pointer slot = immutable_cons (variable, value);
3074 2863
3075 if (is_vector (car (env))) 2864 if (is_vector (car (env)))
3076 { 2865 {
3077 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2866 int location = sym_hash (variable, veclength (car (env)));
3078
3079 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
3080 } 2868 }
3081 else 2869 else
3082 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
3083} 2871}
3084 2872
3085static pointer 2873static pointer
3086find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
3087{ 2875{
3088 pointer x, y; 2876 pointer x, y;
3089 int location;
3090 2877
3091 for (x = env; x != NIL; x = cdr (x)) 2878 for (x = env; x != NIL; x = cdr (x))
3092 { 2879 {
3093 if (is_vector (car (x))) 2880 if (is_vector (car (x)))
3094 { 2881 {
3095 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2882 int location = sym_hash (hdl, veclength (car (x)));
3096 y = vector_elem (car (x), location); 2883 y = vector_get (car (x), location);
3097 } 2884 }
3098 else 2885 else
3099 y = car (x); 2886 y = car (x);
3100 2887
3101 for (; y != NIL; y = cdr (y)) 2888 for (; y != NIL; y = cdr (y))
3102 if (caar (y) == hdl) 2889 if (caar (y) == hdl)
3103 break; 2890 break;
3104 2891
3105 if (y != NIL) 2892 if (y != NIL)
2893 return car (y);
2894
2895 if (!all)
3106 break; 2896 break;
3107
3108 if (!all)
3109 return NIL;
3110 } 2897 }
3111
3112 if (x != NIL)
3113 return car (y);
3114 2898
3115 return NIL; 2899 return NIL;
3116} 2900}
3117 2901
3118#else /* USE_ALIST_ENV */ 2902#else /* USE_ALIST_ENV */
3119 2903
3120static INLINE void 2904ecb_inline void
3121new_frame_in_env (SCHEME_P_ pointer old_env) 2905new_frame_in_env (SCHEME_P_ pointer old_env)
3122{ 2906{
3123 SCHEME_V->envir = immutable_cons (NIL, old_env); 2907 SCHEME_V->envir = immutable_cons (NIL, old_env);
3124 setenvironment (SCHEME_V->envir); 2908 setenvironment (SCHEME_V->envir);
3125} 2909}
3126 2910
3127static INLINE void 2911ecb_inline void
3128new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2912new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3129{ 2913{
3130 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2914 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3131} 2915}
3132 2916
… …
3140 for (y = car (x); y != NIL; y = cdr (y)) 2924 for (y = car (x); y != NIL; y = cdr (y))
3141 if (caar (y) == hdl) 2925 if (caar (y) == hdl)
3142 break; 2926 break;
3143 2927
3144 if (y != NIL) 2928 if (y != NIL)
2929 return car (y);
3145 break; 2930 break;
3146 2931
3147 if (!all) 2932 if (!all)
3148 return NIL; 2933 break;
3149 } 2934 }
3150
3151 if (x != NIL)
3152 return car (y);
3153 2935
3154 return NIL; 2936 return NIL;
3155} 2937}
3156 2938
3157#endif /* USE_ALIST_ENV else */ 2939#endif /* USE_ALIST_ENV else */
3158 2940
3159static INLINE void 2941ecb_inline void
3160new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2942new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3161{ 2943{
2944 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
3162 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2945 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
3163} 2946}
3164 2947
3165static INLINE void 2948ecb_inline void
3166set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2949set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3167{ 2950{
3168 set_cdr (slot, value); 2951 set_cdr (slot, value);
3169} 2952}
3170 2953
3171static INLINE pointer 2954ecb_inline pointer
3172slot_value_in_env (pointer slot) 2955slot_value_in_env (pointer slot)
3173{ 2956{
3174 return cdr (slot); 2957 return cdr (slot);
3175} 2958}
3176 2959
3177/* ========== Evaluation Cycle ========== */ 2960/* ========== Evaluation Cycle ========== */
3178 2961
3179static pointer 2962static int
3180xError_1 (SCHEME_P_ const char *s, pointer a) 2963xError_1 (SCHEME_P_ const char *s, pointer a)
3181{ 2964{
3182#if USE_ERROR_HOOK 2965#if USE_ERROR_HOOK
3183 pointer x; 2966 pointer x;
3184 pointer hdl = SCHEME_V->ERROR_HOOK; 2967 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3210#if USE_ERROR_HOOK 2993#if USE_ERROR_HOOK
3211 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2994 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3212 2995
3213 if (x != NIL) 2996 if (x != NIL)
3214 { 2997 {
3215 if (a) 2998 pointer code = a
3216 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2999 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3217 else 3000 : NIL;
3218 SCHEME_V->code = NIL;
3219 3001
3220 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 3002 code = cons (mk_string (SCHEME_A_ s), code);
3221 setimmutable (car (SCHEME_V->code)); 3003 setimmutable (car (code));
3222 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 3004 SCHEME_V->code = cons (slot_value_in_env (x), code);
3223 SCHEME_V->op = OP_EVAL; 3005 SCHEME_V->op = OP_EVAL;
3224 3006
3225 return S_T; 3007 return 0;
3226 } 3008 }
3227#endif 3009#endif
3228 3010
3229 if (a) 3011 if (a)
3230 SCHEME_V->args = cons (a, NIL); 3012 SCHEME_V->args = cons (a, NIL);
3231 else 3013 else
3232 SCHEME_V->args = NIL; 3014 SCHEME_V->args = NIL;
3233 3015
3234 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3016 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3235 setimmutable (car (SCHEME_V->args)); 3017 setimmutable (car (SCHEME_V->args));
3236 SCHEME_V->op = (int)OP_ERR0; 3018 SCHEME_V->op = OP_ERR0;
3019
3237 return S_T; 3020 return 0;
3238} 3021}
3239 3022
3240#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3023#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3241#define Error_0(s) Error_1 (s, 0) 3024#define Error_0(s) Error_1 (s, 0)
3242 3025
3243/* Too small to turn into function */ 3026/* Too small to turn into function */
3244#define BEGIN do { 3027#define BEGIN do {
3245#define END } while (0) 3028#define END } while (0)
3246#define s_goto(a) BEGIN \ 3029#define s_goto(a) BEGIN \
3247 SCHEME_V->op = (int)(a); \ 3030 SCHEME_V->op = a; \
3248 return S_T; END 3031 return 0; END
3249 3032
3250#define s_return(a) return xs_return(SCHEME_A_ a) 3033#define s_return(a) return xs_return (SCHEME_A_ a)
3251 3034
3252#ifndef USE_SCHEME_STACK 3035#ifndef USE_SCHEME_STACK
3253 3036
3254/* this structure holds all the interpreter's registers */ 3037/* this structure holds all the interpreter's registers */
3255struct dump_stack_frame 3038struct dump_stack_frame
… …
3274 SCHEME_V->dump_size += STACK_GROWTH; 3057 SCHEME_V->dump_size += STACK_GROWTH;
3275 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3058 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3276 } 3059 }
3277 3060
3278 next_frame = SCHEME_V->dump_base + nframes; 3061 next_frame = SCHEME_V->dump_base + nframes;
3062
3279 next_frame->op = op; 3063 next_frame->op = op;
3280 next_frame->args = args; 3064 next_frame->args = args;
3281 next_frame->envir = SCHEME_V->envir; 3065 next_frame->envir = SCHEME_V->envir;
3282 next_frame->code = code; 3066 next_frame->code = code;
3067
3283 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3068 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3284} 3069}
3285 3070
3286static pointer 3071static int
3287xs_return (SCHEME_P_ pointer a) 3072xs_return (SCHEME_P_ pointer a)
3288{ 3073{
3289 int nframes = (uintptr_t)SCHEME_V->dump; 3074 int nframes = (uintptr_t)SCHEME_V->dump;
3290 struct dump_stack_frame *frame; 3075 struct dump_stack_frame *frame;
3291 3076
3292 SCHEME_V->value = a; 3077 SCHEME_V->value = a;
3293 3078
3294 if (nframes <= 0) 3079 if (nframes <= 0)
3295 return NIL; 3080 return -1;
3296 3081
3297 nframes--;
3298 frame = SCHEME_V->dump_base + nframes; 3082 frame = &SCHEME_V->dump_base[--nframes];
3299 SCHEME_V->op = frame->op; 3083 SCHEME_V->op = frame->op;
3300 SCHEME_V->args = frame->args; 3084 SCHEME_V->args = frame->args;
3301 SCHEME_V->envir = frame->envir; 3085 SCHEME_V->envir = frame->envir;
3302 SCHEME_V->code = frame->code; 3086 SCHEME_V->code = frame->code;
3303 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3087 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3304 3088
3305 return S_T; 3089 return 0;
3306} 3090}
3307 3091
3308static INLINE void 3092ecb_inline void
3309dump_stack_reset (SCHEME_P) 3093dump_stack_reset (SCHEME_P)
3310{ 3094{
3311 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3095 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3312 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)+0;
3313} 3097}
3314 3098
3315static INLINE void 3099ecb_inline void
3316dump_stack_initialize (SCHEME_P) 3100dump_stack_initialize (SCHEME_P)
3317{ 3101{
3318 SCHEME_V->dump_size = 0; 3102 SCHEME_V->dump_size = 0;
3319 SCHEME_V->dump_base = NULL; 3103 SCHEME_V->dump_base = 0;
3320 dump_stack_reset (SCHEME_A); 3104 dump_stack_reset (SCHEME_A);
3321} 3105}
3322 3106
3323static void 3107static void
3324dump_stack_free (SCHEME_P) 3108dump_stack_free (SCHEME_P)
3325{ 3109{
3326 free (SCHEME_V->dump_base); 3110 free (SCHEME_V->dump_base);
3327 SCHEME_V->dump_base = NULL; 3111 SCHEME_V->dump_base = 0;
3328 SCHEME_V->dump = (pointer)0; 3112 SCHEME_V->dump = (pointer)0;
3329 SCHEME_V->dump_size = 0; 3113 SCHEME_V->dump_size = 0;
3330} 3114}
3331 3115
3332static void 3116static void
… …
3373 int i = 0; 3157 int i = 0;
3374 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3158 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3375 3159
3376 while (cont != NIL) 3160 while (cont != NIL)
3377 { 3161 {
3378 frame->op = ivalue (car (cont)); cont = cdr (cont); 3162 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3379 frame->args = car (cont) ; cont = cdr (cont); 3163 frame->args = car (cont) ; cont = cdr (cont);
3380 frame->envir = car (cont) ; cont = cdr (cont); 3164 frame->envir = car (cont) ; cont = cdr (cont);
3381 frame->code = car (cont) ; cont = cdr (cont); 3165 frame->code = car (cont) ; cont = cdr (cont);
3382 3166
3383 ++frame; 3167 ++frame;
3384 ++i; 3168 ++i;
3385 } 3169 }
3386 3170
3387 SCHEME_V->dump = (pointer)(uintptr_t)i; 3171 SCHEME_V->dump = (pointer)(uintptr_t)i;
3388} 3172}
3389 3173
3390#else 3174#else
3391 3175
3392static INLINE void 3176ecb_inline void
3393dump_stack_reset (SCHEME_P) 3177dump_stack_reset (SCHEME_P)
3394{ 3178{
3395 SCHEME_V->dump = NIL; 3179 SCHEME_V->dump = NIL;
3396} 3180}
3397 3181
3398static INLINE void 3182ecb_inline void
3399dump_stack_initialize (SCHEME_P) 3183dump_stack_initialize (SCHEME_P)
3400{ 3184{
3401 dump_stack_reset (SCHEME_A); 3185 dump_stack_reset (SCHEME_A);
3402} 3186}
3403 3187
… …
3405dump_stack_free (SCHEME_P) 3189dump_stack_free (SCHEME_P)
3406{ 3190{
3407 SCHEME_V->dump = NIL; 3191 SCHEME_V->dump = NIL;
3408} 3192}
3409 3193
3410static pointer 3194static int
3411xs_return (SCHEME_P_ pointer a) 3195xs_return (SCHEME_P_ pointer a)
3412{ 3196{
3413 pointer dump = SCHEME_V->dump; 3197 pointer dump = SCHEME_V->dump;
3414 3198
3415 SCHEME_V->value = a; 3199 SCHEME_V->value = a;
3416 3200
3417 if (dump == NIL) 3201 if (dump == NIL)
3418 return NIL; 3202 return -1;
3419 3203
3420 SCHEME_V->op = ivalue (car (dump)); 3204 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3421 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3205 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3422 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3423 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3424 3208
3425 SCHEME_V->dump = dump; 3209 SCHEME_V->dump = dump;
3426 3210
3427 return S_T; 3211 return 0;
3428} 3212}
3429 3213
3430static void 3214static void
3431s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3215s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3432{ 3216{
… …
3457 3241
3458#endif 3242#endif
3459 3243
3460#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3244#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3461 3245
3246#if 1
3462static pointer 3247static int
3248debug (SCHEME_P_ int indent, pointer x)
3249{
3250 int c;
3251
3252 if (is_syntax (x))
3253 {
3254 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3255 return 8 + 8;
3256 }
3257
3258 if (x == NIL)
3259 {
3260 printf ("%*sNIL\n", indent, "");
3261 return 3;
3262 }
3263
3264 switch (type (x))
3265 {
3266 case T_INTEGER:
3267 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3268 return 32+8;
3269
3270 case T_SYMBOL:
3271 printf ("%*sS<%s>\n", indent, "", symname (x));
3272 return 24+8;
3273
3274 case T_CLOSURE:
3275 printf ("%*sS<%s>\n", indent, "", "closure");
3276 debug (SCHEME_A_ indent + 3, cdr(x));
3277 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3278
3279 case T_PAIR:
3280 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3281 c = debug (SCHEME_A_ indent + 3, car (x));
3282 c += debug (SCHEME_A_ indent + 3, cdr (x));
3283 return c + 1;
3284
3285 case T_PORT:
3286 printf ("%*sS<%s>\n", indent, "", "port");
3287 return 24+8;
3288
3289 case T_VECTOR:
3290 printf ("%*sS<%s>\n", indent, "", "vector");
3291 return 24+8;
3292
3293 case T_ENVIRONMENT:
3294 printf ("%*sS<%s>\n", indent, "", "environment");
3295 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3296
3297 default:
3298 printf ("unhandled type %d\n", type (x));
3299 break;
3300 }
3301}
3302#endif
3303
3304static int
3463opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3305opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3464{ 3306{
3307 pointer args = SCHEME_V->args;
3465 pointer x, y; 3308 pointer x, y;
3466 3309
3467 switch (op) 3310 switch (op)
3468 { 3311 {
3312#if 1 //D
3313 case OP_DEBUG:
3314 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3315 printf ("\n");
3316 s_return (S_T);
3317#endif
3469 case OP_LOAD: /* load */ 3318 case OP_LOAD: /* load */
3470 if (file_interactive (SCHEME_A)) 3319 if (file_interactive (SCHEME_A))
3471 { 3320 {
3472 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3321 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3473 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3322 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3474 } 3323 }
3475 3324
3476 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3325 if (!file_push (SCHEME_A_ strvalue (car (args))))
3477 Error_1 ("unable to open", car (SCHEME_V->args)); 3326 Error_1 ("unable to open", car (args));
3478 else 3327 else
3479 { 3328 {
3480 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3329 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3481 s_goto (OP_T0LVL); 3330 s_goto (OP_T0LVL);
3482 } 3331 }
… …
3517 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3366 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3518 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3367 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3519 s_goto (OP_READ_INTERNAL); 3368 s_goto (OP_READ_INTERNAL);
3520 3369
3521 case OP_T1LVL: /* top level */ 3370 case OP_T1LVL: /* top level */
3522 SCHEME_V->code = SCHEME_V->value; 3371 SCHEME_V->code = SCHEME_V->value;
3523 SCHEME_V->inport = SCHEME_V->save_inport; 3372 SCHEME_V->inport = SCHEME_V->save_inport;
3524 s_goto (OP_EVAL); 3373 s_goto (OP_EVAL);
3525 3374
3526 case OP_READ_INTERNAL: /* internal read */ 3375 case OP_READ_INTERNAL: /* internal read */
3527 SCHEME_V->tok = token (SCHEME_A); 3376 SCHEME_V->tok = token (SCHEME_A);
3528 3377
3529 if (SCHEME_V->tok == TOK_EOF) 3378 if (SCHEME_V->tok == TOK_EOF)
3530 {
3531 s_return (S_EOF); 3379 s_return (S_EOF);
3532 }
3533 3380
3534 s_goto (OP_RDSEXPR); 3381 s_goto (OP_RDSEXPR);
3535 3382
3536 case OP_GENSYM: 3383 case OP_GENSYM:
3537 s_return (gensym (SCHEME_A)); 3384 s_return (gensym (SCHEME_A));
… …
3541 /* OP_VALUEPRINT is always pushed, because when changing from 3388 /* OP_VALUEPRINT is always pushed, because when changing from
3542 non-interactive to interactive mode, it needs to be 3389 non-interactive to interactive mode, it needs to be
3543 already on the stack */ 3390 already on the stack */
3544#if USE_TRACING 3391#if USE_TRACING
3545 if (SCHEME_V->tracing) 3392 if (SCHEME_V->tracing)
3546 {
3547 putstr (SCHEME_A_ "\nGives: "); 3393 putstr (SCHEME_A_ "\nGives: ");
3548 }
3549#endif 3394#endif
3550 3395
3551 if (file_interactive (SCHEME_A)) 3396 if (file_interactive (SCHEME_A))
3552 { 3397 {
3553 SCHEME_V->print_flag = 1; 3398 SCHEME_V->print_flag = 1;
3554 SCHEME_V->args = SCHEME_V->value; 3399 SCHEME_V->args = SCHEME_V->value;
3555 s_goto (OP_P0LIST); 3400 s_goto (OP_P0LIST);
3556 } 3401 }
3557 else 3402 else
3558 {
3559 s_return (SCHEME_V->value); 3403 s_return (SCHEME_V->value);
3560 }
3561 3404
3562 case OP_EVAL: /* main part of evaluation */ 3405 case OP_EVAL: /* main part of evaluation */
3563#if USE_TRACING 3406#if USE_TRACING
3564 if (SCHEME_V->tracing) 3407 if (SCHEME_V->tracing)
3565 { 3408 {
3566 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3409 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3567 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3410 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3568 SCHEME_V->args = SCHEME_V->code; 3411 SCHEME_V->args = SCHEME_V->code;
3569 putstr (SCHEME_A_ "\nEval: "); 3412 putstr (SCHEME_A_ "\nEval: ");
3570 s_goto (OP_P0LIST); 3413 s_goto (OP_P0LIST);
3571 } 3414 }
3572 3415
3573 /* fall through */ 3416 /* fall through */
3417
3574 case OP_REAL_EVAL: 3418 case OP_REAL_EVAL:
3575#endif 3419#endif
3576 if (is_symbol (SCHEME_V->code)) /* symbol */ 3420 if (is_symbol (SCHEME_V->code)) /* symbol */
3577 { 3421 {
3578 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3422 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
… …
3582 else 3426 else
3583 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3427 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3584 } 3428 }
3585 else if (is_pair (SCHEME_V->code)) 3429 else if (is_pair (SCHEME_V->code))
3586 { 3430 {
3431 x = car (SCHEME_V->code);
3432
3587 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3433 if (is_syntax (x)) /* SYNTAX */
3588 { 3434 {
3589 SCHEME_V->code = cdr (SCHEME_V->code); 3435 SCHEME_V->code = cdr (SCHEME_V->code);
3590 s_goto (syntaxnum (x)); 3436 s_goto (syntaxnum (x));
3591 } 3437 }
3592 else /* first, eval top element and eval arguments */ 3438 else /* first, eval top element and eval arguments */
3593 { 3439 {
3594 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3440 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3595 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3441 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3596 SCHEME_V->code = car (SCHEME_V->code); 3442 SCHEME_V->code = x;
3597 s_goto (OP_EVAL); 3443 s_goto (OP_EVAL);
3598 } 3444 }
3599 } 3445 }
3600 else 3446 else
3601 s_return (SCHEME_V->code); 3447 s_return (SCHEME_V->code);
3602 3448
3603 case OP_E0ARGS: /* eval arguments */ 3449 case OP_E0ARGS: /* eval arguments */
3604 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3450 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3605 { 3451 {
3606 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3452 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3607 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3453 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3608 SCHEME_V->code = SCHEME_V->value; 3454 SCHEME_V->code = SCHEME_V->value;
3609 s_goto (OP_APPLY); 3455 s_goto (OP_APPLY);
… …
3613 SCHEME_V->code = cdr (SCHEME_V->code); 3459 SCHEME_V->code = cdr (SCHEME_V->code);
3614 s_goto (OP_E1ARGS); 3460 s_goto (OP_E1ARGS);
3615 } 3461 }
3616 3462
3617 case OP_E1ARGS: /* eval arguments */ 3463 case OP_E1ARGS: /* eval arguments */
3618 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3464 args = cons (SCHEME_V->value, args);
3619 3465
3620 if (is_pair (SCHEME_V->code)) /* continue */ 3466 if (is_pair (SCHEME_V->code)) /* continue */
3621 { 3467 {
3622 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3468 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3623 SCHEME_V->code = car (SCHEME_V->code); 3469 SCHEME_V->code = car (SCHEME_V->code);
3624 SCHEME_V->args = NIL; 3470 SCHEME_V->args = NIL;
3625 s_goto (OP_EVAL); 3471 s_goto (OP_EVAL);
3626 } 3472 }
3627 else /* end */ 3473 else /* end */
3628 { 3474 {
3629 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3475 args = reverse_in_place (SCHEME_A_ NIL, args);
3630 SCHEME_V->code = car (SCHEME_V->args); 3476 SCHEME_V->code = car (args);
3631 SCHEME_V->args = cdr (SCHEME_V->args); 3477 SCHEME_V->args = cdr (args);
3632 s_goto (OP_APPLY); 3478 s_goto (OP_APPLY);
3633 } 3479 }
3634 3480
3635#if USE_TRACING 3481#if USE_TRACING
3636 3482
3637 case OP_TRACING: 3483 case OP_TRACING:
3638 { 3484 {
3639 int tr = SCHEME_V->tracing; 3485 int tr = SCHEME_V->tracing;
3640 3486
3641 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3487 SCHEME_V->tracing = ivalue_unchecked (car (args));
3642 s_return (mk_integer (SCHEME_A_ tr)); 3488 s_return (mk_integer (SCHEME_A_ tr));
3643 } 3489 }
3644 3490
3645#endif 3491#endif
3646 3492
3647 case OP_APPLY: /* apply 'code' to 'args' */ 3493 case OP_APPLY: /* apply 'code' to 'args' */
3648#if USE_TRACING 3494#if USE_TRACING
3649 if (SCHEME_V->tracing) 3495 if (SCHEME_V->tracing)
3650 { 3496 {
3651 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3497 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3652 SCHEME_V->print_flag = 1; 3498 SCHEME_V->print_flag = 1;
3653 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3499 /* args=cons(SCHEME_V->code,args); */
3654 putstr (SCHEME_A_ "\nApply to: "); 3500 putstr (SCHEME_A_ "\nApply to: ");
3655 s_goto (OP_P0LIST); 3501 s_goto (OP_P0LIST);
3656 } 3502 }
3657 3503
3658 /* fall through */ 3504 /* fall through */
3505
3659 case OP_REAL_APPLY: 3506 case OP_REAL_APPLY:
3660#endif 3507#endif
3661 if (is_proc (SCHEME_V->code)) 3508 if (is_proc (SCHEME_V->code))
3662 {
3663 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3509 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3664 }
3665 else if (is_foreign (SCHEME_V->code)) 3510 else if (is_foreign (SCHEME_V->code))
3666 { 3511 {
3667 /* Keep nested calls from GC'ing the arglist */ 3512 /* Keep nested calls from GC'ing the arglist */
3668 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3513 push_recent_alloc (SCHEME_A_ args, NIL);
3669 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3514 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3670 3515
3671 s_return (x); 3516 s_return (x);
3672 } 3517 }
3673 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3518 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3674 { 3519 {
3675 /* Should not accept promise */ 3520 /* Should not accept promise */
3676 /* make environment */ 3521 /* make environment */
3677 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3522 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3678 3523
3679 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3524 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3680 { 3525 {
3681 if (y == NIL) 3526 if (y == NIL)
3682 {
3683 Error_0 ("not enough arguments"); 3527 Error_0 ("not enough arguments");
3684 }
3685 else 3528 else
3686 {
3687 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3529 new_slot_in_env (SCHEME_A_ car (x), car (y));
3688 }
3689 } 3530 }
3690 3531
3691 if (x == NIL) 3532 if (x == NIL)
3692 { 3533 {
3693
3694 /*-- 3534 /*--
3695 * if (y != NIL) { 3535 * if (y != NIL) {
3696 * Error_0("too many arguments"); 3536 * Error_0("too many arguments");
3697 * } 3537 * }
3698 */ 3538 */
3699 } 3539 }
3700 else if (is_symbol (x)) 3540 else if (is_symbol (x))
3701 new_slot_in_env (SCHEME_A_ x, y); 3541 new_slot_in_env (SCHEME_A_ x, y);
3702 else 3542 else
3703 {
3704 Error_1 ("syntax error in closure: not a symbol:", x); 3543 Error_1 ("syntax error in closure: not a symbol:", x);
3705 }
3706 3544
3707 SCHEME_V->code = cdr (closure_code (SCHEME_V->code)); 3545 SCHEME_V->code = cdr (closure_code (SCHEME_V->code));
3708 SCHEME_V->args = NIL; 3546 SCHEME_V->args = NIL;
3709 s_goto (OP_BEGIN); 3547 s_goto (OP_BEGIN);
3710 } 3548 }
3711 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3549 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3712 { 3550 {
3713 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3551 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3714 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3552 s_return (args != NIL ? car (args) : NIL);
3715 } 3553 }
3716 else 3554 else
3717 Error_0 ("illegal function"); 3555 Error_0 ("illegal function");
3718 3556
3719 case OP_DOMACRO: /* do macro */ 3557 case OP_DOMACRO: /* do macro */
… …
3728 { 3566 {
3729 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3567 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3730 3568
3731 if (f != NIL) 3569 if (f != NIL)
3732 { 3570 {
3733 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3571 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3734 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3572 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3735 SCHEME_V->code = slot_value_in_env (f); 3573 SCHEME_V->code = slot_value_in_env (f);
3736 s_goto (OP_APPLY); 3574 s_goto (OP_APPLY);
3737 } 3575 }
3738 3576
… …
3749 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3587 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3750 3588
3751#endif 3589#endif
3752 3590
3753 case OP_MKCLOSURE: /* make-closure */ 3591 case OP_MKCLOSURE: /* make-closure */
3754 x = car (SCHEME_V->args); 3592 x = car (args);
3755 3593
3756 if (car (x) == SCHEME_V->LAMBDA) 3594 if (car (x) == SCHEME_V->LAMBDA)
3757 x = cdr (x); 3595 x = cdr (x);
3758 3596
3759 if (cdr (SCHEME_V->args) == NIL) 3597 if (cdr (args) == NIL)
3760 y = SCHEME_V->envir; 3598 y = SCHEME_V->envir;
3761 else 3599 else
3762 y = cadr (SCHEME_V->args); 3600 y = cadr (args);
3763 3601
3764 s_return (mk_closure (SCHEME_A_ x, y)); 3602 s_return (mk_closure (SCHEME_A_ x, y));
3765 3603
3766 case OP_QUOTE: /* quote */ 3604 case OP_QUOTE: /* quote */
3767 s_return (car (SCHEME_V->code)); 3605 s_return (car (SCHEME_V->code));
… …
3780 x = car (SCHEME_V->code); 3618 x = car (SCHEME_V->code);
3781 SCHEME_V->code = cadr (SCHEME_V->code); 3619 SCHEME_V->code = cadr (SCHEME_V->code);
3782 } 3620 }
3783 3621
3784 if (!is_symbol (x)) 3622 if (!is_symbol (x))
3785 {
3786 Error_0 ("variable is not a symbol"); 3623 Error_0 ("variable is not a symbol");
3787 }
3788 3624
3789 s_save (SCHEME_A_ OP_DEF1, NIL, x); 3625 s_save (SCHEME_A_ OP_DEF1, NIL, x);
3790 s_goto (OP_EVAL); 3626 s_goto (OP_EVAL);
3791 3627
3792 case OP_DEF1: /* define */ 3628 case OP_DEF1: /* define */
3793 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3629 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
3794 3630
3795 if (x != NIL) 3631 if (x != NIL)
3796 {
3797 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3632 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
3798 }
3799 else 3633 else
3800 {
3801 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3634 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3802 }
3803 3635
3804 s_return (SCHEME_V->code); 3636 s_return (SCHEME_V->code);
3805 3637
3806 3638
3807 case OP_DEFP: /* defined? */ 3639 case OP_DEFP: /* defined? */
3808 x = SCHEME_V->envir; 3640 x = SCHEME_V->envir;
3809 3641
3810 if (cdr (SCHEME_V->args) != NIL) 3642 if (cdr (args) != NIL)
3811 {
3812 x = cadr (SCHEME_V->args); 3643 x = cadr (args);
3813 }
3814 3644
3815 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3645 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3816 3646
3817 case OP_SET0: /* set! */ 3647 case OP_SET0: /* set! */
3818 if (is_immutable (car (SCHEME_V->code))) 3648 if (is_immutable (car (SCHEME_V->code)))
3819 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3649 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3820 3650
… …
3829 { 3659 {
3830 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3660 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3831 s_return (SCHEME_V->value); 3661 s_return (SCHEME_V->value);
3832 } 3662 }
3833 else 3663 else
3834 {
3835 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3664 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3836 }
3837 3665
3838 3666
3839 case OP_BEGIN: /* begin */ 3667 case OP_BEGIN: /* begin */
3840 if (!is_pair (SCHEME_V->code)) 3668 if (!is_pair (SCHEME_V->code))
3841 {
3842 s_return (SCHEME_V->code); 3669 s_return (SCHEME_V->code);
3843 }
3844 3670
3845 if (cdr (SCHEME_V->code) != NIL) 3671 if (cdr (SCHEME_V->code) != NIL)
3846 {
3847 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code)); 3672 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code));
3848 }
3849 3673
3850 SCHEME_V->code = car (SCHEME_V->code); 3674 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3852 3676
3853 case OP_IF0: /* if */ 3677 case OP_IF0: /* if */
… …
3857 3681
3858 case OP_IF1: /* if */ 3682 case OP_IF1: /* if */
3859 if (is_true (SCHEME_V->value)) 3683 if (is_true (SCHEME_V->value))
3860 SCHEME_V->code = car (SCHEME_V->code); 3684 SCHEME_V->code = car (SCHEME_V->code);
3861 else 3685 else
3862 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3686 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3863
3864 * car(NIL) = NIL */
3865 s_goto (OP_EVAL); 3687 s_goto (OP_EVAL);
3866 3688
3867 case OP_LET0: /* let */ 3689 case OP_LET0: /* let */
3868 SCHEME_V->args = NIL; 3690 SCHEME_V->args = NIL;
3869 SCHEME_V->value = SCHEME_V->code; 3691 SCHEME_V->value = SCHEME_V->code;
3870 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3692 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3871 s_goto (OP_LET1); 3693 s_goto (OP_LET1);
3872 3694
3873 case OP_LET1: /* let (calculate parameters) */ 3695 case OP_LET1: /* let (calculate parameters) */
3874 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3696 args = cons (SCHEME_V->value, args);
3875 3697
3876 if (is_pair (SCHEME_V->code)) /* continue */ 3698 if (is_pair (SCHEME_V->code)) /* continue */
3877 { 3699 {
3878 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3700 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3879 {
3880 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3701 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3881 }
3882 3702
3883 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3703 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3884 SCHEME_V->code = cadar (SCHEME_V->code); 3704 SCHEME_V->code = cadar (SCHEME_V->code);
3885 SCHEME_V->args = NIL; 3705 SCHEME_V->args = NIL;
3886 s_goto (OP_EVAL); 3706 s_goto (OP_EVAL);
3887 } 3707 }
3888 else /* end */ 3708 else /* end */
3889 { 3709 {
3890 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3710 args = reverse_in_place (SCHEME_A_ NIL, args);
3891 SCHEME_V->code = car (SCHEME_V->args); 3711 SCHEME_V->code = car (args);
3892 SCHEME_V->args = cdr (SCHEME_V->args); 3712 SCHEME_V->args = cdr (args);
3893 s_goto (OP_LET2); 3713 s_goto (OP_LET2);
3894 } 3714 }
3895 3715
3896 case OP_LET2: /* let */ 3716 case OP_LET2: /* let */
3897 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3717 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3898 3718
3899 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3719 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3900 y != NIL; x = cdr (x), y = cdr (y)) 3720 y != NIL; x = cdr (x), y = cdr (y))
3901 {
3902 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3721 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3903 }
3904 3722
3905 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3723 if (is_symbol (car (SCHEME_V->code))) /* named let */
3906 { 3724 {
3907 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3725 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3908 { 3726 {
3909 if (!is_pair (x)) 3727 if (!is_pair (x))
3910 Error_1 ("Bad syntax of binding in let :", x); 3728 Error_1 ("Bad syntax of binding in let :", x);
3911 3729
3912 if (!is_list (SCHEME_A_ car (x))) 3730 if (!is_list (SCHEME_A_ car (x)))
3913 Error_1 ("Bad syntax of binding in let :", car (x)); 3731 Error_1 ("Bad syntax of binding in let :", car (x));
3914 3732
3915 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3733 args = cons (caar (x), args);
3916 } 3734 }
3917 3735
3918 x =
3919 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3736 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3920 SCHEME_V->envir); 3737 SCHEME_V->envir);
3921 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3738 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3922 SCHEME_V->code = cddr (SCHEME_V->code); 3739 SCHEME_V->code = cddr (SCHEME_V->code);
3923 SCHEME_V->args = NIL;
3924 } 3740 }
3925 else 3741 else
3926 { 3742 {
3927 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3744 }
3745
3928 SCHEME_V->args = NIL; 3746 SCHEME_V->args = NIL;
3929 }
3930
3931 s_goto (OP_BEGIN); 3747 s_goto (OP_BEGIN);
3932 3748
3933 case OP_LET0AST: /* let* */ 3749 case OP_LET0AST: /* let* */
3934 if (car (SCHEME_V->code) == NIL) 3750 if (car (SCHEME_V->code) == NIL)
3935 { 3751 {
… …
3953 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3769 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3954 SCHEME_V->code = cdr (SCHEME_V->code); 3770 SCHEME_V->code = cdr (SCHEME_V->code);
3955 3771
3956 if (is_pair (SCHEME_V->code)) /* continue */ 3772 if (is_pair (SCHEME_V->code)) /* continue */
3957 { 3773 {
3958 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3774 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3959 SCHEME_V->code = cadar (SCHEME_V->code); 3775 SCHEME_V->code = cadar (SCHEME_V->code);
3960 SCHEME_V->args = NIL; 3776 SCHEME_V->args = NIL;
3961 s_goto (OP_EVAL); 3777 s_goto (OP_EVAL);
3962 } 3778 }
3963 else /* end */ 3779 else /* end */
3964 { 3780 {
3965 SCHEME_V->code = SCHEME_V->args; 3781 SCHEME_V->code = args;
3966 SCHEME_V->args = NIL; 3782 SCHEME_V->args = NIL;
3967 s_goto (OP_BEGIN); 3783 s_goto (OP_BEGIN);
3968 } 3784 }
3969 3785
3970 case OP_LET0REC: /* letrec */ 3786 case OP_LET0REC: /* letrec */
… …
3973 SCHEME_V->value = SCHEME_V->code; 3789 SCHEME_V->value = SCHEME_V->code;
3974 SCHEME_V->code = car (SCHEME_V->code); 3790 SCHEME_V->code = car (SCHEME_V->code);
3975 s_goto (OP_LET1REC); 3791 s_goto (OP_LET1REC);
3976 3792
3977 case OP_LET1REC: /* letrec (calculate parameters) */ 3793 case OP_LET1REC: /* letrec (calculate parameters) */
3978 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3794 args = cons (SCHEME_V->value, args);
3979 3795
3980 if (is_pair (SCHEME_V->code)) /* continue */ 3796 if (is_pair (SCHEME_V->code)) /* continue */
3981 { 3797 {
3982 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3798 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3983 {
3984 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3799 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3985 }
3986 3800
3987 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3801 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3988 SCHEME_V->code = cadar (SCHEME_V->code); 3802 SCHEME_V->code = cadar (SCHEME_V->code);
3989 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3990 s_goto (OP_EVAL); 3804 s_goto (OP_EVAL);
3991 } 3805 }
3992 else /* end */ 3806 else /* end */
3993 { 3807 {
3994 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3808 args = reverse_in_place (SCHEME_A_ NIL, args);
3995 SCHEME_V->code = car (SCHEME_V->args); 3809 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cdr (SCHEME_V->args); 3810 SCHEME_V->args = cdr (args);
3997 s_goto (OP_LET2REC); 3811 s_goto (OP_LET2REC);
3998 } 3812 }
3999 3813
4000 case OP_LET2REC: /* letrec */ 3814 case OP_LET2REC: /* letrec */
4001 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3815 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
4002 {
4003 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3816 new_slot_in_env (SCHEME_A_ caar (x), car (y));
4004 }
4005 3817
4006 SCHEME_V->code = cdr (SCHEME_V->code); 3818 SCHEME_V->code = cdr (SCHEME_V->code);
4007 SCHEME_V->args = NIL; 3819 SCHEME_V->args = NIL;
4008 s_goto (OP_BEGIN); 3820 s_goto (OP_BEGIN);
4009 3821
4010 case OP_COND0: /* cond */ 3822 case OP_COND0: /* cond */
4011 if (!is_pair (SCHEME_V->code)) 3823 if (!is_pair (SCHEME_V->code))
4012 {
4013 Error_0 ("syntax error in cond"); 3824 Error_0 ("syntax error in cond");
4014 }
4015 3825
4016 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3826 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4017 SCHEME_V->code = caar (SCHEME_V->code); 3827 SCHEME_V->code = caar (SCHEME_V->code);
4018 s_goto (OP_EVAL); 3828 s_goto (OP_EVAL);
4019 3829
4020 case OP_COND1: /* cond */ 3830 case OP_COND1: /* cond */
4021 if (is_true (SCHEME_V->value)) 3831 if (is_true (SCHEME_V->value))
4022 { 3832 {
4023 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL) 3833 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL)
4024 {
4025 s_return (SCHEME_V->value); 3834 s_return (SCHEME_V->value);
4026 }
4027 3835
4028 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO) 3836 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO)
4029 { 3837 {
4030 if (!is_pair (cdr (SCHEME_V->code))) 3838 if (!is_pair (cdr (SCHEME_V->code)))
4031 {
4032 Error_0 ("syntax error in cond"); 3839 Error_0 ("syntax error in cond");
4033 }
4034 3840
4035 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)); 3841 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL));
4036 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL)); 3842 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL));
4037 s_goto (OP_EVAL); 3843 s_goto (OP_EVAL);
4038 } 3844 }
… …
4040 s_goto (OP_BEGIN); 3846 s_goto (OP_BEGIN);
4041 } 3847 }
4042 else 3848 else
4043 { 3849 {
4044 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3850 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
4045 {
4046 s_return (NIL); 3851 s_return (NIL);
4047 }
4048 else 3852 else
4049 { 3853 {
4050 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3854 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4051 SCHEME_V->code = caar (SCHEME_V->code); 3855 SCHEME_V->code = caar (SCHEME_V->code);
4052 s_goto (OP_EVAL); 3856 s_goto (OP_EVAL);
… …
4058 set_typeflag (x, T_PROMISE); 3862 set_typeflag (x, T_PROMISE);
4059 s_return (x); 3863 s_return (x);
4060 3864
4061 case OP_AND0: /* and */ 3865 case OP_AND0: /* and */
4062 if (SCHEME_V->code == NIL) 3866 if (SCHEME_V->code == NIL)
4063 {
4064 s_return (S_T); 3867 s_return (S_T);
4065 }
4066 3868
4067 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3869 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4068 SCHEME_V->code = car (SCHEME_V->code); 3870 SCHEME_V->code = car (SCHEME_V->code);
4069 s_goto (OP_EVAL); 3871 s_goto (OP_EVAL);
4070 3872
4071 case OP_AND1: /* and */ 3873 case OP_AND1: /* and */
4072 if (is_false (SCHEME_V->value)) 3874 if (is_false (SCHEME_V->value))
4073 {
4074 s_return (SCHEME_V->value); 3875 s_return (SCHEME_V->value);
4075 }
4076 else if (SCHEME_V->code == NIL) 3876 else if (SCHEME_V->code == NIL)
4077 {
4078 s_return (SCHEME_V->value); 3877 s_return (SCHEME_V->value);
4079 }
4080 else 3878 else
4081 { 3879 {
4082 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3880 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4083 SCHEME_V->code = car (SCHEME_V->code); 3881 SCHEME_V->code = car (SCHEME_V->code);
4084 s_goto (OP_EVAL); 3882 s_goto (OP_EVAL);
4085 } 3883 }
4086 3884
4087 case OP_OR0: /* or */ 3885 case OP_OR0: /* or */
4088 if (SCHEME_V->code == NIL) 3886 if (SCHEME_V->code == NIL)
4089 {
4090 s_return (S_F); 3887 s_return (S_F);
4091 }
4092 3888
4093 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3889 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4094 SCHEME_V->code = car (SCHEME_V->code); 3890 SCHEME_V->code = car (SCHEME_V->code);
4095 s_goto (OP_EVAL); 3891 s_goto (OP_EVAL);
4096 3892
4097 case OP_OR1: /* or */ 3893 case OP_OR1: /* or */
4098 if (is_true (SCHEME_V->value)) 3894 if (is_true (SCHEME_V->value))
4099 {
4100 s_return (SCHEME_V->value); 3895 s_return (SCHEME_V->value);
4101 }
4102 else if (SCHEME_V->code == NIL) 3896 else if (SCHEME_V->code == NIL)
4103 {
4104 s_return (SCHEME_V->value); 3897 s_return (SCHEME_V->value);
4105 }
4106 else 3898 else
4107 { 3899 {
4108 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3900 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4109 SCHEME_V->code = car (SCHEME_V->code); 3901 SCHEME_V->code = car (SCHEME_V->code);
4110 s_goto (OP_EVAL); 3902 s_goto (OP_EVAL);
… …
4114 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3906 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4115 SCHEME_V->code = car (SCHEME_V->code); 3907 SCHEME_V->code = car (SCHEME_V->code);
4116 s_goto (OP_EVAL); 3908 s_goto (OP_EVAL);
4117 3909
4118 case OP_C1STREAM: /* cons-stream */ 3910 case OP_C1STREAM: /* cons-stream */
4119 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3911 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
4120 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3912 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4121 set_typeflag (x, T_PROMISE); 3913 set_typeflag (x, T_PROMISE);
4122 s_return (cons (SCHEME_V->args, x)); 3914 s_return (cons (args, x));
4123 3915
4124 case OP_MACRO0: /* macro */ 3916 case OP_MACRO0: /* macro */
4125 if (is_pair (car (SCHEME_V->code))) 3917 if (is_pair (car (SCHEME_V->code)))
4126 { 3918 {
4127 x = caar (SCHEME_V->code); 3919 x = caar (SCHEME_V->code);
… …
4132 x = car (SCHEME_V->code); 3924 x = car (SCHEME_V->code);
4133 SCHEME_V->code = cadr (SCHEME_V->code); 3925 SCHEME_V->code = cadr (SCHEME_V->code);
4134 } 3926 }
4135 3927
4136 if (!is_symbol (x)) 3928 if (!is_symbol (x))
4137 {
4138 Error_0 ("variable is not a symbol"); 3929 Error_0 ("variable is not a symbol");
4139 }
4140 3930
4141 s_save (SCHEME_A_ OP_MACRO1, NIL, x); 3931 s_save (SCHEME_A_ OP_MACRO1, NIL, x);
4142 s_goto (OP_EVAL); 3932 s_goto (OP_EVAL);
4143 3933
4144 case OP_MACRO1: /* macro */ 3934 case OP_MACRO1: /* macro */
4145 set_typeflag (SCHEME_V->value, T_MACRO); 3935 set_typeflag (SCHEME_V->value, T_MACRO);
4146 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3936 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
4147 3937
4148 if (x != NIL) 3938 if (x != NIL)
4149 {
4150 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3939 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
4151 }
4152 else 3940 else
4153 {
4154 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3941 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
4155 }
4156 3942
4157 s_return (SCHEME_V->code); 3943 s_return (SCHEME_V->code);
4158 3944
4159 case OP_CASE0: /* case */ 3945 case OP_CASE0: /* case */
4160 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code)); 3946 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code));
… …
4163 3949
4164 case OP_CASE1: /* case */ 3950 case OP_CASE1: /* case */
4165 for (x = SCHEME_V->code; x != NIL; x = cdr (x)) 3951 for (x = SCHEME_V->code; x != NIL; x = cdr (x))
4166 { 3952 {
4167 if (!is_pair (y = caar (x))) 3953 if (!is_pair (y = caar (x)))
4168 {
4169 break; 3954 break;
4170 }
4171 3955
4172 for (; y != NIL; y = cdr (y)) 3956 for (; y != NIL; y = cdr (y))
4173 {
4174 if (eqv (car (y), SCHEME_V->value)) 3957 if (eqv (car (y), SCHEME_V->value))
4175 {
4176 break; 3958 break;
4177 }
4178 }
4179 3959
4180 if (y != NIL) 3960 if (y != NIL)
4181 {
4182 break; 3961 break;
4183 }
4184 } 3962 }
4185 3963
4186 if (x != NIL) 3964 if (x != NIL)
4187 { 3965 {
4188 if (is_pair (caar (x))) 3966 if (is_pair (caar (x)))
… …
4196 SCHEME_V->code = caar (x); 3974 SCHEME_V->code = caar (x);
4197 s_goto (OP_EVAL); 3975 s_goto (OP_EVAL);
4198 } 3976 }
4199 } 3977 }
4200 else 3978 else
4201 {
4202 s_return (NIL); 3979 s_return (NIL);
4203 }
4204 3980
4205 case OP_CASE2: /* case */ 3981 case OP_CASE2: /* case */
4206 if (is_true (SCHEME_V->value)) 3982 if (is_true (SCHEME_V->value))
4207 {
4208 s_goto (OP_BEGIN); 3983 s_goto (OP_BEGIN);
4209 }
4210 else 3984 else
4211 {
4212 s_return (NIL); 3985 s_return (NIL);
4213 }
4214 3986
4215 case OP_PAPPLY: /* apply */ 3987 case OP_PAPPLY: /* apply */
4216 SCHEME_V->code = car (SCHEME_V->args); 3988 SCHEME_V->code = car (args);
4217 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3989 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4218 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3990 /*SCHEME_V->args = cadr(args); */
4219 s_goto (OP_APPLY); 3991 s_goto (OP_APPLY);
4220 3992
4221 case OP_PEVAL: /* eval */ 3993 case OP_PEVAL: /* eval */
4222 if (cdr (SCHEME_V->args) != NIL) 3994 if (cdr (args) != NIL)
4223 {
4224 SCHEME_V->envir = cadr (SCHEME_V->args); 3995 SCHEME_V->envir = cadr (args);
4225 }
4226 3996
4227 SCHEME_V->code = car (SCHEME_V->args); 3997 SCHEME_V->code = car (args);
4228 s_goto (OP_EVAL); 3998 s_goto (OP_EVAL);
4229 3999
4230 case OP_CONTINUATION: /* call-with-current-continuation */ 4000 case OP_CONTINUATION: /* call-with-current-continuation */
4231 SCHEME_V->code = car (SCHEME_V->args); 4001 SCHEME_V->code = car (args);
4232 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 4002 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4233 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
4234 } 4004 }
4235 4005
4236 return S_T; 4006 if (USE_ERROR_CHECKING) abort ();
4237} 4007}
4238 4008
4239static pointer 4009static int
4240opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4010opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4241{ 4011{
4242 pointer x; 4012 pointer args = SCHEME_V->args;
4013 pointer x = car (args);
4243 num v; 4014 num v;
4244 4015
4016 switch (op)
4017 {
4245#if USE_MATH 4018#if USE_MATH
4246 RVALUE dd;
4247#endif
4248
4249 switch (op)
4250 {
4251#if USE_MATH
4252
4253 case OP_INEX2EX: /* inexact->exact */ 4019 case OP_INEX2EX: /* inexact->exact */
4254 x = car (SCHEME_V->args);
4255
4256 if (num_is_integer (x))
4257 { 4020 {
4021 if (is_integer (x))
4258 s_return (x); 4022 s_return (x);
4259 } 4023
4260 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4024 RVALUE r = rvalue_unchecked (x);
4261 { 4025
4026 if (r == (RVALUE)(IVALUE)r)
4262 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4027 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4028 else
4029 Error_1 ("inexact->exact: not integral:", x);
4263 } 4030 }
4031
4032 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4033 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4035 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4036 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4037 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4038 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4039
4040 case OP_ATAN:
4041 if (cdr (args) == NIL)
4042 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4264 else 4043 else
4265 { 4044 {
4266 Error_1 ("inexact->exact: not integral:", x);
4267 }
4268
4269 case OP_EXP:
4270 x = car (SCHEME_V->args);
4271 s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4272
4273 case OP_LOG:
4274 x = car (SCHEME_V->args);
4275 s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4276
4277 case OP_SIN:
4278 x = car (SCHEME_V->args);
4279 s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4280
4281 case OP_COS:
4282 x = car (SCHEME_V->args);
4283 s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4284
4285 case OP_TAN:
4286 x = car (SCHEME_V->args);
4287 s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4288
4289 case OP_ASIN:
4290 x = car (SCHEME_V->args);
4291 s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4292
4293 case OP_ACOS:
4294 x = car (SCHEME_V->args);
4295 s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4296
4297 case OP_ATAN:
4298 x = car (SCHEME_V->args);
4299
4300 if (cdr (SCHEME_V->args) == NIL)
4301 {
4302 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4303 }
4304 else
4305 {
4306 pointer y = cadr (SCHEME_V->args); 4045 pointer y = cadr (args);
4307
4308 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4046 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4309 } 4047 }
4310 4048
4311 case OP_SQRT: 4049 case OP_SQRT:
4312 x = car (SCHEME_V->args);
4313 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4050 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4314 4051
4315 case OP_EXPT: 4052 case OP_EXPT:
4316 { 4053 {
4317 RVALUE result; 4054 RVALUE result;
4318 int real_result = 1; 4055 int real_result = 1;
4319 pointer y = cadr (SCHEME_V->args); 4056 pointer y = cadr (args);
4320 4057
4321 x = car (SCHEME_V->args);
4322
4323 if (num_is_integer (x) && num_is_integer (y)) 4058 if (is_integer (x) && is_integer (y))
4324 real_result = 0; 4059 real_result = 0;
4325 4060
4326 /* This 'if' is an R5RS compatibility fix. */ 4061 /* This 'if' is an R5RS compatibility fix. */
4327 /* NOTE: Remove this 'if' fix for R6RS. */ 4062 /* NOTE: Remove this 'if' fix for R6RS. */
4328 if (rvalue (x) == 0 && rvalue (y) < 0) 4063 if (rvalue (x) == 0 && rvalue (y) < 0)
4329 {
4330 result = 0.0; 4064 result = 0;
4331 }
4332 else 4065 else
4333 {
4334 result = pow (rvalue (x), rvalue (y)); 4066 result = pow (rvalue (x), rvalue (y));
4335 }
4336 4067
4337 /* Before returning integer result make sure we can. */ 4068 /* Before returning integer result make sure we can. */
4338 /* If the test fails, result is too big for integer. */ 4069 /* If the test fails, result is too big for integer. */
4339 if (!real_result) 4070 if (!real_result)
4340 { 4071 {
4341 long result_as_long = (long) result; 4072 long result_as_long = result;
4342 4073
4343 if (result != (RVALUE) result_as_long) 4074 if (result != result_as_long)
4344 real_result = 1; 4075 real_result = 1;
4345 } 4076 }
4346 4077
4347 if (real_result) 4078 if (real_result)
4348 {
4349 s_return (mk_real (SCHEME_A_ result)); 4079 s_return (mk_real (SCHEME_A_ result));
4350 }
4351 else 4080 else
4352 {
4353 s_return (mk_integer (SCHEME_A_ result)); 4081 s_return (mk_integer (SCHEME_A_ result));
4354 }
4355 } 4082 }
4356 4083
4357 case OP_FLOOR:
4358 x = car (SCHEME_V->args);
4359 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4084 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4360
4361 case OP_CEILING:
4362 x = car (SCHEME_V->args);
4363 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4085 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4364 4086
4365 case OP_TRUNCATE: 4087 case OP_TRUNCATE:
4366 { 4088 {
4367 RVALUE rvalue_of_x; 4089 RVALUE n = rvalue (x);
4368
4369 x = car (SCHEME_V->args);
4370 rvalue_of_x = rvalue (x);
4371
4372 if (rvalue_of_x > 0)
4373 {
4374 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4090 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4375 }
4376 else
4377 {
4378 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4379 }
4380 } 4091 }
4381 4092
4382 case OP_ROUND: 4093 case OP_ROUND:
4383 x = car (SCHEME_V->args);
4384
4385 if (num_is_integer (x)) 4094 if (is_integer (x))
4386 s_return (x); 4095 s_return (x);
4387 4096
4388 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4097 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4389#endif 4098#endif
4390 4099
4391 case OP_ADD: /* + */ 4100 case OP_ADD: /* + */
4392 v = num_zero; 4101 v = num_zero;
4393 4102
4394 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4103 for (x = args; x != NIL; x = cdr (x))
4395 v = num_add (v, nvalue (car (x))); 4104 v = num_op (NUM_ADD, v, nvalue (car (x)));
4396 4105
4397 s_return (mk_number (SCHEME_A_ v)); 4106 s_return (mk_number (SCHEME_A_ v));
4398 4107
4399 case OP_MUL: /* * */ 4108 case OP_MUL: /* * */
4400 v = num_one; 4109 v = num_one;
4401 4110
4402 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4111 for (x = args; x != NIL; x = cdr (x))
4403 v = num_mul (v, nvalue (car (x))); 4112 v = num_op (NUM_MUL, v, nvalue (car (x)));
4404 4113
4405 s_return (mk_number (SCHEME_A_ v)); 4114 s_return (mk_number (SCHEME_A_ v));
4406 4115
4407 case OP_SUB: /* - */ 4116 case OP_SUB: /* - */
4408 if (cdr (SCHEME_V->args) == NIL) 4117 if (cdr (args) == NIL)
4409 { 4118 {
4410 x = SCHEME_V->args; 4119 x = args;
4411 v = num_zero; 4120 v = num_zero;
4412 } 4121 }
4413 else 4122 else
4414 { 4123 {
4415 x = cdr (SCHEME_V->args); 4124 x = cdr (args);
4416 v = nvalue (car (SCHEME_V->args)); 4125 v = nvalue (car (args));
4417 } 4126 }
4418 4127
4419 for (; x != NIL; x = cdr (x)) 4128 for (; x != NIL; x = cdr (x))
4420 v = num_sub (v, nvalue (car (x))); 4129 v = num_op (NUM_SUB, v, nvalue (car (x)));
4421 4130
4422 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4423 4132
4424 case OP_DIV: /* / */ 4133 case OP_DIV: /* / */
4425 if (cdr (SCHEME_V->args) == NIL) 4134 if (cdr (args) == NIL)
4426 { 4135 {
4427 x = SCHEME_V->args; 4136 x = args;
4428 v = num_one; 4137 v = num_one;
4429 } 4138 }
4430 else 4139 else
4431 { 4140 {
4432 x = cdr (SCHEME_V->args); 4141 x = cdr (args);
4433 v = nvalue (car (SCHEME_V->args)); 4142 v = nvalue (car (args));
4434 } 4143 }
4435 4144
4436 for (; x != NIL; x = cdr (x)) 4145 for (; x != NIL; x = cdr (x))
4437 {
4438 if (!is_zero_rvalue (rvalue (car (x)))) 4146 if (!is_zero_rvalue (rvalue (car (x))))
4439 v = num_div (v, nvalue (car (x))); 4147 v = num_div (v, nvalue (car (x)));
4440 else 4148 else
4441 Error_0 ("/: division by zero"); 4149 Error_0 ("/: division by zero");
4442 }
4443 4150
4444 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4445 4152
4446 case OP_INTDIV: /* quotient */ 4153 case OP_INTDIV: /* quotient */
4447 if (cdr (SCHEME_V->args) == NIL) 4154 if (cdr (args) == NIL)
4448 { 4155 {
4449 x = SCHEME_V->args; 4156 x = args;
4450 v = num_one; 4157 v = num_one;
4451 } 4158 }
4452 else 4159 else
4453 { 4160 {
4454 x = cdr (SCHEME_V->args); 4161 x = cdr (args);
4455 v = nvalue (car (SCHEME_V->args)); 4162 v = nvalue (car (args));
4456 } 4163 }
4457 4164
4458 for (; x != NIL; x = cdr (x)) 4165 for (; x != NIL; x = cdr (x))
4459 { 4166 {
4460 if (ivalue (car (x)) != 0) 4167 if (ivalue (car (x)) != 0)
4461 v = num_intdiv (v, nvalue (car (x))); 4168 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4462 else 4169 else
4463 Error_0 ("quotient: division by zero"); 4170 Error_0 ("quotient: division by zero");
4464 } 4171 }
4465 4172
4466 s_return (mk_number (SCHEME_A_ v)); 4173 s_return (mk_number (SCHEME_A_ v));
4467 4174
4468 case OP_REM: /* remainder */ 4175 case OP_REM: /* remainder */
4469 v = nvalue (car (SCHEME_V->args)); 4176 v = nvalue (x);
4470 4177
4471 if (ivalue (cadr (SCHEME_V->args)) != 0) 4178 if (ivalue (cadr (args)) != 0)
4472 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4179 v = num_rem (v, nvalue (cadr (args)));
4473 else 4180 else
4474 Error_0 ("remainder: division by zero"); 4181 Error_0 ("remainder: division by zero");
4475 4182
4476 s_return (mk_number (SCHEME_A_ v)); 4183 s_return (mk_number (SCHEME_A_ v));
4477 4184
4478 case OP_MOD: /* modulo */ 4185 case OP_MOD: /* modulo */
4479 v = nvalue (car (SCHEME_V->args)); 4186 v = nvalue (x);
4480 4187
4481 if (ivalue (cadr (SCHEME_V->args)) != 0) 4188 if (ivalue (cadr (args)) != 0)
4482 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4189 v = num_mod (v, nvalue (cadr (args)));
4483 else 4190 else
4484 Error_0 ("modulo: division by zero"); 4191 Error_0 ("modulo: division by zero");
4485 4192
4486 s_return (mk_number (SCHEME_A_ v)); 4193 s_return (mk_number (SCHEME_A_ v));
4487 4194
4488 case OP_CAR: /* car */ 4195 case OP_CAR: /* car */
4489 s_return (caar (SCHEME_V->args)); 4196 s_return (caar (args));
4490 4197
4491 case OP_CDR: /* cdr */ 4198 case OP_CDR: /* cdr */
4492 s_return (cdar (SCHEME_V->args)); 4199 s_return (cdar (args));
4493 4200
4494 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4495 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4496 s_return (SCHEME_V->args); 4203 s_return (args);
4497 4204
4498 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4499 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4500 { 4207 {
4501 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4502 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4503 } 4210 }
4504 else 4211 else
4505 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4506 4213
4507 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4508 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4509 { 4216 {
4510 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4511 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4512 } 4219 }
4513 else 4220 else
4514 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4515 4222
4516 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4517 {
4518 char c;
4519
4520 c = (char) ivalue (car (SCHEME_V->args));
4521 s_return (mk_integer (SCHEME_A_ (unsigned char) c)); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4522 }
4523 4225
4524 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4525 {
4526 unsigned char c;
4527
4528 c = (unsigned char) ivalue (car (SCHEME_V->args));
4529 s_return (mk_character (SCHEME_A_ (char) c)); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4530 }
4531 4228
4532 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4533 { 4230 {
4534 unsigned char c; 4231 unsigned char c = ivalue_unchecked (x);
4535
4536 c = (unsigned char) ivalue (car (SCHEME_V->args));
4537 c = toupper (c); 4232 c = toupper (c);
4538 s_return (mk_character (SCHEME_A_ (char) c)); 4233 s_return (mk_character (SCHEME_A_ c));
4539 } 4234 }
4540 4235
4541 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4542 { 4237 {
4543 unsigned char c; 4238 unsigned char c = ivalue_unchecked (x);
4544
4545 c = (unsigned char) ivalue (car (SCHEME_V->args));
4546 c = tolower (c); 4239 c = tolower (c);
4547 s_return (mk_character (SCHEME_A_ (char) c)); 4240 s_return (mk_character (SCHEME_A_ c));
4548 } 4241 }
4549 4242
4550 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4551 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4552 4245
4553 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4554 { 4247 {
4555 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4556 long pf = 0; 4249 long pf = 0;
4557 4250
4558 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4559 { 4252 {
4560 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4561 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4562 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4563 4256
4564 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4565 { 4258 {
4566 /* base is OK */ 4259 /* base is OK */
4567 } 4260 }
4568 else 4261 else
4569 {
4570 pf = -1; 4262 pf = -1;
4571 }
4572 } 4263 }
4573 4264
4574 if (pf < 0) 4265 if (pf < 0)
4575 {
4576 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4577 }
4578 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4579 {
4580 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4581 }
4582 else 4269 else
4583 { 4270 {
4584 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
4585 {
4586 s_return (mk_atom (SCHEME_A_ s)); 4272 s_return (mk_atom (SCHEME_A_ s));
4587 }
4588 else 4273 else
4589 { 4274 {
4590 char *ep; 4275 char *ep;
4591 long iv = strtol (s, &ep, (int) pf); 4276 long iv = strtol (s, &ep, (int) pf);
4592 4277
4593 if (*ep == 0) 4278 if (*ep == 0)
4594 {
4595 s_return (mk_integer (SCHEME_A_ iv)); 4279 s_return (mk_integer (SCHEME_A_ iv));
4596 }
4597 else 4280 else
4598 {
4599 s_return (S_F); 4281 s_return (S_F);
4600 }
4601 } 4282 }
4602 } 4283 }
4603 } 4284 }
4604 4285
4605 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4606 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4607 setimmutable (x); 4288 setimmutable (x);
4608 s_return (x); 4289 s_return (x);
4609 4290
4610 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4611 { 4292 {
4612 long pf = 0; 4293 long pf = 0;
4613 4294
4614 x = car (SCHEME_V->args);
4615
4616 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4617 { 4296 {
4618 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4619 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4620 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4621 4300
4622 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))
4623 { 4302 {
4624 /* base is OK */ 4303 /* base is OK */
4625 } 4304 }
4626 else 4305 else
4627 {
4628 pf = -1; 4306 pf = -1;
4629 }
4630 } 4307 }
4631 4308
4632 if (pf < 0) 4309 if (pf < 0)
4633 {
4634 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4635 }
4636 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))
4637 { 4312 {
4638 char *p; 4313 char *p;
4639 int len; 4314 int len;
4640 4315
4641 atom2str (SCHEME_A_ x, (int) pf, &p, &len); 4316 atom2str (SCHEME_A_ x, pf, &p, &len);
4642 s_return (mk_counted_string (SCHEME_A_ p, len)); 4317 s_return (mk_counted_string (SCHEME_A_ p, len));
4643 } 4318 }
4644 else 4319 else
4645 {
4646 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4647 }
4648 } 4321 }
4649 4322
4650 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4651 { 4324 {
4652 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4653 int len; 4326 int len = ivalue_unchecked (x);
4654 4327
4655 len = ivalue (car (SCHEME_V->args));
4656
4657 if (cdr (SCHEME_V->args) != NIL)
4658 {
4659 fill = charvalue (cadr (SCHEME_V->args));
4660 }
4661
4662 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4663 } 4329 }
4664 4330
4665 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4666 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4667 4333
4668 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4669 { 4335 {
4670 char *str; 4336 char *str = strvalue (x);
4671 int index;
4672
4673 str = strvalue (car (SCHEME_V->args));
4674
4675 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4676 4338
4677 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4678 {
4679 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4680 }
4681 4341
4682 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4683 } 4343 }
4684 4344
4685 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4686 { 4346 {
4687 char *str; 4347 char *str = strvalue (x);
4688 int index; 4348 int index = ivalue_unchecked (cadr (args));
4689 int c; 4349 int c;
4690 4350
4691 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4692 {
4693 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4694 }
4695 4353
4696 str = strvalue (car (SCHEME_V->args));
4697
4698 index = ivalue (cadr (SCHEME_V->args));
4699
4700 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4701 {
4702 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4703 }
4704 4356
4705 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4706 4358
4707 str[index] = (char) c; 4359 str[index] = c;
4708 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4709 } 4361 }
4710 4362
4711 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4712 { 4364 {
4713 /* 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 */
4714 int len = 0; 4366 int len = 0;
4715 pointer newstr; 4367 pointer newstr;
4716 char *pos; 4368 char *pos;
4717 4369
4718 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4719 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4720 {
4721 len += strlength (car (x)); 4372 len += strlength (car (x));
4722 }
4723 4373
4724 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4725 4375
4726 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4727 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))
4728 {
4729 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4730 }
4731 4379
4732 s_return (newstr); 4380 s_return (newstr);
4733 } 4381 }
4734 4382
4735 case OP_SUBSTR: /* substring */ 4383 case OP_SUBSTR: /* substring */
4736 { 4384 {
4737 char *str; 4385 char *str = strvalue (x);
4738 int index0; 4386 int index0 = ivalue_unchecked (cadr (args));
4739 int index1; 4387 int index1;
4740 int len; 4388 int len;
4741 4389
4742 str = strvalue (car (SCHEME_V->args));
4743
4744 index0 = ivalue (cadr (SCHEME_V->args));
4745
4746 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4391 Error_1 ("substring: start out of bounds:", cadr (args));
4392
4393 if (cddr (args) != NIL)
4747 { 4394 {
4748 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args));
4749 }
4750
4751 if (cddr (SCHEME_V->args) != NIL)
4752 {
4753 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4754 4396
4755 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4756 {
4757 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("substring: end out of bounds:", caddr (args));
4758 }
4759 } 4399 }
4760 else 4400 else
4761 { 4401 index1 = strlength (x);
4762 index1 = strlength (car (SCHEME_V->args));
4763 }
4764 4402
4765 len = index1 - index0; 4403 len = index1 - index0;
4766 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_empty_string (SCHEME_A_ len, ' ');
4767 memcpy (strvalue (x), str + index0, len); 4405 memcpy (strvalue (x), str + index0, len);
4768 strvalue (x)[len] = 0; 4406 strvalue (x)[len] = 0;
… …
4772 4410
4773 case OP_VECTOR: /* vector */ 4411 case OP_VECTOR: /* vector */
4774 { 4412 {
4775 int i; 4413 int i;
4776 pointer vec; 4414 pointer vec;
4777 int len = list_length (SCHEME_A_ SCHEME_V->args); 4415 int len = list_length (SCHEME_A_ args);
4778 4416
4779 if (len < 0) 4417 if (len < 0)
4780 {
4781 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4418 Error_1 ("vector: not a proper list:", args);
4782 }
4783 4419
4784 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4785 4421
4786#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4787 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
4788 s_return (S_SINK); 4424 s_return (S_SINK);
4789#endif 4425#endif
4790 4426
4791 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++)
4792 set_vector_elem (vec, i, car (x)); 4428 vector_set (vec, i, car (x));
4793 4429
4794 s_return (vec); 4430 s_return (vec);
4795 } 4431 }
4796 4432
4797 case OP_MKVECTOR: /* make-vector */ 4433 case OP_MKVECTOR: /* make-vector */
4798 { 4434 {
4799 pointer fill = NIL; 4435 pointer fill = NIL;
4800 int len;
4801 pointer vec; 4436 pointer vec;
4437 int len = ivalue_unchecked (x);
4802 4438
4803 len = ivalue (car (SCHEME_V->args));
4804
4805 if (cdr (SCHEME_V->args) != NIL) 4439 if (cdr (args) != NIL)
4806 fill = cadr (SCHEME_V->args); 4440 fill = cadr (args);
4807 4441
4808 vec = mk_vector (SCHEME_A_ len); 4442 vec = mk_vector (SCHEME_A_ len);
4809 4443
4810#if USE_ERROR_CHECKING 4444#if USE_ERROR_CHECKING
4811 if (SCHEME_V->no_memory) 4445 if (SCHEME_V->no_memory)
4812 s_return (S_SINK); 4446 s_return (S_SINK);
4813#endif 4447#endif
4814 4448
4815 if (fill != NIL) 4449 if (fill != NIL)
4816 fill_vector (vec, fill); 4450 fill_vector (vec, 0, fill);
4817 4451
4818 s_return (vec); 4452 s_return (vec);
4819 } 4453 }
4820 4454
4821 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4822 s_return (mk_integer (SCHEME_A_ ivalue (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);
4823 4461
4824 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4825 { 4463 {
4826 int index;
4827
4828 index = ivalue (cadr (SCHEME_V->args)); 4464 int index = ivalue_unchecked (cadr (args));
4829 4465
4830 if (index >= ivalue (car (SCHEME_V->args))) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4831 {
4832 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4467 Error_1 ("vector-ref: out of bounds:", cadr (args));
4833 }
4834 4468
4835 s_return (vector_elem (car (SCHEME_V->args), index)); 4469 s_return (vector_get (x, index));
4836 } 4470 }
4837 4471
4838 case OP_VECSET: /* vector-set! */ 4472 case OP_VECSET: /* vector-set! */
4839 { 4473 {
4840 int index; 4474 int index = ivalue_unchecked (cadr (args));
4841 4475
4842 if (is_immutable (car (SCHEME_V->args))) 4476 if (is_immutable (x))
4843 {
4844 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4477 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4845 }
4846 4478
4847 index = ivalue (cadr (SCHEME_V->args)); 4479 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4848
4849 if (index >= ivalue (car (SCHEME_V->args)))
4850 {
4851 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4480 Error_1 ("vector-set!: out of bounds:", cadr (args));
4852 }
4853 4481
4854 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4482 vector_set (x, index, caddr (args));
4855 s_return (car (SCHEME_V->args)); 4483 s_return (x);
4856 } 4484 }
4857 } 4485 }
4858 4486
4859 return S_T; 4487 if (USE_ERROR_CHECKING) abort ();
4860} 4488}
4861 4489
4862INTERFACE int 4490static int
4863is_list (SCHEME_P_ pointer a) 4491opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4864{ 4492{
4865 return list_length (SCHEME_A_ a) >= 0; 4493 pointer x = SCHEME_V->args;
4866}
4867 4494
4868/* Result is: 4495 for (;;)
4869 proper list: length
4870 circular list: -1
4871 not even a pair: -2
4872 dotted list: -2 minus length before dot
4873*/
4874INTERFACE int
4875list_length (SCHEME_P_ pointer a)
4876{
4877 int i = 0;
4878 pointer slow, fast;
4879
4880 slow = fast = a;
4881
4882 while (1)
4883 { 4496 {
4497 num v = nvalue (car (x));
4498 x = cdr (x);
4499
4884 if (fast == NIL) 4500 if (x == NIL)
4885 return i; 4501 break;
4886 4502
4887 if (!is_pair (fast)) 4503 int r = num_cmp (v, nvalue (car (x)));
4888 return -2 - i;
4889 4504
4890 fast = cdr (fast); 4505 switch (op)
4891 ++i;
4892
4893 if (fast == NIL)
4894 return i;
4895
4896 if (!is_pair (fast))
4897 return -2 - i;
4898
4899 ++i;
4900 fast = cdr (fast);
4901
4902 /* Safe because we would have already returned if `fast'
4903 encountered a non-pair. */
4904 slow = cdr (slow);
4905
4906 if (fast == slow)
4907 { 4506 {
4908 /* the fast pointer has looped back around and caught up 4507 case OP_NUMEQ: r = r == 0; break;
4909 with the slow pointer, hence the structure is circular, 4508 case OP_LESS: r = r < 0; break;
4910 not of finite length, and therefore not a list */ 4509 case OP_GRE: r = r > 0; break;
4911 return -1; 4510 case OP_LEQ: r = r <= 0; break;
4511 case OP_GEQ: r = r >= 0; break;
4912 } 4512 }
4913 }
4914}
4915 4513
4514 if (!r)
4515 s_return (S_F);
4516 }
4517
4518 s_return (S_T);
4519}
4520
4916static pointer 4521static int
4917opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4522opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4918{ 4523{
4919 pointer x; 4524 pointer args = SCHEME_V->args;
4920 num v; 4525 pointer a = car (args);
4921 int (*comp_func) (num, num); 4526 pointer d = cdr (args);
4527 int r;
4922 4528
4923 switch (op) 4529 switch (op)
4924 { 4530 {
4925 case OP_NOT: /* not */ 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4926 s_retbool (is_false (car (SCHEME_V->args))); 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4537 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4538 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4539 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4540 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4927 4541
4928 case OP_BOOLP: /* boolean? */
4929 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4930
4931 case OP_EOFOBJP: /* boolean? */
4932 s_retbool (car (SCHEME_V->args) == S_EOF);
4933
4934 case OP_NULLP: /* null? */
4935 s_retbool (car (SCHEME_V->args) == NIL);
4936
4937 case OP_NUMEQ: /* = */
4938 case OP_LESS: /* < */
4939 case OP_GRE: /* > */
4940 case OP_LEQ: /* <= */
4941 case OP_GEQ: /* >= */
4942 switch (op)
4943 {
4944 case OP_NUMEQ:
4945 comp_func = num_eq;
4946 break;
4947
4948 case OP_LESS:
4949 comp_func = num_lt;
4950 break;
4951
4952 case OP_GRE:
4953 comp_func = num_gt;
4954 break;
4955
4956 case OP_LEQ:
4957 comp_func = num_le;
4958 break;
4959
4960 case OP_GEQ:
4961 comp_func = num_ge;
4962 break;
4963 }
4964
4965 x = SCHEME_V->args;
4966 v = nvalue (car (x));
4967 x = cdr (x);
4968
4969 for (; x != NIL; x = cdr (x))
4970 {
4971 if (!comp_func (v, nvalue (car (x))))
4972 {
4973 s_retbool (0);
4974 }
4975
4976 v = nvalue (car (x));
4977 }
4978
4979 s_retbool (1);
4980
4981 case OP_SYMBOLP: /* symbol? */
4982 s_retbool (is_symbol (car (SCHEME_V->args)));
4983
4984 case OP_NUMBERP: /* number? */
4985 s_retbool (is_number (car (SCHEME_V->args)));
4986
4987 case OP_STRINGP: /* string? */
4988 s_retbool (is_string (car (SCHEME_V->args)));
4989
4990 case OP_INTEGERP: /* integer? */
4991 s_retbool (is_integer (car (SCHEME_V->args)));
4992
4993 case OP_REALP: /* real? */
4994 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4995
4996 case OP_CHARP: /* char? */
4997 s_retbool (is_character (car (SCHEME_V->args)));
4998#if USE_CHAR_CLASSIFIERS 4542#if USE_CHAR_CLASSIFIERS
4999 4543 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
5000 case OP_CHARAP: /* char-alphabetic? */ 4544 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
5001 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4545 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
5002 4546 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
5003 case OP_CHARNP: /* char-numeric? */ 4547 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
5004 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
5005
5006 case OP_CHARWP: /* char-whitespace? */
5007 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
5008
5009 case OP_CHARUP: /* char-upper-case? */
5010 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
5011
5012 case OP_CHARLP: /* char-lower-case? */
5013 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
5014#endif 4548#endif
4549
5015#if USE_PORTS 4550#if USE_PORTS
5016 4551 case OP_PORTP: /* port? */ r = is_port (a) ; break;
5017 case OP_PORTP: /* port? */
5018 s_retbool (is_port (car (SCHEME_V->args)));
5019
5020 case OP_INPORTP: /* input-port? */ 4552 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
5021 s_retbool (is_inport (car (SCHEME_V->args)));
5022
5023 case OP_OUTPORTP: /* output-port? */ 4553 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
5024 s_retbool (is_outport (car (SCHEME_V->args)));
5025#endif 4554#endif
5026 4555
5027 case OP_PROCP: /* procedure? */ 4556 case OP_PROCP: /* procedure? */
5028 4557
5029 /*-- 4558 /*--
5030 * continuation should be procedure by the example 4559 * continuation should be procedure by the example
5031 * (call-with-current-continuation procedure?) ==> #t 4560 * (call-with-current-continuation procedure?) ==> #t
5032 * in R^3 report sec. 6.9 4561 * in R^3 report sec. 6.9
5033 */ 4562 */
5034 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4563 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
5035 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4564 break;
5036 4565
5037 case OP_PAIRP: /* pair? */ 4566 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
5038 s_retbool (is_pair (car (SCHEME_V->args))); 4567 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
5039 4568 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
5040 case OP_LISTP: /* list? */ 4569 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
5041 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4570 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
5042 4571 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
5043 case OP_ENVP: /* environment? */
5044 s_retbool (is_environment (car (SCHEME_V->args)));
5045
5046 case OP_VECTORP: /* vector? */
5047 s_retbool (is_vector (car (SCHEME_V->args)));
5048
5049 case OP_EQ: /* eq? */
5050 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
5051
5052 case OP_EQV: /* eqv? */
5053 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
5054 } 4572 }
5055 4573
5056 return S_T; 4574 s_retbool (r);
5057} 4575}
5058 4576
5059static pointer 4577static int
5060opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4578opexe_4 (SCHEME_P_ enum scheme_opcodes op)
5061{ 4579{
4580 pointer args = SCHEME_V->args;
4581 pointer a = car (args);
5062 pointer x, y; 4582 pointer x, y;
5063 4583
5064 switch (op) 4584 switch (op)
5065 { 4585 {
5066 case OP_FORCE: /* force */ 4586 case OP_FORCE: /* force */
5067 SCHEME_V->code = car (SCHEME_V->args); 4587 SCHEME_V->code = a;
5068 4588
5069 if (is_promise (SCHEME_V->code)) 4589 if (is_promise (SCHEME_V->code))
5070 { 4590 {
5071 /* Should change type to closure here */ 4591 /* Should change type to closure here */
5072 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4592 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
5073 SCHEME_V->args = NIL; 4593 SCHEME_V->args = NIL;
5074 s_goto (OP_APPLY); 4594 s_goto (OP_APPLY);
5075 } 4595 }
5076 else 4596 else
5077 {
5078 s_return (SCHEME_V->code); 4597 s_return (SCHEME_V->code);
5079 }
5080 4598
5081 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4599 case OP_SAVE_FORCED: /* Save forced value replacing promise */
5082 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4600 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));
5083 s_return (SCHEME_V->value); 4601 s_return (SCHEME_V->value);
5084 4602
… …
5095 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4613 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5096 SCHEME_V->outport = cadr (SCHEME_V->args); 4614 SCHEME_V->outport = cadr (SCHEME_V->args);
5097 } 4615 }
5098 } 4616 }
5099 4617
5100 SCHEME_V->args = car (SCHEME_V->args); 4618 SCHEME_V->args = a;
5101 4619
5102 if (op == OP_WRITE) 4620 if (op == OP_WRITE)
5103 SCHEME_V->print_flag = 1; 4621 SCHEME_V->print_flag = 1;
5104 else 4622 else
5105 SCHEME_V->print_flag = 0; 4623 SCHEME_V->print_flag = 0;
5106 4624
5107 s_goto (OP_P0LIST); 4625 s_goto (OP_P0LIST);
5108 4626
5109 case OP_NEWLINE: /* newline */ 4627 case OP_NEWLINE: /* newline */
5110 if (is_pair (SCHEME_V->args)) 4628 if (is_pair (args))
5111 { 4629 {
5112 if (car (SCHEME_V->args) != SCHEME_V->outport) 4630 if (a != SCHEME_V->outport)
5113 { 4631 {
5114 x = cons (SCHEME_V->outport, NIL); 4632 x = cons (SCHEME_V->outport, NIL);
5115 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4633 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5116 SCHEME_V->outport = car (SCHEME_V->args); 4634 SCHEME_V->outport = a;
5117 } 4635 }
5118 } 4636 }
5119 4637
5120 putstr (SCHEME_A_ "\n"); 4638 putstr (SCHEME_A_ "\n");
5121 s_return (S_T); 4639 s_return (S_T);
5122#endif 4640#endif
5123 4641
5124 case OP_ERR0: /* error */ 4642 case OP_ERR0: /* error */
5125 SCHEME_V->retcode = -1; 4643 SCHEME_V->retcode = -1;
5126 4644
5127 if (!is_string (car (SCHEME_V->args))) 4645 if (!is_string (a))
5128 { 4646 {
5129 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4647 args = cons (mk_string (SCHEME_A_ " -- "), args);
5130 setimmutable (car (SCHEME_V->args)); 4648 setimmutable (car (args));
5131 } 4649 }
5132 4650
5133 putstr (SCHEME_A_ "Error: "); 4651 putstr (SCHEME_A_ "Error: ");
5134 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4652 putstr (SCHEME_A_ strvalue (car (args)));
5135 SCHEME_V->args = cdr (SCHEME_V->args); 4653 SCHEME_V->args = cdr (args);
5136 s_goto (OP_ERR1); 4654 s_goto (OP_ERR1);
5137 4655
5138 case OP_ERR1: /* error */ 4656 case OP_ERR1: /* error */
5139 putstr (SCHEME_A_ " "); 4657 putstr (SCHEME_A_ " ");
5140 4658
5141 if (SCHEME_V->args != NIL) 4659 if (args != NIL)
5142 { 4660 {
5143 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4661 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
5144 SCHEME_V->args = car (SCHEME_V->args); 4662 SCHEME_V->args = a;
5145 SCHEME_V->print_flag = 1; 4663 SCHEME_V->print_flag = 1;
5146 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
5147 } 4665 }
5148 else 4666 else
5149 { 4667 {
5150 putstr (SCHEME_A_ "\n"); 4668 putstr (SCHEME_A_ "\n");
5151 4669
5152 if (SCHEME_V->interactive_repl) 4670 if (SCHEME_V->interactive_repl)
5153 {
5154 s_goto (OP_T0LVL); 4671 s_goto (OP_T0LVL);
5155 }
5156 else 4672 else
5157 {
5158 return NIL; 4673 return -1;
5159 }
5160 } 4674 }
5161 4675
5162 case OP_REVERSE: /* reverse */ 4676 case OP_REVERSE: /* reverse */
5163 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4677 s_return (reverse (SCHEME_A_ a));
5164 4678
5165 case OP_LIST_STAR: /* list* */ 4679 case OP_LIST_STAR: /* list* */
5166 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4680 s_return (list_star (SCHEME_A_ SCHEME_V->args));
5167 4681
5168 case OP_APPEND: /* append */ 4682 case OP_APPEND: /* append */
5169 x = NIL; 4683 x = NIL;
5170 y = SCHEME_V->args; 4684 y = args;
5171 4685
5172 if (y == x) 4686 if (y == x)
5173 s_return (x); 4687 s_return (x);
5174 4688
5175 /* cdr() in the while condition is not a typo. If car() */ 4689 /* cdr() in the while condition is not a typo. If car() */
… …
5186 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4700 s_return (reverse_in_place (SCHEME_A_ car (y), x));
5187 4701
5188#if USE_PLIST 4702#if USE_PLIST
5189 4703
5190 case OP_PUT: /* put */ 4704 case OP_PUT: /* put */
5191 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4705 if (!hasprop (a) || !hasprop (cadr (args)))
5192 {
5193 Error_0 ("illegal use of put"); 4706 Error_0 ("illegal use of put");
5194 }
5195 4707
5196 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4708 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5197 { 4709 {
5198 if (caar (x) == y) 4710 if (caar (x) == y)
5199 {
5200 break; 4711 break;
5201 }
5202 } 4712 }
5203 4713
5204 if (x != NIL) 4714 if (x != NIL)
5205 cdar (x) = caddr (SCHEME_V->args); 4715 cdar (x) = caddr (args);
5206 else 4716 else
5207 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4717 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5208 4718
5209 s_return (S_T); 4719 s_return (S_T);
5210 4720
5211 case OP_GET: /* get */ 4721 case OP_GET: /* get */
5212 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4722 if (!hasprop (a) || !hasprop (cadr (args)))
5213 Error_0 ("illegal use of get"); 4723 Error_0 ("illegal use of get");
5214 4724
5215 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4725 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5216 if (caar (x) == y) 4726 if (caar (x) == y)
5217 break; 4727 break;
5218 4728
5219 if (x != NIL) 4729 if (x != NIL)
5220 s_return (cdar (x)); 4730 s_return (cdar (x));
… …
5222 s_return (NIL); 4732 s_return (NIL);
5223 4733
5224#endif /* USE_PLIST */ 4734#endif /* USE_PLIST */
5225 4735
5226 case OP_QUIT: /* quit */ 4736 case OP_QUIT: /* quit */
5227 if (is_pair (SCHEME_V->args)) 4737 if (is_pair (args))
5228 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4738 SCHEME_V->retcode = ivalue (a);
5229 4739
5230 return NIL; 4740 return -1;
5231 4741
5232 case OP_GC: /* gc */ 4742 case OP_GC: /* gc */
5233 gc (SCHEME_A_ NIL, NIL); 4743 gc (SCHEME_A_ NIL, NIL);
5234 s_return (S_T); 4744 s_return (S_T);
5235 4745
5236 case OP_GCVERB: /* gc-verbose */ 4746 case OP_GCVERB: /* gc-verbose */
5237 { 4747 {
5238 int was = SCHEME_V->gc_verbose; 4748 int was = SCHEME_V->gc_verbose;
5239 4749
5240 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4750 SCHEME_V->gc_verbose = (a != S_F);
5241 s_retbool (was); 4751 s_retbool (was);
5242 } 4752 }
5243 4753
5244 case OP_NEWSEGMENT: /* new-segment */ 4754 case OP_NEWSEGMENT: /* new-segment */
5245 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4755 if (!is_pair (args) || !is_number (a))
5246 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
5247 4757
5248 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4758 alloc_cellseg (SCHEME_A_ ivalue (a));
5249 4759
5250 s_return (S_T); 4760 s_return (S_T);
5251 4761
5252 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
5253 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
… …
5280 case OP_OPEN_INOUTFILE: 4790 case OP_OPEN_INOUTFILE:
5281 prop = port_input | port_output; 4791 prop = port_input | port_output;
5282 break; 4792 break;
5283 } 4793 }
5284 4794
5285 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4795 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5286 4796
5287 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
5288 {
5289 s_return (S_F);
5290 }
5291
5292 s_return (p);
5293 } 4798 }
5294 4799
5295# if USE_STRING_PORTS 4800# if USE_STRING_PORTS
5296 4801
5297 case OP_OPEN_INSTRING: /* open-input-string */ 4802 case OP_OPEN_INSTRING: /* open-input-string */
… …
5309 case OP_OPEN_INOUTSTRING: 4814 case OP_OPEN_INOUTSTRING:
5310 prop = port_input | port_output; 4815 prop = port_input | port_output;
5311 break; 4816 break;
5312 } 4817 }
5313 4818
5314 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4819 p = port_from_string (SCHEME_A_ strvalue (a),
5315 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4820 strvalue (a) + strlength (a), prop);
5316 4821
5317 if (p == NIL) 4822 s_return (p == NIL ? S_F : p);
5318 {
5319 s_return (S_F);
5320 }
5321
5322 s_return (p);
5323 } 4823 }
5324 4824
5325 case OP_OPEN_OUTSTRING: /* open-output-string */ 4825 case OP_OPEN_OUTSTRING: /* open-output-string */
5326 { 4826 {
5327 pointer p; 4827 pointer p;
5328 4828
5329 if (car (SCHEME_V->args) == NIL) 4829 if (a == NIL)
5330 {
5331 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
5332
5333 if (p == NIL)
5334 {
5335 s_return (S_F);
5336 }
5337 }
5338 else 4831 else
5339 {
5340 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
5341 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4833 strvalue (a) + strlength (a), port_output);
5342 4834
5343 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
5344 {
5345 s_return (S_F);
5346 }
5347 }
5348
5349 s_return (p);
5350 } 4836 }
5351 4837
5352 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
5353 { 4839 {
5354 port *p; 4840 port *p;
5355 4841
5356 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4842 if ((p = a->object.port)->kind & port_string)
5357 { 4843 {
5358 off_t size; 4844 off_t size;
5359 char *str; 4845 char *str;
5360 4846
5361 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5377 } 4863 }
5378 4864
5379# endif 4865# endif
5380 4866
5381 case OP_CLOSE_INPORT: /* close-input-port */ 4867 case OP_CLOSE_INPORT: /* close-input-port */
5382 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4868 port_close (SCHEME_A_ a, port_input);
5383 s_return (S_T); 4869 s_return (S_T);
5384 4870
5385 case OP_CLOSE_OUTPORT: /* close-output-port */ 4871 case OP_CLOSE_OUTPORT: /* close-output-port */
5386 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4872 port_close (SCHEME_A_ a, port_output);
5387 s_return (S_T); 4873 s_return (S_T);
5388#endif 4874#endif
5389 4875
5390 case OP_INT_ENV: /* interaction-environment */ 4876 case OP_INT_ENV: /* interaction-environment */
5391 s_return (SCHEME_V->global_env); 4877 s_return (SCHEME_V->global_env);
… …
5393 case OP_CURR_ENV: /* current-environment */ 4879 case OP_CURR_ENV: /* current-environment */
5394 s_return (SCHEME_V->envir); 4880 s_return (SCHEME_V->envir);
5395 4881
5396 } 4882 }
5397 4883
5398 return S_T; 4884 if (USE_ERROR_CHECKING) abort ();
5399} 4885}
5400 4886
5401static pointer 4887static int
5402opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4888opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5403{ 4889{
4890 pointer args = SCHEME_V->args;
5404 pointer x; 4891 pointer x;
5405 4892
5406 if (SCHEME_V->nesting != 0) 4893 if (SCHEME_V->nesting != 0)
5407 { 4894 {
5408 int n = SCHEME_V->nesting; 4895 int n = SCHEME_V->nesting;
… …
5415 switch (op) 4902 switch (op)
5416 { 4903 {
5417 /* ========== reading part ========== */ 4904 /* ========== reading part ========== */
5418#if USE_PORTS 4905#if USE_PORTS
5419 case OP_READ: 4906 case OP_READ:
5420 if (!is_pair (SCHEME_V->args)) 4907 if (!is_pair (args))
5421 {
5422 s_goto (OP_READ_INTERNAL); 4908 s_goto (OP_READ_INTERNAL);
5423 }
5424 4909
5425 if (!is_inport (car (SCHEME_V->args))) 4910 if (!is_inport (car (args)))
5426 {
5427 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4911 Error_1 ("read: not an input port:", car (args));
5428 }
5429 4912
5430 if (car (SCHEME_V->args) == SCHEME_V->inport) 4913 if (car (args) == SCHEME_V->inport)
5431 {
5432 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5433 }
5434 4915
5435 x = SCHEME_V->inport; 4916 x = SCHEME_V->inport;
5436 SCHEME_V->inport = car (SCHEME_V->args); 4917 SCHEME_V->inport = car (args);
5437 x = cons (x, NIL); 4918 x = cons (x, NIL);
5438 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4919 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5439 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5440 4921
5441 case OP_READ_CHAR: /* read-char */ 4922 case OP_READ_CHAR: /* read-char */
5442 case OP_PEEK_CHAR: /* peek-char */ 4923 case OP_PEEK_CHAR: /* peek-char */
5443 { 4924 {
5444 int c; 4925 int c;
5445 4926
5446 if (is_pair (SCHEME_V->args)) 4927 if (is_pair (args))
5447 { 4928 {
5448 if (car (SCHEME_V->args) != SCHEME_V->inport) 4929 if (car (args) != SCHEME_V->inport)
5449 { 4930 {
5450 x = SCHEME_V->inport; 4931 x = SCHEME_V->inport;
5451 x = cons (x, NIL); 4932 x = cons (x, NIL);
5452 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5453 SCHEME_V->inport = car (SCHEME_V->args); 4934 SCHEME_V->inport = car (args);
5454 } 4935 }
5455 } 4936 }
5456 4937
5457 c = inchar (SCHEME_A); 4938 c = inchar (SCHEME_A);
5458 4939
… …
5468 case OP_CHAR_READY: /* char-ready? */ 4949 case OP_CHAR_READY: /* char-ready? */
5469 { 4950 {
5470 pointer p = SCHEME_V->inport; 4951 pointer p = SCHEME_V->inport;
5471 int res; 4952 int res;
5472 4953
5473 if (is_pair (SCHEME_V->args)) 4954 if (is_pair (args))
5474 {
5475 p = car (SCHEME_V->args); 4955 p = car (args);
5476 }
5477 4956
5478 res = p->object.port->kind & port_string; 4957 res = p->object.port->kind & port_string;
5479 4958
5480 s_retbool (res); 4959 s_retbool (res);
5481 } 4960 }
5482 4961
5483 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
5484 SCHEME_V->inport = car (SCHEME_V->args); 4963 SCHEME_V->inport = car (args);
5485 s_return (SCHEME_V->value); 4964 s_return (SCHEME_V->value);
5486 4965
5487 case OP_SET_OUTPORT: /* set-output-port */ 4966 case OP_SET_OUTPORT: /* set-output-port */
5488 SCHEME_V->outport = car (SCHEME_V->args); 4967 SCHEME_V->outport = car (args);
5489 s_return (SCHEME_V->value); 4968 s_return (SCHEME_V->value);
5490#endif 4969#endif
5491 4970
5492 case OP_RDSEXPR: 4971 case OP_RDSEXPR:
5493 switch (SCHEME_V->tok) 4972 switch (SCHEME_V->tok)
… …
5496 s_return (S_EOF); 4975 s_return (S_EOF);
5497 /* NOTREACHED */ 4976 /* NOTREACHED */
5498 4977
5499 case TOK_VEC: 4978 case TOK_VEC:
5500 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 4979 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5501
5502 /* fall through */ 4980 /* fall through */
4981
5503 case TOK_LPAREN: 4982 case TOK_LPAREN:
5504 SCHEME_V->tok = token (SCHEME_A); 4983 SCHEME_V->tok = token (SCHEME_A);
5505 4984
5506 if (SCHEME_V->tok == TOK_RPAREN) 4985 if (SCHEME_V->tok == TOK_RPAREN)
5507 s_return (NIL); 4986 s_return (NIL);
… …
5527 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5006 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5528 SCHEME_V->tok = TOK_LPAREN; 5007 SCHEME_V->tok = TOK_LPAREN;
5529 s_goto (OP_RDSEXPR); 5008 s_goto (OP_RDSEXPR);
5530 } 5009 }
5531 else 5010 else
5532 {
5533 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5011 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5534 }
5535 5012
5536 s_goto (OP_RDSEXPR); 5013 s_goto (OP_RDSEXPR);
5537 5014
5538 case TOK_COMMA: 5015 case TOK_COMMA:
5539 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5016 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
… …
5544 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5545 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
5546 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
5547 5024
5548 case TOK_ATOM: 5025 case TOK_ATOM:
5549 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)));
5550 5036
5551 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
5552 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
5553 5039
5554 if (x == S_F) 5040 if (x == S_F)
5555 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
5556 5042
5557 setimmutable (x); 5043 setimmutable (x);
… …
5569 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
5570 } 5056 }
5571 } 5057 }
5572 5058
5573 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
5574 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)
5575 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
5576 else 5062 else
5577 s_return (x); 5063 s_return (x);
5578 5064
5579 default: 5065 default:
… …
5581 } 5067 }
5582 5068
5583 break; 5069 break;
5584 5070
5585 case OP_RDLIST: 5071 case OP_RDLIST:
5586 {
5587 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5072 SCHEME_V->args = cons (SCHEME_V->value, args);
5588 SCHEME_V->tok = token (SCHEME_A); 5073 SCHEME_V->tok = token (SCHEME_A);
5589 5074
5590 if (SCHEME_V->tok == TOK_EOF) 5075 switch (SCHEME_V->tok)
5076 {
5077 case TOK_EOF:
5591 s_return (S_EOF); 5078 s_return (S_EOF);
5592 else if (SCHEME_V->tok == TOK_RPAREN) 5079
5080 case TOK_RPAREN:
5593 { 5081 {
5594 int c = inchar (SCHEME_A); 5082 int c = inchar (SCHEME_A);
5595 5083
5596 if (c != '\n') 5084 if (c != '\n')
5597 backchar (SCHEME_A_ c); 5085 backchar (SCHEME_A_ c);
5598
5599#if SHOW_ERROR_LINE 5086#if SHOW_ERROR_LINE
5600 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 5087 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
5601 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++; 5088 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++;
5602
5603#endif 5089#endif
5090
5604 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5091 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5605 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args)); 5092 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args));
5606 } 5093 }
5607 else if (SCHEME_V->tok == TOK_DOT) 5094
5608 { 5095 case TOK_DOT:
5609 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL); 5096 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL);
5610 SCHEME_V->tok = token (SCHEME_A); 5097 SCHEME_V->tok = token (SCHEME_A);
5611 s_goto (OP_RDSEXPR); 5098 s_goto (OP_RDSEXPR);
5612 } 5099
5613 else 5100 default:
5614 {
5615 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);; 5101 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);
5616 s_goto (OP_RDSEXPR); 5102 s_goto (OP_RDSEXPR);
5617 } 5103 }
5618 }
5619 5104
5620 case OP_RDDOT: 5105 case OP_RDDOT:
5621 if (token (SCHEME_A) != TOK_RPAREN) 5106 if (token (SCHEME_A) != TOK_RPAREN)
5622 Error_0 ("syntax error: illegal dot expression"); 5107 Error_0 ("syntax error: illegal dot expression");
5623 else 5108
5624 {
5625 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5109 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5626 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));
5627 }
5628 5111
5629 case OP_RDQUOTE: 5112 case OP_RDQUOTE:
5630 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5113 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5631 5114
5632 case OP_RDQQUOTE: 5115 case OP_RDQQUOTE:
… …
5654 SCHEME_V->args = SCHEME_V->value; 5137 SCHEME_V->args = SCHEME_V->value;
5655 s_goto (OP_VECTOR); 5138 s_goto (OP_VECTOR);
5656 5139
5657 /* ========== printing part ========== */ 5140 /* ========== printing part ========== */
5658 case OP_P0LIST: 5141 case OP_P0LIST:
5659 if (is_vector (SCHEME_V->args)) 5142 if (is_vector (args))
5660 { 5143 {
5661 putstr (SCHEME_A_ "#("); 5144 putstr (SCHEME_A_ "#(");
5662 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5145 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5663 s_goto (OP_PVECFROM); 5146 s_goto (OP_PVECFROM);
5664 } 5147 }
5665 else if (is_environment (SCHEME_V->args)) 5148 else if (is_environment (args))
5666 { 5149 {
5667 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5150 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5668 s_return (S_T); 5151 s_return (S_T);
5669 } 5152 }
5670 else if (!is_pair (SCHEME_V->args)) 5153 else if (!is_pair (args))
5671 { 5154 {
5672 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5155 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5673 s_return (S_T); 5156 s_return (S_T);
5674 } 5157 }
5675 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5158 else
5676 { 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)
5677 putstr (SCHEME_A_ "'"); 5166 putstr (SCHEME_A_ "'");
5678 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
5679 s_goto (OP_P0LIST); 5180 s_goto (OP_P0LIST);
5680 } 5181 }
5681 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))
5682 { 5185 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5683 putstr (SCHEME_A_ "`"); 5187 putstr (SCHEME_A_ " ");
5684 SCHEME_V->args = cadr (SCHEME_V->args); 5188 SCHEME_V->args = car (args);
5685 s_goto (OP_P0LIST); 5189 s_goto (OP_P0LIST);
5686 } 5190 }
5687 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5688 {
5689 putstr (SCHEME_A_ ",");
5690 SCHEME_V->args = cadr (SCHEME_V->args);
5691 s_goto (OP_P0LIST);
5692 }
5693 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5694 {
5695 putstr (SCHEME_A_ ",@");
5696 SCHEME_V->args = cadr (SCHEME_V->args);
5697 s_goto (OP_P0LIST);
5698 }
5699 else
5700 {
5701 putstr (SCHEME_A_ "(");
5702 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5703 SCHEME_V->args = car (SCHEME_V->args);
5704 s_goto (OP_P0LIST);
5705 }
5706
5707 case OP_P1LIST:
5708 if (is_pair (SCHEME_V->args))
5709 {
5710 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5711 putstr (SCHEME_A_ " ");
5712 SCHEME_V->args = car (SCHEME_V->args);
5713 s_goto (OP_P0LIST);
5714 }
5715 else if (is_vector (SCHEME_V->args)) 5191 else if (is_vector (args))
5716 { 5192 {
5717 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5193 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5718 putstr (SCHEME_A_ " . "); 5194 putstr (SCHEME_A_ " . ");
5719 s_goto (OP_P0LIST); 5195 s_goto (OP_P0LIST);
5720 } 5196 }
5721 else 5197 else
5722 { 5198 {
5723 if (SCHEME_V->args != NIL) 5199 if (args != NIL)
5724 { 5200 {
5725 putstr (SCHEME_A_ " . "); 5201 putstr (SCHEME_A_ " . ");
5726 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5727 } 5203 }
5728 5204
5729 putstr (SCHEME_A_ ")"); 5205 putstr (SCHEME_A_ ")");
5730 s_return (S_T); 5206 s_return (S_T);
5731 } 5207 }
5732 5208
5733 case OP_PVECFROM: 5209 case OP_PVECFROM:
5734 { 5210 {
5735 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5211 int i = ivalue_unchecked (cdr (args));
5736 pointer vec = car (SCHEME_V->args); 5212 pointer vec = car (args);
5737 int len = ivalue_unchecked (vec); 5213 int len = veclength (vec);
5738 5214
5739 if (i == len) 5215 if (i == len)
5740 { 5216 {
5741 putstr (SCHEME_A_ ")"); 5217 putstr (SCHEME_A_ ")");
5742 s_return (S_T); 5218 s_return (S_T);
5743 } 5219 }
5744 else 5220 else
5745 { 5221 {
5746 pointer elem = vector_elem (vec, i); 5222 pointer elem = vector_get (vec, i);
5747 5223
5748 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5224 ivalue_unchecked (cdr (args)) = i + 1;
5749 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5750 SCHEME_V->args = elem; 5226 SCHEME_V->args = elem;
5751 5227
5752 if (i > 0) 5228 if (i > 0)
5753 putstr (SCHEME_A_ " "); 5229 putstr (SCHEME_A_ " ");
5754 5230
5755 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5756 } 5232 }
5757 } 5233 }
5758 } 5234 }
5759 5235
5760 return S_T; 5236 if (USE_ERROR_CHECKING) abort ();
5761} 5237}
5762 5238
5763static pointer 5239static int
5764opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5240opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5765{ 5241{
5242 pointer args = SCHEME_V->args;
5243 pointer a = car (args);
5766 pointer x, y; 5244 pointer x, y;
5767 5245
5768 switch (op) 5246 switch (op)
5769 { 5247 {
5770 case OP_LIST_LENGTH: /* length *//* a.k */ 5248 case OP_LIST_LENGTH: /* length *//* a.k */
5771 { 5249 {
5772 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5250 long v = list_length (SCHEME_A_ a);
5773 5251
5774 if (v < 0) 5252 if (v < 0)
5775 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5253 Error_1 ("length: not a list:", a);
5776 5254
5777 s_return (mk_integer (SCHEME_A_ v)); 5255 s_return (mk_integer (SCHEME_A_ v));
5778 } 5256 }
5779 5257
5780 case OP_ASSQ: /* assq *//* a.k */ 5258 case OP_ASSQ: /* assq *//* a.k */
5781 x = car (SCHEME_V->args); 5259 x = a;
5782 5260
5783 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5261 for (y = cadr (args); is_pair (y); y = cdr (y))
5784 { 5262 {
5785 if (!is_pair (car (y))) 5263 if (!is_pair (car (y)))
5786 Error_0 ("unable to handle non pair element"); 5264 Error_0 ("unable to handle non pair element");
5787 5265
5788 if (x == caar (y)) 5266 if (x == caar (y))
… …
5794 else 5272 else
5795 s_return (S_F); 5273 s_return (S_F);
5796 5274
5797 5275
5798 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5799 SCHEME_V->args = car (SCHEME_V->args); 5277 SCHEME_V->args = a;
5800 5278
5801 if (SCHEME_V->args == NIL) 5279 if (SCHEME_V->args == NIL)
5802 s_return (S_F); 5280 s_return (S_F);
5803 else if (is_closure (SCHEME_V->args)) 5281 else if (is_closure (SCHEME_V->args))
5804 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5809 5287
5810 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5811 /* 5289 /*
5812 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5813 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5814 */ 5293 */
5815 s_retbool (is_closure (car (SCHEME_V->args))); 5294 s_retbool (is_closure (a));
5816 5295
5817 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5818 s_retbool (is_macro (car (SCHEME_V->args))); 5297 s_retbool (is_macro (a));
5819 } 5298 }
5820 5299
5821 return S_T; /* NOTREACHED */ 5300 if (USE_ERROR_CHECKING) abort ();
5822} 5301}
5823 5302
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5824typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5825 5305
5826typedef int (*test_predicate) (pointer); 5306typedef int (*test_predicate)(pointer);
5827static int 5307static int
5828is_any (pointer p) 5308tst_any (pointer p)
5829{ 5309{
5830 return 1; 5310 return 1;
5831} 5311}
5832 5312
5833static int 5313static int
5834is_nonneg (pointer p) 5314tst_inonneg (pointer p)
5835{ 5315{
5836 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);
5837} 5323}
5838 5324
5839/* Correspond carefully with following defines! */ 5325/* Correspond carefully with following defines! */
5840static struct 5326static struct
5841{ 5327{
5842 test_predicate fct; 5328 test_predicate fct;
5843 const char *kind; 5329 const char *kind;
5844} tests[] = 5330} tests[] = {
5845{ 5331 { tst_any , 0 },
5846 { 0, 0}, /* unused */ 5332 { is_string , "string" },
5847 { is_any, 0}, 5333 { is_symbol , "symbol" },
5848 { is_string, "string" }, 5334 { is_port , "port" },
5849 { is_symbol, "symbol" },
5850 { is_port, "port" },
5851 { is_inport, "input port" }, 5335 { is_inport , "input port" },
5852 { is_outport, "output port" }, 5336 { is_outport , "output port" },
5853 { is_environment, "environment" }, 5337 { is_environment, "environment" },
5854 { is_pair, "pair" }, 5338 { is_pair , "pair" },
5855 { 0, "pair or '()" }, 5339 { 0 , "pair or '()" },
5856 { is_character, "character" }, 5340 { is_character , "character" },
5857 { is_vector, "vector" }, 5341 { is_vector , "vector" },
5858 { is_number, "number" }, 5342 { is_number , "number" },
5859 { is_integer, "integer" }, 5343 { is_integer , "integer" },
5860 { is_nonneg, "non-negative integer" } 5344 { tst_inonneg , "non-negative integer" }
5861}; 5345};
5862 5346
5863#define TST_NONE 0 5347#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5864#define TST_ANY "\001" 5348#define TST_ANY "\001"
5865#define TST_STRING "\002" 5349#define TST_STRING "\002"
5866#define TST_SYMBOL "\003" 5350#define TST_SYMBOL "\003"
5867#define TST_PORT "\004" 5351#define TST_PORT "\004"
5868#define TST_INPORT "\005" 5352#define TST_INPORT "\005"
5869#define TST_OUTPORT "\006" 5353#define TST_OUTPORT "\006"
5870#define TST_ENVIRONMENT "\007" 5354#define TST_ENVIRONMENT "\007"
5871#define TST_PAIR "\010" 5355#define TST_PAIR "\010"
5872#define TST_LIST "\011" 5356#define TST_LIST "\011"
5873#define TST_CHAR "\012" 5357#define TST_CHAR "\012"
5874#define TST_VECTOR "\013" 5358#define TST_VECTOR "\013"
5875#define TST_NUMBER "\014" 5359#define TST_NUMBER "\014"
5876#define TST_INTEGER "\015" 5360#define TST_INTEGER "\015"
5877#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}
5878 5389
5879typedef struct 5390typedef struct
5880{ 5391{
5881 dispatch_func func; 5392 uint8_t func;
5882 char *name; 5393 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5394 uint8_t builtin;
5395#if USE_ERROR_CHECKING
5883 int min_arity; 5396 uint8_t min_arity;
5884 int max_arity; 5397 uint8_t max_arity;
5885 char *arg_tests_encoding; 5398 char arg_tests_encoding[3];
5399#endif
5886} op_code_info; 5400} op_code_info;
5887 5401
5888#define INF_ARG 0xffff
5889
5890static op_code_info dispatch_table[] = { 5402static const op_code_info dispatch_table[] = {
5891#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
5892#include "opdefines.h" 5408#include "opdefines.h"
5409#undef OP_DEF
5893 {0} 5410 {0}
5894}; 5411};
5895 5412
5896static const char *
5897procname (pointer x)
5898{
5899 int n = procnum (x);
5900 const char *name = dispatch_table[n].name;
5901
5902 if (name == 0)
5903 {
5904 name = "ILLEGAL!";
5905 }
5906
5907 return name;
5908}
5909
5910/* kernel of this interpreter */ 5413/* kernel of this interpreter */
5911static void 5414static void ecb_hot
5912Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5913{ 5416{
5914 SCHEME_V->op = op; 5417 SCHEME_V->op = op;
5915 5418
5916 for (;;) 5419 for (;;)
5917 { 5420 {
5918 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5421 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5919 5422
5423#if USE_ERROR_CHECKING
5920 if (pcd->name != 0) /* if built-in function, check arguments */ 5424 if (pcd->builtin) /* if built-in function, check arguments */
5921 { 5425 {
5922 char msg[STRBUFFSIZE]; 5426 char msg[STRBUFFSIZE];
5923 int ok = 1;
5924 int n = list_length (SCHEME_A_ SCHEME_V->args); 5427 int n = list_length (SCHEME_A_ SCHEME_V->args);
5925 5428
5926#if USE_ERROR_CHECKING
5927 /* Check number of arguments */ 5429 /* Check number of arguments */
5928 if (n < pcd->min_arity) 5430 if (ecb_expect_false (n < pcd->min_arity))
5929 { 5431 {
5930 ok = 0;
5931 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5432 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5932 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;
5933 } 5436 }
5934 5437 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5935 if (ok && n > pcd->max_arity)
5936 { 5438 {
5937 ok = 0;
5938 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5439 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5939 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;
5940 } 5443 }
5941#endif 5444 else
5942
5943 if (ok)
5944 { 5445 {
5945 if (pcd->arg_tests_encoding != 0) 5446 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5946 { 5447 {
5947 int i = 0; 5448 int i = 0;
5948 int j; 5449 int j;
5949 const char *t = pcd->arg_tests_encoding; 5450 const char *t = pcd->arg_tests_encoding;
5950 pointer arglist = SCHEME_V->args; 5451 pointer arglist = SCHEME_V->args;
5951 5452
5952 do 5453 do
5953 { 5454 {
5954 pointer arg = car (arglist); 5455 pointer arg = car (arglist);
5955 5456
5956 j = (int) t[0]; 5457 j = t[0];
5957 5458
5459 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5958 if (j == TST_LIST[0]) 5460 if (j == TST_LIST[0])
5959 { 5461 {
5960 if (arg != NIL && !is_pair (arg)) 5462 if (!tst_is_list (SCHEME_A_ arg))
5961 break; 5463 break;
5962 } 5464 }
5963 else 5465 else
5964 { 5466 {
5965 if (!tests[j].fct (arg)) 5467 if (!tests[j - 1].fct (arg))
5966 break; 5468 break;
5967 } 5469 }
5968 5470
5969 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 */
5970 {
5971 t++; 5472 t++;
5972 }
5973 5473
5974 arglist = cdr (arglist); 5474 arglist = cdr (arglist);
5975 i++; 5475 i++;
5976 } 5476 }
5977 while (i < n); 5477 while (i < n);
5978 5478
5979#if USE_ERROR_CHECKING
5980 if (i < n) 5479 if (i < n)
5981 { 5480 {
5982 ok = 0;
5983 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;
5984 } 5484 }
5985#endif
5986 } 5485 }
5987 } 5486 }
5988
5989 if (!ok)
5990 {
5991 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5992 return;
5993
5994 pcd = dispatch_table + SCHEME_V->op;
5995 }
5996 } 5487 }
5488#endif
5997 5489
5998 ok_to_freely_gc (SCHEME_A); 5490 ok_to_freely_gc (SCHEME_A);
5999 5491
6000 if (pcd->func (SCHEME_A_ (enum scheme_opcodes) SCHEME_V->op) == NIL) 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
5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
6001 return; 5503 return;
6002 5504
6003#if USE_ERROR_CHECKING 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
6004 if (SCHEME_V->no_memory)
6005 { 5506 {
6006 xwrstr ("No memory!\n"); 5507 xwrstr ("No memory!\n");
6007 return; 5508 return;
6008 } 5509 }
6009#endif
6010 } 5510 }
6011} 5511}
6012 5512
6013/* ========== Initialization of internal keywords ========== */ 5513/* ========== Initialization of internal keywords ========== */
6014 5514
6015static void 5515static void
6016assign_syntax (SCHEME_P_ char *name) 5516assign_syntax (SCHEME_P_ const char *name)
6017{ 5517{
6018 pointer x = oblist_add_by_name (SCHEME_A_ name); 5518 pointer x = oblist_add_by_name (SCHEME_A_ name);
6019 set_typeflag (x, typeflag (x) | T_SYNTAX); 5519 set_typeflag (x, typeflag (x) | T_SYNTAX);
6020} 5520}
6021 5521
6022static void 5522static void
6023assign_proc (SCHEME_P_ enum scheme_opcodes op, char *name) 5523assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
6024{ 5524{
6025 pointer x = mk_symbol (SCHEME_A_ name); 5525 pointer x = mk_symbol (SCHEME_A_ name);
6026 pointer y = mk_proc (SCHEME_A_ op); 5526 pointer y = mk_proc (SCHEME_A_ op);
6027 new_slot_in_env (SCHEME_A_ x, y); 5527 new_slot_in_env (SCHEME_A_ x, y);
6028} 5528}
… …
6030static pointer 5530static pointer
6031mk_proc (SCHEME_P_ enum scheme_opcodes op) 5531mk_proc (SCHEME_P_ enum scheme_opcodes op)
6032{ 5532{
6033 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5533 pointer y = get_cell (SCHEME_A_ NIL, NIL);
6034 set_typeflag (y, (T_PROC | T_ATOM)); 5534 set_typeflag (y, (T_PROC | T_ATOM));
6035 ivalue_unchecked (y) = (long) op; 5535 ivalue_unchecked (y) = op;
6036 set_num_integer (y);
6037 return y; 5536 return y;
6038} 5537}
6039 5538
6040/* 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! */
6041static int 5540static int
6042syntaxnum (pointer p) 5541syntaxnum (pointer p)
6043{ 5542{
6044 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
6045 5544
6046 switch (strlength (car (p))) 5545 switch (strlength (p))
6047 { 5546 {
6048 case 2: 5547 case 2:
6049 if (s[0] == 'i') 5548 if (s[0] == 'i')
6050 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
6051 else 5550 else
… …
6065 5564
6066 case 'd': 5565 case 'd':
6067 return OP_COND0; /* cond */ 5566 return OP_COND0; /* cond */
6068 5567
6069 case '*': 5568 case '*':
6070 return OP_LET0AST; /* let* */ 5569 return OP_LET0AST;/* let* */
6071 5570
6072 default: 5571 default:
6073 return OP_SET0; /* set! */ 5572 return OP_SET0; /* set! */
6074 } 5573 }
6075 5574
… …
6097 5596
6098 case 'f': 5597 case 'f':
6099 return OP_DEF0; /* define */ 5598 return OP_DEF0; /* define */
6100 5599
6101 default: 5600 default:
6102 return OP_LET0REC; /* letrec */ 5601 return OP_LET0REC;/* letrec */
6103 } 5602 }
6104 5603
6105 default: 5604 default:
6106 return OP_C0STREAM; /* cons-stream */ 5605 return OP_C0STREAM; /* cons-stream */
6107 } 5606 }
6108} 5607}
6109 5608
6110#if USE_MULTIPLICITY 5609#if USE_MULTIPLICITY
6111scheme * 5610ecb_cold scheme *
6112scheme_init_new () 5611scheme_init_new ()
6113{ 5612{
6114 scheme *sc = malloc (sizeof (scheme)); 5613 scheme *sc = malloc (sizeof (scheme));
6115 5614
6116 if (!scheme_init (SCHEME_A)) 5615 if (!scheme_init (SCHEME_A))
… …
6121 else 5620 else
6122 return sc; 5621 return sc;
6123} 5622}
6124#endif 5623#endif
6125 5624
6126int 5625ecb_cold int
6127scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
6128{ 5627{
6129 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
6130 pointer x; 5629 pointer x;
6131 5630
… …
6158 } 5657 }
6159 5658
6160 SCHEME_V->gc_verbose = 0; 5659 SCHEME_V->gc_verbose = 0;
6161 dump_stack_initialize (SCHEME_A); 5660 dump_stack_initialize (SCHEME_A);
6162 SCHEME_V->code = NIL; 5661 SCHEME_V->code = NIL;
5662 SCHEME_V->args = NIL;
5663 SCHEME_V->envir = NIL;
6163 SCHEME_V->tracing = 0; 5664 SCHEME_V->tracing = 0;
6164 5665
6165 /* init NIL */ 5666 /* init NIL */
6166 set_typeflag (NIL, T_ATOM | MARK); 5667 set_typeflag (NIL, T_ATOM | T_MARK);
6167 set_car (NIL, NIL); 5668 set_car (NIL, NIL);
6168 set_cdr (NIL, NIL); 5669 set_cdr (NIL, NIL);
6169 /* init T */ 5670 /* init T */
6170 set_typeflag (S_T, T_ATOM | MARK); 5671 set_typeflag (S_T, T_ATOM | T_MARK);
6171 set_car (S_T, S_T); 5672 set_car (S_T, S_T);
6172 set_cdr (S_T, S_T); 5673 set_cdr (S_T, S_T);
6173 /* init F */ 5674 /* init F */
6174 set_typeflag (S_F, T_ATOM | MARK); 5675 set_typeflag (S_F, T_ATOM | T_MARK);
6175 set_car (S_F, S_F); 5676 set_car (S_F, S_F);
6176 set_cdr (S_F, S_F); 5677 set_cdr (S_F, S_F);
5678 /* init EOF_OBJ */
5679 set_typeflag (S_EOF, T_ATOM | T_MARK);
5680 set_car (S_EOF, S_EOF);
5681 set_cdr (S_EOF, S_EOF);
6177 /* init sink */ 5682 /* init sink */
6178 set_typeflag (S_SINK, T_PAIR | MARK); 5683 set_typeflag (S_SINK, T_PAIR | T_MARK);
6179 set_car (S_SINK, NIL); 5684 set_car (S_SINK, NIL);
5685
6180 /* init c_nest */ 5686 /* init c_nest */
6181 SCHEME_V->c_nest = NIL; 5687 SCHEME_V->c_nest = NIL;
6182 5688
6183 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5689 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
6184 /* init global_env */ 5690 /* init global_env */
… …
6186 SCHEME_V->global_env = SCHEME_V->envir; 5692 SCHEME_V->global_env = SCHEME_V->envir;
6187 /* init else */ 5693 /* init else */
6188 x = mk_symbol (SCHEME_A_ "else"); 5694 x = mk_symbol (SCHEME_A_ "else");
6189 new_slot_in_env (SCHEME_A_ x, S_T); 5695 new_slot_in_env (SCHEME_A_ x, S_T);
6190 5696
6191 assign_syntax (SCHEME_A_ "lambda"); 5697 {
6192 assign_syntax (SCHEME_A_ "quote"); 5698 static const char *syntax_names[] = {
6193 assign_syntax (SCHEME_A_ "define"); 5699 "lambda", "quote", "define", "if", "begin", "set!",
6194 assign_syntax (SCHEME_A_ "if"); 5700 "let", "let*", "letrec", "cond", "delay", "and",
6195 assign_syntax (SCHEME_A_ "begin"); 5701 "or", "cons-stream", "macro", "case"
6196 assign_syntax (SCHEME_A_ "set!"); 5702 };
6197 assign_syntax (SCHEME_A_ "let"); 5703
6198 assign_syntax (SCHEME_A_ "let*"); 5704 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
6199 assign_syntax (SCHEME_A_ "letrec");
6200 assign_syntax (SCHEME_A_ "cond");
6201 assign_syntax (SCHEME_A_ "delay");
6202 assign_syntax (SCHEME_A_ "and"); 5705 assign_syntax (SCHEME_A_ syntax_names[i]);
6203 assign_syntax (SCHEME_A_ "or"); 5706 }
6204 assign_syntax (SCHEME_A_ "cons-stream");
6205 assign_syntax (SCHEME_A_ "macro");
6206 assign_syntax (SCHEME_A_ "case");
6207 5707
5708 // TODO: should iterate via strlen, to avoid n² complexity
6208 for (i = 0; i < n; i++) 5709 for (i = 0; i < n; i++)
6209 {
6210 if (dispatch_table[i].name != 0) 5710 if (dispatch_table[i].builtin)
6211 { 5711 assign_proc (SCHEME_A_ i, opname (i));
6212 assign_proc (SCHEME_A_ (enum scheme_opcodes) i, dispatch_table[i].name);
6213 }
6214 }
6215 5712
6216 /* initialization of global pointers to special symbols */ 5713 /* initialization of global pointers to special symbols */
6217 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5714 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
6218 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5715 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
6219 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5716 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
6220 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5717 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
6221 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5718 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
6222 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5719 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
6223 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5720 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
6224 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5721 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
6225 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5722 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
6226 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5723 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
6227 5724
6228 return !SCHEME_V->no_memory; 5725 return !SCHEME_V->no_memory;
6229} 5726}
6230 5727
… …
6258scheme_set_external_data (SCHEME_P_ void *p) 5755scheme_set_external_data (SCHEME_P_ void *p)
6259{ 5756{
6260 SCHEME_V->ext_data = p; 5757 SCHEME_V->ext_data = p;
6261} 5758}
6262 5759
6263void 5760ecb_cold void
6264scheme_deinit (SCHEME_P) 5761scheme_deinit (SCHEME_P)
6265{ 5762{
6266 int i; 5763 int i;
6267 5764
6268#if SHOW_ERROR_LINE 5765#if SHOW_ERROR_LINE
… …
6360{ 5857{
6361 dump_stack_reset (SCHEME_A); 5858 dump_stack_reset (SCHEME_A);
6362 SCHEME_V->envir = SCHEME_V->global_env; 5859 SCHEME_V->envir = SCHEME_V->global_env;
6363 SCHEME_V->file_i = 0; 5860 SCHEME_V->file_i = 0;
6364 SCHEME_V->load_stack[0].kind = port_input | port_string; 5861 SCHEME_V->load_stack[0].kind = port_input | port_string;
6365 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5862 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6366 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5863 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6367 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5864 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6368#if USE_PORTS 5865#if USE_PORTS
6369 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5866 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6370#endif 5867#endif
6371 SCHEME_V->retcode = 0; 5868 SCHEME_V->retcode = 0;
6372 SCHEME_V->interactive_repl = 0; 5869 SCHEME_V->interactive_repl = 0;
… …
6385 pointer x; 5882 pointer x;
6386 5883
6387 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5884 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
6388 5885
6389 if (x != NIL) 5886 if (x != NIL)
6390 {
6391 set_slot_in_env (SCHEME_A_ x, value); 5887 set_slot_in_env (SCHEME_A_ x, value);
6392 }
6393 else 5888 else
6394 {
6395 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5889 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6396 }
6397} 5890}
6398 5891
6399#if !STANDALONE 5892#if !STANDALONE
5893
6400void 5894void
6401scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5895scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6402{ 5896{
6403 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5897 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6404} 5898}
… …
6407scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5901scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6408{ 5902{
6409 int i; 5903 int i;
6410 5904
6411 for (i = 0; i < count; i++) 5905 for (i = 0; i < count; i++)
6412 {
6413 scheme_register_foreign_func (SCHEME_A_ list + i); 5906 scheme_register_foreign_func (SCHEME_A_ list + i);
6414 }
6415} 5907}
6416 5908
6417pointer 5909pointer
6418scheme_apply0 (SCHEME_P_ const char *procname) 5910scheme_apply0 (SCHEME_P_ const char *procname)
6419{ 5911{
… …
6476 SCHEME_V->interactive_repl = old_repl; 5968 SCHEME_V->interactive_repl = old_repl;
6477 restore_from_C_call (SCHEME_A); 5969 restore_from_C_call (SCHEME_A);
6478 return SCHEME_V->value; 5970 return SCHEME_V->value;
6479} 5971}
6480 5972
6481
6482#endif 5973#endif
6483 5974
6484/* ========== Main ========== */ 5975/* ========== Main ========== */
6485 5976
6486#if STANDALONE 5977#if STANDALONE
6487 5978
6488# if defined(__APPLE__) && !defined (OSX)
6489int
6490main ()
6491{
6492 extern MacTS_main (int argc, char **argv);
6493 char **argv;
6494 int argc = ccommand (&argv);
6495
6496 MacTS_main (argc, argv);
6497 return 0;
6498}
6499
6500int
6501MacTS_main (int argc, char **argv)
6502{
6503# else
6504int 5979int
6505main (int argc, char **argv) 5980main (int argc, char **argv)
6506{ 5981{
6507# endif
6508# if USE_MULTIPLICITY 5982# if USE_MULTIPLICITY
6509 scheme ssc; 5983 scheme ssc;
6510 scheme *const sc = &ssc; 5984 scheme *const SCHEME_V = &ssc;
6511# else 5985# else
6512# endif 5986# endif
6513 int fin; 5987 int fin;
6514 char *file_name = InitFile; 5988 char *file_name = InitFile;
6515 int retcode; 5989 int retcode;
6516 int isfile = 1; 5990 int isfile = 1;
6517 5991 system ("ps v $PPID");//D
6518 if (argc == 1)
6519 xwrstr (banner);
6520 5992
6521 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5993 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6522 { 5994 {
6523 xwrstr ("Usage: tinyscheme -?\n"); 5995 xwrstr ("Usage: tinyscheme -?\n");
6524 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5996 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");
… …
6547 if (access (file_name, 0) != 0) 6019 if (access (file_name, 0) != 0)
6548 { 6020 {
6549 char *p = getenv ("TINYSCHEMEINIT"); 6021 char *p = getenv ("TINYSCHEMEINIT");
6550 6022
6551 if (p != 0) 6023 if (p != 0)
6552 {
6553 file_name = p; 6024 file_name = p;
6554 }
6555 } 6025 }
6556#endif 6026#endif
6557 6027
6558 do 6028 do
6559 { 6029 {

Diff Legend

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