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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 74 TOK_SHARP_CONST,
58 TOK_VEC 75 TOK_VEC
59}; 76};
60 77
61#define BACKQUOTE '`' 78#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 79#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE
63 81
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 85#define S_SINK (&SCHEME_V->xsink)
… …
143 161
144#define toupper(c) xtoupper (c) 162#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 163#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 164#define isdigit(c) xisdigit (c)
147 165
148#if USE_STRLWR 166#if USE_IGNORECASE
149static const char * 167static const char *
150strlwr (char *s) 168xstrlwr (char *s)
151{ 169{
152 const char *p = s; 170 const char *p = s;
153 171
154 while (*s) 172 while (*s)
155 { 173 {
… …
157 s++; 175 s++;
158 } 176 }
159 177
160 return p; 178 return p;
161} 179}
162#endif
163 180
181#define stricmp(a,b) strcasecmp (a, b)
182#define strlwr(s) xstrlwr (s)
183
184#else
164#define stricmp(a,b) strcmp (a, b) 185# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 186# define strlwr(s) (s)
187#endif
166 188
167#ifndef prompt 189#ifndef prompt
168# define prompt "ts> " 190# define prompt "ts> "
169#endif 191#endif
170 192
… …
176# define FIRST_CELLSEGS 3 198# define FIRST_CELLSEGS 3
177#endif 199#endif
178 200
179enum scheme_types 201enum scheme_types
180{ 202{
203 T_INTEGER,
181 T_FREE, 204 T_REAL,
182 T_STRING, 205 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 206 T_SYMBOL,
185 T_PROC, 207 T_PROC,
186 T_PAIR, 208 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 209 T_CLOSURE,
188 T_CONTINUATION, 210 T_CONTINUATION,
189 T_FOREIGN, 211 T_FOREIGN,
190 T_CHARACTER, 212 T_CHARACTER,
191 T_PORT, 213 T_PORT,
… …
201#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
205 227
206static num num_add (num a, num b); 228/* num, for generic arithmetic */
207static num num_mul (num a, num b); 229struct num
208static num num_div (num a, num b); 230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
255
256static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 258static num num_rem (num a, num b);
212static num num_mod (num a, num b); 259static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 260
219#if USE_MATH 261#if USE_MATH
220static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
221#endif 263#endif
222static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
223
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 265
230static num num_zero; 266static num num_zero;
231static num num_one; 267static num num_one;
232 268
233/* macros for cell operations */ 269/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 270#define typeflag(p) ((p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 271#define set_typeflag(p,v) ((p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 272#define type(p) (typeflag (p) & T_MASKTYPE)
237 273
238INTERFACE INLINE int 274INTERFACE int
239is_string (pointer p) 275is_string (pointer p)
240{ 276{
241 return type (p) == T_STRING; 277 return type (p) == T_STRING;
242} 278}
243 279
244#define strvalue(p) ((p)->object.string.svalue) 280#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 281#define strlength(p) ((p)->object.string.length)
246 282
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 283INTERFACE int
249is_vector (pointer p) 284is_vector (pointer p)
250{ 285{
251 return type (p) == T_VECTOR; 286 return type (p) == T_VECTOR;
252} 287}
253 288
254#define vecvalue(p) ((p)->object.vector.vvalue) 289#define vecvalue(p) ((p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 290#define veclength(p) ((p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 292INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 294
261INTERFACE uint32_t 295INTERFACE int
262vector_length (pointer vec) 296is_integer (pointer p)
263{ 297{
264 return vec->object.vector.length; 298 return type (p) == T_INTEGER;
265} 299}
266 300
301/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 302INTERFACE int
303is_real (pointer p)
304{
305 return type (p) == T_REAL;
306}
307
308INTERFACE int
268is_number (pointer p) 309is_number (pointer p)
269{ 310{
270 return type (p) == T_NUMBER; 311 return is_integer (p) || is_real (p);
271} 312}
272 313
273INTERFACE INLINE int 314INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 315is_character (pointer p)
293{ 316{
294 return type (p) == T_CHARACTER; 317 return type (p) == T_CHARACTER;
295} 318}
296 319
297INTERFACE INLINE char * 320INTERFACE char *
298string_value (pointer p) 321string_value (pointer p)
299{ 322{
300 return strvalue (p); 323 return strvalue (p);
301} 324}
302 325
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 326#define ivalue_unchecked(p) (p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v)
328
334#if USE_REAL 329#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 330#define rvalue_unchecked(p) (p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 331#define set_rvalue(p,v) (p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 332#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define rvalue_unchecked(p) (p)->object.ivalue
340# define set_num_integer(p) 0 334#define set_rvalue(p,v) (p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 335#endif
336
343INTERFACE long 337INTERFACE long
344charvalue (pointer p) 338charvalue (pointer p)
345{ 339{
346 return ivalue_unchecked (p); 340 return ivalue_unchecked (p);
347} 341}
348 342
349INTERFACE INLINE int 343INTERFACE int
350is_port (pointer p) 344is_port (pointer p)
351{ 345{
352 return type (p) == T_PORT; 346 return type (p) == T_PORT;
353} 347}
354 348
355INTERFACE INLINE int 349INTERFACE int
356is_inport (pointer p) 350is_inport (pointer p)
357{ 351{
358 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && p->object.port->kind & port_input;
359} 353}
360 354
361INTERFACE INLINE int 355INTERFACE int
362is_outport (pointer p) 356is_outport (pointer p)
363{ 357{
364 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && p->object.port->kind & port_output;
365} 359}
366 360
367INTERFACE INLINE int 361INTERFACE int
368is_pair (pointer p) 362is_pair (pointer p)
369{ 363{
370 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
371} 365}
372 366
373#define car(p) ((p)->object.cons.car + 0) 367#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) ((p)->object.cons.cdr + 0)
375 369
376#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 374
381#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 378
385INTERFACE void 379INTERFACE void
386set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
387{ 381{
388 p->object.cons.car = q; 382 p->object.cons.car = q;
… …
404pair_cdr (pointer p) 398pair_cdr (pointer p)
405{ 399{
406 return cdr (p); 400 return cdr (p);
407} 401}
408 402
409INTERFACE INLINE int 403INTERFACE int
410is_symbol (pointer p) 404is_symbol (pointer p)
411{ 405{
412 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
413} 407}
414 408
415INTERFACE INLINE char * 409INTERFACE char *
416symname (pointer p) 410symname (pointer p)
417{ 411{
418 return strvalue (car (p)); 412 return strvalue (p);
419} 413}
420 414
421#if USE_PLIST 415#if USE_PLIST
422SCHEME_EXPORT INLINE int 416SCHEME_EXPORT int
423hasprop (pointer p) 417hasprop (pointer p)
424{ 418{
425 return typeflag (p) & T_SYMBOL; 419 return typeflag (p) & T_SYMBOL;
426} 420}
427 421
428# define symprop(p) cdr(p) 422# define symprop(p) cdr(p)
429#endif 423#endif
430 424
431INTERFACE INLINE int 425INTERFACE int
432is_syntax (pointer p) 426is_syntax (pointer p)
433{ 427{
434 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
435} 429}
436 430
437INTERFACE INLINE int 431INTERFACE int
438is_proc (pointer p) 432is_proc (pointer p)
439{ 433{
440 return type (p) == T_PROC; 434 return type (p) == T_PROC;
441} 435}
442 436
443INTERFACE INLINE int 437INTERFACE int
444is_foreign (pointer p) 438is_foreign (pointer p)
445{ 439{
446 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
447} 441}
448 442
449INTERFACE INLINE char * 443INTERFACE char *
450syntaxname (pointer p) 444syntaxname (pointer p)
451{ 445{
452 return strvalue (car (p)); 446 return strvalue (p);
453} 447}
454 448
455#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 450static const char *procname (pointer x);
457 451
458INTERFACE INLINE int 452INTERFACE int
459is_closure (pointer p) 453is_closure (pointer p)
460{ 454{
461 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
462} 456}
463 457
464INTERFACE INLINE int 458INTERFACE int
465is_macro (pointer p) 459is_macro (pointer p)
466{ 460{
467 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
468} 462}
469 463
470INTERFACE INLINE pointer 464INTERFACE pointer
471closure_code (pointer p) 465closure_code (pointer p)
472{ 466{
473 return car (p); 467 return car (p);
474} 468}
475 469
476INTERFACE INLINE pointer 470INTERFACE pointer
477closure_env (pointer p) 471closure_env (pointer p)
478{ 472{
479 return cdr (p); 473 return cdr (p);
480} 474}
481 475
482INTERFACE INLINE int 476INTERFACE int
483is_continuation (pointer p) 477is_continuation (pointer p)
484{ 478{
485 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
486} 480}
487 481
488#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
490 484
491/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 486INTERFACE int
493is_promise (pointer p) 487is_promise (pointer p)
494{ 488{
495 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
496} 490}
497 491
498INTERFACE INLINE int 492INTERFACE int
499is_environment (pointer p) 493is_environment (pointer p)
500{ 494{
501 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
502} 496}
503 497
… …
509 503
510#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 507
514INTERFACE INLINE int 508INTERFACE int
515is_immutable (pointer p) 509is_immutable (pointer p)
516{ 510{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 512}
519 513
520INTERFACE INLINE void 514INTERFACE void
521setimmutable (pointer p) 515setimmutable (pointer p)
522{ 516{
523#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 519#endif
526} 520}
527 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
528#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
529static INLINE int 577ecb_inline int
530Cisalpha (int c) 578Cisalpha (int c)
531{ 579{
532 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
533} 581}
534 582
535static INLINE int 583ecb_inline int
536Cisdigit (int c) 584Cisdigit (int c)
537{ 585{
538 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
539} 587}
540 588
541static INLINE int 589ecb_inline int
542Cisspace (int c) 590Cisspace (int c)
543{ 591{
544 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
545} 593}
546 594
547static INLINE int 595ecb_inline int
548Cisupper (int c) 596Cisupper (int c)
549{ 597{
550 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
551} 599}
552 600
553static INLINE int 601ecb_inline int
554Cislower (int c) 602Cislower (int c)
555{ 603{
556 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
557} 605}
558#endif 606#endif
… …
619#endif 667#endif
620 668
621static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P_ int n);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
647static void mark (pointer a); 694static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 702static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
753
679static num 754static num
680num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
681{ 756{
682 num ret; 757 num ret;
683 758
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 760
686 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 762 {
763 switch (op)
764 {
765 case NUM_ADD: a.ivalue += b.ivalue; break;
766 case NUM_SUB: a.ivalue -= b.ivalue; break;
767 case NUM_MUL: a.ivalue *= b.ivalue; break;
768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
769 }
770
771 num_set_ivalue (ret, a.ivalue);
772 }
773#if USE_REAL
688 else 774 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 775 {
776 switch (op)
777 {
778 case NUM_ADD: a.rvalue += b.rvalue; break;
779 case NUM_SUB: a.rvalue -= b.rvalue; break;
780 case NUM_MUL: a.rvalue *= b.rvalue; break;
781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
782 }
690 783
691 return ret; 784 num_set_rvalue (ret, a.rvalue);
692} 785 }
693 786#endif
694static num
695num_mul (num a, num b)
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 787
706 return ret; 788 return ret;
707} 789}
708 790
709static num 791static num
710num_div (num a, num b) 792num_div (num a, num b)
711{ 793{
712 num ret; 794 num ret;
713 795
714 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
715 797
716 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
717 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
718 else 800 else
719 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
720
721 return ret;
722}
723
724static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750 802
751 return ret; 803 return ret;
752} 804}
753 805
754static num 806static num
… …
756{ 808{
757 num ret; 809 num ret;
758 long e1, e2, res; 810 long e1, e2, res;
759 811
760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 812 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
761 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
762 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
763 res = e1 % e2; 815 res = e1 % e2;
764 816
765 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
766 if (res > 0) 818 if (res > 0)
767 { 819 {
… …
783{ 835{
784 num ret; 836 num ret;
785 long e1, e2, res; 837 long e1, e2, res;
786 838
787 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 839 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
788 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
789 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
790 res = e1 % e2; 842 res = e1 % e2;
791 843
792 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
793 if (res * e2 < 0) 845 if (res * e2 < 0)
794 res += e2; 846 res += e2;
795 847
796 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
797 return ret; 849 return ret;
798} 850}
799 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 853static int
801num_eq (num a, num b) 854num_cmp (num a, num b)
802{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 857 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 858
806 if (is_fixnum) 859 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 860 {
861 IVALUE av = num_ivalue (a);
862 IVALUE bv = num_ivalue (b);
863
864 ret = av == bv ? 0 : av < bv ? -1 : +1;
865 }
808 else 866 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 867 {
868 RVALUE av = num_rvalue (a);
869 RVALUE bv = num_rvalue (b);
870
871 ret = av == bv ? 0 : av < bv ? -1 : +1;
872 }
810 873
811 return ret; 874 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 875}
854 876
855#if USE_MATH 877#if USE_MATH
856 878
857/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
867 return ce; 889 return ce;
868 else if (dfl < dce) 890 else if (dfl < dce)
869 return fl; 891 return fl;
870 else 892 else
871 { 893 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 895 return fl;
874 else 896 else
875 return ce; 897 return ce;
876 } 898 }
877} 899}
878#endif 900#endif
879 901
880static int 902static int
881is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
882{ 904{
905 return x == 0;
906#if 0
883#if USE_REAL 907#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 909#else
886 return x == 0; 910 return x == 0;
887#endif 911#endif
888} 912#endif
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 913}
904 914
905/* allocate new cell segment */ 915/* allocate new cell segment */
906static int 916static int
907alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P_ int n)
… …
927 return k; 937 return k;
928 938
929 i = ++SCHEME_V->last_cell_seg; 939 i = ++SCHEME_V->last_cell_seg;
930 SCHEME_V->alloc_seg[i] = cp; 940 SCHEME_V->alloc_seg[i] = cp;
931 941
932 /* insert new segment in address order */
933 newp = (pointer)cp; 942 newp = (pointer)cp;
934 SCHEME_V->cell_seg[i] = newp; 943 SCHEME_V->cell_seg[i] = newp;
935 SCHEME_V->cell_segsize[i] = segsize; 944 SCHEME_V->cell_segsize[i] = segsize;
936
937 //TODO: insert, not swap
938 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
939 {
940 p = SCHEME_V->cell_seg[i];
941 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
942 SCHEME_V->cell_seg[i - 1] = p;
943
944 k = SCHEME_V->cell_segsize[i];
945 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
946 SCHEME_V->cell_segsize[i - 1] = k;
947
948 --i;
949 }
950
951 SCHEME_V->fcells += segsize; 945 SCHEME_V->fcells += segsize;
952 last = newp + segsize - 1; 946 last = newp + segsize - 1;
953 947
954 for (p = newp; p <= last; p++) 948 for (p = newp; p <= last; p++)
955 { 949 {
956 set_typeflag (p, T_FREE); 950 set_typeflag (p, T_PAIR);
957 set_car (p, NIL); 951 set_car (p, NIL);
958 set_cdr (p, p + 1); 952 set_cdr (p, p + 1);
959 } 953 }
960 954
961 /* insert new cells in address order on free list */
962 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
963 {
964 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (last, SCHEME_V->free_cell);
965 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = newp;
966 }
967 else
968 {
969 p = SCHEME_V->free_cell;
970
971 while (cdr (p) != NIL && newp > cdr (p))
972 p = cdr (p);
973
974 set_cdr (last, cdr (p));
975 set_cdr (p, newp);
976 }
977 } 957 }
978 958
979 return n; 959 return n;
980} 960}
981 961
982/* get new cell. parameter a, b is marked by gc. */ 962/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 963ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 964get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 965{
986 if (SCHEME_V->free_cell == NIL) 966 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 967 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 969 return S_SINK;
990 970
991 if (SCHEME_V->free_cell == NIL) 971 if (SCHEME_V->free_cell == NIL)
… …
1060 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1061 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1062 1042
1063 v->object.vector.vvalue = e; 1043 v->object.vector.vvalue = e;
1064 v->object.vector.length = len; 1044 v->object.vector.length = len;
1065 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1047
1068 return v; 1048 return v;
1069} 1049}
1070 1050
1071static INLINE void 1051ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1073{ 1053{
1074 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1075} 1055}
1076 1056
… …
1115 return x; 1095 return x;
1116} 1096}
1117 1097
1118/* ========== oblist implementation ========== */ 1098/* ========== oblist implementation ========== */
1119 1099
1100static pointer
1101generate_symbol (SCHEME_P_ const char *name)
1102{
1103 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x;
1107}
1108
1120#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1121 1110
1111static int
1122static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1123 1122
1124static pointer 1123static pointer
1125oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1126{ 1125{
1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1129 1128
1130/* returns the new symbol */ 1129/* returns the new symbol */
1131static pointer 1130static pointer
1132oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1133{ 1132{
1134 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1135
1136 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1137 set_typeflag (x, T_SYMBOL);
1138 setimmutable (car (x));
1139
1140 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1141 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1142 return x; 1136 return x;
1143} 1137}
1144 1138
1145static INLINE pointer 1139ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1141{
1148 int location; 1142 int location;
1149 pointer x; 1143 pointer x;
1150 char *s; 1144 char *s;
1151 1145
1152 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1153 1147
1154 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1155 { 1149 {
1156 s = symname (car (x)); 1150 s = symname (car (x));
1157 1151
1158 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1159 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1169 int i; 1163 int i;
1170 pointer x; 1164 pointer x;
1171 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1172 1166
1173 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1174 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1175 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1176 1170
1177 return ob_list; 1171 return ob_list;
1178} 1172}
1179 1173
… …
1183oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1184{ 1178{
1185 return NIL; 1179 return NIL;
1186} 1180}
1187 1181
1188static INLINE pointer 1182ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1184{
1191 pointer x; 1185 pointer x;
1192 char *s; 1186 char *s;
1193 1187
… …
1205 1199
1206/* returns the new symbol */ 1200/* returns the new symbol */
1207static pointer 1201static pointer
1208oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1209{ 1203{
1210 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1211
1212 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1213 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1214 setimmutable (car (x)); 1206 setimmutable (x);
1215 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1216 return x; 1208 return x;
1217} 1209}
1218 1210
1219static pointer 1211static pointer
… …
1252mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1253{ 1245{
1254 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1255 1247
1256 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1257 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1258 set_num_integer (x); 1250
1259 return x; 1251 return x;
1260} 1252}
1261 1253
1262/* get number atom (integer) */ 1254/* get number atom (integer) */
1263INTERFACE pointer 1255INTERFACE pointer
1264mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1265{ 1257{
1266 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1267 1259
1268 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1269 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1270 set_num_integer (x); 1262
1271 return x; 1263 return x;
1272} 1264}
1273 1265
1274INTERFACE pointer 1266INTERFACE pointer
1275mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1276{ 1268{
1269#if USE_REAL
1277 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1278 1271
1279 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1280 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1281 set_num_real (x); 1274
1282 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1283} 1279}
1284 1280
1285static pointer 1281static pointer
1286mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1287{ 1283{
1284#if USE_REAL
1288 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1289 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1290 else 1290#endif
1291 return mk_real (SCHEME_A_ num_get_rvalue (n));
1292} 1291}
1293 1292
1294/* allocate name to string area */ 1293/* allocate name to string area */
1295static char * 1294static char *
1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1302 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1303 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1304 } 1303 }
1305 1304
1306 if (str) 1305 if (str)
1307 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1308 int l = strlen (str);
1309
1310 if (l > len_str)
1311 l = len_str;
1312
1313 memcpy (q, str, l);
1314 q[l] = 0;
1315 }
1316 else 1307 else
1317 {
1318 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1319 q[len_str] = 0; 1310 q[len_str] = 0;
1320 }
1321 1311
1322 return q; 1312 return q;
1323}
1324
1325/* get new string */
1326INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str)
1328{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str));
1330}
1331
1332INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{
1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1336
1337 set_typeflag (x, T_STRING | T_ATOM);
1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1339 strlength (x) = len;
1340 return x;
1341} 1313}
1342 1314
1343INTERFACE pointer 1315INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1316mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1345{ 1317{
… …
1350 strlength (x) = len; 1322 strlength (x) = len;
1351 return x; 1323 return x;
1352} 1324}
1353 1325
1354INTERFACE pointer 1326INTERFACE pointer
1327mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1328{
1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1330
1331 set_typeflag (x, T_STRING | T_ATOM);
1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1333 strlength (x) = len;
1334
1335 return x;
1336}
1337
1338INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str)
1340{
1341 return mk_counted_string (SCHEME_A_ str, strlen (str));
1342}
1343
1344INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1345mk_vector (SCHEME_P_ uint32_t len)
1356{ 1346{
1357 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1358} 1348}
1359 1349
1360INTERFACE void 1350INTERFACE void
1361fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1362{ 1352{
1363 int i; 1353 int i;
1364 1354
1365 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1366 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1367} 1357}
1368 1358
1359INTERFACE void
1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1366}
1367
1369INTERFACE pointer 1368INTERFACE pointer
1370vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1371{ 1370{
1372 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1373} 1372}
1374 1373
1375INTERFACE void 1374INTERFACE void
1376set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1377{ 1376{
1378 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1379} 1378}
1380 1379
1381/* get new symbol */ 1380/* get new symbol */
… …
1393 1392
1394INTERFACE pointer 1393INTERFACE pointer
1395gensym (SCHEME_P) 1394gensym (SCHEME_P)
1396{ 1395{
1397 pointer x; 1396 pointer x;
1398 char name[40]; 1397 char name[40] = "gensym-";
1399
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 {
1402 strcpy (name, "gensym-");
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1404 1399
1405 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1406 x = oblist_find_by_name (SCHEME_A_ name);
1407
1408 if (x != NIL)
1409 continue;
1410 else
1411 {
1412 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x;
1414 }
1415 }
1416
1417 return NIL;
1418} 1401}
1419 1402
1420/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1421static pointer 1404static pointer
1422mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1424 char c, *p; 1407 char c, *p;
1425 int has_dec_point = 0; 1408 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1409 int has_fp_exp = 0;
1427 1410
1428#if USE_COLON_HOOK 1411#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1412 if ((p = strstr (q, "::")) != 0)
1431 { 1413 {
1432 *p = 0; 1414 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1415 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1416 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1417 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1418 }
1437
1438#endif 1419#endif
1439 1420
1440 p = q; 1421 p = q;
1441 c = *p++; 1422 c = *p++;
1442 1423
… …
1478 } 1459 }
1479 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1480 { 1461 {
1481 if (!has_fp_exp) 1462 if (!has_fp_exp)
1482 { 1463 {
1483 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1484 from now on */
1485 p++; 1465 p++;
1486 1466
1487 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1488 continue; 1468 continue;
1489 } 1469 }
… …
1503 1483
1504/* make constant */ 1484/* make constant */
1505static pointer 1485static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1486mk_sharp_const (SCHEME_P_ char *name)
1507{ 1487{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1488 if (!strcmp (name, "t"))
1512 return S_T; 1489 return S_T;
1513 else if (!strcmp (name, "f")) 1490 else if (!strcmp (name, "f"))
1514 return S_F; 1491 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1492 else if (*name == '\\') /* #\w (character) */
1536 { 1493 {
1537 int c = 0; 1494 int c;
1538 1495
1539 if (stricmp (name + 1, "space") == 0) 1496 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1497 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1498 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1499 c = '\n';
… …
1544 c = '\r'; 1501 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1502 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1503 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1504 else if (name[1] == 'x' && name[2] != 0)
1548 { 1505 {
1549 int c1 = strtol (name + 2, 0, 16); 1506 long c1 = strtol (name + 2, 0, 16);
1550 1507
1551 if (c1 <= UCHAR_MAX) 1508 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1509 c = c1;
1553 else 1510 else
1554 return NIL; 1511 return NIL;
1555 1512 }
1556#if USE_ASCII_NAMES 1513#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1514 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1515 /* nothing */;
1561#endif 1516#endif
1562 }
1563 else if (name[2] == 0) 1517 else if (name[2] == 0)
1564 c = name[1]; 1518 c = name[1];
1565 else 1519 else
1566 return NIL; 1520 return NIL;
1567 1521
1568 return mk_character (SCHEME_A_ c); 1522 return mk_character (SCHEME_A_ c);
1569 } 1523 }
1570 else 1524 else
1525 {
1526 /* identify base by string index */
1527 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1528 char *base = strchr (baseidx, *name);
1529
1530 if (base)
1531 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1532
1571 return NIL; 1533 return NIL;
1534 }
1572} 1535}
1573 1536
1574/* ========== garbage collector ========== */ 1537/* ========== garbage collector ========== */
1575 1538
1576/*-- 1539/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1542 * for marking.
1543 *
1544 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector
1580 */ 1547 */
1581static void 1548static void
1582mark (pointer a) 1549mark (pointer a)
1583{ 1550{
1584 pointer t, q, p; 1551 pointer t, q, p;
… …
1586 t = 0; 1553 t = 0;
1587 p = a; 1554 p = a;
1588E2: 1555E2:
1589 setmark (p); 1556 setmark (p);
1590 1557
1591 if (is_vector (p)) 1558 if (ecb_expect_false (is_vector (p)))
1592 { 1559 {
1593 int i; 1560 int i;
1594 1561
1595 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1596 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1597 } 1564 }
1598 1565
1599 if (is_atom (p)) 1566 if (is_atom (p))
1600 goto E6; 1567 goto E6;
… …
1698 if (is_mark (p)) 1665 if (is_mark (p))
1699 clrmark (p); 1666 clrmark (p);
1700 else 1667 else
1701 { 1668 {
1702 /* reclaim cell */ 1669 /* reclaim cell */
1703 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1704 { 1671 {
1705 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1706 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1707 set_car (p, NIL); 1674 set_car (p, NIL);
1708 } 1675 }
1709 1676
1710 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1711 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1713 } 1680 }
1714 } 1681 }
1715 } 1682 }
1716 1683
1717 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1718 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1719} 1688}
1720 1689
1721static void 1690static void
1722finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1723{ 1692{
1724 if (is_string (a)) 1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1725 free (strvalue (a)); 1695 free (strvalue (a));
1726 else if (is_vector (a)) 1696 else if (is_vector (a))
1727 free (vecvalue (a)); 1697 free (vecvalue (a));
1728#if USE_PORTS 1698#if USE_PORTS
1729 else if (is_port (a)) 1699 else if (is_port (a))
… …
2151#endif 2121#endif
2152} 2122}
2153 2123
2154/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2155static char * 2125static char *
2156readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2157{ 2127{
2158 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2159 2129
2160 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2161 2131
2162 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2163 *p = 0; 2133 *p = 0;
… …
2170 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2171} 2141}
2172 2142
2173/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2174static pointer 2144static pointer
2175readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2176{ 2146{
2177 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2178 int c; 2148 int c;
2179 int c1 = 0; 2149 int c1 = 0;
2180 enum
2181 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2150 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2182 2151
2183 for (;;) 2152 for (;;)
2184 { 2153 {
2185 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2186 2155
… …
2188 return S_F; 2157 return S_F;
2189 2158
2190 switch (state) 2159 switch (state)
2191 { 2160 {
2192 case st_ok: 2161 case st_ok:
2193 switch (c) 2162 if (ecb_expect_false (c == delim))
2194 {
2195 case '\\':
2196 state = st_bsl;
2197 break;
2198
2199 case '"':
2200 *p = 0;
2201 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2202 2164
2203 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2204 *p++ = c; 2168 *p++ = c;
2205 break;
2206 }
2207 2169
2208 break; 2170 break;
2209 2171
2210 case st_bsl: 2172 case st_bsl:
2211 switch (c) 2173 switch (c)
… …
2241 case 'r': 2203 case 'r':
2242 *p++ = '\r'; 2204 *p++ = '\r';
2243 state = st_ok; 2205 state = st_ok;
2244 break; 2206 break;
2245 2207
2246 case '"':
2247 *p++ = '"';
2248 state = st_ok;
2249 break;
2250
2251 default: 2208 default:
2252 *p++ = c; 2209 *p++ = c;
2253 state = st_ok; 2210 state = st_ok;
2254 break; 2211 break;
2255 } 2212 }
2256 2213
2257 break; 2214 break;
2258 2215
2259 case st_x1: 2216 case st_x1:
2260 case st_x2: 2217 case st_x2:
2261 c = toupper (c); 2218 c = tolower (c);
2262 2219
2263 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2264 {
2265 if (c <= '9')
2266 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2267 else 2222 else if (c >= 'a' && c <= 'f')
2268 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2269
2270 if (state == st_x1)
2271 state = st_x2;
2272 else
2273 {
2274 *p++ = c1;
2275 state = st_ok;
2276 }
2277 }
2278 else 2224 else
2279 return S_F; 2225 return S_F;
2226
2227 if (state == st_x1)
2228 state = st_x2;
2229 else
2230 {
2231 *p++ = c1;
2232 state = st_ok;
2233 }
2280 2234
2281 break; 2235 break;
2282 2236
2283 case st_oct1: 2237 case st_oct1:
2284 case st_oct2: 2238 case st_oct2:
… …
2288 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2289 state = st_ok; 2243 state = st_ok;
2290 } 2244 }
2291 else 2245 else
2292 { 2246 {
2293 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2294 return S_F; 2248 return S_F;
2295 2249
2296 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2297 2251
2298 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2303 state = st_ok; 2257 state = st_ok;
2304 } 2258 }
2305 } 2259 }
2306 2260
2307 break; 2261 break;
2308
2309 } 2262 }
2310 } 2263 }
2311} 2264}
2312 2265
2313/* check c is in chars */ 2266/* check c is in chars */
2314static INLINE int 2267ecb_inline int
2315is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2316{ 2269{
2317 if (c == EOF)
2318 return 1;
2319
2320 return !!strchr (s, c); 2270 return c == EOF || !!strchr (s, c);
2321} 2271}
2322 2272
2323/* skip white characters */ 2273/* skip white characters */
2324static INLINE int 2274ecb_inline int
2325skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2326{ 2276{
2327 int c, curr_line = 0; 2277 int c, curr_line = 0;
2328 2278
2329 do 2279 do
2330 { 2280 {
2331 c = inchar (SCHEME_A); 2281 c = inchar (SCHEME_A);
2282
2332#if SHOW_ERROR_LINE 2283#if SHOW_ERROR_LINE
2333 if (c == '\n') 2284 if (ecb_expect_false (c == '\n'))
2334 curr_line++; 2285 curr_line++;
2335#endif 2286#endif
2287
2288 if (ecb_expect_false (c == EOF))
2289 return c;
2336 } 2290 }
2337 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2291 while (is_one_of (WHITESPACE, c));
2338 2292
2339 /* record it */ 2293 /* record it */
2340#if SHOW_ERROR_LINE 2294#if SHOW_ERROR_LINE
2341 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2342 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2343#endif 2297#endif
2344 2298
2345 if (c != EOF)
2346 {
2347 backchar (SCHEME_A_ c); 2299 backchar (SCHEME_A_ c);
2348 return 1; 2300 return 1;
2349 }
2350 else
2351 return EOF;
2352} 2301}
2353 2302
2354/* get token */ 2303/* get token */
2355static int 2304static int
2356token (SCHEME_P) 2305token (SCHEME_P)
… …
2372 return TOK_RPAREN; 2321 return TOK_RPAREN;
2373 2322
2374 case '.': 2323 case '.':
2375 c = inchar (SCHEME_A); 2324 c = inchar (SCHEME_A);
2376 2325
2377 if (is_one_of (" \n\t", c)) 2326 if (is_one_of (WHITESPACE, c))
2378 return TOK_DOT; 2327 return TOK_DOT;
2379 else 2328 else
2380 { 2329 {
2381 //TODO: ungetc twice in a row is not supported in C
2382 backchar (SCHEME_A_ c); 2330 backchar (SCHEME_A_ c);
2383 backchar (SCHEME_A_ '.');
2384 return TOK_ATOM; 2331 return TOK_DOTATOM;
2385 } 2332 }
2333
2334 case '|':
2335 return TOK_STRATOM;
2386 2336
2387 case '\'': 2337 case '\'':
2388 return TOK_QUOTE; 2338 return TOK_QUOTE;
2389 2339
2390 case ';': 2340 case ';':
… …
2522 } 2472 }
2523 2473
2524 putcharacter (SCHEME_A_ '"'); 2474 putcharacter (SCHEME_A_ '"');
2525} 2475}
2526 2476
2527
2528/* print atoms */ 2477/* print atoms */
2529static void 2478static void
2530printatom (SCHEME_P_ pointer l, int f) 2479printatom (SCHEME_P_ pointer l, int f)
2531{ 2480{
2532 char *p; 2481 char *p;
2533 int len; 2482 int len;
2534 2483
2535 atom2str (SCHEME_A_ l, f, &p, &len); 2484 atom2str (SCHEME_A_ l, f, &p, &len);
2536 putchars (SCHEME_A_ p, len); 2485 putchars (SCHEME_A_ p, len);
2537} 2486}
2538
2539 2487
2540/* Uses internal buffer unless string pointer is already available */ 2488/* Uses internal buffer unless string pointer is already available */
2541static void 2489static void
2542atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2490atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2543{ 2491{
… …
2557 { 2505 {
2558 p = SCHEME_V->strbuff; 2506 p = SCHEME_V->strbuff;
2559 2507
2560 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2508 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2561 { 2509 {
2562 if (num_is_integer (l)) 2510 if (is_integer (l))
2563 xnum (p, ivalue_unchecked (l)); 2511 xnum (p, ivalue_unchecked (l));
2564#if USE_REAL 2512#if USE_REAL
2565 else 2513 else
2566 { 2514 {
2567 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2515 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2704#endif 2652#endif
2705 } 2653 }
2706 else if (is_continuation (l)) 2654 else if (is_continuation (l))
2707 p = "#<CONTINUATION>"; 2655 p = "#<CONTINUATION>";
2708 else 2656 else
2657 {
2658#if USE_PRINTF
2659 p = SCHEME_V->strbuff;
2660 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2661#else
2709 p = "#<ERROR>"; 2662 p = "#<ERROR>";
2663#endif
2664 }
2710 2665
2711 *pp = p; 2666 *pp = p;
2712 *plen = strlen (p); 2667 *plen = strlen (p);
2713} 2668}
2714 2669
… …
2822 return 0; 2777 return 0;
2823 } 2778 }
2824 else if (is_number (a)) 2779 else if (is_number (a))
2825 { 2780 {
2826 if (is_number (b)) 2781 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2782 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2783
2830 return 0; 2784 return 0;
2831 } 2785 }
2832 else if (is_character (a)) 2786 else if (is_character (a))
2833 { 2787 {
… …
2859/* () is #t in R5RS */ 2813/* () is #t in R5RS */
2860#define is_true(p) ((p) != S_F) 2814#define is_true(p) ((p) != S_F)
2861#define is_false(p) ((p) == S_F) 2815#define is_false(p) ((p) == S_F)
2862 2816
2863/* ========== Environment implementation ========== */ 2817/* ========== Environment implementation ========== */
2864
2865#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2866
2867static int
2868hash_fn (const char *key, int table_size)
2869{
2870 const unsigned char *p = key;
2871 uint32_t hash = 2166136261;
2872
2873 while (*p)
2874 hash = (hash ^ *p++) * 16777619;
2875
2876 return hash % table_size;
2877}
2878#endif
2879 2818
2880#ifndef USE_ALIST_ENV 2819#ifndef USE_ALIST_ENV
2881 2820
2882/* 2821/*
2883 * In this implementation, each frame of the environment may be 2822 * In this implementation, each frame of the environment may be
… …
2900 2839
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2840 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2841 setenvironment (SCHEME_V->envir);
2903} 2842}
2904 2843
2905static INLINE void 2844static uint32_t
2845sym_hash (pointer sym, uint32_t size)
2846{
2847 uintptr_t ptr = (uintptr_t)sym;
2848
2849#if 0
2850 /* table size is prime, so why mix */
2851 ptr += ptr >> 32;
2852 ptr += ptr >> 16;
2853 ptr += ptr >> 8;
2854#endif
2855
2856 return ptr % size;
2857}
2858
2859ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2860new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2861{
2908 pointer slot = immutable_cons (variable, value); 2862 pointer slot = immutable_cons (variable, value);
2909 2863
2910 if (is_vector (car (env))) 2864 if (is_vector (car (env)))
2911 { 2865 {
2912 int location = hash_fn (symname (variable), veclength (car (env))); 2866 int location = sym_hash (variable, veclength (car (env)));
2913
2914 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2915 } 2868 }
2916 else 2869 else
2917 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
2918} 2871}
2919 2872
2920static pointer 2873static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2875{
2923 pointer x, y; 2876 pointer x, y;
2924 int location;
2925 2877
2926 for (x = env; x != NIL; x = cdr (x)) 2878 for (x = env; x != NIL; x = cdr (x))
2927 { 2879 {
2928 if (is_vector (car (x))) 2880 if (is_vector (car (x)))
2929 { 2881 {
2930 location = hash_fn (symname (hdl), veclength (car (x))); 2882 int location = sym_hash (hdl, veclength (car (x)));
2931 y = vector_elem (car (x), location); 2883 y = vector_get (car (x), location);
2932 } 2884 }
2933 else 2885 else
2934 y = car (x); 2886 y = car (x);
2935 2887
2936 for (; y != NIL; y = cdr (y)) 2888 for (; y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2889 if (caar (y) == hdl)
2938 break; 2890 break;
2939 2891
2940 if (y != NIL) 2892 if (y != NIL)
2893 return car (y);
2894
2895 if (!all)
2941 break; 2896 break;
2942
2943 if (!all)
2944 return NIL;
2945 } 2897 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2898
2950 return NIL; 2899 return NIL;
2951} 2900}
2952 2901
2953#else /* USE_ALIST_ENV */ 2902#else /* USE_ALIST_ENV */
2954 2903
2955static INLINE void 2904ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2905new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2906{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2907 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2908 setenvironment (SCHEME_V->envir);
2960} 2909}
2961 2910
2962static INLINE void 2911ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2912new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2913{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2914 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2915}
2967 2916
… …
2975 for (y = car (x); y != NIL; y = cdr (y)) 2924 for (y = car (x); y != NIL; y = cdr (y))
2976 if (caar (y) == hdl) 2925 if (caar (y) == hdl)
2977 break; 2926 break;
2978 2927
2979 if (y != NIL) 2928 if (y != NIL)
2929 return car (y);
2980 break; 2930 break;
2981 2931
2982 if (!all) 2932 if (!all)
2983 return NIL; 2933 break;
2984 } 2934 }
2985
2986 if (x != NIL)
2987 return car (y);
2988 2935
2989 return NIL; 2936 return NIL;
2990} 2937}
2991 2938
2992#endif /* USE_ALIST_ENV else */ 2939#endif /* USE_ALIST_ENV else */
2993 2940
2994static INLINE void 2941ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2942new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2943{
2944 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2945 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2946}
2999 2947
3000static INLINE void 2948ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2949set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2950{
3003 set_cdr (slot, value); 2951 set_cdr (slot, value);
3004} 2952}
3005 2953
3006static INLINE pointer 2954ecb_inline pointer
3007slot_value_in_env (pointer slot) 2955slot_value_in_env (pointer slot)
3008{ 2956{
3009 return cdr (slot); 2957 return cdr (slot);
3010} 2958}
3011 2959
3012/* ========== Evaluation Cycle ========== */ 2960/* ========== Evaluation Cycle ========== */
3013 2961
3014static pointer 2962static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2963xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2964{
3017#if USE_ERROR_HOOK 2965#if USE_ERROR_HOOK
3018 pointer x; 2966 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2967 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 3002 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 3003 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 3004 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 3005 SCHEME_V->op = OP_EVAL;
3058 3006
3059 return S_T; 3007 return 0;
3060 } 3008 }
3061#endif 3009#endif
3062 3010
3063 if (a) 3011 if (a)
3064 SCHEME_V->args = cons (a, NIL); 3012 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 3014 SCHEME_V->args = NIL;
3067 3015
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3016 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 3017 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 3018 SCHEME_V->op = OP_ERR0;
3019
3071 return S_T; 3020 return 0;
3072} 3021}
3073 3022
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3023#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 3024#define Error_0(s) Error_1 (s, 0)
3076 3025
3077/* Too small to turn into function */ 3026/* Too small to turn into function */
3078#define BEGIN do { 3027#define BEGIN do {
3079#define END } while (0) 3028#define END } while (0)
3080#define s_goto(a) BEGIN \ 3029#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3030 SCHEME_V->op = a; \
3082 return S_T; END 3031 return 0; END
3083 3032
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3033#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3034
3086#ifndef USE_SCHEME_STACK 3035#ifndef USE_SCHEME_STACK
3087 3036
… …
3112 next_frame = SCHEME_V->dump_base + nframes; 3061 next_frame = SCHEME_V->dump_base + nframes;
3113 3062
3114 next_frame->op = op; 3063 next_frame->op = op;
3115 next_frame->args = args; 3064 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3065 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3066 next_frame->code = code;
3118 3067
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3068 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3069}
3121 3070
3122static pointer 3071static int
3123xs_return (SCHEME_P_ pointer a) 3072xs_return (SCHEME_P_ pointer a)
3124{ 3073{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3074 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3075 struct dump_stack_frame *frame;
3127 3076
3128 SCHEME_V->value = a; 3077 SCHEME_V->value = a;
3129 3078
3130 if (nframes <= 0) 3079 if (nframes <= 0)
3131 return NIL; 3080 return -1;
3132 3081
3133 frame = &SCHEME_V->dump_base[--nframes]; 3082 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3083 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3084 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3085 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3086 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3087 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3088
3140 return S_T; 3089 return 0;
3141} 3090}
3142 3091
3143static INLINE void 3092ecb_inline void
3144dump_stack_reset (SCHEME_P) 3093dump_stack_reset (SCHEME_P)
3145{ 3094{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3095 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3096 SCHEME_V->dump = (pointer)+0;
3148} 3097}
3149 3098
3150static INLINE void 3099ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3100dump_stack_initialize (SCHEME_P)
3152{ 3101{
3153 SCHEME_V->dump_size = 0; 3102 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3103 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3104 dump_stack_reset (SCHEME_A);
… …
3208 int i = 0; 3157 int i = 0;
3209 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3158 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3210 3159
3211 while (cont != NIL) 3160 while (cont != NIL)
3212 { 3161 {
3213 frame->op = ivalue (car (cont)); cont = cdr (cont); 3162 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3214 frame->args = car (cont) ; cont = cdr (cont); 3163 frame->args = car (cont) ; cont = cdr (cont);
3215 frame->envir = car (cont) ; cont = cdr (cont); 3164 frame->envir = car (cont) ; cont = cdr (cont);
3216 frame->code = car (cont) ; cont = cdr (cont); 3165 frame->code = car (cont) ; cont = cdr (cont);
3217 3166
3218 ++frame; 3167 ++frame;
3219 ++i; 3168 ++i;
3220 } 3169 }
3221 3170
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3171 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3172}
3224 3173
3225#else 3174#else
3226 3175
3227static INLINE void 3176ecb_inline void
3228dump_stack_reset (SCHEME_P) 3177dump_stack_reset (SCHEME_P)
3229{ 3178{
3230 SCHEME_V->dump = NIL; 3179 SCHEME_V->dump = NIL;
3231} 3180}
3232 3181
3233static INLINE void 3182ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3183dump_stack_initialize (SCHEME_P)
3235{ 3184{
3236 dump_stack_reset (SCHEME_A); 3185 dump_stack_reset (SCHEME_A);
3237} 3186}
3238 3187
… …
3240dump_stack_free (SCHEME_P) 3189dump_stack_free (SCHEME_P)
3241{ 3190{
3242 SCHEME_V->dump = NIL; 3191 SCHEME_V->dump = NIL;
3243} 3192}
3244 3193
3245static pointer 3194static int
3246xs_return (SCHEME_P_ pointer a) 3195xs_return (SCHEME_P_ pointer a)
3247{ 3196{
3248 pointer dump = SCHEME_V->dump; 3197 pointer dump = SCHEME_V->dump;
3249 3198
3250 SCHEME_V->value = a; 3199 SCHEME_V->value = a;
3251 3200
3252 if (dump == NIL) 3201 if (dump == NIL)
3253 return NIL; 3202 return -1;
3254 3203
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3204 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3205 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3208
3260 SCHEME_V->dump = dump; 3209 SCHEME_V->dump = dump;
3261 3210
3262 return S_T; 3211 return 0;
3263} 3212}
3264 3213
3265static void 3214static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3215s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3216{
… …
3292 3241
3293#endif 3242#endif
3294 3243
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3244#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3245
3246#if 1
3297static pointer 3247static int
3248debug (SCHEME_P_ int indent, pointer x)
3249{
3250 int c;
3251
3252 if (is_syntax (x))
3253 {
3254 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3255 return 8 + 8;
3256 }
3257
3258 if (x == NIL)
3259 {
3260 printf ("%*sNIL\n", indent, "");
3261 return 3;
3262 }
3263
3264 switch (type (x))
3265 {
3266 case T_INTEGER:
3267 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3268 return 32+8;
3269
3270 case T_SYMBOL:
3271 printf ("%*sS<%s>\n", indent, "", symname (x));
3272 return 24+8;
3273
3274 case T_CLOSURE:
3275 printf ("%*sS<%s>\n", indent, "", "closure");
3276 debug (SCHEME_A_ indent + 3, cdr(x));
3277 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3278
3279 case T_PAIR:
3280 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3281 c = debug (SCHEME_A_ indent + 3, car (x));
3282 c += debug (SCHEME_A_ indent + 3, cdr (x));
3283 return c + 1;
3284
3285 case T_PORT:
3286 printf ("%*sS<%s>\n", indent, "", "port");
3287 return 24+8;
3288
3289 case T_VECTOR:
3290 printf ("%*sS<%s>\n", indent, "", "vector");
3291 return 24+8;
3292
3293 case T_ENVIRONMENT:
3294 printf ("%*sS<%s>\n", indent, "", "environment");
3295 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3296
3297 default:
3298 printf ("unhandled type %d\n", type (x));
3299 break;
3300 }
3301}
3302#endif
3303
3304static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3305opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3306{
3307 pointer args = SCHEME_V->args;
3300 pointer x, y; 3308 pointer x, y;
3301 3309
3302 switch (op) 3310 switch (op)
3303 { 3311 {
3312#if 1 //D
3313 case OP_DEBUG:
3314 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3315 printf ("\n");
3316 s_return (S_T);
3317#endif
3304 case OP_LOAD: /* load */ 3318 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3319 if (file_interactive (SCHEME_A))
3306 { 3320 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3321 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3322 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3323 }
3310 3324
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3325 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3326 Error_1 ("unable to open", car (args));
3313 else 3327 else
3314 { 3328 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3329 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3330 s_goto (OP_T0LVL);
3317 } 3331 }
… …
3391 case OP_EVAL: /* main part of evaluation */ 3405 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3406#if USE_TRACING
3393 if (SCHEME_V->tracing) 3407 if (SCHEME_V->tracing)
3394 { 3408 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3409 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3410 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3411 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3412 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3413 s_goto (OP_P0LIST);
3400 } 3414 }
3401 3415
… …
3431 } 3445 }
3432 else 3446 else
3433 s_return (SCHEME_V->code); 3447 s_return (SCHEME_V->code);
3434 3448
3435 case OP_E0ARGS: /* eval arguments */ 3449 case OP_E0ARGS: /* eval arguments */
3436 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3450 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3437 { 3451 {
3438 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3452 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3439 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3453 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3440 SCHEME_V->code = SCHEME_V->value; 3454 SCHEME_V->code = SCHEME_V->value;
3441 s_goto (OP_APPLY); 3455 s_goto (OP_APPLY);
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3459 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3460 s_goto (OP_E1ARGS);
3447 } 3461 }
3448 3462
3449 case OP_E1ARGS: /* eval arguments */ 3463 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3464 args = cons (SCHEME_V->value, args);
3451 3465
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3466 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3467 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3468 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3469 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3470 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3471 s_goto (OP_EVAL);
3458 } 3472 }
3459 else /* end */ 3473 else /* end */
3460 { 3474 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3475 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3476 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3477 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3478 s_goto (OP_APPLY);
3465 } 3479 }
3466 3480
3467#if USE_TRACING 3481#if USE_TRACING
3468 3482
3469 case OP_TRACING: 3483 case OP_TRACING:
3470 { 3484 {
3471 int tr = SCHEME_V->tracing; 3485 int tr = SCHEME_V->tracing;
3472 3486
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3487 SCHEME_V->tracing = ivalue_unchecked (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3488 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3489 }
3476 3490
3477#endif 3491#endif
3478 3492
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3493 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3494#if USE_TRACING
3481 if (SCHEME_V->tracing) 3495 if (SCHEME_V->tracing)
3482 { 3496 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3497 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3498 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3499 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3500 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3501 s_goto (OP_P0LIST);
3488 } 3502 }
3489 3503
3490 /* fall through */ 3504 /* fall through */
3491 3505
3492 case OP_REAL_APPLY: 3506 case OP_REAL_APPLY:
3493#endif 3507#endif
3494 if (is_proc (SCHEME_V->code)) 3508 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3509 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3510 else if (is_foreign (SCHEME_V->code))
3499 { 3511 {
3500 /* Keep nested calls from GC'ing the arglist */ 3512 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3513 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3514 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3503 3515
3504 s_return (x); 3516 s_return (x);
3505 } 3517 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3518 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3519 {
3508 /* Should not accept promise */ 3520 /* Should not accept promise */
3509 /* make environment */ 3521 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3522 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3523
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3524 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3525 {
3514 if (y == NIL) 3526 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3527 Error_0 ("not enough arguments");
3516 else 3528 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3529 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3547 s_goto (OP_BEGIN);
3536 } 3548 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3549 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3550 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3551 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3552 s_return (args != NIL ? car (args) : NIL);
3541 } 3553 }
3542 else 3554 else
3543 Error_0 ("illegal function"); 3555 Error_0 ("illegal function");
3544 3556
3545 case OP_DOMACRO: /* do macro */ 3557 case OP_DOMACRO: /* do macro */
… …
3554 { 3566 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3567 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3568
3557 if (f != NIL) 3569 if (f != NIL)
3558 { 3570 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3571 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3572 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3573 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3574 s_goto (OP_APPLY);
3563 } 3575 }
3564 3576
… …
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3587 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576 3588
3577#endif 3589#endif
3578 3590
3579 case OP_MKCLOSURE: /* make-closure */ 3591 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3592 x = car (args);
3581 3593
3582 if (car (x) == SCHEME_V->LAMBDA) 3594 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3595 x = cdr (x);
3584 3596
3585 if (cdr (SCHEME_V->args) == NIL) 3597 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3598 y = SCHEME_V->envir;
3587 else 3599 else
3588 y = cadr (SCHEME_V->args); 3600 y = cadr (args);
3589 3601
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3602 s_return (mk_closure (SCHEME_A_ x, y));
3591 3603
3592 case OP_QUOTE: /* quote */ 3604 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3605 s_return (car (SCHEME_V->code));
… …
3625 3637
3626 3638
3627 case OP_DEFP: /* defined? */ 3639 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3640 x = SCHEME_V->envir;
3629 3641
3630 if (cdr (SCHEME_V->args) != NIL) 3642 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3643 x = cadr (args);
3632 3644
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3645 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3646
3635 case OP_SET0: /* set! */ 3647 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3648 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3649 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3650
… …
3669 3681
3670 case OP_IF1: /* if */ 3682 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3683 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3684 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3685 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3686 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3687 s_goto (OP_EVAL);
3678 3688
3679 case OP_LET0: /* let */ 3689 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3690 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3691 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3692 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3693 s_goto (OP_LET1);
3684 3694
3685 case OP_LET1: /* let (calculate parameters) */ 3695 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3696 args = cons (SCHEME_V->value, args);
3687 3697
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3698 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3699 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3700 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3701 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3702
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3703 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3704 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3705 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3706 s_goto (OP_EVAL);
3697 } 3707 }
3698 else /* end */ 3708 else /* end */
3699 { 3709 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3710 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3711 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3712 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3713 s_goto (OP_LET2);
3704 } 3714 }
3705 3715
3706 case OP_LET2: /* let */ 3716 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3717 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3718
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3719 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3720 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3721 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3722
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3723 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3724 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3725 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3726 {
3717 if (!is_pair (x)) 3727 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3728 Error_1 ("Bad syntax of binding in let :", x);
3719 3729
3720 if (!is_list (SCHEME_A_ car (x))) 3730 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3731 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3732
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3733 args = cons (caar (x), args);
3724 } 3734 }
3725 3735
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3736 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3737 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3738 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3739 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3740 }
3733 else 3741 else
3734 { 3742 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3744 }
3745
3736 SCHEME_V->args = NIL; 3746 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3747 s_goto (OP_BEGIN);
3740 3748
3741 case OP_LET0AST: /* let* */ 3749 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3750 if (car (SCHEME_V->code) == NIL)
3743 { 3751 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3769 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3770 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3771
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3772 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3773 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3774 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3775 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3776 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3777 s_goto (OP_EVAL);
3770 } 3778 }
3771 else /* end */ 3779 else /* end */
3772 { 3780 {
3773 SCHEME_V->code = SCHEME_V->args; 3781 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3782 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3783 s_goto (OP_BEGIN);
3776 } 3784 }
3777 3785
3778 case OP_LET0REC: /* letrec */ 3786 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3789 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3790 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3791 s_goto (OP_LET1REC);
3784 3792
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3793 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3794 args = cons (SCHEME_V->value, args);
3787 3795
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3796 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3797 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3798 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3799 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3800
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3801 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3802 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3804 s_goto (OP_EVAL);
3797 } 3805 }
3798 else /* end */ 3806 else /* end */
3799 { 3807 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3808 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3809 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3810 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3811 s_goto (OP_LET2REC);
3804 } 3812 }
3805 3813
3806 case OP_LET2REC: /* letrec */ 3814 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3815 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3816 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3817
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3818 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3819 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3820 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3906 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3907 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3908 s_goto (OP_EVAL);
3901 3909
3902 case OP_C1STREAM: /* cons-stream */ 3910 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3911 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3912 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3913 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3914 s_return (cons (args, x));
3907 3915
3908 case OP_MACRO0: /* macro */ 3916 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3917 if (is_pair (car (SCHEME_V->code)))
3910 { 3918 {
3911 x = caar (SCHEME_V->code); 3919 x = caar (SCHEME_V->code);
… …
3944 { 3952 {
3945 if (!is_pair (y = caar (x))) 3953 if (!is_pair (y = caar (x)))
3946 break; 3954 break;
3947 3955
3948 for (; y != NIL; y = cdr (y)) 3956 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3957 if (eqv (car (y), SCHEME_V->value))
3951 break; 3958 break;
3952 }
3953 3959
3954 if (y != NIL) 3960 if (y != NIL)
3955 break; 3961 break;
3956 } 3962 }
3957 3963
… …
3977 s_goto (OP_BEGIN); 3983 s_goto (OP_BEGIN);
3978 else 3984 else
3979 s_return (NIL); 3985 s_return (NIL);
3980 3986
3981 case OP_PAPPLY: /* apply */ 3987 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 3988 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3989 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3990 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 3991 s_goto (OP_APPLY);
3986 3992
3987 case OP_PEVAL: /* eval */ 3993 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 3994 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 3995 SCHEME_V->envir = cadr (args);
3990 3996
3991 SCHEME_V->code = car (SCHEME_V->args); 3997 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 3998 s_goto (OP_EVAL);
3993 3999
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 4000 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 4001 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4002 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
3998 } 4004 }
3999 4005
4000 return S_T; 4006 if (USE_ERROR_CHECKING) abort ();
4001} 4007}
4002 4008
4003static pointer 4009static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4010opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 4011{
4006 pointer x; 4012 pointer args = SCHEME_V->args;
4013 pointer x = car (args);
4007 num v; 4014 num v;
4008 4015
4016 switch (op)
4017 {
4009#if USE_MATH 4018#if USE_MATH
4010 RVALUE dd;
4011#endif
4012
4013 switch (op)
4014 {
4015#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 4019 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args); 4020 {
4019
4020 if (num_is_integer (x)) 4021 if (is_integer (x))
4021 s_return (x); 4022 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4023
4024 RVALUE r = rvalue_unchecked (x);
4025
4026 if (r == (RVALUE)(IVALUE)r)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4027 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4024 else 4028 else
4025 Error_1 ("inexact->exact: not integral:", x); 4029 Error_1 ("inexact->exact: not integral:", x);
4030 }
4026 4031
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4032 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4033 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4034 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4035 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4036 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4037 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4038 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 4039
4055 case OP_ATAN: 4040 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 4041 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4042 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 4043 else
4061 { 4044 {
4062 pointer y = cadr (SCHEME_V->args); 4045 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4046 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 4047 }
4066 4048
4067 case OP_SQRT: 4049 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4050 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 4051
4071 case OP_EXPT: 4052 case OP_EXPT:
4072 { 4053 {
4073 RVALUE result; 4054 RVALUE result;
4074 int real_result = 1; 4055 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 4056 pointer y = cadr (args);
4076 4057
4077 x = car (SCHEME_V->args);
4078
4079 if (num_is_integer (x) && num_is_integer (y)) 4058 if (is_integer (x) && is_integer (y))
4080 real_result = 0; 4059 real_result = 0;
4081 4060
4082 /* This 'if' is an R5RS compatibility fix. */ 4061 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 4062 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 4063 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 4064 result = 0;
4086 else 4065 else
4087 result = pow (rvalue (x), rvalue (y)); 4066 result = pow (rvalue (x), rvalue (y));
4088 4067
4089 /* Before returning integer result make sure we can. */ 4068 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 4069 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 4070 if (!real_result)
4092 { 4071 {
4093 long result_as_long = (long) result; 4072 long result_as_long = result;
4094 4073
4095 if (result != (RVALUE) result_as_long) 4074 if (result != result_as_long)
4096 real_result = 1; 4075 real_result = 1;
4097 } 4076 }
4098 4077
4099 if (real_result) 4078 if (real_result)
4100 s_return (mk_real (SCHEME_A_ result)); 4079 s_return (mk_real (SCHEME_A_ result));
4101 else 4080 else
4102 s_return (mk_integer (SCHEME_A_ result)); 4081 s_return (mk_integer (SCHEME_A_ result));
4103 } 4082 }
4104 4083
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4084 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4085 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 4086
4113 case OP_TRUNCATE: 4087 case OP_TRUNCATE:
4114 { 4088 {
4115 RVALUE rvalue_of_x; 4089 RVALUE n = rvalue (x);
4116
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x);
4119
4120 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4090 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4122 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4091 }
4125 4092
4126 case OP_ROUND: 4093 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4094 if (is_integer (x))
4130 s_return (x); 4095 s_return (x);
4131 4096
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4097 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4098#endif
4134 4099
4135 case OP_ADD: /* + */ 4100 case OP_ADD: /* + */
4136 v = num_zero; 4101 v = num_zero;
4137 4102
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4103 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4104 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4105
4141 s_return (mk_number (SCHEME_A_ v)); 4106 s_return (mk_number (SCHEME_A_ v));
4142 4107
4143 case OP_MUL: /* * */ 4108 case OP_MUL: /* * */
4144 v = num_one; 4109 v = num_one;
4145 4110
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4111 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4112 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4113
4149 s_return (mk_number (SCHEME_A_ v)); 4114 s_return (mk_number (SCHEME_A_ v));
4150 4115
4151 case OP_SUB: /* - */ 4116 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4117 if (cdr (args) == NIL)
4153 { 4118 {
4154 x = SCHEME_V->args; 4119 x = args;
4155 v = num_zero; 4120 v = num_zero;
4156 } 4121 }
4157 else 4122 else
4158 { 4123 {
4159 x = cdr (SCHEME_V->args); 4124 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4125 v = nvalue (car (args));
4161 } 4126 }
4162 4127
4163 for (; x != NIL; x = cdr (x)) 4128 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4129 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4130
4166 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4167 4132
4168 case OP_DIV: /* / */ 4133 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4134 if (cdr (args) == NIL)
4170 { 4135 {
4171 x = SCHEME_V->args; 4136 x = args;
4172 v = num_one; 4137 v = num_one;
4173 } 4138 }
4174 else 4139 else
4175 { 4140 {
4176 x = cdr (SCHEME_V->args); 4141 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4142 v = nvalue (car (args));
4178 } 4143 }
4179 4144
4180 for (; x != NIL; x = cdr (x)) 4145 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4146 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4147 v = num_div (v, nvalue (car (x)));
4184 else 4148 else
4185 Error_0 ("/: division by zero"); 4149 Error_0 ("/: division by zero");
4186 }
4187 4150
4188 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4189 4152
4190 case OP_INTDIV: /* quotient */ 4153 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4154 if (cdr (args) == NIL)
4192 { 4155 {
4193 x = SCHEME_V->args; 4156 x = args;
4194 v = num_one; 4157 v = num_one;
4195 } 4158 }
4196 else 4159 else
4197 { 4160 {
4198 x = cdr (SCHEME_V->args); 4161 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4162 v = nvalue (car (args));
4200 } 4163 }
4201 4164
4202 for (; x != NIL; x = cdr (x)) 4165 for (; x != NIL; x = cdr (x))
4203 { 4166 {
4204 if (ivalue (car (x)) != 0) 4167 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4168 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4169 else
4207 Error_0 ("quotient: division by zero"); 4170 Error_0 ("quotient: division by zero");
4208 } 4171 }
4209 4172
4210 s_return (mk_number (SCHEME_A_ v)); 4173 s_return (mk_number (SCHEME_A_ v));
4211 4174
4212 case OP_REM: /* remainder */ 4175 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4176 v = nvalue (x);
4214 4177
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4178 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4179 v = num_rem (v, nvalue (cadr (args)));
4217 else 4180 else
4218 Error_0 ("remainder: division by zero"); 4181 Error_0 ("remainder: division by zero");
4219 4182
4220 s_return (mk_number (SCHEME_A_ v)); 4183 s_return (mk_number (SCHEME_A_ v));
4221 4184
4222 case OP_MOD: /* modulo */ 4185 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4186 v = nvalue (x);
4224 4187
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4188 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4189 v = num_mod (v, nvalue (cadr (args)));
4227 else 4190 else
4228 Error_0 ("modulo: division by zero"); 4191 Error_0 ("modulo: division by zero");
4229 4192
4230 s_return (mk_number (SCHEME_A_ v)); 4193 s_return (mk_number (SCHEME_A_ v));
4231 4194
4232 case OP_CAR: /* car */ 4195 case OP_CAR: /* car */
4233 s_return (caar (SCHEME_V->args)); 4196 s_return (caar (args));
4234 4197
4235 case OP_CDR: /* cdr */ 4198 case OP_CDR: /* cdr */
4236 s_return (cdar (SCHEME_V->args)); 4199 s_return (cdar (args));
4237 4200
4238 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4203 s_return (args);
4241 4204
4242 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4244 { 4207 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4247 } 4210 }
4248 else 4211 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4250 4213
4251 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4253 { 4216 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4256 } 4219 }
4257 else 4220 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4222
4260 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4262 4225
4263 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4265 4228
4266 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4267 { 4230 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4231 unsigned char c = ivalue_unchecked (x);
4269 c = toupper (c); 4232 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4271 } 4234 }
4272 4235
4273 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4274 { 4237 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4276 c = tolower (c); 4239 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4278 } 4241 }
4279 4242
4280 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4245
4283 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4284 { 4247 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4286 long pf = 0; 4249 long pf = 0;
4287 4250
4288 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4289 { 4252 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4293 4256
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4258 {
4296 /* base is OK */ 4259 /* base is OK */
4297 } 4260 }
4298 else 4261 else
4299 pf = -1; 4262 pf = -1;
4300 } 4263 }
4301 4264
4302 if (pf < 0) 4265 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4269 else
4307 { 4270 {
4308 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
… …
4319 } 4282 }
4320 } 4283 }
4321 } 4284 }
4322 4285
4323 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4288 setimmutable (x);
4326 s_return (x); 4289 s_return (x);
4327 4290
4328 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4329 { 4292 {
4330 long pf = 0; 4293 long pf = 0;
4331 4294
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4335 { 4296 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4339 4300
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4302 {
4342 /* base is OK */ 4303 /* base is OK */
4343 } 4304 }
4344 else 4305 else
4345 pf = -1; 4306 pf = -1;
4346 } 4307 }
4347 4308
4348 if (pf < 0) 4309 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4312 {
4352 char *p; 4313 char *p;
4353 int len; 4314 int len;
4354 4315
… …
4359 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4360 } 4321 }
4361 4322
4362 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4363 { 4324 {
4364 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4365 int len; 4326 int len = ivalue_unchecked (x);
4366 4327
4367 len = ivalue (car (SCHEME_V->args));
4368
4369 if (cdr (SCHEME_V->args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args));
4371
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4329 }
4374 4330
4375 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4333
4378 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4379 { 4335 {
4380 char *str; 4336 char *str = strvalue (x);
4381 int index;
4382
4383 str = strvalue (car (SCHEME_V->args));
4384
4385 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4386 4338
4387 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4341
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4343 }
4392 4344
4393 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4394 { 4346 {
4395 char *str; 4347 char *str = strvalue (x);
4396 int index; 4348 int index = ivalue_unchecked (cadr (args));
4397 int c; 4349 int c;
4398 4350
4399 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4353
4402 str = strvalue (car (SCHEME_V->args));
4403
4404 index = ivalue (cadr (SCHEME_V->args));
4405
4406 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4356
4409 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4410 4358
4411 str[index] = (char) c; 4359 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4413 } 4361 }
4414 4362
4415 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4416 { 4364 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4365 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4366 int len = 0;
4419 pointer newstr; 4367 pointer newstr;
4420 char *pos; 4368 char *pos;
4421 4369
4422 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4372 len += strlength (car (x));
4425 4373
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4375
4428 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4377 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4379
4432 s_return (newstr); 4380 s_return (newstr);
4433 } 4381 }
4434 4382
4435 case OP_SUBSTR: /* substring */ 4383 case OP_SUBSTR: /* substring */
4436 { 4384 {
4437 char *str; 4385 char *str = strvalue (x);
4438 int index0; 4386 int index0 = ivalue_unchecked (cadr (args));
4439 int index1; 4387 int index1;
4440 int len; 4388 int len;
4441 4389
4442 str = strvalue (car (SCHEME_V->args));
4443
4444 index0 = ivalue (cadr (SCHEME_V->args));
4445
4446 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4391 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4392
4449 if (cddr (SCHEME_V->args) != NIL) 4393 if (cddr (args) != NIL)
4450 { 4394 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4452 4396
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4399 }
4456 else 4400 else
4457 index1 = strlength (car (SCHEME_V->args)); 4401 index1 = strlength (x);
4458 4402
4459 len = index1 - index0; 4403 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4405 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4406 strvalue (x)[len] = 0;
… …
4466 4410
4467 case OP_VECTOR: /* vector */ 4411 case OP_VECTOR: /* vector */
4468 { 4412 {
4469 int i; 4413 int i;
4470 pointer vec; 4414 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4415 int len = list_length (SCHEME_A_ args);
4472 4416
4473 if (len < 0) 4417 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4418 Error_1 ("vector: not a proper list:", args);
4475 4419
4476 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4477 4421
4478#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4424 s_return (S_SINK);
4481#endif 4425#endif
4482 4426
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4427 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4428 vector_set (vec, i, car (x));
4485 4429
4486 s_return (vec); 4430 s_return (vec);
4487 } 4431 }
4488 4432
4489 case OP_MKVECTOR: /* make-vector */ 4433 case OP_MKVECTOR: /* make-vector */
4490 { 4434 {
4491 pointer fill = NIL; 4435 pointer fill = NIL;
4492 int len;
4493 pointer vec; 4436 pointer vec;
4437 int len = ivalue_unchecked (x);
4494 4438
4495 len = ivalue (car (SCHEME_V->args));
4496
4497 if (cdr (SCHEME_V->args) != NIL) 4439 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4440 fill = cadr (args);
4499 4441
4500 vec = mk_vector (SCHEME_A_ len); 4442 vec = mk_vector (SCHEME_A_ len);
4501 4443
4502#if USE_ERROR_CHECKING 4444#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4445 if (SCHEME_V->no_memory)
4504 s_return (S_SINK); 4446 s_return (S_SINK);
4505#endif 4447#endif
4506 4448
4507 if (fill != NIL) 4449 if (fill != NIL)
4508 fill_vector (vec, fill); 4450 fill_vector (vec, 0, fill);
4509 4451
4510 s_return (vec); 4452 s_return (vec);
4511 } 4453 }
4512 4454
4513 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4456 s_return (mk_integer (SCHEME_A_ veclength (x)));
4457
4458 case OP_VECRESIZE:
4459 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4460 s_return (x);
4515 4461
4516 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4517 { 4463 {
4518 int index;
4519
4520 index = ivalue (cadr (SCHEME_V->args)); 4464 int index = ivalue_unchecked (cadr (args));
4521 4465
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4467 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4468
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4469 s_return (vector_get (x, index));
4526 } 4470 }
4527 4471
4528 case OP_VECSET: /* vector-set! */ 4472 case OP_VECSET: /* vector-set! */
4529 { 4473 {
4530 int index; 4474 int index = ivalue_unchecked (cadr (args));
4531 4475
4532 if (is_immutable (car (SCHEME_V->args))) 4476 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4477 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4478
4535 index = ivalue (cadr (SCHEME_V->args));
4536
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4479 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4480 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4481
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4482 vector_set (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4483 s_return (x);
4542 } 4484 }
4543 } 4485 }
4544 4486
4545 return S_T; 4487 if (USE_ERROR_CHECKING) abort ();
4546} 4488}
4547 4489
4548INTERFACE int 4490static int
4549is_list (SCHEME_P_ pointer a) 4491opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4550{ 4492{
4551 return list_length (SCHEME_A_ a) >= 0; 4493 pointer x = SCHEME_V->args;
4552}
4553 4494
4554/* Result is: 4495 for (;;)
4555 proper list: length
4556 circular list: -1
4557 not even a pair: -2
4558 dotted list: -2 minus length before dot
4559*/
4560INTERFACE int
4561list_length (SCHEME_P_ pointer a)
4562{
4563 int i = 0;
4564 pointer slow, fast;
4565
4566 slow = fast = a;
4567
4568 while (1)
4569 { 4496 {
4497 num v = nvalue (car (x));
4498 x = cdr (x);
4499
4570 if (fast == NIL) 4500 if (x == NIL)
4571 return i; 4501 break;
4572 4502
4573 if (!is_pair (fast)) 4503 int r = num_cmp (v, nvalue (car (x)));
4574 return -2 - i;
4575 4504
4576 fast = cdr (fast); 4505 switch (op)
4577 ++i;
4578
4579 if (fast == NIL)
4580 return i;
4581
4582 if (!is_pair (fast))
4583 return -2 - i;
4584
4585 ++i;
4586 fast = cdr (fast);
4587
4588 /* Safe because we would have already returned if `fast'
4589 encountered a non-pair. */
4590 slow = cdr (slow);
4591
4592 if (fast == slow)
4593 { 4506 {
4594 /* the fast pointer has looped back around and caught up 4507 case OP_NUMEQ: r = r == 0; break;
4595 with the slow pointer, hence the structure is circular, 4508 case OP_LESS: r = r < 0; break;
4596 not of finite length, and therefore not a list */ 4509 case OP_GRE: r = r > 0; break;
4597 return -1; 4510 case OP_LEQ: r = r <= 0; break;
4511 case OP_GEQ: r = r >= 0; break;
4598 } 4512 }
4599 }
4600}
4601 4513
4514 if (!r)
4515 s_return (S_F);
4516 }
4517
4518 s_return (S_T);
4519}
4520
4602static pointer 4521static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4522opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4523{
4605 pointer x; 4524 pointer args = SCHEME_V->args;
4606 num v; 4525 pointer a = car (args);
4607 int (*comp_func) (num, num); 4526 pointer d = cdr (args);
4527 int r;
4608 4528
4609 switch (op) 4529 switch (op)
4610 { 4530 {
4611 case OP_NOT: /* not */ 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4537 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4538 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4539 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4540 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4541
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4542#if USE_CHAR_CLASSIFIERS
4683 4543 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4684 case OP_CHARAP: /* char-alphabetic? */ 4544 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4545 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4686 4546 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4687 case OP_CHARNP: /* char-numeric? */ 4547 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4548#endif
4549
4699#if USE_PORTS 4550#if USE_PORTS
4700 4551 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4552 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4553 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4554#endif
4710 4555
4711 case OP_PROCP: /* procedure? */ 4556 case OP_PROCP: /* procedure? */
4712 4557
4713 /*-- 4558 /*--
4714 * continuation should be procedure by the example 4559 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4560 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4561 * in R^3 report sec. 6.9
4717 */ 4562 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4563 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4564 break;
4720 4565
4721 case OP_PAIRP: /* pair? */ 4566 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4567 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4568 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4569 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4570 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4571 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4572 }
4739 4573
4740 return S_T; 4574 s_retbool (r);
4741} 4575}
4742 4576
4743static pointer 4577static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4578opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4579{
4580 pointer args = SCHEME_V->args;
4581 pointer a = car (args);
4746 pointer x, y; 4582 pointer x, y;
4747 4583
4748 switch (op) 4584 switch (op)
4749 { 4585 {
4750 case OP_FORCE: /* force */ 4586 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4587 SCHEME_V->code = a;
4752 4588
4753 if (is_promise (SCHEME_V->code)) 4589 if (is_promise (SCHEME_V->code))
4754 { 4590 {
4755 /* Should change type to closure here */ 4591 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4592 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4613 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4614 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4615 }
4780 } 4616 }
4781 4617
4782 SCHEME_V->args = car (SCHEME_V->args); 4618 SCHEME_V->args = a;
4783 4619
4784 if (op == OP_WRITE) 4620 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4621 SCHEME_V->print_flag = 1;
4786 else 4622 else
4787 SCHEME_V->print_flag = 0; 4623 SCHEME_V->print_flag = 0;
4788 4624
4789 s_goto (OP_P0LIST); 4625 s_goto (OP_P0LIST);
4790 4626
4791 case OP_NEWLINE: /* newline */ 4627 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4628 if (is_pair (args))
4793 { 4629 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4630 if (a != SCHEME_V->outport)
4795 { 4631 {
4796 x = cons (SCHEME_V->outport, NIL); 4632 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4633 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4634 SCHEME_V->outport = a;
4799 } 4635 }
4800 } 4636 }
4801 4637
4802 putstr (SCHEME_A_ "\n"); 4638 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4639 s_return (S_T);
4804#endif 4640#endif
4805 4641
4806 case OP_ERR0: /* error */ 4642 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4643 SCHEME_V->retcode = -1;
4808 4644
4809 if (!is_string (car (SCHEME_V->args))) 4645 if (!is_string (a))
4810 { 4646 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4647 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4648 setimmutable (car (args));
4813 } 4649 }
4814 4650
4815 putstr (SCHEME_A_ "Error: "); 4651 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4652 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4653 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4654 s_goto (OP_ERR1);
4819 4655
4820 case OP_ERR1: /* error */ 4656 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4657 putstr (SCHEME_A_ " ");
4822 4658
4823 if (SCHEME_V->args != NIL) 4659 if (args != NIL)
4824 { 4660 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4661 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4662 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4663 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
4829 } 4665 }
4830 else 4666 else
4831 { 4667 {
4832 putstr (SCHEME_A_ "\n"); 4668 putstr (SCHEME_A_ "\n");
4833 4669
4834 if (SCHEME_V->interactive_repl) 4670 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4671 s_goto (OP_T0LVL);
4836 else 4672 else
4837 return NIL; 4673 return -1;
4838 } 4674 }
4839 4675
4840 case OP_REVERSE: /* reverse */ 4676 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4677 s_return (reverse (SCHEME_A_ a));
4842 4678
4843 case OP_LIST_STAR: /* list* */ 4679 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4680 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4681
4846 case OP_APPEND: /* append */ 4682 case OP_APPEND: /* append */
4847 x = NIL; 4683 x = NIL;
4848 y = SCHEME_V->args; 4684 y = args;
4849 4685
4850 if (y == x) 4686 if (y == x)
4851 s_return (x); 4687 s_return (x);
4852 4688
4853 /* cdr() in the while condition is not a typo. If car() */ 4689 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4700 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4701
4866#if USE_PLIST 4702#if USE_PLIST
4867 4703
4868 case OP_PUT: /* put */ 4704 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4705 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4706 Error_0 ("illegal use of put");
4871 4707
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4708 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4709 {
4874 if (caar (x) == y) 4710 if (caar (x) == y)
4875 break; 4711 break;
4876 } 4712 }
4877 4713
4878 if (x != NIL) 4714 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4715 cdar (x) = caddr (args);
4880 else 4716 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4717 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4718
4883 s_return (S_T); 4719 s_return (S_T);
4884 4720
4885 case OP_GET: /* get */ 4721 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4722 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4723 Error_0 ("illegal use of get");
4888 4724
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4725 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4726 if (caar (x) == y)
4891 break; 4727 break;
4892 4728
4893 if (x != NIL) 4729 if (x != NIL)
4894 s_return (cdar (x)); 4730 s_return (cdar (x));
… …
4896 s_return (NIL); 4732 s_return (NIL);
4897 4733
4898#endif /* USE_PLIST */ 4734#endif /* USE_PLIST */
4899 4735
4900 case OP_QUIT: /* quit */ 4736 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4737 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4738 SCHEME_V->retcode = ivalue (a);
4903 4739
4904 return NIL; 4740 return -1;
4905 4741
4906 case OP_GC: /* gc */ 4742 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4743 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4744 s_return (S_T);
4909 4745
4910 case OP_GCVERB: /* gc-verbose */ 4746 case OP_GCVERB: /* gc-verbose */
4911 { 4747 {
4912 int was = SCHEME_V->gc_verbose; 4748 int was = SCHEME_V->gc_verbose;
4913 4749
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4750 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4751 s_retbool (was);
4916 } 4752 }
4917 4753
4918 case OP_NEWSEGMENT: /* new-segment */ 4754 case OP_NEWSEGMENT: /* new-segment */
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4755 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
4921 4757
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4758 alloc_cellseg (SCHEME_A_ ivalue (a));
4923 4759
4924 s_return (S_T); 4760 s_return (S_T);
4925 4761
4926 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
… …
4954 case OP_OPEN_INOUTFILE: 4790 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4791 prop = port_input | port_output;
4956 break; 4792 break;
4957 } 4793 }
4958 4794
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4795 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4796
4961 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4798 }
4966 4799
4967# if USE_STRING_PORTS 4800# if USE_STRING_PORTS
4968 4801
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4802 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4814 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4815 prop = port_input | port_output;
4983 break; 4816 break;
4984 } 4817 }
4985 4818
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4819 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4820 strvalue (a) + strlength (a), prop);
4988 4821
4989 if (p == NIL) 4822 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4823 }
4994 4824
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4825 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4826 {
4997 pointer p; 4827 pointer p;
4998 4828
4999 if (car (SCHEME_V->args) == NIL) 4829 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4831 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4833 strvalue (a) + strlength (a), port_output);
5010 4834
5011 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4836 }
5017 4837
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4839 {
5020 port *p; 4840 port *p;
5021 4841
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4842 if ((p = a->object.port)->kind & port_string)
5023 { 4843 {
5024 off_t size; 4844 off_t size;
5025 char *str; 4845 char *str;
5026 4846
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4863 }
5044 4864
5045# endif 4865# endif
5046 4866
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4867 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4868 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4869 s_return (S_T);
5050 4870
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4871 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4872 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4873 s_return (S_T);
5054#endif 4874#endif
5055 4875
5056 case OP_INT_ENV: /* interaction-environment */ 4876 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4877 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4879 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4880 s_return (SCHEME_V->envir);
5061 4881
5062 } 4882 }
5063 4883
5064 return S_T; 4884 if (USE_ERROR_CHECKING) abort ();
5065} 4885}
5066 4886
5067static pointer 4887static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4888opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4889{
4890 pointer args = SCHEME_V->args;
5070 pointer x; 4891 pointer x;
5071 4892
5072 if (SCHEME_V->nesting != 0) 4893 if (SCHEME_V->nesting != 0)
5073 { 4894 {
5074 int n = SCHEME_V->nesting; 4895 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4902 switch (op)
5082 { 4903 {
5083 /* ========== reading part ========== */ 4904 /* ========== reading part ========== */
5084#if USE_PORTS 4905#if USE_PORTS
5085 case OP_READ: 4906 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4907 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4908 s_goto (OP_READ_INTERNAL);
5088 4909
5089 if (!is_inport (car (SCHEME_V->args))) 4910 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4911 Error_1 ("read: not an input port:", car (args));
5091 4912
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4913 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5094 4915
5095 x = SCHEME_V->inport; 4916 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4917 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4918 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4919 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5100 4921
5101 case OP_READ_CHAR: /* read-char */ 4922 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4923 case OP_PEEK_CHAR: /* peek-char */
5103 { 4924 {
5104 int c; 4925 int c;
5105 4926
5106 if (is_pair (SCHEME_V->args)) 4927 if (is_pair (args))
5107 { 4928 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4929 if (car (args) != SCHEME_V->inport)
5109 { 4930 {
5110 x = SCHEME_V->inport; 4931 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4932 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4934 SCHEME_V->inport = car (args);
5114 } 4935 }
5115 } 4936 }
5116 4937
5117 c = inchar (SCHEME_A); 4938 c = inchar (SCHEME_A);
5118 4939
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4949 case OP_CHAR_READY: /* char-ready? */
5129 { 4950 {
5130 pointer p = SCHEME_V->inport; 4951 pointer p = SCHEME_V->inport;
5131 int res; 4952 int res;
5132 4953
5133 if (is_pair (SCHEME_V->args)) 4954 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4955 p = car (args);
5135 4956
5136 res = p->object.port->kind & port_string; 4957 res = p->object.port->kind & port_string;
5137 4958
5138 s_retbool (res); 4959 s_retbool (res);
5139 } 4960 }
5140 4961
5141 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 4963 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 4964 s_return (SCHEME_V->value);
5144 4965
5145 case OP_SET_OUTPORT: /* set-output-port */ 4966 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 4967 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 4968 s_return (SCHEME_V->value);
5148#endif 4969#endif
5149 4970
5150 case OP_RDSEXPR: 4971 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 4972 switch (SCHEME_V->tok)
… …
5200 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5201 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
5202 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
5203 5024
5204 case TOK_ATOM: 5025 case TOK_ATOM:
5205 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5026 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5027
5028 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031
5032 case TOK_STRATOM:
5033 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5206 5036
5207 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
5208 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
5209 5039
5210 if (x == S_F) 5040 if (x == S_F)
5211 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
5212 5042
5213 setimmutable (x); 5043 setimmutable (x);
… …
5225 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
5226 } 5056 }
5227 } 5057 }
5228 5058
5229 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
5230 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5231 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
5232 else 5062 else
5233 s_return (x); 5063 s_return (x);
5234 5064
5235 default: 5065 default:
… …
5237 } 5067 }
5238 5068
5239 break; 5069 break;
5240 5070
5241 case OP_RDLIST: 5071 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5072 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5073 SCHEME_V->tok = token (SCHEME_A);
5244 5074
5245 switch (SCHEME_V->tok) 5075 switch (SCHEME_V->tok)
5246 { 5076 {
5247 case TOK_EOF: 5077 case TOK_EOF:
… …
5275 case OP_RDDOT: 5105 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5106 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5107 Error_0 ("syntax error: illegal dot expression");
5278 5108
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5109 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5110 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5111
5282 case OP_RDQUOTE: 5112 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5113 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5114
5285 case OP_RDQQUOTE: 5115 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5137 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5138 s_goto (OP_VECTOR);
5309 5139
5310 /* ========== printing part ========== */ 5140 /* ========== printing part ========== */
5311 case OP_P0LIST: 5141 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5142 if (is_vector (args))
5313 { 5143 {
5314 putstr (SCHEME_A_ "#("); 5144 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5145 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5146 s_goto (OP_PVECFROM);
5317 } 5147 }
5318 else if (is_environment (SCHEME_V->args)) 5148 else if (is_environment (args))
5319 { 5149 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5150 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5151 s_return (S_T);
5322 } 5152 }
5323 else if (!is_pair (SCHEME_V->args)) 5153 else if (!is_pair (args))
5324 { 5154 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5155 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5156 s_return (S_T);
5327 } 5157 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5158 else
5329 { 5159 {
5160 pointer a = car (args);
5161 pointer b = cdr (args);
5162 int ok_abbr = ok_abbrev (b);
5163 SCHEME_V->args = car (b);
5164
5165 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5166 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5167 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ "`");
5169 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5170 putstr (SCHEME_A_ ",");
5171 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5172 putstr (SCHEME_A_ ",@");
5173 else
5174 {
5175 putstr (SCHEME_A_ "(");
5176 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5177 SCHEME_V->args = a;
5178 }
5179
5332 s_goto (OP_P0LIST); 5180 s_goto (OP_P0LIST);
5333 } 5181 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5182
5183 case OP_P1LIST:
5184 if (is_pair (args))
5335 { 5185 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5187 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5188 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5189 s_goto (OP_P0LIST);
5339 } 5190 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5191 else if (is_vector (args))
5369 { 5192 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5193 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5194 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5195 s_goto (OP_P0LIST);
5373 } 5196 }
5374 else 5197 else
5375 { 5198 {
5376 if (SCHEME_V->args != NIL) 5199 if (args != NIL)
5377 { 5200 {
5378 putstr (SCHEME_A_ " . "); 5201 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5203 }
5381 5204
5382 putstr (SCHEME_A_ ")"); 5205 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5206 s_return (S_T);
5384 } 5207 }
5385 5208
5386 case OP_PVECFROM: 5209 case OP_PVECFROM:
5387 { 5210 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5211 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5212 pointer vec = car (args);
5390 int len = veclength (vec); 5213 int len = veclength (vec);
5391 5214
5392 if (i == len) 5215 if (i == len)
5393 { 5216 {
5394 putstr (SCHEME_A_ ")"); 5217 putstr (SCHEME_A_ ")");
5395 s_return (S_T); 5218 s_return (S_T);
5396 } 5219 }
5397 else 5220 else
5398 { 5221 {
5399 pointer elem = vector_elem (vec, i); 5222 pointer elem = vector_get (vec, i);
5400 5223
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5224 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5226 SCHEME_V->args = elem;
5404 5227
5405 if (i > 0) 5228 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5229 putstr (SCHEME_A_ " ");
5407 5230
5408 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5409 } 5232 }
5410 } 5233 }
5411 } 5234 }
5412 5235
5413 return S_T; 5236 if (USE_ERROR_CHECKING) abort ();
5414} 5237}
5415 5238
5416static pointer 5239static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5240opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5241{
5242 pointer args = SCHEME_V->args;
5243 pointer a = car (args);
5419 pointer x, y; 5244 pointer x, y;
5420 5245
5421 switch (op) 5246 switch (op)
5422 { 5247 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5248 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5249 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5250 long v = list_length (SCHEME_A_ a);
5426 5251
5427 if (v < 0) 5252 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5253 Error_1 ("length: not a list:", a);
5429 5254
5430 s_return (mk_integer (SCHEME_A_ v)); 5255 s_return (mk_integer (SCHEME_A_ v));
5431 } 5256 }
5432 5257
5433 case OP_ASSQ: /* assq *//* a.k */ 5258 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5259 x = a;
5435 5260
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5261 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5262 {
5438 if (!is_pair (car (y))) 5263 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5264 Error_0 ("unable to handle non pair element");
5440 5265
5441 if (x == caar (y)) 5266 if (x == caar (y))
… …
5447 else 5272 else
5448 s_return (S_F); 5273 s_return (S_F);
5449 5274
5450 5275
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5277 SCHEME_V->args = a;
5453 5278
5454 if (SCHEME_V->args == NIL) 5279 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5280 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5281 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5462 5287
5463 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5464 /* 5289 /*
5465 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5467 */ 5293 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5294 s_retbool (is_closure (a));
5469 5295
5470 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5297 s_retbool (is_macro (a));
5472 } 5298 }
5473 5299
5474 return S_T; /* NOTREACHED */ 5300 if (USE_ERROR_CHECKING) abort ();
5475} 5301}
5476 5302
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5305
5479typedef int (*test_predicate) (pointer); 5306typedef int (*test_predicate)(pointer);
5480static int 5307static int
5481is_any (pointer p) 5308tst_any (pointer p)
5482{ 5309{
5483 return 1; 5310 return 1;
5484} 5311}
5485 5312
5486static int 5313static int
5487is_nonneg (pointer p) 5314tst_inonneg (pointer p)
5488{ 5315{
5489 return ivalue (p) >= 0 && is_integer (p); 5316 return is_integer (p) && ivalue_unchecked (p) >= 0;
5317}
5318
5319static int
5320tst_is_list (SCHEME_P_ pointer p)
5321{
5322 return p == NIL || is_pair (p);
5490} 5323}
5491 5324
5492/* Correspond carefully with following defines! */ 5325/* Correspond carefully with following defines! */
5493static struct 5326static struct
5494{ 5327{
5495 test_predicate fct; 5328 test_predicate fct;
5496 const char *kind; 5329 const char *kind;
5497} tests[] = 5330} tests[] = {
5498{ 5331 { tst_any , 0 },
5499 { 0, 0}, /* unused */ 5332 { is_string , "string" },
5500 { is_any, 0}, 5333 { is_symbol , "symbol" },
5501 { is_string, "string" }, 5334 { is_port , "port" },
5502 { is_symbol, "symbol" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5335 { is_inport , "input port" },
5505 { is_outport, "output port" }, 5336 { is_outport , "output port" },
5506 { is_environment, "environment" }, 5337 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5338 { is_pair , "pair" },
5508 { 0, "pair or '()" }, 5339 { 0 , "pair or '()" },
5509 { is_character, "character" }, 5340 { is_character , "character" },
5510 { is_vector, "vector" }, 5341 { is_vector , "vector" },
5511 { is_number, "number" }, 5342 { is_number , "number" },
5512 { is_integer, "integer" }, 5343 { is_integer , "integer" },
5513 { is_nonneg, "non-negative integer" } 5344 { tst_inonneg , "non-negative integer" }
5514}; 5345};
5515 5346
5516#define TST_NONE 0 5347#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5348#define TST_ANY "\001"
5518#define TST_STRING "\002" 5349#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5350#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5351#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5352#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5353#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5354#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5355#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5356#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5357#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5358#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5359#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5360#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5361#define TST_NATURAL "\016"
5362
5363#define INF_ARG 0xff
5364#define UNNAMED_OP ""
5365
5366static const char opnames[] =
5367#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5368#include "opdefines.h"
5369#undef OP_DEF
5370;
5371
5372static const char *
5373opname (int idx)
5374{
5375 const char *name = opnames;
5376
5377 /* should do this at compile time, but would require external program, right? */
5378 while (idx--)
5379 name += strlen (name) + 1;
5380
5381 return *name ? name : "ILLEGAL";
5382}
5383
5384static const char *
5385procname (pointer x)
5386{
5387 return opname (procnum (x));
5388}
5531 5389
5532typedef struct 5390typedef struct
5533{ 5391{
5534 dispatch_func func; 5392 uint8_t func;
5535 char *name; 5393 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5394 uint8_t builtin;
5395#if USE_ERROR_CHECKING
5536 int min_arity; 5396 uint8_t min_arity;
5537 int max_arity; 5397 uint8_t max_arity;
5538 char *arg_tests_encoding; 5398 char arg_tests_encoding[3];
5399#endif
5539} op_code_info; 5400} op_code_info;
5540 5401
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5402static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5403#if USE_ERROR_CHECKING
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5405#else
5406#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5407#endif
5545#include "opdefines.h" 5408#include "opdefines.h"
5409#undef OP_DEF
5546 {0} 5410 {0}
5547}; 5411};
5548 5412
5549static const char *
5550procname (pointer x)
5551{
5552 int n = procnum (x);
5553 const char *name = dispatch_table[n].name;
5554
5555 if (name == 0)
5556 name = "ILLEGAL!";
5557
5558 return name;
5559}
5560
5561/* kernel of this interpreter */ 5413/* kernel of this interpreter */
5562static void 5414static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5416{
5565 SCHEME_V->op = op; 5417 SCHEME_V->op = op;
5566 5418
5567 for (;;) 5419 for (;;)
5568 { 5420 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5421 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5422
5571#if USE_ERROR_CHECKING 5423#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5424 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5425 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5426 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5427 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5428
5578 /* Check number of arguments */ 5429 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5430 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5431 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5432 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5433 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5584 } 5436 }
5585 5437 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5438 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5439 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5440 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5441 xError_1 (SCHEME_A_ msg, 0);
5442 continue;
5591 } 5443 }
5592 5444 else
5593 if (ok)
5594 { 5445 {
5595 if (pcd->arg_tests_encoding) 5446 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5447 {
5597 int i = 0; 5448 int i = 0;
5598 int j; 5449 int j;
5599 const char *t = pcd->arg_tests_encoding; 5450 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5451 pointer arglist = SCHEME_V->args;
5601 5452
5602 do 5453 do
5603 { 5454 {
5604 pointer arg = car (arglist); 5455 pointer arg = car (arglist);
5605 5456
5606 j = (int) t[0]; 5457 j = t[0];
5607 5458
5459 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5608 if (j == TST_LIST[0]) 5460 if (j == TST_LIST[0])
5609 { 5461 {
5610 if (arg != NIL && !is_pair (arg)) 5462 if (!tst_is_list (SCHEME_A_ arg))
5611 break; 5463 break;
5612 } 5464 }
5613 else 5465 else
5614 { 5466 {
5615 if (!tests[j].fct (arg)) 5467 if (!tests[j - 1].fct (arg))
5616 break; 5468 break;
5617 } 5469 }
5618 5470
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5471 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5620 t++; 5472 t++;
5621 5473
5622 arglist = cdr (arglist); 5474 arglist = cdr (arglist);
5623 i++; 5475 i++;
5624 } 5476 }
5625 while (i < n); 5477 while (i < n);
5626 5478
5627 if (i < n) 5479 if (i < n)
5628 { 5480 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5481 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5482 xError_1 (SCHEME_A_ msg, 0);
5483 continue;
5631 } 5484 }
5632 } 5485 }
5633 } 5486 }
5634
5635 if (!ok)
5636 {
5637 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5638 return;
5639
5640 pcd = dispatch_table + SCHEME_V->op;
5641 }
5642 } 5487 }
5643#endif 5488#endif
5644 5489
5645 ok_to_freely_gc (SCHEME_A); 5490 ok_to_freely_gc (SCHEME_A);
5646 5491
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5492 static const dispatch_func dispatch_funcs[] = {
5493 opexe_0,
5494 opexe_1,
5495 opexe_2,
5496 opexe_3,
5497 opexe_4,
5498 opexe_5,
5499 opexe_6,
5500 };
5501
5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5503 return;
5649 5504
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5506 {
5652 xwrstr ("No memory!\n"); 5507 xwrstr ("No memory!\n");
… …
5676mk_proc (SCHEME_P_ enum scheme_opcodes op) 5531mk_proc (SCHEME_P_ enum scheme_opcodes op)
5677{ 5532{
5678 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5533 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5679 set_typeflag (y, (T_PROC | T_ATOM)); 5534 set_typeflag (y, (T_PROC | T_ATOM));
5680 ivalue_unchecked (y) = op; 5535 ivalue_unchecked (y) = op;
5681 set_num_integer (y);
5682 return y; 5536 return y;
5683} 5537}
5684 5538
5685/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5686static int 5540static int
5687syntaxnum (pointer p) 5541syntaxnum (pointer p)
5688{ 5542{
5689 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
5690 5544
5691 switch (strlength (car (p))) 5545 switch (strlength (p))
5692 { 5546 {
5693 case 2: 5547 case 2:
5694 if (s[0] == 'i') 5548 if (s[0] == 'i')
5695 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
5696 else 5550 else
… …
5710 5564
5711 case 'd': 5565 case 'd':
5712 return OP_COND0; /* cond */ 5566 return OP_COND0; /* cond */
5713 5567
5714 case '*': 5568 case '*':
5715 return OP_LET0AST; /* let* */ 5569 return OP_LET0AST;/* let* */
5716 5570
5717 default: 5571 default:
5718 return OP_SET0; /* set! */ 5572 return OP_SET0; /* set! */
5719 } 5573 }
5720 5574
… …
5742 5596
5743 case 'f': 5597 case 'f':
5744 return OP_DEF0; /* define */ 5598 return OP_DEF0; /* define */
5745 5599
5746 default: 5600 default:
5747 return OP_LET0REC; /* letrec */ 5601 return OP_LET0REC;/* letrec */
5748 } 5602 }
5749 5603
5750 default: 5604 default:
5751 return OP_C0STREAM; /* cons-stream */ 5605 return OP_C0STREAM; /* cons-stream */
5752 } 5606 }
5753} 5607}
5754 5608
5755#if USE_MULTIPLICITY 5609#if USE_MULTIPLICITY
5756scheme * 5610ecb_cold scheme *
5757scheme_init_new () 5611scheme_init_new ()
5758{ 5612{
5759 scheme *sc = malloc (sizeof (scheme)); 5613 scheme *sc = malloc (sizeof (scheme));
5760 5614
5761 if (!scheme_init (SCHEME_A)) 5615 if (!scheme_init (SCHEME_A))
… …
5766 else 5620 else
5767 return sc; 5621 return sc;
5768} 5622}
5769#endif 5623#endif
5770 5624
5771int 5625ecb_cold int
5772scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
5773{ 5627{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5629 pointer x;
5776 5630
… …
5849 5703
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5704 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5705 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5706 }
5853 5707
5708 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5709 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5710 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5711 assign_proc (SCHEME_A_ i, opname (i));
5857 5712
5858 /* initialization of global pointers to special symbols */ 5713 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5714 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5715 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5716 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5755scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5756{
5902 SCHEME_V->ext_data = p; 5757 SCHEME_V->ext_data = p;
5903} 5758}
5904 5759
5905void 5760ecb_cold void
5906scheme_deinit (SCHEME_P) 5761scheme_deinit (SCHEME_P)
5907{ 5762{
5908 int i; 5763 int i;
5909 5764
5910#if SHOW_ERROR_LINE 5765#if SHOW_ERROR_LINE
… …
6002{ 5857{
6003 dump_stack_reset (SCHEME_A); 5858 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5859 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5860 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5861 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5862 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5863 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5864 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5865#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5866 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5867#endif
6013 SCHEME_V->retcode = 0; 5868 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5869 SCHEME_V->interactive_repl = 0;
… …
6131# endif 5986# endif
6132 int fin; 5987 int fin;
6133 char *file_name = InitFile; 5988 char *file_name = InitFile;
6134 int retcode; 5989 int retcode;
6135 int isfile = 1; 5990 int isfile = 1;
5991 system ("ps v $PPID");//D
6136 5992
6137 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5993 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6138 { 5994 {
6139 xwrstr ("Usage: tinyscheme -?\n"); 5995 xwrstr ("Usage: tinyscheme -?\n");
6140 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5996 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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