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

Diff Legend

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