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

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 74 TOK_SHARP_CONST,
58 TOK_VEC 75 TOK_VEC
59}; 76};
60 77
61#define BACKQUOTE '`' 78#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 79#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE
63 81
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 85#define S_SINK (&SCHEME_V->xsink)
… …
143 161
144#define toupper(c) xtoupper (c) 162#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 163#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 164#define isdigit(c) xisdigit (c)
147 165
148#if USE_STRLWR 166#if USE_IGNORECASE
149static const char * 167static const char *
150strlwr (char *s) 168xstrlwr (char *s)
151{ 169{
152 const char *p = s; 170 const char *p = s;
153 171
154 while (*s) 172 while (*s)
155 { 173 {
… …
157 s++; 175 s++;
158 } 176 }
159 177
160 return p; 178 return p;
161} 179}
162#endif
163 180
181#define stricmp(a,b) strcasecmp (a, b)
182#define strlwr(s) xstrlwr (s)
183
184#else
164#define stricmp(a,b) strcmp (a, b) 185# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 186# define strlwr(s) (s)
187#endif
166 188
167#ifndef prompt 189#ifndef prompt
168# define prompt "ts> " 190# define prompt "ts> "
169#endif 191#endif
170 192
… …
176# define FIRST_CELLSEGS 3 198# define FIRST_CELLSEGS 3
177#endif 199#endif
178 200
179enum scheme_types 201enum scheme_types
180{ 202{
203 T_INTEGER,
181 T_FREE, 204 T_REAL,
182 T_STRING, 205 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 206 T_SYMBOL,
185 T_PROC, 207 T_PROC,
186 T_PAIR, 208 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 209 T_CLOSURE,
188 T_CONTINUATION, 210 T_CONTINUATION,
189 T_FOREIGN, 211 T_FOREIGN,
190 T_CHARACTER, 212 T_CHARACTER,
191 T_PORT, 213 T_PORT,
… …
201#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
205 227
206static num num_add (num a, num b); 228/* num, for generic arithmetic */
207static num num_mul (num a, num b); 229struct num
208static num num_div (num a, num b); 230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
255
256static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 258static num num_rem (num a, num b);
212static num num_mod (num a, num b); 259static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 260
219#if USE_MATH 261#if USE_MATH
220static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
221#endif 263#endif
222static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
223
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 265
230static num num_zero; 266static num num_zero;
231static num num_one; 267static num num_one;
232 268
233/* macros for cell operations */ 269/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 270#define typeflag(p) ((p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 271#define set_typeflag(p,v) ((p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 272#define type(p) (typeflag (p) & T_MASKTYPE)
237 273
238INTERFACE INLINE int 274INTERFACE int
239is_string (pointer p) 275is_string (pointer p)
240{ 276{
241 return type (p) == T_STRING; 277 return type (p) == T_STRING;
242} 278}
243 279
244#define strvalue(p) ((p)->object.string.svalue) 280#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 281#define strlength(p) ((p)->object.string.length)
246 282
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 283INTERFACE int
249is_vector (pointer p) 284is_vector (pointer p)
250{ 285{
251 return type (p) == T_VECTOR; 286 return type (p) == T_VECTOR;
252} 287}
253 288
254#define vecvalue(p) ((p)->object.vector.vvalue) 289#define vecvalue(p) ((p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 290#define veclength(p) ((p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 292INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 294
261INTERFACE uint32_t 295INTERFACE int
262vector_length (pointer vec) 296is_integer (pointer p)
263{ 297{
264 return vec->object.vector.length; 298 return type (p) == T_INTEGER;
265} 299}
266 300
301/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 302INTERFACE int
303is_real (pointer p)
304{
305 return type (p) == T_REAL;
306}
307
308INTERFACE int
268is_number (pointer p) 309is_number (pointer p)
269{ 310{
270 return type (p) == T_NUMBER; 311 return is_integer (p) || is_real (p);
271} 312}
272 313
273INTERFACE INLINE int 314INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 315is_character (pointer p)
293{ 316{
294 return type (p) == T_CHARACTER; 317 return type (p) == T_CHARACTER;
295} 318}
296 319
297INTERFACE INLINE char * 320INTERFACE char *
298string_value (pointer p) 321string_value (pointer p)
299{ 322{
300 return strvalue (p); 323 return strvalue (p);
301} 324}
302 325
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 326#define ivalue_unchecked(p) (p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v)
328
334#if USE_REAL 329#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 330#define rvalue_unchecked(p) (p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 331#define set_rvalue(p,v) (p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 332#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define rvalue_unchecked(p) (p)->object.ivalue
340# define set_num_integer(p) 0 334#define set_rvalue(p,v) (p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 335#endif
336
343INTERFACE long 337INTERFACE long
344charvalue (pointer p) 338charvalue (pointer p)
345{ 339{
346 return ivalue_unchecked (p); 340 return ivalue_unchecked (p);
347} 341}
348 342
349INTERFACE INLINE int 343INTERFACE int
350is_port (pointer p) 344is_port (pointer p)
351{ 345{
352 return type (p) == T_PORT; 346 return type (p) == T_PORT;
353} 347}
354 348
355INTERFACE INLINE int 349INTERFACE int
356is_inport (pointer p) 350is_inport (pointer p)
357{ 351{
358 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && p->object.port->kind & port_input;
359} 353}
360 354
361INTERFACE INLINE int 355INTERFACE int
362is_outport (pointer p) 356is_outport (pointer p)
363{ 357{
364 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && p->object.port->kind & port_output;
365} 359}
366 360
367INTERFACE INLINE int 361INTERFACE int
368is_pair (pointer p) 362is_pair (pointer p)
369{ 363{
370 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
371} 365}
372 366
373#define car(p) ((p)->object.cons.car + 0) 367#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) ((p)->object.cons.cdr + 0)
375 369
376#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 374
381#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 378
385INTERFACE void 379INTERFACE void
386set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
387{ 381{
388 p->object.cons.car = q; 382 p->object.cons.car = q;
… …
404pair_cdr (pointer p) 398pair_cdr (pointer p)
405{ 399{
406 return cdr (p); 400 return cdr (p);
407} 401}
408 402
409INTERFACE INLINE int 403INTERFACE int
410is_symbol (pointer p) 404is_symbol (pointer p)
411{ 405{
412 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
413} 407}
414 408
415INTERFACE INLINE char * 409INTERFACE char *
416symname (pointer p) 410symname (pointer p)
417{ 411{
418 return strvalue (car (p)); 412 return strvalue (p);
419} 413}
420 414
421#if USE_PLIST 415#if USE_PLIST
422SCHEME_EXPORT INLINE int 416SCHEME_EXPORT int
423hasprop (pointer p) 417hasprop (pointer p)
424{ 418{
425 return typeflag (p) & T_SYMBOL; 419 return typeflag (p) & T_SYMBOL;
426} 420}
427 421
428# define symprop(p) cdr(p) 422# define symprop(p) cdr(p)
429#endif 423#endif
430 424
431INTERFACE INLINE int 425INTERFACE int
432is_syntax (pointer p) 426is_syntax (pointer p)
433{ 427{
434 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
435} 429}
436 430
437INTERFACE INLINE int 431INTERFACE int
438is_proc (pointer p) 432is_proc (pointer p)
439{ 433{
440 return type (p) == T_PROC; 434 return type (p) == T_PROC;
441} 435}
442 436
443INTERFACE INLINE int 437INTERFACE int
444is_foreign (pointer p) 438is_foreign (pointer p)
445{ 439{
446 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
447} 441}
448 442
449INTERFACE INLINE char * 443INTERFACE char *
450syntaxname (pointer p) 444syntaxname (pointer p)
451{ 445{
452 return strvalue (car (p)); 446 return strvalue (p);
453} 447}
454 448
455#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 450static const char *procname (pointer x);
457 451
458INTERFACE INLINE int 452INTERFACE int
459is_closure (pointer p) 453is_closure (pointer p)
460{ 454{
461 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
462} 456}
463 457
464INTERFACE INLINE int 458INTERFACE int
465is_macro (pointer p) 459is_macro (pointer p)
466{ 460{
467 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
468} 462}
469 463
470INTERFACE INLINE pointer 464INTERFACE pointer
471closure_code (pointer p) 465closure_code (pointer p)
472{ 466{
473 return car (p); 467 return car (p);
474} 468}
475 469
476INTERFACE INLINE pointer 470INTERFACE pointer
477closure_env (pointer p) 471closure_env (pointer p)
478{ 472{
479 return cdr (p); 473 return cdr (p);
480} 474}
481 475
482INTERFACE INLINE int 476INTERFACE int
483is_continuation (pointer p) 477is_continuation (pointer p)
484{ 478{
485 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
486} 480}
487 481
488#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
490 484
491/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 486INTERFACE int
493is_promise (pointer p) 487is_promise (pointer p)
494{ 488{
495 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
496} 490}
497 491
498INTERFACE INLINE int 492INTERFACE int
499is_environment (pointer p) 493is_environment (pointer p)
500{ 494{
501 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
502} 496}
503 497
… …
509 503
510#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 507
514INTERFACE INLINE int 508INTERFACE int
515is_immutable (pointer p) 509is_immutable (pointer p)
516{ 510{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 512}
519 513
520INTERFACE INLINE void 514INTERFACE void
521setimmutable (pointer p) 515setimmutable (pointer p)
522{ 516{
523#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 519#endif
526} 520}
527 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
528#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
529static INLINE int 577ecb_inline int
530Cisalpha (int c) 578Cisalpha (int c)
531{ 579{
532 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
533} 581}
534 582
535static INLINE int 583ecb_inline int
536Cisdigit (int c) 584Cisdigit (int c)
537{ 585{
538 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
539} 587}
540 588
541static INLINE int 589ecb_inline int
542Cisspace (int c) 590Cisspace (int c)
543{ 591{
544 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
545} 593}
546 594
547static INLINE int 595ecb_inline int
548Cisupper (int c) 596Cisupper (int c)
549{ 597{
550 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
551} 599}
552 600
553static INLINE int 601ecb_inline int
554Cislower (int c) 602Cislower (int c)
555{ 603{
556 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
557} 605}
558#endif 606#endif
… …
619#endif 667#endif
620 668
621static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P_ int n);
626static 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 }
… …
1481 1483
1482/* make constant */ 1484/* make constant */
1483static pointer 1485static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1486mk_sharp_const (SCHEME_P_ char *name)
1485{ 1487{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1488 if (!strcmp (name, "t"))
1490 return S_T; 1489 return S_T;
1491 else if (!strcmp (name, "f")) 1490 else if (!strcmp (name, "f"))
1492 return S_F; 1491 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1492 else if (*name == '\\') /* #\w (character) */
1494 { 1493 {
1495 int c = 0; 1494 int c;
1496 1495
1497 if (stricmp (name + 1, "space") == 0) 1496 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1497 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1498 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1499 c = '\n';
… …
1502 c = '\r'; 1501 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1502 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1503 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1504 else if (name[1] == 'x' && name[2] != 0)
1506 { 1505 {
1507 int c1 = strtol (name + 2, 0, 16); 1506 long c1 = strtol (name + 2, 0, 16);
1508 1507
1509 if (c1 <= UCHAR_MAX) 1508 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1509 c = c1;
1511 else 1510 else
1512 return NIL; 1511 return NIL;
1513 1512 }
1514#if USE_ASCII_NAMES 1513#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1514 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1515 /* nothing */;
1519#endif 1516#endif
1520 }
1521 else if (name[2] == 0) 1517 else if (name[2] == 0)
1522 c = name[1]; 1518 c = name[1];
1523 else 1519 else
1524 return NIL; 1520 return NIL;
1525 1521
… …
1542 1538
1543/*-- 1539/*--
1544 * 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,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * 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
1547 */ 1547 */
1548static void 1548static void
1549mark (pointer a) 1549mark (pointer a)
1550{ 1550{
1551 pointer t, q, p; 1551 pointer t, q, p;
… …
1553 t = 0; 1553 t = 0;
1554 p = a; 1554 p = a;
1555E2: 1555E2:
1556 setmark (p); 1556 setmark (p);
1557 1557
1558 if (is_vector (p)) 1558 if (ecb_expect_false (is_vector (p)))
1559 { 1559 {
1560 int i; 1560 int i;
1561 1561
1562 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1564 } 1564 }
1565 1565
1566 if (is_atom (p)) 1566 if (is_atom (p))
1567 goto E6; 1567 goto E6;
… …
1665 if (is_mark (p)) 1665 if (is_mark (p))
1666 clrmark (p); 1666 clrmark (p);
1667 else 1667 else
1668 { 1668 {
1669 /* reclaim cell */ 1669 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1671 { 1671 {
1672 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL); 1674 set_car (p, NIL);
1675 } 1675 }
1676 1676
1677 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1680 } 1680 }
1681 } 1681 }
1682 } 1682 }
1683 1683
1684 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1686} 1688}
1687 1689
1688static void 1690static void
1689finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1690{ 1692{
1691 if (is_string (a)) 1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1692 free (strvalue (a)); 1695 free (strvalue (a));
1693 else if (is_vector (a)) 1696 else if (is_vector (a))
1694 free (vecvalue (a)); 1697 free (vecvalue (a));
1695#if USE_PORTS 1698#if USE_PORTS
1696 else if (is_port (a)) 1699 else if (is_port (a))
… …
2118#endif 2121#endif
2119} 2122}
2120 2123
2121/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2122static char * 2125static char *
2123readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2127{
2125 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2126 2129
2127 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))));
2128 2131
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2133 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2138} 2141}
2139 2142
2140/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2141static pointer 2144static pointer
2142readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2143{ 2146{
2144 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2145 int c; 2148 int c;
2146 int c1 = 0; 2149 int c1 = 0;
2147 enum
2148 { 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;
2149 2151
2150 for (;;) 2152 for (;;)
2151 { 2153 {
2152 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2153 2155
… …
2155 return S_F; 2157 return S_F;
2156 2158
2157 switch (state) 2159 switch (state)
2158 { 2160 {
2159 case st_ok: 2161 case st_ok:
2160 switch (c) 2162 if (ecb_expect_false (c == delim))
2161 {
2162 case '\\':
2163 state = st_bsl;
2164 break;
2165
2166 case '"':
2167 *p = 0;
2168 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);
2169 2164
2170 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2171 *p++ = c; 2168 *p++ = c;
2172 break;
2173 }
2174 2169
2175 break; 2170 break;
2176 2171
2177 case st_bsl: 2172 case st_bsl:
2178 switch (c) 2173 switch (c)
… …
2208 case 'r': 2203 case 'r':
2209 *p++ = '\r'; 2204 *p++ = '\r';
2210 state = st_ok; 2205 state = st_ok;
2211 break; 2206 break;
2212 2207
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2208 default:
2219 *p++ = c; 2209 *p++ = c;
2220 state = st_ok; 2210 state = st_ok;
2221 break; 2211 break;
2222 } 2212 }
2223 2213
2224 break; 2214 break;
2225 2215
2226 case st_x1: 2216 case st_x1:
2227 case st_x2: 2217 case st_x2:
2228 c = toupper (c); 2218 c = tolower (c);
2229 2219
2230 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2234 else 2222 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2236
2237 if (state == st_x1)
2238 state = st_x2;
2239 else
2240 {
2241 *p++ = c1;
2242 state = st_ok;
2243 }
2244 }
2245 else 2224 else
2246 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 }
2247 2234
2248 break; 2235 break;
2249 2236
2250 case st_oct1: 2237 case st_oct1:
2251 case st_oct2: 2238 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2256 state = st_ok; 2243 state = st_ok;
2257 } 2244 }
2258 else 2245 else
2259 { 2246 {
2260 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2248 return S_F;
2262 2249
2263 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2264 2251
2265 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2270 state = st_ok; 2257 state = st_ok;
2271 } 2258 }
2272 } 2259 }
2273 2260
2274 break; 2261 break;
2275
2276 } 2262 }
2277 } 2263 }
2278} 2264}
2279 2265
2280/* check c is in chars */ 2266/* check c is in chars */
2281static INLINE int 2267ecb_inline int
2282is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2283{ 2269{
2284 if (c == EOF)
2285 return 1;
2286
2287 return !!strchr (s, c); 2270 return c == EOF || !!strchr (s, c);
2288} 2271}
2289 2272
2290/* skip white characters */ 2273/* skip white characters */
2291static INLINE int 2274ecb_inline int
2292skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2293{ 2276{
2294 int c, curr_line = 0; 2277 int c, curr_line = 0;
2295 2278
2296 do 2279 do
2297 { 2280 {
2298 c = inchar (SCHEME_A); 2281 c = inchar (SCHEME_A);
2282
2299#if SHOW_ERROR_LINE 2283#if SHOW_ERROR_LINE
2300 if (c == '\n') 2284 if (ecb_expect_false (c == '\n'))
2301 curr_line++; 2285 curr_line++;
2302#endif 2286#endif
2287
2288 if (ecb_expect_false (c == EOF))
2289 return c;
2303 } 2290 }
2304 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2291 while (is_one_of (WHITESPACE, c));
2305 2292
2306 /* record it */ 2293 /* record it */
2307#if SHOW_ERROR_LINE 2294#if SHOW_ERROR_LINE
2308 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2309 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2310#endif 2297#endif
2311 2298
2312 if (c != EOF)
2313 {
2314 backchar (SCHEME_A_ c); 2299 backchar (SCHEME_A_ c);
2315 return 1; 2300 return 1;
2316 }
2317 else
2318 return EOF;
2319} 2301}
2320 2302
2321/* get token */ 2303/* get token */
2322static int 2304static int
2323token (SCHEME_P) 2305token (SCHEME_P)
… …
2339 return TOK_RPAREN; 2321 return TOK_RPAREN;
2340 2322
2341 case '.': 2323 case '.':
2342 c = inchar (SCHEME_A); 2324 c = inchar (SCHEME_A);
2343 2325
2344 if (is_one_of (" \n\t", c)) 2326 if (is_one_of (WHITESPACE, c))
2345 return TOK_DOT; 2327 return TOK_DOT;
2346 else 2328 else
2347 { 2329 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2330 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2331 return TOK_DOTATOM;
2352 } 2332 }
2333
2334 case '|':
2335 return TOK_STRATOM;
2353 2336
2354 case '\'': 2337 case '\'':
2355 return TOK_QUOTE; 2338 return TOK_QUOTE;
2356 2339
2357 case ';': 2340 case ';':
… …
2489 } 2472 }
2490 2473
2491 putcharacter (SCHEME_A_ '"'); 2474 putcharacter (SCHEME_A_ '"');
2492} 2475}
2493 2476
2494
2495/* print atoms */ 2477/* print atoms */
2496static void 2478static void
2497printatom (SCHEME_P_ pointer l, int f) 2479printatom (SCHEME_P_ pointer l, int f)
2498{ 2480{
2499 char *p; 2481 char *p;
2500 int len; 2482 int len;
2501 2483
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2484 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2485 putchars (SCHEME_A_ p, len);
2504} 2486}
2505
2506 2487
2507/* Uses internal buffer unless string pointer is already available */ 2488/* Uses internal buffer unless string pointer is already available */
2508static void 2489static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2490atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2491{
… …
2524 { 2505 {
2525 p = SCHEME_V->strbuff; 2506 p = SCHEME_V->strbuff;
2526 2507
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2508 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2509 {
2529 if (num_is_integer (l)) 2510 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2511 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2512#if USE_REAL
2532 else 2513 else
2533 { 2514 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2515 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2671#endif 2652#endif
2672 } 2653 }
2673 else if (is_continuation (l)) 2654 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2655 p = "#<CONTINUATION>";
2675 else 2656 else
2657 {
2658#if USE_PRINTF
2659 p = SCHEME_V->strbuff;
2660 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2661#else
2676 p = "#<ERROR>"; 2662 p = "#<ERROR>";
2663#endif
2664 }
2677 2665
2678 *pp = p; 2666 *pp = p;
2679 *plen = strlen (p); 2667 *plen = strlen (p);
2680} 2668}
2681 2669
… …
2789 return 0; 2777 return 0;
2790 } 2778 }
2791 else if (is_number (a)) 2779 else if (is_number (a))
2792 { 2780 {
2793 if (is_number (b)) 2781 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2782 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2783
2797 return 0; 2784 return 0;
2798 } 2785 }
2799 else if (is_character (a)) 2786 else if (is_character (a))
2800 { 2787 {
… …
2826/* () is #t in R5RS */ 2813/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2814#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2815#define is_false(p) ((p) == S_F)
2829 2816
2830/* ========== Environment implementation ========== */ 2817/* ========== Environment implementation ========== */
2831
2832#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2833
2834static int
2835hash_fn (const char *key, int table_size)
2836{
2837 const unsigned char *p = key;
2838 uint32_t hash = 2166136261;
2839
2840 while (*p)
2841 hash = (hash ^ *p++) * 16777619;
2842
2843 return hash % table_size;
2844}
2845#endif
2846 2818
2847#ifndef USE_ALIST_ENV 2819#ifndef USE_ALIST_ENV
2848 2820
2849/* 2821/*
2850 * In this implementation, each frame of the environment may be 2822 * In this implementation, each frame of the environment may be
… …
2867 2839
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2840 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2841 setenvironment (SCHEME_V->envir);
2870} 2842}
2871 2843
2872static INLINE void 2844static uint32_t
2845sym_hash (pointer sym, uint32_t size)
2846{
2847 uintptr_t ptr = (uintptr_t)sym;
2848
2849#if 0
2850 /* table size is prime, so why mix */
2851 ptr += ptr >> 32;
2852 ptr += ptr >> 16;
2853 ptr += ptr >> 8;
2854#endif
2855
2856 return ptr % size;
2857}
2858
2859ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2860new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2861{
2875 pointer slot = immutable_cons (variable, value); 2862 pointer slot = immutable_cons (variable, value);
2876 2863
2877 if (is_vector (car (env))) 2864 if (is_vector (car (env)))
2878 { 2865 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2866 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2868 }
2883 else 2869 else
2884 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
2885} 2871}
2886 2872
2887static pointer 2873static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2875{
2890 pointer x, y; 2876 pointer x, y;
2891 int location;
2892 2877
2893 for (x = env; x != NIL; x = cdr (x)) 2878 for (x = env; x != NIL; x = cdr (x))
2894 { 2879 {
2895 if (is_vector (car (x))) 2880 if (is_vector (car (x)))
2896 { 2881 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2882 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2883 y = vector_get (car (x), location);
2899 } 2884 }
2900 else 2885 else
2901 y = car (x); 2886 y = car (x);
2902 2887
2903 for (; y != NIL; y = cdr (y)) 2888 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2889 if (caar (y) == hdl)
2905 break; 2890 break;
2906 2891
2907 if (y != NIL) 2892 if (y != NIL)
2893 return car (y);
2894
2895 if (!all)
2908 break; 2896 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2897 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2898
2917 return NIL; 2899 return NIL;
2918} 2900}
2919 2901
2920#else /* USE_ALIST_ENV */ 2902#else /* USE_ALIST_ENV */
2921 2903
2922static INLINE void 2904ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2905new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2906{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2907 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2908 setenvironment (SCHEME_V->envir);
2927} 2909}
2928 2910
2929static INLINE void 2911ecb_inline void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2912new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2913{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2914 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2915}
2934 2916
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2924 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2925 if (caar (y) == hdl)
2944 break; 2926 break;
2945 2927
2946 if (y != NIL) 2928 if (y != NIL)
2929 return car (y);
2947 break; 2930 break;
2948 2931
2949 if (!all) 2932 if (!all)
2950 return NIL; 2933 break;
2951 } 2934 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2935
2956 return NIL; 2936 return NIL;
2957} 2937}
2958 2938
2959#endif /* USE_ALIST_ENV else */ 2939#endif /* USE_ALIST_ENV else */
2960 2940
2961static INLINE void 2941ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2942new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2943{
2944 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2945 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2946}
2966 2947
2967static INLINE void 2948ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2949set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2950{
2970 set_cdr (slot, value); 2951 set_cdr (slot, value);
2971} 2952}
2972 2953
2973static INLINE pointer 2954ecb_inline pointer
2974slot_value_in_env (pointer slot) 2955slot_value_in_env (pointer slot)
2975{ 2956{
2976 return cdr (slot); 2957 return cdr (slot);
2977} 2958}
2978 2959
2979/* ========== Evaluation Cycle ========== */ 2960/* ========== Evaluation Cycle ========== */
2980 2961
2981static pointer 2962static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2963xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2964{
2984#if USE_ERROR_HOOK 2965#if USE_ERROR_HOOK
2985 pointer x; 2966 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2967 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 3002 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 3003 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 3004 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 3005 SCHEME_V->op = OP_EVAL;
3025 3006
3026 return S_T; 3007 return 0;
3027 } 3008 }
3028#endif 3009#endif
3029 3010
3030 if (a) 3011 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3012 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3014 SCHEME_V->args = NIL;
3034 3015
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3016 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3017 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3018 SCHEME_V->op = OP_ERR0;
3019
3038 return S_T; 3020 return 0;
3039} 3021}
3040 3022
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3023#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3024#define Error_0(s) Error_1 (s, 0)
3043 3025
3044/* Too small to turn into function */ 3026/* Too small to turn into function */
3045#define BEGIN do { 3027#define BEGIN do {
3046#define END } while (0) 3028#define END } while (0)
3047#define s_goto(a) BEGIN \ 3029#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3030 SCHEME_V->op = a; \
3049 return S_T; END 3031 return 0; END
3050 3032
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3033#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3034
3053#ifndef USE_SCHEME_STACK 3035#ifndef USE_SCHEME_STACK
3054 3036
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3061 next_frame = SCHEME_V->dump_base + nframes;
3080 3062
3081 next_frame->op = op; 3063 next_frame->op = op;
3082 next_frame->args = args; 3064 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3065 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3066 next_frame->code = code;
3085 3067
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3068 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3069}
3088 3070
3089static pointer 3071static int
3090xs_return (SCHEME_P_ pointer a) 3072xs_return (SCHEME_P_ pointer a)
3091{ 3073{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3074 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3075 struct dump_stack_frame *frame;
3094 3076
3095 SCHEME_V->value = a; 3077 SCHEME_V->value = a;
3096 3078
3097 if (nframes <= 0) 3079 if (nframes <= 0)
3098 return NIL; 3080 return -1;
3099 3081
3100 frame = &SCHEME_V->dump_base[--nframes]; 3082 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3083 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3084 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3085 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3086 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3087 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3088
3107 return S_T; 3089 return 0;
3108} 3090}
3109 3091
3110static INLINE void 3092ecb_inline void
3111dump_stack_reset (SCHEME_P) 3093dump_stack_reset (SCHEME_P)
3112{ 3094{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3095 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3096 SCHEME_V->dump = (pointer)+0;
3115} 3097}
3116 3098
3117static INLINE void 3099ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3100dump_stack_initialize (SCHEME_P)
3119{ 3101{
3120 SCHEME_V->dump_size = 0; 3102 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3103 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3104 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3157 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3158 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3159
3178 while (cont != NIL) 3160 while (cont != NIL)
3179 { 3161 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3162 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3163 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3164 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3165 frame->code = car (cont) ; cont = cdr (cont);
3184 3166
3185 ++frame; 3167 ++frame;
3186 ++i; 3168 ++i;
3187 } 3169 }
3188 3170
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3171 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3172}
3191 3173
3192#else 3174#else
3193 3175
3194static INLINE void 3176ecb_inline void
3195dump_stack_reset (SCHEME_P) 3177dump_stack_reset (SCHEME_P)
3196{ 3178{
3197 SCHEME_V->dump = NIL; 3179 SCHEME_V->dump = NIL;
3198} 3180}
3199 3181
3200static INLINE void 3182ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3183dump_stack_initialize (SCHEME_P)
3202{ 3184{
3203 dump_stack_reset (SCHEME_A); 3185 dump_stack_reset (SCHEME_A);
3204} 3186}
3205 3187
… …
3207dump_stack_free (SCHEME_P) 3189dump_stack_free (SCHEME_P)
3208{ 3190{
3209 SCHEME_V->dump = NIL; 3191 SCHEME_V->dump = NIL;
3210} 3192}
3211 3193
3212static pointer 3194static int
3213xs_return (SCHEME_P_ pointer a) 3195xs_return (SCHEME_P_ pointer a)
3214{ 3196{
3215 pointer dump = SCHEME_V->dump; 3197 pointer dump = SCHEME_V->dump;
3216 3198
3217 SCHEME_V->value = a; 3199 SCHEME_V->value = a;
3218 3200
3219 if (dump == NIL) 3201 if (dump == NIL)
3220 return NIL; 3202 return -1;
3221 3203
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3204 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3205 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3208
3227 SCHEME_V->dump = dump; 3209 SCHEME_V->dump = dump;
3228 3210
3229 return S_T; 3211 return 0;
3230} 3212}
3231 3213
3232static void 3214static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3215s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3216{
… …
3259 3241
3260#endif 3242#endif
3261 3243
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3244#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3245
3246#if 1
3264static pointer 3247static int
3248debug (SCHEME_P_ int indent, pointer x)
3249{
3250 int c;
3251
3252 if (is_syntax (x))
3253 {
3254 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3255 return 8 + 8;
3256 }
3257
3258 if (x == NIL)
3259 {
3260 printf ("%*sNIL\n", indent, "");
3261 return 3;
3262 }
3263
3264 switch (type (x))
3265 {
3266 case T_INTEGER:
3267 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3268 return 32+8;
3269
3270 case T_SYMBOL:
3271 printf ("%*sS<%s>\n", indent, "", symname (x));
3272 return 24+8;
3273
3274 case T_CLOSURE:
3275 printf ("%*sS<%s>\n", indent, "", "closure");
3276 debug (SCHEME_A_ indent + 3, cdr(x));
3277 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3278
3279 case T_PAIR:
3280 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3281 c = debug (SCHEME_A_ indent + 3, car (x));
3282 c += debug (SCHEME_A_ indent + 3, cdr (x));
3283 return c + 1;
3284
3285 case T_PORT:
3286 printf ("%*sS<%s>\n", indent, "", "port");
3287 return 24+8;
3288
3289 case T_VECTOR:
3290 printf ("%*sS<%s>\n", indent, "", "vector");
3291 return 24+8;
3292
3293 case T_ENVIRONMENT:
3294 printf ("%*sS<%s>\n", indent, "", "environment");
3295 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3296
3297 default:
3298 printf ("unhandled type %d\n", type (x));
3299 break;
3300 }
3301}
3302#endif
3303
3304static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3305opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3306{
3307 pointer args = SCHEME_V->args;
3267 pointer x, y; 3308 pointer x, y;
3268 3309
3269 switch (op) 3310 switch (op)
3270 { 3311 {
3312#if 1 //D
3313 case OP_DEBUG:
3314 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3315 printf ("\n");
3316 s_return (S_T);
3317#endif
3271 case OP_LOAD: /* load */ 3318 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3319 if (file_interactive (SCHEME_A))
3273 { 3320 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3321 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3275 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3322 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3323 }
3277 3324
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3325 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3326 Error_1 ("unable to open", car (args));
3280 else 3327 else
3281 { 3328 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3329 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3330 s_goto (OP_T0LVL);
3284 } 3331 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3405 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3406#if USE_TRACING
3360 if (SCHEME_V->tracing) 3407 if (SCHEME_V->tracing)
3361 { 3408 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3409 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3410 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3411 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3412 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3413 s_goto (OP_P0LIST);
3367 } 3414 }
3368 3415
… …
3398 } 3445 }
3399 else 3446 else
3400 s_return (SCHEME_V->code); 3447 s_return (SCHEME_V->code);
3401 3448
3402 case OP_E0ARGS: /* eval arguments */ 3449 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3450 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3451 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3452 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3453 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3454 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3455 s_goto (OP_APPLY);
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3459 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3460 s_goto (OP_E1ARGS);
3414 } 3461 }
3415 3462
3416 case OP_E1ARGS: /* eval arguments */ 3463 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3464 args = cons (SCHEME_V->value, args);
3418 3465
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3466 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3467 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3468 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3469 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3470 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3471 s_goto (OP_EVAL);
3425 } 3472 }
3426 else /* end */ 3473 else /* end */
3427 { 3474 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3475 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3476 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3477 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3478 s_goto (OP_APPLY);
3432 } 3479 }
3433 3480
3434#if USE_TRACING 3481#if USE_TRACING
3435 3482
3436 case OP_TRACING: 3483 case OP_TRACING:
3437 { 3484 {
3438 int tr = SCHEME_V->tracing; 3485 int tr = SCHEME_V->tracing;
3439 3486
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3487 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3488 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3489 }
3443 3490
3444#endif 3491#endif
3445 3492
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3493 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3494#if USE_TRACING
3448 if (SCHEME_V->tracing) 3495 if (SCHEME_V->tracing)
3449 { 3496 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3497 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3498 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3499 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3500 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3501 s_goto (OP_P0LIST);
3455 } 3502 }
3456 3503
3457 /* fall through */ 3504 /* fall through */
3458 3505
3459 case OP_REAL_APPLY: 3506 case OP_REAL_APPLY:
3460#endif 3507#endif
3461 if (is_proc (SCHEME_V->code)) 3508 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3509 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3510 else if (is_foreign (SCHEME_V->code))
3466 { 3511 {
3467 /* Keep nested calls from GC'ing the arglist */ 3512 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3513 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3514 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3515
3471 s_return (x); 3516 s_return (x);
3472 } 3517 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3518 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3519 {
3475 /* Should not accept promise */ 3520 /* Should not accept promise */
3476 /* make environment */ 3521 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3522 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3523
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3524 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3525 {
3481 if (y == NIL) 3526 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3527 Error_0 ("not enough arguments");
3483 else 3528 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3529 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3547 s_goto (OP_BEGIN);
3503 } 3548 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3549 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3550 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3551 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3552 s_return (args != NIL ? car (args) : NIL);
3508 } 3553 }
3509 else 3554 else
3510 Error_0 ("illegal function"); 3555 Error_0 ("illegal function");
3511 3556
3512 case OP_DOMACRO: /* do macro */ 3557 case OP_DOMACRO: /* do macro */
… …
3521 { 3566 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3567 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3568
3524 if (f != NIL) 3569 if (f != NIL)
3525 { 3570 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3571 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3572 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3573 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3574 s_goto (OP_APPLY);
3530 } 3575 }
3531 3576
… …
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3587 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543 3588
3544#endif 3589#endif
3545 3590
3546 case OP_MKCLOSURE: /* make-closure */ 3591 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3592 x = car (args);
3548 3593
3549 if (car (x) == SCHEME_V->LAMBDA) 3594 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3595 x = cdr (x);
3551 3596
3552 if (cdr (SCHEME_V->args) == NIL) 3597 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3598 y = SCHEME_V->envir;
3554 else 3599 else
3555 y = cadr (SCHEME_V->args); 3600 y = cadr (args);
3556 3601
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3602 s_return (mk_closure (SCHEME_A_ x, y));
3558 3603
3559 case OP_QUOTE: /* quote */ 3604 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3605 s_return (car (SCHEME_V->code));
… …
3592 3637
3593 3638
3594 case OP_DEFP: /* defined? */ 3639 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3640 x = SCHEME_V->envir;
3596 3641
3597 if (cdr (SCHEME_V->args) != NIL) 3642 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3643 x = cadr (args);
3599 3644
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3645 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3646
3602 case OP_SET0: /* set! */ 3647 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3648 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3649 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3650
… …
3636 3681
3637 case OP_IF1: /* if */ 3682 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3683 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3684 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3685 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3686 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3687 s_goto (OP_EVAL);
3645 3688
3646 case OP_LET0: /* let */ 3689 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3690 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3691 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3692 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 3693 s_goto (OP_LET1);
3651 3694
3652 case OP_LET1: /* let (calculate parameters) */ 3695 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3696 args = cons (SCHEME_V->value, args);
3654 3697
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3698 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3699 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3700 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3658 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3701 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3659 3702
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3703 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3704 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3705 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3706 s_goto (OP_EVAL);
3664 } 3707 }
3665 else /* end */ 3708 else /* end */
3666 { 3709 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3710 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3711 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3712 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3713 s_goto (OP_LET2);
3671 } 3714 }
3672 3715
3673 case OP_LET2: /* let */ 3716 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3717 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3718
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3719 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3720 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3721 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3722
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3723 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3724 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3725 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 3726 {
3684 if (!is_pair (x)) 3727 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3728 Error_1 ("Bad syntax of binding in let :", x);
3686 3729
3687 if (!is_list (SCHEME_A_ car (x))) 3730 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3731 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3732
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3733 args = cons (caar (x), args);
3691 } 3734 }
3692 3735
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3736 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 3737 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3738 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3739 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3740 }
3700 else 3741 else
3701 { 3742 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3744 }
3745
3703 SCHEME_V->args = NIL; 3746 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3747 s_goto (OP_BEGIN);
3707 3748
3708 case OP_LET0AST: /* let* */ 3749 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3750 if (car (SCHEME_V->code) == NIL)
3710 { 3751 {
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3769 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3770 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3771
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3772 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3773 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3774 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3775 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3776 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3777 s_goto (OP_EVAL);
3737 } 3778 }
3738 else /* end */ 3779 else /* end */
3739 { 3780 {
3740 SCHEME_V->code = SCHEME_V->args; 3781 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3782 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3783 s_goto (OP_BEGIN);
3743 } 3784 }
3744 3785
3745 case OP_LET0REC: /* letrec */ 3786 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3789 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3790 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3791 s_goto (OP_LET1REC);
3751 3792
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3793 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3794 args = cons (SCHEME_V->value, args);
3754 3795
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3796 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3797 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3798 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3758 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3799 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759 3800
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3801 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3802 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3804 s_goto (OP_EVAL);
3764 } 3805 }
3765 else /* end */ 3806 else /* end */
3766 { 3807 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3808 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3809 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3810 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3811 s_goto (OP_LET2REC);
3771 } 3812 }
3772 3813
3773 case OP_LET2REC: /* letrec */ 3814 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3815 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3816 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3817
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3818 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3819 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3820 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3906 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3907 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3908 s_goto (OP_EVAL);
3868 3909
3869 case OP_C1STREAM: /* cons-stream */ 3910 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3911 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3871 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3912 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 3913 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3914 s_return (cons (args, x));
3874 3915
3875 case OP_MACRO0: /* macro */ 3916 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3917 if (is_pair (car (SCHEME_V->code)))
3877 { 3918 {
3878 x = caar (SCHEME_V->code); 3919 x = caar (SCHEME_V->code);
… …
3911 { 3952 {
3912 if (!is_pair (y = caar (x))) 3953 if (!is_pair (y = caar (x)))
3913 break; 3954 break;
3914 3955
3915 for (; y != NIL; y = cdr (y)) 3956 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3957 if (eqv (car (y), SCHEME_V->value))
3918 break; 3958 break;
3919 }
3920 3959
3921 if (y != NIL) 3960 if (y != NIL)
3922 break; 3961 break;
3923 } 3962 }
3924 3963
… …
3944 s_goto (OP_BEGIN); 3983 s_goto (OP_BEGIN);
3945 else 3984 else
3946 s_return (NIL); 3985 s_return (NIL);
3947 3986
3948 case OP_PAPPLY: /* apply */ 3987 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3988 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3989 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3990 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3991 s_goto (OP_APPLY);
3953 3992
3954 case OP_PEVAL: /* eval */ 3993 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3994 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3995 SCHEME_V->envir = cadr (args);
3957 3996
3958 SCHEME_V->code = car (SCHEME_V->args); 3997 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3998 s_goto (OP_EVAL);
3960 3999
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 4000 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 4001 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4002 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 4003 s_goto (OP_APPLY);
3965 } 4004 }
3966 4005
3967 return S_T; 4006 if (USE_ERROR_CHECKING) abort ();
3968} 4007}
3969 4008
3970static pointer 4009static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4010opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 4011{
3973 pointer x; 4012 pointer args = SCHEME_V->args;
4013 pointer x = car (args);
3974 num v; 4014 num v;
3975 4015
4016 switch (op)
4017 {
3976#if USE_MATH 4018#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4019 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 4020 {
3986
3987 if (num_is_integer (x)) 4021 if (is_integer (x))
3988 s_return (x); 4022 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4023
4024 RVALUE r = rvalue_unchecked (x);
4025
4026 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4027 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 4028 else
3992 Error_1 ("inexact->exact: not integral:", x); 4029 Error_1 ("inexact->exact: not integral:", x);
4030 }
3993 4031
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4032 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4033 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4034 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4035 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4036 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4037 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4038 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4039
4022 case OP_ATAN: 4040 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 4041 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4042 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 4043 else
4028 { 4044 {
4029 pointer y = cadr (SCHEME_V->args); 4045 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4046 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 4047 }
4033 4048
4034 case OP_SQRT: 4049 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4050 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 4051
4038 case OP_EXPT: 4052 case OP_EXPT:
4039 { 4053 {
4040 RVALUE result; 4054 RVALUE result;
4041 int real_result = 1; 4055 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4056 pointer y = cadr (args);
4043 4057
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4058 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4059 real_result = 0;
4048 4060
4049 /* This 'if' is an R5RS compatibility fix. */ 4061 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4062 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4063 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4064 result = 0;
4053 else 4065 else
4054 result = pow (rvalue (x), rvalue (y)); 4066 result = pow (rvalue (x), rvalue (y));
4055 4067
4056 /* Before returning integer result make sure we can. */ 4068 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4069 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4070 if (!real_result)
4059 { 4071 {
4060 long result_as_long = (long) result; 4072 long result_as_long = result;
4061 4073
4062 if (result != (RVALUE) result_as_long) 4074 if (result != result_as_long)
4063 real_result = 1; 4075 real_result = 1;
4064 } 4076 }
4065 4077
4066 if (real_result) 4078 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4079 s_return (mk_real (SCHEME_A_ result));
4068 else 4080 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4081 s_return (mk_integer (SCHEME_A_ result));
4070 } 4082 }
4071 4083
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4084 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4085 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4086
4080 case OP_TRUNCATE: 4087 case OP_TRUNCATE:
4081 { 4088 {
4082 RVALUE rvalue_of_x; 4089 RVALUE n = rvalue (x);
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4090 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4091 }
4092 4092
4093 case OP_ROUND: 4093 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4094 if (is_integer (x))
4097 s_return (x); 4095 s_return (x);
4098 4096
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4097 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4098#endif
4101 4099
4102 case OP_ADD: /* + */ 4100 case OP_ADD: /* + */
4103 v = num_zero; 4101 v = num_zero;
4104 4102
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4103 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4104 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4105
4108 s_return (mk_number (SCHEME_A_ v)); 4106 s_return (mk_number (SCHEME_A_ v));
4109 4107
4110 case OP_MUL: /* * */ 4108 case OP_MUL: /* * */
4111 v = num_one; 4109 v = num_one;
4112 4110
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4111 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4112 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4113
4116 s_return (mk_number (SCHEME_A_ v)); 4114 s_return (mk_number (SCHEME_A_ v));
4117 4115
4118 case OP_SUB: /* - */ 4116 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4117 if (cdr (args) == NIL)
4120 { 4118 {
4121 x = SCHEME_V->args; 4119 x = args;
4122 v = num_zero; 4120 v = num_zero;
4123 } 4121 }
4124 else 4122 else
4125 { 4123 {
4126 x = cdr (SCHEME_V->args); 4124 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4125 v = nvalue (car (args));
4128 } 4126 }
4129 4127
4130 for (; x != NIL; x = cdr (x)) 4128 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4129 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4130
4133 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4134 4132
4135 case OP_DIV: /* / */ 4133 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4134 if (cdr (args) == NIL)
4137 { 4135 {
4138 x = SCHEME_V->args; 4136 x = args;
4139 v = num_one; 4137 v = num_one;
4140 } 4138 }
4141 else 4139 else
4142 { 4140 {
4143 x = cdr (SCHEME_V->args); 4141 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4142 v = nvalue (car (args));
4145 } 4143 }
4146 4144
4147 for (; x != NIL; x = cdr (x)) 4145 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4146 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4147 v = num_div (v, nvalue (car (x)));
4151 else 4148 else
4152 Error_0 ("/: division by zero"); 4149 Error_0 ("/: division by zero");
4153 }
4154 4150
4155 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4156 4152
4157 case OP_INTDIV: /* quotient */ 4153 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4154 if (cdr (args) == NIL)
4159 { 4155 {
4160 x = SCHEME_V->args; 4156 x = args;
4161 v = num_one; 4157 v = num_one;
4162 } 4158 }
4163 else 4159 else
4164 { 4160 {
4165 x = cdr (SCHEME_V->args); 4161 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4162 v = nvalue (car (args));
4167 } 4163 }
4168 4164
4169 for (; x != NIL; x = cdr (x)) 4165 for (; x != NIL; x = cdr (x))
4170 { 4166 {
4171 if (ivalue (car (x)) != 0) 4167 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4168 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4169 else
4174 Error_0 ("quotient: division by zero"); 4170 Error_0 ("quotient: division by zero");
4175 } 4171 }
4176 4172
4177 s_return (mk_number (SCHEME_A_ v)); 4173 s_return (mk_number (SCHEME_A_ v));
4178 4174
4179 case OP_REM: /* remainder */ 4175 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4176 v = nvalue (x);
4181 4177
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4178 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4179 v = num_rem (v, nvalue (cadr (args)));
4184 else 4180 else
4185 Error_0 ("remainder: division by zero"); 4181 Error_0 ("remainder: division by zero");
4186 4182
4187 s_return (mk_number (SCHEME_A_ v)); 4183 s_return (mk_number (SCHEME_A_ v));
4188 4184
4189 case OP_MOD: /* modulo */ 4185 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4186 v = nvalue (x);
4191 4187
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4188 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4189 v = num_mod (v, nvalue (cadr (args)));
4194 else 4190 else
4195 Error_0 ("modulo: division by zero"); 4191 Error_0 ("modulo: division by zero");
4196 4192
4197 s_return (mk_number (SCHEME_A_ v)); 4193 s_return (mk_number (SCHEME_A_ v));
4198 4194
4199 case OP_CAR: /* car */ 4195 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4196 s_return (caar (args));
4201 4197
4202 case OP_CDR: /* cdr */ 4198 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4199 s_return (cdar (args));
4204 4200
4205 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4203 s_return (args);
4208 4204
4209 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4211 { 4207 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4214 } 4210 }
4215 else 4211 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4217 4213
4218 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4220 { 4216 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4223 } 4219 }
4224 else 4220 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4222
4227 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4225
4230 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4228
4233 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4234 { 4230 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4231 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4232 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4238 } 4234 }
4239 4235
4240 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4241 { 4237 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4239 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4245 } 4241 }
4246 4242
4247 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4245
4250 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4251 { 4247 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4253 long pf = 0; 4249 long pf = 0;
4254 4250
4255 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4256 { 4252 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4260 4256
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4258 {
4263 /* base is OK */ 4259 /* base is OK */
4264 } 4260 }
4265 else 4261 else
4266 pf = -1; 4262 pf = -1;
4267 } 4263 }
4268 4264
4269 if (pf < 0) 4265 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4269 else
4274 { 4270 {
4275 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
… …
4286 } 4282 }
4287 } 4283 }
4288 } 4284 }
4289 4285
4290 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4288 setimmutable (x);
4293 s_return (x); 4289 s_return (x);
4294 4290
4295 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4296 { 4292 {
4297 long pf = 0; 4293 long pf = 0;
4298 4294
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4302 { 4296 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4306 4300
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4302 {
4309 /* base is OK */ 4303 /* base is OK */
4310 } 4304 }
4311 else 4305 else
4312 pf = -1; 4306 pf = -1;
4313 } 4307 }
4314 4308
4315 if (pf < 0) 4309 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4312 {
4319 char *p; 4313 char *p;
4320 int len; 4314 int len;
4321 4315
… …
4326 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4327 } 4321 }
4328 4322
4329 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4330 { 4324 {
4331 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4326 int len = ivalue_unchecked (x);
4333 4327
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4329 }
4341 4330
4342 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4333
4345 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4346 { 4335 {
4347 char *str; 4336 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4353 4338
4354 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4341
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4343 }
4359 4344
4360 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4361 { 4346 {
4362 char *str; 4347 char *str = strvalue (x);
4363 int index; 4348 int index = ivalue_unchecked (cadr (args));
4364 int c; 4349 int c;
4365 4350
4366 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4353
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4356
4376 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4377 4358
4378 str[index] = (char) c; 4359 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4380 } 4361 }
4381 4362
4382 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4383 { 4364 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4365 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4366 int len = 0;
4386 pointer newstr; 4367 pointer newstr;
4387 char *pos; 4368 char *pos;
4388 4369
4389 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4372 len += strlength (car (x));
4392 4373
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4375
4395 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4377 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4379
4399 s_return (newstr); 4380 s_return (newstr);
4400 } 4381 }
4401 4382
4402 case OP_SUBSTR: /* substring */ 4383 case OP_SUBSTR: /* substring */
4403 { 4384 {
4404 char *str; 4385 char *str = strvalue (x);
4405 int index0; 4386 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4387 int index1;
4407 int len; 4388 int len;
4408 4389
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4391 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4392
4416 if (cddr (SCHEME_V->args) != NIL) 4393 if (cddr (args) != NIL)
4417 { 4394 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4419 4396
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4399 }
4423 else 4400 else
4424 index1 = strlength (car (SCHEME_V->args)); 4401 index1 = strlength (x);
4425 4402
4426 len = index1 - index0; 4403 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4405 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4406 strvalue (x)[len] = 0;
… …
4433 4410
4434 case OP_VECTOR: /* vector */ 4411 case OP_VECTOR: /* vector */
4435 { 4412 {
4436 int i; 4413 int i;
4437 pointer vec; 4414 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4415 int len = list_length (SCHEME_A_ args);
4439 4416
4440 if (len < 0) 4417 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4418 Error_1 ("vector: not a proper list:", args);
4442 4419
4443 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4444 4421
4445#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4424 s_return (S_SINK);
4448#endif 4425#endif
4449 4426
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4427 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4428 vector_set (vec, i, car (x));
4452 4429
4453 s_return (vec); 4430 s_return (vec);
4454 } 4431 }
4455 4432
4456 case OP_MKVECTOR: /* make-vector */ 4433 case OP_MKVECTOR: /* make-vector */
4457 { 4434 {
4458 pointer fill = NIL; 4435 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4436 pointer vec;
4437 int len = ivalue_unchecked (x);
4461 4438
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4439 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4440 fill = cadr (args);
4466 4441
4467 vec = mk_vector (SCHEME_A_ len); 4442 vec = mk_vector (SCHEME_A_ len);
4468 4443
4469#if USE_ERROR_CHECKING 4444#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4445 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4446 s_return (S_SINK);
4472#endif 4447#endif
4473 4448
4474 if (fill != NIL) 4449 if (fill != NIL)
4475 fill_vector (vec, fill); 4450 fill_vector (vec, 0, fill);
4476 4451
4477 s_return (vec); 4452 s_return (vec);
4478 } 4453 }
4479 4454
4480 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4456 s_return (mk_integer (SCHEME_A_ veclength (x)));
4457
4458 case OP_VECRESIZE:
4459 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4460 s_return (x);
4482 4461
4483 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4484 { 4463 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4464 int index = ivalue_unchecked (cadr (args));
4488 4465
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4467 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4468
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4469 s_return (vector_get (x, index));
4493 } 4470 }
4494 4471
4495 case OP_VECSET: /* vector-set! */ 4472 case OP_VECSET: /* vector-set! */
4496 { 4473 {
4497 int index; 4474 int index = ivalue_unchecked (cadr (args));
4498 4475
4499 if (is_immutable (car (SCHEME_V->args))) 4476 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4477 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4478
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4479 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4480 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4481
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4482 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4483 s_return (x);
4509 } 4484 }
4510 } 4485 }
4511 4486
4512 return S_T; 4487 if (USE_ERROR_CHECKING) abort ();
4513} 4488}
4514 4489
4515INTERFACE int 4490static int
4516is_list (SCHEME_P_ pointer a) 4491opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4492{
4518 return list_length (SCHEME_A_ a) >= 0; 4493 pointer x = SCHEME_V->args;
4519}
4520 4494
4521/* Result is: 4495 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4496 {
4497 num v = nvalue (car (x));
4498 x = cdr (x);
4499
4537 if (fast == NIL) 4500 if (x == NIL)
4538 return i; 4501 break;
4539 4502
4540 if (!is_pair (fast)) 4503 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4504
4543 fast = cdr (fast); 4505 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4506 {
4561 /* the fast pointer has looped back around and caught up 4507 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4508 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4509 case OP_GRE: r = r > 0; break;
4564 return -1; 4510 case OP_LEQ: r = r <= 0; break;
4511 case OP_GEQ: r = r >= 0; break;
4565 } 4512 }
4566 }
4567}
4568 4513
4514 if (!r)
4515 s_return (S_F);
4516 }
4517
4518 s_return (S_T);
4519}
4520
4569static pointer 4521static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4522opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4523{
4572 pointer x; 4524 pointer args = SCHEME_V->args;
4573 num v; 4525 pointer a = car (args);
4574 int (*comp_func) (num, num); 4526 pointer d = cdr (args);
4527 int r;
4575 4528
4576 switch (op) 4529 switch (op)
4577 { 4530 {
4578 case OP_NOT: /* not */ 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4537 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4538 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4539 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4540 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4541
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4542#if USE_CHAR_CLASSIFIERS
4650 4543 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4544 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4545 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4546 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4547 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4548#endif
4549
4666#if USE_PORTS 4550#if USE_PORTS
4667 4551 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4552 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4553 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4554#endif
4677 4555
4678 case OP_PROCP: /* procedure? */ 4556 case OP_PROCP: /* procedure? */
4679 4557
4680 /*-- 4558 /*--
4681 * continuation should be procedure by the example 4559 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4560 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4561 * in R^3 report sec. 6.9
4684 */ 4562 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4563 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4564 break;
4687 4565
4688 case OP_PAIRP: /* pair? */ 4566 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4567 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4568 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4569 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4570 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4571 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4572 }
4706 4573
4707 return S_T; 4574 s_retbool (r);
4708} 4575}
4709 4576
4710static pointer 4577static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4578opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4579{
4580 pointer args = SCHEME_V->args;
4581 pointer a = car (args);
4713 pointer x, y; 4582 pointer x, y;
4714 4583
4715 switch (op) 4584 switch (op)
4716 { 4585 {
4717 case OP_FORCE: /* force */ 4586 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4587 SCHEME_V->code = a;
4719 4588
4720 if (is_promise (SCHEME_V->code)) 4589 if (is_promise (SCHEME_V->code))
4721 { 4590 {
4722 /* Should change type to closure here */ 4591 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4592 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4613 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4614 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4615 }
4747 } 4616 }
4748 4617
4749 SCHEME_V->args = car (SCHEME_V->args); 4618 SCHEME_V->args = a;
4750 4619
4751 if (op == OP_WRITE) 4620 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4621 SCHEME_V->print_flag = 1;
4753 else 4622 else
4754 SCHEME_V->print_flag = 0; 4623 SCHEME_V->print_flag = 0;
4755 4624
4756 s_goto (OP_P0LIST); 4625 s_goto (OP_P0LIST);
4757 4626
4758 case OP_NEWLINE: /* newline */ 4627 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4628 if (is_pair (args))
4760 { 4629 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4630 if (a != SCHEME_V->outport)
4762 { 4631 {
4763 x = cons (SCHEME_V->outport, NIL); 4632 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4633 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4634 SCHEME_V->outport = a;
4766 } 4635 }
4767 } 4636 }
4768 4637
4769 putstr (SCHEME_A_ "\n"); 4638 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4639 s_return (S_T);
4771#endif 4640#endif
4772 4641
4773 case OP_ERR0: /* error */ 4642 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4643 SCHEME_V->retcode = -1;
4775 4644
4776 if (!is_string (car (SCHEME_V->args))) 4645 if (!is_string (a))
4777 { 4646 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4647 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4648 setimmutable (car (args));
4780 } 4649 }
4781 4650
4782 putstr (SCHEME_A_ "Error: "); 4651 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4652 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4653 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4654 s_goto (OP_ERR1);
4786 4655
4787 case OP_ERR1: /* error */ 4656 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4657 putstr (SCHEME_A_ " ");
4789 4658
4790 if (SCHEME_V->args != NIL) 4659 if (args != NIL)
4791 { 4660 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4661 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4662 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4663 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4664 s_goto (OP_P0LIST);
4796 } 4665 }
4797 else 4666 else
4798 { 4667 {
4799 putstr (SCHEME_A_ "\n"); 4668 putstr (SCHEME_A_ "\n");
4800 4669
4801 if (SCHEME_V->interactive_repl) 4670 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4671 s_goto (OP_T0LVL);
4803 else 4672 else
4804 return NIL; 4673 return -1;
4805 } 4674 }
4806 4675
4807 case OP_REVERSE: /* reverse */ 4676 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4677 s_return (reverse (SCHEME_A_ a));
4809 4678
4810 case OP_LIST_STAR: /* list* */ 4679 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4680 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4681
4813 case OP_APPEND: /* append */ 4682 case OP_APPEND: /* append */
4814 x = NIL; 4683 x = NIL;
4815 y = SCHEME_V->args; 4684 y = args;
4816 4685
4817 if (y == x) 4686 if (y == x)
4818 s_return (x); 4687 s_return (x);
4819 4688
4820 /* cdr() in the while condition is not a typo. If car() */ 4689 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4700 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4701
4833#if USE_PLIST 4702#if USE_PLIST
4834 4703
4835 case OP_PUT: /* put */ 4704 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4705 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4706 Error_0 ("illegal use of put");
4838 4707
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4708 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4709 {
4841 if (caar (x) == y) 4710 if (caar (x) == y)
4842 break; 4711 break;
4843 } 4712 }
4844 4713
4845 if (x != NIL) 4714 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4715 cdar (x) = caddr (args);
4847 else 4716 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4717 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4718
4850 s_return (S_T); 4719 s_return (S_T);
4851 4720
4852 case OP_GET: /* get */ 4721 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4722 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4723 Error_0 ("illegal use of get");
4855 4724
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4725 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4726 if (caar (x) == y)
4858 break; 4727 break;
4859 4728
4860 if (x != NIL) 4729 if (x != NIL)
4861 s_return (cdar (x)); 4730 s_return (cdar (x));
… …
4863 s_return (NIL); 4732 s_return (NIL);
4864 4733
4865#endif /* USE_PLIST */ 4734#endif /* USE_PLIST */
4866 4735
4867 case OP_QUIT: /* quit */ 4736 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4737 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4738 SCHEME_V->retcode = ivalue (a);
4870 4739
4871 return NIL; 4740 return -1;
4872 4741
4873 case OP_GC: /* gc */ 4742 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4743 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4744 s_return (S_T);
4876 4745
4877 case OP_GCVERB: /* gc-verbose */ 4746 case OP_GCVERB: /* gc-verbose */
4878 { 4747 {
4879 int was = SCHEME_V->gc_verbose; 4748 int was = SCHEME_V->gc_verbose;
4880 4749
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4750 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4751 s_retbool (was);
4883 } 4752 }
4884 4753
4885 case OP_NEWSEGMENT: /* new-segment */ 4754 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4755 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
4888 4757
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4758 alloc_cellseg (SCHEME_A_ ivalue (a));
4890 4759
4891 s_return (S_T); 4760 s_return (S_T);
4892 4761
4893 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4790 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4791 prop = port_input | port_output;
4923 break; 4792 break;
4924 } 4793 }
4925 4794
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4795 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4796
4928 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4798 }
4933 4799
4934# if USE_STRING_PORTS 4800# if USE_STRING_PORTS
4935 4801
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4802 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4814 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4815 prop = port_input | port_output;
4950 break; 4816 break;
4951 } 4817 }
4952 4818
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4819 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4820 strvalue (a) + strlength (a), prop);
4955 4821
4956 if (p == NIL) 4822 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4823 }
4961 4824
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4825 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4826 {
4964 pointer p; 4827 pointer p;
4965 4828
4966 if (car (SCHEME_V->args) == NIL) 4829 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4831 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4833 strvalue (a) + strlength (a), port_output);
4977 4834
4978 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4836 }
4984 4837
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4839 {
4987 port *p; 4840 port *p;
4988 4841
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4842 if ((p = a->object.port)->kind & port_string)
4990 { 4843 {
4991 off_t size; 4844 off_t size;
4992 char *str; 4845 char *str;
4993 4846
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4863 }
5011 4864
5012# endif 4865# endif
5013 4866
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4867 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4868 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4869 s_return (S_T);
5017 4870
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4871 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4872 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4873 s_return (S_T);
5021#endif 4874#endif
5022 4875
5023 case OP_INT_ENV: /* interaction-environment */ 4876 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4877 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4879 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4880 s_return (SCHEME_V->envir);
5028 4881
5029 } 4882 }
5030 4883
5031 return S_T; 4884 if (USE_ERROR_CHECKING) abort ();
5032} 4885}
5033 4886
5034static pointer 4887static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4888opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4889{
4890 pointer args = SCHEME_V->args;
5037 pointer x; 4891 pointer x;
5038 4892
5039 if (SCHEME_V->nesting != 0) 4893 if (SCHEME_V->nesting != 0)
5040 { 4894 {
5041 int n = SCHEME_V->nesting; 4895 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4902 switch (op)
5049 { 4903 {
5050 /* ========== reading part ========== */ 4904 /* ========== reading part ========== */
5051#if USE_PORTS 4905#if USE_PORTS
5052 case OP_READ: 4906 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4907 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4908 s_goto (OP_READ_INTERNAL);
5055 4909
5056 if (!is_inport (car (SCHEME_V->args))) 4910 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4911 Error_1 ("read: not an input port:", car (args));
5058 4912
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4913 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5061 4915
5062 x = SCHEME_V->inport; 4916 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4917 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4918 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4919 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5067 4921
5068 case OP_READ_CHAR: /* read-char */ 4922 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4923 case OP_PEEK_CHAR: /* peek-char */
5070 { 4924 {
5071 int c; 4925 int c;
5072 4926
5073 if (is_pair (SCHEME_V->args)) 4927 if (is_pair (args))
5074 { 4928 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4929 if (car (args) != SCHEME_V->inport)
5076 { 4930 {
5077 x = SCHEME_V->inport; 4931 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4932 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4934 SCHEME_V->inport = car (args);
5081 } 4935 }
5082 } 4936 }
5083 4937
5084 c = inchar (SCHEME_A); 4938 c = inchar (SCHEME_A);
5085 4939
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4949 case OP_CHAR_READY: /* char-ready? */
5096 { 4950 {
5097 pointer p = SCHEME_V->inport; 4951 pointer p = SCHEME_V->inport;
5098 int res; 4952 int res;
5099 4953
5100 if (is_pair (SCHEME_V->args)) 4954 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4955 p = car (args);
5102 4956
5103 res = p->object.port->kind & port_string; 4957 res = p->object.port->kind & port_string;
5104 4958
5105 s_retbool (res); 4959 s_retbool (res);
5106 } 4960 }
5107 4961
5108 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4963 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4964 s_return (SCHEME_V->value);
5111 4965
5112 case OP_SET_OUTPORT: /* set-output-port */ 4966 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4967 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4968 s_return (SCHEME_V->value);
5115#endif 4969#endif
5116 4970
5117 case OP_RDSEXPR: 4971 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4972 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
5170 5024
5171 case TOK_ATOM: 5025 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5026 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5027
5028 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031
5032 case TOK_STRATOM:
5033 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5036
5174 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
5176 5039
5177 if (x == S_F) 5040 if (x == S_F)
5178 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
5179 5042
5180 setimmutable (x); 5043 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
5193 } 5056 }
5194 } 5057 }
5195 5058
5196 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
5199 else 5062 else
5200 s_return (x); 5063 s_return (x);
5201 5064
5202 default: 5065 default:
… …
5204 } 5067 }
5205 5068
5206 break; 5069 break;
5207 5070
5208 case OP_RDLIST: 5071 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5072 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5073 SCHEME_V->tok = token (SCHEME_A);
5211 5074
5212 switch (SCHEME_V->tok) 5075 switch (SCHEME_V->tok)
5213 { 5076 {
5214 case TOK_EOF: 5077 case TOK_EOF:
… …
5242 case OP_RDDOT: 5105 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5106 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5107 Error_0 ("syntax error: illegal dot expression");
5245 5108
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5109 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5110 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5111
5249 case OP_RDQUOTE: 5112 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5113 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5114
5252 case OP_RDQQUOTE: 5115 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5137 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5138 s_goto (OP_VECTOR);
5276 5139
5277 /* ========== printing part ========== */ 5140 /* ========== printing part ========== */
5278 case OP_P0LIST: 5141 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5142 if (is_vector (args))
5280 { 5143 {
5281 putstr (SCHEME_A_ "#("); 5144 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5145 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5146 s_goto (OP_PVECFROM);
5284 } 5147 }
5285 else if (is_environment (SCHEME_V->args)) 5148 else if (is_environment (args))
5286 { 5149 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5150 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5151 s_return (S_T);
5289 } 5152 }
5290 else if (!is_pair (SCHEME_V->args)) 5153 else if (!is_pair (args))
5291 { 5154 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5155 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5156 s_return (S_T);
5294 } 5157 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5158 else
5296 { 5159 {
5160 pointer a = car (args);
5161 pointer b = cdr (args);
5162 int ok_abbr = ok_abbrev (b);
5163 SCHEME_V->args = car (b);
5164
5165 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5166 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5167 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ "`");
5169 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5170 putstr (SCHEME_A_ ",");
5171 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5172 putstr (SCHEME_A_ ",@");
5173 else
5174 {
5175 putstr (SCHEME_A_ "(");
5176 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5177 SCHEME_V->args = a;
5178 }
5179
5299 s_goto (OP_P0LIST); 5180 s_goto (OP_P0LIST);
5300 } 5181 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5182
5183 case OP_P1LIST:
5184 if (is_pair (args))
5302 { 5185 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5187 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5188 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5189 s_goto (OP_P0LIST);
5306 } 5190 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && 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 if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5191 else if (is_vector (args))
5336 { 5192 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5193 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5194 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5195 s_goto (OP_P0LIST);
5340 } 5196 }
5341 else 5197 else
5342 { 5198 {
5343 if (SCHEME_V->args != NIL) 5199 if (args != NIL)
5344 { 5200 {
5345 putstr (SCHEME_A_ " . "); 5201 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5203 }
5348 5204
5349 putstr (SCHEME_A_ ")"); 5205 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5206 s_return (S_T);
5351 } 5207 }
5352 5208
5353 case OP_PVECFROM: 5209 case OP_PVECFROM:
5354 { 5210 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5211 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5212 pointer vec = car (args);
5357 int len = veclength (vec); 5213 int len = veclength (vec);
5358 5214
5359 if (i == len) 5215 if (i == len)
5360 { 5216 {
5361 putstr (SCHEME_A_ ")"); 5217 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5218 s_return (S_T);
5363 } 5219 }
5364 else 5220 else
5365 { 5221 {
5366 pointer elem = vector_elem (vec, i); 5222 pointer elem = vector_get (vec, i);
5367 5223
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5224 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5226 SCHEME_V->args = elem;
5371 5227
5372 if (i > 0) 5228 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5229 putstr (SCHEME_A_ " ");
5374 5230
5375 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5376 } 5232 }
5377 } 5233 }
5378 } 5234 }
5379 5235
5380 return S_T; 5236 if (USE_ERROR_CHECKING) abort ();
5381} 5237}
5382 5238
5383static pointer 5239static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5240opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5241{
5242 pointer args = SCHEME_V->args;
5243 pointer a = car (args);
5386 pointer x, y; 5244 pointer x, y;
5387 5245
5388 switch (op) 5246 switch (op)
5389 { 5247 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5248 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5249 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5250 long v = list_length (SCHEME_A_ a);
5393 5251
5394 if (v < 0) 5252 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5253 Error_1 ("length: not a list:", a);
5396 5254
5397 s_return (mk_integer (SCHEME_A_ v)); 5255 s_return (mk_integer (SCHEME_A_ v));
5398 } 5256 }
5399 5257
5400 case OP_ASSQ: /* assq *//* a.k */ 5258 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5259 x = a;
5402 5260
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5261 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5262 {
5405 if (!is_pair (car (y))) 5263 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5264 Error_0 ("unable to handle non pair element");
5407 5265
5408 if (x == caar (y)) 5266 if (x == caar (y))
… …
5414 else 5272 else
5415 s_return (S_F); 5273 s_return (S_F);
5416 5274
5417 5275
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5277 SCHEME_V->args = a;
5420 5278
5421 if (SCHEME_V->args == NIL) 5279 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5280 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5281 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5429 5287
5430 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5431 /* 5289 /*
5432 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5434 */ 5293 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5294 s_retbool (is_closure (a));
5436 5295
5437 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5297 s_retbool (is_macro (a));
5439 } 5298 }
5440 5299
5441 return S_T; /* NOTREACHED */ 5300 if (USE_ERROR_CHECKING) abort ();
5442} 5301}
5443 5302
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5305
5446typedef int (*test_predicate) (pointer); 5306typedef int (*test_predicate)(pointer);
5447static int 5307static int
5448is_any (pointer p) 5308tst_any (pointer p)
5449{ 5309{
5450 return 1; 5310 return 1;
5451} 5311}
5452 5312
5453static int 5313static int
5454is_nonneg (pointer p) 5314tst_inonneg (pointer p)
5455{ 5315{
5456 return ivalue (p) >= 0 && is_integer (p); 5316 return is_integer (p) && ivalue_unchecked (p) >= 0;
5317}
5318
5319static int
5320tst_is_list (SCHEME_P_ pointer p)
5321{
5322 return p == NIL || is_pair (p);
5457} 5323}
5458 5324
5459/* Correspond carefully with following defines! */ 5325/* Correspond carefully with following defines! */
5460static struct 5326static struct
5461{ 5327{
5462 test_predicate fct; 5328 test_predicate fct;
5463 const char *kind; 5329 const char *kind;
5464} tests[] = 5330} tests[] = {
5465{ 5331 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5332 { is_string , "string" },
5467 { is_any, 0}, 5333 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5334 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5335 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5336 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5337 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5338 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5339 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5340 { is_character , "character" },
5477 { is_vector, "vector" }, 5341 { is_vector , "vector" },
5478 { is_number, "number" }, 5342 { is_number , "number" },
5479 { is_integer, "integer" }, 5343 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5344 { tst_inonneg , "non-negative integer" }
5481}; 5345};
5482 5346
5483#define TST_NONE 0 5347#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5348#define TST_ANY "\001"
5485#define TST_STRING "\002" 5349#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5350#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5351#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5352#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5353#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5354#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5355#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5356#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5357#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5358#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5359#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5360#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5361#define TST_NATURAL "\016"
5362
5363#define INF_ARG 0xff
5364#define UNNAMED_OP ""
5365
5366static const char opnames[] =
5367#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5368#include "opdefines.h"
5369#undef OP_DEF
5370;
5371
5372static const char *
5373opname (int idx)
5374{
5375 const char *name = opnames;
5376
5377 /* should do this at compile time, but would require external program, right? */
5378 while (idx--)
5379 name += strlen (name) + 1;
5380
5381 return *name ? name : "ILLEGAL";
5382}
5383
5384static const char *
5385procname (pointer x)
5386{
5387 return opname (procnum (x));
5388}
5498 5389
5499typedef struct 5390typedef struct
5500{ 5391{
5501 dispatch_func func; 5392 uint8_t func;
5502 char *name; 5393 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5394 uint8_t builtin;
5395#if USE_ERROR_CHECKING
5503 int min_arity; 5396 uint8_t min_arity;
5504 int max_arity; 5397 uint8_t max_arity;
5505 char *arg_tests_encoding; 5398 char arg_tests_encoding[3];
5399#endif
5506} op_code_info; 5400} op_code_info;
5507 5401
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5402static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5403#if USE_ERROR_CHECKING
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5405#else
5406#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5407#endif
5512#include "opdefines.h" 5408#include "opdefines.h"
5409#undef OP_DEF
5513 {0} 5410 {0}
5514}; 5411};
5515 5412
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5413/* kernel of this interpreter */
5529static void 5414static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5416{
5532 SCHEME_V->op = op; 5417 SCHEME_V->op = op;
5533 5418
5534 for (;;) 5419 for (;;)
5535 { 5420 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5421 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5422
5538#if USE_ERROR_CHECKING 5423#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5424 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5425 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5426 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5427 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5428
5545 /* Check number of arguments */ 5429 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5430 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5431 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5432 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5433 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5551 } 5436 }
5552 5437 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5438 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5439 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5440 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5441 xError_1 (SCHEME_A_ msg, 0);
5442 continue;
5558 } 5443 }
5559 5444 else
5560 if (ok)
5561 { 5445 {
5562 if (pcd->arg_tests_encoding) 5446 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5447 {
5564 int i = 0; 5448 int i = 0;
5565 int j; 5449 int j;
5566 const char *t = pcd->arg_tests_encoding; 5450 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5451 pointer arglist = SCHEME_V->args;
5568 5452
5569 do 5453 do
5570 { 5454 {
5571 pointer arg = car (arglist); 5455 pointer arg = car (arglist);
5572 5456
5573 j = (int) t[0]; 5457 j = t[0];
5574 5458
5459 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5460 if (j == TST_LIST[0])
5576 { 5461 {
5577 if (arg != NIL && !is_pair (arg)) 5462 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5463 break;
5579 } 5464 }
5580 else 5465 else
5581 { 5466 {
5582 if (!tests[j].fct (arg)) 5467 if (!tests[j - 1].fct (arg))
5583 break; 5468 break;
5584 } 5469 }
5585 5470
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5471 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5472 t++;
5588 5473
5589 arglist = cdr (arglist); 5474 arglist = cdr (arglist);
5590 i++; 5475 i++;
5591 } 5476 }
5592 while (i < n); 5477 while (i < n);
5593 5478
5594 if (i < n) 5479 if (i < n)
5595 { 5480 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5481 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5482 xError_1 (SCHEME_A_ msg, 0);
5483 continue;
5598 } 5484 }
5599 } 5485 }
5600 } 5486 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5487 }
5610#endif 5488#endif
5611 5489
5612 ok_to_freely_gc (SCHEME_A); 5490 ok_to_freely_gc (SCHEME_A);
5613 5491
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5492 static const dispatch_func dispatch_funcs[] = {
5493 opexe_0,
5494 opexe_1,
5495 opexe_2,
5496 opexe_3,
5497 opexe_4,
5498 opexe_5,
5499 opexe_6,
5500 };
5501
5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5503 return;
5616 5504
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5506 {
5619 xwrstr ("No memory!\n"); 5507 xwrstr ("No memory!\n");
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5531mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5532{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5533 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5534 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5535 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5536 return y;
5650} 5537}
5651 5538
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5540static int
5654syntaxnum (pointer p) 5541syntaxnum (pointer p)
5655{ 5542{
5656 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
5657 5544
5658 switch (strlength (car (p))) 5545 switch (strlength (p))
5659 { 5546 {
5660 case 2: 5547 case 2:
5661 if (s[0] == 'i') 5548 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
5663 else 5550 else
… …
5677 5564
5678 case 'd': 5565 case 'd':
5679 return OP_COND0; /* cond */ 5566 return OP_COND0; /* cond */
5680 5567
5681 case '*': 5568 case '*':
5682 return OP_LET0AST; /* let* */ 5569 return OP_LET0AST;/* let* */
5683 5570
5684 default: 5571 default:
5685 return OP_SET0; /* set! */ 5572 return OP_SET0; /* set! */
5686 } 5573 }
5687 5574
… …
5709 5596
5710 case 'f': 5597 case 'f':
5711 return OP_DEF0; /* define */ 5598 return OP_DEF0; /* define */
5712 5599
5713 default: 5600 default:
5714 return OP_LET0REC; /* letrec */ 5601 return OP_LET0REC;/* letrec */
5715 } 5602 }
5716 5603
5717 default: 5604 default:
5718 return OP_C0STREAM; /* cons-stream */ 5605 return OP_C0STREAM; /* cons-stream */
5719 } 5606 }
5720} 5607}
5721 5608
5722#if USE_MULTIPLICITY 5609#if USE_MULTIPLICITY
5723scheme * 5610ecb_cold scheme *
5724scheme_init_new () 5611scheme_init_new ()
5725{ 5612{
5726 scheme *sc = malloc (sizeof (scheme)); 5613 scheme *sc = malloc (sizeof (scheme));
5727 5614
5728 if (!scheme_init (SCHEME_A)) 5615 if (!scheme_init (SCHEME_A))
… …
5733 else 5620 else
5734 return sc; 5621 return sc;
5735} 5622}
5736#endif 5623#endif
5737 5624
5738int 5625ecb_cold int
5739scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
5740{ 5627{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5629 pointer x;
5743 5630
… …
5816 5703
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5704 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5705 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5706 }
5820 5707
5708 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5709 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5710 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5711 assign_proc (SCHEME_A_ i, opname (i));
5824 5712
5825 /* initialization of global pointers to special symbols */ 5713 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5714 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5715 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5716 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5755scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5756{
5869 SCHEME_V->ext_data = p; 5757 SCHEME_V->ext_data = p;
5870} 5758}
5871 5759
5872void 5760ecb_cold void
5873scheme_deinit (SCHEME_P) 5761scheme_deinit (SCHEME_P)
5874{ 5762{
5875 int i; 5763 int i;
5876 5764
5877#if SHOW_ERROR_LINE 5765#if SHOW_ERROR_LINE
… …
5969{ 5857{
5970 dump_stack_reset (SCHEME_A); 5858 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5859 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5860 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5861 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5862 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5863 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5864 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5865#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5866 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5867#endif
5980 SCHEME_V->retcode = 0; 5868 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5869 SCHEME_V->interactive_repl = 0;
… …
6098# endif 5986# endif
6099 int fin; 5987 int fin;
6100 char *file_name = InitFile; 5988 char *file_name = InitFile;
6101 int retcode; 5989 int retcode;
6102 int isfile = 1; 5990 int isfile = 1;
5991 system ("ps v $PPID");//D
6103 5992
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5993 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 5994 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 5995 xwrstr ("Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5996 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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