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.9 by root, Wed Nov 25 22:39:19 2015 UTC vs.
Revision 1.40 by root, Mon Nov 30 05:19:01 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 INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
629static 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);
630static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
631static 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);
… …
646static void mark (pointer a); 694static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 702static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
656static 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);
657static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
667static 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);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 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
678static num 754static num
679num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
680{ 756{
681 num ret; 757 num ret;
682 758
683 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));
684 760
685 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
686 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
687 else 774 else
688 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 }
689 783
690 return ret; 784 num_set_rvalue (ret, a.rvalue);
691} 785 }
692 786#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 787
705 return ret; 788 return ret;
706} 789}
707 790
708static num 791static num
709num_div (num a, num b) 792num_div (num a, num b)
710{ 793{
711 num ret; 794 num ret;
712 795
713 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);
714 797
715 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 800 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 802
750 return ret; 803 return ret;
751} 804}
752 805
753static num 806static num
… …
755{ 808{
756 num ret; 809 num ret;
757 long e1, e2, res; 810 long e1, e2, res;
758 811
759 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));
760 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
762 res = e1 % e2; 815 res = e1 % e2;
763 816
764 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
765 if (res > 0) 818 if (res > 0)
766 { 819 {
… …
782{ 835{
783 num ret; 836 num ret;
784 long e1, e2, res; 837 long e1, e2, res;
785 838
786 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));
787 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
789 res = e1 % e2; 842 res = e1 % e2;
790 843
791 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 845 if (res * e2 < 0)
793 res += e2; 846 res += e2;
794 847
795 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
796 return ret; 849 return ret;
797} 850}
798 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 853static int
800num_eq (num a, num b) 854num_cmp (num a, num b)
801{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 857 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 858
805 if (is_fixnum) 859 if (is_fixnum)
806 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 }
807 else 866 else
808 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 }
809 873
810 return ret; 874 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 875}
853 876
854#if USE_MATH 877#if USE_MATH
855 878
856/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
866 return ce; 889 return ce;
867 else if (dfl < dce) 890 else if (dfl < dce)
868 return fl; 891 return fl;
869 else 892 else
870 { 893 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 895 return fl;
873 else 896 else
874 return ce; 897 return ce;
875 } 898 }
876} 899}
877#endif 900#endif
878 901
879static int 902static int
880is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
881{ 904{
905 return x == 0;
906#if 0
882#if USE_REAL 907#if USE_REAL
883 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. */
884#else 909#else
885 return x == 0; 910 return x == 0;
911#endif
886#endif 912#endif
887} 913}
888 914
889/* allocate new cell segment */ 915/* allocate new cell segment */
890static int 916static int
… …
911 return k; 937 return k;
912 938
913 i = ++SCHEME_V->last_cell_seg; 939 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 940 SCHEME_V->alloc_seg[i] = cp;
915 941
916 /* insert new segment in address order */
917 newp = (pointer)cp; 942 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 943 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 944 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 945 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 946 last = newp + segsize - 1;
937 947
938 for (p = newp; p <= last; p++) 948 for (p = newp; p <= last; p++)
939 { 949 {
940 set_typeflag (p, T_FREE); 950 set_typeflag (p, T_PAIR);
941 set_car (p, NIL); 951 set_car (p, NIL);
942 set_cdr (p, p + 1); 952 set_cdr (p, p + 1);
943 } 953 }
944 954
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (last, SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = newp;
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 } 957 }
962 958
963 return n; 959 return n;
964} 960}
965 961
966/* get new cell. parameter a, b is marked by gc. */ 962/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 963ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 964get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 965{
970 if (SCHEME_V->free_cell == NIL) 966 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 967 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 969 return S_SINK;
974 970
975 if (SCHEME_V->free_cell == NIL) 971 if (SCHEME_V->free_cell == NIL)
… …
1044 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1042
1047 v->object.vector.vvalue = e; 1043 v->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1044 v->object.vector.length = len;
1049 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1047
1052 return v; 1048 return v;
1053} 1049}
1054 1050
1055static INLINE void 1051ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1057{ 1053{
1058 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1059} 1055}
1060 1056
… …
1099 return x; 1095 return x;
1100} 1096}
1101 1097
1102/* ========== oblist implementation ========== */ 1098/* ========== oblist implementation ========== */
1103 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
1104#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1105 1110
1111static int
1106static 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}
1107 1122
1108static pointer 1123static pointer
1109oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1110{ 1125{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1128
1114/* returns the new symbol */ 1129/* returns the new symbol */
1115static pointer 1130static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1132{
1118 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1119
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x));
1123
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 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)));
1126 return x; 1136 return x;
1127} 1137}
1128 1138
1129static INLINE pointer 1139ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1141{
1132 int location; 1142 int location;
1133 pointer x; 1143 pointer x;
1134 char *s; 1144 char *s;
1135 1145
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1147
1138 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))
1139 { 1149 {
1140 s = symname (car (x)); 1150 s = symname (car (x));
1141 1151
1142 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1153 int i; 1163 int i;
1154 pointer x; 1164 pointer x;
1155 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1156 1166
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 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))
1159 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1160 1170
1161 return ob_list; 1171 return ob_list;
1162} 1172}
1163 1173
… …
1167oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1168{ 1178{
1169 return NIL; 1179 return NIL;
1170} 1180}
1171 1181
1172static INLINE pointer 1182ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1184{
1175 pointer x; 1185 pointer x;
1176 char *s; 1186 char *s;
1177 1187
… …
1189 1199
1190/* returns the new symbol */ 1200/* returns the new symbol */
1191static pointer 1201static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1203{
1194 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x)); 1206 setimmutable (x);
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1208 return x;
1201} 1209}
1202 1210
1203static pointer 1211static pointer
… …
1236mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1237{ 1245{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1247
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1241 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1250
1243 return x; 1251 return x;
1244} 1252}
1245 1253
1246/* get number atom (integer) */ 1254/* get number atom (integer) */
1247INTERFACE pointer 1255INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1249{ 1257{
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1259
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1253 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1254 set_num_integer (x); 1262
1255 return x; 1263 return x;
1256} 1264}
1257 1265
1258INTERFACE pointer 1266INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1260{ 1268{
1269#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1271
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1264 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1265 set_num_real (x); 1274
1266 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1267} 1279}
1268 1280
1269static pointer 1281static pointer
1270mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1271{ 1283{
1284#if USE_REAL
1272 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
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1290#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1291}
1277 1292
1278/* allocate name to string area */ 1293/* allocate name to string area */
1279static char * 1294static char *
1280store_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)
… …
1286 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1288 } 1303 }
1289 1304
1290 if (str) 1305 if (str)
1291 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1307 else
1301 {
1302 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1303 q[len_str] = 0; 1310 q[len_str] = 0;
1304 }
1305 1311
1306 return q; 1312 return q;
1307} 1313}
1308 1314
1309INTERFACE pointer 1315INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1330
1325 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1333 strlength (x) = len;
1334
1328 return x; 1335 return x;
1329} 1336}
1330 1337
1331INTERFACE pointer 1338INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1339{ 1346{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1348}
1342 1349
1343INTERFACE void 1350INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1352{
1346 int i; 1353 int i;
1347 1354
1348 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1350} 1357}
1351 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
1352INTERFACE pointer 1368INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1354{ 1370{
1355 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1356} 1372}
1357 1373
1358INTERFACE void 1374INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1376{
1361 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1362} 1378}
1363 1379
1364/* get new symbol */ 1380/* get new symbol */
… …
1376 1392
1377INTERFACE pointer 1393INTERFACE pointer
1378gensym (SCHEME_P) 1394gensym (SCHEME_P)
1379{ 1395{
1380 pointer x; 1396 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1397 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, SCHEME_V->gensym_cnt);
1386 1399
1387 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name);
1389
1390 if (x == NIL)
1391 {
1392 x = oblist_add_by_name (SCHEME_A_ name);
1393 return x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1401}
1399 1402
1400/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1401static pointer 1404static pointer
1402mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1456 } 1459 }
1457 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1458 { 1461 {
1459 if (!has_fp_exp) 1462 if (!has_fp_exp)
1460 { 1463 {
1461 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1465 p++;
1464 1466
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1468 continue;
1467 } 1469 }
… …
1536 1538
1537/*-- 1539/*--
1538 * 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,
1539 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1540 * 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
1541 */ 1547 */
1542static void 1548static void
1543mark (pointer a) 1549mark (pointer a)
1544{ 1550{
1545 pointer t, q, p; 1551 pointer t, q, p;
… …
1547 t = 0; 1553 t = 0;
1548 p = a; 1554 p = a;
1549E2: 1555E2:
1550 setmark (p); 1556 setmark (p);
1551 1557
1552 if (is_vector (p)) 1558 if (ecb_expect_false (is_vector (p)))
1553 { 1559 {
1554 int i; 1560 int i;
1555 1561
1556 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1557 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1558 } 1564 }
1559 1565
1560 if (is_atom (p)) 1566 if (is_atom (p))
1561 goto E6; 1567 goto E6;
… …
1659 if (is_mark (p)) 1665 if (is_mark (p))
1660 clrmark (p); 1666 clrmark (p);
1661 else 1667 else
1662 { 1668 {
1663 /* reclaim cell */ 1669 /* reclaim cell */
1664 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1665 { 1671 {
1666 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1667 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1668 set_car (p, NIL); 1674 set_car (p, NIL);
1669 } 1675 }
1670 1676
1671 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1672 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1674 } 1680 }
1675 } 1681 }
1676 } 1682 }
1677 1683
1678 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1679 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1680} 1688}
1681 1689
1682static void 1690static void
1683finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1684{ 1692{
1685 if (is_string (a)) 1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1686 free (strvalue (a)); 1695 free (strvalue (a));
1687 else if (is_vector (a)) 1696 else if (is_vector (a))
1688 free (vecvalue (a)); 1697 free (vecvalue (a));
1689#if USE_PORTS 1698#if USE_PORTS
1690 else if (is_port (a)) 1699 else if (is_port (a))
… …
2112#endif 2121#endif
2113} 2122}
2114 2123
2115/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2116static char * 2125static char *
2117readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2118{ 2127{
2119 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2120 2129
2121 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))));
2122 2131
2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2124 *p = 0; 2133 *p = 0;
… …
2131 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2132} 2141}
2133 2142
2134/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2135static pointer 2144static pointer
2136readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2137{ 2146{
2138 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2139 int c; 2148 int c;
2140 int c1 = 0; 2149 int c1 = 0;
2141 enum
2142 { 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;
2143 2151
2144 for (;;) 2152 for (;;)
2145 { 2153 {
2146 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2147 2155
… …
2149 return S_F; 2157 return S_F;
2150 2158
2151 switch (state) 2159 switch (state)
2152 { 2160 {
2153 case st_ok: 2161 case st_ok:
2154 switch (c) 2162 if (ecb_expect_false (c == delim))
2155 {
2156 case '\\':
2157 state = st_bsl;
2158 break;
2159
2160 case '"':
2161 *p = 0;
2162 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);
2163 2164
2164 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2165 *p++ = c; 2168 *p++ = c;
2166 break;
2167 }
2168 2169
2169 break; 2170 break;
2170 2171
2171 case st_bsl: 2172 case st_bsl:
2172 switch (c) 2173 switch (c)
… …
2202 case 'r': 2203 case 'r':
2203 *p++ = '\r'; 2204 *p++ = '\r';
2204 state = st_ok; 2205 state = st_ok;
2205 break; 2206 break;
2206 2207
2207 case '"':
2208 *p++ = '"';
2209 state = st_ok;
2210 break;
2211
2212 default: 2208 default:
2213 *p++ = c; 2209 *p++ = c;
2214 state = st_ok; 2210 state = st_ok;
2215 break; 2211 break;
2216 } 2212 }
2217 2213
2218 break; 2214 break;
2219 2215
2220 case st_x1: 2216 case st_x1:
2221 case st_x2: 2217 case st_x2:
2222 c = toupper (c); 2218 c = tolower (c);
2223 2219
2224 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2225 {
2226 if (c <= '9')
2227 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2228 else 2222 else if (c >= 'a' && c <= 'f')
2229 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2230
2231 if (state == st_x1)
2232 state = st_x2;
2233 else
2234 {
2235 *p++ = c1;
2236 state = st_ok;
2237 }
2238 }
2239 else 2224 else
2240 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 }
2241 2234
2242 break; 2235 break;
2243 2236
2244 case st_oct1: 2237 case st_oct1:
2245 case st_oct2: 2238 case st_oct2:
… …
2249 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2250 state = st_ok; 2243 state = st_ok;
2251 } 2244 }
2252 else 2245 else
2253 { 2246 {
2254 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2255 return S_F; 2248 return S_F;
2256 2249
2257 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2258 2251
2259 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2264 state = st_ok; 2257 state = st_ok;
2265 } 2258 }
2266 } 2259 }
2267 2260
2268 break; 2261 break;
2269
2270 } 2262 }
2271 } 2263 }
2272} 2264}
2273 2265
2274/* check c is in chars */ 2266/* check c is in chars */
2275static INLINE int 2267ecb_inline int
2276is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2277{ 2269{
2278 if (c == EOF)
2279 return 1;
2280
2281 return !!strchr (s, c); 2270 return c == EOF || !!strchr (s, c);
2282} 2271}
2283 2272
2284/* skip white characters */ 2273/* skip white characters */
2285static INLINE int 2274ecb_inline int
2286skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2287{ 2276{
2288 int c, curr_line = 0; 2277 int c, curr_line = 0;
2289 2278
2290 do 2279 do
… …
2293#if SHOW_ERROR_LINE 2282#if SHOW_ERROR_LINE
2294 if (c == '\n') 2283 if (c == '\n')
2295 curr_line++; 2284 curr_line++;
2296#endif 2285#endif
2297 } 2286 }
2298 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2287 while (is_one_of (WHITESPACE, c));
2299 2288
2300 /* record it */ 2289 /* record it */
2301#if SHOW_ERROR_LINE 2290#if SHOW_ERROR_LINE
2302 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2303 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
… …
2333 return TOK_RPAREN; 2322 return TOK_RPAREN;
2334 2323
2335 case '.': 2324 case '.':
2336 c = inchar (SCHEME_A); 2325 c = inchar (SCHEME_A);
2337 2326
2338 if (is_one_of (" \n\t", c)) 2327 if (is_one_of (WHITESPACE, c))
2339 return TOK_DOT; 2328 return TOK_DOT;
2340 else 2329 else
2341 { 2330 {
2342 //TODO: ungetc twice in a row is not supported in C
2343 backchar (SCHEME_A_ c); 2331 backchar (SCHEME_A_ c);
2344 backchar (SCHEME_A_ '.');
2345 return TOK_ATOM; 2332 return TOK_DOTATOM;
2346 } 2333 }
2334
2335 case '|':
2336 return TOK_STRATOM;
2347 2337
2348 case '\'': 2338 case '\'':
2349 return TOK_QUOTE; 2339 return TOK_QUOTE;
2350 2340
2351 case ';': 2341 case ';':
… …
2483 } 2473 }
2484 2474
2485 putcharacter (SCHEME_A_ '"'); 2475 putcharacter (SCHEME_A_ '"');
2486} 2476}
2487 2477
2488
2489/* print atoms */ 2478/* print atoms */
2490static void 2479static void
2491printatom (SCHEME_P_ pointer l, int f) 2480printatom (SCHEME_P_ pointer l, int f)
2492{ 2481{
2493 char *p; 2482 char *p;
2494 int len; 2483 int len;
2495 2484
2496 atom2str (SCHEME_A_ l, f, &p, &len); 2485 atom2str (SCHEME_A_ l, f, &p, &len);
2497 putchars (SCHEME_A_ p, len); 2486 putchars (SCHEME_A_ p, len);
2498} 2487}
2499
2500 2488
2501/* Uses internal buffer unless string pointer is already available */ 2489/* Uses internal buffer unless string pointer is already available */
2502static void 2490static void
2503atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2504{ 2492{
… …
2518 { 2506 {
2519 p = SCHEME_V->strbuff; 2507 p = SCHEME_V->strbuff;
2520 2508
2521 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2509 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2522 { 2510 {
2523 if (num_is_integer (l)) 2511 if (is_integer (l))
2524 xnum (p, ivalue_unchecked (l)); 2512 xnum (p, ivalue_unchecked (l));
2525#if USE_REAL 2513#if USE_REAL
2526 else 2514 else
2527 { 2515 {
2528 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2516 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2665#endif 2653#endif
2666 } 2654 }
2667 else if (is_continuation (l)) 2655 else if (is_continuation (l))
2668 p = "#<CONTINUATION>"; 2656 p = "#<CONTINUATION>";
2669 else 2657 else
2658 {
2659#if USE_PRINTF
2660 p = SCHEME_V->strbuff;
2661 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2662#else
2670 p = "#<ERROR>"; 2663 p = "#<ERROR>";
2664#endif
2665 }
2671 2666
2672 *pp = p; 2667 *pp = p;
2673 *plen = strlen (p); 2668 *plen = strlen (p);
2674} 2669}
2675 2670
… …
2783 return 0; 2778 return 0;
2784 } 2779 }
2785 else if (is_number (a)) 2780 else if (is_number (a))
2786 { 2781 {
2787 if (is_number (b)) 2782 if (is_number (b))
2788 if (num_is_integer (a) == num_is_integer (b))
2789 return num_eq (nvalue (a), nvalue (b)); 2783 return num_cmp (nvalue (a), nvalue (b)) == 0;
2790 2784
2791 return 0; 2785 return 0;
2792 } 2786 }
2793 else if (is_character (a)) 2787 else if (is_character (a))
2794 { 2788 {
… …
2820/* () is #t in R5RS */ 2814/* () is #t in R5RS */
2821#define is_true(p) ((p) != S_F) 2815#define is_true(p) ((p) != S_F)
2822#define is_false(p) ((p) == S_F) 2816#define is_false(p) ((p) == S_F)
2823 2817
2824/* ========== Environment implementation ========== */ 2818/* ========== Environment implementation ========== */
2825
2826#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2827
2828static int
2829hash_fn (const char *key, int table_size)
2830{
2831 const unsigned char *p = key;
2832 uint32_t hash = 2166136261;
2833
2834 while (*p)
2835 hash = (hash ^ *p++) * 16777619;
2836
2837 return hash % table_size;
2838}
2839#endif
2840 2819
2841#ifndef USE_ALIST_ENV 2820#ifndef USE_ALIST_ENV
2842 2821
2843/* 2822/*
2844 * In this implementation, each frame of the environment may be 2823 * In this implementation, each frame of the environment may be
… …
2861 2840
2862 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2841 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2863 setenvironment (SCHEME_V->envir); 2842 setenvironment (SCHEME_V->envir);
2864} 2843}
2865 2844
2866static INLINE void 2845static uint32_t
2846sym_hash (pointer sym, uint32_t size)
2847{
2848 uintptr_t ptr = (uintptr_t)sym;
2849
2850#if 0
2851 /* table size is prime, so why mix */
2852 ptr += ptr >> 32;
2853 ptr += ptr >> 16;
2854 ptr += ptr >> 8;
2855#endif
2856
2857 return ptr % size;
2858}
2859
2860ecb_inline void
2867new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2861new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2868{ 2862{
2869 pointer slot = immutable_cons (variable, value); 2863 pointer slot = immutable_cons (variable, value);
2870 2864
2871 if (is_vector (car (env))) 2865 if (is_vector (car (env)))
2872 { 2866 {
2873 int location = hash_fn (symname (variable), veclength (car (env))); 2867 int location = sym_hash (variable, veclength (car (env)));
2874
2875 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2868 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2876 } 2869 }
2877 else 2870 else
2878 set_car (env, immutable_cons (slot, car (env))); 2871 set_car (env, immutable_cons (slot, car (env)));
2879} 2872}
2880 2873
2881static pointer 2874static pointer
2882find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2883{ 2876{
2884 pointer x, y; 2877 pointer x, y;
2885 int location;
2886 2878
2887 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
2888 { 2880 {
2889 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
2890 { 2882 {
2891 location = hash_fn (symname (hdl), veclength (car (x))); 2883 int location = sym_hash (hdl, veclength (car (x)));
2892 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
2893 } 2885 }
2894 else 2886 else
2895 y = car (x); 2887 y = car (x);
2896 2888
2897 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
2899 break; 2891 break;
2900 2892
2901 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
2902 break; 2897 break;
2903
2904 if (!all)
2905 return NIL;
2906 } 2898 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2899
2911 return NIL; 2900 return NIL;
2912} 2901}
2913 2902
2914#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
2915 2904
2916static INLINE void 2905ecb_inline void
2917new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
2918{ 2907{
2919 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
2920 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
2921} 2910}
2922 2911
2923static INLINE void 2912ecb_inline void
2924new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2925{ 2914{
2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2927} 2916}
2928 2917
… …
2936 for (y = car (x); y != NIL; y = cdr (y)) 2925 for (y = car (x); y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2926 if (caar (y) == hdl)
2938 break; 2927 break;
2939 2928
2940 if (y != NIL) 2929 if (y != NIL)
2930 return car (y);
2941 break; 2931 break;
2942 2932
2943 if (!all) 2933 if (!all)
2944 return NIL; 2934 break;
2945 } 2935 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2936
2950 return NIL; 2937 return NIL;
2951} 2938}
2952 2939
2953#endif /* USE_ALIST_ENV else */ 2940#endif /* USE_ALIST_ENV else */
2954 2941
2955static INLINE void 2942ecb_inline void
2956new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2957{ 2944{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2958 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2946 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2959} 2947}
2960 2948
2961static INLINE void 2949ecb_inline void
2962set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2963{ 2951{
2964 set_cdr (slot, value); 2952 set_cdr (slot, value);
2965} 2953}
2966 2954
2967static INLINE pointer 2955ecb_inline pointer
2968slot_value_in_env (pointer slot) 2956slot_value_in_env (pointer slot)
2969{ 2957{
2970 return cdr (slot); 2958 return cdr (slot);
2971} 2959}
2972 2960
2973/* ========== Evaluation Cycle ========== */ 2961/* ========== Evaluation Cycle ========== */
2974 2962
2975static pointer 2963static int
2976xError_1 (SCHEME_P_ const char *s, pointer a) 2964xError_1 (SCHEME_P_ const char *s, pointer a)
2977{ 2965{
2978#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
2979 pointer x; 2967 pointer x;
2980 pointer hdl = SCHEME_V->ERROR_HOOK; 2968 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3015 code = cons (mk_string (SCHEME_A_ s), code); 3003 code = cons (mk_string (SCHEME_A_ s), code);
3016 setimmutable (car (code)); 3004 setimmutable (car (code));
3017 SCHEME_V->code = cons (slot_value_in_env (x), code); 3005 SCHEME_V->code = cons (slot_value_in_env (x), code);
3018 SCHEME_V->op = OP_EVAL; 3006 SCHEME_V->op = OP_EVAL;
3019 3007
3020 return S_T; 3008 return 0;
3021 } 3009 }
3022#endif 3010#endif
3023 3011
3024 if (a) 3012 if (a)
3025 SCHEME_V->args = cons (a, NIL); 3013 SCHEME_V->args = cons (a, NIL);
… …
3027 SCHEME_V->args = NIL; 3015 SCHEME_V->args = NIL;
3028 3016
3029 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3017 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3030 setimmutable (car (SCHEME_V->args)); 3018 setimmutable (car (SCHEME_V->args));
3031 SCHEME_V->op = OP_ERR0; 3019 SCHEME_V->op = OP_ERR0;
3020
3032 return S_T; 3021 return 0;
3033} 3022}
3034 3023
3035#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3024#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3036#define Error_0(s) Error_1 (s, 0) 3025#define Error_0(s) Error_1 (s, 0)
3037 3026
3038/* Too small to turn into function */ 3027/* Too small to turn into function */
3039#define BEGIN do { 3028#define BEGIN do {
3040#define END } while (0) 3029#define END } while (0)
3041#define s_goto(a) BEGIN \ 3030#define s_goto(a) BEGIN \
3042 SCHEME_V->op = a; \ 3031 SCHEME_V->op = a; \
3043 return S_T; END 3032 return 0; END
3044 3033
3045#define s_return(a) return xs_return (SCHEME_A_ a) 3034#define s_return(a) return xs_return (SCHEME_A_ a)
3046 3035
3047#ifndef USE_SCHEME_STACK 3036#ifndef USE_SCHEME_STACK
3048 3037
… …
3073 next_frame = SCHEME_V->dump_base + nframes; 3062 next_frame = SCHEME_V->dump_base + nframes;
3074 3063
3075 next_frame->op = op; 3064 next_frame->op = op;
3076 next_frame->args = args; 3065 next_frame->args = args;
3077 next_frame->envir = SCHEME_V->envir; 3066 next_frame->envir = SCHEME_V->envir;
3078 next_frame->code = code; 3067 next_frame->code = code;
3079 3068
3080 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3081} 3070}
3082 3071
3083static pointer 3072static int
3084xs_return (SCHEME_P_ pointer a) 3073xs_return (SCHEME_P_ pointer a)
3085{ 3074{
3086 int nframes = (uintptr_t)SCHEME_V->dump; 3075 int nframes = (uintptr_t)SCHEME_V->dump;
3087 struct dump_stack_frame *frame; 3076 struct dump_stack_frame *frame;
3088 3077
3089 SCHEME_V->value = a; 3078 SCHEME_V->value = a;
3090 3079
3091 if (nframes <= 0) 3080 if (nframes <= 0)
3092 return NIL; 3081 return -1;
3093 3082
3094 frame = &SCHEME_V->dump_base[--nframes]; 3083 frame = &SCHEME_V->dump_base[--nframes];
3095 SCHEME_V->op = frame->op; 3084 SCHEME_V->op = frame->op;
3096 SCHEME_V->args = frame->args; 3085 SCHEME_V->args = frame->args;
3097 SCHEME_V->envir = frame->envir; 3086 SCHEME_V->envir = frame->envir;
3098 SCHEME_V->code = frame->code; 3087 SCHEME_V->code = frame->code;
3099 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3100 3089
3101 return S_T; 3090 return 0;
3102} 3091}
3103 3092
3104static INLINE void 3093ecb_inline void
3105dump_stack_reset (SCHEME_P) 3094dump_stack_reset (SCHEME_P)
3106{ 3095{
3107 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3096 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3108 SCHEME_V->dump = (pointer)+0; 3097 SCHEME_V->dump = (pointer)+0;
3109} 3098}
3110 3099
3111static INLINE void 3100ecb_inline void
3112dump_stack_initialize (SCHEME_P) 3101dump_stack_initialize (SCHEME_P)
3113{ 3102{
3114 SCHEME_V->dump_size = 0; 3103 SCHEME_V->dump_size = 0;
3115 SCHEME_V->dump_base = 0; 3104 SCHEME_V->dump_base = 0;
3116 dump_stack_reset (SCHEME_A); 3105 dump_stack_reset (SCHEME_A);
… …
3169 int i = 0; 3158 int i = 0;
3170 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3159 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3171 3160
3172 while (cont != NIL) 3161 while (cont != NIL)
3173 { 3162 {
3174 frame->op = ivalue (car (cont)); cont = cdr (cont); 3163 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3175 frame->args = car (cont) ; cont = cdr (cont); 3164 frame->args = car (cont) ; cont = cdr (cont);
3176 frame->envir = car (cont) ; cont = cdr (cont); 3165 frame->envir = car (cont) ; cont = cdr (cont);
3177 frame->code = car (cont) ; cont = cdr (cont); 3166 frame->code = car (cont) ; cont = cdr (cont);
3178 3167
3179 ++frame; 3168 ++frame;
3180 ++i; 3169 ++i;
3181 } 3170 }
3182 3171
3183 SCHEME_V->dump = (pointer)(uintptr_t)i; 3172 SCHEME_V->dump = (pointer)(uintptr_t)i;
3184} 3173}
3185 3174
3186#else 3175#else
3187 3176
3188static INLINE void 3177ecb_inline void
3189dump_stack_reset (SCHEME_P) 3178dump_stack_reset (SCHEME_P)
3190{ 3179{
3191 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3192} 3181}
3193 3182
3194static INLINE void 3183ecb_inline void
3195dump_stack_initialize (SCHEME_P) 3184dump_stack_initialize (SCHEME_P)
3196{ 3185{
3197 dump_stack_reset (SCHEME_A); 3186 dump_stack_reset (SCHEME_A);
3198} 3187}
3199 3188
… …
3201dump_stack_free (SCHEME_P) 3190dump_stack_free (SCHEME_P)
3202{ 3191{
3203 SCHEME_V->dump = NIL; 3192 SCHEME_V->dump = NIL;
3204} 3193}
3205 3194
3206static pointer 3195static int
3207xs_return (SCHEME_P_ pointer a) 3196xs_return (SCHEME_P_ pointer a)
3208{ 3197{
3209 pointer dump = SCHEME_V->dump; 3198 pointer dump = SCHEME_V->dump;
3210 3199
3211 SCHEME_V->value = a; 3200 SCHEME_V->value = a;
3212 3201
3213 if (dump == NIL) 3202 if (dump == NIL)
3214 return NIL; 3203 return -1;
3215 3204
3216 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3205 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3217 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3218 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3219 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3220 3209
3221 SCHEME_V->dump = dump; 3210 SCHEME_V->dump = dump;
3222 3211
3223 return S_T; 3212 return 0;
3224} 3213}
3225 3214
3226static void 3215static void
3227s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3228{ 3217{
… …
3253 3242
3254#endif 3243#endif
3255 3244
3256#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3257 3246
3247#if 1
3258static pointer 3248static int
3249debug (SCHEME_P_ int indent, pointer x)
3250{
3251 int c;
3252
3253 if (is_syntax (x))
3254 {
3255 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3256 return 8 + 8;
3257 }
3258
3259 if (x == NIL)
3260 {
3261 printf ("%*sNIL\n", indent, "");
3262 return 3;
3263 }
3264
3265 switch (type (x))
3266 {
3267 case T_INTEGER:
3268 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3269 return 32+8;
3270
3271 case T_SYMBOL:
3272 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8;
3274
3275 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3279
3280 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1;
3285
3286 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8;
3289
3290 case T_VECTOR:
3291 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8;
3293
3294 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3297
3298 default:
3299 printf ("unhandled type %d\n", type (x));
3300 break;
3301 }
3302}
3303#endif
3304
3305static int
3259opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3306opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3260{ 3307{
3308 pointer args = SCHEME_V->args;
3261 pointer x, y; 3309 pointer x, y;
3262 3310
3263 switch (op) 3311 switch (op)
3264 { 3312 {
3313#if 1 //D
3314 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3316 printf ("\n");
3317 s_return (S_T);
3318#endif
3265 case OP_LOAD: /* load */ 3319 case OP_LOAD: /* load */
3266 if (file_interactive (SCHEME_A)) 3320 if (file_interactive (SCHEME_A))
3267 { 3321 {
3268 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3269 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3270 } 3324 }
3271 3325
3272 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3326 if (!file_push (SCHEME_A_ strvalue (car (args))))
3273 Error_1 ("unable to open", car (SCHEME_V->args)); 3327 Error_1 ("unable to open", car (args));
3274 else 3328 else
3275 { 3329 {
3276 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3330 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3277 s_goto (OP_T0LVL); 3331 s_goto (OP_T0LVL);
3278 } 3332 }
… …
3352 case OP_EVAL: /* main part of evaluation */ 3406 case OP_EVAL: /* main part of evaluation */
3353#if USE_TRACING 3407#if USE_TRACING
3354 if (SCHEME_V->tracing) 3408 if (SCHEME_V->tracing)
3355 { 3409 {
3356 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3410 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3357 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3411 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3358 SCHEME_V->args = SCHEME_V->code; 3412 SCHEME_V->args = SCHEME_V->code;
3359 putstr (SCHEME_A_ "\nEval: "); 3413 putstr (SCHEME_A_ "\nEval: ");
3360 s_goto (OP_P0LIST); 3414 s_goto (OP_P0LIST);
3361 } 3415 }
3362 3416
… …
3392 } 3446 }
3393 else 3447 else
3394 s_return (SCHEME_V->code); 3448 s_return (SCHEME_V->code);
3395 3449
3396 case OP_E0ARGS: /* eval arguments */ 3450 case OP_E0ARGS: /* eval arguments */
3397 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3398 { 3452 {
3399 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3400 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3454 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3401 SCHEME_V->code = SCHEME_V->value; 3455 SCHEME_V->code = SCHEME_V->value;
3402 s_goto (OP_APPLY); 3456 s_goto (OP_APPLY);
… …
3406 SCHEME_V->code = cdr (SCHEME_V->code); 3460 SCHEME_V->code = cdr (SCHEME_V->code);
3407 s_goto (OP_E1ARGS); 3461 s_goto (OP_E1ARGS);
3408 } 3462 }
3409 3463
3410 case OP_E1ARGS: /* eval arguments */ 3464 case OP_E1ARGS: /* eval arguments */
3411 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3465 args = cons (SCHEME_V->value, args);
3412 3466
3413 if (is_pair (SCHEME_V->code)) /* continue */ 3467 if (is_pair (SCHEME_V->code)) /* continue */
3414 { 3468 {
3415 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3469 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3416 SCHEME_V->code = car (SCHEME_V->code); 3470 SCHEME_V->code = car (SCHEME_V->code);
3417 SCHEME_V->args = NIL; 3471 SCHEME_V->args = NIL;
3418 s_goto (OP_EVAL); 3472 s_goto (OP_EVAL);
3419 } 3473 }
3420 else /* end */ 3474 else /* end */
3421 { 3475 {
3422 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3476 args = reverse_in_place (SCHEME_A_ NIL, args);
3423 SCHEME_V->code = car (SCHEME_V->args); 3477 SCHEME_V->code = car (args);
3424 SCHEME_V->args = cdr (SCHEME_V->args); 3478 SCHEME_V->args = cdr (args);
3425 s_goto (OP_APPLY); 3479 s_goto (OP_APPLY);
3426 } 3480 }
3427 3481
3428#if USE_TRACING 3482#if USE_TRACING
3429 3483
3430 case OP_TRACING: 3484 case OP_TRACING:
3431 { 3485 {
3432 int tr = SCHEME_V->tracing; 3486 int tr = SCHEME_V->tracing;
3433 3487
3434 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3488 SCHEME_V->tracing = ivalue_unchecked (car (args));
3435 s_return (mk_integer (SCHEME_A_ tr)); 3489 s_return (mk_integer (SCHEME_A_ tr));
3436 } 3490 }
3437 3491
3438#endif 3492#endif
3439 3493
3440 case OP_APPLY: /* apply 'code' to 'args' */ 3494 case OP_APPLY: /* apply 'code' to 'args' */
3441#if USE_TRACING 3495#if USE_TRACING
3442 if (SCHEME_V->tracing) 3496 if (SCHEME_V->tracing)
3443 { 3497 {
3444 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3498 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3445 SCHEME_V->print_flag = 1; 3499 SCHEME_V->print_flag = 1;
3446 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3500 /* args=cons(SCHEME_V->code,args); */
3447 putstr (SCHEME_A_ "\nApply to: "); 3501 putstr (SCHEME_A_ "\nApply to: ");
3448 s_goto (OP_P0LIST); 3502 s_goto (OP_P0LIST);
3449 } 3503 }
3450 3504
3451 /* fall through */ 3505 /* fall through */
3452 3506
3453 case OP_REAL_APPLY: 3507 case OP_REAL_APPLY:
3454#endif 3508#endif
3455 if (is_proc (SCHEME_V->code)) 3509 if (is_proc (SCHEME_V->code))
3456 {
3457 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3458 }
3459 else if (is_foreign (SCHEME_V->code)) 3511 else if (is_foreign (SCHEME_V->code))
3460 { 3512 {
3461 /* Keep nested calls from GC'ing the arglist */ 3513 /* Keep nested calls from GC'ing the arglist */
3462 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3514 push_recent_alloc (SCHEME_A_ args, NIL);
3463 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3464 3516
3465 s_return (x); 3517 s_return (x);
3466 } 3518 }
3467 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3468 { 3520 {
3469 /* Should not accept promise */ 3521 /* Should not accept promise */
3470 /* make environment */ 3522 /* make environment */
3471 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3523 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3472 3524
3473 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3525 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3474 { 3526 {
3475 if (y == NIL) 3527 if (y == NIL)
3476 Error_0 ("not enough arguments"); 3528 Error_0 ("not enough arguments");
3477 else 3529 else
3478 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3530 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3496 s_goto (OP_BEGIN); 3548 s_goto (OP_BEGIN);
3497 } 3549 }
3498 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3550 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3499 { 3551 {
3500 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3552 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3501 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3553 s_return (args != NIL ? car (args) : NIL);
3502 } 3554 }
3503 else 3555 else
3504 Error_0 ("illegal function"); 3556 Error_0 ("illegal function");
3505 3557
3506 case OP_DOMACRO: /* do macro */ 3558 case OP_DOMACRO: /* do macro */
… …
3515 { 3567 {
3516 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3568 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3517 3569
3518 if (f != NIL) 3570 if (f != NIL)
3519 { 3571 {
3520 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3572 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3521 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3573 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3522 SCHEME_V->code = slot_value_in_env (f); 3574 SCHEME_V->code = slot_value_in_env (f);
3523 s_goto (OP_APPLY); 3575 s_goto (OP_APPLY);
3524 } 3576 }
3525 3577
… …
3536 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3537 3589
3538#endif 3590#endif
3539 3591
3540 case OP_MKCLOSURE: /* make-closure */ 3592 case OP_MKCLOSURE: /* make-closure */
3541 x = car (SCHEME_V->args); 3593 x = car (args);
3542 3594
3543 if (car (x) == SCHEME_V->LAMBDA) 3595 if (car (x) == SCHEME_V->LAMBDA)
3544 x = cdr (x); 3596 x = cdr (x);
3545 3597
3546 if (cdr (SCHEME_V->args) == NIL) 3598 if (cdr (args) == NIL)
3547 y = SCHEME_V->envir; 3599 y = SCHEME_V->envir;
3548 else 3600 else
3549 y = cadr (SCHEME_V->args); 3601 y = cadr (args);
3550 3602
3551 s_return (mk_closure (SCHEME_A_ x, y)); 3603 s_return (mk_closure (SCHEME_A_ x, y));
3552 3604
3553 case OP_QUOTE: /* quote */ 3605 case OP_QUOTE: /* quote */
3554 s_return (car (SCHEME_V->code)); 3606 s_return (car (SCHEME_V->code));
… …
3586 3638
3587 3639
3588 case OP_DEFP: /* defined? */ 3640 case OP_DEFP: /* defined? */
3589 x = SCHEME_V->envir; 3641 x = SCHEME_V->envir;
3590 3642
3591 if (cdr (SCHEME_V->args) != NIL) 3643 if (cdr (args) != NIL)
3592 x = cadr (SCHEME_V->args); 3644 x = cadr (args);
3593 3645
3594 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3646 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3595 3647
3596 case OP_SET0: /* set! */ 3648 case OP_SET0: /* set! */
3597 if (is_immutable (car (SCHEME_V->code))) 3649 if (is_immutable (car (SCHEME_V->code)))
3598 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3650 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3599 3651
… …
3630 3682
3631 case OP_IF1: /* if */ 3683 case OP_IF1: /* if */
3632 if (is_true (SCHEME_V->value)) 3684 if (is_true (SCHEME_V->value))
3633 SCHEME_V->code = car (SCHEME_V->code); 3685 SCHEME_V->code = car (SCHEME_V->code);
3634 else 3686 else
3635 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3636
3637 * car(NIL) = NIL */
3638 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3639 3689
3640 case OP_LET0: /* let */ 3690 case OP_LET0: /* let */
3641 SCHEME_V->args = NIL; 3691 SCHEME_V->args = NIL;
3642 SCHEME_V->value = SCHEME_V->code; 3692 SCHEME_V->value = SCHEME_V->code;
3643 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3693 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3644 s_goto (OP_LET1); 3694 s_goto (OP_LET1);
3645 3695
3646 case OP_LET1: /* let (calculate parameters) */ 3696 case OP_LET1: /* let (calculate parameters) */
3647 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3697 args = cons (SCHEME_V->value, args);
3648 3698
3649 if (is_pair (SCHEME_V->code)) /* continue */ 3699 if (is_pair (SCHEME_V->code)) /* continue */
3650 { 3700 {
3651 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3701 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3652 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3702 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3653 3703
3654 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3704 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3655 SCHEME_V->code = cadar (SCHEME_V->code); 3705 SCHEME_V->code = cadar (SCHEME_V->code);
3656 SCHEME_V->args = NIL; 3706 SCHEME_V->args = NIL;
3657 s_goto (OP_EVAL); 3707 s_goto (OP_EVAL);
3658 } 3708 }
3659 else /* end */ 3709 else /* end */
3660 { 3710 {
3661 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3711 args = reverse_in_place (SCHEME_A_ NIL, args);
3662 SCHEME_V->code = car (SCHEME_V->args); 3712 SCHEME_V->code = car (args);
3663 SCHEME_V->args = cdr (SCHEME_V->args); 3713 SCHEME_V->args = cdr (args);
3664 s_goto (OP_LET2); 3714 s_goto (OP_LET2);
3665 } 3715 }
3666 3716
3667 case OP_LET2: /* let */ 3717 case OP_LET2: /* let */
3668 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3718 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3669 3719
3670 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3720 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3671 y != NIL; x = cdr (x), y = cdr (y)) 3721 y != NIL; x = cdr (x), y = cdr (y))
3672 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3722 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3673 3723
3674 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3724 if (is_symbol (car (SCHEME_V->code))) /* named let */
3675 { 3725 {
3676 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3726 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3677 { 3727 {
3678 if (!is_pair (x)) 3728 if (!is_pair (x))
3679 Error_1 ("Bad syntax of binding in let :", x); 3729 Error_1 ("Bad syntax of binding in let :", x);
3680 3730
3681 if (!is_list (SCHEME_A_ car (x))) 3731 if (!is_list (SCHEME_A_ car (x)))
3682 Error_1 ("Bad syntax of binding in let :", car (x)); 3732 Error_1 ("Bad syntax of binding in let :", car (x));
3683 3733
3684 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3734 args = cons (caar (x), args);
3685 } 3735 }
3686 3736
3687 x =
3688 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3737 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3689 SCHEME_V->envir); 3738 SCHEME_V->envir);
3690 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3739 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3691 SCHEME_V->code = cddr (SCHEME_V->code); 3740 SCHEME_V->code = cddr (SCHEME_V->code);
3692 SCHEME_V->args = NIL;
3693 } 3741 }
3694 else 3742 else
3695 { 3743 {
3696 SCHEME_V->code = cdr (SCHEME_V->code); 3744 SCHEME_V->code = cdr (SCHEME_V->code);
3745 }
3746
3697 SCHEME_V->args = NIL; 3747 SCHEME_V->args = NIL;
3698 }
3699
3700 s_goto (OP_BEGIN); 3748 s_goto (OP_BEGIN);
3701 3749
3702 case OP_LET0AST: /* let* */ 3750 case OP_LET0AST: /* let* */
3703 if (car (SCHEME_V->code) == NIL) 3751 if (car (SCHEME_V->code) == NIL)
3704 { 3752 {
… …
3722 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3770 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3723 SCHEME_V->code = cdr (SCHEME_V->code); 3771 SCHEME_V->code = cdr (SCHEME_V->code);
3724 3772
3725 if (is_pair (SCHEME_V->code)) /* continue */ 3773 if (is_pair (SCHEME_V->code)) /* continue */
3726 { 3774 {
3727 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3775 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3728 SCHEME_V->code = cadar (SCHEME_V->code); 3776 SCHEME_V->code = cadar (SCHEME_V->code);
3729 SCHEME_V->args = NIL; 3777 SCHEME_V->args = NIL;
3730 s_goto (OP_EVAL); 3778 s_goto (OP_EVAL);
3731 } 3779 }
3732 else /* end */ 3780 else /* end */
3733 { 3781 {
3734 SCHEME_V->code = SCHEME_V->args; 3782 SCHEME_V->code = args;
3735 SCHEME_V->args = NIL; 3783 SCHEME_V->args = NIL;
3736 s_goto (OP_BEGIN); 3784 s_goto (OP_BEGIN);
3737 } 3785 }
3738 3786
3739 case OP_LET0REC: /* letrec */ 3787 case OP_LET0REC: /* letrec */
… …
3742 SCHEME_V->value = SCHEME_V->code; 3790 SCHEME_V->value = SCHEME_V->code;
3743 SCHEME_V->code = car (SCHEME_V->code); 3791 SCHEME_V->code = car (SCHEME_V->code);
3744 s_goto (OP_LET1REC); 3792 s_goto (OP_LET1REC);
3745 3793
3746 case OP_LET1REC: /* letrec (calculate parameters) */ 3794 case OP_LET1REC: /* letrec (calculate parameters) */
3747 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3795 args = cons (SCHEME_V->value, args);
3748 3796
3749 if (is_pair (SCHEME_V->code)) /* continue */ 3797 if (is_pair (SCHEME_V->code)) /* continue */
3750 { 3798 {
3751 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3799 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3752 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3800 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3753 3801
3754 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3802 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3755 SCHEME_V->code = cadar (SCHEME_V->code); 3803 SCHEME_V->code = cadar (SCHEME_V->code);
3756 SCHEME_V->args = NIL; 3804 SCHEME_V->args = NIL;
3757 s_goto (OP_EVAL); 3805 s_goto (OP_EVAL);
3758 } 3806 }
3759 else /* end */ 3807 else /* end */
3760 { 3808 {
3761 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3809 args = reverse_in_place (SCHEME_A_ NIL, args);
3762 SCHEME_V->code = car (SCHEME_V->args); 3810 SCHEME_V->code = car (args);
3763 SCHEME_V->args = cdr (SCHEME_V->args); 3811 SCHEME_V->args = cdr (args);
3764 s_goto (OP_LET2REC); 3812 s_goto (OP_LET2REC);
3765 } 3813 }
3766 3814
3767 case OP_LET2REC: /* letrec */ 3815 case OP_LET2REC: /* letrec */
3768 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3816 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3769 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3817 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3770 3818
3771 SCHEME_V->code = cdr (SCHEME_V->code); 3819 SCHEME_V->code = cdr (SCHEME_V->code);
3772 SCHEME_V->args = NIL; 3820 SCHEME_V->args = NIL;
3773 s_goto (OP_BEGIN); 3821 s_goto (OP_BEGIN);
… …
3859 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3907 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3860 SCHEME_V->code = car (SCHEME_V->code); 3908 SCHEME_V->code = car (SCHEME_V->code);
3861 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
3862 3910
3863 case OP_C1STREAM: /* cons-stream */ 3911 case OP_C1STREAM: /* cons-stream */
3864 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3912 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3865 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3913 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3866 set_typeflag (x, T_PROMISE); 3914 set_typeflag (x, T_PROMISE);
3867 s_return (cons (SCHEME_V->args, x)); 3915 s_return (cons (args, x));
3868 3916
3869 case OP_MACRO0: /* macro */ 3917 case OP_MACRO0: /* macro */
3870 if (is_pair (car (SCHEME_V->code))) 3918 if (is_pair (car (SCHEME_V->code)))
3871 { 3919 {
3872 x = caar (SCHEME_V->code); 3920 x = caar (SCHEME_V->code);
… …
3905 { 3953 {
3906 if (!is_pair (y = caar (x))) 3954 if (!is_pair (y = caar (x)))
3907 break; 3955 break;
3908 3956
3909 for (; y != NIL; y = cdr (y)) 3957 for (; y != NIL; y = cdr (y))
3910 {
3911 if (eqv (car (y), SCHEME_V->value)) 3958 if (eqv (car (y), SCHEME_V->value))
3912 break; 3959 break;
3913 }
3914 3960
3915 if (y != NIL) 3961 if (y != NIL)
3916 break; 3962 break;
3917 } 3963 }
3918 3964
… …
3938 s_goto (OP_BEGIN); 3984 s_goto (OP_BEGIN);
3939 else 3985 else
3940 s_return (NIL); 3986 s_return (NIL);
3941 3987
3942 case OP_PAPPLY: /* apply */ 3988 case OP_PAPPLY: /* apply */
3943 SCHEME_V->code = car (SCHEME_V->args); 3989 SCHEME_V->code = car (args);
3944 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3990 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3945 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3991 /*SCHEME_V->args = cadr(args); */
3946 s_goto (OP_APPLY); 3992 s_goto (OP_APPLY);
3947 3993
3948 case OP_PEVAL: /* eval */ 3994 case OP_PEVAL: /* eval */
3949 if (cdr (SCHEME_V->args) != NIL) 3995 if (cdr (args) != NIL)
3950 SCHEME_V->envir = cadr (SCHEME_V->args); 3996 SCHEME_V->envir = cadr (args);
3951 3997
3952 SCHEME_V->code = car (SCHEME_V->args); 3998 SCHEME_V->code = car (args);
3953 s_goto (OP_EVAL); 3999 s_goto (OP_EVAL);
3954 4000
3955 case OP_CONTINUATION: /* call-with-current-continuation */ 4001 case OP_CONTINUATION: /* call-with-current-continuation */
3956 SCHEME_V->code = car (SCHEME_V->args); 4002 SCHEME_V->code = car (args);
3957 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4003 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3958 s_goto (OP_APPLY); 4004 s_goto (OP_APPLY);
3959 } 4005 }
3960 4006
3961 return S_T; 4007 if (USE_ERROR_CHECKING) abort ();
3962} 4008}
3963 4009
3964static pointer 4010static int
3965opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4011opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3966{ 4012{
3967 pointer x; 4013 pointer args = SCHEME_V->args;
4014 pointer x = car (args);
3968 num v; 4015 num v;
3969 4016
4017 switch (op)
4018 {
3970#if USE_MATH 4019#if USE_MATH
3971 RVALUE dd;
3972#endif
3973
3974 switch (op)
3975 {
3976#if USE_MATH
3977
3978 case OP_INEX2EX: /* inexact->exact */ 4020 case OP_INEX2EX: /* inexact->exact */
3979 x = car (SCHEME_V->args); 4021 {
3980
3981 if (num_is_integer (x)) 4022 if (is_integer (x))
3982 s_return (x); 4023 s_return (x);
3983 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4024
4025 RVALUE r = rvalue_unchecked (x);
4026
4027 if (r == (RVALUE)(IVALUE)r)
3984 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3985 else 4029 else
3986 Error_1 ("inexact->exact: not integral:", x); 4030 Error_1 ("inexact->exact: not integral:", x);
4031 }
3987 4032
3988 case OP_EXP:
3989 x = car (SCHEME_V->args);
3990 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4033 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3991
3992 case OP_LOG:
3993 x = car (SCHEME_V->args);
3994 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4034 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3995
3996 case OP_SIN:
3997 x = car (SCHEME_V->args);
3998 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4035 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3999
4000 case OP_COS:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4003
4004 case OP_TAN:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4037 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4007
4008 case OP_ASIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4038 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4011
4012 case OP_ACOS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4039 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4015 4040
4016 case OP_ATAN: 4041 case OP_ATAN:
4017 x = car (SCHEME_V->args);
4018
4019 if (cdr (SCHEME_V->args) == NIL) 4042 if (cdr (args) == NIL)
4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4043 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4021 else 4044 else
4022 { 4045 {
4023 pointer y = cadr (SCHEME_V->args); 4046 pointer y = cadr (args);
4024
4025 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4047 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4026 } 4048 }
4027 4049
4028 case OP_SQRT: 4050 case OP_SQRT:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4051 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4031 4052
4032 case OP_EXPT: 4053 case OP_EXPT:
4033 { 4054 {
4034 RVALUE result; 4055 RVALUE result;
4035 int real_result = 1; 4056 int real_result = 1;
4036 pointer y = cadr (SCHEME_V->args); 4057 pointer y = cadr (args);
4037 4058
4038 x = car (SCHEME_V->args);
4039
4040 if (num_is_integer (x) && num_is_integer (y)) 4059 if (is_integer (x) && is_integer (y))
4041 real_result = 0; 4060 real_result = 0;
4042 4061
4043 /* This 'if' is an R5RS compatibility fix. */ 4062 /* This 'if' is an R5RS compatibility fix. */
4044 /* NOTE: Remove this 'if' fix for R6RS. */ 4063 /* NOTE: Remove this 'if' fix for R6RS. */
4045 if (rvalue (x) == 0 && rvalue (y) < 0) 4064 if (rvalue (x) == 0 && rvalue (y) < 0)
4046 result = 0.0; 4065 result = 0;
4047 else 4066 else
4048 result = pow (rvalue (x), rvalue (y)); 4067 result = pow (rvalue (x), rvalue (y));
4049 4068
4050 /* Before returning integer result make sure we can. */ 4069 /* Before returning integer result make sure we can. */
4051 /* If the test fails, result is too big for integer. */ 4070 /* If the test fails, result is too big for integer. */
4052 if (!real_result) 4071 if (!real_result)
4053 { 4072 {
4054 long result_as_long = (long) result; 4073 long result_as_long = result;
4055 4074
4056 if (result != (RVALUE) result_as_long) 4075 if (result != result_as_long)
4057 real_result = 1; 4076 real_result = 1;
4058 } 4077 }
4059 4078
4060 if (real_result) 4079 if (real_result)
4061 s_return (mk_real (SCHEME_A_ result)); 4080 s_return (mk_real (SCHEME_A_ result));
4062 else 4081 else
4063 s_return (mk_integer (SCHEME_A_ result)); 4082 s_return (mk_integer (SCHEME_A_ result));
4064 } 4083 }
4065 4084
4066 case OP_FLOOR:
4067 x = car (SCHEME_V->args);
4068 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4085 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4069
4070 case OP_CEILING:
4071 x = car (SCHEME_V->args);
4072 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4073 4087
4074 case OP_TRUNCATE: 4088 case OP_TRUNCATE:
4075 { 4089 {
4076 RVALUE rvalue_of_x; 4090 RVALUE n = rvalue (x);
4077
4078 x = car (SCHEME_V->args);
4079 rvalue_of_x = rvalue (x);
4080
4081 if (rvalue_of_x > 0)
4082 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4091 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4083 else
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4085 } 4092 }
4086 4093
4087 case OP_ROUND: 4094 case OP_ROUND:
4088 x = car (SCHEME_V->args);
4089
4090 if (num_is_integer (x)) 4095 if (is_integer (x))
4091 s_return (x); 4096 s_return (x);
4092 4097
4093 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4094#endif 4099#endif
4095 4100
4096 case OP_ADD: /* + */ 4101 case OP_ADD: /* + */
4097 v = num_zero; 4102 v = num_zero;
4098 4103
4099 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4104 for (x = args; x != NIL; x = cdr (x))
4100 v = num_add (v, nvalue (car (x))); 4105 v = num_op (NUM_ADD, v, nvalue (car (x)));
4101 4106
4102 s_return (mk_number (SCHEME_A_ v)); 4107 s_return (mk_number (SCHEME_A_ v));
4103 4108
4104 case OP_MUL: /* * */ 4109 case OP_MUL: /* * */
4105 v = num_one; 4110 v = num_one;
4106 4111
4107 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4112 for (x = args; x != NIL; x = cdr (x))
4108 v = num_mul (v, nvalue (car (x))); 4113 v = num_op (NUM_MUL, v, nvalue (car (x)));
4109 4114
4110 s_return (mk_number (SCHEME_A_ v)); 4115 s_return (mk_number (SCHEME_A_ v));
4111 4116
4112 case OP_SUB: /* - */ 4117 case OP_SUB: /* - */
4113 if (cdr (SCHEME_V->args) == NIL) 4118 if (cdr (args) == NIL)
4114 { 4119 {
4115 x = SCHEME_V->args; 4120 x = args;
4116 v = num_zero; 4121 v = num_zero;
4117 } 4122 }
4118 else 4123 else
4119 { 4124 {
4120 x = cdr (SCHEME_V->args); 4125 x = cdr (args);
4121 v = nvalue (car (SCHEME_V->args)); 4126 v = nvalue (car (args));
4122 } 4127 }
4123 4128
4124 for (; x != NIL; x = cdr (x)) 4129 for (; x != NIL; x = cdr (x))
4125 v = num_sub (v, nvalue (car (x))); 4130 v = num_op (NUM_SUB, v, nvalue (car (x)));
4126 4131
4127 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4128 4133
4129 case OP_DIV: /* / */ 4134 case OP_DIV: /* / */
4130 if (cdr (SCHEME_V->args) == NIL) 4135 if (cdr (args) == NIL)
4131 { 4136 {
4132 x = SCHEME_V->args; 4137 x = args;
4133 v = num_one; 4138 v = num_one;
4134 } 4139 }
4135 else 4140 else
4136 { 4141 {
4137 x = cdr (SCHEME_V->args); 4142 x = cdr (args);
4138 v = nvalue (car (SCHEME_V->args)); 4143 v = nvalue (car (args));
4139 } 4144 }
4140 4145
4141 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4142 {
4143 if (!is_zero_rvalue (rvalue (car (x)))) 4147 if (!is_zero_rvalue (rvalue (car (x))))
4144 v = num_div (v, nvalue (car (x))); 4148 v = num_div (v, nvalue (car (x)));
4145 else 4149 else
4146 Error_0 ("/: division by zero"); 4150 Error_0 ("/: division by zero");
4147 }
4148 4151
4149 s_return (mk_number (SCHEME_A_ v)); 4152 s_return (mk_number (SCHEME_A_ v));
4150 4153
4151 case OP_INTDIV: /* quotient */ 4154 case OP_INTDIV: /* quotient */
4152 if (cdr (SCHEME_V->args) == NIL) 4155 if (cdr (args) == NIL)
4153 { 4156 {
4154 x = SCHEME_V->args; 4157 x = args;
4155 v = num_one; 4158 v = num_one;
4156 } 4159 }
4157 else 4160 else
4158 { 4161 {
4159 x = cdr (SCHEME_V->args); 4162 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4163 v = nvalue (car (args));
4161 } 4164 }
4162 4165
4163 for (; x != NIL; x = cdr (x)) 4166 for (; x != NIL; x = cdr (x))
4164 { 4167 {
4165 if (ivalue (car (x)) != 0) 4168 if (ivalue (car (x)) != 0)
4166 v = num_intdiv (v, nvalue (car (x))); 4169 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4167 else 4170 else
4168 Error_0 ("quotient: division by zero"); 4171 Error_0 ("quotient: division by zero");
4169 } 4172 }
4170 4173
4171 s_return (mk_number (SCHEME_A_ v)); 4174 s_return (mk_number (SCHEME_A_ v));
4172 4175
4173 case OP_REM: /* remainder */ 4176 case OP_REM: /* remainder */
4174 v = nvalue (car (SCHEME_V->args)); 4177 v = nvalue (x);
4175 4178
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4179 if (ivalue (cadr (args)) != 0)
4177 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4180 v = num_rem (v, nvalue (cadr (args)));
4178 else 4181 else
4179 Error_0 ("remainder: division by zero"); 4182 Error_0 ("remainder: division by zero");
4180 4183
4181 s_return (mk_number (SCHEME_A_ v)); 4184 s_return (mk_number (SCHEME_A_ v));
4182 4185
4183 case OP_MOD: /* modulo */ 4186 case OP_MOD: /* modulo */
4184 v = nvalue (car (SCHEME_V->args)); 4187 v = nvalue (x);
4185 4188
4186 if (ivalue (cadr (SCHEME_V->args)) != 0) 4189 if (ivalue (cadr (args)) != 0)
4187 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4190 v = num_mod (v, nvalue (cadr (args)));
4188 else 4191 else
4189 Error_0 ("modulo: division by zero"); 4192 Error_0 ("modulo: division by zero");
4190 4193
4191 s_return (mk_number (SCHEME_A_ v)); 4194 s_return (mk_number (SCHEME_A_ v));
4192 4195
4193 case OP_CAR: /* car */ 4196 case OP_CAR: /* car */
4194 s_return (caar (SCHEME_V->args)); 4197 s_return (caar (args));
4195 4198
4196 case OP_CDR: /* cdr */ 4199 case OP_CDR: /* cdr */
4197 s_return (cdar (SCHEME_V->args)); 4200 s_return (cdar (args));
4198 4201
4199 case OP_CONS: /* cons */ 4202 case OP_CONS: /* cons */
4200 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4203 set_cdr (args, cadr (args));
4201 s_return (SCHEME_V->args); 4204 s_return (args);
4202 4205
4203 case OP_SETCAR: /* set-car! */ 4206 case OP_SETCAR: /* set-car! */
4204 if (!is_immutable (car (SCHEME_V->args))) 4207 if (!is_immutable (x))
4205 { 4208 {
4206 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4209 set_car (x, cadr (args));
4207 s_return (car (SCHEME_V->args)); 4210 s_return (car (args));
4208 } 4211 }
4209 else 4212 else
4210 Error_0 ("set-car!: unable to alter immutable pair"); 4213 Error_0 ("set-car!: unable to alter immutable pair");
4211 4214
4212 case OP_SETCDR: /* set-cdr! */ 4215 case OP_SETCDR: /* set-cdr! */
4213 if (!is_immutable (car (SCHEME_V->args))) 4216 if (!is_immutable (x))
4214 { 4217 {
4215 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4218 set_cdr (x, cadr (args));
4216 s_return (car (SCHEME_V->args)); 4219 s_return (car (args));
4217 } 4220 }
4218 else 4221 else
4219 Error_0 ("set-cdr!: unable to alter immutable pair"); 4222 Error_0 ("set-cdr!: unable to alter immutable pair");
4220 4223
4221 case OP_CHAR2INT: /* char->integer */ 4224 case OP_CHAR2INT: /* char->integer */
4222 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4225 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4223 4226
4224 case OP_INT2CHAR: /* integer->char */ 4227 case OP_INT2CHAR: /* integer->char */
4225 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4228 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4226 4229
4227 case OP_CHARUPCASE: 4230 case OP_CHARUPCASE:
4228 { 4231 {
4229 unsigned char c = ivalue (car (SCHEME_V->args)); 4232 unsigned char c = ivalue_unchecked (x);
4230 c = toupper (c); 4233 c = toupper (c);
4231 s_return (mk_character (SCHEME_A_ c)); 4234 s_return (mk_character (SCHEME_A_ c));
4232 } 4235 }
4233 4236
4234 case OP_CHARDNCASE: 4237 case OP_CHARDNCASE:
4235 { 4238 {
4236 unsigned char c = ivalue (car (SCHEME_V->args)); 4239 unsigned char c = ivalue_unchecked (x);
4237 c = tolower (c); 4240 c = tolower (c);
4238 s_return (mk_character (SCHEME_A_ c)); 4241 s_return (mk_character (SCHEME_A_ c));
4239 } 4242 }
4240 4243
4241 case OP_STR2SYM: /* string->symbol */ 4244 case OP_STR2SYM: /* string->symbol */
4242 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4245 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4243 4246
4244 case OP_STR2ATOM: /* string->atom */ 4247 case OP_STR2ATOM: /* string->atom */
4245 { 4248 {
4246 char *s = strvalue (car (SCHEME_V->args)); 4249 char *s = strvalue (x);
4247 long pf = 0; 4250 long pf = 0;
4248 4251
4249 if (cdr (SCHEME_V->args) != NIL) 4252 if (cdr (args) != NIL)
4250 { 4253 {
4251 /* we know cadr(SCHEME_V->args) is a natural number */ 4254 /* we know cadr(args) is a natural number */
4252 /* see if it is 2, 8, 10, or 16, or error */ 4255 /* see if it is 2, 8, 10, or 16, or error */
4253 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4256 pf = ivalue_unchecked (cadr (args));
4254 4257
4255 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4258 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4256 { 4259 {
4257 /* base is OK */ 4260 /* base is OK */
4258 } 4261 }
4259 else 4262 else
4260 pf = -1; 4263 pf = -1;
4261 } 4264 }
4262 4265
4263 if (pf < 0) 4266 if (pf < 0)
4264 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4267 Error_1 ("string->atom: bad base:", cadr (args));
4265 else if (*s == '#') /* no use of base! */ 4268 else if (*s == '#') /* no use of base! */
4266 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4269 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4267 else 4270 else
4268 { 4271 {
4269 if (pf == 0 || pf == 10) 4272 if (pf == 0 || pf == 10)
… …
4280 } 4283 }
4281 } 4284 }
4282 } 4285 }
4283 4286
4284 case OP_SYM2STR: /* symbol->string */ 4287 case OP_SYM2STR: /* symbol->string */
4285 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4288 x = mk_string (SCHEME_A_ symname (x));
4286 setimmutable (x); 4289 setimmutable (x);
4287 s_return (x); 4290 s_return (x);
4288 4291
4289 case OP_ATOM2STR: /* atom->string */ 4292 case OP_ATOM2STR: /* atom->string */
4290 { 4293 {
4291 long pf = 0; 4294 long pf = 0;
4292 4295
4293 x = car (SCHEME_V->args);
4294
4295 if (cdr (SCHEME_V->args) != NIL) 4296 if (cdr (args) != NIL)
4296 { 4297 {
4297 /* we know cadr(SCHEME_V->args) is a natural number */ 4298 /* we know cadr(args) is a natural number */
4298 /* see if it is 2, 8, 10, or 16, or error */ 4299 /* see if it is 2, 8, 10, or 16, or error */
4299 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4300 pf = ivalue_unchecked (cadr (args));
4300 4301
4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4302 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4302 { 4303 {
4303 /* base is OK */ 4304 /* base is OK */
4304 } 4305 }
4305 else 4306 else
4306 pf = -1; 4307 pf = -1;
4307 } 4308 }
4308 4309
4309 if (pf < 0) 4310 if (pf < 0)
4310 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4311 Error_1 ("atom->string: bad base:", cadr (args));
4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4312 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4312 { 4313 {
4313 char *p; 4314 char *p;
4314 int len; 4315 int len;
4315 4316
… …
4320 Error_1 ("atom->string: not an atom:", x); 4321 Error_1 ("atom->string: not an atom:", x);
4321 } 4322 }
4322 4323
4323 case OP_MKSTRING: /* make-string */ 4324 case OP_MKSTRING: /* make-string */
4324 { 4325 {
4325 int fill = ' '; 4326 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4326 int len; 4327 int len = ivalue_unchecked (x);
4327 4328
4328 len = ivalue (car (SCHEME_V->args));
4329
4330 if (cdr (SCHEME_V->args) != NIL)
4331 fill = charvalue (cadr (SCHEME_V->args));
4332
4333 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4329 s_return (mk_empty_string (SCHEME_A_ len, fill));
4334 } 4330 }
4335 4331
4336 case OP_STRLEN: /* string-length */ 4332 case OP_STRLEN: /* string-length */
4337 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4333 s_return (mk_integer (SCHEME_A_ strlength (x)));
4338 4334
4339 case OP_STRREF: /* string-ref */ 4335 case OP_STRREF: /* string-ref */
4340 { 4336 {
4341 char *str; 4337 char *str = strvalue (x);
4342 int index;
4343
4344 str = strvalue (car (SCHEME_V->args));
4345
4346 index = ivalue (cadr (SCHEME_V->args)); 4338 int index = ivalue_unchecked (cadr (args));
4347 4339
4348 if (index >= strlength (car (SCHEME_V->args))) 4340 if (index >= strlength (x))
4349 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4341 Error_1 ("string-ref: out of bounds:", cadr (args));
4350 4342
4351 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4343 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4352 } 4344 }
4353 4345
4354 case OP_STRSET: /* string-set! */ 4346 case OP_STRSET: /* string-set! */
4355 { 4347 {
4356 char *str; 4348 char *str = strvalue (x);
4357 int index; 4349 int index = ivalue_unchecked (cadr (args));
4358 int c; 4350 int c;
4359 4351
4360 if (is_immutable (car (SCHEME_V->args))) 4352 if (is_immutable (x))
4361 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4353 Error_1 ("string-set!: unable to alter immutable string:", x);
4362 4354
4363 str = strvalue (car (SCHEME_V->args));
4364
4365 index = ivalue (cadr (SCHEME_V->args));
4366
4367 if (index >= strlength (car (SCHEME_V->args))) 4355 if (index >= strlength (x))
4368 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4356 Error_1 ("string-set!: out of bounds:", cadr (args));
4369 4357
4370 c = charvalue (caddr (SCHEME_V->args)); 4358 c = charvalue (caddr (args));
4371 4359
4372 str[index] = (char) c; 4360 str[index] = c;
4373 s_return (car (SCHEME_V->args)); 4361 s_return (car (args));
4374 } 4362 }
4375 4363
4376 case OP_STRAPPEND: /* string-append */ 4364 case OP_STRAPPEND: /* string-append */
4377 { 4365 {
4378 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4366 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4379 int len = 0; 4367 int len = 0;
4380 pointer newstr; 4368 pointer newstr;
4381 char *pos; 4369 char *pos;
4382 4370
4383 /* compute needed length for new string */ 4371 /* compute needed length for new string */
4384 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4372 for (x = args; x != NIL; x = cdr (x))
4385 len += strlength (car (x)); 4373 len += strlength (car (x));
4386 4374
4387 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4375 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4388 4376
4389 /* store the contents of the argument strings into the new string */ 4377 /* store the contents of the argument strings into the new string */
4390 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4378 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4391 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4379 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4392 4380
4393 s_return (newstr); 4381 s_return (newstr);
4394 } 4382 }
4395 4383
4396 case OP_SUBSTR: /* substring */ 4384 case OP_SUBSTR: /* substring */
4397 { 4385 {
4398 char *str; 4386 char *str = strvalue (x);
4399 int index0; 4387 int index0 = ivalue_unchecked (cadr (args));
4400 int index1; 4388 int index1;
4401 int len; 4389 int len;
4402 4390
4403 str = strvalue (car (SCHEME_V->args));
4404
4405 index0 = ivalue (cadr (SCHEME_V->args));
4406
4407 if (index0 > strlength (car (SCHEME_V->args))) 4391 if (index0 > strlength (x))
4408 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4392 Error_1 ("substring: start out of bounds:", cadr (args));
4409 4393
4410 if (cddr (SCHEME_V->args) != NIL) 4394 if (cddr (args) != NIL)
4411 { 4395 {
4412 index1 = ivalue (caddr (SCHEME_V->args)); 4396 index1 = ivalue_unchecked (caddr (args));
4413 4397
4414 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4398 if (index1 > strlength (x) || index1 < index0)
4415 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4399 Error_1 ("substring: end out of bounds:", caddr (args));
4416 } 4400 }
4417 else 4401 else
4418 index1 = strlength (car (SCHEME_V->args)); 4402 index1 = strlength (x);
4419 4403
4420 len = index1 - index0; 4404 len = index1 - index0;
4421 x = mk_empty_string (SCHEME_A_ len, ' '); 4405 x = mk_empty_string (SCHEME_A_ len, ' ');
4422 memcpy (strvalue (x), str + index0, len); 4406 memcpy (strvalue (x), str + index0, len);
4423 strvalue (x)[len] = 0; 4407 strvalue (x)[len] = 0;
… …
4427 4411
4428 case OP_VECTOR: /* vector */ 4412 case OP_VECTOR: /* vector */
4429 { 4413 {
4430 int i; 4414 int i;
4431 pointer vec; 4415 pointer vec;
4432 int len = list_length (SCHEME_A_ SCHEME_V->args); 4416 int len = list_length (SCHEME_A_ args);
4433 4417
4434 if (len < 0) 4418 if (len < 0)
4435 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4419 Error_1 ("vector: not a proper list:", args);
4436 4420
4437 vec = mk_vector (SCHEME_A_ len); 4421 vec = mk_vector (SCHEME_A_ len);
4438 4422
4439#if USE_ERROR_CHECKING 4423#if USE_ERROR_CHECKING
4440 if (SCHEME_V->no_memory) 4424 if (SCHEME_V->no_memory)
4441 s_return (S_SINK); 4425 s_return (S_SINK);
4442#endif 4426#endif
4443 4427
4444 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4428 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4445 set_vector_elem (vec, i, car (x)); 4429 vector_set (vec, i, car (x));
4446 4430
4447 s_return (vec); 4431 s_return (vec);
4448 } 4432 }
4449 4433
4450 case OP_MKVECTOR: /* make-vector */ 4434 case OP_MKVECTOR: /* make-vector */
4451 { 4435 {
4452 pointer fill = NIL; 4436 pointer fill = NIL;
4453 int len;
4454 pointer vec; 4437 pointer vec;
4438 int len = ivalue_unchecked (x);
4455 4439
4456 len = ivalue (car (SCHEME_V->args));
4457
4458 if (cdr (SCHEME_V->args) != NIL) 4440 if (cdr (args) != NIL)
4459 fill = cadr (SCHEME_V->args); 4441 fill = cadr (args);
4460 4442
4461 vec = mk_vector (SCHEME_A_ len); 4443 vec = mk_vector (SCHEME_A_ len);
4462 4444
4463#if USE_ERROR_CHECKING 4445#if USE_ERROR_CHECKING
4464 if (SCHEME_V->no_memory) 4446 if (SCHEME_V->no_memory)
4465 s_return (S_SINK); 4447 s_return (S_SINK);
4466#endif 4448#endif
4467 4449
4468 if (fill != NIL) 4450 if (fill != NIL)
4469 fill_vector (vec, fill); 4451 fill_vector (vec, 0, fill);
4470 4452
4471 s_return (vec); 4453 s_return (vec);
4472 } 4454 }
4473 4455
4474 case OP_VECLEN: /* vector-length */ 4456 case OP_VECLEN: /* vector-length */
4475 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4457 s_return (mk_integer (SCHEME_A_ veclength (x)));
4458
4459 case OP_VECRESIZE:
4460 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4461 s_return (x);
4476 4462
4477 case OP_VECREF: /* vector-ref */ 4463 case OP_VECREF: /* vector-ref */
4478 { 4464 {
4479 int index;
4480
4481 index = ivalue (cadr (SCHEME_V->args)); 4465 int index = ivalue_unchecked (cadr (args));
4482 4466
4483 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4467 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4484 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4468 Error_1 ("vector-ref: out of bounds:", cadr (args));
4485 4469
4486 s_return (vector_elem (car (SCHEME_V->args), index)); 4470 s_return (vector_get (x, index));
4487 } 4471 }
4488 4472
4489 case OP_VECSET: /* vector-set! */ 4473 case OP_VECSET: /* vector-set! */
4490 { 4474 {
4491 int index; 4475 int index = ivalue_unchecked (cadr (args));
4492 4476
4493 if (is_immutable (car (SCHEME_V->args))) 4477 if (is_immutable (x))
4494 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4478 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4495 4479
4496 index = ivalue (cadr (SCHEME_V->args));
4497
4498 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4480 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4499 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4481 Error_1 ("vector-set!: out of bounds:", cadr (args));
4500 4482
4501 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4483 vector_set (x, index, caddr (args));
4502 s_return (car (SCHEME_V->args)); 4484 s_return (x);
4503 } 4485 }
4504 } 4486 }
4505 4487
4506 return S_T; 4488 if (USE_ERROR_CHECKING) abort ();
4507} 4489}
4508 4490
4509INTERFACE int 4491static int
4510is_list (SCHEME_P_ pointer a) 4492opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4511{ 4493{
4512 return list_length (SCHEME_A_ a) >= 0; 4494 pointer x = SCHEME_V->args;
4513}
4514 4495
4515/* Result is: 4496 for (;;)
4516 proper list: length
4517 circular list: -1
4518 not even a pair: -2
4519 dotted list: -2 minus length before dot
4520*/
4521INTERFACE int
4522list_length (SCHEME_P_ pointer a)
4523{
4524 int i = 0;
4525 pointer slow, fast;
4526
4527 slow = fast = a;
4528
4529 while (1)
4530 { 4497 {
4498 num v = nvalue (car (x));
4499 x = cdr (x);
4500
4531 if (fast == NIL) 4501 if (x == NIL)
4532 return i; 4502 break;
4533 4503
4534 if (!is_pair (fast)) 4504 int r = num_cmp (v, nvalue (car (x)));
4535 return -2 - i;
4536 4505
4537 fast = cdr (fast); 4506 switch (op)
4538 ++i;
4539
4540 if (fast == NIL)
4541 return i;
4542
4543 if (!is_pair (fast))
4544 return -2 - i;
4545
4546 ++i;
4547 fast = cdr (fast);
4548
4549 /* Safe because we would have already returned if `fast'
4550 encountered a non-pair. */
4551 slow = cdr (slow);
4552
4553 if (fast == slow)
4554 { 4507 {
4555 /* the fast pointer has looped back around and caught up 4508 case OP_NUMEQ: r = r == 0; break;
4556 with the slow pointer, hence the structure is circular, 4509 case OP_LESS: r = r < 0; break;
4557 not of finite length, and therefore not a list */ 4510 case OP_GRE: r = r > 0; break;
4558 return -1; 4511 case OP_LEQ: r = r <= 0; break;
4512 case OP_GEQ: r = r >= 0; break;
4559 } 4513 }
4560 }
4561}
4562 4514
4515 if (!r)
4516 s_return (S_F);
4517 }
4518
4519 s_return (S_T);
4520}
4521
4563static pointer 4522static int
4564opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4523opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4565{ 4524{
4566 pointer x; 4525 pointer args = SCHEME_V->args;
4567 num v; 4526 pointer a = car (args);
4568 int (*comp_func) (num, num); 4527 pointer d = cdr (args);
4528 int r;
4569 4529
4570 switch (op) 4530 switch (op)
4571 { 4531 {
4572 case OP_NOT: /* not */ 4532 case OP_NOT: /* not */ r = is_false (a) ; break;
4573 s_retbool (is_false (car (SCHEME_V->args))); 4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4574 4542
4575 case OP_BOOLP: /* boolean? */
4576 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4577
4578 case OP_EOFOBJP: /* boolean? */
4579 s_retbool (car (SCHEME_V->args) == S_EOF);
4580
4581 case OP_NULLP: /* null? */
4582 s_retbool (car (SCHEME_V->args) == NIL);
4583
4584 case OP_NUMEQ: /* = */
4585 case OP_LESS: /* < */
4586 case OP_GRE: /* > */
4587 case OP_LEQ: /* <= */
4588 case OP_GEQ: /* >= */
4589 switch (op)
4590 {
4591 case OP_NUMEQ:
4592 comp_func = num_eq;
4593 break;
4594
4595 case OP_LESS:
4596 comp_func = num_lt;
4597 break;
4598
4599 case OP_GRE:
4600 comp_func = num_gt;
4601 break;
4602
4603 case OP_LEQ:
4604 comp_func = num_le;
4605 break;
4606
4607 case OP_GEQ:
4608 comp_func = num_ge;
4609 break;
4610 }
4611
4612 x = SCHEME_V->args;
4613 v = nvalue (car (x));
4614 x = cdr (x);
4615
4616 for (; x != NIL; x = cdr (x))
4617 {
4618 if (!comp_func (v, nvalue (car (x))))
4619 s_retbool (0);
4620
4621 v = nvalue (car (x));
4622 }
4623
4624 s_retbool (1);
4625
4626 case OP_SYMBOLP: /* symbol? */
4627 s_retbool (is_symbol (car (SCHEME_V->args)));
4628
4629 case OP_NUMBERP: /* number? */
4630 s_retbool (is_number (car (SCHEME_V->args)));
4631
4632 case OP_STRINGP: /* string? */
4633 s_retbool (is_string (car (SCHEME_V->args)));
4634
4635 case OP_INTEGERP: /* integer? */
4636 s_retbool (is_integer (car (SCHEME_V->args)));
4637
4638 case OP_REALP: /* real? */
4639 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4640
4641 case OP_CHARP: /* char? */
4642 s_retbool (is_character (car (SCHEME_V->args)));
4643#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4644 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4645 case OP_CHARAP: /* char-alphabetic? */ 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4646 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4647 4547 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4648 case OP_CHARNP: /* char-numeric? */ 4548 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4649 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4650
4651 case OP_CHARWP: /* char-whitespace? */
4652 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4653
4654 case OP_CHARUP: /* char-upper-case? */
4655 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARLP: /* char-lower-case? */
4658 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4659#endif 4549#endif
4550
4660#if USE_PORTS 4551#if USE_PORTS
4661 4552 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4662 case OP_PORTP: /* port? */
4663 s_retbool (is_port (car (SCHEME_V->args)));
4664
4665 case OP_INPORTP: /* input-port? */ 4553 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4666 s_retbool (is_inport (car (SCHEME_V->args)));
4667
4668 case OP_OUTPORTP: /* output-port? */ 4554 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4669 s_retbool (is_outport (car (SCHEME_V->args)));
4670#endif 4555#endif
4671 4556
4672 case OP_PROCP: /* procedure? */ 4557 case OP_PROCP: /* procedure? */
4673 4558
4674 /*-- 4559 /*--
4675 * continuation should be procedure by the example 4560 * continuation should be procedure by the example
4676 * (call-with-current-continuation procedure?) ==> #t 4561 * (call-with-current-continuation procedure?) ==> #t
4677 * in R^3 report sec. 6.9 4562 * in R^3 report sec. 6.9
4678 */ 4563 */
4679 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4564 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4680 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4565 break;
4681 4566
4682 case OP_PAIRP: /* pair? */ 4567 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4683 s_retbool (is_pair (car (SCHEME_V->args))); 4568 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4684 4569 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4685 case OP_LISTP: /* list? */ 4570 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4686 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4571 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4687 4572 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4688 case OP_ENVP: /* environment? */
4689 s_retbool (is_environment (car (SCHEME_V->args)));
4690
4691 case OP_VECTORP: /* vector? */
4692 s_retbool (is_vector (car (SCHEME_V->args)));
4693
4694 case OP_EQ: /* eq? */
4695 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4696
4697 case OP_EQV: /* eqv? */
4698 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4699 } 4573 }
4700 4574
4701 return S_T; 4575 s_retbool (r);
4702} 4576}
4703 4577
4704static pointer 4578static int
4705opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4579opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4706{ 4580{
4581 pointer args = SCHEME_V->args;
4582 pointer a = car (args);
4707 pointer x, y; 4583 pointer x, y;
4708 4584
4709 switch (op) 4585 switch (op)
4710 { 4586 {
4711 case OP_FORCE: /* force */ 4587 case OP_FORCE: /* force */
4712 SCHEME_V->code = car (SCHEME_V->args); 4588 SCHEME_V->code = a;
4713 4589
4714 if (is_promise (SCHEME_V->code)) 4590 if (is_promise (SCHEME_V->code))
4715 { 4591 {
4716 /* Should change type to closure here */ 4592 /* Should change type to closure here */
4717 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4593 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4738 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4614 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4739 SCHEME_V->outport = cadr (SCHEME_V->args); 4615 SCHEME_V->outport = cadr (SCHEME_V->args);
4740 } 4616 }
4741 } 4617 }
4742 4618
4743 SCHEME_V->args = car (SCHEME_V->args); 4619 SCHEME_V->args = a;
4744 4620
4745 if (op == OP_WRITE) 4621 if (op == OP_WRITE)
4746 SCHEME_V->print_flag = 1; 4622 SCHEME_V->print_flag = 1;
4747 else 4623 else
4748 SCHEME_V->print_flag = 0; 4624 SCHEME_V->print_flag = 0;
4749 4625
4750 s_goto (OP_P0LIST); 4626 s_goto (OP_P0LIST);
4751 4627
4752 case OP_NEWLINE: /* newline */ 4628 case OP_NEWLINE: /* newline */
4753 if (is_pair (SCHEME_V->args)) 4629 if (is_pair (args))
4754 { 4630 {
4755 if (car (SCHEME_V->args) != SCHEME_V->outport) 4631 if (a != SCHEME_V->outport)
4756 { 4632 {
4757 x = cons (SCHEME_V->outport, NIL); 4633 x = cons (SCHEME_V->outport, NIL);
4758 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4759 SCHEME_V->outport = car (SCHEME_V->args); 4635 SCHEME_V->outport = a;
4760 } 4636 }
4761 } 4637 }
4762 4638
4763 putstr (SCHEME_A_ "\n"); 4639 putstr (SCHEME_A_ "\n");
4764 s_return (S_T); 4640 s_return (S_T);
4765#endif 4641#endif
4766 4642
4767 case OP_ERR0: /* error */ 4643 case OP_ERR0: /* error */
4768 SCHEME_V->retcode = -1; 4644 SCHEME_V->retcode = -1;
4769 4645
4770 if (!is_string (car (SCHEME_V->args))) 4646 if (!is_string (a))
4771 { 4647 {
4772 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4648 args = cons (mk_string (SCHEME_A_ " -- "), args);
4773 setimmutable (car (SCHEME_V->args)); 4649 setimmutable (car (args));
4774 } 4650 }
4775 4651
4776 putstr (SCHEME_A_ "Error: "); 4652 putstr (SCHEME_A_ "Error: ");
4777 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4653 putstr (SCHEME_A_ strvalue (car (args)));
4778 SCHEME_V->args = cdr (SCHEME_V->args); 4654 SCHEME_V->args = cdr (args);
4779 s_goto (OP_ERR1); 4655 s_goto (OP_ERR1);
4780 4656
4781 case OP_ERR1: /* error */ 4657 case OP_ERR1: /* error */
4782 putstr (SCHEME_A_ " "); 4658 putstr (SCHEME_A_ " ");
4783 4659
4784 if (SCHEME_V->args != NIL) 4660 if (args != NIL)
4785 { 4661 {
4786 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4787 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4788 SCHEME_V->print_flag = 1; 4664 SCHEME_V->print_flag = 1;
4789 s_goto (OP_P0LIST); 4665 s_goto (OP_P0LIST);
4790 } 4666 }
4791 else 4667 else
4792 { 4668 {
4793 putstr (SCHEME_A_ "\n"); 4669 putstr (SCHEME_A_ "\n");
4794 4670
4795 if (SCHEME_V->interactive_repl) 4671 if (SCHEME_V->interactive_repl)
4796 s_goto (OP_T0LVL); 4672 s_goto (OP_T0LVL);
4797 else 4673 else
4798 return NIL; 4674 return -1;
4799 } 4675 }
4800 4676
4801 case OP_REVERSE: /* reverse */ 4677 case OP_REVERSE: /* reverse */
4802 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4678 s_return (reverse (SCHEME_A_ a));
4803 4679
4804 case OP_LIST_STAR: /* list* */ 4680 case OP_LIST_STAR: /* list* */
4805 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4681 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4806 4682
4807 case OP_APPEND: /* append */ 4683 case OP_APPEND: /* append */
4808 x = NIL; 4684 x = NIL;
4809 y = SCHEME_V->args; 4685 y = args;
4810 4686
4811 if (y == x) 4687 if (y == x)
4812 s_return (x); 4688 s_return (x);
4813 4689
4814 /* cdr() in the while condition is not a typo. If car() */ 4690 /* cdr() in the while condition is not a typo. If car() */
… …
4825 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4701 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4826 4702
4827#if USE_PLIST 4703#if USE_PLIST
4828 4704
4829 case OP_PUT: /* put */ 4705 case OP_PUT: /* put */
4830 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4706 if (!hasprop (a) || !hasprop (cadr (args)))
4831 Error_0 ("illegal use of put"); 4707 Error_0 ("illegal use of put");
4832 4708
4833 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4709 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4834 { 4710 {
4835 if (caar (x) == y) 4711 if (caar (x) == y)
4836 break; 4712 break;
4837 } 4713 }
4838 4714
4839 if (x != NIL) 4715 if (x != NIL)
4840 cdar (x) = caddr (SCHEME_V->args); 4716 cdar (x) = caddr (args);
4841 else 4717 else
4842 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4718 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4843 4719
4844 s_return (S_T); 4720 s_return (S_T);
4845 4721
4846 case OP_GET: /* get */ 4722 case OP_GET: /* get */
4847 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4723 if (!hasprop (a) || !hasprop (cadr (args)))
4848 Error_0 ("illegal use of get"); 4724 Error_0 ("illegal use of get");
4849 4725
4850 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4726 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4851 if (caar (x) == y) 4727 if (caar (x) == y)
4852 break; 4728 break;
4853 4729
4854 if (x != NIL) 4730 if (x != NIL)
4855 s_return (cdar (x)); 4731 s_return (cdar (x));
… …
4857 s_return (NIL); 4733 s_return (NIL);
4858 4734
4859#endif /* USE_PLIST */ 4735#endif /* USE_PLIST */
4860 4736
4861 case OP_QUIT: /* quit */ 4737 case OP_QUIT: /* quit */
4862 if (is_pair (SCHEME_V->args)) 4738 if (is_pair (args))
4863 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4739 SCHEME_V->retcode = ivalue (a);
4864 4740
4865 return NIL; 4741 return -1;
4866 4742
4867 case OP_GC: /* gc */ 4743 case OP_GC: /* gc */
4868 gc (SCHEME_A_ NIL, NIL); 4744 gc (SCHEME_A_ NIL, NIL);
4869 s_return (S_T); 4745 s_return (S_T);
4870 4746
4871 case OP_GCVERB: /* gc-verbose */ 4747 case OP_GCVERB: /* gc-verbose */
4872 { 4748 {
4873 int was = SCHEME_V->gc_verbose; 4749 int was = SCHEME_V->gc_verbose;
4874 4750
4875 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4751 SCHEME_V->gc_verbose = (a != S_F);
4876 s_retbool (was); 4752 s_retbool (was);
4877 } 4753 }
4878 4754
4879 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
4880 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4756 if (!is_pair (args) || !is_number (a))
4881 Error_0 ("new-segment: argument must be a number"); 4757 Error_0 ("new-segment: argument must be a number");
4882 4758
4883 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4759 alloc_cellseg (SCHEME_A_ ivalue (a));
4884 4760
4885 s_return (S_T); 4761 s_return (S_T);
4886 4762
4887 case OP_OBLIST: /* oblist */ 4763 case OP_OBLIST: /* oblist */
4888 s_return (oblist_all_symbols (SCHEME_A)); 4764 s_return (oblist_all_symbols (SCHEME_A));
… …
4915 case OP_OPEN_INOUTFILE: 4791 case OP_OPEN_INOUTFILE:
4916 prop = port_input | port_output; 4792 prop = port_input | port_output;
4917 break; 4793 break;
4918 } 4794 }
4919 4795
4920 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4796 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4921 4797
4922 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
4923 s_return (S_F);
4924
4925 s_return (p);
4926 } 4799 }
4927 4800
4928# if USE_STRING_PORTS 4801# if USE_STRING_PORTS
4929 4802
4930 case OP_OPEN_INSTRING: /* open-input-string */ 4803 case OP_OPEN_INSTRING: /* open-input-string */
… …
4942 case OP_OPEN_INOUTSTRING: 4815 case OP_OPEN_INOUTSTRING:
4943 prop = port_input | port_output; 4816 prop = port_input | port_output;
4944 break; 4817 break;
4945 } 4818 }
4946 4819
4947 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4820 p = port_from_string (SCHEME_A_ strvalue (a),
4948 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4821 strvalue (a) + strlength (a), prop);
4949 4822
4950 if (p == NIL) 4823 s_return (p == NIL ? S_F : p);
4951 s_return (S_F);
4952
4953 s_return (p);
4954 } 4824 }
4955 4825
4956 case OP_OPEN_OUTSTRING: /* open-output-string */ 4826 case OP_OPEN_OUTSTRING: /* open-output-string */
4957 { 4827 {
4958 pointer p; 4828 pointer p;
4959 4829
4960 if (car (SCHEME_V->args) == NIL) 4830 if (a == NIL)
4961 {
4962 p = port_from_scratch (SCHEME_A); 4831 p = port_from_scratch (SCHEME_A);
4963
4964 if (p == NIL)
4965 s_return (S_F);
4966 }
4967 else 4832 else
4968 {
4969 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4833 p = port_from_string (SCHEME_A_ strvalue (a),
4970 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4834 strvalue (a) + strlength (a), port_output);
4971 4835
4972 if (p == NIL) 4836 s_return (p == NIL ? S_F : p);
4973 s_return (S_F);
4974 }
4975
4976 s_return (p);
4977 } 4837 }
4978 4838
4979 case OP_GET_OUTSTRING: /* get-output-string */ 4839 case OP_GET_OUTSTRING: /* get-output-string */
4980 { 4840 {
4981 port *p; 4841 port *p;
4982 4842
4983 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4843 if ((p = a->object.port)->kind & port_string)
4984 { 4844 {
4985 off_t size; 4845 off_t size;
4986 char *str; 4846 char *str;
4987 4847
4988 size = p->rep.string.curr - p->rep.string.start + 1; 4848 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5004 } 4864 }
5005 4865
5006# endif 4866# endif
5007 4867
5008 case OP_CLOSE_INPORT: /* close-input-port */ 4868 case OP_CLOSE_INPORT: /* close-input-port */
5009 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4869 port_close (SCHEME_A_ a, port_input);
5010 s_return (S_T); 4870 s_return (S_T);
5011 4871
5012 case OP_CLOSE_OUTPORT: /* close-output-port */ 4872 case OP_CLOSE_OUTPORT: /* close-output-port */
5013 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4873 port_close (SCHEME_A_ a, port_output);
5014 s_return (S_T); 4874 s_return (S_T);
5015#endif 4875#endif
5016 4876
5017 case OP_INT_ENV: /* interaction-environment */ 4877 case OP_INT_ENV: /* interaction-environment */
5018 s_return (SCHEME_V->global_env); 4878 s_return (SCHEME_V->global_env);
… …
5020 case OP_CURR_ENV: /* current-environment */ 4880 case OP_CURR_ENV: /* current-environment */
5021 s_return (SCHEME_V->envir); 4881 s_return (SCHEME_V->envir);
5022 4882
5023 } 4883 }
5024 4884
5025 return S_T; 4885 if (USE_ERROR_CHECKING) abort ();
5026} 4886}
5027 4887
5028static pointer 4888static int
5029opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4889opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5030{ 4890{
4891 pointer args = SCHEME_V->args;
5031 pointer x; 4892 pointer x;
5032 4893
5033 if (SCHEME_V->nesting != 0) 4894 if (SCHEME_V->nesting != 0)
5034 { 4895 {
5035 int n = SCHEME_V->nesting; 4896 int n = SCHEME_V->nesting;
… …
5042 switch (op) 4903 switch (op)
5043 { 4904 {
5044 /* ========== reading part ========== */ 4905 /* ========== reading part ========== */
5045#if USE_PORTS 4906#if USE_PORTS
5046 case OP_READ: 4907 case OP_READ:
5047 if (!is_pair (SCHEME_V->args)) 4908 if (!is_pair (args))
5048 s_goto (OP_READ_INTERNAL); 4909 s_goto (OP_READ_INTERNAL);
5049 4910
5050 if (!is_inport (car (SCHEME_V->args))) 4911 if (!is_inport (car (args)))
5051 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4912 Error_1 ("read: not an input port:", car (args));
5052 4913
5053 if (car (SCHEME_V->args) == SCHEME_V->inport) 4914 if (car (args) == SCHEME_V->inport)
5054 s_goto (OP_READ_INTERNAL); 4915 s_goto (OP_READ_INTERNAL);
5055 4916
5056 x = SCHEME_V->inport; 4917 x = SCHEME_V->inport;
5057 SCHEME_V->inport = car (SCHEME_V->args); 4918 SCHEME_V->inport = car (args);
5058 x = cons (x, NIL); 4919 x = cons (x, NIL);
5059 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4920 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5060 s_goto (OP_READ_INTERNAL); 4921 s_goto (OP_READ_INTERNAL);
5061 4922
5062 case OP_READ_CHAR: /* read-char */ 4923 case OP_READ_CHAR: /* read-char */
5063 case OP_PEEK_CHAR: /* peek-char */ 4924 case OP_PEEK_CHAR: /* peek-char */
5064 { 4925 {
5065 int c; 4926 int c;
5066 4927
5067 if (is_pair (SCHEME_V->args)) 4928 if (is_pair (args))
5068 { 4929 {
5069 if (car (SCHEME_V->args) != SCHEME_V->inport) 4930 if (car (args) != SCHEME_V->inport)
5070 { 4931 {
5071 x = SCHEME_V->inport; 4932 x = SCHEME_V->inport;
5072 x = cons (x, NIL); 4933 x = cons (x, NIL);
5073 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4934 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5074 SCHEME_V->inport = car (SCHEME_V->args); 4935 SCHEME_V->inport = car (args);
5075 } 4936 }
5076 } 4937 }
5077 4938
5078 c = inchar (SCHEME_A); 4939 c = inchar (SCHEME_A);
5079 4940
… …
5089 case OP_CHAR_READY: /* char-ready? */ 4950 case OP_CHAR_READY: /* char-ready? */
5090 { 4951 {
5091 pointer p = SCHEME_V->inport; 4952 pointer p = SCHEME_V->inport;
5092 int res; 4953 int res;
5093 4954
5094 if (is_pair (SCHEME_V->args)) 4955 if (is_pair (args))
5095 p = car (SCHEME_V->args); 4956 p = car (args);
5096 4957
5097 res = p->object.port->kind & port_string; 4958 res = p->object.port->kind & port_string;
5098 4959
5099 s_retbool (res); 4960 s_retbool (res);
5100 } 4961 }
5101 4962
5102 case OP_SET_INPORT: /* set-input-port */ 4963 case OP_SET_INPORT: /* set-input-port */
5103 SCHEME_V->inport = car (SCHEME_V->args); 4964 SCHEME_V->inport = car (args);
5104 s_return (SCHEME_V->value); 4965 s_return (SCHEME_V->value);
5105 4966
5106 case OP_SET_OUTPORT: /* set-output-port */ 4967 case OP_SET_OUTPORT: /* set-output-port */
5107 SCHEME_V->outport = car (SCHEME_V->args); 4968 SCHEME_V->outport = car (args);
5108 s_return (SCHEME_V->value); 4969 s_return (SCHEME_V->value);
5109#endif 4970#endif
5110 4971
5111 case OP_RDSEXPR: 4972 case OP_RDSEXPR:
5112 switch (SCHEME_V->tok) 4973 switch (SCHEME_V->tok)
… …
5161 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5022 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5162 SCHEME_V->tok = token (SCHEME_A); 5023 SCHEME_V->tok = token (SCHEME_A);
5163 s_goto (OP_RDSEXPR); 5024 s_goto (OP_RDSEXPR);
5164 5025
5165 case TOK_ATOM: 5026 case TOK_ATOM:
5166 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5027 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5028
5029 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032
5033 case TOK_STRATOM:
5034 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5167 5037
5168 case TOK_DQUOTE: 5038 case TOK_DQUOTE:
5169 x = readstrexp (SCHEME_A); 5039 x = readstrexp (SCHEME_A_ '"');
5170 5040
5171 if (x == S_F) 5041 if (x == S_F)
5172 Error_0 ("Error reading string"); 5042 Error_0 ("Error reading string");
5173 5043
5174 setimmutable (x); 5044 setimmutable (x);
… …
5186 s_goto (OP_EVAL); 5056 s_goto (OP_EVAL);
5187 } 5057 }
5188 } 5058 }
5189 5059
5190 case TOK_SHARP_CONST: 5060 case TOK_SHARP_CONST:
5191 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5192 Error_0 ("undefined sharp expression"); 5062 Error_0 ("undefined sharp expression");
5193 else 5063 else
5194 s_return (x); 5064 s_return (x);
5195 5065
5196 default: 5066 default:
… …
5198 } 5068 }
5199 5069
5200 break; 5070 break;
5201 5071
5202 case OP_RDLIST: 5072 case OP_RDLIST:
5203 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5073 SCHEME_V->args = cons (SCHEME_V->value, args);
5204 SCHEME_V->tok = token (SCHEME_A); 5074 SCHEME_V->tok = token (SCHEME_A);
5205 5075
5206 switch (SCHEME_V->tok) 5076 switch (SCHEME_V->tok)
5207 { 5077 {
5208 case TOK_EOF: 5078 case TOK_EOF:
… …
5236 case OP_RDDOT: 5106 case OP_RDDOT:
5237 if (token (SCHEME_A) != TOK_RPAREN) 5107 if (token (SCHEME_A) != TOK_RPAREN)
5238 Error_0 ("syntax error: illegal dot expression"); 5108 Error_0 ("syntax error: illegal dot expression");
5239 5109
5240 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5110 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5241 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5111 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5242 5112
5243 case OP_RDQUOTE: 5113 case OP_RDQUOTE:
5244 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5114 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5245 5115
5246 case OP_RDQQUOTE: 5116 case OP_RDQQUOTE:
… …
5268 SCHEME_V->args = SCHEME_V->value; 5138 SCHEME_V->args = SCHEME_V->value;
5269 s_goto (OP_VECTOR); 5139 s_goto (OP_VECTOR);
5270 5140
5271 /* ========== printing part ========== */ 5141 /* ========== printing part ========== */
5272 case OP_P0LIST: 5142 case OP_P0LIST:
5273 if (is_vector (SCHEME_V->args)) 5143 if (is_vector (args))
5274 { 5144 {
5275 putstr (SCHEME_A_ "#("); 5145 putstr (SCHEME_A_ "#(");
5276 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5146 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5277 s_goto (OP_PVECFROM); 5147 s_goto (OP_PVECFROM);
5278 } 5148 }
5279 else if (is_environment (SCHEME_V->args)) 5149 else if (is_environment (args))
5280 { 5150 {
5281 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5151 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5282 s_return (S_T); 5152 s_return (S_T);
5283 } 5153 }
5284 else if (!is_pair (SCHEME_V->args)) 5154 else if (!is_pair (args))
5285 { 5155 {
5286 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5156 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5287 s_return (S_T); 5157 s_return (S_T);
5288 } 5158 }
5289 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5159 else
5290 { 5160 {
5161 pointer a = car (args);
5162 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b);
5165
5166 if (a == SCHEME_V->QUOTE && ok_abbr)
5291 putstr (SCHEME_A_ "'"); 5167 putstr (SCHEME_A_ "'");
5292 SCHEME_V->args = cadr (SCHEME_V->args); 5168 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`");
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ",");
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@");
5174 else
5175 {
5176 putstr (SCHEME_A_ "(");
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a;
5179 }
5180
5293 s_goto (OP_P0LIST); 5181 s_goto (OP_P0LIST);
5294 } 5182 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5183
5184 case OP_P1LIST:
5185 if (is_pair (args))
5296 { 5186 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5297 putstr (SCHEME_A_ "`"); 5188 putstr (SCHEME_A_ " ");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5189 SCHEME_V->args = car (args);
5299 s_goto (OP_P0LIST); 5190 s_goto (OP_P0LIST);
5300 } 5191 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5302 {
5303 putstr (SCHEME_A_ ",");
5304 SCHEME_V->args = cadr (SCHEME_V->args);
5305 s_goto (OP_P0LIST);
5306 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",@");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else
5314 {
5315 putstr (SCHEME_A_ "(");
5316 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5317 SCHEME_V->args = car (SCHEME_V->args);
5318 s_goto (OP_P0LIST);
5319 }
5320
5321 case OP_P1LIST:
5322 if (is_pair (SCHEME_V->args))
5323 {
5324 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5325 putstr (SCHEME_A_ " ");
5326 SCHEME_V->args = car (SCHEME_V->args);
5327 s_goto (OP_P0LIST);
5328 }
5329 else if (is_vector (SCHEME_V->args)) 5192 else if (is_vector (args))
5330 { 5193 {
5331 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5194 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5332 putstr (SCHEME_A_ " . "); 5195 putstr (SCHEME_A_ " . ");
5333 s_goto (OP_P0LIST); 5196 s_goto (OP_P0LIST);
5334 } 5197 }
5335 else 5198 else
5336 { 5199 {
5337 if (SCHEME_V->args != NIL) 5200 if (args != NIL)
5338 { 5201 {
5339 putstr (SCHEME_A_ " . "); 5202 putstr (SCHEME_A_ " . ");
5340 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5341 } 5204 }
5342 5205
5343 putstr (SCHEME_A_ ")"); 5206 putstr (SCHEME_A_ ")");
5344 s_return (S_T); 5207 s_return (S_T);
5345 } 5208 }
5346 5209
5347 case OP_PVECFROM: 5210 case OP_PVECFROM:
5348 { 5211 {
5349 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5212 int i = ivalue_unchecked (cdr (args));
5350 pointer vec = car (SCHEME_V->args); 5213 pointer vec = car (args);
5351 int len = veclength (vec); 5214 int len = veclength (vec);
5352 5215
5353 if (i == len) 5216 if (i == len)
5354 { 5217 {
5355 putstr (SCHEME_A_ ")"); 5218 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5219 s_return (S_T);
5357 } 5220 }
5358 else 5221 else
5359 { 5222 {
5360 pointer elem = vector_elem (vec, i); 5223 pointer elem = vector_get (vec, i);
5361 5224
5362 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5225 ivalue_unchecked (cdr (args)) = i + 1;
5363 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5364 SCHEME_V->args = elem; 5227 SCHEME_V->args = elem;
5365 5228
5366 if (i > 0) 5229 if (i > 0)
5367 putstr (SCHEME_A_ " "); 5230 putstr (SCHEME_A_ " ");
5368 5231
5369 s_goto (OP_P0LIST); 5232 s_goto (OP_P0LIST);
5370 } 5233 }
5371 } 5234 }
5372 } 5235 }
5373 5236
5374 return S_T; 5237 if (USE_ERROR_CHECKING) abort ();
5375} 5238}
5376 5239
5377static pointer 5240static int
5378opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5241opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5379{ 5242{
5243 pointer args = SCHEME_V->args;
5244 pointer a = car (args);
5380 pointer x, y; 5245 pointer x, y;
5381 5246
5382 switch (op) 5247 switch (op)
5383 { 5248 {
5384 case OP_LIST_LENGTH: /* length *//* a.k */ 5249 case OP_LIST_LENGTH: /* length *//* a.k */
5385 { 5250 {
5386 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5251 long v = list_length (SCHEME_A_ a);
5387 5252
5388 if (v < 0) 5253 if (v < 0)
5389 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5254 Error_1 ("length: not a list:", a);
5390 5255
5391 s_return (mk_integer (SCHEME_A_ v)); 5256 s_return (mk_integer (SCHEME_A_ v));
5392 } 5257 }
5393 5258
5394 case OP_ASSQ: /* assq *//* a.k */ 5259 case OP_ASSQ: /* assq *//* a.k */
5395 x = car (SCHEME_V->args); 5260 x = a;
5396 5261
5397 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5262 for (y = cadr (args); is_pair (y); y = cdr (y))
5398 { 5263 {
5399 if (!is_pair (car (y))) 5264 if (!is_pair (car (y)))
5400 Error_0 ("unable to handle non pair element"); 5265 Error_0 ("unable to handle non pair element");
5401 5266
5402 if (x == caar (y)) 5267 if (x == caar (y))
… …
5408 else 5273 else
5409 s_return (S_F); 5274 s_return (S_F);
5410 5275
5411 5276
5412 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5413 SCHEME_V->args = car (SCHEME_V->args); 5278 SCHEME_V->args = a;
5414 5279
5415 if (SCHEME_V->args == NIL) 5280 if (SCHEME_V->args == NIL)
5416 s_return (S_F); 5281 s_return (S_F);
5417 else if (is_closure (SCHEME_V->args)) 5282 else if (is_closure (SCHEME_V->args))
5418 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5423 5288
5424 case OP_CLOSUREP: /* closure? */ 5289 case OP_CLOSUREP: /* closure? */
5425 /* 5290 /*
5426 * Note, macro object is also a closure. 5291 * Note, macro object is also a closure.
5427 * Therefore, (closure? <#MACRO>) ==> #t 5292 * Therefore, (closure? <#MACRO>) ==> #t
5293 * (schmorp) well, obviously not, fix? TODO
5428 */ 5294 */
5429 s_retbool (is_closure (car (SCHEME_V->args))); 5295 s_retbool (is_closure (a));
5430 5296
5431 case OP_MACROP: /* macro? */ 5297 case OP_MACROP: /* macro? */
5432 s_retbool (is_macro (car (SCHEME_V->args))); 5298 s_retbool (is_macro (a));
5433 } 5299 }
5434 5300
5435 return S_T; /* NOTREACHED */ 5301 if (USE_ERROR_CHECKING) abort ();
5436} 5302}
5437 5303
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5438typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5439 5306
5440typedef int (*test_predicate) (pointer); 5307typedef int (*test_predicate)(pointer);
5441static int 5308static int
5442is_any (pointer p) 5309tst_any (pointer p)
5443{ 5310{
5444 return 1; 5311 return 1;
5445} 5312}
5446 5313
5447static int 5314static int
5448is_nonneg (pointer p) 5315tst_inonneg (pointer p)
5449{ 5316{
5450 return ivalue (p) >= 0 && is_integer (p); 5317 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318}
5319
5320static int
5321tst_is_list (SCHEME_P_ pointer p)
5322{
5323 return p == NIL || is_pair (p);
5451} 5324}
5452 5325
5453/* Correspond carefully with following defines! */ 5326/* Correspond carefully with following defines! */
5454static struct 5327static struct
5455{ 5328{
5456 test_predicate fct; 5329 test_predicate fct;
5457 const char *kind; 5330 const char *kind;
5458} tests[] = 5331} tests[] = {
5459{ 5332 { tst_any , 0 },
5460 { 0, 0}, /* unused */ 5333 { is_string , "string" },
5461 { is_any, 0}, 5334 { is_symbol , "symbol" },
5462 { is_string, "string" }, 5335 { is_port , "port" },
5463 { is_symbol, "symbol" },
5464 { is_port, "port" },
5465 { is_inport, "input port" }, 5336 { is_inport , "input port" },
5466 { is_outport, "output port" }, 5337 { is_outport , "output port" },
5467 { is_environment, "environment" }, 5338 { is_environment, "environment" },
5468 { is_pair, "pair" }, 5339 { is_pair , "pair" },
5469 { 0, "pair or '()" }, 5340 { 0 , "pair or '()" },
5470 { is_character, "character" }, 5341 { is_character , "character" },
5471 { is_vector, "vector" }, 5342 { is_vector , "vector" },
5472 { is_number, "number" }, 5343 { is_number , "number" },
5473 { is_integer, "integer" }, 5344 { is_integer , "integer" },
5474 { is_nonneg, "non-negative integer" } 5345 { tst_inonneg , "non-negative integer" }
5475}; 5346};
5476 5347
5477#define TST_NONE 0 5348#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5478#define TST_ANY "\001" 5349#define TST_ANY "\001"
5479#define TST_STRING "\002" 5350#define TST_STRING "\002"
5480#define TST_SYMBOL "\003" 5351#define TST_SYMBOL "\003"
5481#define TST_PORT "\004" 5352#define TST_PORT "\004"
5482#define TST_INPORT "\005" 5353#define TST_INPORT "\005"
5483#define TST_OUTPORT "\006" 5354#define TST_OUTPORT "\006"
5484#define TST_ENVIRONMENT "\007" 5355#define TST_ENVIRONMENT "\007"
5485#define TST_PAIR "\010" 5356#define TST_PAIR "\010"
5486#define TST_LIST "\011" 5357#define TST_LIST "\011"
5487#define TST_CHAR "\012" 5358#define TST_CHAR "\012"
5488#define TST_VECTOR "\013" 5359#define TST_VECTOR "\013"
5489#define TST_NUMBER "\014" 5360#define TST_NUMBER "\014"
5490#define TST_INTEGER "\015" 5361#define TST_INTEGER "\015"
5491#define TST_NATURAL "\016" 5362#define TST_NATURAL "\016"
5363
5364#define INF_ARG 0xff
5365#define UNNAMED_OP ""
5366
5367static const char opnames[] =
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h"
5370#undef OP_DEF
5371;
5372
5373static const char *
5374opname (int idx)
5375{
5376 const char *name = opnames;
5377
5378 /* should do this at compile time, but would require external program, right? */
5379 while (idx--)
5380 name += strlen (name) + 1;
5381
5382 return *name ? name : "ILLEGAL";
5383}
5384
5385static const char *
5386procname (pointer x)
5387{
5388 return opname (procnum (x));
5389}
5492 5390
5493typedef struct 5391typedef struct
5494{ 5392{
5495 dispatch_func func; 5393 uint8_t func;
5496 char *name; 5394 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5395 uint8_t builtin;
5396#if USE_ERROR_CHECKING
5497 int min_arity; 5397 uint8_t min_arity;
5498 int max_arity; 5398 uint8_t max_arity;
5499 char *arg_tests_encoding; 5399 char arg_tests_encoding[3];
5400#endif
5500} op_code_info; 5401} op_code_info;
5501 5402
5502#define INF_ARG 0xffff
5503
5504static op_code_info dispatch_table[] = { 5403static const op_code_info dispatch_table[] = {
5505#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5404#if USE_ERROR_CHECKING
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5406#else
5407#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5408#endif
5506#include "opdefines.h" 5409#include "opdefines.h"
5410#undef OP_DEF
5507 {0} 5411 {0}
5508}; 5412};
5509 5413
5510static const char *
5511procname (pointer x)
5512{
5513 int n = procnum (x);
5514 const char *name = dispatch_table[n].name;
5515
5516 if (name == 0)
5517 name = "ILLEGAL!";
5518
5519 return name;
5520}
5521
5522/* kernel of this interpreter */ 5414/* kernel of this interpreter */
5523static void 5415static void ecb_hot
5524Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5525{ 5417{
5526 SCHEME_V->op = op; 5418 SCHEME_V->op = op;
5527 5419
5528 for (;;) 5420 for (;;)
5529 { 5421 {
5530 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5422 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5531 5423
5532#if USE_ERROR_CHECKING 5424#if USE_ERROR_CHECKING
5533 if (pcd->name) /* if built-in function, check arguments */ 5425 if (pcd->builtin) /* if built-in function, check arguments */
5534 { 5426 {
5535 int ok = 1;
5536 char msg[STRBUFFSIZE]; 5427 char msg[STRBUFFSIZE];
5537 int n = list_length (SCHEME_A_ SCHEME_V->args); 5428 int n = list_length (SCHEME_A_ SCHEME_V->args);
5538 5429
5539 /* Check number of arguments */ 5430 /* Check number of arguments */
5540 if (n < pcd->min_arity) 5431 if (ecb_expect_false (n < pcd->min_arity))
5541 { 5432 {
5542 ok = 0;
5543 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5433 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5544 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5434 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5435 xError_1 (SCHEME_A_ msg, 0);
5436 continue;
5545 } 5437 }
5546 5438 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5547 if (ok && n > pcd->max_arity)
5548 { 5439 {
5549 ok = 0;
5550 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5440 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5551 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5441 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5442 xError_1 (SCHEME_A_ msg, 0);
5443 continue;
5552 } 5444 }
5553 5445 else
5554 if (ok)
5555 { 5446 {
5556 if (pcd->arg_tests_encoding) 5447 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5557 { 5448 {
5558 int i = 0; 5449 int i = 0;
5559 int j; 5450 int j;
5560 const char *t = pcd->arg_tests_encoding; 5451 const char *t = pcd->arg_tests_encoding;
5561 pointer arglist = SCHEME_V->args; 5452 pointer arglist = SCHEME_V->args;
5562 5453
5563 do 5454 do
5564 { 5455 {
5565 pointer arg = car (arglist); 5456 pointer arg = car (arglist);
5566 5457
5567 j = (int) t[0]; 5458 j = t[0];
5568 5459
5460 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5569 if (j == TST_LIST[0]) 5461 if (j == TST_LIST[0])
5570 { 5462 {
5571 if (arg != NIL && !is_pair (arg)) 5463 if (!tst_is_list (SCHEME_A_ arg))
5572 break; 5464 break;
5573 } 5465 }
5574 else 5466 else
5575 { 5467 {
5576 if (!tests[j].fct (arg)) 5468 if (!tests[j - 1].fct (arg))
5577 break; 5469 break;
5578 } 5470 }
5579 5471
5580 if (t[1] != 0) /* last test is replicated as necessary */ 5472 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5581 t++; 5473 t++;
5582 5474
5583 arglist = cdr (arglist); 5475 arglist = cdr (arglist);
5584 i++; 5476 i++;
5585 } 5477 }
5586 while (i < n); 5478 while (i < n);
5587 5479
5588 if (i < n) 5480 if (i < n)
5589 { 5481 {
5590 ok = 0;
5591 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5482 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5483 xError_1 (SCHEME_A_ msg, 0);
5484 continue;
5592 } 5485 }
5593 } 5486 }
5594 } 5487 }
5595
5596 if (!ok)
5597 {
5598 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5599 return;
5600
5601 pcd = dispatch_table + SCHEME_V->op;
5602 }
5603 } 5488 }
5604#endif 5489#endif
5605 5490
5606 ok_to_freely_gc (SCHEME_A); 5491 ok_to_freely_gc (SCHEME_A);
5607 5492
5608 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5493 static const dispatch_func dispatch_funcs[] = {
5494 opexe_0,
5495 opexe_1,
5496 opexe_2,
5497 opexe_3,
5498 opexe_4,
5499 opexe_5,
5500 opexe_6,
5501 };
5502
5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5609 return; 5504 return;
5610 5505
5611 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5612 { 5507 {
5613 xwrstr ("No memory!\n"); 5508 xwrstr ("No memory!\n");
… …
5637mk_proc (SCHEME_P_ enum scheme_opcodes op) 5532mk_proc (SCHEME_P_ enum scheme_opcodes op)
5638{ 5533{
5639 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5534 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5640 set_typeflag (y, (T_PROC | T_ATOM)); 5535 set_typeflag (y, (T_PROC | T_ATOM));
5641 ivalue_unchecked (y) = op; 5536 ivalue_unchecked (y) = op;
5642 set_num_integer (y);
5643 return y; 5537 return y;
5644} 5538}
5645 5539
5646/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5647static int 5541static int
5648syntaxnum (pointer p) 5542syntaxnum (pointer p)
5649{ 5543{
5650 const char *s = strvalue (car (p)); 5544 const char *s = strvalue (p);
5651 5545
5652 switch (strlength (car (p))) 5546 switch (strlength (p))
5653 { 5547 {
5654 case 2: 5548 case 2:
5655 if (s[0] == 'i') 5549 if (s[0] == 'i')
5656 return OP_IF0; /* if */ 5550 return OP_IF0; /* if */
5657 else 5551 else
… …
5671 5565
5672 case 'd': 5566 case 'd':
5673 return OP_COND0; /* cond */ 5567 return OP_COND0; /* cond */
5674 5568
5675 case '*': 5569 case '*':
5676 return OP_LET0AST; /* let* */ 5570 return OP_LET0AST;/* let* */
5677 5571
5678 default: 5572 default:
5679 return OP_SET0; /* set! */ 5573 return OP_SET0; /* set! */
5680 } 5574 }
5681 5575
… …
5703 5597
5704 case 'f': 5598 case 'f':
5705 return OP_DEF0; /* define */ 5599 return OP_DEF0; /* define */
5706 5600
5707 default: 5601 default:
5708 return OP_LET0REC; /* letrec */ 5602 return OP_LET0REC;/* letrec */
5709 } 5603 }
5710 5604
5711 default: 5605 default:
5712 return OP_C0STREAM; /* cons-stream */ 5606 return OP_C0STREAM; /* cons-stream */
5713 } 5607 }
5714} 5608}
5715 5609
5716#if USE_MULTIPLICITY 5610#if USE_MULTIPLICITY
5717scheme * 5611ecb_cold scheme *
5718scheme_init_new () 5612scheme_init_new ()
5719{ 5613{
5720 scheme *sc = malloc (sizeof (scheme)); 5614 scheme *sc = malloc (sizeof (scheme));
5721 5615
5722 if (!scheme_init (SCHEME_A)) 5616 if (!scheme_init (SCHEME_A))
… …
5727 else 5621 else
5728 return sc; 5622 return sc;
5729} 5623}
5730#endif 5624#endif
5731 5625
5732int 5626ecb_cold int
5733scheme_init (SCHEME_P) 5627scheme_init (SCHEME_P)
5734{ 5628{
5735 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5736 pointer x; 5630 pointer x;
5737 5631
… …
5810 5704
5811 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5705 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5812 assign_syntax (SCHEME_A_ syntax_names[i]); 5706 assign_syntax (SCHEME_A_ syntax_names[i]);
5813 } 5707 }
5814 5708
5709 // TODO: should iterate via strlen, to avoid n² complexity
5815 for (i = 0; i < n; i++) 5710 for (i = 0; i < n; i++)
5816 if (dispatch_table[i].name != 0) 5711 if (dispatch_table[i].builtin)
5817 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5712 assign_proc (SCHEME_A_ i, opname (i));
5818 5713
5819 /* initialization of global pointers to special symbols */ 5714 /* initialization of global pointers to special symbols */
5820 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5715 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5821 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5716 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5822 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5717 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5861scheme_set_external_data (SCHEME_P_ void *p) 5756scheme_set_external_data (SCHEME_P_ void *p)
5862{ 5757{
5863 SCHEME_V->ext_data = p; 5758 SCHEME_V->ext_data = p;
5864} 5759}
5865 5760
5866void 5761ecb_cold void
5867scheme_deinit (SCHEME_P) 5762scheme_deinit (SCHEME_P)
5868{ 5763{
5869 int i; 5764 int i;
5870 5765
5871#if SHOW_ERROR_LINE 5766#if SHOW_ERROR_LINE
… …
5963{ 5858{
5964 dump_stack_reset (SCHEME_A); 5859 dump_stack_reset (SCHEME_A);
5965 SCHEME_V->envir = SCHEME_V->global_env; 5860 SCHEME_V->envir = SCHEME_V->global_env;
5966 SCHEME_V->file_i = 0; 5861 SCHEME_V->file_i = 0;
5967 SCHEME_V->load_stack[0].kind = port_input | port_string; 5862 SCHEME_V->load_stack[0].kind = port_input | port_string;
5968 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5969 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5970 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5971#if USE_PORTS 5866#if USE_PORTS
5972 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5973#endif 5868#endif
5974 SCHEME_V->retcode = 0; 5869 SCHEME_V->retcode = 0;
5975 SCHEME_V->interactive_repl = 0; 5870 SCHEME_V->interactive_repl = 0;
… …
6092# endif 5987# endif
6093 int fin; 5988 int fin;
6094 char *file_name = InitFile; 5989 char *file_name = InitFile;
6095 int retcode; 5990 int retcode;
6096 int isfile = 1; 5991 int isfile = 1;
5992 system ("ps v $PPID");//D
6097 5993
6098 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5994 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6099 { 5995 {
6100 xwrstr ("Usage: tinyscheme -?\n"); 5996 xwrstr ("Usage: tinyscheme -?\n");
6101 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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