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.32 by root, Sat Nov 28 10:56:45 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
… …
1217 1093
1218/* returns the new symbol */ 1094/* returns the new symbol */
1219static pointer 1095static pointer
1220oblist_add_by_name (SCHEME_P_ const char *name) 1096oblist_add_by_name (SCHEME_P_ const char *name)
1221{ 1097{
1222 pointer x;
1223 int location; 1098 int location;
1224 1099
1225 x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1226 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1227 setimmutable (car (x)); 1102 setimmutable (car (x));
1228 1103
1229 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1104 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))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1231 return x; 1106 return x;
1232} 1107}
1233 1108
1234static INLINE pointer 1109ecb_inline pointer
1235oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1236{ 1111{
1237 int location; 1112 int location;
1238 pointer x; 1113 pointer x;
1239 char *s; 1114 char *s;
1240 1115
1241 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1242 1117
1243 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1118 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1244 { 1119 {
1245 s = symname (car (x)); 1120 s = symname (car (x));
1246 1121
1247 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1248 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1257{ 1132{
1258 int i; 1133 int i;
1259 pointer x; 1134 pointer x;
1260 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1261 1136
1262 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1263 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1264 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1265 1140
1266 return ob_list; 1141 return ob_list;
1267} 1142}
1268 1143
… …
1272oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1273{ 1148{
1274 return NIL; 1149 return NIL;
1275} 1150}
1276 1151
1277static INLINE pointer 1152ecb_inline pointer
1278oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1279{ 1154{
1280 pointer x; 1155 pointer x;
1281 char *s; 1156 char *s;
1282 1157
… …
1294 1169
1295/* returns the new symbol */ 1170/* returns the new symbol */
1296static pointer 1171static pointer
1297oblist_add_by_name (SCHEME_P_ const char *name) 1172oblist_add_by_name (SCHEME_P_ const char *name)
1298{ 1173{
1299 pointer x; 1174 pointer x = mk_string (SCHEME_A_ name);
1300
1301 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1302 set_typeflag (x, T_SYMBOL); 1175 set_typeflag (x, T_SYMBOL);
1303 setimmutable (car (x)); 1176 setimmutable (x);
1304 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1177 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1305 return x; 1178 return x;
1306} 1179}
1307 1180
1308static pointer 1181static pointer
… …
1341mk_character (SCHEME_P_ int c) 1214mk_character (SCHEME_P_ int c)
1342{ 1215{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1216 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1344 1217
1345 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1218 set_typeflag (x, (T_CHARACTER | T_ATOM));
1346 ivalue_unchecked (x) = c; 1219 set_ivalue (x, c & 0xff);
1347 set_num_integer (x); 1220
1348 return x; 1221 return x;
1349} 1222}
1350 1223
1351/* get number atom (integer) */ 1224/* get number atom (integer) */
1352INTERFACE pointer 1225INTERFACE pointer
1353mk_integer (SCHEME_P_ long num) 1226mk_integer (SCHEME_P_ long n)
1354{ 1227{
1355 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1356 1229
1357 set_typeflag (x, (T_NUMBER | T_ATOM)); 1230 set_typeflag (x, (T_INTEGER | T_ATOM));
1358 ivalue_unchecked (x) = num; 1231 set_ivalue (x, n);
1359 set_num_integer (x); 1232
1360 return x; 1233 return x;
1361} 1234}
1362 1235
1363INTERFACE pointer 1236INTERFACE pointer
1364mk_real (SCHEME_P_ RVALUE n) 1237mk_real (SCHEME_P_ RVALUE n)
1365{ 1238{
1239#if USE_REAL
1366 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1240 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1367 1241
1368 set_typeflag (x, (T_NUMBER | T_ATOM)); 1242 set_typeflag (x, (T_REAL | T_ATOM));
1369 rvalue_unchecked (x) = n; 1243 set_rvalue (x, n);
1370 set_num_real (x); 1244
1371 return x; 1245 return x;
1246#else
1247 return mk_integer (SCHEME_A_ n);
1248#endif
1372} 1249}
1373 1250
1374static pointer 1251static pointer
1375mk_number (SCHEME_P_ num n) 1252mk_number (SCHEME_P_ const num n)
1376{ 1253{
1254#if USE_REAL
1377 if (num_is_fixnum (n)) 1255 return num_is_fixnum (n)
1378 { 1256 ? mk_integer (SCHEME_A_ num_ivalue (n))
1257 : mk_real (SCHEME_A_ num_rvalue (n));
1258#else
1379 return mk_integer (SCHEME_A_ num_ivalue (n)); 1259 return mk_integer (SCHEME_A_ num_ivalue (n));
1380 } 1260#endif
1381 else
1382 {
1383 return mk_real (SCHEME_A_ num_rvalue (n));
1384 }
1385} 1261}
1386 1262
1387/* allocate name to string area */ 1263/* allocate name to string area */
1388static char * 1264static char *
1389store_string (SCHEME_P_ int len_str, const char *str, char fill) 1265store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1390{ 1266{
1391 char *q;
1392
1393 q = (char *)malloc (len_str + 1); 1267 char *q = malloc (len_str + 1);
1394 1268
1395 if (q == 0) 1269 if (q == 0 && USE_ERROR_CHECKING)
1396 { 1270 {
1397#if USE_ERROR_CHECKING
1398 SCHEME_V->no_memory = 1; 1271 SCHEME_V->no_memory = 1;
1399 return SCHEME_V->strbuff; 1272 return SCHEME_V->strbuff;
1400#endif
1401 } 1273 }
1402 1274
1403 if (str) 1275 if (str)
1404 { 1276 {
1405 int l = strlen (str); 1277 int l = strlen (str);
1406 1278
1407 if (l > len_str) 1279 if (l > len_str)
1408 l = len_str; 1280 l = len_str;
1409 1281
1410 memcpy (q, str, l + 1); 1282 memcpy (q, str, l);
1411 q[l + 1] = 0; 1283 q[l] = 0;
1412 } 1284 }
1413 else 1285 else
1414 { 1286 {
1415 memset (q, fill, len_str); 1287 memset (q, fill, len_str);
1416 q[len_str] = 0; 1288 q[len_str] = 0;
1417 } 1289 }
1418 1290
1419 return q; 1291 return q;
1420} 1292}
1421 1293
1422/* get new string */
1423INTERFACE pointer 1294INTERFACE pointer
1424mk_string (SCHEME_P_ const char *str) 1295mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1425{ 1296{
1426 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1297 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1298
1299 set_typeflag (x, T_STRING | T_ATOM);
1300 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1301 strlength (x) = len;
1302 return x;
1427} 1303}
1428 1304
1429INTERFACE pointer 1305INTERFACE pointer
1430mk_counted_string (SCHEME_P_ const char *str, int len) 1306mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1431{ 1307{
1432 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1308 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1433 1309
1434 set_typeflag (x, T_STRING | T_ATOM); 1310 set_typeflag (x, T_STRING | T_ATOM);
1435 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1311 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1436 strlength (x) = len; 1312 strlength (x) = len;
1437 return x; 1313 return x;
1438} 1314}
1439 1315
1440INTERFACE pointer 1316INTERFACE pointer
1441mk_empty_string (SCHEME_P_ int len, char fill) 1317mk_string (SCHEME_P_ const char *str)
1442{ 1318{
1443 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1319 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} 1320}
1450 1321
1451INTERFACE pointer 1322INTERFACE pointer
1452mk_vector (SCHEME_P_ int len) 1323mk_vector (SCHEME_P_ uint32_t len)
1453{ 1324{
1454 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1455} 1326}
1456 1327
1457INTERFACE void 1328INTERFACE void
1458fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1459{ 1330{
1460 int i; 1331 int i;
1461 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1462 1332
1463 for (i = 0; i < num; i++) 1333 for (i = start; i < veclength (vec); i++)
1464 { 1334 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} 1335}
1471 1336
1472INTERFACE pointer 1337INTERFACE pointer
1473vector_elem (pointer vec, int ielem) 1338vector_get (pointer vec, uint32_t ielem)
1474{ 1339{
1475 int n = ielem / 2; 1340 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} 1341}
1482 1342
1483INTERFACE void 1343INTERFACE void
1484set_vector_elem (pointer vec, int ielem, pointer a) 1344vector_set (pointer vec, uint32_t ielem, pointer a)
1485{ 1345{
1486 int n = ielem / 2; 1346 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} 1347}
1493 1348
1494/* get new symbol */ 1349/* get new symbol */
1495INTERFACE pointer 1350INTERFACE pointer
1496mk_symbol (SCHEME_P_ const char *name) 1351mk_symbol (SCHEME_P_ const char *name)
1497{ 1352{
1498 pointer x;
1499
1500 /* first check oblist */ 1353 /* first check oblist */
1501 x = oblist_find_by_name (SCHEME_A_ name); 1354 pointer x = oblist_find_by_name (SCHEME_A_ name);
1502 1355
1503 if (x != NIL) 1356 if (x == NIL)
1504 return x;
1505 else
1506 {
1507 x = oblist_add_by_name (SCHEME_A_ name); 1357 x = oblist_add_by_name (SCHEME_A_ name);
1358
1508 return x; 1359 return x;
1509 }
1510} 1360}
1511 1361
1512INTERFACE pointer 1362INTERFACE pointer
1513gensym (SCHEME_P) 1363gensym (SCHEME_P)
1514{ 1364{
1515 pointer x; 1365 pointer x;
1516 char name[40];
1517 1366
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 { 1368 {
1520 strcpy (name, "gensym-"); 1369 char name[40] = "gensym-";
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1370 xnum (name + 7, SCHEME_V->gensym_cnt);
1522 1371
1523 /* first check oblist */ 1372 /* first check oblist */
1524 x = oblist_find_by_name (SCHEME_A_ name); 1373 x = oblist_find_by_name (SCHEME_A_ name);
1525 1374
1526 if (x != NIL) 1375 if (x == NIL)
1527 continue;
1528 else
1529 { 1376 {
1530 x = oblist_add_by_name (SCHEME_A_ name); 1377 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x; 1378 return x;
1532 } 1379 }
1533 } 1380 }
… …
1542 char c, *p; 1389 char c, *p;
1543 int has_dec_point = 0; 1390 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1391 int has_fp_exp = 0;
1545 1392
1546#if USE_COLON_HOOK 1393#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1394 if ((p = strstr (q, "::")) != 0)
1549 { 1395 {
1550 *p = 0; 1396 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1397 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1398 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1399 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1400 }
1555
1556#endif 1401#endif
1557 1402
1558 p = q; 1403 p = q;
1559 c = *p++; 1404 c = *p++;
1560 1405
… …
1567 has_dec_point = 1; 1412 has_dec_point = 1;
1568 c = *p++; 1413 c = *p++;
1569 } 1414 }
1570 1415
1571 if (!isdigit (c)) 1416 if (!isdigit (c))
1572 {
1573 return mk_symbol (SCHEME_A_ strlwr (q)); 1417 return mk_symbol (SCHEME_A_ strlwr (q));
1574 }
1575 } 1418 }
1576 else if (c == '.') 1419 else if (c == '.')
1577 { 1420 {
1578 has_dec_point = 1; 1421 has_dec_point = 1;
1579 c = *p++; 1422 c = *p++;
1580 1423
1581 if (!isdigit (c)) 1424 if (!isdigit (c))
1582 {
1583 return mk_symbol (SCHEME_A_ strlwr (q)); 1425 return mk_symbol (SCHEME_A_ strlwr (q));
1584 }
1585 } 1426 }
1586 else if (!isdigit (c)) 1427 else if (!isdigit (c))
1587 {
1588 return mk_symbol (SCHEME_A_ strlwr (q)); 1428 return mk_symbol (SCHEME_A_ strlwr (q));
1589 }
1590 1429
1591 for (; (c = *p) != 0; ++p) 1430 for (; (c = *p) != 0; ++p)
1592 { 1431 {
1593 if (!isdigit (c)) 1432 if (!isdigit (c))
1594 { 1433 {
… …
1602 } 1441 }
1603 else if ((c == 'e') || (c == 'E')) 1442 else if ((c == 'e') || (c == 'E'))
1604 { 1443 {
1605 if (!has_fp_exp) 1444 if (!has_fp_exp)
1606 { 1445 {
1607 has_dec_point = 1; /* decimal point illegal 1446 has_dec_point = 1; /* decimal point illegal from now on */
1608 from now on */
1609 p++; 1447 p++;
1610 1448
1611 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1449 if ((*p == '-') || (*p == '+') || isdigit (*p))
1612 {
1613 continue; 1450 continue;
1614 }
1615 } 1451 }
1616 } 1452 }
1617 1453
1618 return mk_symbol (SCHEME_A_ strlwr (q)); 1454 return mk_symbol (SCHEME_A_ strlwr (q));
1619 } 1455 }
1620 } 1456 }
1621 1457
1622#if USE_FLOAT 1458#if USE_REAL
1623 if (has_dec_point) 1459 if (has_dec_point)
1624 return mk_real (SCHEME_A_ atof (q)); 1460 return mk_real (SCHEME_A_ atof (q));
1625#endif 1461#endif
1626 1462
1627 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1463 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1629 1465
1630/* make constant */ 1466/* make constant */
1631static pointer 1467static pointer
1632mk_sharp_const (SCHEME_P_ char *name) 1468mk_sharp_const (SCHEME_P_ char *name)
1633{ 1469{
1634 long x;
1635 char tmp[STRBUFFSIZE];
1636
1637 if (!strcmp (name, "t")) 1470 if (!strcmp (name, "t"))
1638 return S_T; 1471 return S_T;
1639 else if (!strcmp (name, "f")) 1472 else if (!strcmp (name, "f"))
1640 return S_F; 1473 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) */ 1474 else if (*name == '\\') /* #\w (character) */
1662 { 1475 {
1663 int c = 0; 1476 int c;
1664 1477
1665 if (stricmp (name + 1, "space") == 0) 1478 if (stricmp (name + 1, "space") == 0)
1666 c = ' '; 1479 c = ' ';
1667 else if (stricmp (name + 1, "newline") == 0) 1480 else if (stricmp (name + 1, "newline") == 0)
1668 c = '\n'; 1481 c = '\n';
… …
1670 c = '\r'; 1483 c = '\r';
1671 else if (stricmp (name + 1, "tab") == 0) 1484 else if (stricmp (name + 1, "tab") == 0)
1672 c = '\t'; 1485 c = '\t';
1673 else if (name[1] == 'x' && name[2] != 0) 1486 else if (name[1] == 'x' && name[2] != 0)
1674 { 1487 {
1675 int c1 = strtol (name + 2, 0, 16); 1488 long c1 = strtol (name + 2, 0, 16);
1676 1489
1677 if (c1 <= UCHAR_MAX) 1490 if (0 <= c1 && c1 <= UCHAR_MAX)
1678 c = c1; 1491 c = c1;
1679 else 1492 else
1680 return NIL; 1493 return NIL;
1681 1494 }
1682#if USE_ASCII_NAMES 1495#if USE_ASCII_NAMES
1683 }
1684 else if (is_ascii_name (name + 1, &c)) 1496 else if (is_ascii_name (name + 1, &c))
1685 {
1686 /* nothing */ 1497 /* nothing */;
1687#endif 1498#endif
1688 }
1689 else if (name[2] == 0) 1499 else if (name[2] == 0)
1690 c = name[1]; 1500 c = name[1];
1691 else 1501 else
1692 return NIL; 1502 return NIL;
1693 1503
1694 return mk_character (SCHEME_A_ c); 1504 return mk_character (SCHEME_A_ c);
1695 } 1505 }
1696 else 1506 else
1507 {
1508 /* identify base by string index */
1509 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1510 char *base = strchr (baseidx, *name);
1511
1512 if (base)
1513 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1514
1697 return NIL; 1515 return NIL;
1516 }
1698} 1517}
1699 1518
1700/* ========== garbage collector ========== */ 1519/* ========== garbage collector ========== */
1701 1520
1702/*-- 1521/*--
1703 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1522 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1704 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1523 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1705 * for marking. 1524 * for marking.
1525 *
1526 * The exception is vectors - vectors are currently marked recursively,
1527 * which is inherited form tinyscheme and could be fixed by having another
1528 * word of context in the vector
1706 */ 1529 */
1707static void 1530static void
1708mark (pointer a) 1531mark (pointer a)
1709{ 1532{
1710 pointer t, q, p; 1533 pointer t, q, p;
1711 1534
1712 t = (pointer) 0; 1535 t = 0;
1713 p = a; 1536 p = a;
1714E2: 1537E2:
1715 setmark (p); 1538 setmark (p);
1716 printf ("mark %p %x\n", p, p->flag);//D
1717 1539
1718 if (is_vector (p)) 1540 if (ecb_expect_false (is_vector (p)))
1719 { 1541 {
1720 int i; 1542 int i;
1721 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1722 1543
1723 for (i = 0; i < num; i++) 1544 for (i = 0; i < veclength (p); i++)
1724 { 1545 mark (vecvalue (p)[i]);
1725 /* Vector cells will be treated like ordinary cells */
1726 mark (p + 1 + i);
1727 }
1728 } 1546 }
1729 1547
1730 if (is_atom (p)) 1548 if (is_atom (p))
1731 goto E6; 1549 goto E6;
1732 1550
… …
1742 goto E2; 1560 goto E2;
1743 } 1561 }
1744 1562
1745E5: 1563E5:
1746 q = cdr (p); /* down cdr */ 1564 q = cdr (p); /* down cdr */
1747 printf ("mark+ %p\n", q, q->flag);//D
1748 1565
1749 if (q && !is_mark (q)) 1566 if (q && !is_mark (q))
1750 { 1567 {
1751 set_cdr (p, t); 1568 set_cdr (p, t);
1752 t = p; 1569 t = p;
1753 p = q; 1570 p = q;
1754 goto E2; 1571 goto E2;
1755 } 1572 }
1756 1573
1757E6: /* up. Undo the link switching from steps E4 and E5. */ 1574E6: /* up. Undo the link switching from steps E4 and E5. */
1758
1759 if (!t) 1575 if (!t)
1760 return; 1576 return;
1761 1577
1762 q = t; 1578 q = t;
1763 1579
… …
1831 if (is_mark (p)) 1647 if (is_mark (p))
1832 clrmark (p); 1648 clrmark (p);
1833 else 1649 else
1834 { 1650 {
1835 /* reclaim cell */ 1651 /* reclaim cell */
1836 if (typeflag (p) != 0) 1652 if (typeflag (p) != T_PAIR)
1837 { 1653 {
1838 finalize_cell (SCHEME_A_ p); 1654 finalize_cell (SCHEME_A_ p);
1839 set_typeflag (p, 0); 1655 set_typeflag (p, T_PAIR);
1840 set_car (p, NIL); 1656 set_car (p, NIL);
1841 } 1657 }
1842 1658
1843 ++SCHEME_V->fcells; 1659 ++SCHEME_V->fcells;
1844 set_cdr (p, SCHEME_V->free_cell); 1660 set_cdr (p, SCHEME_V->free_cell);
… …
1846 } 1662 }
1847 } 1663 }
1848 } 1664 }
1849 1665
1850 if (SCHEME_V->gc_verbose) 1666 if (SCHEME_V->gc_verbose)
1667 {
1851 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1669 }
1852} 1670}
1853 1671
1854static void 1672static void
1855finalize_cell (SCHEME_P_ pointer a) 1673finalize_cell (SCHEME_P_ pointer a)
1856{ 1674{
1675 /* TODO, fast bitmap check? */
1857 if (is_string (a)) 1676 if (is_string (a))
1858 free (strvalue (a)); 1677 free (strvalue (a));
1678 else if (is_vector (a))
1679 free (vecvalue (a));
1859#if USE_PORTS 1680#if USE_PORTS
1860 else if (is_port (a)) 1681 else if (is_port (a))
1861 { 1682 {
1862 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1683 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1863 port_close (SCHEME_A_ a, port_input | port_output); 1684 port_close (SCHEME_A_ a, port_input | port_output);
… …
2289 char *p = SCHEME_V->strbuff; 2110 char *p = SCHEME_V->strbuff;
2290 2111
2291 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2112 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2292 2113
2293 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2114 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2294 {
2295 *p = 0; 2115 *p = 0;
2296 }
2297 else 2116 else
2298 { 2117 {
2299 backchar (SCHEME_A_ p[-1]); 2118 backchar (SCHEME_A_ p[-1]);
2300 *--p = '\0'; 2119 *--p = '\0';
2301 } 2120 }
… …
2316 for (;;) 2135 for (;;)
2317 { 2136 {
2318 c = inchar (SCHEME_A); 2137 c = inchar (SCHEME_A);
2319 2138
2320 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1) 2139 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1)
2321 {
2322 return S_F; 2140 return S_F;
2323 }
2324 2141
2325 switch (state) 2142 switch (state)
2326 { 2143 {
2327 case st_ok: 2144 case st_ok:
2328 switch (c) 2145 switch (c)
… …
2396 c = toupper (c); 2213 c = toupper (c);
2397 2214
2398 if (c >= '0' && c <= 'F') 2215 if (c >= '0' && c <= 'F')
2399 { 2216 {
2400 if (c <= '9') 2217 if (c <= '9')
2401 {
2402 c1 = (c1 << 4) + c - '0'; 2218 c1 = (c1 << 4) + c - '0';
2403 }
2404 else 2219 else
2405 {
2406 c1 = (c1 << 4) + c - 'A' + 10; 2220 c1 = (c1 << 4) + c - 'A' + 10;
2407 }
2408 2221
2409 if (state == st_x1) 2222 if (state == st_x1)
2410 {
2411 state = st_x2; 2223 state = st_x2;
2412 }
2413 else 2224 else
2414 { 2225 {
2415 *p++ = c1; 2226 *p++ = c1;
2416 state = st_ok; 2227 state = st_ok;
2417 } 2228 }
2418 } 2229 }
2419 else 2230 else
2420 {
2421 return S_F; 2231 return S_F;
2422 }
2423 2232
2424 break; 2233 break;
2425 2234
2426 case st_oct1: 2235 case st_oct1:
2427 case st_oct2: 2236 case st_oct2:
… …
2452 } 2261 }
2453 } 2262 }
2454} 2263}
2455 2264
2456/* check c is in chars */ 2265/* check c is in chars */
2457static INLINE int 2266ecb_inline int
2458is_one_of (char *s, int c) 2267is_one_of (char *s, int c)
2459{ 2268{
2460 if (c == EOF) 2269 if (c == EOF)
2461 return 1; 2270 return 1;
2462 2271
2463 while (*s) 2272 return !!strchr (s, c);
2464 if (*s++ == c)
2465 return 1;
2466
2467 return 0;
2468} 2273}
2469 2274
2470/* skip white characters */ 2275/* skip white characters */
2471static INLINE int 2276ecb_inline int
2472skipspace (SCHEME_P) 2277skipspace (SCHEME_P)
2473{ 2278{
2474 int c, curr_line = 0; 2279 int c, curr_line = 0;
2475 2280
2476 do 2281 do
2477 { 2282 {
2478 c = inchar (SCHEME_A); 2283 c = inchar (SCHEME_A);
2479#if SHOW_ERROR_LINE 2284#if SHOW_ERROR_LINE
2480 if (c == '\n') 2285 if (c == '\n')
2481 curr_line++; 2286 curr_line++;
2482
2483#endif 2287#endif
2484 } 2288 }
2485 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2289 while (c == ' ' || c == '\n' || c == '\r' || c == '\t');
2486 2290
2487 /* record it */ 2291 /* record it */
… …
2524 2328
2525 if (is_one_of (" \n\t", c)) 2329 if (is_one_of (" \n\t", c))
2526 return TOK_DOT; 2330 return TOK_DOT;
2527 else 2331 else
2528 { 2332 {
2333 //TODO: ungetc twice in a row is not supported in C
2529 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2530 backchar (SCHEME_A_ '.'); 2335 backchar (SCHEME_A_ '.');
2531 return TOK_ATOM; 2336 return TOK_ATOM;
2532 } 2337 }
2533 2338
… …
2647 int d = *s / 16; 2452 int d = *s / 16;
2648 2453
2649 putcharacter (SCHEME_A_ 'x'); 2454 putcharacter (SCHEME_A_ 'x');
2650 2455
2651 if (d < 10) 2456 if (d < 10)
2652 {
2653 putcharacter (SCHEME_A_ d + '0'); 2457 putcharacter (SCHEME_A_ d + '0');
2654 }
2655 else 2458 else
2656 {
2657 putcharacter (SCHEME_A_ d - 10 + 'A'); 2459 putcharacter (SCHEME_A_ d - 10 + 'A');
2658 }
2659 2460
2660 d = *s % 16; 2461 d = *s % 16;
2661 2462
2662 if (d < 10) 2463 if (d < 10)
2663 {
2664 putcharacter (SCHEME_A_ d + '0'); 2464 putcharacter (SCHEME_A_ d + '0');
2665 }
2666 else 2465 else
2667 {
2668 putcharacter (SCHEME_A_ d - 10 + 'A'); 2466 putcharacter (SCHEME_A_ d - 10 + 'A');
2669 }
2670 } 2467 }
2671 } 2468 }
2672 } 2469 }
2673 else 2470 else
2674 {
2675 putcharacter (SCHEME_A_ * s); 2471 putcharacter (SCHEME_A_ * s);
2676 }
2677 2472
2678 s++; 2473 s++;
2679 } 2474 }
2680 2475
2681 putcharacter (SCHEME_A_ '"'); 2476 putcharacter (SCHEME_A_ '"');
… …
2714 { 2509 {
2715 p = SCHEME_V->strbuff; 2510 p = SCHEME_V->strbuff;
2716 2511
2717 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2512 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2718 { 2513 {
2719 if (num_is_integer (l)) 2514 if (is_integer (l))
2720 xnum (p, ivalue_unchecked (l)); 2515 xnum (p, ivalue_unchecked (l));
2721#if USE_FLOAT 2516#if USE_REAL
2722 else 2517 else
2723 { 2518 {
2724 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2519 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2725 /* r5rs says there must be a '.' (unless 'e'?) */ 2520 /* r5rs says there must be a '.' (unless 'e'?) */
2726 f = strcspn (p, ".e"); 2521 f = strcspn (p, ".e");
… …
2898list_star (SCHEME_P_ pointer d) 2693list_star (SCHEME_P_ pointer d)
2899{ 2694{
2900 pointer p, q; 2695 pointer p, q;
2901 2696
2902 if (cdr (d) == NIL) 2697 if (cdr (d) == NIL)
2903 {
2904 return car (d); 2698 return car (d);
2905 }
2906 2699
2907 p = cons (car (d), cdr (d)); 2700 p = cons (car (d), cdr (d));
2908 q = p; 2701 q = p;
2909 2702
2910 while (cdr (cdr (p)) != NIL) 2703 while (cdr (cdr (p)) != NIL)
2911 { 2704 {
2912 d = cons (car (p), cdr (p)); 2705 d = cons (car (p), cdr (p));
2913 2706
2914 if (cdr (cdr (p)) != NIL) 2707 if (cdr (cdr (p)) != NIL)
2915 {
2916 p = cdr (d); 2708 p = cdr (d);
2917 }
2918 } 2709 }
2919 2710
2920 set_cdr (p, car (cdr (p))); 2711 set_cdr (p, car (cdr (p)));
2921 return q; 2712 return q;
2922} 2713}
… …
2936 2727
2937/* reverse list --- in-place */ 2728/* reverse list --- in-place */
2938static pointer 2729static pointer
2939reverse_in_place (SCHEME_P_ pointer term, pointer list) 2730reverse_in_place (SCHEME_P_ pointer term, pointer list)
2940{ 2731{
2941 pointer p = list, result = term, q; 2732 pointer result = term;
2733 pointer p = list;
2942 2734
2943 while (p != NIL) 2735 while (p != NIL)
2944 { 2736 {
2945 q = cdr (p); 2737 pointer q = cdr (p);
2946 set_cdr (p, result); 2738 set_cdr (p, result);
2947 result = p; 2739 result = p;
2948 p = q; 2740 p = q;
2949 } 2741 }
2950 2742
… …
2982 return 0; 2774 return 0;
2983 } 2775 }
2984 else if (is_number (a)) 2776 else if (is_number (a))
2985 { 2777 {
2986 if (is_number (b)) 2778 if (is_number (b))
2987 if (num_is_integer (a) == num_is_integer (b))
2988 return num_eq (nvalue (a), nvalue (b)); 2779 return num_cmp (nvalue (a), nvalue (b)) == 0;
2989 2780
2990 return 0; 2781 return 0;
2991 } 2782 }
2992 else if (is_character (a)) 2783 else if (is_character (a))
2993 { 2784 {
… …
3025#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST) 2816#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
3026 2817
3027static int 2818static int
3028hash_fn (const char *key, int table_size) 2819hash_fn (const char *key, int table_size)
3029{ 2820{
3030 unsigned int hashed = 0; 2821 const unsigned char *p = key;
3031 const char *c; 2822 uint32_t hash = 2166136261;
3032 int bits_per_int = sizeof (unsigned int) * 8;
3033 2823
3034 for (c = key; *c; c++) 2824 while (*p)
3035 { 2825 hash = (hash ^ *p++) * 16777619;
3036 /* letters have about 5 bits in them */
3037 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
3038 hashed ^= *c;
3039 }
3040 2826
3041 return hashed % table_size; 2827 return hash % table_size;
3042} 2828}
3043#endif 2829#endif
3044 2830
3045#ifndef USE_ALIST_ENV 2831#ifndef USE_ALIST_ENV
3046 2832
… …
3065 2851
3066 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2852 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3067 setenvironment (SCHEME_V->envir); 2853 setenvironment (SCHEME_V->envir);
3068} 2854}
3069 2855
3070static INLINE void 2856static uint32_t
2857sym_hash (pointer sym, uint32_t size)
2858{
2859 uintptr_t ptr = (uintptr_t)sym;
2860
2861#if 0
2862 /* tqable size is prime, so why mix */
2863 ptr += ptr >> 32;
2864 ptr += ptr >> 16;
2865 ptr += ptr >> 8;
2866#endif
2867
2868 return ptr % size;
2869}
2870
2871ecb_inline void
3071new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2872new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3072{ 2873{
3073 pointer slot = immutable_cons (variable, value); 2874 pointer slot = immutable_cons (variable, value);
3074 2875
3075 if (is_vector (car (env))) 2876 if (is_vector (car (env)))
3076 { 2877 {
3077 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2878 int location = sym_hash (variable, veclength (car (env)));
3078
3079 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2879 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
3080 } 2880 }
3081 else 2881 else
3082 set_car (env, immutable_cons (slot, car (env))); 2882 set_car (env, immutable_cons (slot, car (env)));
3083} 2883}
3084 2884
3085static pointer 2885static pointer
3086find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2886find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
3087{ 2887{
3088 pointer x, y; 2888 pointer x, y;
3089 int location;
3090 2889
3091 for (x = env; x != NIL; x = cdr (x)) 2890 for (x = env; x != NIL; x = cdr (x))
3092 { 2891 {
3093 if (is_vector (car (x))) 2892 if (is_vector (car (x)))
3094 { 2893 {
3095 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2894 int location = sym_hash (hdl, veclength (car (x)));
3096 y = vector_elem (car (x), location); 2895 y = vector_get (car (x), location);
3097 } 2896 }
3098 else 2897 else
3099 y = car (x); 2898 y = car (x);
3100 2899
3101 for (; y != NIL; y = cdr (y)) 2900 for (; y != NIL; y = cdr (y))
3102 if (caar (y) == hdl) 2901 if (caar (y) == hdl)
3103 break; 2902 break;
3104 2903
3105 if (y != NIL) 2904 if (y != NIL)
2905 return car (y);
2906
2907 if (!all)
3106 break; 2908 break;
3107
3108 if (!all)
3109 return NIL;
3110 } 2909 }
3111
3112 if (x != NIL)
3113 return car (y);
3114 2910
3115 return NIL; 2911 return NIL;
3116} 2912}
3117 2913
3118#else /* USE_ALIST_ENV */ 2914#else /* USE_ALIST_ENV */
3119 2915
3120static INLINE void 2916ecb_inline void
3121new_frame_in_env (SCHEME_P_ pointer old_env) 2917new_frame_in_env (SCHEME_P_ pointer old_env)
3122{ 2918{
3123 SCHEME_V->envir = immutable_cons (NIL, old_env); 2919 SCHEME_V->envir = immutable_cons (NIL, old_env);
3124 setenvironment (SCHEME_V->envir); 2920 setenvironment (SCHEME_V->envir);
3125} 2921}
3126 2922
3127static INLINE void 2923ecb_inline void
3128new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2924new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3129{ 2925{
3130 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3131} 2927}
3132 2928
… …
3140 for (y = car (x); y != NIL; y = cdr (y)) 2936 for (y = car (x); y != NIL; y = cdr (y))
3141 if (caar (y) == hdl) 2937 if (caar (y) == hdl)
3142 break; 2938 break;
3143 2939
3144 if (y != NIL) 2940 if (y != NIL)
2941 return car (y);
3145 break; 2942 break;
3146 2943
3147 if (!all) 2944 if (!all)
3148 return NIL; 2945 break;
3149 } 2946 }
3150
3151 if (x != NIL)
3152 return car (y);
3153 2947
3154 return NIL; 2948 return NIL;
3155} 2949}
3156 2950
3157#endif /* USE_ALIST_ENV else */ 2951#endif /* USE_ALIST_ENV else */
3158 2952
3159static INLINE void 2953ecb_inline void
3160new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2954new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3161{ 2955{
3162 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2956 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
3163} 2957}
3164 2958
3165static INLINE void 2959ecb_inline void
3166set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2960set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3167{ 2961{
3168 set_cdr (slot, value); 2962 set_cdr (slot, value);
3169} 2963}
3170 2964
3171static INLINE pointer 2965ecb_inline pointer
3172slot_value_in_env (pointer slot) 2966slot_value_in_env (pointer slot)
3173{ 2967{
3174 return cdr (slot); 2968 return cdr (slot);
3175} 2969}
3176 2970
3177/* ========== Evaluation Cycle ========== */ 2971/* ========== Evaluation Cycle ========== */
3178 2972
3179static pointer 2973static int
3180xError_1 (SCHEME_P_ const char *s, pointer a) 2974xError_1 (SCHEME_P_ const char *s, pointer a)
3181{ 2975{
3182#if USE_ERROR_HOOK 2976#if USE_ERROR_HOOK
3183 pointer x; 2977 pointer x;
3184 pointer hdl = SCHEME_V->ERROR_HOOK; 2978 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3210#if USE_ERROR_HOOK 3004#if USE_ERROR_HOOK
3211 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 3005 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3212 3006
3213 if (x != NIL) 3007 if (x != NIL)
3214 { 3008 {
3215 if (a) 3009 pointer code = a
3216 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 3010 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3217 else 3011 : NIL;
3218 SCHEME_V->code = NIL;
3219 3012
3220 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 3013 code = cons (mk_string (SCHEME_A_ s), code);
3221 setimmutable (car (SCHEME_V->code)); 3014 setimmutable (car (code));
3222 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 3015 SCHEME_V->code = cons (slot_value_in_env (x), code);
3223 SCHEME_V->op = OP_EVAL; 3016 SCHEME_V->op = OP_EVAL;
3224 3017
3225 return S_T; 3018 return 0;
3226 } 3019 }
3227#endif 3020#endif
3228 3021
3229 if (a) 3022 if (a)
3230 SCHEME_V->args = cons (a, NIL); 3023 SCHEME_V->args = cons (a, NIL);
3231 else 3024 else
3232 SCHEME_V->args = NIL; 3025 SCHEME_V->args = NIL;
3233 3026
3234 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3027 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3235 setimmutable (car (SCHEME_V->args)); 3028 setimmutable (car (SCHEME_V->args));
3236 SCHEME_V->op = (int)OP_ERR0; 3029 SCHEME_V->op = OP_ERR0;
3030
3237 return S_T; 3031 return 0;
3238} 3032}
3239 3033
3240#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3034#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3241#define Error_0(s) Error_1 (s, 0) 3035#define Error_0(s) Error_1 (s, 0)
3242 3036
3243/* Too small to turn into function */ 3037/* Too small to turn into function */
3244#define BEGIN do { 3038#define BEGIN do {
3245#define END } while (0) 3039#define END } while (0)
3246#define s_goto(a) BEGIN \ 3040#define s_goto(a) BEGIN \
3247 SCHEME_V->op = (int)(a); \ 3041 SCHEME_V->op = a; \
3248 return S_T; END 3042 return 0; END
3249 3043
3250#define s_return(a) return xs_return(SCHEME_A_ a) 3044#define s_return(a) return xs_return (SCHEME_A_ a)
3251 3045
3252#ifndef USE_SCHEME_STACK 3046#ifndef USE_SCHEME_STACK
3253 3047
3254/* this structure holds all the interpreter's registers */ 3048/* this structure holds all the interpreter's registers */
3255struct dump_stack_frame 3049struct dump_stack_frame
… …
3274 SCHEME_V->dump_size += STACK_GROWTH; 3068 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); 3069 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3276 } 3070 }
3277 3071
3278 next_frame = SCHEME_V->dump_base + nframes; 3072 next_frame = SCHEME_V->dump_base + nframes;
3073
3279 next_frame->op = op; 3074 next_frame->op = op;
3280 next_frame->args = args; 3075 next_frame->args = args;
3281 next_frame->envir = SCHEME_V->envir; 3076 next_frame->envir = SCHEME_V->envir;
3282 next_frame->code = code; 3077 next_frame->code = code;
3078
3283 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3079 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3284} 3080}
3285 3081
3286static pointer 3082static int
3287xs_return (SCHEME_P_ pointer a) 3083xs_return (SCHEME_P_ pointer a)
3288{ 3084{
3289 int nframes = (uintptr_t)SCHEME_V->dump; 3085 int nframes = (uintptr_t)SCHEME_V->dump;
3290 struct dump_stack_frame *frame; 3086 struct dump_stack_frame *frame;
3291 3087
3292 SCHEME_V->value = a; 3088 SCHEME_V->value = a;
3293 3089
3294 if (nframes <= 0) 3090 if (nframes <= 0)
3295 return NIL; 3091 return -1;
3296 3092
3297 nframes--;
3298 frame = SCHEME_V->dump_base + nframes; 3093 frame = &SCHEME_V->dump_base[--nframes];
3299 SCHEME_V->op = frame->op; 3094 SCHEME_V->op = frame->op;
3300 SCHEME_V->args = frame->args; 3095 SCHEME_V->args = frame->args;
3301 SCHEME_V->envir = frame->envir; 3096 SCHEME_V->envir = frame->envir;
3302 SCHEME_V->code = frame->code; 3097 SCHEME_V->code = frame->code;
3303 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3098 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3304 3099
3305 return S_T; 3100 return 0;
3306} 3101}
3307 3102
3308static INLINE void 3103ecb_inline void
3309dump_stack_reset (SCHEME_P) 3104dump_stack_reset (SCHEME_P)
3310{ 3105{
3311 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3106 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3312 SCHEME_V->dump = (pointer)0; 3107 SCHEME_V->dump = (pointer)+0;
3313} 3108}
3314 3109
3315static INLINE void 3110ecb_inline void
3316dump_stack_initialize (SCHEME_P) 3111dump_stack_initialize (SCHEME_P)
3317{ 3112{
3318 SCHEME_V->dump_size = 0; 3113 SCHEME_V->dump_size = 0;
3319 SCHEME_V->dump_base = NULL; 3114 SCHEME_V->dump_base = 0;
3320 dump_stack_reset (SCHEME_A); 3115 dump_stack_reset (SCHEME_A);
3321} 3116}
3322 3117
3323static void 3118static void
3324dump_stack_free (SCHEME_P) 3119dump_stack_free (SCHEME_P)
3325{ 3120{
3326 free (SCHEME_V->dump_base); 3121 free (SCHEME_V->dump_base);
3327 SCHEME_V->dump_base = NULL; 3122 SCHEME_V->dump_base = 0;
3328 SCHEME_V->dump = (pointer)0; 3123 SCHEME_V->dump = (pointer)0;
3329 SCHEME_V->dump_size = 0; 3124 SCHEME_V->dump_size = 0;
3330} 3125}
3331 3126
3332static void 3127static void
… …
3373 int i = 0; 3168 int i = 0;
3374 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3169 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3375 3170
3376 while (cont != NIL) 3171 while (cont != NIL)
3377 { 3172 {
3378 frame->op = ivalue (car (cont)); cont = cdr (cont); 3173 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3379 frame->args = car (cont) ; cont = cdr (cont); 3174 frame->args = car (cont) ; cont = cdr (cont);
3380 frame->envir = car (cont) ; cont = cdr (cont); 3175 frame->envir = car (cont) ; cont = cdr (cont);
3381 frame->code = car (cont) ; cont = cdr (cont); 3176 frame->code = car (cont) ; cont = cdr (cont);
3382 3177
3383 ++frame; 3178 ++frame;
3384 ++i; 3179 ++i;
3385 } 3180 }
3386 3181
3387 SCHEME_V->dump = (pointer)(uintptr_t)i; 3182 SCHEME_V->dump = (pointer)(uintptr_t)i;
3388} 3183}
3389 3184
3390#else 3185#else
3391 3186
3392static INLINE void 3187ecb_inline void
3393dump_stack_reset (SCHEME_P) 3188dump_stack_reset (SCHEME_P)
3394{ 3189{
3395 SCHEME_V->dump = NIL; 3190 SCHEME_V->dump = NIL;
3396} 3191}
3397 3192
3398static INLINE void 3193ecb_inline void
3399dump_stack_initialize (SCHEME_P) 3194dump_stack_initialize (SCHEME_P)
3400{ 3195{
3401 dump_stack_reset (SCHEME_A); 3196 dump_stack_reset (SCHEME_A);
3402} 3197}
3403 3198
… …
3405dump_stack_free (SCHEME_P) 3200dump_stack_free (SCHEME_P)
3406{ 3201{
3407 SCHEME_V->dump = NIL; 3202 SCHEME_V->dump = NIL;
3408} 3203}
3409 3204
3410static pointer 3205static int
3411xs_return (SCHEME_P_ pointer a) 3206xs_return (SCHEME_P_ pointer a)
3412{ 3207{
3413 pointer dump = SCHEME_V->dump; 3208 pointer dump = SCHEME_V->dump;
3414 3209
3415 SCHEME_V->value = a; 3210 SCHEME_V->value = a;
3416 3211
3417 if (dump == NIL) 3212 if (dump == NIL)
3418 return NIL; 3213 return -1;
3419 3214
3420 SCHEME_V->op = ivalue (car (dump)); 3215 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3421 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3216 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3422 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3217 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3423 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3218 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3424 3219
3425 SCHEME_V->dump = dump; 3220 SCHEME_V->dump = dump;
3426 3221
3427 return S_T; 3222 return 0;
3428} 3223}
3429 3224
3430static void 3225static void
3431s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3226s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3432{ 3227{
… …
3457 3252
3458#endif 3253#endif
3459 3254
3460#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3255#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3461 3256
3462static pointer 3257static int
3463opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3258opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3464{ 3259{
3260 pointer args = SCHEME_V->args;
3465 pointer x, y; 3261 pointer x, y;
3466 3262
3467 switch (op) 3263 switch (op)
3468 { 3264 {
3469 case OP_LOAD: /* load */ 3265 case OP_LOAD: /* load */
3470 if (file_interactive (SCHEME_A)) 3266 if (file_interactive (SCHEME_A))
3471 { 3267 {
3472 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3268 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))); 3269 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3474 } 3270 }
3475 3271
3476 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3272 if (!file_push (SCHEME_A_ strvalue (car (args))))
3477 Error_1 ("unable to open", car (SCHEME_V->args)); 3273 Error_1 ("unable to open", car (args));
3478 else 3274 else
3479 { 3275 {
3480 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3276 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3481 s_goto (OP_T0LVL); 3277 s_goto (OP_T0LVL);
3482 } 3278 }
… …
3517 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3313 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3518 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3314 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3519 s_goto (OP_READ_INTERNAL); 3315 s_goto (OP_READ_INTERNAL);
3520 3316
3521 case OP_T1LVL: /* top level */ 3317 case OP_T1LVL: /* top level */
3522 SCHEME_V->code = SCHEME_V->value; 3318 SCHEME_V->code = SCHEME_V->value;
3523 SCHEME_V->inport = SCHEME_V->save_inport; 3319 SCHEME_V->inport = SCHEME_V->save_inport;
3524 s_goto (OP_EVAL); 3320 s_goto (OP_EVAL);
3525 3321
3526 case OP_READ_INTERNAL: /* internal read */ 3322 case OP_READ_INTERNAL: /* internal read */
3527 SCHEME_V->tok = token (SCHEME_A); 3323 SCHEME_V->tok = token (SCHEME_A);
3528 3324
3529 if (SCHEME_V->tok == TOK_EOF) 3325 if (SCHEME_V->tok == TOK_EOF)
3530 {
3531 s_return (S_EOF); 3326 s_return (S_EOF);
3532 }
3533 3327
3534 s_goto (OP_RDSEXPR); 3328 s_goto (OP_RDSEXPR);
3535 3329
3536 case OP_GENSYM: 3330 case OP_GENSYM:
3537 s_return (gensym (SCHEME_A)); 3331 s_return (gensym (SCHEME_A));
… …
3541 /* OP_VALUEPRINT is always pushed, because when changing from 3335 /* OP_VALUEPRINT is always pushed, because when changing from
3542 non-interactive to interactive mode, it needs to be 3336 non-interactive to interactive mode, it needs to be
3543 already on the stack */ 3337 already on the stack */
3544#if USE_TRACING 3338#if USE_TRACING
3545 if (SCHEME_V->tracing) 3339 if (SCHEME_V->tracing)
3546 {
3547 putstr (SCHEME_A_ "\nGives: "); 3340 putstr (SCHEME_A_ "\nGives: ");
3548 }
3549#endif 3341#endif
3550 3342
3551 if (file_interactive (SCHEME_A)) 3343 if (file_interactive (SCHEME_A))
3552 { 3344 {
3553 SCHEME_V->print_flag = 1; 3345 SCHEME_V->print_flag = 1;
3554 SCHEME_V->args = SCHEME_V->value; 3346 SCHEME_V->args = SCHEME_V->value;
3555 s_goto (OP_P0LIST); 3347 s_goto (OP_P0LIST);
3556 } 3348 }
3557 else 3349 else
3558 {
3559 s_return (SCHEME_V->value); 3350 s_return (SCHEME_V->value);
3560 }
3561 3351
3562 case OP_EVAL: /* main part of evaluation */ 3352 case OP_EVAL: /* main part of evaluation */
3563#if USE_TRACING 3353#if USE_TRACING
3564 if (SCHEME_V->tracing) 3354 if (SCHEME_V->tracing)
3565 { 3355 {
3566 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3356 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3567 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3357 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3568 SCHEME_V->args = SCHEME_V->code; 3358 SCHEME_V->args = SCHEME_V->code;
3569 putstr (SCHEME_A_ "\nEval: "); 3359 putstr (SCHEME_A_ "\nEval: ");
3570 s_goto (OP_P0LIST); 3360 s_goto (OP_P0LIST);
3571 } 3361 }
3572 3362
3573 /* fall through */ 3363 /* fall through */
3364
3574 case OP_REAL_EVAL: 3365 case OP_REAL_EVAL:
3575#endif 3366#endif
3576 if (is_symbol (SCHEME_V->code)) /* symbol */ 3367 if (is_symbol (SCHEME_V->code)) /* symbol */
3577 { 3368 {
3578 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3369 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
… …
3582 else 3373 else
3583 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3374 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3584 } 3375 }
3585 else if (is_pair (SCHEME_V->code)) 3376 else if (is_pair (SCHEME_V->code))
3586 { 3377 {
3378 x = car (SCHEME_V->code);
3379
3587 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3380 if (is_syntax (x)) /* SYNTAX */
3588 { 3381 {
3589 SCHEME_V->code = cdr (SCHEME_V->code); 3382 SCHEME_V->code = cdr (SCHEME_V->code);
3590 s_goto (syntaxnum (x)); 3383 s_goto (syntaxnum (x));
3591 } 3384 }
3592 else /* first, eval top element and eval arguments */ 3385 else /* first, eval top element and eval arguments */
3593 { 3386 {
3594 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3387 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)); */ 3388 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3596 SCHEME_V->code = car (SCHEME_V->code); 3389 SCHEME_V->code = x;
3597 s_goto (OP_EVAL); 3390 s_goto (OP_EVAL);
3598 } 3391 }
3599 } 3392 }
3600 else 3393 else
3601 s_return (SCHEME_V->code); 3394 s_return (SCHEME_V->code);
… …
3613 SCHEME_V->code = cdr (SCHEME_V->code); 3406 SCHEME_V->code = cdr (SCHEME_V->code);
3614 s_goto (OP_E1ARGS); 3407 s_goto (OP_E1ARGS);
3615 } 3408 }
3616 3409
3617 case OP_E1ARGS: /* eval arguments */ 3410 case OP_E1ARGS: /* eval arguments */
3618 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3411 args = cons (SCHEME_V->value, args);
3619 3412
3620 if (is_pair (SCHEME_V->code)) /* continue */ 3413 if (is_pair (SCHEME_V->code)) /* continue */
3621 { 3414 {
3622 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3415 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3623 SCHEME_V->code = car (SCHEME_V->code); 3416 SCHEME_V->code = car (SCHEME_V->code);
3624 SCHEME_V->args = NIL; 3417 SCHEME_V->args = NIL;
3625 s_goto (OP_EVAL); 3418 s_goto (OP_EVAL);
3626 } 3419 }
3627 else /* end */ 3420 else /* end */
3628 { 3421 {
3629 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3422 args = reverse_in_place (SCHEME_A_ NIL, args);
3630 SCHEME_V->code = car (SCHEME_V->args); 3423 SCHEME_V->code = car (args);
3631 SCHEME_V->args = cdr (SCHEME_V->args); 3424 SCHEME_V->args = cdr (args);
3632 s_goto (OP_APPLY); 3425 s_goto (OP_APPLY);
3633 } 3426 }
3634 3427
3635#if USE_TRACING 3428#if USE_TRACING
3636 3429
3637 case OP_TRACING: 3430 case OP_TRACING:
3638 { 3431 {
3639 int tr = SCHEME_V->tracing; 3432 int tr = SCHEME_V->tracing;
3640 3433
3641 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3434 SCHEME_V->tracing = ivalue_unchecked (car (args));
3642 s_return (mk_integer (SCHEME_A_ tr)); 3435 s_return (mk_integer (SCHEME_A_ tr));
3643 } 3436 }
3644 3437
3645#endif 3438#endif
3646 3439
3647 case OP_APPLY: /* apply 'code' to 'args' */ 3440 case OP_APPLY: /* apply 'code' to 'args' */
3648#if USE_TRACING 3441#if USE_TRACING
3649 if (SCHEME_V->tracing) 3442 if (SCHEME_V->tracing)
3650 { 3443 {
3651 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3444 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3652 SCHEME_V->print_flag = 1; 3445 SCHEME_V->print_flag = 1;
3653 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3446 /* args=cons(SCHEME_V->code,args); */
3654 putstr (SCHEME_A_ "\nApply to: "); 3447 putstr (SCHEME_A_ "\nApply to: ");
3655 s_goto (OP_P0LIST); 3448 s_goto (OP_P0LIST);
3656 } 3449 }
3657 3450
3658 /* fall through */ 3451 /* fall through */
3452
3659 case OP_REAL_APPLY: 3453 case OP_REAL_APPLY:
3660#endif 3454#endif
3661 if (is_proc (SCHEME_V->code)) 3455 if (is_proc (SCHEME_V->code))
3662 {
3663 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3456 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3664 }
3665 else if (is_foreign (SCHEME_V->code)) 3457 else if (is_foreign (SCHEME_V->code))
3666 { 3458 {
3667 /* Keep nested calls from GC'ing the arglist */ 3459 /* Keep nested calls from GC'ing the arglist */
3668 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3460 push_recent_alloc (SCHEME_A_ args, NIL);
3669 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3461 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3670 3462
3671 s_return (x); 3463 s_return (x);
3672 } 3464 }
3673 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3465 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3674 { 3466 {
3675 /* Should not accept promise */ 3467 /* Should not accept promise */
3676 /* make environment */ 3468 /* make environment */
3677 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3469 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3678 3470
3679 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3471 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3680 { 3472 {
3681 if (y == NIL) 3473 if (y == NIL)
3682 {
3683 Error_0 ("not enough arguments"); 3474 Error_0 ("not enough arguments");
3684 }
3685 else 3475 else
3686 {
3687 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3476 new_slot_in_env (SCHEME_A_ car (x), car (y));
3688 }
3689 } 3477 }
3690 3478
3691 if (x == NIL) 3479 if (x == NIL)
3692 { 3480 {
3693
3694 /*-- 3481 /*--
3695 * if (y != NIL) { 3482 * if (y != NIL) {
3696 * Error_0("too many arguments"); 3483 * Error_0("too many arguments");
3697 * } 3484 * }
3698 */ 3485 */
3699 } 3486 }
3700 else if (is_symbol (x)) 3487 else if (is_symbol (x))
3701 new_slot_in_env (SCHEME_A_ x, y); 3488 new_slot_in_env (SCHEME_A_ x, y);
3702 else 3489 else
3703 {
3704 Error_1 ("syntax error in closure: not a symbol:", x); 3490 Error_1 ("syntax error in closure: not a symbol:", x);
3705 }
3706 3491
3707 SCHEME_V->code = cdr (closure_code (SCHEME_V->code)); 3492 SCHEME_V->code = cdr (closure_code (SCHEME_V->code));
3708 SCHEME_V->args = NIL; 3493 SCHEME_V->args = NIL;
3709 s_goto (OP_BEGIN); 3494 s_goto (OP_BEGIN);
3710 } 3495 }
3711 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3496 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3712 { 3497 {
3713 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3498 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3714 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3499 s_return (args != NIL ? car (args) : NIL);
3715 } 3500 }
3716 else 3501 else
3717 Error_0 ("illegal function"); 3502 Error_0 ("illegal function");
3718 3503
3719 case OP_DOMACRO: /* do macro */ 3504 case OP_DOMACRO: /* do macro */
… …
3728 { 3513 {
3729 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3514 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3730 3515
3731 if (f != NIL) 3516 if (f != NIL)
3732 { 3517 {
3733 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3518 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3734 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3519 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3735 SCHEME_V->code = slot_value_in_env (f); 3520 SCHEME_V->code = slot_value_in_env (f);
3736 s_goto (OP_APPLY); 3521 s_goto (OP_APPLY);
3737 } 3522 }
3738 3523
… …
3749 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3534 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3750 3535
3751#endif 3536#endif
3752 3537
3753 case OP_MKCLOSURE: /* make-closure */ 3538 case OP_MKCLOSURE: /* make-closure */
3754 x = car (SCHEME_V->args); 3539 x = car (args);
3755 3540
3756 if (car (x) == SCHEME_V->LAMBDA) 3541 if (car (x) == SCHEME_V->LAMBDA)
3757 x = cdr (x); 3542 x = cdr (x);
3758 3543
3759 if (cdr (SCHEME_V->args) == NIL) 3544 if (cdr (args) == NIL)
3760 y = SCHEME_V->envir; 3545 y = SCHEME_V->envir;
3761 else 3546 else
3762 y = cadr (SCHEME_V->args); 3547 y = cadr (args);
3763 3548
3764 s_return (mk_closure (SCHEME_A_ x, y)); 3549 s_return (mk_closure (SCHEME_A_ x, y));
3765 3550
3766 case OP_QUOTE: /* quote */ 3551 case OP_QUOTE: /* quote */
3767 s_return (car (SCHEME_V->code)); 3552 s_return (car (SCHEME_V->code));
… …
3780 x = car (SCHEME_V->code); 3565 x = car (SCHEME_V->code);
3781 SCHEME_V->code = cadr (SCHEME_V->code); 3566 SCHEME_V->code = cadr (SCHEME_V->code);
3782 } 3567 }
3783 3568
3784 if (!is_symbol (x)) 3569 if (!is_symbol (x))
3785 {
3786 Error_0 ("variable is not a symbol"); 3570 Error_0 ("variable is not a symbol");
3787 }
3788 3571
3789 s_save (SCHEME_A_ OP_DEF1, NIL, x); 3572 s_save (SCHEME_A_ OP_DEF1, NIL, x);
3790 s_goto (OP_EVAL); 3573 s_goto (OP_EVAL);
3791 3574
3792 case OP_DEF1: /* define */ 3575 case OP_DEF1: /* define */
3793 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3576 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
3794 3577
3795 if (x != NIL) 3578 if (x != NIL)
3796 {
3797 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3579 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
3798 }
3799 else 3580 else
3800 {
3801 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3581 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3802 }
3803 3582
3804 s_return (SCHEME_V->code); 3583 s_return (SCHEME_V->code);
3805 3584
3806 3585
3807 case OP_DEFP: /* defined? */ 3586 case OP_DEFP: /* defined? */
3808 x = SCHEME_V->envir; 3587 x = SCHEME_V->envir;
3809 3588
3810 if (cdr (SCHEME_V->args) != NIL) 3589 if (cdr (args) != NIL)
3811 {
3812 x = cadr (SCHEME_V->args); 3590 x = cadr (args);
3813 }
3814 3591
3815 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3592 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3816 3593
3817 case OP_SET0: /* set! */ 3594 case OP_SET0: /* set! */
3818 if (is_immutable (car (SCHEME_V->code))) 3595 if (is_immutable (car (SCHEME_V->code)))
3819 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3596 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3820 3597
… …
3829 { 3606 {
3830 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3607 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3831 s_return (SCHEME_V->value); 3608 s_return (SCHEME_V->value);
3832 } 3609 }
3833 else 3610 else
3834 {
3835 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3611 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3836 }
3837 3612
3838 3613
3839 case OP_BEGIN: /* begin */ 3614 case OP_BEGIN: /* begin */
3840 if (!is_pair (SCHEME_V->code)) 3615 if (!is_pair (SCHEME_V->code))
3841 {
3842 s_return (SCHEME_V->code); 3616 s_return (SCHEME_V->code);
3843 }
3844 3617
3845 if (cdr (SCHEME_V->code) != NIL) 3618 if (cdr (SCHEME_V->code) != NIL)
3846 {
3847 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code)); 3619 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code));
3848 }
3849 3620
3850 SCHEME_V->code = car (SCHEME_V->code); 3621 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3622 s_goto (OP_EVAL);
3852 3623
3853 case OP_IF0: /* if */ 3624 case OP_IF0: /* if */
… …
3857 3628
3858 case OP_IF1: /* if */ 3629 case OP_IF1: /* if */
3859 if (is_true (SCHEME_V->value)) 3630 if (is_true (SCHEME_V->value))
3860 SCHEME_V->code = car (SCHEME_V->code); 3631 SCHEME_V->code = car (SCHEME_V->code);
3861 else 3632 else
3862 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3633 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3863
3864 * car(NIL) = NIL */
3865 s_goto (OP_EVAL); 3634 s_goto (OP_EVAL);
3866 3635
3867 case OP_LET0: /* let */ 3636 case OP_LET0: /* let */
3868 SCHEME_V->args = NIL; 3637 SCHEME_V->args = NIL;
3869 SCHEME_V->value = SCHEME_V->code; 3638 SCHEME_V->value = SCHEME_V->code;
3870 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3639 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3871 s_goto (OP_LET1); 3640 s_goto (OP_LET1);
3872 3641
3873 case OP_LET1: /* let (calculate parameters) */ 3642 case OP_LET1: /* let (calculate parameters) */
3874 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3643 args = cons (SCHEME_V->value, args);
3875 3644
3876 if (is_pair (SCHEME_V->code)) /* continue */ 3645 if (is_pair (SCHEME_V->code)) /* continue */
3877 { 3646 {
3878 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3647 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)); 3648 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3881 }
3882 3649
3883 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3650 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3884 SCHEME_V->code = cadar (SCHEME_V->code); 3651 SCHEME_V->code = cadar (SCHEME_V->code);
3885 SCHEME_V->args = NIL; 3652 SCHEME_V->args = NIL;
3886 s_goto (OP_EVAL); 3653 s_goto (OP_EVAL);
3887 } 3654 }
3888 else /* end */ 3655 else /* end */
3889 { 3656 {
3890 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3657 args = reverse_in_place (SCHEME_A_ NIL, args);
3891 SCHEME_V->code = car (SCHEME_V->args); 3658 SCHEME_V->code = car (args);
3892 SCHEME_V->args = cdr (SCHEME_V->args); 3659 SCHEME_V->args = cdr (args);
3893 s_goto (OP_LET2); 3660 s_goto (OP_LET2);
3894 } 3661 }
3895 3662
3896 case OP_LET2: /* let */ 3663 case OP_LET2: /* let */
3897 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3664 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3898 3665
3899 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3666 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)) 3667 y != NIL; x = cdr (x), y = cdr (y))
3901 {
3902 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3668 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3903 }
3904 3669
3905 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3670 if (is_symbol (car (SCHEME_V->code))) /* named let */
3906 { 3671 {
3907 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3672 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3908 { 3673 {
3909 if (!is_pair (x)) 3674 if (!is_pair (x))
3910 Error_1 ("Bad syntax of binding in let :", x); 3675 Error_1 ("Bad syntax of binding in let :", x);
3911 3676
3912 if (!is_list (SCHEME_A_ car (x))) 3677 if (!is_list (SCHEME_A_ car (x)))
3913 Error_1 ("Bad syntax of binding in let :", car (x)); 3678 Error_1 ("Bad syntax of binding in let :", car (x));
3914 3679
3915 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3680 args = cons (caar (x), args);
3916 } 3681 }
3917 3682
3918 x =
3919 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3683 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3920 SCHEME_V->envir); 3684 SCHEME_V->envir);
3921 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3685 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3922 SCHEME_V->code = cddr (SCHEME_V->code); 3686 SCHEME_V->code = cddr (SCHEME_V->code);
3923 SCHEME_V->args = NIL;
3924 } 3687 }
3925 else 3688 else
3926 { 3689 {
3927 SCHEME_V->code = cdr (SCHEME_V->code); 3690 SCHEME_V->code = cdr (SCHEME_V->code);
3691 }
3692
3928 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3929 }
3930
3931 s_goto (OP_BEGIN); 3694 s_goto (OP_BEGIN);
3932 3695
3933 case OP_LET0AST: /* let* */ 3696 case OP_LET0AST: /* let* */
3934 if (car (SCHEME_V->code) == NIL) 3697 if (car (SCHEME_V->code) == NIL)
3935 { 3698 {
… …
3953 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3716 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3954 SCHEME_V->code = cdr (SCHEME_V->code); 3717 SCHEME_V->code = cdr (SCHEME_V->code);
3955 3718
3956 if (is_pair (SCHEME_V->code)) /* continue */ 3719 if (is_pair (SCHEME_V->code)) /* continue */
3957 { 3720 {
3958 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3721 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3959 SCHEME_V->code = cadar (SCHEME_V->code); 3722 SCHEME_V->code = cadar (SCHEME_V->code);
3960 SCHEME_V->args = NIL; 3723 SCHEME_V->args = NIL;
3961 s_goto (OP_EVAL); 3724 s_goto (OP_EVAL);
3962 } 3725 }
3963 else /* end */ 3726 else /* end */
3964 { 3727 {
3965 SCHEME_V->code = SCHEME_V->args; 3728 SCHEME_V->code = args;
3966 SCHEME_V->args = NIL; 3729 SCHEME_V->args = NIL;
3967 s_goto (OP_BEGIN); 3730 s_goto (OP_BEGIN);
3968 } 3731 }
3969 3732
3970 case OP_LET0REC: /* letrec */ 3733 case OP_LET0REC: /* letrec */
… …
3973 SCHEME_V->value = SCHEME_V->code; 3736 SCHEME_V->value = SCHEME_V->code;
3974 SCHEME_V->code = car (SCHEME_V->code); 3737 SCHEME_V->code = car (SCHEME_V->code);
3975 s_goto (OP_LET1REC); 3738 s_goto (OP_LET1REC);
3976 3739
3977 case OP_LET1REC: /* letrec (calculate parameters) */ 3740 case OP_LET1REC: /* letrec (calculate parameters) */
3978 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3741 args = cons (SCHEME_V->value, args);
3979 3742
3980 if (is_pair (SCHEME_V->code)) /* continue */ 3743 if (is_pair (SCHEME_V->code)) /* continue */
3981 { 3744 {
3982 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3745 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)); 3746 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3985 }
3986 3747
3987 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3748 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3988 SCHEME_V->code = cadar (SCHEME_V->code); 3749 SCHEME_V->code = cadar (SCHEME_V->code);
3989 SCHEME_V->args = NIL; 3750 SCHEME_V->args = NIL;
3990 s_goto (OP_EVAL); 3751 s_goto (OP_EVAL);
3991 } 3752 }
3992 else /* end */ 3753 else /* end */
3993 { 3754 {
3994 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3755 args = reverse_in_place (SCHEME_A_ NIL, args);
3995 SCHEME_V->code = car (SCHEME_V->args); 3756 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cdr (SCHEME_V->args); 3757 SCHEME_V->args = cdr (args);
3997 s_goto (OP_LET2REC); 3758 s_goto (OP_LET2REC);
3998 } 3759 }
3999 3760
4000 case OP_LET2REC: /* letrec */ 3761 case OP_LET2REC: /* letrec */
4001 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3762 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)); 3763 new_slot_in_env (SCHEME_A_ caar (x), car (y));
4004 }
4005 3764
4006 SCHEME_V->code = cdr (SCHEME_V->code); 3765 SCHEME_V->code = cdr (SCHEME_V->code);
4007 SCHEME_V->args = NIL; 3766 SCHEME_V->args = NIL;
4008 s_goto (OP_BEGIN); 3767 s_goto (OP_BEGIN);
4009 3768
4010 case OP_COND0: /* cond */ 3769 case OP_COND0: /* cond */
4011 if (!is_pair (SCHEME_V->code)) 3770 if (!is_pair (SCHEME_V->code))
4012 {
4013 Error_0 ("syntax error in cond"); 3771 Error_0 ("syntax error in cond");
4014 }
4015 3772
4016 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3773 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4017 SCHEME_V->code = caar (SCHEME_V->code); 3774 SCHEME_V->code = caar (SCHEME_V->code);
4018 s_goto (OP_EVAL); 3775 s_goto (OP_EVAL);
4019 3776
4020 case OP_COND1: /* cond */ 3777 case OP_COND1: /* cond */
4021 if (is_true (SCHEME_V->value)) 3778 if (is_true (SCHEME_V->value))
4022 { 3779 {
4023 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL) 3780 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL)
4024 {
4025 s_return (SCHEME_V->value); 3781 s_return (SCHEME_V->value);
4026 }
4027 3782
4028 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO) 3783 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO)
4029 { 3784 {
4030 if (!is_pair (cdr (SCHEME_V->code))) 3785 if (!is_pair (cdr (SCHEME_V->code)))
4031 {
4032 Error_0 ("syntax error in cond"); 3786 Error_0 ("syntax error in cond");
4033 }
4034 3787
4035 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)); 3788 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL));
4036 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL)); 3789 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL));
4037 s_goto (OP_EVAL); 3790 s_goto (OP_EVAL);
4038 } 3791 }
… …
4040 s_goto (OP_BEGIN); 3793 s_goto (OP_BEGIN);
4041 } 3794 }
4042 else 3795 else
4043 { 3796 {
4044 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3797 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
4045 {
4046 s_return (NIL); 3798 s_return (NIL);
4047 }
4048 else 3799 else
4049 { 3800 {
4050 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3801 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4051 SCHEME_V->code = caar (SCHEME_V->code); 3802 SCHEME_V->code = caar (SCHEME_V->code);
4052 s_goto (OP_EVAL); 3803 s_goto (OP_EVAL);
… …
4058 set_typeflag (x, T_PROMISE); 3809 set_typeflag (x, T_PROMISE);
4059 s_return (x); 3810 s_return (x);
4060 3811
4061 case OP_AND0: /* and */ 3812 case OP_AND0: /* and */
4062 if (SCHEME_V->code == NIL) 3813 if (SCHEME_V->code == NIL)
4063 {
4064 s_return (S_T); 3814 s_return (S_T);
4065 }
4066 3815
4067 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3816 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4068 SCHEME_V->code = car (SCHEME_V->code); 3817 SCHEME_V->code = car (SCHEME_V->code);
4069 s_goto (OP_EVAL); 3818 s_goto (OP_EVAL);
4070 3819
4071 case OP_AND1: /* and */ 3820 case OP_AND1: /* and */
4072 if (is_false (SCHEME_V->value)) 3821 if (is_false (SCHEME_V->value))
4073 {
4074 s_return (SCHEME_V->value); 3822 s_return (SCHEME_V->value);
4075 }
4076 else if (SCHEME_V->code == NIL) 3823 else if (SCHEME_V->code == NIL)
4077 {
4078 s_return (SCHEME_V->value); 3824 s_return (SCHEME_V->value);
4079 }
4080 else 3825 else
4081 { 3826 {
4082 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3827 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4083 SCHEME_V->code = car (SCHEME_V->code); 3828 SCHEME_V->code = car (SCHEME_V->code);
4084 s_goto (OP_EVAL); 3829 s_goto (OP_EVAL);
4085 } 3830 }
4086 3831
4087 case OP_OR0: /* or */ 3832 case OP_OR0: /* or */
4088 if (SCHEME_V->code == NIL) 3833 if (SCHEME_V->code == NIL)
4089 {
4090 s_return (S_F); 3834 s_return (S_F);
4091 }
4092 3835
4093 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3836 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4094 SCHEME_V->code = car (SCHEME_V->code); 3837 SCHEME_V->code = car (SCHEME_V->code);
4095 s_goto (OP_EVAL); 3838 s_goto (OP_EVAL);
4096 3839
4097 case OP_OR1: /* or */ 3840 case OP_OR1: /* or */
4098 if (is_true (SCHEME_V->value)) 3841 if (is_true (SCHEME_V->value))
4099 {
4100 s_return (SCHEME_V->value); 3842 s_return (SCHEME_V->value);
4101 }
4102 else if (SCHEME_V->code == NIL) 3843 else if (SCHEME_V->code == NIL)
4103 {
4104 s_return (SCHEME_V->value); 3844 s_return (SCHEME_V->value);
4105 }
4106 else 3845 else
4107 { 3846 {
4108 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3847 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4109 SCHEME_V->code = car (SCHEME_V->code); 3848 SCHEME_V->code = car (SCHEME_V->code);
4110 s_goto (OP_EVAL); 3849 s_goto (OP_EVAL);
… …
4114 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3853 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4115 SCHEME_V->code = car (SCHEME_V->code); 3854 SCHEME_V->code = car (SCHEME_V->code);
4116 s_goto (OP_EVAL); 3855 s_goto (OP_EVAL);
4117 3856
4118 case OP_C1STREAM: /* cons-stream */ 3857 case OP_C1STREAM: /* cons-stream */
4119 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3858 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); 3859 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4121 set_typeflag (x, T_PROMISE); 3860 set_typeflag (x, T_PROMISE);
4122 s_return (cons (SCHEME_V->args, x)); 3861 s_return (cons (args, x));
4123 3862
4124 case OP_MACRO0: /* macro */ 3863 case OP_MACRO0: /* macro */
4125 if (is_pair (car (SCHEME_V->code))) 3864 if (is_pair (car (SCHEME_V->code)))
4126 { 3865 {
4127 x = caar (SCHEME_V->code); 3866 x = caar (SCHEME_V->code);
… …
4132 x = car (SCHEME_V->code); 3871 x = car (SCHEME_V->code);
4133 SCHEME_V->code = cadr (SCHEME_V->code); 3872 SCHEME_V->code = cadr (SCHEME_V->code);
4134 } 3873 }
4135 3874
4136 if (!is_symbol (x)) 3875 if (!is_symbol (x))
4137 {
4138 Error_0 ("variable is not a symbol"); 3876 Error_0 ("variable is not a symbol");
4139 }
4140 3877
4141 s_save (SCHEME_A_ OP_MACRO1, NIL, x); 3878 s_save (SCHEME_A_ OP_MACRO1, NIL, x);
4142 s_goto (OP_EVAL); 3879 s_goto (OP_EVAL);
4143 3880
4144 case OP_MACRO1: /* macro */ 3881 case OP_MACRO1: /* macro */
4145 set_typeflag (SCHEME_V->value, T_MACRO); 3882 set_typeflag (SCHEME_V->value, T_MACRO);
4146 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3883 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
4147 3884
4148 if (x != NIL) 3885 if (x != NIL)
4149 {
4150 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3886 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
4151 }
4152 else 3887 else
4153 {
4154 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3888 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
4155 }
4156 3889
4157 s_return (SCHEME_V->code); 3890 s_return (SCHEME_V->code);
4158 3891
4159 case OP_CASE0: /* case */ 3892 case OP_CASE0: /* case */
4160 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code)); 3893 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code));
… …
4163 3896
4164 case OP_CASE1: /* case */ 3897 case OP_CASE1: /* case */
4165 for (x = SCHEME_V->code; x != NIL; x = cdr (x)) 3898 for (x = SCHEME_V->code; x != NIL; x = cdr (x))
4166 { 3899 {
4167 if (!is_pair (y = caar (x))) 3900 if (!is_pair (y = caar (x)))
4168 {
4169 break; 3901 break;
4170 }
4171 3902
4172 for (; y != NIL; y = cdr (y)) 3903 for (; y != NIL; y = cdr (y))
4173 {
4174 if (eqv (car (y), SCHEME_V->value)) 3904 if (eqv (car (y), SCHEME_V->value))
4175 {
4176 break; 3905 break;
4177 }
4178 }
4179 3906
4180 if (y != NIL) 3907 if (y != NIL)
4181 {
4182 break; 3908 break;
4183 }
4184 } 3909 }
4185 3910
4186 if (x != NIL) 3911 if (x != NIL)
4187 { 3912 {
4188 if (is_pair (caar (x))) 3913 if (is_pair (caar (x)))
… …
4196 SCHEME_V->code = caar (x); 3921 SCHEME_V->code = caar (x);
4197 s_goto (OP_EVAL); 3922 s_goto (OP_EVAL);
4198 } 3923 }
4199 } 3924 }
4200 else 3925 else
4201 {
4202 s_return (NIL); 3926 s_return (NIL);
4203 }
4204 3927
4205 case OP_CASE2: /* case */ 3928 case OP_CASE2: /* case */
4206 if (is_true (SCHEME_V->value)) 3929 if (is_true (SCHEME_V->value))
4207 {
4208 s_goto (OP_BEGIN); 3930 s_goto (OP_BEGIN);
4209 }
4210 else 3931 else
4211 {
4212 s_return (NIL); 3932 s_return (NIL);
4213 }
4214 3933
4215 case OP_PAPPLY: /* apply */ 3934 case OP_PAPPLY: /* apply */
4216 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
4217 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3936 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4218 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3937 /*SCHEME_V->args = cadr(args); */
4219 s_goto (OP_APPLY); 3938 s_goto (OP_APPLY);
4220 3939
4221 case OP_PEVAL: /* eval */ 3940 case OP_PEVAL: /* eval */
4222 if (cdr (SCHEME_V->args) != NIL) 3941 if (cdr (args) != NIL)
4223 {
4224 SCHEME_V->envir = cadr (SCHEME_V->args); 3942 SCHEME_V->envir = cadr (args);
4225 }
4226 3943
4227 SCHEME_V->code = car (SCHEME_V->args); 3944 SCHEME_V->code = car (args);
4228 s_goto (OP_EVAL); 3945 s_goto (OP_EVAL);
4229 3946
4230 case OP_CONTINUATION: /* call-with-current-continuation */ 3947 case OP_CONTINUATION: /* call-with-current-continuation */
4231 SCHEME_V->code = car (SCHEME_V->args); 3948 SCHEME_V->code = car (args);
4232 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3949 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4233 s_goto (OP_APPLY); 3950 s_goto (OP_APPLY);
4234 } 3951 }
4235 3952
4236 return S_T; 3953 if (USE_ERROR_CHECKING) abort ();
4237} 3954}
4238 3955
4239static pointer 3956static int
4240opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3957opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4241{ 3958{
4242 pointer x; 3959 pointer args = SCHEME_V->args;
3960 pointer x = car (args);
4243 num v; 3961 num v;
4244 3962
3963 switch (op)
3964 {
4245#if USE_MATH 3965#if USE_MATH
4246 RVALUE dd;
4247#endif
4248
4249 switch (op)
4250 {
4251#if USE_MATH
4252
4253 case OP_INEX2EX: /* inexact->exact */ 3966 case OP_INEX2EX: /* inexact->exact */
4254 x = car (SCHEME_V->args);
4255
4256 if (num_is_integer (x))
4257 { 3967 {
3968 if (is_integer (x))
4258 s_return (x); 3969 s_return (x);
4259 } 3970
4260 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3971 RVALUE r = rvalue_unchecked (x);
4261 { 3972
3973 if (r == (RVALUE)(IVALUE)r)
4262 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3974 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3975 else
3976 Error_1 ("inexact->exact: not integral:", x);
4263 } 3977 }
3978
3979 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3980 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3981 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3982 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3983 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3984 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3985 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3986
3987 case OP_ATAN:
3988 if (cdr (args) == NIL)
3989 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4264 else 3990 else
4265 { 3991 {
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); 3992 pointer y = cadr (args);
4307
4308 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3993 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4309 } 3994 }
4310 3995
4311 case OP_SQRT: 3996 case OP_SQRT:
4312 x = car (SCHEME_V->args);
4313 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3997 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4314 3998
4315 case OP_EXPT: 3999 case OP_EXPT:
4316 { 4000 {
4317 RVALUE result; 4001 RVALUE result;
4318 int real_result = 1; 4002 int real_result = 1;
4319 pointer y = cadr (SCHEME_V->args); 4003 pointer y = cadr (args);
4320 4004
4321 x = car (SCHEME_V->args);
4322
4323 if (num_is_integer (x) && num_is_integer (y)) 4005 if (is_integer (x) && is_integer (y))
4324 real_result = 0; 4006 real_result = 0;
4325 4007
4326 /* This 'if' is an R5RS compatibility fix. */ 4008 /* This 'if' is an R5RS compatibility fix. */
4327 /* NOTE: Remove this 'if' fix for R6RS. */ 4009 /* NOTE: Remove this 'if' fix for R6RS. */
4328 if (rvalue (x) == 0 && rvalue (y) < 0) 4010 if (rvalue (x) == 0 && rvalue (y) < 0)
4329 {
4330 result = 0.0; 4011 result = 0;
4331 }
4332 else 4012 else
4333 {
4334 result = pow (rvalue (x), rvalue (y)); 4013 result = pow (rvalue (x), rvalue (y));
4335 }
4336 4014
4337 /* Before returning integer result make sure we can. */ 4015 /* Before returning integer result make sure we can. */
4338 /* If the test fails, result is too big for integer. */ 4016 /* If the test fails, result is too big for integer. */
4339 if (!real_result) 4017 if (!real_result)
4340 { 4018 {
4341 long result_as_long = (long) result; 4019 long result_as_long = result;
4342 4020
4343 if (result != (RVALUE) result_as_long) 4021 if (result != result_as_long)
4344 real_result = 1; 4022 real_result = 1;
4345 } 4023 }
4346 4024
4347 if (real_result) 4025 if (real_result)
4348 {
4349 s_return (mk_real (SCHEME_A_ result)); 4026 s_return (mk_real (SCHEME_A_ result));
4350 }
4351 else 4027 else
4352 {
4353 s_return (mk_integer (SCHEME_A_ result)); 4028 s_return (mk_integer (SCHEME_A_ result));
4354 }
4355 } 4029 }
4356 4030
4357 case OP_FLOOR:
4358 x = car (SCHEME_V->args);
4359 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4031 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)))); 4032 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4364 4033
4365 case OP_TRUNCATE: 4034 case OP_TRUNCATE:
4366 { 4035 {
4367 RVALUE rvalue_of_x; 4036 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))); 4037 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 } 4038 }
4381 4039
4382 case OP_ROUND: 4040 case OP_ROUND:
4383 x = car (SCHEME_V->args);
4384
4385 if (num_is_integer (x)) 4041 if (is_integer (x))
4386 s_return (x); 4042 s_return (x);
4387 4043
4388 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4044 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4389#endif 4045#endif
4390 4046
4391 case OP_ADD: /* + */ 4047 case OP_ADD: /* + */
4392 v = num_zero; 4048 v = num_zero;
4393 4049
4394 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4050 for (x = args; x != NIL; x = cdr (x))
4395 v = num_add (v, nvalue (car (x))); 4051 v = num_op (NUM_ADD, v, nvalue (car (x)));
4396 4052
4397 s_return (mk_number (SCHEME_A_ v)); 4053 s_return (mk_number (SCHEME_A_ v));
4398 4054
4399 case OP_MUL: /* * */ 4055 case OP_MUL: /* * */
4400 v = num_one; 4056 v = num_one;
4401 4057
4402 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4058 for (x = args; x != NIL; x = cdr (x))
4403 v = num_mul (v, nvalue (car (x))); 4059 v = num_op (NUM_MUL, v, nvalue (car (x)));
4404 4060
4405 s_return (mk_number (SCHEME_A_ v)); 4061 s_return (mk_number (SCHEME_A_ v));
4406 4062
4407 case OP_SUB: /* - */ 4063 case OP_SUB: /* - */
4408 if (cdr (SCHEME_V->args) == NIL) 4064 if (cdr (args) == NIL)
4409 { 4065 {
4410 x = SCHEME_V->args; 4066 x = args;
4411 v = num_zero; 4067 v = num_zero;
4412 } 4068 }
4413 else 4069 else
4414 { 4070 {
4415 x = cdr (SCHEME_V->args); 4071 x = cdr (args);
4416 v = nvalue (car (SCHEME_V->args)); 4072 v = nvalue (car (args));
4417 } 4073 }
4418 4074
4419 for (; x != NIL; x = cdr (x)) 4075 for (; x != NIL; x = cdr (x))
4420 v = num_sub (v, nvalue (car (x))); 4076 v = num_op (NUM_SUB, v, nvalue (car (x)));
4421 4077
4422 s_return (mk_number (SCHEME_A_ v)); 4078 s_return (mk_number (SCHEME_A_ v));
4423 4079
4424 case OP_DIV: /* / */ 4080 case OP_DIV: /* / */
4425 if (cdr (SCHEME_V->args) == NIL) 4081 if (cdr (args) == NIL)
4426 { 4082 {
4427 x = SCHEME_V->args; 4083 x = args;
4428 v = num_one; 4084 v = num_one;
4429 } 4085 }
4430 else 4086 else
4431 { 4087 {
4432 x = cdr (SCHEME_V->args); 4088 x = cdr (args);
4433 v = nvalue (car (SCHEME_V->args)); 4089 v = nvalue (car (args));
4434 } 4090 }
4435 4091
4436 for (; x != NIL; x = cdr (x)) 4092 for (; x != NIL; x = cdr (x))
4437 {
4438 if (!is_zero_rvalue (rvalue (car (x)))) 4093 if (!is_zero_rvalue (rvalue (car (x))))
4439 v = num_div (v, nvalue (car (x))); 4094 v = num_div (v, nvalue (car (x)));
4440 else 4095 else
4441 Error_0 ("/: division by zero"); 4096 Error_0 ("/: division by zero");
4442 }
4443 4097
4444 s_return (mk_number (SCHEME_A_ v)); 4098 s_return (mk_number (SCHEME_A_ v));
4445 4099
4446 case OP_INTDIV: /* quotient */ 4100 case OP_INTDIV: /* quotient */
4447 if (cdr (SCHEME_V->args) == NIL) 4101 if (cdr (args) == NIL)
4448 { 4102 {
4449 x = SCHEME_V->args; 4103 x = args;
4450 v = num_one; 4104 v = num_one;
4451 } 4105 }
4452 else 4106 else
4453 { 4107 {
4454 x = cdr (SCHEME_V->args); 4108 x = cdr (args);
4455 v = nvalue (car (SCHEME_V->args)); 4109 v = nvalue (car (args));
4456 } 4110 }
4457 4111
4458 for (; x != NIL; x = cdr (x)) 4112 for (; x != NIL; x = cdr (x))
4459 { 4113 {
4460 if (ivalue (car (x)) != 0) 4114 if (ivalue (car (x)) != 0)
4461 v = num_intdiv (v, nvalue (car (x))); 4115 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4462 else 4116 else
4463 Error_0 ("quotient: division by zero"); 4117 Error_0 ("quotient: division by zero");
4464 } 4118 }
4465 4119
4466 s_return (mk_number (SCHEME_A_ v)); 4120 s_return (mk_number (SCHEME_A_ v));
4467 4121
4468 case OP_REM: /* remainder */ 4122 case OP_REM: /* remainder */
4469 v = nvalue (car (SCHEME_V->args)); 4123 v = nvalue (x);
4470 4124
4471 if (ivalue (cadr (SCHEME_V->args)) != 0) 4125 if (ivalue (cadr (args)) != 0)
4472 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4126 v = num_rem (v, nvalue (cadr (args)));
4473 else 4127 else
4474 Error_0 ("remainder: division by zero"); 4128 Error_0 ("remainder: division by zero");
4475 4129
4476 s_return (mk_number (SCHEME_A_ v)); 4130 s_return (mk_number (SCHEME_A_ v));
4477 4131
4478 case OP_MOD: /* modulo */ 4132 case OP_MOD: /* modulo */
4479 v = nvalue (car (SCHEME_V->args)); 4133 v = nvalue (x);
4480 4134
4481 if (ivalue (cadr (SCHEME_V->args)) != 0) 4135 if (ivalue (cadr (args)) != 0)
4482 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4136 v = num_mod (v, nvalue (cadr (args)));
4483 else 4137 else
4484 Error_0 ("modulo: division by zero"); 4138 Error_0 ("modulo: division by zero");
4485 4139
4486 s_return (mk_number (SCHEME_A_ v)); 4140 s_return (mk_number (SCHEME_A_ v));
4487 4141
4488 case OP_CAR: /* car */ 4142 case OP_CAR: /* car */
4489 s_return (caar (SCHEME_V->args)); 4143 s_return (caar (args));
4490 4144
4491 case OP_CDR: /* cdr */ 4145 case OP_CDR: /* cdr */
4492 s_return (cdar (SCHEME_V->args)); 4146 s_return (cdar (args));
4493 4147
4494 case OP_CONS: /* cons */ 4148 case OP_CONS: /* cons */
4495 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4149 set_cdr (args, cadr (args));
4496 s_return (SCHEME_V->args); 4150 s_return (args);
4497 4151
4498 case OP_SETCAR: /* set-car! */ 4152 case OP_SETCAR: /* set-car! */
4499 if (!is_immutable (car (SCHEME_V->args))) 4153 if (!is_immutable (x))
4500 { 4154 {
4501 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4155 set_car (x, cadr (args));
4502 s_return (car (SCHEME_V->args)); 4156 s_return (car (args));
4503 } 4157 }
4504 else 4158 else
4505 Error_0 ("set-car!: unable to alter immutable pair"); 4159 Error_0 ("set-car!: unable to alter immutable pair");
4506 4160
4507 case OP_SETCDR: /* set-cdr! */ 4161 case OP_SETCDR: /* set-cdr! */
4508 if (!is_immutable (car (SCHEME_V->args))) 4162 if (!is_immutable (x))
4509 { 4163 {
4510 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4164 set_cdr (x, cadr (args));
4511 s_return (car (SCHEME_V->args)); 4165 s_return (car (args));
4512 } 4166 }
4513 else 4167 else
4514 Error_0 ("set-cdr!: unable to alter immutable pair"); 4168 Error_0 ("set-cdr!: unable to alter immutable pair");
4515 4169
4516 case OP_CHAR2INT: /* char->integer */ 4170 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)); 4171 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4522 }
4523 4172
4524 case OP_INT2CHAR: /* integer->char */ 4173 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)); 4174 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4530 }
4531 4175
4532 case OP_CHARUPCASE: 4176 case OP_CHARUPCASE:
4533 { 4177 {
4534 unsigned char c; 4178 unsigned char c = ivalue_unchecked (x);
4535
4536 c = (unsigned char) ivalue (car (SCHEME_V->args));
4537 c = toupper (c); 4179 c = toupper (c);
4538 s_return (mk_character (SCHEME_A_ (char) c)); 4180 s_return (mk_character (SCHEME_A_ c));
4539 } 4181 }
4540 4182
4541 case OP_CHARDNCASE: 4183 case OP_CHARDNCASE:
4542 { 4184 {
4543 unsigned char c; 4185 unsigned char c = ivalue_unchecked (x);
4544
4545 c = (unsigned char) ivalue (car (SCHEME_V->args));
4546 c = tolower (c); 4186 c = tolower (c);
4547 s_return (mk_character (SCHEME_A_ (char) c)); 4187 s_return (mk_character (SCHEME_A_ c));
4548 } 4188 }
4549 4189
4550 case OP_STR2SYM: /* string->symbol */ 4190 case OP_STR2SYM: /* string->symbol */
4551 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4191 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4552 4192
4553 case OP_STR2ATOM: /* string->atom */ 4193 case OP_STR2ATOM: /* string->atom */
4554 { 4194 {
4555 char *s = strvalue (car (SCHEME_V->args)); 4195 char *s = strvalue (x);
4556 long pf = 0; 4196 long pf = 0;
4557 4197
4558 if (cdr (SCHEME_V->args) != NIL) 4198 if (cdr (args) != NIL)
4559 { 4199 {
4560 /* we know cadr(SCHEME_V->args) is a natural number */ 4200 /* we know cadr(args) is a natural number */
4561 /* see if it is 2, 8, 10, or 16, or error */ 4201 /* see if it is 2, 8, 10, or 16, or error */
4562 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4202 pf = ivalue_unchecked (cadr (args));
4563 4203
4564 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4204 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4565 { 4205 {
4566 /* base is OK */ 4206 /* base is OK */
4567 } 4207 }
4568 else 4208 else
4569 {
4570 pf = -1; 4209 pf = -1;
4571 }
4572 } 4210 }
4573 4211
4574 if (pf < 0) 4212 if (pf < 0)
4575 {
4576 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4213 Error_1 ("string->atom: bad base:", cadr (args));
4577 }
4578 else if (*s == '#') /* no use of base! */ 4214 else if (*s == '#') /* no use of base! */
4579 {
4580 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4215 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4581 }
4582 else 4216 else
4583 { 4217 {
4584 if (pf == 0 || pf == 10) 4218 if (pf == 0 || pf == 10)
4585 {
4586 s_return (mk_atom (SCHEME_A_ s)); 4219 s_return (mk_atom (SCHEME_A_ s));
4587 }
4588 else 4220 else
4589 { 4221 {
4590 char *ep; 4222 char *ep;
4591 long iv = strtol (s, &ep, (int) pf); 4223 long iv = strtol (s, &ep, (int) pf);
4592 4224
4593 if (*ep == 0) 4225 if (*ep == 0)
4594 {
4595 s_return (mk_integer (SCHEME_A_ iv)); 4226 s_return (mk_integer (SCHEME_A_ iv));
4596 }
4597 else 4227 else
4598 {
4599 s_return (S_F); 4228 s_return (S_F);
4600 }
4601 } 4229 }
4602 } 4230 }
4603 } 4231 }
4604 4232
4605 case OP_SYM2STR: /* symbol->string */ 4233 case OP_SYM2STR: /* symbol->string */
4606 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4234 x = mk_string (SCHEME_A_ symname (x));
4607 setimmutable (x); 4235 setimmutable (x);
4608 s_return (x); 4236 s_return (x);
4609 4237
4610 case OP_ATOM2STR: /* atom->string */ 4238 case OP_ATOM2STR: /* atom->string */
4611 { 4239 {
4612 long pf = 0; 4240 long pf = 0;
4613 4241
4614 x = car (SCHEME_V->args);
4615
4616 if (cdr (SCHEME_V->args) != NIL) 4242 if (cdr (args) != NIL)
4617 { 4243 {
4618 /* we know cadr(SCHEME_V->args) is a natural number */ 4244 /* we know cadr(args) is a natural number */
4619 /* see if it is 2, 8, 10, or 16, or error */ 4245 /* see if it is 2, 8, 10, or 16, or error */
4620 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4246 pf = ivalue_unchecked (cadr (args));
4621 4247
4622 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4248 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4623 { 4249 {
4624 /* base is OK */ 4250 /* base is OK */
4625 } 4251 }
4626 else 4252 else
4627 {
4628 pf = -1; 4253 pf = -1;
4629 }
4630 } 4254 }
4631 4255
4632 if (pf < 0) 4256 if (pf < 0)
4633 {
4634 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4257 Error_1 ("atom->string: bad base:", cadr (args));
4635 }
4636 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4258 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4637 { 4259 {
4638 char *p; 4260 char *p;
4639 int len; 4261 int len;
4640 4262
4641 atom2str (SCHEME_A_ x, (int) pf, &p, &len); 4263 atom2str (SCHEME_A_ x, pf, &p, &len);
4642 s_return (mk_counted_string (SCHEME_A_ p, len)); 4264 s_return (mk_counted_string (SCHEME_A_ p, len));
4643 } 4265 }
4644 else 4266 else
4645 {
4646 Error_1 ("atom->string: not an atom:", x); 4267 Error_1 ("atom->string: not an atom:", x);
4647 }
4648 } 4268 }
4649 4269
4650 case OP_MKSTRING: /* make-string */ 4270 case OP_MKSTRING: /* make-string */
4651 { 4271 {
4652 int fill = ' '; 4272 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4653 int len; 4273 int len = ivalue_unchecked (x);
4654 4274
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)); 4275 s_return (mk_empty_string (SCHEME_A_ len, fill));
4663 } 4276 }
4664 4277
4665 case OP_STRLEN: /* string-length */ 4278 case OP_STRLEN: /* string-length */
4666 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4279 s_return (mk_integer (SCHEME_A_ strlength (x)));
4667 4280
4668 case OP_STRREF: /* string-ref */ 4281 case OP_STRREF: /* string-ref */
4669 { 4282 {
4670 char *str; 4283 char *str = strvalue (x);
4671 int index;
4672
4673 str = strvalue (car (SCHEME_V->args));
4674
4675 index = ivalue (cadr (SCHEME_V->args)); 4284 int index = ivalue_unchecked (cadr (args));
4676 4285
4677 if (index >= strlength (car (SCHEME_V->args))) 4286 if (index >= strlength (x))
4678 {
4679 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4287 Error_1 ("string-ref: out of bounds:", cadr (args));
4680 }
4681 4288
4682 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4289 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4683 } 4290 }
4684 4291
4685 case OP_STRSET: /* string-set! */ 4292 case OP_STRSET: /* string-set! */
4686 { 4293 {
4687 char *str; 4294 char *str = strvalue (x);
4688 int index; 4295 int index = ivalue_unchecked (cadr (args));
4689 int c; 4296 int c;
4690 4297
4691 if (is_immutable (car (SCHEME_V->args))) 4298 if (is_immutable (x))
4692 {
4693 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4299 Error_1 ("string-set!: unable to alter immutable string:", x);
4694 }
4695 4300
4696 str = strvalue (car (SCHEME_V->args));
4697
4698 index = ivalue (cadr (SCHEME_V->args));
4699
4700 if (index >= strlength (car (SCHEME_V->args))) 4301 if (index >= strlength (x))
4701 {
4702 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4302 Error_1 ("string-set!: out of bounds:", cadr (args));
4703 }
4704 4303
4705 c = charvalue (caddr (SCHEME_V->args)); 4304 c = charvalue (caddr (args));
4706 4305
4707 str[index] = (char) c; 4306 str[index] = c;
4708 s_return (car (SCHEME_V->args)); 4307 s_return (car (args));
4709 } 4308 }
4710 4309
4711 case OP_STRAPPEND: /* string-append */ 4310 case OP_STRAPPEND: /* string-append */
4712 { 4311 {
4713 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4312 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4714 int len = 0; 4313 int len = 0;
4715 pointer newstr; 4314 pointer newstr;
4716 char *pos; 4315 char *pos;
4717 4316
4718 /* compute needed length for new string */ 4317 /* compute needed length for new string */
4719 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4318 for (x = args; x != NIL; x = cdr (x))
4720 {
4721 len += strlength (car (x)); 4319 len += strlength (car (x));
4722 }
4723 4320
4724 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4321 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4725 4322
4726 /* store the contents of the argument strings into the new string */ 4323 /* 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)) 4324 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))); 4325 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4730 }
4731 4326
4732 s_return (newstr); 4327 s_return (newstr);
4733 } 4328 }
4734 4329
4735 case OP_SUBSTR: /* substring */ 4330 case OP_SUBSTR: /* substring */
4736 { 4331 {
4737 char *str; 4332 char *str = strvalue (x);
4738 int index0; 4333 int index0 = ivalue_unchecked (cadr (args));
4739 int index1; 4334 int index1;
4740 int len; 4335 int len;
4741 4336
4742 str = strvalue (car (SCHEME_V->args));
4743
4744 index0 = ivalue (cadr (SCHEME_V->args));
4745
4746 if (index0 > strlength (car (SCHEME_V->args))) 4337 if (index0 > strlength (x))
4338 Error_1 ("substring: start out of bounds:", cadr (args));
4339
4340 if (cddr (args) != NIL)
4747 { 4341 {
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)); 4342 index1 = ivalue_unchecked (caddr (args));
4754 4343
4755 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4344 if (index1 > strlength (x) || index1 < index0)
4756 {
4757 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4345 Error_1 ("substring: end out of bounds:", caddr (args));
4758 }
4759 } 4346 }
4760 else 4347 else
4761 { 4348 index1 = strlength (x);
4762 index1 = strlength (car (SCHEME_V->args));
4763 }
4764 4349
4765 len = index1 - index0; 4350 len = index1 - index0;
4766 x = mk_empty_string (SCHEME_A_ len, ' '); 4351 x = mk_empty_string (SCHEME_A_ len, ' ');
4767 memcpy (strvalue (x), str + index0, len); 4352 memcpy (strvalue (x), str + index0, len);
4768 strvalue (x)[len] = 0; 4353 strvalue (x)[len] = 0;
… …
4772 4357
4773 case OP_VECTOR: /* vector */ 4358 case OP_VECTOR: /* vector */
4774 { 4359 {
4775 int i; 4360 int i;
4776 pointer vec; 4361 pointer vec;
4777 int len = list_length (SCHEME_A_ SCHEME_V->args); 4362 int len = list_length (SCHEME_A_ args);
4778 4363
4779 if (len < 0) 4364 if (len < 0)
4780 {
4781 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4365 Error_1 ("vector: not a proper list:", args);
4782 }
4783 4366
4784 vec = mk_vector (SCHEME_A_ len); 4367 vec = mk_vector (SCHEME_A_ len);
4785 4368
4786#if USE_ERROR_CHECKING 4369#if USE_ERROR_CHECKING
4787 if (SCHEME_V->no_memory) 4370 if (SCHEME_V->no_memory)
4788 s_return (S_SINK); 4371 s_return (S_SINK);
4789#endif 4372#endif
4790 4373
4791 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4374 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4792 set_vector_elem (vec, i, car (x)); 4375 vector_set (vec, i, car (x));
4793 4376
4794 s_return (vec); 4377 s_return (vec);
4795 } 4378 }
4796 4379
4797 case OP_MKVECTOR: /* make-vector */ 4380 case OP_MKVECTOR: /* make-vector */
4798 { 4381 {
4799 pointer fill = NIL; 4382 pointer fill = NIL;
4800 int len;
4801 pointer vec; 4383 pointer vec;
4384 int len = ivalue_unchecked (x);
4802 4385
4803 len = ivalue (car (SCHEME_V->args));
4804
4805 if (cdr (SCHEME_V->args) != NIL) 4386 if (cdr (args) != NIL)
4806 fill = cadr (SCHEME_V->args); 4387 fill = cadr (args);
4807 4388
4808 vec = mk_vector (SCHEME_A_ len); 4389 vec = mk_vector (SCHEME_A_ len);
4809 4390
4810#if USE_ERROR_CHECKING 4391#if USE_ERROR_CHECKING
4811 if (SCHEME_V->no_memory) 4392 if (SCHEME_V->no_memory)
4812 s_return (S_SINK); 4393 s_return (S_SINK);
4813#endif 4394#endif
4814 4395
4815 if (fill != NIL) 4396 if (fill != NIL)
4816 fill_vector (vec, fill); 4397 fill_vector (vec, 0, fill);
4817 4398
4818 s_return (vec); 4399 s_return (vec);
4819 } 4400 }
4820 4401
4821 case OP_VECLEN: /* vector-length */ 4402 case OP_VECLEN: /* vector-length */
4822 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4403 s_return (mk_integer (SCHEME_A_ veclength (x)));
4823 4404
4824 case OP_VECREF: /* vector-ref */ 4405 case OP_VECREF: /* vector-ref */
4825 { 4406 {
4826 int index;
4827
4828 index = ivalue (cadr (SCHEME_V->args)); 4407 int index = ivalue_unchecked (cadr (args));
4829 4408
4830 if (index >= ivalue (car (SCHEME_V->args))) 4409 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4831 {
4832 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4410 Error_1 ("vector-ref: out of bounds:", cadr (args));
4833 }
4834 4411
4835 s_return (vector_elem (car (SCHEME_V->args), index)); 4412 s_return (vector_get (x, index));
4836 } 4413 }
4837 4414
4838 case OP_VECSET: /* vector-set! */ 4415 case OP_VECSET: /* vector-set! */
4839 { 4416 {
4840 int index; 4417 int index = ivalue_unchecked (cadr (args));
4841 4418
4842 if (is_immutable (car (SCHEME_V->args))) 4419 if (is_immutable (x))
4843 {
4844 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4420 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4845 }
4846 4421
4847 index = ivalue (cadr (SCHEME_V->args)); 4422 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)); 4423 Error_1 ("vector-set!: out of bounds:", cadr (args));
4852 }
4853 4424
4854 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4425 vector_set (x, index, caddr (args));
4855 s_return (car (SCHEME_V->args)); 4426 s_return (x);
4856 } 4427 }
4857 } 4428 }
4858 4429
4859 return S_T; 4430 if (USE_ERROR_CHECKING) abort ();
4860} 4431}
4861 4432
4862INTERFACE int 4433static int
4863is_list (SCHEME_P_ pointer a) 4434opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4864{ 4435{
4865 return list_length (SCHEME_A_ a) >= 0; 4436 pointer x = SCHEME_V->args;
4866}
4867 4437
4868/* Result is: 4438 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 { 4439 {
4440 num v = nvalue (car (x));
4441 x = cdr (x);
4442
4884 if (fast == NIL) 4443 if (x == NIL)
4885 return i; 4444 break;
4886 4445
4887 if (!is_pair (fast)) 4446 int r = num_cmp (v, nvalue (car (x)));
4888 return -2 - i;
4889 4447
4890 fast = cdr (fast); 4448 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 { 4449 {
4908 /* the fast pointer has looped back around and caught up 4450 case OP_NUMEQ: r = r == 0; break;
4909 with the slow pointer, hence the structure is circular, 4451 case OP_LESS: r = r < 0; break;
4910 not of finite length, and therefore not a list */ 4452 case OP_GRE: r = r > 0; break;
4911 return -1; 4453 case OP_LEQ: r = r <= 0; break;
4454 case OP_GEQ: r = r >= 0; break;
4912 } 4455 }
4913 }
4914}
4915 4456
4457 if (!r)
4458 s_return (S_F);
4459 }
4460
4461 s_return (S_T);
4462}
4463
4916static pointer 4464static int
4917opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4465opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4918{ 4466{
4919 pointer x; 4467 pointer args = SCHEME_V->args;
4920 num v; 4468 pointer a = car (args);
4921 int (*comp_func) (num, num); 4469 pointer d = cdr (args);
4470 int r;
4922 4471
4923 switch (op) 4472 switch (op)
4924 { 4473 {
4925 case OP_NOT: /* not */ 4474 case OP_NOT: /* not */ r = is_false (a) ; break;
4926 s_retbool (is_false (car (SCHEME_V->args))); 4475 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4476 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4477 case OP_NULLP: /* null? */ r = a == NIL ; break;
4478 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4479 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4480 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4481 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4482 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4483 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4927 4484
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 4485#if USE_CHAR_CLASSIFIERS
4999 4486 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
5000 case OP_CHARAP: /* char-alphabetic? */ 4487 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
5001 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4488 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
5002 4489 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
5003 case OP_CHARNP: /* char-numeric? */ 4490 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 4491#endif
4492
5015#if USE_PORTS 4493#if USE_PORTS
5016 4494 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? */ 4495 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? */ 4496 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
5024 s_retbool (is_outport (car (SCHEME_V->args)));
5025#endif 4497#endif
5026 4498
5027 case OP_PROCP: /* procedure? */ 4499 case OP_PROCP: /* procedure? */
5028 4500
5029 /*-- 4501 /*--
5030 * continuation should be procedure by the example 4502 * continuation should be procedure by the example
5031 * (call-with-current-continuation procedure?) ==> #t 4503 * (call-with-current-continuation procedure?) ==> #t
5032 * in R^3 report sec. 6.9 4504 * in R^3 report sec. 6.9
5033 */ 4505 */
5034 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4506 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))); 4507 break;
5036 4508
5037 case OP_PAIRP: /* pair? */ 4509 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
5038 s_retbool (is_pair (car (SCHEME_V->args))); 4510 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
5039 4511 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
5040 case OP_LISTP: /* list? */ 4512 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
5041 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4513 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
5042 4514 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 } 4515 }
5055 4516
5056 return S_T; 4517 s_retbool (r);
5057} 4518}
5058 4519
5059static pointer 4520static int
5060opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4521opexe_4 (SCHEME_P_ enum scheme_opcodes op)
5061{ 4522{
4523 pointer args = SCHEME_V->args;
4524 pointer a = car (args);
5062 pointer x, y; 4525 pointer x, y;
5063 4526
5064 switch (op) 4527 switch (op)
5065 { 4528 {
5066 case OP_FORCE: /* force */ 4529 case OP_FORCE: /* force */
5067 SCHEME_V->code = car (SCHEME_V->args); 4530 SCHEME_V->code = a;
5068 4531
5069 if (is_promise (SCHEME_V->code)) 4532 if (is_promise (SCHEME_V->code))
5070 { 4533 {
5071 /* Should change type to closure here */ 4534 /* Should change type to closure here */
5072 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4535 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
5073 SCHEME_V->args = NIL; 4536 SCHEME_V->args = NIL;
5074 s_goto (OP_APPLY); 4537 s_goto (OP_APPLY);
5075 } 4538 }
5076 else 4539 else
5077 {
5078 s_return (SCHEME_V->code); 4540 s_return (SCHEME_V->code);
5079 }
5080 4541
5081 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4542 case OP_SAVE_FORCED: /* Save forced value replacing promise */
5082 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4543 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));
5083 s_return (SCHEME_V->value); 4544 s_return (SCHEME_V->value);
5084 4545
… …
5095 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4556 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5096 SCHEME_V->outport = cadr (SCHEME_V->args); 4557 SCHEME_V->outport = cadr (SCHEME_V->args);
5097 } 4558 }
5098 } 4559 }
5099 4560
5100 SCHEME_V->args = car (SCHEME_V->args); 4561 SCHEME_V->args = a;
5101 4562
5102 if (op == OP_WRITE) 4563 if (op == OP_WRITE)
5103 SCHEME_V->print_flag = 1; 4564 SCHEME_V->print_flag = 1;
5104 else 4565 else
5105 SCHEME_V->print_flag = 0; 4566 SCHEME_V->print_flag = 0;
5106 4567
5107 s_goto (OP_P0LIST); 4568 s_goto (OP_P0LIST);
5108 4569
5109 case OP_NEWLINE: /* newline */ 4570 case OP_NEWLINE: /* newline */
5110 if (is_pair (SCHEME_V->args)) 4571 if (is_pair (args))
5111 { 4572 {
5112 if (car (SCHEME_V->args) != SCHEME_V->outport) 4573 if (a != SCHEME_V->outport)
5113 { 4574 {
5114 x = cons (SCHEME_V->outport, NIL); 4575 x = cons (SCHEME_V->outport, NIL);
5115 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4576 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5116 SCHEME_V->outport = car (SCHEME_V->args); 4577 SCHEME_V->outport = a;
5117 } 4578 }
5118 } 4579 }
5119 4580
5120 putstr (SCHEME_A_ "\n"); 4581 putstr (SCHEME_A_ "\n");
5121 s_return (S_T); 4582 s_return (S_T);
5122#endif 4583#endif
5123 4584
5124 case OP_ERR0: /* error */ 4585 case OP_ERR0: /* error */
5125 SCHEME_V->retcode = -1; 4586 SCHEME_V->retcode = -1;
5126 4587
5127 if (!is_string (car (SCHEME_V->args))) 4588 if (!is_string (a))
5128 { 4589 {
5129 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4590 args = cons (mk_string (SCHEME_A_ " -- "), args);
5130 setimmutable (car (SCHEME_V->args)); 4591 setimmutable (car (args));
5131 } 4592 }
5132 4593
5133 putstr (SCHEME_A_ "Error: "); 4594 putstr (SCHEME_A_ "Error: ");
5134 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4595 putstr (SCHEME_A_ strvalue (car (args)));
5135 SCHEME_V->args = cdr (SCHEME_V->args); 4596 SCHEME_V->args = cdr (args);
5136 s_goto (OP_ERR1); 4597 s_goto (OP_ERR1);
5137 4598
5138 case OP_ERR1: /* error */ 4599 case OP_ERR1: /* error */
5139 putstr (SCHEME_A_ " "); 4600 putstr (SCHEME_A_ " ");
5140 4601
5141 if (SCHEME_V->args != NIL) 4602 if (args != NIL)
5142 { 4603 {
5143 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4604 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
5144 SCHEME_V->args = car (SCHEME_V->args); 4605 SCHEME_V->args = a;
5145 SCHEME_V->print_flag = 1; 4606 SCHEME_V->print_flag = 1;
5146 s_goto (OP_P0LIST); 4607 s_goto (OP_P0LIST);
5147 } 4608 }
5148 else 4609 else
5149 { 4610 {
5150 putstr (SCHEME_A_ "\n"); 4611 putstr (SCHEME_A_ "\n");
5151 4612
5152 if (SCHEME_V->interactive_repl) 4613 if (SCHEME_V->interactive_repl)
5153 {
5154 s_goto (OP_T0LVL); 4614 s_goto (OP_T0LVL);
5155 }
5156 else 4615 else
5157 {
5158 return NIL; 4616 return -1;
5159 }
5160 } 4617 }
5161 4618
5162 case OP_REVERSE: /* reverse */ 4619 case OP_REVERSE: /* reverse */
5163 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4620 s_return (reverse (SCHEME_A_ a));
5164 4621
5165 case OP_LIST_STAR: /* list* */ 4622 case OP_LIST_STAR: /* list* */
5166 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4623 s_return (list_star (SCHEME_A_ SCHEME_V->args));
5167 4624
5168 case OP_APPEND: /* append */ 4625 case OP_APPEND: /* append */
5169 x = NIL; 4626 x = NIL;
5170 y = SCHEME_V->args; 4627 y = args;
5171 4628
5172 if (y == x) 4629 if (y == x)
5173 s_return (x); 4630 s_return (x);
5174 4631
5175 /* cdr() in the while condition is not a typo. If car() */ 4632 /* cdr() in the while condition is not a typo. If car() */
… …
5186 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4643 s_return (reverse_in_place (SCHEME_A_ car (y), x));
5187 4644
5188#if USE_PLIST 4645#if USE_PLIST
5189 4646
5190 case OP_PUT: /* put */ 4647 case OP_PUT: /* put */
5191 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4648 if (!hasprop (a) || !hasprop (cadr (args)))
5192 {
5193 Error_0 ("illegal use of put"); 4649 Error_0 ("illegal use of put");
5194 }
5195 4650
5196 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4651 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5197 { 4652 {
5198 if (caar (x) == y) 4653 if (caar (x) == y)
5199 {
5200 break; 4654 break;
5201 }
5202 } 4655 }
5203 4656
5204 if (x != NIL) 4657 if (x != NIL)
5205 cdar (x) = caddr (SCHEME_V->args); 4658 cdar (x) = caddr (args);
5206 else 4659 else
5207 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4660 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5208 4661
5209 s_return (S_T); 4662 s_return (S_T);
5210 4663
5211 case OP_GET: /* get */ 4664 case OP_GET: /* get */
5212 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4665 if (!hasprop (a) || !hasprop (cadr (args)))
5213 Error_0 ("illegal use of get"); 4666 Error_0 ("illegal use of get");
5214 4667
5215 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4668 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5216 if (caar (x) == y) 4669 if (caar (x) == y)
5217 break; 4670 break;
5218 4671
5219 if (x != NIL) 4672 if (x != NIL)
5220 s_return (cdar (x)); 4673 s_return (cdar (x));
… …
5222 s_return (NIL); 4675 s_return (NIL);
5223 4676
5224#endif /* USE_PLIST */ 4677#endif /* USE_PLIST */
5225 4678
5226 case OP_QUIT: /* quit */ 4679 case OP_QUIT: /* quit */
5227 if (is_pair (SCHEME_V->args)) 4680 if (is_pair (args))
5228 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4681 SCHEME_V->retcode = ivalue (a);
5229 4682
5230 return NIL; 4683 return -1;
5231 4684
5232 case OP_GC: /* gc */ 4685 case OP_GC: /* gc */
5233 gc (SCHEME_A_ NIL, NIL); 4686 gc (SCHEME_A_ NIL, NIL);
5234 s_return (S_T); 4687 s_return (S_T);
5235 4688
5236 case OP_GCVERB: /* gc-verbose */ 4689 case OP_GCVERB: /* gc-verbose */
5237 { 4690 {
5238 int was = SCHEME_V->gc_verbose; 4691 int was = SCHEME_V->gc_verbose;
5239 4692
5240 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4693 SCHEME_V->gc_verbose = (a != S_F);
5241 s_retbool (was); 4694 s_retbool (was);
5242 } 4695 }
5243 4696
5244 case OP_NEWSEGMENT: /* new-segment */ 4697 case OP_NEWSEGMENT: /* new-segment */
5245 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4698 if (!is_pair (args) || !is_number (a))
5246 Error_0 ("new-segment: argument must be a number"); 4699 Error_0 ("new-segment: argument must be a number");
5247 4700
5248 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4701 alloc_cellseg (SCHEME_A_ ivalue (a));
5249 4702
5250 s_return (S_T); 4703 s_return (S_T);
5251 4704
5252 case OP_OBLIST: /* oblist */ 4705 case OP_OBLIST: /* oblist */
5253 s_return (oblist_all_symbols (SCHEME_A)); 4706 s_return (oblist_all_symbols (SCHEME_A));
… …
5280 case OP_OPEN_INOUTFILE: 4733 case OP_OPEN_INOUTFILE:
5281 prop = port_input | port_output; 4734 prop = port_input | port_output;
5282 break; 4735 break;
5283 } 4736 }
5284 4737
5285 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4738 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5286 4739
5287 if (p == NIL) 4740 s_return (p == NIL ? S_F : p);
5288 {
5289 s_return (S_F);
5290 }
5291
5292 s_return (p);
5293 } 4741 }
5294 4742
5295# if USE_STRING_PORTS 4743# if USE_STRING_PORTS
5296 4744
5297 case OP_OPEN_INSTRING: /* open-input-string */ 4745 case OP_OPEN_INSTRING: /* open-input-string */
… …
5309 case OP_OPEN_INOUTSTRING: 4757 case OP_OPEN_INOUTSTRING:
5310 prop = port_input | port_output; 4758 prop = port_input | port_output;
5311 break; 4759 break;
5312 } 4760 }
5313 4761
5314 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4762 p = port_from_string (SCHEME_A_ strvalue (a),
5315 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4763 strvalue (a) + strlength (a), prop);
5316 4764
5317 if (p == NIL) 4765 s_return (p == NIL ? S_F : p);
5318 {
5319 s_return (S_F);
5320 }
5321
5322 s_return (p);
5323 } 4766 }
5324 4767
5325 case OP_OPEN_OUTSTRING: /* open-output-string */ 4768 case OP_OPEN_OUTSTRING: /* open-output-string */
5326 { 4769 {
5327 pointer p; 4770 pointer p;
5328 4771
5329 if (car (SCHEME_V->args) == NIL) 4772 if (a == NIL)
5330 {
5331 p = port_from_scratch (SCHEME_A); 4773 p = port_from_scratch (SCHEME_A);
5332
5333 if (p == NIL)
5334 {
5335 s_return (S_F);
5336 }
5337 }
5338 else 4774 else
5339 {
5340 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4775 p = port_from_string (SCHEME_A_ strvalue (a),
5341 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4776 strvalue (a) + strlength (a), port_output);
5342 4777
5343 if (p == NIL) 4778 s_return (p == NIL ? S_F : p);
5344 {
5345 s_return (S_F);
5346 }
5347 }
5348
5349 s_return (p);
5350 } 4779 }
5351 4780
5352 case OP_GET_OUTSTRING: /* get-output-string */ 4781 case OP_GET_OUTSTRING: /* get-output-string */
5353 { 4782 {
5354 port *p; 4783 port *p;
5355 4784
5356 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4785 if ((p = a->object.port)->kind & port_string)
5357 { 4786 {
5358 off_t size; 4787 off_t size;
5359 char *str; 4788 char *str;
5360 4789
5361 size = p->rep.string.curr - p->rep.string.start + 1; 4790 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5377 } 4806 }
5378 4807
5379# endif 4808# endif
5380 4809
5381 case OP_CLOSE_INPORT: /* close-input-port */ 4810 case OP_CLOSE_INPORT: /* close-input-port */
5382 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4811 port_close (SCHEME_A_ a, port_input);
5383 s_return (S_T); 4812 s_return (S_T);
5384 4813
5385 case OP_CLOSE_OUTPORT: /* close-output-port */ 4814 case OP_CLOSE_OUTPORT: /* close-output-port */
5386 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4815 port_close (SCHEME_A_ a, port_output);
5387 s_return (S_T); 4816 s_return (S_T);
5388#endif 4817#endif
5389 4818
5390 case OP_INT_ENV: /* interaction-environment */ 4819 case OP_INT_ENV: /* interaction-environment */
5391 s_return (SCHEME_V->global_env); 4820 s_return (SCHEME_V->global_env);
… …
5393 case OP_CURR_ENV: /* current-environment */ 4822 case OP_CURR_ENV: /* current-environment */
5394 s_return (SCHEME_V->envir); 4823 s_return (SCHEME_V->envir);
5395 4824
5396 } 4825 }
5397 4826
5398 return S_T; 4827 if (USE_ERROR_CHECKING) abort ();
5399} 4828}
5400 4829
5401static pointer 4830static int
5402opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4831opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5403{ 4832{
4833 pointer args = SCHEME_V->args;
5404 pointer x; 4834 pointer x;
5405 4835
5406 if (SCHEME_V->nesting != 0) 4836 if (SCHEME_V->nesting != 0)
5407 { 4837 {
5408 int n = SCHEME_V->nesting; 4838 int n = SCHEME_V->nesting;
… …
5415 switch (op) 4845 switch (op)
5416 { 4846 {
5417 /* ========== reading part ========== */ 4847 /* ========== reading part ========== */
5418#if USE_PORTS 4848#if USE_PORTS
5419 case OP_READ: 4849 case OP_READ:
5420 if (!is_pair (SCHEME_V->args)) 4850 if (!is_pair (args))
5421 {
5422 s_goto (OP_READ_INTERNAL); 4851 s_goto (OP_READ_INTERNAL);
5423 }
5424 4852
5425 if (!is_inport (car (SCHEME_V->args))) 4853 if (!is_inport (car (args)))
5426 {
5427 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4854 Error_1 ("read: not an input port:", car (args));
5428 }
5429 4855
5430 if (car (SCHEME_V->args) == SCHEME_V->inport) 4856 if (car (args) == SCHEME_V->inport)
5431 {
5432 s_goto (OP_READ_INTERNAL); 4857 s_goto (OP_READ_INTERNAL);
5433 }
5434 4858
5435 x = SCHEME_V->inport; 4859 x = SCHEME_V->inport;
5436 SCHEME_V->inport = car (SCHEME_V->args); 4860 SCHEME_V->inport = car (args);
5437 x = cons (x, NIL); 4861 x = cons (x, NIL);
5438 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4862 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5439 s_goto (OP_READ_INTERNAL); 4863 s_goto (OP_READ_INTERNAL);
5440 4864
5441 case OP_READ_CHAR: /* read-char */ 4865 case OP_READ_CHAR: /* read-char */
5442 case OP_PEEK_CHAR: /* peek-char */ 4866 case OP_PEEK_CHAR: /* peek-char */
5443 { 4867 {
5444 int c; 4868 int c;
5445 4869
5446 if (is_pair (SCHEME_V->args)) 4870 if (is_pair (args))
5447 { 4871 {
5448 if (car (SCHEME_V->args) != SCHEME_V->inport) 4872 if (car (args) != SCHEME_V->inport)
5449 { 4873 {
5450 x = SCHEME_V->inport; 4874 x = SCHEME_V->inport;
5451 x = cons (x, NIL); 4875 x = cons (x, NIL);
5452 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4876 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5453 SCHEME_V->inport = car (SCHEME_V->args); 4877 SCHEME_V->inport = car (args);
5454 } 4878 }
5455 } 4879 }
5456 4880
5457 c = inchar (SCHEME_A); 4881 c = inchar (SCHEME_A);
5458 4882
… …
5468 case OP_CHAR_READY: /* char-ready? */ 4892 case OP_CHAR_READY: /* char-ready? */
5469 { 4893 {
5470 pointer p = SCHEME_V->inport; 4894 pointer p = SCHEME_V->inport;
5471 int res; 4895 int res;
5472 4896
5473 if (is_pair (SCHEME_V->args)) 4897 if (is_pair (args))
5474 {
5475 p = car (SCHEME_V->args); 4898 p = car (args);
5476 }
5477 4899
5478 res = p->object.port->kind & port_string; 4900 res = p->object.port->kind & port_string;
5479 4901
5480 s_retbool (res); 4902 s_retbool (res);
5481 } 4903 }
5482 4904
5483 case OP_SET_INPORT: /* set-input-port */ 4905 case OP_SET_INPORT: /* set-input-port */
5484 SCHEME_V->inport = car (SCHEME_V->args); 4906 SCHEME_V->inport = car (args);
5485 s_return (SCHEME_V->value); 4907 s_return (SCHEME_V->value);
5486 4908
5487 case OP_SET_OUTPORT: /* set-output-port */ 4909 case OP_SET_OUTPORT: /* set-output-port */
5488 SCHEME_V->outport = car (SCHEME_V->args); 4910 SCHEME_V->outport = car (args);
5489 s_return (SCHEME_V->value); 4911 s_return (SCHEME_V->value);
5490#endif 4912#endif
5491 4913
5492 case OP_RDSEXPR: 4914 case OP_RDSEXPR:
5493 switch (SCHEME_V->tok) 4915 switch (SCHEME_V->tok)
… …
5496 s_return (S_EOF); 4918 s_return (S_EOF);
5497 /* NOTREACHED */ 4919 /* NOTREACHED */
5498 4920
5499 case TOK_VEC: 4921 case TOK_VEC:
5500 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 4922 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5501
5502 /* fall through */ 4923 /* fall through */
4924
5503 case TOK_LPAREN: 4925 case TOK_LPAREN:
5504 SCHEME_V->tok = token (SCHEME_A); 4926 SCHEME_V->tok = token (SCHEME_A);
5505 4927
5506 if (SCHEME_V->tok == TOK_RPAREN) 4928 if (SCHEME_V->tok == TOK_RPAREN)
5507 s_return (NIL); 4929 s_return (NIL);
… …
5527 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 4949 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5528 SCHEME_V->tok = TOK_LPAREN; 4950 SCHEME_V->tok = TOK_LPAREN;
5529 s_goto (OP_RDSEXPR); 4951 s_goto (OP_RDSEXPR);
5530 } 4952 }
5531 else 4953 else
5532 {
5533 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 4954 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5534 }
5535 4955
5536 s_goto (OP_RDSEXPR); 4956 s_goto (OP_RDSEXPR);
5537 4957
5538 case TOK_COMMA: 4958 case TOK_COMMA:
5539 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 4959 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
… …
5581 } 5001 }
5582 5002
5583 break; 5003 break;
5584 5004
5585 case OP_RDLIST: 5005 case OP_RDLIST:
5586 {
5587 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5006 SCHEME_V->args = cons (SCHEME_V->value, args);
5588 SCHEME_V->tok = token (SCHEME_A); 5007 SCHEME_V->tok = token (SCHEME_A);
5589 5008
5590 if (SCHEME_V->tok == TOK_EOF) 5009 switch (SCHEME_V->tok)
5010 {
5011 case TOK_EOF:
5591 s_return (S_EOF); 5012 s_return (S_EOF);
5592 else if (SCHEME_V->tok == TOK_RPAREN) 5013
5014 case TOK_RPAREN:
5593 { 5015 {
5594 int c = inchar (SCHEME_A); 5016 int c = inchar (SCHEME_A);
5595 5017
5596 if (c != '\n') 5018 if (c != '\n')
5597 backchar (SCHEME_A_ c); 5019 backchar (SCHEME_A_ c);
5598
5599#if SHOW_ERROR_LINE 5020#if SHOW_ERROR_LINE
5600 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 5021 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++; 5022 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++;
5602
5603#endif 5023#endif
5024
5604 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5025 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5605 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args)); 5026 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args));
5606 } 5027 }
5607 else if (SCHEME_V->tok == TOK_DOT) 5028
5608 { 5029 case TOK_DOT:
5609 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL); 5030 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL);
5610 SCHEME_V->tok = token (SCHEME_A); 5031 SCHEME_V->tok = token (SCHEME_A);
5611 s_goto (OP_RDSEXPR); 5032 s_goto (OP_RDSEXPR);
5612 } 5033
5613 else 5034 default:
5614 {
5615 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);; 5035 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);
5616 s_goto (OP_RDSEXPR); 5036 s_goto (OP_RDSEXPR);
5617 } 5037 }
5618 }
5619 5038
5620 case OP_RDDOT: 5039 case OP_RDDOT:
5621 if (token (SCHEME_A) != TOK_RPAREN) 5040 if (token (SCHEME_A) != TOK_RPAREN)
5622 Error_0 ("syntax error: illegal dot expression"); 5041 Error_0 ("syntax error: illegal dot expression");
5623 else 5042
5624 {
5625 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5043 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5626 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5044 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5627 }
5628 5045
5629 case OP_RDQUOTE: 5046 case OP_RDQUOTE:
5630 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5047 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5631 5048
5632 case OP_RDQQUOTE: 5049 case OP_RDQQUOTE:
… …
5654 SCHEME_V->args = SCHEME_V->value; 5071 SCHEME_V->args = SCHEME_V->value;
5655 s_goto (OP_VECTOR); 5072 s_goto (OP_VECTOR);
5656 5073
5657 /* ========== printing part ========== */ 5074 /* ========== printing part ========== */
5658 case OP_P0LIST: 5075 case OP_P0LIST:
5659 if (is_vector (SCHEME_V->args)) 5076 if (is_vector (args))
5660 { 5077 {
5661 putstr (SCHEME_A_ "#("); 5078 putstr (SCHEME_A_ "#(");
5662 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5079 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5663 s_goto (OP_PVECFROM); 5080 s_goto (OP_PVECFROM);
5664 } 5081 }
5665 else if (is_environment (SCHEME_V->args)) 5082 else if (is_environment (args))
5666 { 5083 {
5667 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5084 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5668 s_return (S_T); 5085 s_return (S_T);
5669 } 5086 }
5670 else if (!is_pair (SCHEME_V->args)) 5087 else if (!is_pair (args))
5671 { 5088 {
5672 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5089 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5673 s_return (S_T); 5090 s_return (S_T);
5674 } 5091 }
5675 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5092 else
5676 { 5093 {
5094 pointer a = car (args);
5095 pointer b = cdr (args);
5096 int ok_abbr = ok_abbrev (b);
5097 SCHEME_V->args = car (b);
5098
5099 if (a == SCHEME_V->QUOTE && ok_abbr)
5677 putstr (SCHEME_A_ "'"); 5100 putstr (SCHEME_A_ "'");
5678 SCHEME_V->args = cadr (SCHEME_V->args); 5101 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5102 putstr (SCHEME_A_ "`");
5103 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ ",");
5105 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5106 putstr (SCHEME_A_ ",@");
5107 else
5108 {
5109 putstr (SCHEME_A_ "(");
5110 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5111 SCHEME_V->args = a;
5112 }
5113
5679 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5680 } 5115 }
5681 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5116
5117 case OP_P1LIST:
5118 if (is_pair (args))
5682 { 5119 {
5120 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5683 putstr (SCHEME_A_ "`"); 5121 putstr (SCHEME_A_ " ");
5684 SCHEME_V->args = cadr (SCHEME_V->args); 5122 SCHEME_V->args = car (args);
5685 s_goto (OP_P0LIST); 5123 s_goto (OP_P0LIST);
5686 } 5124 }
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)) 5125 else if (is_vector (args))
5716 { 5126 {
5717 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5127 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5718 putstr (SCHEME_A_ " . "); 5128 putstr (SCHEME_A_ " . ");
5719 s_goto (OP_P0LIST); 5129 s_goto (OP_P0LIST);
5720 } 5130 }
5721 else 5131 else
5722 { 5132 {
5723 if (SCHEME_V->args != NIL) 5133 if (args != NIL)
5724 { 5134 {
5725 putstr (SCHEME_A_ " . "); 5135 putstr (SCHEME_A_ " . ");
5726 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5136 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5727 } 5137 }
5728 5138
5729 putstr (SCHEME_A_ ")"); 5139 putstr (SCHEME_A_ ")");
5730 s_return (S_T); 5140 s_return (S_T);
5731 } 5141 }
5732 5142
5733 case OP_PVECFROM: 5143 case OP_PVECFROM:
5734 { 5144 {
5735 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5145 int i = ivalue_unchecked (cdr (args));
5736 pointer vec = car (SCHEME_V->args); 5146 pointer vec = car (args);
5737 int len = ivalue_unchecked (vec); 5147 int len = veclength (vec);
5738 5148
5739 if (i == len) 5149 if (i == len)
5740 { 5150 {
5741 putstr (SCHEME_A_ ")"); 5151 putstr (SCHEME_A_ ")");
5742 s_return (S_T); 5152 s_return (S_T);
5743 } 5153 }
5744 else 5154 else
5745 { 5155 {
5746 pointer elem = vector_elem (vec, i); 5156 pointer elem = vector_get (vec, i);
5747 5157
5748 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5158 ivalue_unchecked (cdr (args)) = i + 1;
5749 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5159 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5750 SCHEME_V->args = elem; 5160 SCHEME_V->args = elem;
5751 5161
5752 if (i > 0) 5162 if (i > 0)
5753 putstr (SCHEME_A_ " "); 5163 putstr (SCHEME_A_ " ");
5754 5164
5755 s_goto (OP_P0LIST); 5165 s_goto (OP_P0LIST);
5756 } 5166 }
5757 } 5167 }
5758 } 5168 }
5759 5169
5760 return S_T; 5170 if (USE_ERROR_CHECKING) abort ();
5761} 5171}
5762 5172
5763static pointer 5173static int
5764opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5174opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5765{ 5175{
5176 pointer args = SCHEME_V->args;
5177 pointer a = car (args);
5766 pointer x, y; 5178 pointer x, y;
5767 5179
5768 switch (op) 5180 switch (op)
5769 { 5181 {
5770 case OP_LIST_LENGTH: /* length *//* a.k */ 5182 case OP_LIST_LENGTH: /* length *//* a.k */
5771 { 5183 {
5772 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5184 long v = list_length (SCHEME_A_ a);
5773 5185
5774 if (v < 0) 5186 if (v < 0)
5775 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5187 Error_1 ("length: not a list:", a);
5776 5188
5777 s_return (mk_integer (SCHEME_A_ v)); 5189 s_return (mk_integer (SCHEME_A_ v));
5778 } 5190 }
5779 5191
5780 case OP_ASSQ: /* assq *//* a.k */ 5192 case OP_ASSQ: /* assq *//* a.k */
5781 x = car (SCHEME_V->args); 5193 x = a;
5782 5194
5783 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5195 for (y = cadr (args); is_pair (y); y = cdr (y))
5784 { 5196 {
5785 if (!is_pair (car (y))) 5197 if (!is_pair (car (y)))
5786 Error_0 ("unable to handle non pair element"); 5198 Error_0 ("unable to handle non pair element");
5787 5199
5788 if (x == caar (y)) 5200 if (x == caar (y))
… …
5794 else 5206 else
5795 s_return (S_F); 5207 s_return (S_F);
5796 5208
5797 5209
5798 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5210 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5799 SCHEME_V->args = car (SCHEME_V->args); 5211 SCHEME_V->args = a;
5800 5212
5801 if (SCHEME_V->args == NIL) 5213 if (SCHEME_V->args == NIL)
5802 s_return (S_F); 5214 s_return (S_F);
5803 else if (is_closure (SCHEME_V->args)) 5215 else if (is_closure (SCHEME_V->args))
5804 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5216 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5810 case OP_CLOSUREP: /* closure? */ 5222 case OP_CLOSUREP: /* closure? */
5811 /* 5223 /*
5812 * Note, macro object is also a closure. 5224 * Note, macro object is also a closure.
5813 * Therefore, (closure? <#MACRO>) ==> #t 5225 * Therefore, (closure? <#MACRO>) ==> #t
5814 */ 5226 */
5815 s_retbool (is_closure (car (SCHEME_V->args))); 5227 s_retbool (is_closure (a));
5816 5228
5817 case OP_MACROP: /* macro? */ 5229 case OP_MACROP: /* macro? */
5818 s_retbool (is_macro (car (SCHEME_V->args))); 5230 s_retbool (is_macro (a));
5819 } 5231 }
5820 5232
5821 return S_T; /* NOTREACHED */ 5233 if (USE_ERROR_CHECKING) abort ();
5822} 5234}
5823 5235
5236/* 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); 5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5825 5238
5826typedef int (*test_predicate) (pointer); 5239typedef int (*test_predicate)(pointer);
5827static int 5240static int
5828is_any (pointer p) 5241tst_any (pointer p)
5829{ 5242{
5830 return 1; 5243 return 1;
5831} 5244}
5832 5245
5833static int 5246static int
5834is_nonneg (pointer p) 5247tst_inonneg (pointer p)
5835{ 5248{
5836 return ivalue (p) >= 0 && is_integer (p); 5249 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250}
5251
5252static int
5253tst_is_list (SCHEME_P_ pointer p)
5254{
5255 return p == NIL || is_pair (p);
5837} 5256}
5838 5257
5839/* Correspond carefully with following defines! */ 5258/* Correspond carefully with following defines! */
5840static struct 5259static struct
5841{ 5260{
5842 test_predicate fct; 5261 test_predicate fct;
5843 const char *kind; 5262 const char *kind;
5844} tests[] = 5263} tests[] = {
5845{ 5264 { tst_any , 0 },
5846 { 0, 0}, /* unused */ 5265 { is_string , "string" },
5847 { is_any, 0}, 5266 { is_symbol , "symbol" },
5848 { is_string, "string" }, 5267 { is_port , "port" },
5849 { is_symbol, "symbol" },
5850 { is_port, "port" },
5851 { is_inport, "input port" }, 5268 { is_inport , "input port" },
5852 { is_outport, "output port" }, 5269 { is_outport , "output port" },
5853 { is_environment, "environment" }, 5270 { is_environment, "environment" },
5854 { is_pair, "pair" }, 5271 { is_pair , "pair" },
5855 { 0, "pair or '()" }, 5272 { 0 , "pair or '()" },
5856 { is_character, "character" }, 5273 { is_character , "character" },
5857 { is_vector, "vector" }, 5274 { is_vector , "vector" },
5858 { is_number, "number" }, 5275 { is_number , "number" },
5859 { is_integer, "integer" }, 5276 { is_integer , "integer" },
5860 { is_nonneg, "non-negative integer" } 5277 { tst_inonneg , "non-negative integer" }
5861}; 5278};
5862 5279
5863#define TST_NONE 0 5280#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5864#define TST_ANY "\001" 5281#define TST_ANY "\001"
5865#define TST_STRING "\002" 5282#define TST_STRING "\002"
5866#define TST_SYMBOL "\003" 5283#define TST_SYMBOL "\003"
5867#define TST_PORT "\004" 5284#define TST_PORT "\004"
5868#define TST_INPORT "\005" 5285#define TST_INPORT "\005"
5869#define TST_OUTPORT "\006" 5286#define TST_OUTPORT "\006"
5870#define TST_ENVIRONMENT "\007" 5287#define TST_ENVIRONMENT "\007"
5871#define TST_PAIR "\010" 5288#define TST_PAIR "\010"
5872#define TST_LIST "\011" 5289#define TST_LIST "\011"
5873#define TST_CHAR "\012" 5290#define TST_CHAR "\012"
5874#define TST_VECTOR "\013" 5291#define TST_VECTOR "\013"
5875#define TST_NUMBER "\014" 5292#define TST_NUMBER "\014"
5876#define TST_INTEGER "\015" 5293#define TST_INTEGER "\015"
5877#define TST_NATURAL "\016" 5294#define TST_NATURAL "\016"
5295
5296#define INF_ARG 0xff
5297#define UNNAMED_OP ""
5298
5299static const char opnames[] =
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h"
5302#undef OP_DEF
5303;
5304
5305static const char *
5306opname (int idx)
5307{
5308 const char *name = opnames;
5309
5310 /* should do this at compile time, but would require external program, right? */
5311 while (idx--)
5312 name += strlen (name) + 1;
5313
5314 return *name ? name : "ILLEGAL";
5315}
5316
5317static const char *
5318procname (pointer x)
5319{
5320 return opname (procnum (x));
5321}
5878 5322
5879typedef struct 5323typedef struct
5880{ 5324{
5881 dispatch_func func; 5325 uint8_t func;
5882 char *name; 5326 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5327 uint8_t builtin;
5328#if USE_ERROR_CHECKING
5883 int min_arity; 5329 uint8_t min_arity;
5884 int max_arity; 5330 uint8_t max_arity;
5885 char *arg_tests_encoding; 5331 char arg_tests_encoding[3];
5332#endif
5886} op_code_info; 5333} op_code_info;
5887 5334
5888#define INF_ARG 0xffff
5889
5890static op_code_info dispatch_table[] = { 5335static const op_code_info dispatch_table[] = {
5891#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5336#if USE_ERROR_CHECKING
5337#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5338#else
5339#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5340#endif
5892#include "opdefines.h" 5341#include "opdefines.h"
5342#undef OP_DEF
5893 {0} 5343 {0}
5894}; 5344};
5895 5345
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 */ 5346/* kernel of this interpreter */
5911static void 5347static void ecb_hot
5912Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5913{ 5349{
5914 SCHEME_V->op = op; 5350 SCHEME_V->op = op;
5915 5351
5916 for (;;) 5352 for (;;)
5917 { 5353 {
5918 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5354 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5919 5355
5356#if USE_ERROR_CHECKING
5920 if (pcd->name != 0) /* if built-in function, check arguments */ 5357 if (pcd->builtin) /* if built-in function, check arguments */
5921 { 5358 {
5922 char msg[STRBUFFSIZE]; 5359 char msg[STRBUFFSIZE];
5923 int ok = 1;
5924 int n = list_length (SCHEME_A_ SCHEME_V->args); 5360 int n = list_length (SCHEME_A_ SCHEME_V->args);
5925 5361
5926#if USE_ERROR_CHECKING
5927 /* Check number of arguments */ 5362 /* Check number of arguments */
5928 if (n < pcd->min_arity) 5363 if (ecb_expect_false (n < pcd->min_arity))
5929 { 5364 {
5930 ok = 0;
5931 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5365 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5932 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5366 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5367 xError_1 (SCHEME_A_ msg, 0);
5368 continue;
5933 } 5369 }
5934 5370 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5935 if (ok && n > pcd->max_arity)
5936 { 5371 {
5937 ok = 0;
5938 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5372 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5939 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5373 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5374 xError_1 (SCHEME_A_ msg, 0);
5375 continue;
5940 } 5376 }
5941#endif 5377 else
5942
5943 if (ok)
5944 { 5378 {
5945 if (pcd->arg_tests_encoding != 0) 5379 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5946 { 5380 {
5947 int i = 0; 5381 int i = 0;
5948 int j; 5382 int j;
5949 const char *t = pcd->arg_tests_encoding; 5383 const char *t = pcd->arg_tests_encoding;
5950 pointer arglist = SCHEME_V->args; 5384 pointer arglist = SCHEME_V->args;
5951 5385
5952 do 5386 do
5953 { 5387 {
5954 pointer arg = car (arglist); 5388 pointer arg = car (arglist);
5955 5389
5956 j = (int) t[0]; 5390 j = t[0];
5957 5391
5392 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5958 if (j == TST_LIST[0]) 5393 if (j == TST_LIST[0])
5959 { 5394 {
5960 if (arg != NIL && !is_pair (arg)) 5395 if (!tst_is_list (SCHEME_A_ arg))
5961 break; 5396 break;
5962 } 5397 }
5963 else 5398 else
5964 { 5399 {
5965 if (!tests[j].fct (arg)) 5400 if (!tests[j - 1].fct (arg))
5966 break; 5401 break;
5967 } 5402 }
5968 5403
5969 if (t[1] != 0) /* last test is replicated as necessary */ 5404 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5970 {
5971 t++; 5405 t++;
5972 }
5973 5406
5974 arglist = cdr (arglist); 5407 arglist = cdr (arglist);
5975 i++; 5408 i++;
5976 } 5409 }
5977 while (i < n); 5410 while (i < n);
5978 5411
5979#if USE_ERROR_CHECKING
5980 if (i < n) 5412 if (i < n)
5981 { 5413 {
5982 ok = 0;
5983 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5414 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5415 xError_1 (SCHEME_A_ msg, 0);
5416 continue;
5984 } 5417 }
5985#endif
5986 } 5418 }
5987 } 5419 }
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 } 5420 }
5421#endif
5997 5422
5998 ok_to_freely_gc (SCHEME_A); 5423 ok_to_freely_gc (SCHEME_A);
5999 5424
6000 if (pcd->func (SCHEME_A_ (enum scheme_opcodes) SCHEME_V->op) == NIL) 5425 static const dispatch_func dispatch_funcs[] = {
5426 opexe_0,
5427 opexe_1,
5428 opexe_2,
5429 opexe_3,
5430 opexe_4,
5431 opexe_5,
5432 opexe_6,
5433 };
5434
5435 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
6001 return; 5436 return;
6002 5437
6003#if USE_ERROR_CHECKING 5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
6004 if (SCHEME_V->no_memory)
6005 { 5439 {
6006 xwrstr ("No memory!\n"); 5440 xwrstr ("No memory!\n");
6007 return; 5441 return;
6008 } 5442 }
6009#endif
6010 } 5443 }
6011} 5444}
6012 5445
6013/* ========== Initialization of internal keywords ========== */ 5446/* ========== Initialization of internal keywords ========== */
6014 5447
6015static void 5448static void
6016assign_syntax (SCHEME_P_ char *name) 5449assign_syntax (SCHEME_P_ const char *name)
6017{ 5450{
6018 pointer x = oblist_add_by_name (SCHEME_A_ name); 5451 pointer x = oblist_add_by_name (SCHEME_A_ name);
6019 set_typeflag (x, typeflag (x) | T_SYNTAX); 5452 set_typeflag (x, typeflag (x) | T_SYNTAX);
6020} 5453}
6021 5454
6022static void 5455static void
6023assign_proc (SCHEME_P_ enum scheme_opcodes op, char *name) 5456assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
6024{ 5457{
6025 pointer x = mk_symbol (SCHEME_A_ name); 5458 pointer x = mk_symbol (SCHEME_A_ name);
6026 pointer y = mk_proc (SCHEME_A_ op); 5459 pointer y = mk_proc (SCHEME_A_ op);
6027 new_slot_in_env (SCHEME_A_ x, y); 5460 new_slot_in_env (SCHEME_A_ x, y);
6028} 5461}
… …
6030static pointer 5463static pointer
6031mk_proc (SCHEME_P_ enum scheme_opcodes op) 5464mk_proc (SCHEME_P_ enum scheme_opcodes op)
6032{ 5465{
6033 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5466 pointer y = get_cell (SCHEME_A_ NIL, NIL);
6034 set_typeflag (y, (T_PROC | T_ATOM)); 5467 set_typeflag (y, (T_PROC | T_ATOM));
6035 ivalue_unchecked (y) = (long) op; 5468 ivalue_unchecked (y) = op;
6036 set_num_integer (y);
6037 return y; 5469 return y;
6038} 5470}
6039 5471
6040/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5472/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
6041static int 5473static int
… …
6065 5497
6066 case 'd': 5498 case 'd':
6067 return OP_COND0; /* cond */ 5499 return OP_COND0; /* cond */
6068 5500
6069 case '*': 5501 case '*':
6070 return OP_LET0AST; /* let* */ 5502 return OP_LET0AST;/* let* */
6071 5503
6072 default: 5504 default:
6073 return OP_SET0; /* set! */ 5505 return OP_SET0; /* set! */
6074 } 5506 }
6075 5507
… …
6097 5529
6098 case 'f': 5530 case 'f':
6099 return OP_DEF0; /* define */ 5531 return OP_DEF0; /* define */
6100 5532
6101 default: 5533 default:
6102 return OP_LET0REC; /* letrec */ 5534 return OP_LET0REC;/* letrec */
6103 } 5535 }
6104 5536
6105 default: 5537 default:
6106 return OP_C0STREAM; /* cons-stream */ 5538 return OP_C0STREAM; /* cons-stream */
6107 } 5539 }
6108} 5540}
6109 5541
6110#if USE_MULTIPLICITY 5542#if USE_MULTIPLICITY
6111scheme * 5543ecb_cold scheme *
6112scheme_init_new () 5544scheme_init_new ()
6113{ 5545{
6114 scheme *sc = malloc (sizeof (scheme)); 5546 scheme *sc = malloc (sizeof (scheme));
6115 5547
6116 if (!scheme_init (SCHEME_A)) 5548 if (!scheme_init (SCHEME_A))
… …
6121 else 5553 else
6122 return sc; 5554 return sc;
6123} 5555}
6124#endif 5556#endif
6125 5557
6126int 5558ecb_cold int
6127scheme_init (SCHEME_P) 5559scheme_init (SCHEME_P)
6128{ 5560{
6129 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
6130 pointer x; 5562 pointer x;
6131 5563
… …
6158 } 5590 }
6159 5591
6160 SCHEME_V->gc_verbose = 0; 5592 SCHEME_V->gc_verbose = 0;
6161 dump_stack_initialize (SCHEME_A); 5593 dump_stack_initialize (SCHEME_A);
6162 SCHEME_V->code = NIL; 5594 SCHEME_V->code = NIL;
5595 SCHEME_V->args = NIL;
5596 SCHEME_V->envir = NIL;
6163 SCHEME_V->tracing = 0; 5597 SCHEME_V->tracing = 0;
6164 5598
6165 /* init NIL */ 5599 /* init NIL */
6166 set_typeflag (NIL, T_ATOM | MARK); 5600 set_typeflag (NIL, T_ATOM | T_MARK);
6167 set_car (NIL, NIL); 5601 set_car (NIL, NIL);
6168 set_cdr (NIL, NIL); 5602 set_cdr (NIL, NIL);
6169 /* init T */ 5603 /* init T */
6170 set_typeflag (S_T, T_ATOM | MARK); 5604 set_typeflag (S_T, T_ATOM | T_MARK);
6171 set_car (S_T, S_T); 5605 set_car (S_T, S_T);
6172 set_cdr (S_T, S_T); 5606 set_cdr (S_T, S_T);
6173 /* init F */ 5607 /* init F */
6174 set_typeflag (S_F, T_ATOM | MARK); 5608 set_typeflag (S_F, T_ATOM | T_MARK);
6175 set_car (S_F, S_F); 5609 set_car (S_F, S_F);
6176 set_cdr (S_F, S_F); 5610 set_cdr (S_F, S_F);
5611 /* init EOF_OBJ */
5612 set_typeflag (S_EOF, T_ATOM | T_MARK);
5613 set_car (S_EOF, S_EOF);
5614 set_cdr (S_EOF, S_EOF);
6177 /* init sink */ 5615 /* init sink */
6178 set_typeflag (S_SINK, T_PAIR | MARK); 5616 set_typeflag (S_SINK, T_PAIR | T_MARK);
6179 set_car (S_SINK, NIL); 5617 set_car (S_SINK, NIL);
5618
6180 /* init c_nest */ 5619 /* init c_nest */
6181 SCHEME_V->c_nest = NIL; 5620 SCHEME_V->c_nest = NIL;
6182 5621
6183 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5622 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
6184 /* init global_env */ 5623 /* init global_env */
… …
6186 SCHEME_V->global_env = SCHEME_V->envir; 5625 SCHEME_V->global_env = SCHEME_V->envir;
6187 /* init else */ 5626 /* init else */
6188 x = mk_symbol (SCHEME_A_ "else"); 5627 x = mk_symbol (SCHEME_A_ "else");
6189 new_slot_in_env (SCHEME_A_ x, S_T); 5628 new_slot_in_env (SCHEME_A_ x, S_T);
6190 5629
6191 assign_syntax (SCHEME_A_ "lambda"); 5630 {
6192 assign_syntax (SCHEME_A_ "quote"); 5631 static const char *syntax_names[] = {
6193 assign_syntax (SCHEME_A_ "define"); 5632 "lambda", "quote", "define", "if", "begin", "set!",
6194 assign_syntax (SCHEME_A_ "if"); 5633 "let", "let*", "letrec", "cond", "delay", "and",
6195 assign_syntax (SCHEME_A_ "begin"); 5634 "or", "cons-stream", "macro", "case"
6196 assign_syntax (SCHEME_A_ "set!"); 5635 };
6197 assign_syntax (SCHEME_A_ "let"); 5636
6198 assign_syntax (SCHEME_A_ "let*"); 5637 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"); 5638 assign_syntax (SCHEME_A_ syntax_names[i]);
6203 assign_syntax (SCHEME_A_ "or"); 5639 }
6204 assign_syntax (SCHEME_A_ "cons-stream");
6205 assign_syntax (SCHEME_A_ "macro");
6206 assign_syntax (SCHEME_A_ "case");
6207 5640
5641 // TODO: should iterate via strlen, to avoid n² complexity
6208 for (i = 0; i < n; i++) 5642 for (i = 0; i < n; i++)
6209 {
6210 if (dispatch_table[i].name != 0) 5643 if (dispatch_table[i].builtin)
6211 { 5644 assign_proc (SCHEME_A_ i, opname (i));
6212 assign_proc (SCHEME_A_ (enum scheme_opcodes) i, dispatch_table[i].name);
6213 }
6214 }
6215 5645
6216 /* initialization of global pointers to special symbols */ 5646 /* initialization of global pointers to special symbols */
6217 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5647 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
6218 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5648 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
6219 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5649 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
6220 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5650 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
6221 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5651 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
6222 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5652 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
6223 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5653 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
6224 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5654 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
6225 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5655 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
6226 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5656 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
6227 5657
6228 return !SCHEME_V->no_memory; 5658 return !SCHEME_V->no_memory;
6229} 5659}
6230 5660
… …
6258scheme_set_external_data (SCHEME_P_ void *p) 5688scheme_set_external_data (SCHEME_P_ void *p)
6259{ 5689{
6260 SCHEME_V->ext_data = p; 5690 SCHEME_V->ext_data = p;
6261} 5691}
6262 5692
6263void 5693ecb_cold void
6264scheme_deinit (SCHEME_P) 5694scheme_deinit (SCHEME_P)
6265{ 5695{
6266 int i; 5696 int i;
6267 5697
6268#if SHOW_ERROR_LINE 5698#if SHOW_ERROR_LINE
… …
6360{ 5790{
6361 dump_stack_reset (SCHEME_A); 5791 dump_stack_reset (SCHEME_A);
6362 SCHEME_V->envir = SCHEME_V->global_env; 5792 SCHEME_V->envir = SCHEME_V->global_env;
6363 SCHEME_V->file_i = 0; 5793 SCHEME_V->file_i = 0;
6364 SCHEME_V->load_stack[0].kind = port_input | port_string; 5794 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 */ 5795 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); 5796 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; 5797 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6368#if USE_PORTS 5798#if USE_PORTS
6369 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5799 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6370#endif 5800#endif
6371 SCHEME_V->retcode = 0; 5801 SCHEME_V->retcode = 0;
6372 SCHEME_V->interactive_repl = 0; 5802 SCHEME_V->interactive_repl = 0;
… …
6385 pointer x; 5815 pointer x;
6386 5816
6387 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5817 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
6388 5818
6389 if (x != NIL) 5819 if (x != NIL)
6390 {
6391 set_slot_in_env (SCHEME_A_ x, value); 5820 set_slot_in_env (SCHEME_A_ x, value);
6392 }
6393 else 5821 else
6394 {
6395 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5822 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6396 }
6397} 5823}
6398 5824
6399#if !STANDALONE 5825#if !STANDALONE
5826
6400void 5827void
6401scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5828scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6402{ 5829{
6403 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5830 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6404} 5831}
… …
6407scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5834scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6408{ 5835{
6409 int i; 5836 int i;
6410 5837
6411 for (i = 0; i < count; i++) 5838 for (i = 0; i < count; i++)
6412 {
6413 scheme_register_foreign_func (SCHEME_A_ list + i); 5839 scheme_register_foreign_func (SCHEME_A_ list + i);
6414 }
6415} 5840}
6416 5841
6417pointer 5842pointer
6418scheme_apply0 (SCHEME_P_ const char *procname) 5843scheme_apply0 (SCHEME_P_ const char *procname)
6419{ 5844{
… …
6476 SCHEME_V->interactive_repl = old_repl; 5901 SCHEME_V->interactive_repl = old_repl;
6477 restore_from_C_call (SCHEME_A); 5902 restore_from_C_call (SCHEME_A);
6478 return SCHEME_V->value; 5903 return SCHEME_V->value;
6479} 5904}
6480 5905
6481
6482#endif 5906#endif
6483 5907
6484/* ========== Main ========== */ 5908/* ========== Main ========== */
6485 5909
6486#if STANDALONE 5910#if STANDALONE
6487 5911
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 5912int
6505main (int argc, char **argv) 5913main (int argc, char **argv)
6506{ 5914{
6507# endif
6508# if USE_MULTIPLICITY 5915# if USE_MULTIPLICITY
6509 scheme ssc; 5916 scheme ssc;
6510 scheme *const sc = &ssc; 5917 scheme *const SCHEME_V = &ssc;
6511# else 5918# else
6512# endif 5919# endif
6513 int fin; 5920 int fin;
6514 char *file_name = InitFile; 5921 char *file_name = InitFile;
6515 int retcode; 5922 int retcode;
6516 int isfile = 1; 5923 int isfile = 1;
6517
6518 if (argc == 1)
6519 xwrstr (banner);
6520 5924
6521 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5925 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6522 { 5926 {
6523 xwrstr ("Usage: tinyscheme -?\n"); 5927 xwrstr ("Usage: tinyscheme -?\n");
6524 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5928 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");
… …
6547 if (access (file_name, 0) != 0) 5951 if (access (file_name, 0) != 0)
6548 { 5952 {
6549 char *p = getenv ("TINYSCHEMEINIT"); 5953 char *p = getenv ("TINYSCHEMEINIT");
6550 5954
6551 if (p != 0) 5955 if (p != 0)
6552 {
6553 file_name = p; 5956 file_name = p;
6554 }
6555 } 5957 }
6556#endif 5958#endif
6557 5959
6558 do 5960 do
6559 { 5961 {

Diff Legend

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