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.14 by root, Thu Nov 26 08:56:32 2015 UTC vs.
Revision 1.48 by root, Mon Nov 30 13:07:34 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 24#include "malloc.c"
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
… …
28#endif 30#endif
29#if USE_MATH 31#if USE_MATH
30# include <math.h> 32# include <math.h>
31#endif 33#endif
32 34
35#include "ecb.h"
36
33#include <sys/types.h> 37#include <sys/types.h>
34#include <sys/stat.h> 38#include <sys/stat.h>
35#include <fcntl.h> 39#include <fcntl.h>
36 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
37#include <string.h> 47#include <string.h>
38#include <stdlib.h>
39 48
40#include <limits.h> 49#include <limits.h>
41#include <inttypes.h> 50#include <inttypes.h>
42#include <float.h> 51#include <float.h>
43//#include <ctype.h> 52//#include <ctype.h>
53
54#if '1' != '0' + 1 \
55 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
56 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
57 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
58 || 'f' != 'a' + 5
59# error "execution character set digits not consecutive"
60#endif
44 61
45enum { 62enum {
46 TOK_EOF, 63 TOK_EOF,
47 TOK_LPAREN, 64 TOK_LPAREN,
48 TOK_RPAREN, 65 TOK_RPAREN,
49 TOK_DOT, 66 TOK_DOT,
50 TOK_ATOM, 67 TOK_ATOM,
68 TOK_DOTATOM, /* atom name starting with '.' */
69 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 70 TOK_QUOTE,
52 TOK_DQUOTE, 71 TOK_DQUOTE,
53 TOK_BQUOTE, 72 TOK_BQUOTE,
54 TOK_COMMA, 73 TOK_COMMA,
55 TOK_ATMARK, 74 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 76 TOK_SHARP_CONST,
58 TOK_VEC 77 TOK_VEC
59}; 78};
60 79
61#define BACKQUOTE '`' 80#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 81#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE
63 83
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 88#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 89
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76
77#if !USE_MULTIPLICITY 90#if !USE_MULTIPLICITY
78static scheme sc; 91static scheme sc;
79#endif 92#endif
80 93
81static void 94static void
… …
150 163
151#define toupper(c) xtoupper (c) 164#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 165#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 166#define isdigit(c) xisdigit (c)
154 167
155#if USE_STRLWR 168#if USE_IGNORECASE
156static const char * 169static const char *
157strlwr (char *s) 170xstrlwr (char *s)
158{ 171{
159 const char *p = s; 172 const char *p = s;
160 173
161 while (*s) 174 while (*s)
162 { 175 {
… …
164 s++; 177 s++;
165 } 178 }
166 179
167 return p; 180 return p;
168} 181}
169#endif
170 182
183#define stricmp(a,b) strcasecmp (a, b)
184#define strlwr(s) xstrlwr (s)
185
186#else
171#define stricmp(a,b) strcmp (a, b) 187# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 188# define strlwr(s) (s)
189#endif
173 190
174#ifndef prompt 191#ifndef prompt
175# define prompt "ts> " 192# define prompt "ts> "
176#endif 193#endif
177 194
… …
183# define FIRST_CELLSEGS 3 200# define FIRST_CELLSEGS 3
184#endif 201#endif
185 202
186enum scheme_types 203enum scheme_types
187{ 204{
205 T_INTEGER,
188 T_FREE, 206 T_REAL,
189 T_STRING, 207 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 208 T_SYMBOL,
192 T_PROC, 209 T_PROC,
193 T_PAIR, 210 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 211 T_CLOSURE,
195 T_CONTINUATION, 212 T_CONTINUATION,
196 T_FOREIGN, 213 T_FOREIGN,
197 T_CHARACTER, 214 T_CHARACTER,
198 T_PORT, 215 T_PORT,
… …
208#define T_SYNTAX 0x0010 225#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 226#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 227#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 228#define T_MARK 0x0080 /* only for gc */
212 229
230/* num, for generic arithmetic */
231struct num
232{
233 IVALUE ivalue;
234#if USE_REAL
235 RVALUE rvalue;
236 char is_fixnum;
237#endif
238};
239
240#if USE_REAL
241# define num_is_fixnum(n) (n).is_fixnum
242# define num_set_fixnum(n,f) (n).is_fixnum = (f)
243# define num_ivalue(n) (n).ivalue
244# define num_rvalue(n) (n).rvalue
245# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
246# define num_set_rvalue(n,r) (n).rvalue = (r)
247#else
248# define num_is_fixnum(n) 1
249# define num_set_fixnum(n,f) 0
250# define num_ivalue(n) (n).ivalue
251# define num_rvalue(n) (n).ivalue
252# define num_set_ivalue(n,i) (n).ivalue = (i)
253# define num_set_rvalue(n,r) (n).ivalue = (r)
254#endif
255
213enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 256enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
214 257
215static num num_op (enum num_op op, num a, num b); 258static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 259static num num_intdiv (num a, num b);
217static num num_rem (num a, num b); 260static num num_rem (num a, num b);
… …
220#if USE_MATH 263#if USE_MATH
221static double round_per_R5RS (double x); 264static double round_per_R5RS (double x);
222#endif 265#endif
223static int is_zero_rvalue (RVALUE x); 266static int is_zero_rvalue (RVALUE x);
224 267
225static INLINE int
226num_is_integer (pointer p)
227{
228 return num_is_fixnum (p->object.number);
229}
230
231static num num_zero; 268static num num_zero;
232static num num_one; 269static num num_one;
233 270
234/* macros for cell operations */ 271/* macros for cell operations */
235#define typeflag(p) ((p)->flag + 0) 272#define typeflag(p) ((p)->flag + 0)
236#define set_typeflag(p,v) ((p)->flag = (v)) 273#define set_typeflag(p,v) ((p)->flag = (v))
237#define type(p) (typeflag (p) & T_MASKTYPE) 274#define type(p) (typeflag (p) & T_MASKTYPE)
238 275
239INTERFACE INLINE int 276INTERFACE int
240is_string (pointer p) 277is_string (pointer p)
241{ 278{
242 return type (p) == T_STRING; 279 return type (p) == T_STRING;
243} 280}
244 281
245#define strvalue(p) ((p)->object.string.svalue) 282#define strvalue(p) ((p)->object.string.svalue)
246#define strlength(p) ((p)->object.string.length) 283#define strlength(p) ((p)->object.string.length)
247 284
248INTERFACE int is_list (SCHEME_P_ pointer p);
249INTERFACE INLINE int 285INTERFACE int
250is_vector (pointer p) 286is_vector (pointer p)
251{ 287{
252 return type (p) == T_VECTOR; 288 return type (p) == T_VECTOR;
253} 289}
254 290
255#define vecvalue(p) ((p)->object.vector.vvalue) 291#define vecvalue(p) ((p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 292#define veclength(p) ((p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 294INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 296
262INTERFACE uint32_t 297INTERFACE int
263vector_length (pointer vec) 298is_integer (pointer p)
264{ 299{
265 return vec->object.vector.length; 300 return type (p) == T_INTEGER;
266} 301}
267 302
303/* not the same as in scheme, where integers are (correctly :) reals */
268INTERFACE INLINE int 304INTERFACE int
305is_real (pointer p)
306{
307 return type (p) == T_REAL;
308}
309
310INTERFACE int
269is_number (pointer p) 311is_number (pointer p)
270{ 312{
271 return type (p) == T_NUMBER; 313 return is_integer (p) || is_real (p);
272} 314}
273 315
274INTERFACE INLINE int 316INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE INLINE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290}
291
292INTERFACE INLINE int
293is_character (pointer p) 317is_character (pointer p)
294{ 318{
295 return type (p) == T_CHARACTER; 319 return type (p) == T_CHARACTER;
296} 320}
297 321
298INTERFACE INLINE char * 322INTERFACE char *
299string_value (pointer p) 323string_value (pointer p)
300{ 324{
301 return strvalue (p); 325 return strvalue (p);
302} 326}
303 327
304INLINE num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define ivalue_unchecked(p) (p)->object.ivalue
329#define set_ivalue(p,v) (p)->object.ivalue = (v)
330
335#if USE_REAL 331#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 332#define rvalue_unchecked(p) (p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 333#define set_rvalue(p,v) (p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 334#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 335#define rvalue_unchecked(p) (p)->object.ivalue
341# define set_num_integer(p) 0 336#define set_rvalue(p,v) (p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 337#endif
338
344INTERFACE long 339INTERFACE long
345charvalue (pointer p) 340charvalue (pointer p)
346{ 341{
347 return ivalue_unchecked (p); 342 return ivalue_unchecked (p);
348} 343}
349 344
350INTERFACE INLINE int 345INTERFACE int
351is_port (pointer p) 346is_port (pointer p)
352{ 347{
353 return type (p) == T_PORT; 348 return type (p) == T_PORT;
354} 349}
355 350
356INTERFACE INLINE int 351INTERFACE int
357is_inport (pointer p) 352is_inport (pointer p)
358{ 353{
359 return is_port (p) && p->object.port->kind & port_input; 354 return is_port (p) && p->object.port->kind & port_input;
360} 355}
361 356
362INTERFACE INLINE int 357INTERFACE int
363is_outport (pointer p) 358is_outport (pointer p)
364{ 359{
365 return is_port (p) && p->object.port->kind & port_output; 360 return is_port (p) && p->object.port->kind & port_output;
366} 361}
367 362
368INTERFACE INLINE int 363INTERFACE int
369is_pair (pointer p) 364is_pair (pointer p)
370{ 365{
371 return type (p) == T_PAIR; 366 return type (p) == T_PAIR;
372} 367}
373 368
… …
405pair_cdr (pointer p) 400pair_cdr (pointer p)
406{ 401{
407 return cdr (p); 402 return cdr (p);
408} 403}
409 404
410INTERFACE INLINE int 405INTERFACE int
411is_symbol (pointer p) 406is_symbol (pointer p)
412{ 407{
413 return type (p) == T_SYMBOL; 408 return type (p) == T_SYMBOL;
414} 409}
415 410
416INTERFACE INLINE char * 411INTERFACE char *
417symname (pointer p) 412symname (pointer p)
418{ 413{
419 return strvalue (car (p)); 414 return strvalue (p);
420} 415}
421 416
422#if USE_PLIST 417#if USE_PLIST
418#error plists are broken because symbols are no longer pairs
419#define symprop(p) cdr(p)
423SCHEME_EXPORT INLINE int 420SCHEME_EXPORT int
424hasprop (pointer p) 421hasprop (pointer p)
425{ 422{
426 return typeflag (p) & T_SYMBOL; 423 return typeflag (p) & T_SYMBOL;
427} 424}
428
429# define symprop(p) cdr(p)
430#endif 425#endif
431 426
432INTERFACE INLINE int 427INTERFACE int
433is_syntax (pointer p) 428is_syntax (pointer p)
434{ 429{
435 return typeflag (p) & T_SYNTAX; 430 return typeflag (p) & T_SYNTAX;
436} 431}
437 432
438INTERFACE INLINE int 433INTERFACE int
439is_proc (pointer p) 434is_proc (pointer p)
440{ 435{
441 return type (p) == T_PROC; 436 return type (p) == T_PROC;
442} 437}
443 438
444INTERFACE INLINE int 439INTERFACE int
445is_foreign (pointer p) 440is_foreign (pointer p)
446{ 441{
447 return type (p) == T_FOREIGN; 442 return type (p) == T_FOREIGN;
448} 443}
449 444
450INTERFACE INLINE char * 445INTERFACE char *
451syntaxname (pointer p) 446syntaxname (pointer p)
452{ 447{
453 return strvalue (car (p)); 448 return strvalue (p);
454} 449}
455 450
456#define procnum(p) ivalue (p) 451#define procnum(p) ivalue_unchecked (p)
457static const char *procname (pointer x); 452static const char *procname (pointer x);
458 453
459INTERFACE INLINE int 454INTERFACE int
460is_closure (pointer p) 455is_closure (pointer p)
461{ 456{
462 return type (p) == T_CLOSURE; 457 return type (p) == T_CLOSURE;
463} 458}
464 459
465INTERFACE INLINE int 460INTERFACE int
466is_macro (pointer p) 461is_macro (pointer p)
467{ 462{
468 return type (p) == T_MACRO; 463 return type (p) == T_MACRO;
469} 464}
470 465
471INTERFACE INLINE pointer 466INTERFACE pointer
472closure_code (pointer p) 467closure_code (pointer p)
473{ 468{
474 return car (p); 469 return car (p);
475} 470}
476 471
477INTERFACE INLINE pointer 472INTERFACE pointer
478closure_env (pointer p) 473closure_env (pointer p)
479{ 474{
480 return cdr (p); 475 return cdr (p);
481} 476}
482 477
483INTERFACE INLINE int 478INTERFACE int
484is_continuation (pointer p) 479is_continuation (pointer p)
485{ 480{
486 return type (p) == T_CONTINUATION; 481 return type (p) == T_CONTINUATION;
487} 482}
488 483
489#define cont_dump(p) cdr (p) 484#define cont_dump(p) cdr (p)
490#define set_cont_dump(p,v) set_cdr ((p), (v)) 485#define set_cont_dump(p,v) set_cdr ((p), (v))
491 486
492/* To do: promise should be forced ONCE only */ 487/* To do: promise should be forced ONCE only */
493INTERFACE INLINE int 488INTERFACE int
494is_promise (pointer p) 489is_promise (pointer p)
495{ 490{
496 return type (p) == T_PROMISE; 491 return type (p) == T_PROMISE;
497} 492}
498 493
499INTERFACE INLINE int 494INTERFACE int
500is_environment (pointer p) 495is_environment (pointer p)
501{ 496{
502 return type (p) == T_ENVIRONMENT; 497 return type (p) == T_ENVIRONMENT;
503} 498}
504 499
… …
510 505
511#define is_mark(p) (typeflag (p) & T_MARK) 506#define is_mark(p) (typeflag (p) & T_MARK)
512#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 507#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
513#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 508#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
514 509
515INTERFACE INLINE int 510INTERFACE int
516is_immutable (pointer p) 511is_immutable (pointer p)
517{ 512{
518 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 513 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
519} 514}
520 515
521INTERFACE INLINE void 516INTERFACE void
522setimmutable (pointer p) 517setimmutable (pointer p)
523{ 518{
524#if USE_ERROR_CHECKING 519#if USE_ERROR_CHECKING
525 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 520 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
526#endif 521#endif
527} 522}
528 523
524/* Result is:
525 proper list: length
526 circular list: -1
527 not even a pair: -2
528 dotted list: -2 minus length before dot
529*/
530INTERFACE int
531list_length (SCHEME_P_ pointer a)
532{
533 int i = 0;
534 pointer slow, fast;
535
536 slow = fast = a;
537
538 while (1)
539 {
540 if (fast == NIL)
541 return i;
542
543 if (!is_pair (fast))
544 return -2 - i;
545
546 fast = cdr (fast);
547 ++i;
548
549 if (fast == NIL)
550 return i;
551
552 if (!is_pair (fast))
553 return -2 - i;
554
555 ++i;
556 fast = cdr (fast);
557
558 /* Safe because we would have already returned if `fast'
559 encountered a non-pair. */
560 slow = cdr (slow);
561
562 if (fast == slow)
563 {
564 /* the fast pointer has looped back around and caught up
565 with the slow pointer, hence the structure is circular,
566 not of finite length, and therefore not a list */
567 return -1;
568 }
569 }
570}
571
572INTERFACE int
573is_list (SCHEME_P_ pointer a)
574{
575 return list_length (SCHEME_A_ a) >= 0;
576}
577
529#if USE_CHAR_CLASSIFIERS 578#if USE_CHAR_CLASSIFIERS
530static INLINE int 579ecb_inline int
531Cisalpha (int c) 580Cisalpha (int c)
532{ 581{
533 return isascii (c) && isalpha (c); 582 return isascii (c) && isalpha (c);
534} 583}
535 584
536static INLINE int 585ecb_inline int
537Cisdigit (int c) 586Cisdigit (int c)
538{ 587{
539 return isascii (c) && isdigit (c); 588 return isascii (c) && isdigit (c);
540} 589}
541 590
542static INLINE int 591ecb_inline int
543Cisspace (int c) 592Cisspace (int c)
544{ 593{
545 return isascii (c) && isspace (c); 594 return isascii (c) && isspace (c);
546} 595}
547 596
548static INLINE int 597ecb_inline int
549Cisupper (int c) 598Cisupper (int c)
550{ 599{
551 return isascii (c) && isupper (c); 600 return isascii (c) && isupper (c);
552} 601}
553 602
554static INLINE int 603ecb_inline int
555Cislower (int c) 604Cislower (int c)
556{ 605{
557 return isascii (c) && islower (c); 606 return isascii (c) && islower (c);
558} 607}
559#endif 608#endif
… …
620#endif 669#endif
621 670
622static int file_push (SCHEME_P_ const char *fname); 671static int file_push (SCHEME_P_ const char *fname);
623static void file_pop (SCHEME_P); 672static void file_pop (SCHEME_P);
624static int file_interactive (SCHEME_P); 673static int file_interactive (SCHEME_P);
625static INLINE int is_one_of (char *s, int c); 674ecb_inline int is_one_of (const char *s, int c);
626static int alloc_cellseg (SCHEME_P_ int n); 675static int alloc_cellseg (SCHEME_P_ int n);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 677static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 678static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 679static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 680static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 681static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
647static void mark (pointer a); 696static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 697static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 698static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 699static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 700static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 701static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 702static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 703ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 704static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 705static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 706static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 707static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 708static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 712static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 713static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 714static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 715static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 716static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
718static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 722static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
675static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 724static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
676static void assign_syntax (SCHEME_P_ const char *name); 725static void assign_syntax (SCHEME_P_ const char *name);
677static int syntaxnum (pointer p); 726static int syntaxnum (pointer p);
678static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 727static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
679 728
729static IVALUE
730ivalue (pointer x)
731{
732 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
733}
734
735static RVALUE
736rvalue (pointer x)
737{
738 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
739}
740
741INTERFACE num
742nvalue (pointer x)
743{
744 num n;
745
746 num_set_fixnum (n, is_integer (x));
747
748 if (num_is_fixnum (n))
749 num_set_ivalue (n, ivalue_unchecked (x));
750 else
751 num_set_rvalue (n, rvalue_unchecked (x));
752
753 return n;
754}
755
680static num 756static num
681num_op (enum num_op op, num a, num b) 757num_op (enum num_op op, num a, num b)
682{ 758{
683 num ret; 759 num ret;
684 760
685 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 761 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
686 762
687 if (num_is_fixnum (ret)) 763 if (num_is_fixnum (ret))
688 { 764 {
689 IVALUE av = num_get_ivalue (a);
690 IVALUE bv = num_get_ivalue (b);
691
692 switch (op) 765 switch (op)
693 { 766 {
694 case NUM_ADD: av += bv; break; 767 case NUM_ADD: a.ivalue += b.ivalue; break;
695 case NUM_SUB: av -= bv; break; 768 case NUM_SUB: a.ivalue -= b.ivalue; break;
696 case NUM_MUL: av *= bv; break; 769 case NUM_MUL: a.ivalue *= b.ivalue; break;
697 case NUM_INTDIV: av /= bv; break; 770 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
698 } 771 }
699 772
700 num_set_ivalue (ret, av); 773 num_set_ivalue (ret, a.ivalue);
701 } 774 }
775#if USE_REAL
702 else 776 else
703 { 777 {
704 RVALUE av = num_get_rvalue (a);
705 RVALUE bv = num_get_rvalue (b);
706
707 switch (op) 778 switch (op)
708 { 779 {
709 case NUM_ADD: av += bv; break; 780 case NUM_ADD: a.rvalue += b.rvalue; break;
710 case NUM_SUB: av -= bv; break; 781 case NUM_SUB: a.rvalue -= b.rvalue; break;
711 case NUM_MUL: av *= bv; break; 782 case NUM_MUL: a.rvalue *= b.rvalue; break;
712 case NUM_INTDIV: av /= bv; break; 783 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
713 } 784 }
714 785
715 num_set_rvalue (ret, av); 786 num_set_rvalue (ret, a.rvalue);
716 } 787 }
788#endif
717 789
718 return ret; 790 return ret;
719} 791}
720 792
721static num 793static num
722num_div (num a, num b) 794num_div (num a, num b)
723{ 795{
724 num ret; 796 num ret;
725 797
726 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 798 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
727 799
728 if (num_is_fixnum (ret)) 800 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 801 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
730 else 802 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 803 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
732 804
733 return ret; 805 return ret;
734} 806}
735 807
736static num 808static num
… …
738{ 810{
739 num ret; 811 num ret;
740 long e1, e2, res; 812 long e1, e2, res;
741 813
742 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 814 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
743 e1 = num_get_ivalue (a); 815 e1 = num_ivalue (a);
744 e2 = num_get_ivalue (b); 816 e2 = num_ivalue (b);
745 res = e1 % e2; 817 res = e1 % e2;
746 818
747 /* remainder should have same sign as second operand */ 819 /* remainder should have same sign as second operand */
748 if (res > 0) 820 if (res > 0)
749 { 821 {
… …
765{ 837{
766 num ret; 838 num ret;
767 long e1, e2, res; 839 long e1, e2, res;
768 840
769 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 841 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
770 e1 = num_get_ivalue (a); 842 e1 = num_ivalue (a);
771 e2 = num_get_ivalue (b); 843 e2 = num_ivalue (b);
772 res = e1 % e2; 844 res = e1 % e2;
773 845
774 /* modulo should have same sign as second operand */ 846 /* modulo should have same sign as second operand */
775 if (res * e2 < 0) 847 if (res * e2 < 0)
776 res += e2; 848 res += e2;
777 849
778 num_set_ivalue (ret, res); 850 num_set_ivalue (ret, res);
779 return ret; 851 return ret;
780} 852}
781 853
782/* this completely disrespects NaNs */ 854/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
783static int 855static int
784num_cmp (num a, num b) 856num_cmp (num a, num b)
785{ 857{
786 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 858 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 859 int ret;
788 860
789 if (is_fixnum) 861 if (is_fixnum)
790 { 862 {
791 IVALUE av = num_get_ivalue (a); 863 IVALUE av = num_ivalue (a);
792 IVALUE bv = num_get_ivalue (b); 864 IVALUE bv = num_ivalue (b);
793 865
794 ret = av == bv ? 0 : av < bv ? -1 : +1; 866 ret = av == bv ? 0 : av < bv ? -1 : +1;
795 } 867 }
796 else 868 else
797 { 869 {
798 RVALUE av = num_get_rvalue (a); 870 RVALUE av = num_rvalue (a);
799 RVALUE bv = num_get_rvalue (b); 871 RVALUE bv = num_rvalue (b);
800 872
801 ret = av == bv ? 0 : av < bv ? -1 : +1; 873 ret = av == bv ? 0 : av < bv ? -1 : +1;
802 } 874 }
803 875
804 return ret; 876 return ret;
… …
819 return ce; 891 return ce;
820 else if (dfl < dce) 892 else if (dfl < dce)
821 return fl; 893 return fl;
822 else 894 else
823 { 895 {
824 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 896 if (fmod (fl, 2) == 0) /* I imagine this holds */
825 return fl; 897 return fl;
826 else 898 else
827 return ce; 899 return ce;
828 } 900 }
829} 901}
830#endif 902#endif
831 903
832static int 904static int
833is_zero_rvalue (RVALUE x) 905is_zero_rvalue (RVALUE x)
834{ 906{
907 return x == 0;
908#if 0
835#if USE_REAL 909#if USE_REAL
836 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 910 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
837#else 911#else
838 return x == 0; 912 return x == 0;
913#endif
839#endif 914#endif
840} 915}
841 916
842/* allocate new cell segment */ 917/* allocate new cell segment */
843static int 918static int
… …
864 return k; 939 return k;
865 940
866 i = ++SCHEME_V->last_cell_seg; 941 i = ++SCHEME_V->last_cell_seg;
867 SCHEME_V->alloc_seg[i] = cp; 942 SCHEME_V->alloc_seg[i] = cp;
868 943
869 /* insert new segment in address order */
870 newp = (pointer)cp; 944 newp = (pointer)cp;
871 SCHEME_V->cell_seg[i] = newp; 945 SCHEME_V->cell_seg[i] = newp;
872 SCHEME_V->cell_segsize[i] = segsize; 946 SCHEME_V->cell_segsize[i] = segsize;
873
874 //TODO: insert, not swap
875 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
876 {
877 p = SCHEME_V->cell_seg[i];
878 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
879 SCHEME_V->cell_seg[i - 1] = p;
880
881 k = SCHEME_V->cell_segsize[i];
882 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
883 SCHEME_V->cell_segsize[i - 1] = k;
884
885 --i;
886 }
887
888 SCHEME_V->fcells += segsize; 947 SCHEME_V->fcells += segsize;
889 last = newp + segsize - 1; 948 last = newp + segsize - 1;
890 949
891 for (p = newp; p <= last; p++) 950 for (p = newp; p <= last; p++)
892 { 951 {
893 set_typeflag (p, T_FREE); 952 set_typeflag (p, T_PAIR);
894 set_car (p, NIL); 953 set_car (p, NIL);
895 set_cdr (p, p + 1); 954 set_cdr (p, p + 1);
896 } 955 }
897 956
898 /* insert new cells in address order on free list */
899 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
900 {
901 set_cdr (last, SCHEME_V->free_cell); 957 set_cdr (last, SCHEME_V->free_cell);
902 SCHEME_V->free_cell = newp; 958 SCHEME_V->free_cell = newp;
903 }
904 else
905 {
906 p = SCHEME_V->free_cell;
907
908 while (cdr (p) != NIL && newp > cdr (p))
909 p = cdr (p);
910
911 set_cdr (last, cdr (p));
912 set_cdr (p, newp);
913 }
914 } 959 }
915 960
916 return n; 961 return n;
917} 962}
918 963
919/* get new cell. parameter a, b is marked by gc. */ 964/* get new cell. parameter a, b is marked by gc. */
920static INLINE pointer 965ecb_inline pointer
921get_cell_x (SCHEME_P_ pointer a, pointer b) 966get_cell_x (SCHEME_P_ pointer a, pointer b)
922{ 967{
923 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 968 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
924 { 969 {
925 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
926 return S_SINK; 971 return S_SINK;
927 972
928 if (SCHEME_V->free_cell == NIL) 973 if (SCHEME_V->free_cell == NIL)
929 { 974 {
930 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 975 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
931 976
932 gc (SCHEME_A_ a, b); 977 gc (SCHEME_A_ a, b);
933 978
934 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 979 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
935 { 980 {
… …
986} 1031}
987 1032
988static pointer 1033static pointer
989get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1034get_vector_object (SCHEME_P_ uint32_t len, pointer init)
990{ 1035{
991 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1036 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
992 pointer *e = malloc (len * sizeof (pointer)); 1037 pointer *e = malloc (len * sizeof (pointer));
993 1038
994 if (!e && USE_ERROR_CHECKING) 1039 if (!e && USE_ERROR_CHECKING)
995 return S_SINK; 1040 return S_SINK;
996 1041
997 /* Record it as a vector so that gc understands it. */ 1042 /* Record it as a vector so that gc understands it. */
998 set_typeflag (v, T_VECTOR | T_ATOM); 1043 set_typeflag (v, T_VECTOR | T_ATOM);
999 1044
1000 v->object.vector.vvalue = e; 1045 v->object.vector.vvalue = e;
1001 v->object.vector.length = len; 1046 v->object.vector.length = len;
1002 fill_vector (v, init); 1047 fill_vector (v, 0, init);
1003 push_recent_alloc (SCHEME_A_ v, NIL); 1048 push_recent_alloc (SCHEME_A_ v, NIL);
1004 1049
1005 return v; 1050 return v;
1006} 1051}
1007 1052
1008static INLINE void 1053ecb_inline void
1009ok_to_freely_gc (SCHEME_P) 1054ok_to_freely_gc (SCHEME_P)
1010{ 1055{
1011 set_car (S_SINK, NIL); 1056 set_car (S_SINK, NIL);
1012} 1057}
1013 1058
… …
1050 set_cdr (x, b); 1095 set_cdr (x, b);
1051 1096
1052 return x; 1097 return x;
1053} 1098}
1054 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
1055/* ========== oblist implementation ========== */ 1109/* ========== oblist implementation ========== */
1056 1110
1057#ifndef USE_OBJECT_LIST 1111#ifndef USE_OBJECT_LIST
1058 1112
1113static int
1059static int hash_fn (const char *key, int table_size); 1114hash_fn (const char *key, int table_size)
1115{
1116 const unsigned char *p = key;
1117 uint32_t hash = 2166136261;
1118
1119 while (*p)
1120 hash = (hash ^ *p++) * 16777619;
1121
1122 return hash % table_size;
1123}
1060 1124
1061static pointer 1125static pointer
1062oblist_initial_value (SCHEME_P) 1126oblist_initial_value (SCHEME_P)
1063{ 1127{
1064 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1066 1130
1067/* returns the new symbol */ 1131/* returns the new symbol */
1068static pointer 1132static pointer
1069oblist_add_by_name (SCHEME_P_ const char *name) 1133oblist_add_by_name (SCHEME_P_ const char *name)
1070{ 1134{
1071 int location; 1135 pointer x = generate_symbol (SCHEME_A_ name);
1072
1073 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1074 set_typeflag (x, T_SYMBOL);
1075 setimmutable (car (x));
1076
1077 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1136 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1078 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1137 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1079 return x; 1138 return x;
1080} 1139}
1081 1140
1082static INLINE pointer 1141ecb_inline pointer
1083oblist_find_by_name (SCHEME_P_ const char *name) 1142oblist_find_by_name (SCHEME_P_ const char *name)
1084{ 1143{
1085 int location; 1144 int location;
1086 pointer x; 1145 pointer x;
1087 char *s; 1146 char *s;
1088 1147
1089 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1148 location = hash_fn (name, veclength (SCHEME_V->oblist));
1090 1149
1091 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1150 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1092 { 1151 {
1093 s = symname (car (x)); 1152 s = symname (car (x));
1094 1153
1095 /* case-insensitive, per R5RS section 2 */ 1154 /* case-insensitive, per R5RS section 2 */
1096 if (stricmp (name, s) == 0) 1155 if (stricmp (name, s) == 0)
… …
1106 int i; 1165 int i;
1107 pointer x; 1166 pointer x;
1108 pointer ob_list = NIL; 1167 pointer ob_list = NIL;
1109 1168
1110 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1169 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1111 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1170 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1112 ob_list = cons (x, ob_list); 1171 ob_list = cons (x, ob_list);
1113 1172
1114 return ob_list; 1173 return ob_list;
1115} 1174}
1116 1175
… …
1120oblist_initial_value (SCHEME_P) 1179oblist_initial_value (SCHEME_P)
1121{ 1180{
1122 return NIL; 1181 return NIL;
1123} 1182}
1124 1183
1125static INLINE pointer 1184ecb_inline pointer
1126oblist_find_by_name (SCHEME_P_ const char *name) 1185oblist_find_by_name (SCHEME_P_ const char *name)
1127{ 1186{
1128 pointer x; 1187 pointer x;
1129 char *s; 1188 char *s;
1130 1189
… …
1142 1201
1143/* returns the new symbol */ 1202/* returns the new symbol */
1144static pointer 1203static pointer
1145oblist_add_by_name (SCHEME_P_ const char *name) 1204oblist_add_by_name (SCHEME_P_ const char *name)
1146{ 1205{
1147 pointer x; 1206 pointer x = generate_symbol (SCHEME_A_ name);
1148
1149 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1150 set_typeflag (x, T_SYMBOL);
1151 setimmutable (car (x));
1152 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1153 return x; 1208 return x;
1154} 1209}
1155 1210
1156static pointer 1211static pointer
… …
1177pointer 1232pointer
1178mk_foreign_func (SCHEME_P_ foreign_func f) 1233mk_foreign_func (SCHEME_P_ foreign_func f)
1179{ 1234{
1180 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1235 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1181 1236
1182 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1237 set_typeflag (x, T_FOREIGN | T_ATOM);
1183 x->object.ff = f; 1238 x->object.ff = f;
1184 1239
1185 return x; 1240 return x;
1186} 1241}
1187 1242
1188INTERFACE pointer 1243INTERFACE pointer
1189mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1190{ 1245{
1191 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1192 1247
1193 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, T_CHARACTER | T_ATOM);
1194 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1195 set_num_integer (x); 1250
1196 return x; 1251 return x;
1197} 1252}
1198 1253
1199/* get number atom (integer) */ 1254/* get number atom (integer) */
1200INTERFACE pointer 1255INTERFACE pointer
1201mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1202{ 1257{
1258 pointer p = 0;
1259 pointer *pp = &p;
1260
1261#if USE_INTCACHE
1262 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1263 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1264#endif
1265
1266 if (!*pp)
1267 {
1203 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1204 1269
1205 set_typeflag (x, (T_NUMBER | T_ATOM)); 1270 set_typeflag (x, T_INTEGER | T_ATOM);
1206 ivalue_unchecked (x) = num; 1271 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1207 set_num_integer (x); 1272 set_ivalue (x, n);
1273
1274 *pp = x;
1275 }
1276
1208 return x; 1277 return *pp;
1209} 1278}
1210 1279
1211INTERFACE pointer 1280INTERFACE pointer
1212mk_real (SCHEME_P_ RVALUE n) 1281mk_real (SCHEME_P_ RVALUE n)
1213{ 1282{
1283#if USE_REAL
1214 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1284 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1215 1285
1216 set_typeflag (x, (T_NUMBER | T_ATOM)); 1286 set_typeflag (x, T_REAL | T_ATOM);
1217 rvalue_unchecked (x) = n; 1287 set_rvalue (x, n);
1218 set_num_real (x); 1288
1219 return x; 1289 return x;
1290#else
1291 return mk_integer (SCHEME_A_ n);
1292#endif
1220} 1293}
1221 1294
1222static pointer 1295static pointer
1223mk_number (SCHEME_P_ const num n) 1296mk_number (SCHEME_P_ const num n)
1224{ 1297{
1298#if USE_REAL
1225 if (num_is_fixnum (n)) 1299 return num_is_fixnum (n)
1300 ? mk_integer (SCHEME_A_ num_ivalue (n))
1301 : mk_real (SCHEME_A_ num_rvalue (n));
1302#else
1226 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1303 return mk_integer (SCHEME_A_ num_ivalue (n));
1227 else 1304#endif
1228 return mk_real (SCHEME_A_ num_get_rvalue (n));
1229} 1305}
1230 1306
1231/* allocate name to string area */ 1307/* allocate name to string area */
1232static char * 1308static char *
1233store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1309store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1239 SCHEME_V->no_memory = 1; 1315 SCHEME_V->no_memory = 1;
1240 return SCHEME_V->strbuff; 1316 return SCHEME_V->strbuff;
1241 } 1317 }
1242 1318
1243 if (str) 1319 if (str)
1244 { 1320 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1245 int l = strlen (str);
1246
1247 if (l > len_str)
1248 l = len_str;
1249
1250 memcpy (q, str, l);
1251 q[l] = 0;
1252 }
1253 else 1321 else
1254 {
1255 memset (q, fill, len_str); 1322 memset (q, fill, len_str);
1323
1256 q[len_str] = 0; 1324 q[len_str] = 0;
1257 }
1258 1325
1259 return q; 1326 return q;
1260} 1327}
1261 1328
1262INTERFACE pointer 1329INTERFACE pointer
… …
1276 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1343 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1277 1344
1278 set_typeflag (x, T_STRING | T_ATOM); 1345 set_typeflag (x, T_STRING | T_ATOM);
1279 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1346 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1280 strlength (x) = len; 1347 strlength (x) = len;
1348
1281 return x; 1349 return x;
1282} 1350}
1283 1351
1284INTERFACE pointer 1352INTERFACE pointer
1285mk_string (SCHEME_P_ const char *str) 1353mk_string (SCHEME_P_ const char *str)
… …
1292{ 1360{
1293 return get_vector_object (SCHEME_A_ len, NIL); 1361 return get_vector_object (SCHEME_A_ len, NIL);
1294} 1362}
1295 1363
1296INTERFACE void 1364INTERFACE void
1297fill_vector (pointer vec, pointer obj) 1365fill_vector (pointer vec, uint32_t start, pointer obj)
1298{ 1366{
1299 int i; 1367 int i;
1300 1368
1301 for (i = 0; i < vec->object.vector.length; i++) 1369 for (i = start; i < veclength (vec); i++)
1302 vecvalue (vec)[i] = obj; 1370 vecvalue (vec)[i] = obj;
1303} 1371}
1304 1372
1373INTERFACE void
1374vector_resize (pointer vec, uint32_t newsize, pointer fill)
1375{
1376 uint32_t oldsize = veclength (vec);
1377 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1378 veclength (vec) = newsize;
1379 fill_vector (vec, oldsize, fill);
1380}
1381
1305INTERFACE pointer 1382INTERFACE pointer
1306vector_elem (pointer vec, uint32_t ielem) 1383vector_get (pointer vec, uint32_t ielem)
1307{ 1384{
1308 return vecvalue(vec)[ielem]; 1385 return vecvalue(vec)[ielem];
1309} 1386}
1310 1387
1311INTERFACE void 1388INTERFACE void
1312set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1389vector_set (pointer vec, uint32_t ielem, pointer a)
1313{ 1390{
1314 vecvalue(vec)[ielem] = a; 1391 vecvalue(vec)[ielem] = a;
1315} 1392}
1316 1393
1317/* get new symbol */ 1394/* get new symbol */
… …
1329 1406
1330INTERFACE pointer 1407INTERFACE pointer
1331gensym (SCHEME_P) 1408gensym (SCHEME_P)
1332{ 1409{
1333 pointer x; 1410 pointer x;
1334
1335 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1336 {
1337 char name[40] = "gensym-"; 1411 char name[40] = "gensym-";
1338 xnum (name + 7, SCHEME_V->gensym_cnt); 1412 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1339 1413
1340 /* first check oblist */ 1414 return generate_symbol (SCHEME_A_ name);
1341 x = oblist_find_by_name (SCHEME_A_ name); 1415}
1342 1416
1343 if (x == NIL) 1417static int
1344 { 1418is_gensym (SCHEME_P_ pointer x)
1345 x = oblist_add_by_name (SCHEME_A_ name); 1419{
1346 return x; 1420 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1347 }
1348 }
1349
1350 return NIL;
1351} 1421}
1352 1422
1353/* make symbol or number atom from string */ 1423/* make symbol or number atom from string */
1354static pointer 1424static pointer
1355mk_atom (SCHEME_P_ char *q) 1425mk_atom (SCHEME_P_ char *q)
… …
1409 } 1479 }
1410 else if ((c == 'e') || (c == 'E')) 1480 else if ((c == 'e') || (c == 'E'))
1411 { 1481 {
1412 if (!has_fp_exp) 1482 if (!has_fp_exp)
1413 { 1483 {
1414 has_dec_point = 1; /* decimal point illegal 1484 has_dec_point = 1; /* decimal point illegal from now on */
1415 from now on */
1416 p++; 1485 p++;
1417 1486
1418 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1487 if ((*p == '-') || (*p == '+') || isdigit (*p))
1419 continue; 1488 continue;
1420 } 1489 }
… …
1508 1577
1509 if (ecb_expect_false (is_vector (p))) 1578 if (ecb_expect_false (is_vector (p)))
1510 { 1579 {
1511 int i; 1580 int i;
1512 1581
1513 for (i = 0; i < p->object.vector.length; i++) 1582 for (i = 0; i < veclength (p); i++)
1514 mark (vecvalue (p)[i]); 1583 mark (vecvalue (p)[i]);
1515 } 1584 }
1516 1585
1517 if (is_atom (p)) 1586 if (is_atom (p))
1518 goto E6; 1587 goto E6;
… …
1591 /* Mark recent objects the interpreter doesn't know about yet. */ 1660 /* Mark recent objects the interpreter doesn't know about yet. */
1592 mark (car (S_SINK)); 1661 mark (car (S_SINK));
1593 /* Mark any older stuff above nested C calls */ 1662 /* Mark any older stuff above nested C calls */
1594 mark (SCHEME_V->c_nest); 1663 mark (SCHEME_V->c_nest);
1595 1664
1665#if USE_INTCACHE
1666 /* mark intcache */
1667 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1668 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1669 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1670#endif
1671
1596 /* mark variables a, b */ 1672 /* mark variables a, b */
1597 mark (a); 1673 mark (a);
1598 mark (b); 1674 mark (b);
1599 1675
1600 /* garbage collect */ 1676 /* garbage collect */
1601 clrmark (NIL); 1677 clrmark (NIL);
1602 SCHEME_V->fcells = 0; 1678 SCHEME_V->fcells = 0;
1603 SCHEME_V->free_cell = NIL; 1679 SCHEME_V->free_cell = NIL;
1604 1680
1605 /* free-list is kept sorted by address so as to maintain consecutive 1681 if (SCHEME_V->gc_verbose)
1606 ranges, if possible, for use with vectors. Here we scan the cells 1682 xwrstr ("freeing...");
1607 (which are also kept sorted by address) downwards to build the 1683
1608 free-list in sorted order. 1684 uint32_t total = 0;
1609 */ 1685
1686 /* Here we scan the cells to build the free-list. */
1610 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1687 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1611 { 1688 {
1612 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1689 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1690 total += SCHEME_V->cell_segsize [i];
1613 1691
1614 while (--p >= SCHEME_V->cell_seg[i]) 1692 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1615 { 1693 {
1616 if (is_mark (p)) 1694 if (is_mark (p))
1617 clrmark (p); 1695 clrmark (p);
1618 else 1696 else
1619 { 1697 {
1620 /* reclaim cell */ 1698 /* reclaim cell */
1621 if (typeflag (p) != T_FREE) 1699 if (typeflag (p) != T_PAIR)
1622 { 1700 {
1623 finalize_cell (SCHEME_A_ p); 1701 finalize_cell (SCHEME_A_ p);
1624 set_typeflag (p, T_FREE); 1702 set_typeflag (p, T_PAIR);
1625 set_car (p, NIL); 1703 set_car (p, NIL);
1626 } 1704 }
1627 1705
1628 ++SCHEME_V->fcells; 1706 ++SCHEME_V->fcells;
1629 set_cdr (p, SCHEME_V->free_cell); 1707 set_cdr (p, SCHEME_V->free_cell);
… …
1631 } 1709 }
1632 } 1710 }
1633 } 1711 }
1634 1712
1635 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1714 {
1636 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1716 }
1637} 1717}
1638 1718
1639static void 1719static void
1640finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1641{ 1721{
1642 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1643 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1644 free (strvalue (a)); 1724 free (strvalue (a));
1645 else if (is_vector (a)) 1725 else if (is_vector (a))
1646 free (vecvalue (a)); 1726 free (vecvalue (a));
1647#if USE_PORTS 1727#if USE_PORTS
1648 else if (is_port (a)) 1728 else if (is_port (a))
… …
2070#endif 2150#endif
2071} 2151}
2072 2152
2073/* read characters up to delimiter, but cater to character constants */ 2153/* read characters up to delimiter, but cater to character constants */
2074static char * 2154static char *
2075readstr_upto (SCHEME_P_ char *delim) 2155readstr_upto (SCHEME_P_ int skip, const char *delim)
2076{ 2156{
2077 char *p = SCHEME_V->strbuff; 2157 char *p = SCHEME_V->strbuff + skip;
2078 2158
2079 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2159 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2080 2160
2081 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2161 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2082 *p = 0; 2162 *p = 0;
… …
2089 return SCHEME_V->strbuff; 2169 return SCHEME_V->strbuff;
2090} 2170}
2091 2171
2092/* read string expression "xxx...xxx" */ 2172/* read string expression "xxx...xxx" */
2093static pointer 2173static pointer
2094readstrexp (SCHEME_P) 2174readstrexp (SCHEME_P_ char delim)
2095{ 2175{
2096 char *p = SCHEME_V->strbuff; 2176 char *p = SCHEME_V->strbuff;
2097 int c; 2177 int c;
2098 int c1 = 0; 2178 int c1 = 0;
2099 enum
2100 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2179 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2101 2180
2102 for (;;) 2181 for (;;)
2103 { 2182 {
2104 c = inchar (SCHEME_A); 2183 c = inchar (SCHEME_A);
2105 2184
… …
2107 return S_F; 2186 return S_F;
2108 2187
2109 switch (state) 2188 switch (state)
2110 { 2189 {
2111 case st_ok: 2190 case st_ok:
2112 switch (c) 2191 if (ecb_expect_false (c == delim))
2113 {
2114 case '\\':
2115 state = st_bsl;
2116 break;
2117
2118 case '"':
2119 *p = 0;
2120 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2192 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2121 2193
2122 default: 2194 if (ecb_expect_false (c == '\\'))
2195 state = st_bsl;
2196 else
2123 *p++ = c; 2197 *p++ = c;
2124 break;
2125 }
2126 2198
2127 break; 2199 break;
2128 2200
2129 case st_bsl: 2201 case st_bsl:
2130 switch (c) 2202 switch (c)
… …
2160 case 'r': 2232 case 'r':
2161 *p++ = '\r'; 2233 *p++ = '\r';
2162 state = st_ok; 2234 state = st_ok;
2163 break; 2235 break;
2164 2236
2165 case '"':
2166 *p++ = '"';
2167 state = st_ok;
2168 break;
2169
2170 default: 2237 default:
2171 *p++ = c; 2238 *p++ = c;
2172 state = st_ok; 2239 state = st_ok;
2173 break; 2240 break;
2174 } 2241 }
2175 2242
2176 break; 2243 break;
2177 2244
2178 case st_x1: 2245 case st_x1:
2179 case st_x2: 2246 case st_x2:
2180 c = toupper (c); 2247 c = tolower (c);
2181 2248
2182 if (c >= '0' && c <= 'F') 2249 if (c >= '0' && c <= '9')
2183 {
2184 if (c <= '9')
2185 c1 = (c1 << 4) + c - '0'; 2250 c1 = (c1 << 4) + c - '0';
2186 else 2251 else if (c >= 'a' && c <= 'f')
2187 c1 = (c1 << 4) + c - 'A' + 10; 2252 c1 = (c1 << 4) + c - 'a' + 10;
2188
2189 if (state == st_x1)
2190 state = st_x2;
2191 else
2192 {
2193 *p++ = c1;
2194 state = st_ok;
2195 }
2196 }
2197 else 2253 else
2198 return S_F; 2254 return S_F;
2255
2256 if (state == st_x1)
2257 state = st_x2;
2258 else
2259 {
2260 *p++ = c1;
2261 state = st_ok;
2262 }
2199 2263
2200 break; 2264 break;
2201 2265
2202 case st_oct1: 2266 case st_oct1:
2203 case st_oct2: 2267 case st_oct2:
… …
2207 backchar (SCHEME_A_ c); 2271 backchar (SCHEME_A_ c);
2208 state = st_ok; 2272 state = st_ok;
2209 } 2273 }
2210 else 2274 else
2211 { 2275 {
2212 if (state == st_oct2 && c1 >= 32) 2276 if (state == st_oct2 && c1 >= ' ')
2213 return S_F; 2277 return S_F;
2214 2278
2215 c1 = (c1 << 3) + (c - '0'); 2279 c1 = (c1 << 3) + (c - '0');
2216 2280
2217 if (state == st_oct1) 2281 if (state == st_oct1)
… …
2222 state = st_ok; 2286 state = st_ok;
2223 } 2287 }
2224 } 2288 }
2225 2289
2226 break; 2290 break;
2227
2228 } 2291 }
2229 } 2292 }
2230} 2293}
2231 2294
2232/* check c is in chars */ 2295/* check c is in chars */
2233static INLINE int 2296ecb_inline int
2234is_one_of (char *s, int c) 2297is_one_of (const char *s, int c)
2235{ 2298{
2236 if (c == EOF)
2237 return 1;
2238
2239 return !!strchr (s, c); 2299 return c == EOF || !!strchr (s, c);
2240} 2300}
2241 2301
2242/* skip white characters */ 2302/* skip white characters */
2243static INLINE int 2303ecb_inline int
2244skipspace (SCHEME_P) 2304skipspace (SCHEME_P)
2245{ 2305{
2246 int c, curr_line = 0; 2306 int c, curr_line = 0;
2247 2307
2248 do 2308 do
2249 { 2309 {
2250 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2311
2251#if SHOW_ERROR_LINE 2312#if SHOW_ERROR_LINE
2252 if (c == '\n') 2313 if (ecb_expect_false (c == '\n'))
2253 curr_line++; 2314 curr_line++;
2254#endif 2315#endif
2316
2317 if (ecb_expect_false (c == EOF))
2318 return c;
2255 } 2319 }
2256 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2320 while (is_one_of (WHITESPACE, c));
2257 2321
2258 /* record it */ 2322 /* record it */
2259#if SHOW_ERROR_LINE 2323#if SHOW_ERROR_LINE
2260 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2324 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2261 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2325 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2262#endif 2326#endif
2263 2327
2264 if (c != EOF)
2265 {
2266 backchar (SCHEME_A_ c); 2328 backchar (SCHEME_A_ c);
2267 return 1; 2329 return 1;
2268 }
2269 else
2270 return EOF;
2271} 2330}
2272 2331
2273/* get token */ 2332/* get token */
2274static int 2333static int
2275token (SCHEME_P) 2334token (SCHEME_P)
… …
2291 return TOK_RPAREN; 2350 return TOK_RPAREN;
2292 2351
2293 case '.': 2352 case '.':
2294 c = inchar (SCHEME_A); 2353 c = inchar (SCHEME_A);
2295 2354
2296 if (is_one_of (" \n\t", c)) 2355 if (is_one_of (WHITESPACE, c))
2297 return TOK_DOT; 2356 return TOK_DOT;
2298 else 2357 else
2299 { 2358 {
2300 //TODO: ungetc twice in a row is not supported in C
2301 backchar (SCHEME_A_ c); 2359 backchar (SCHEME_A_ c);
2302 backchar (SCHEME_A_ '.');
2303 return TOK_ATOM; 2360 return TOK_DOTATOM;
2304 } 2361 }
2362
2363 case '|':
2364 return TOK_STRATOM;
2305 2365
2306 case '\'': 2366 case '\'':
2307 return TOK_QUOTE; 2367 return TOK_QUOTE;
2308 2368
2309 case ';': 2369 case ';':
… …
2441 } 2501 }
2442 2502
2443 putcharacter (SCHEME_A_ '"'); 2503 putcharacter (SCHEME_A_ '"');
2444} 2504}
2445 2505
2446
2447/* print atoms */ 2506/* print atoms */
2448static void 2507static void
2449printatom (SCHEME_P_ pointer l, int f) 2508printatom (SCHEME_P_ pointer l, int f)
2450{ 2509{
2451 char *p; 2510 char *p;
2452 int len; 2511 int len;
2453 2512
2454 atom2str (SCHEME_A_ l, f, &p, &len); 2513 atom2str (SCHEME_A_ l, f, &p, &len);
2455 putchars (SCHEME_A_ p, len); 2514 putchars (SCHEME_A_ p, len);
2456} 2515}
2457
2458 2516
2459/* Uses internal buffer unless string pointer is already available */ 2517/* Uses internal buffer unless string pointer is already available */
2460static void 2518static void
2461atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2519atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2462{ 2520{
… …
2476 { 2534 {
2477 p = SCHEME_V->strbuff; 2535 p = SCHEME_V->strbuff;
2478 2536
2479 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2537 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2480 { 2538 {
2481 if (num_is_integer (l)) 2539 if (is_integer (l))
2482 xnum (p, ivalue_unchecked (l)); 2540 xnum (p, ivalue_unchecked (l));
2483#if USE_REAL 2541#if USE_REAL
2484 else 2542 else
2485 { 2543 {
2486 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2544 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2623#endif 2681#endif
2624 } 2682 }
2625 else if (is_continuation (l)) 2683 else if (is_continuation (l))
2626 p = "#<CONTINUATION>"; 2684 p = "#<CONTINUATION>";
2627 else 2685 else
2686 {
2687#if USE_PRINTF
2688 p = SCHEME_V->strbuff;
2689 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2690#else
2628 p = "#<ERROR>"; 2691 p = "#<ERROR>";
2692#endif
2693 }
2629 2694
2630 *pp = p; 2695 *pp = p;
2631 *plen = strlen (p); 2696 *plen = strlen (p);
2632} 2697}
2633 2698
… …
2741 return 0; 2806 return 0;
2742 } 2807 }
2743 else if (is_number (a)) 2808 else if (is_number (a))
2744 { 2809 {
2745 if (is_number (b)) 2810 if (is_number (b))
2746 if (num_is_integer (a) == num_is_integer (b))
2747 return num_cmp (nvalue (a), nvalue (b)) == 0; 2811 return num_cmp (nvalue (a), nvalue (b)) == 0;
2748 2812
2749 return 0; 2813 return 0;
2750 } 2814 }
2751 else if (is_character (a)) 2815 else if (is_character (a))
2752 { 2816 {
… …
2778/* () is #t in R5RS */ 2842/* () is #t in R5RS */
2779#define is_true(p) ((p) != S_F) 2843#define is_true(p) ((p) != S_F)
2780#define is_false(p) ((p) == S_F) 2844#define is_false(p) ((p) == S_F)
2781 2845
2782/* ========== Environment implementation ========== */ 2846/* ========== Environment implementation ========== */
2783
2784#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2785
2786static int
2787hash_fn (const char *key, int table_size)
2788{
2789 const unsigned char *p = key;
2790 uint32_t hash = 2166136261;
2791
2792 while (*p)
2793 hash = (hash ^ *p++) * 16777619;
2794
2795 return hash % table_size;
2796}
2797#endif
2798 2847
2799#ifndef USE_ALIST_ENV 2848#ifndef USE_ALIST_ENV
2800 2849
2801/* 2850/*
2802 * In this implementation, each frame of the environment may be 2851 * In this implementation, each frame of the environment may be
… …
2819 2868
2820 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2869 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2821 setenvironment (SCHEME_V->envir); 2870 setenvironment (SCHEME_V->envir);
2822} 2871}
2823 2872
2824static INLINE void 2873static uint32_t
2874sym_hash (pointer sym, uint32_t size)
2875{
2876 uintptr_t ptr = (uintptr_t)sym;
2877
2878#if 0
2879 /* table size is prime, so why mix */
2880 ptr += ptr >> 32;
2881 ptr += ptr >> 16;
2882 ptr += ptr >> 8;
2883#endif
2884
2885 return ptr % size;
2886}
2887
2888ecb_inline void
2825new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2889new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2826{ 2890{
2827 pointer slot = immutable_cons (variable, value); 2891 pointer slot = immutable_cons (variable, value);
2828 2892
2829 if (is_vector (car (env))) 2893 if (is_vector (car (env)))
2830 { 2894 {
2831 int location = hash_fn (symname (variable), veclength (car (env))); 2895 int location = sym_hash (variable, veclength (car (env)));
2832
2833 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2896 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2834 } 2897 }
2835 else 2898 else
2836 set_car (env, immutable_cons (slot, car (env))); 2899 set_car (env, immutable_cons (slot, car (env)));
2837} 2900}
2838 2901
2839static pointer 2902static pointer
2840find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2903find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2841{ 2904{
2842 pointer x, y; 2905 pointer x, y;
2843 int location;
2844 2906
2845 for (x = env; x != NIL; x = cdr (x)) 2907 for (x = env; x != NIL; x = cdr (x))
2846 { 2908 {
2847 if (is_vector (car (x))) 2909 if (is_vector (car (x)))
2848 { 2910 {
2849 location = hash_fn (symname (hdl), veclength (car (x))); 2911 int location = sym_hash (hdl, veclength (car (x)));
2850 y = vector_elem (car (x), location); 2912 y = vector_get (car (x), location);
2851 } 2913 }
2852 else 2914 else
2853 y = car (x); 2915 y = car (x);
2854 2916
2855 for (; y != NIL; y = cdr (y)) 2917 for (; y != NIL; y = cdr (y))
2856 if (caar (y) == hdl) 2918 if (caar (y) == hdl)
2857 break; 2919 break;
2858 2920
2859 if (y != NIL) 2921 if (y != NIL)
2922 return car (y);
2923
2924 if (!all)
2860 break; 2925 break;
2861
2862 if (!all)
2863 return NIL;
2864 } 2926 }
2865
2866 if (x != NIL)
2867 return car (y);
2868 2927
2869 return NIL; 2928 return NIL;
2870} 2929}
2871 2930
2872#else /* USE_ALIST_ENV */ 2931#else /* USE_ALIST_ENV */
2873 2932
2874static INLINE void 2933ecb_inline void
2875new_frame_in_env (SCHEME_P_ pointer old_env) 2934new_frame_in_env (SCHEME_P_ pointer old_env)
2876{ 2935{
2877 SCHEME_V->envir = immutable_cons (NIL, old_env); 2936 SCHEME_V->envir = immutable_cons (NIL, old_env);
2878 setenvironment (SCHEME_V->envir); 2937 setenvironment (SCHEME_V->envir);
2879} 2938}
2880 2939
2881static INLINE void 2940ecb_inline void
2882new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2941new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2883{ 2942{
2884 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2943 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2885} 2944}
2886 2945
… …
2894 for (y = car (x); y != NIL; y = cdr (y)) 2953 for (y = car (x); y != NIL; y = cdr (y))
2895 if (caar (y) == hdl) 2954 if (caar (y) == hdl)
2896 break; 2955 break;
2897 2956
2898 if (y != NIL) 2957 if (y != NIL)
2958 return car (y);
2899 break; 2959 break;
2900 2960
2901 if (!all) 2961 if (!all)
2902 return NIL; 2962 break;
2903 } 2963 }
2904
2905 if (x != NIL)
2906 return car (y);
2907 2964
2908 return NIL; 2965 return NIL;
2909} 2966}
2910 2967
2911#endif /* USE_ALIST_ENV else */ 2968#endif /* USE_ALIST_ENV else */
2912 2969
2913static INLINE void 2970ecb_inline void
2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2971new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2915{ 2972{
2973 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2916 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2974 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2917} 2975}
2918 2976
2919static INLINE void 2977ecb_inline void
2920set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2978set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2921{ 2979{
2922 set_cdr (slot, value); 2980 set_cdr (slot, value);
2923} 2981}
2924 2982
2925static INLINE pointer 2983ecb_inline pointer
2926slot_value_in_env (pointer slot) 2984slot_value_in_env (pointer slot)
2927{ 2985{
2928 return cdr (slot); 2986 return cdr (slot);
2929} 2987}
2930 2988
2931/* ========== Evaluation Cycle ========== */ 2989/* ========== Evaluation Cycle ========== */
2932 2990
2933static pointer 2991static int
2934xError_1 (SCHEME_P_ const char *s, pointer a) 2992xError_1 (SCHEME_P_ const char *s, pointer a)
2935{ 2993{
2936#if USE_ERROR_HOOK 2994#if USE_ERROR_HOOK
2937 pointer x; 2995 pointer x;
2938 pointer hdl = SCHEME_V->ERROR_HOOK; 2996 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2973 code = cons (mk_string (SCHEME_A_ s), code); 3031 code = cons (mk_string (SCHEME_A_ s), code);
2974 setimmutable (car (code)); 3032 setimmutable (car (code));
2975 SCHEME_V->code = cons (slot_value_in_env (x), code); 3033 SCHEME_V->code = cons (slot_value_in_env (x), code);
2976 SCHEME_V->op = OP_EVAL; 3034 SCHEME_V->op = OP_EVAL;
2977 3035
2978 return S_T; 3036 return 0;
2979 } 3037 }
2980#endif 3038#endif
2981 3039
2982 if (a) 3040 if (a)
2983 SCHEME_V->args = cons (a, NIL); 3041 SCHEME_V->args = cons (a, NIL);
… …
2985 SCHEME_V->args = NIL; 3043 SCHEME_V->args = NIL;
2986 3044
2987 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3045 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2988 setimmutable (car (SCHEME_V->args)); 3046 setimmutable (car (SCHEME_V->args));
2989 SCHEME_V->op = OP_ERR0; 3047 SCHEME_V->op = OP_ERR0;
3048
2990 return S_T; 3049 return 0;
2991} 3050}
2992 3051
2993#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3052#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2994#define Error_0(s) Error_1 (s, 0) 3053#define Error_0(s) Error_1 (s, 0)
2995 3054
2996/* Too small to turn into function */ 3055/* Too small to turn into function */
2997#define BEGIN do { 3056#define BEGIN do {
2998#define END } while (0) 3057#define END } while (0)
2999#define s_goto(a) BEGIN \ 3058#define s_goto(a) BEGIN \
3000 SCHEME_V->op = a; \ 3059 SCHEME_V->op = a; \
3001 return S_T; END 3060 return 0; END
3002 3061
3003#define s_return(a) return xs_return (SCHEME_A_ a) 3062#define s_return(a) return xs_return (SCHEME_A_ a)
3004 3063
3005#ifndef USE_SCHEME_STACK 3064#ifndef USE_SCHEME_STACK
3006 3065
… …
3031 next_frame = SCHEME_V->dump_base + nframes; 3090 next_frame = SCHEME_V->dump_base + nframes;
3032 3091
3033 next_frame->op = op; 3092 next_frame->op = op;
3034 next_frame->args = args; 3093 next_frame->args = args;
3035 next_frame->envir = SCHEME_V->envir; 3094 next_frame->envir = SCHEME_V->envir;
3036 next_frame->code = code; 3095 next_frame->code = code;
3037 3096
3038 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3097 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3039} 3098}
3040 3099
3041static pointer 3100static int
3042xs_return (SCHEME_P_ pointer a) 3101xs_return (SCHEME_P_ pointer a)
3043{ 3102{
3044 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3045 struct dump_stack_frame *frame; 3104 struct dump_stack_frame *frame;
3046 3105
3047 SCHEME_V->value = a; 3106 SCHEME_V->value = a;
3048 3107
3049 if (nframes <= 0) 3108 if (nframes <= 0)
3050 return NIL; 3109 return -1;
3051 3110
3052 frame = &SCHEME_V->dump_base[--nframes]; 3111 frame = &SCHEME_V->dump_base[--nframes];
3053 SCHEME_V->op = frame->op; 3112 SCHEME_V->op = frame->op;
3054 SCHEME_V->args = frame->args; 3113 SCHEME_V->args = frame->args;
3055 SCHEME_V->envir = frame->envir; 3114 SCHEME_V->envir = frame->envir;
3056 SCHEME_V->code = frame->code; 3115 SCHEME_V->code = frame->code;
3057 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3116 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3058 3117
3059 return S_T; 3118 return 0;
3060} 3119}
3061 3120
3062static INLINE void 3121ecb_inline void
3063dump_stack_reset (SCHEME_P) 3122dump_stack_reset (SCHEME_P)
3064{ 3123{
3065 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3124 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3066 SCHEME_V->dump = (pointer)+0; 3125 SCHEME_V->dump = (pointer)+0;
3067} 3126}
3068 3127
3069static INLINE void 3128ecb_inline void
3070dump_stack_initialize (SCHEME_P) 3129dump_stack_initialize (SCHEME_P)
3071{ 3130{
3072 SCHEME_V->dump_size = 0; 3131 SCHEME_V->dump_size = 0;
3073 SCHEME_V->dump_base = 0; 3132 SCHEME_V->dump_base = 0;
3074 dump_stack_reset (SCHEME_A); 3133 dump_stack_reset (SCHEME_A);
… …
3127 int i = 0; 3186 int i = 0;
3128 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3187 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3129 3188
3130 while (cont != NIL) 3189 while (cont != NIL)
3131 { 3190 {
3132 frame->op = ivalue (car (cont)); cont = cdr (cont); 3191 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3133 frame->args = car (cont) ; cont = cdr (cont); 3192 frame->args = car (cont) ; cont = cdr (cont);
3134 frame->envir = car (cont) ; cont = cdr (cont); 3193 frame->envir = car (cont) ; cont = cdr (cont);
3135 frame->code = car (cont) ; cont = cdr (cont); 3194 frame->code = car (cont) ; cont = cdr (cont);
3136 3195
3137 ++frame; 3196 ++frame;
3138 ++i; 3197 ++i;
3139 } 3198 }
3140 3199
3141 SCHEME_V->dump = (pointer)(uintptr_t)i; 3200 SCHEME_V->dump = (pointer)(uintptr_t)i;
3142} 3201}
3143 3202
3144#else 3203#else
3145 3204
3146static INLINE void 3205ecb_inline void
3147dump_stack_reset (SCHEME_P) 3206dump_stack_reset (SCHEME_P)
3148{ 3207{
3149 SCHEME_V->dump = NIL; 3208 SCHEME_V->dump = NIL;
3150} 3209}
3151 3210
3152static INLINE void 3211ecb_inline void
3153dump_stack_initialize (SCHEME_P) 3212dump_stack_initialize (SCHEME_P)
3154{ 3213{
3155 dump_stack_reset (SCHEME_A); 3214 dump_stack_reset (SCHEME_A);
3156} 3215}
3157 3216
… …
3159dump_stack_free (SCHEME_P) 3218dump_stack_free (SCHEME_P)
3160{ 3219{
3161 SCHEME_V->dump = NIL; 3220 SCHEME_V->dump = NIL;
3162} 3221}
3163 3222
3164static pointer 3223static int
3165xs_return (SCHEME_P_ pointer a) 3224xs_return (SCHEME_P_ pointer a)
3166{ 3225{
3167 pointer dump = SCHEME_V->dump; 3226 pointer dump = SCHEME_V->dump;
3168 3227
3169 SCHEME_V->value = a; 3228 SCHEME_V->value = a;
3170 3229
3171 if (dump == NIL) 3230 if (dump == NIL)
3172 return NIL; 3231 return -1;
3173 3232
3174 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3233 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3175 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3234 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3176 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3235 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3177 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3236 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3178 3237
3179 SCHEME_V->dump = dump; 3238 SCHEME_V->dump = dump;
3180 3239
3181 return S_T; 3240 return 0;
3182} 3241}
3183 3242
3184static void 3243static void
3185s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3244s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3186{ 3245{
… …
3211 3270
3212#endif 3271#endif
3213 3272
3214#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3273#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3215 3274
3275#if EXPERIMENT
3216static pointer 3276static int
3277debug (SCHEME_P_ int indent, pointer x)
3278{
3279 int c;
3280
3281 if (is_syntax (x))
3282 {
3283 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3284 return 8 + 8;
3285 }
3286
3287 if (x == NIL)
3288 {
3289 printf ("%*sNIL\n", indent, "");
3290 return 3;
3291 }
3292
3293 switch (type (x))
3294 {
3295 case T_INTEGER:
3296 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3297 return 32+8;
3298
3299 case T_SYMBOL:
3300 printf ("%*sS<%s>\n", indent, "", symname (x));
3301 return 24+8;
3302
3303 case T_CLOSURE:
3304 printf ("%*sS<%s>\n", indent, "", "closure");
3305 debug (SCHEME_A_ indent + 3, cdr(x));
3306 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3307
3308 case T_PAIR:
3309 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3310 c = debug (SCHEME_A_ indent + 3, car (x));
3311 c += debug (SCHEME_A_ indent + 3, cdr (x));
3312 return c + 1;
3313
3314 case T_PORT:
3315 printf ("%*sS<%s>\n", indent, "", "port");
3316 return 24+8;
3317
3318 case T_VECTOR:
3319 printf ("%*sS<%s>\n", indent, "", "vector");
3320 return 24+8;
3321
3322 case T_ENVIRONMENT:
3323 printf ("%*sS<%s>\n", indent, "", "environment");
3324 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3325
3326 default:
3327 printf ("unhandled type %d\n", type (x));
3328 break;
3329 }
3330}
3331#endif
3332
3333static int
3217opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3334opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3218{ 3335{
3336 pointer args = SCHEME_V->args;
3219 pointer x, y; 3337 pointer x, y;
3220 3338
3221 switch (op) 3339 switch (op)
3222 { 3340 {
3341#if EXPERIMENT //D
3342 case OP_DEBUG:
3343 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3344 printf ("\n");
3345 s_return (S_T);
3346#endif
3223 case OP_LOAD: /* load */ 3347 case OP_LOAD: /* load */
3224 if (file_interactive (SCHEME_A)) 3348 if (file_interactive (SCHEME_A))
3225 { 3349 {
3226 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3350 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3227 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3351 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3228 } 3352 }
3229 3353
3230 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3354 if (!file_push (SCHEME_A_ strvalue (car (args))))
3231 Error_1 ("unable to open", car (SCHEME_V->args)); 3355 Error_1 ("unable to open", car (args));
3232 else 3356 else
3233 { 3357 {
3234 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3358 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3235 s_goto (OP_T0LVL); 3359 s_goto (OP_T0LVL);
3236 } 3360 }
… …
3310 case OP_EVAL: /* main part of evaluation */ 3434 case OP_EVAL: /* main part of evaluation */
3311#if USE_TRACING 3435#if USE_TRACING
3312 if (SCHEME_V->tracing) 3436 if (SCHEME_V->tracing)
3313 { 3437 {
3314 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3438 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3315 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3439 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3316 SCHEME_V->args = SCHEME_V->code; 3440 SCHEME_V->args = SCHEME_V->code;
3317 putstr (SCHEME_A_ "\nEval: "); 3441 putstr (SCHEME_A_ "\nEval: ");
3318 s_goto (OP_P0LIST); 3442 s_goto (OP_P0LIST);
3319 } 3443 }
3320 3444
… …
3350 } 3474 }
3351 else 3475 else
3352 s_return (SCHEME_V->code); 3476 s_return (SCHEME_V->code);
3353 3477
3354 case OP_E0ARGS: /* eval arguments */ 3478 case OP_E0ARGS: /* eval arguments */
3355 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3479 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3356 { 3480 {
3357 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3481 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3358 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3482 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3359 SCHEME_V->code = SCHEME_V->value; 3483 SCHEME_V->code = SCHEME_V->value;
3360 s_goto (OP_APPLY); 3484 s_goto (OP_APPLY);
… …
3364 SCHEME_V->code = cdr (SCHEME_V->code); 3488 SCHEME_V->code = cdr (SCHEME_V->code);
3365 s_goto (OP_E1ARGS); 3489 s_goto (OP_E1ARGS);
3366 } 3490 }
3367 3491
3368 case OP_E1ARGS: /* eval arguments */ 3492 case OP_E1ARGS: /* eval arguments */
3369 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3493 args = cons (SCHEME_V->value, args);
3370 3494
3371 if (is_pair (SCHEME_V->code)) /* continue */ 3495 if (is_pair (SCHEME_V->code)) /* continue */
3372 { 3496 {
3373 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3497 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3374 SCHEME_V->code = car (SCHEME_V->code); 3498 SCHEME_V->code = car (SCHEME_V->code);
3375 SCHEME_V->args = NIL; 3499 SCHEME_V->args = NIL;
3376 s_goto (OP_EVAL); 3500 s_goto (OP_EVAL);
3377 } 3501 }
3378 else /* end */ 3502 else /* end */
3379 { 3503 {
3380 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3504 args = reverse_in_place (SCHEME_A_ NIL, args);
3381 SCHEME_V->code = car (SCHEME_V->args); 3505 SCHEME_V->code = car (args);
3382 SCHEME_V->args = cdr (SCHEME_V->args); 3506 SCHEME_V->args = cdr (args);
3383 s_goto (OP_APPLY); 3507 s_goto (OP_APPLY);
3384 } 3508 }
3385 3509
3386#if USE_TRACING 3510#if USE_TRACING
3387 3511
3388 case OP_TRACING: 3512 case OP_TRACING:
3389 { 3513 {
3390 int tr = SCHEME_V->tracing; 3514 int tr = SCHEME_V->tracing;
3391 3515
3392 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3516 SCHEME_V->tracing = ivalue_unchecked (car (args));
3393 s_return (mk_integer (SCHEME_A_ tr)); 3517 s_return (mk_integer (SCHEME_A_ tr));
3394 } 3518 }
3395 3519
3396#endif 3520#endif
3397 3521
3398 case OP_APPLY: /* apply 'code' to 'args' */ 3522 case OP_APPLY: /* apply 'code' to 'args' */
3399#if USE_TRACING 3523#if USE_TRACING
3400 if (SCHEME_V->tracing) 3524 if (SCHEME_V->tracing)
3401 { 3525 {
3402 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3526 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3403 SCHEME_V->print_flag = 1; 3527 SCHEME_V->print_flag = 1;
3404 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3528 /* args=cons(SCHEME_V->code,args); */
3405 putstr (SCHEME_A_ "\nApply to: "); 3529 putstr (SCHEME_A_ "\nApply to: ");
3406 s_goto (OP_P0LIST); 3530 s_goto (OP_P0LIST);
3407 } 3531 }
3408 3532
3409 /* fall through */ 3533 /* fall through */
3410 3534
3411 case OP_REAL_APPLY: 3535 case OP_REAL_APPLY:
3412#endif 3536#endif
3413 if (is_proc (SCHEME_V->code)) 3537 if (is_proc (SCHEME_V->code))
3414 {
3415 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3538 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3416 }
3417 else if (is_foreign (SCHEME_V->code)) 3539 else if (is_foreign (SCHEME_V->code))
3418 { 3540 {
3419 /* Keep nested calls from GC'ing the arglist */ 3541 /* Keep nested calls from GC'ing the arglist */
3420 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3542 push_recent_alloc (SCHEME_A_ args, NIL);
3421 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3543 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3422 3544
3423 s_return (x); 3545 s_return (x);
3424 } 3546 }
3425 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3547 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3426 { 3548 {
3427 /* Should not accept promise */ 3549 /* Should not accept promise */
3428 /* make environment */ 3550 /* make environment */
3429 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3551 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3430 3552
3431 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3553 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3432 { 3554 {
3433 if (y == NIL) 3555 if (y == NIL)
3434 Error_0 ("not enough arguments"); 3556 Error_0 ("not enough arguments");
3435 else 3557 else
3436 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3558 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3454 s_goto (OP_BEGIN); 3576 s_goto (OP_BEGIN);
3455 } 3577 }
3456 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3578 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3457 { 3579 {
3458 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3580 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3459 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3581 s_return (args != NIL ? car (args) : NIL);
3460 } 3582 }
3461 else 3583 else
3462 Error_0 ("illegal function"); 3584 Error_0 ("illegal function");
3463 3585
3464 case OP_DOMACRO: /* do macro */ 3586 case OP_DOMACRO: /* do macro */
3465 SCHEME_V->code = SCHEME_V->value; 3587 SCHEME_V->code = SCHEME_V->value;
3466 s_goto (OP_EVAL); 3588 s_goto (OP_EVAL);
3467
3468#if 1
3469 3589
3470 case OP_LAMBDA: /* lambda */ 3590 case OP_LAMBDA: /* lambda */
3471 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3591 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3472 set SCHEME_V->value fall thru */ 3592 set SCHEME_V->value fall thru */
3473 { 3593 {
3474 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3594 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3475 3595
3476 if (f != NIL) 3596 if (f != NIL)
3477 { 3597 {
3478 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3598 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3479 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3599 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3480 SCHEME_V->code = slot_value_in_env (f); 3600 SCHEME_V->code = slot_value_in_env (f);
3481 s_goto (OP_APPLY); 3601 s_goto (OP_APPLY);
3482 } 3602 }
3483 3603
3484 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3485 /* Fallthru */
3486 } 3605 }
3606 /* Fallthru */
3487 3607
3488 case OP_LAMBDA1: 3608 case OP_LAMBDA1:
3489 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3609 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3490 3610
3491#else
3492
3493 case OP_LAMBDA: /* lambda */
3494 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3495
3496#endif
3497
3498 case OP_MKCLOSURE: /* make-closure */ 3611 case OP_MKCLOSURE: /* make-closure */
3499 x = car (SCHEME_V->args); 3612 x = car (args);
3500 3613
3501 if (car (x) == SCHEME_V->LAMBDA) 3614 if (car (x) == SCHEME_V->LAMBDA)
3502 x = cdr (x); 3615 x = cdr (x);
3503 3616
3504 if (cdr (SCHEME_V->args) == NIL) 3617 if (cdr (args) == NIL)
3505 y = SCHEME_V->envir; 3618 y = SCHEME_V->envir;
3506 else 3619 else
3507 y = cadr (SCHEME_V->args); 3620 y = cadr (args);
3508 3621
3509 s_return (mk_closure (SCHEME_A_ x, y)); 3622 s_return (mk_closure (SCHEME_A_ x, y));
3510 3623
3511 case OP_QUOTE: /* quote */ 3624 case OP_QUOTE: /* quote */
3512 s_return (car (SCHEME_V->code)); 3625 s_return (car (SCHEME_V->code));
… …
3544 3657
3545 3658
3546 case OP_DEFP: /* defined? */ 3659 case OP_DEFP: /* defined? */
3547 x = SCHEME_V->envir; 3660 x = SCHEME_V->envir;
3548 3661
3549 if (cdr (SCHEME_V->args) != NIL) 3662 if (cdr (args) != NIL)
3550 x = cadr (SCHEME_V->args); 3663 x = cadr (args);
3551 3664
3552 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3665 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3553 3666
3554 case OP_SET0: /* set! */ 3667 case OP_SET0: /* set! */
3555 if (is_immutable (car (SCHEME_V->code))) 3668 if (is_immutable (car (SCHEME_V->code)))
3556 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3669 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3557 3670
… …
3588 3701
3589 case OP_IF1: /* if */ 3702 case OP_IF1: /* if */
3590 if (is_true (SCHEME_V->value)) 3703 if (is_true (SCHEME_V->value))
3591 SCHEME_V->code = car (SCHEME_V->code); 3704 SCHEME_V->code = car (SCHEME_V->code);
3592 else 3705 else
3593 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3706 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3594
3595 * car(NIL) = NIL */
3596 s_goto (OP_EVAL); 3707 s_goto (OP_EVAL);
3597 3708
3598 case OP_LET0: /* let */ 3709 case OP_LET0: /* let */
3599 SCHEME_V->args = NIL; 3710 SCHEME_V->args = NIL;
3600 SCHEME_V->value = SCHEME_V->code; 3711 SCHEME_V->value = SCHEME_V->code;
3601 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3712 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3602 s_goto (OP_LET1); 3713 s_goto (OP_LET1);
3603 3714
3604 case OP_LET1: /* let (calculate parameters) */ 3715 case OP_LET1: /* let (calculate parameters) */
3605 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3716 args = cons (SCHEME_V->value, args);
3606 3717
3607 if (is_pair (SCHEME_V->code)) /* continue */ 3718 if (is_pair (SCHEME_V->code)) /* continue */
3608 { 3719 {
3609 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3720 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3610 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3721 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3611 3722
3612 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3723 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3613 SCHEME_V->code = cadar (SCHEME_V->code); 3724 SCHEME_V->code = cadar (SCHEME_V->code);
3614 SCHEME_V->args = NIL; 3725 SCHEME_V->args = NIL;
3615 s_goto (OP_EVAL); 3726 s_goto (OP_EVAL);
3616 } 3727 }
3617 else /* end */ 3728 else /* end */
3618 { 3729 {
3619 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3730 args = reverse_in_place (SCHEME_A_ NIL, args);
3620 SCHEME_V->code = car (SCHEME_V->args); 3731 SCHEME_V->code = car (args);
3621 SCHEME_V->args = cdr (SCHEME_V->args); 3732 SCHEME_V->args = cdr (args);
3622 s_goto (OP_LET2); 3733 s_goto (OP_LET2);
3623 } 3734 }
3624 3735
3625 case OP_LET2: /* let */ 3736 case OP_LET2: /* let */
3626 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3737 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3627 3738
3628 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3739 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3629 y != NIL; x = cdr (x), y = cdr (y)) 3740 y != NIL; x = cdr (x), y = cdr (y))
3630 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3741 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3631 3742
3632 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3743 if (is_symbol (car (SCHEME_V->code))) /* named let */
3633 { 3744 {
3634 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3745 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3635 { 3746 {
3636 if (!is_pair (x)) 3747 if (!is_pair (x))
3637 Error_1 ("Bad syntax of binding in let :", x); 3748 Error_1 ("Bad syntax of binding in let :", x);
3638 3749
3639 if (!is_list (SCHEME_A_ car (x))) 3750 if (!is_list (SCHEME_A_ car (x)))
3640 Error_1 ("Bad syntax of binding in let :", car (x)); 3751 Error_1 ("Bad syntax of binding in let :", car (x));
3641 3752
3642 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3753 args = cons (caar (x), args);
3643 } 3754 }
3644 3755
3645 x =
3646 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3756 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3647 SCHEME_V->envir); 3757 SCHEME_V->envir);
3648 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3758 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3649 SCHEME_V->code = cddr (SCHEME_V->code); 3759 SCHEME_V->code = cddr (SCHEME_V->code);
3650 SCHEME_V->args = NIL;
3651 } 3760 }
3652 else 3761 else
3653 { 3762 {
3654 SCHEME_V->code = cdr (SCHEME_V->code); 3763 SCHEME_V->code = cdr (SCHEME_V->code);
3764 }
3765
3655 SCHEME_V->args = NIL; 3766 SCHEME_V->args = NIL;
3656 }
3657
3658 s_goto (OP_BEGIN); 3767 s_goto (OP_BEGIN);
3659 3768
3660 case OP_LET0AST: /* let* */ 3769 case OP_LET0AST: /* let* */
3661 if (car (SCHEME_V->code) == NIL) 3770 if (car (SCHEME_V->code) == NIL)
3662 { 3771 {
… …
3680 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3789 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3681 SCHEME_V->code = cdr (SCHEME_V->code); 3790 SCHEME_V->code = cdr (SCHEME_V->code);
3682 3791
3683 if (is_pair (SCHEME_V->code)) /* continue */ 3792 if (is_pair (SCHEME_V->code)) /* continue */
3684 { 3793 {
3685 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3794 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3686 SCHEME_V->code = cadar (SCHEME_V->code); 3795 SCHEME_V->code = cadar (SCHEME_V->code);
3687 SCHEME_V->args = NIL; 3796 SCHEME_V->args = NIL;
3688 s_goto (OP_EVAL); 3797 s_goto (OP_EVAL);
3689 } 3798 }
3690 else /* end */ 3799 else /* end */
3691 { 3800 {
3692 SCHEME_V->code = SCHEME_V->args; 3801 SCHEME_V->code = args;
3693 SCHEME_V->args = NIL; 3802 SCHEME_V->args = NIL;
3694 s_goto (OP_BEGIN); 3803 s_goto (OP_BEGIN);
3695 } 3804 }
3696 3805
3697 case OP_LET0REC: /* letrec */ 3806 case OP_LET0REC: /* letrec */
… …
3700 SCHEME_V->value = SCHEME_V->code; 3809 SCHEME_V->value = SCHEME_V->code;
3701 SCHEME_V->code = car (SCHEME_V->code); 3810 SCHEME_V->code = car (SCHEME_V->code);
3702 s_goto (OP_LET1REC); 3811 s_goto (OP_LET1REC);
3703 3812
3704 case OP_LET1REC: /* letrec (calculate parameters) */ 3813 case OP_LET1REC: /* letrec (calculate parameters) */
3705 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3814 args = cons (SCHEME_V->value, args);
3706 3815
3707 if (is_pair (SCHEME_V->code)) /* continue */ 3816 if (is_pair (SCHEME_V->code)) /* continue */
3708 { 3817 {
3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3818 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3710 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3819 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3711 3820
3712 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3821 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3713 SCHEME_V->code = cadar (SCHEME_V->code); 3822 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL; 3823 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL); 3824 s_goto (OP_EVAL);
3716 } 3825 }
3717 else /* end */ 3826 else /* end */
3718 { 3827 {
3719 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3828 args = reverse_in_place (SCHEME_A_ NIL, args);
3720 SCHEME_V->code = car (SCHEME_V->args); 3829 SCHEME_V->code = car (args);
3721 SCHEME_V->args = cdr (SCHEME_V->args); 3830 SCHEME_V->args = cdr (args);
3722 s_goto (OP_LET2REC); 3831 s_goto (OP_LET2REC);
3723 } 3832 }
3724 3833
3725 case OP_LET2REC: /* letrec */ 3834 case OP_LET2REC: /* letrec */
3726 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3835 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3727 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3836 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3728 3837
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3838 SCHEME_V->code = cdr (SCHEME_V->code);
3730 SCHEME_V->args = NIL; 3839 SCHEME_V->args = NIL;
3731 s_goto (OP_BEGIN); 3840 s_goto (OP_BEGIN);
… …
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3926 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 3927 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 3928 s_goto (OP_EVAL);
3820 3929
3821 case OP_C1STREAM: /* cons-stream */ 3930 case OP_C1STREAM: /* cons-stream */
3822 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3931 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3823 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3932 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3824 set_typeflag (x, T_PROMISE); 3933 set_typeflag (x, T_PROMISE);
3825 s_return (cons (SCHEME_V->args, x)); 3934 s_return (cons (args, x));
3826 3935
3827 case OP_MACRO0: /* macro */ 3936 case OP_MACRO0: /* macro */
3828 if (is_pair (car (SCHEME_V->code))) 3937 if (is_pair (car (SCHEME_V->code)))
3829 { 3938 {
3830 x = caar (SCHEME_V->code); 3939 x = caar (SCHEME_V->code);
… …
3863 { 3972 {
3864 if (!is_pair (y = caar (x))) 3973 if (!is_pair (y = caar (x)))
3865 break; 3974 break;
3866 3975
3867 for (; y != NIL; y = cdr (y)) 3976 for (; y != NIL; y = cdr (y))
3868 {
3869 if (eqv (car (y), SCHEME_V->value)) 3977 if (eqv (car (y), SCHEME_V->value))
3870 break; 3978 break;
3871 }
3872 3979
3873 if (y != NIL) 3980 if (y != NIL)
3874 break; 3981 break;
3875 } 3982 }
3876 3983
… …
3896 s_goto (OP_BEGIN); 4003 s_goto (OP_BEGIN);
3897 else 4004 else
3898 s_return (NIL); 4005 s_return (NIL);
3899 4006
3900 case OP_PAPPLY: /* apply */ 4007 case OP_PAPPLY: /* apply */
3901 SCHEME_V->code = car (SCHEME_V->args); 4008 SCHEME_V->code = car (args);
3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4009 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3903 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4010 /*SCHEME_V->args = cadr(args); */
3904 s_goto (OP_APPLY); 4011 s_goto (OP_APPLY);
3905 4012
3906 case OP_PEVAL: /* eval */ 4013 case OP_PEVAL: /* eval */
3907 if (cdr (SCHEME_V->args) != NIL) 4014 if (cdr (args) != NIL)
3908 SCHEME_V->envir = cadr (SCHEME_V->args); 4015 SCHEME_V->envir = cadr (args);
3909 4016
3910 SCHEME_V->code = car (SCHEME_V->args); 4017 SCHEME_V->code = car (args);
3911 s_goto (OP_EVAL); 4018 s_goto (OP_EVAL);
3912 4019
3913 case OP_CONTINUATION: /* call-with-current-continuation */ 4020 case OP_CONTINUATION: /* call-with-current-continuation */
3914 SCHEME_V->code = car (SCHEME_V->args); 4021 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4022 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 4023 s_goto (OP_APPLY);
3917 } 4024 }
3918 4025
3919 abort (); 4026 if (USE_ERROR_CHECKING) abort ();
3920} 4027}
3921 4028
3922static pointer 4029static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4030opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 4031{
3925 pointer x; 4032 pointer args = SCHEME_V->args;
4033 pointer x = car (args);
3926 num v; 4034 num v;
3927 4035
4036 switch (op)
4037 {
3928#if USE_MATH 4038#if USE_MATH
3929 RVALUE dd;
3930#endif
3931
3932 switch (op)
3933 {
3934#if USE_MATH
3935
3936 case OP_INEX2EX: /* inexact->exact */ 4039 case OP_INEX2EX: /* inexact->exact */
3937 x = car (SCHEME_V->args); 4040 {
3938
3939 if (num_is_integer (x)) 4041 if (is_integer (x))
3940 s_return (x); 4042 s_return (x);
3941 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4043
4044 RVALUE r = rvalue_unchecked (x);
4045
4046 if (r == (RVALUE)(IVALUE)r)
3942 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4047 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3943 else 4048 else
3944 Error_1 ("inexact->exact: not integral:", x); 4049 Error_1 ("inexact->exact: not integral:", x);
4050 }
3945 4051
3946 case OP_EXP:
3947 x = car (SCHEME_V->args);
3948 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4052 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3949
3950 case OP_LOG:
3951 x = car (SCHEME_V->args);
3952 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4053 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3953
3954 case OP_SIN:
3955 x = car (SCHEME_V->args);
3956 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4054 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3957
3958 case OP_COS:
3959 x = car (SCHEME_V->args);
3960 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4055 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3961
3962 case OP_TAN:
3963 x = car (SCHEME_V->args);
3964 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4056 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3965
3966 case OP_ASIN:
3967 x = car (SCHEME_V->args);
3968 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4057 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3969
3970 case OP_ACOS:
3971 x = car (SCHEME_V->args);
3972 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4058 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 4059
3974 case OP_ATAN: 4060 case OP_ATAN:
3975 x = car (SCHEME_V->args);
3976
3977 if (cdr (SCHEME_V->args) == NIL) 4061 if (cdr (args) == NIL)
3978 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4062 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
3979 else 4063 else
3980 { 4064 {
3981 pointer y = cadr (SCHEME_V->args); 4065 pointer y = cadr (args);
3982
3983 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4066 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3984 } 4067 }
3985 4068
3986 case OP_SQRT: 4069 case OP_SQRT:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4070 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 4071
3990 case OP_EXPT: 4072 case OP_EXPT:
3991 { 4073 {
3992 RVALUE result; 4074 RVALUE result;
3993 int real_result = 1; 4075 int real_result = 1;
3994 pointer y = cadr (SCHEME_V->args); 4076 pointer y = cadr (args);
3995 4077
3996 x = car (SCHEME_V->args);
3997
3998 if (num_is_integer (x) && num_is_integer (y)) 4078 if (is_integer (x) && is_integer (y))
3999 real_result = 0; 4079 real_result = 0;
4000 4080
4001 /* This 'if' is an R5RS compatibility fix. */ 4081 /* This 'if' is an R5RS compatibility fix. */
4002 /* NOTE: Remove this 'if' fix for R6RS. */ 4082 /* NOTE: Remove this 'if' fix for R6RS. */
4003 if (rvalue (x) == 0 && rvalue (y) < 0) 4083 if (rvalue (x) == 0 && rvalue (y) < 0)
4004 result = 0.0; 4084 result = 0;
4005 else 4085 else
4006 result = pow (rvalue (x), rvalue (y)); 4086 result = pow (rvalue (x), rvalue (y));
4007 4087
4008 /* Before returning integer result make sure we can. */ 4088 /* Before returning integer result make sure we can. */
4009 /* If the test fails, result is too big for integer. */ 4089 /* If the test fails, result is too big for integer. */
4010 if (!real_result) 4090 if (!real_result)
4011 { 4091 {
4012 long result_as_long = (long) result; 4092 long result_as_long = result;
4013 4093
4014 if (result != (RVALUE) result_as_long) 4094 if (result != result_as_long)
4015 real_result = 1; 4095 real_result = 1;
4016 } 4096 }
4017 4097
4018 if (real_result) 4098 if (real_result)
4019 s_return (mk_real (SCHEME_A_ result)); 4099 s_return (mk_real (SCHEME_A_ result));
4020 else 4100 else
4021 s_return (mk_integer (SCHEME_A_ result)); 4101 s_return (mk_integer (SCHEME_A_ result));
4022 } 4102 }
4023 4103
4024 case OP_FLOOR:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4104 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4027
4028 case OP_CEILING:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4105 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 4106
4032 case OP_TRUNCATE: 4107 case OP_TRUNCATE:
4033 { 4108 {
4034 RVALUE rvalue_of_x; 4109 RVALUE n = rvalue (x);
4035
4036 x = car (SCHEME_V->args);
4037 rvalue_of_x = rvalue (x);
4038
4039 if (rvalue_of_x > 0)
4040 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4110 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4041 else
4042 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4043 } 4111 }
4044 4112
4045 case OP_ROUND: 4113 case OP_ROUND:
4046 x = car (SCHEME_V->args);
4047
4048 if (num_is_integer (x)) 4114 if (is_integer (x))
4049 s_return (x); 4115 s_return (x);
4050 4116
4051 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4117 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4052#endif 4118#endif
4053 4119
4054 case OP_ADD: /* + */ 4120 case OP_ADD: /* + */
4055 v = num_zero; 4121 v = num_zero;
4056 4122
4057 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4058 v = num_op ('+', v, nvalue (car (x))); 4124 v = num_op (NUM_ADD, v, nvalue (car (x)));
4059 4125
4060 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4061 4127
4062 case OP_MUL: /* * */ 4128 case OP_MUL: /* * */
4063 v = num_one; 4129 v = num_one;
4064 4130
4065 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4131 for (x = args; x != NIL; x = cdr (x))
4066 v = num_op ('+', v, nvalue (car (x))); 4132 v = num_op (NUM_MUL, v, nvalue (car (x)));
4067 4133
4068 s_return (mk_number (SCHEME_A_ v)); 4134 s_return (mk_number (SCHEME_A_ v));
4069 4135
4070 case OP_SUB: /* - */ 4136 case OP_SUB: /* - */
4071 if (cdr (SCHEME_V->args) == NIL) 4137 if (cdr (args) == NIL)
4072 { 4138 {
4073 x = SCHEME_V->args; 4139 x = args;
4074 v = num_zero; 4140 v = num_zero;
4075 } 4141 }
4076 else 4142 else
4077 { 4143 {
4078 x = cdr (SCHEME_V->args); 4144 x = cdr (args);
4079 v = nvalue (car (SCHEME_V->args)); 4145 v = nvalue (car (args));
4080 } 4146 }
4081 4147
4082 for (; x != NIL; x = cdr (x)) 4148 for (; x != NIL; x = cdr (x))
4083 v = num_op ('+', v, nvalue (car (x))); 4149 v = num_op (NUM_SUB, v, nvalue (car (x)));
4084 4150
4085 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4086 4152
4087 case OP_DIV: /* / */ 4153 case OP_DIV: /* / */
4088 if (cdr (SCHEME_V->args) == NIL) 4154 if (cdr (args) == NIL)
4089 { 4155 {
4090 x = SCHEME_V->args; 4156 x = args;
4091 v = num_one; 4157 v = num_one;
4092 } 4158 }
4093 else 4159 else
4094 { 4160 {
4095 x = cdr (SCHEME_V->args); 4161 x = cdr (args);
4096 v = nvalue (car (SCHEME_V->args)); 4162 v = nvalue (car (args));
4097 } 4163 }
4098 4164
4099 for (; x != NIL; x = cdr (x)) 4165 for (; x != NIL; x = cdr (x))
4100 {
4101 if (!is_zero_rvalue (rvalue (car (x)))) 4166 if (!is_zero_rvalue (rvalue (car (x))))
4102 v = num_div (v, nvalue (car (x))); 4167 v = num_div (v, nvalue (car (x)));
4103 else 4168 else
4104 Error_0 ("/: division by zero"); 4169 Error_0 ("/: division by zero");
4105 }
4106 4170
4107 s_return (mk_number (SCHEME_A_ v)); 4171 s_return (mk_number (SCHEME_A_ v));
4108 4172
4109 case OP_INTDIV: /* quotient */ 4173 case OP_INTDIV: /* quotient */
4110 if (cdr (SCHEME_V->args) == NIL) 4174 if (cdr (args) == NIL)
4111 { 4175 {
4112 x = SCHEME_V->args; 4176 x = args;
4113 v = num_one; 4177 v = num_one;
4114 } 4178 }
4115 else 4179 else
4116 { 4180 {
4117 x = cdr (SCHEME_V->args); 4181 x = cdr (args);
4118 v = nvalue (car (SCHEME_V->args)); 4182 v = nvalue (car (args));
4119 } 4183 }
4120 4184
4121 for (; x != NIL; x = cdr (x)) 4185 for (; x != NIL; x = cdr (x))
4122 { 4186 {
4123 if (ivalue (car (x)) != 0) 4187 if (ivalue (car (x)) != 0)
4124 v = num_op ('/', v, nvalue (car (x))); 4188 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4125 else 4189 else
4126 Error_0 ("quotient: division by zero"); 4190 Error_0 ("quotient: division by zero");
4127 } 4191 }
4128 4192
4129 s_return (mk_number (SCHEME_A_ v)); 4193 s_return (mk_number (SCHEME_A_ v));
4130 4194
4131 case OP_REM: /* remainder */ 4195 case OP_REM: /* remainder */
4132 v = nvalue (car (SCHEME_V->args)); 4196 v = nvalue (x);
4133 4197
4134 if (ivalue (cadr (SCHEME_V->args)) != 0) 4198 if (ivalue (cadr (args)) != 0)
4135 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4199 v = num_rem (v, nvalue (cadr (args)));
4136 else 4200 else
4137 Error_0 ("remainder: division by zero"); 4201 Error_0 ("remainder: division by zero");
4138 4202
4139 s_return (mk_number (SCHEME_A_ v)); 4203 s_return (mk_number (SCHEME_A_ v));
4140 4204
4141 case OP_MOD: /* modulo */ 4205 case OP_MOD: /* modulo */
4142 v = nvalue (car (SCHEME_V->args)); 4206 v = nvalue (x);
4143 4207
4144 if (ivalue (cadr (SCHEME_V->args)) != 0) 4208 if (ivalue (cadr (args)) != 0)
4145 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4209 v = num_mod (v, nvalue (cadr (args)));
4146 else 4210 else
4147 Error_0 ("modulo: division by zero"); 4211 Error_0 ("modulo: division by zero");
4148 4212
4149 s_return (mk_number (SCHEME_A_ v)); 4213 s_return (mk_number (SCHEME_A_ v));
4150 4214
4151 case OP_CAR: /* car */ 4215 /* the compiler will optimize this mess... */
4152 s_return (caar (SCHEME_V->args)); 4216 case OP_CAR: op_car: s_return (car (x));
4153 4217 case OP_CDR: op_cdr: s_return (cdr (x));
4154 case OP_CDR: /* cdr */ 4218 case OP_CAAR: op_caar: x = car (x); goto op_car;
4155 s_return (cdar (SCHEME_V->args)); 4219 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4220 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4221 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4222 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4223 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4224 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4225 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4226 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4227 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4228 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4229 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4230 case OP_CAAAAR: x = car (x); goto op_caaar;
4231 case OP_CAAADR: x = cdr (x); goto op_caaar;
4232 case OP_CAADAR: x = car (x); goto op_caadr;
4233 case OP_CAADDR: x = cdr (x); goto op_caadr;
4234 case OP_CADAAR: x = car (x); goto op_cadar;
4235 case OP_CADADR: x = cdr (x); goto op_cadar;
4236 case OP_CADDAR: x = car (x); goto op_caddr;
4237 case OP_CADDDR: x = cdr (x); goto op_caddr;
4238 case OP_CDAAAR: x = car (x); goto op_cdaar;
4239 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4240 case OP_CDADAR: x = car (x); goto op_cdadr;
4241 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4242 case OP_CDDAAR: x = car (x); goto op_cddar;
4243 case OP_CDDADR: x = cdr (x); goto op_cddar;
4244 case OP_CDDDAR: x = car (x); goto op_cdddr;
4245 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4156 4246
4157 case OP_CONS: /* cons */ 4247 case OP_CONS: /* cons */
4158 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4248 set_cdr (args, cadr (args));
4159 s_return (SCHEME_V->args); 4249 s_return (args);
4160 4250
4161 case OP_SETCAR: /* set-car! */ 4251 case OP_SETCAR: /* set-car! */
4162 if (!is_immutable (car (SCHEME_V->args))) 4252 if (!is_immutable (x))
4163 { 4253 {
4164 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4254 set_car (x, cadr (args));
4165 s_return (car (SCHEME_V->args)); 4255 s_return (car (args));
4166 } 4256 }
4167 else 4257 else
4168 Error_0 ("set-car!: unable to alter immutable pair"); 4258 Error_0 ("set-car!: unable to alter immutable pair");
4169 4259
4170 case OP_SETCDR: /* set-cdr! */ 4260 case OP_SETCDR: /* set-cdr! */
4171 if (!is_immutable (car (SCHEME_V->args))) 4261 if (!is_immutable (x))
4172 { 4262 {
4173 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4263 set_cdr (x, cadr (args));
4174 s_return (car (SCHEME_V->args)); 4264 s_return (car (args));
4175 } 4265 }
4176 else 4266 else
4177 Error_0 ("set-cdr!: unable to alter immutable pair"); 4267 Error_0 ("set-cdr!: unable to alter immutable pair");
4178 4268
4179 case OP_CHAR2INT: /* char->integer */ 4269 case OP_CHAR2INT: /* char->integer */
4180 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4270 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4181 4271
4182 case OP_INT2CHAR: /* integer->char */ 4272 case OP_INT2CHAR: /* integer->char */
4183 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4273 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4184 4274
4185 case OP_CHARUPCASE: 4275 case OP_CHARUPCASE:
4186 { 4276 {
4187 unsigned char c = ivalue (car (SCHEME_V->args)); 4277 unsigned char c = ivalue_unchecked (x);
4188 c = toupper (c); 4278 c = toupper (c);
4189 s_return (mk_character (SCHEME_A_ c)); 4279 s_return (mk_character (SCHEME_A_ c));
4190 } 4280 }
4191 4281
4192 case OP_CHARDNCASE: 4282 case OP_CHARDNCASE:
4193 { 4283 {
4194 unsigned char c = ivalue (car (SCHEME_V->args)); 4284 unsigned char c = ivalue_unchecked (x);
4195 c = tolower (c); 4285 c = tolower (c);
4196 s_return (mk_character (SCHEME_A_ c)); 4286 s_return (mk_character (SCHEME_A_ c));
4197 } 4287 }
4198 4288
4199 case OP_STR2SYM: /* string->symbol */ 4289 case OP_STR2SYM: /* string->symbol */
4200 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4290 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4201 4291
4202 case OP_STR2ATOM: /* string->atom */ 4292 case OP_STR2ATOM: /* string->atom */
4203 { 4293 {
4204 char *s = strvalue (car (SCHEME_V->args)); 4294 char *s = strvalue (x);
4205 long pf = 0; 4295 long pf = 0;
4206 4296
4207 if (cdr (SCHEME_V->args) != NIL) 4297 if (cdr (args) != NIL)
4208 { 4298 {
4209 /* we know cadr(SCHEME_V->args) is a natural number */ 4299 /* we know cadr(args) is a natural number */
4210 /* see if it is 2, 8, 10, or 16, or error */ 4300 /* see if it is 2, 8, 10, or 16, or error */
4211 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4301 pf = ivalue_unchecked (cadr (args));
4212 4302
4213 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4303 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4214 { 4304 {
4215 /* base is OK */ 4305 /* base is OK */
4216 } 4306 }
4217 else 4307 else
4218 pf = -1; 4308 pf = -1;
4219 } 4309 }
4220 4310
4221 if (pf < 0) 4311 if (pf < 0)
4222 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4312 Error_1 ("string->atom: bad base:", cadr (args));
4223 else if (*s == '#') /* no use of base! */ 4313 else if (*s == '#') /* no use of base! */
4224 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4314 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4225 else 4315 else
4226 { 4316 {
4227 if (pf == 0 || pf == 10) 4317 if (pf == 0 || pf == 10)
… …
4238 } 4328 }
4239 } 4329 }
4240 } 4330 }
4241 4331
4242 case OP_SYM2STR: /* symbol->string */ 4332 case OP_SYM2STR: /* symbol->string */
4243 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4333 x = mk_string (SCHEME_A_ symname (x));
4244 setimmutable (x); 4334 setimmutable (x);
4245 s_return (x); 4335 s_return (x);
4246 4336
4247 case OP_ATOM2STR: /* atom->string */ 4337 case OP_ATOM2STR: /* atom->string */
4248 { 4338 {
4249 long pf = 0; 4339 long pf = 0;
4250 4340
4251 x = car (SCHEME_V->args);
4252
4253 if (cdr (SCHEME_V->args) != NIL) 4341 if (cdr (args) != NIL)
4254 { 4342 {
4255 /* we know cadr(SCHEME_V->args) is a natural number */ 4343 /* we know cadr(args) is a natural number */
4256 /* see if it is 2, 8, 10, or 16, or error */ 4344 /* see if it is 2, 8, 10, or 16, or error */
4257 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4345 pf = ivalue_unchecked (cadr (args));
4258 4346
4259 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4347 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4260 { 4348 {
4261 /* base is OK */ 4349 /* base is OK */
4262 } 4350 }
4263 else 4351 else
4264 pf = -1; 4352 pf = -1;
4265 } 4353 }
4266 4354
4267 if (pf < 0) 4355 if (pf < 0)
4268 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4356 Error_1 ("atom->string: bad base:", cadr (args));
4269 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4357 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4270 { 4358 {
4271 char *p; 4359 char *p;
4272 int len; 4360 int len;
4273 4361
… …
4278 Error_1 ("atom->string: not an atom:", x); 4366 Error_1 ("atom->string: not an atom:", x);
4279 } 4367 }
4280 4368
4281 case OP_MKSTRING: /* make-string */ 4369 case OP_MKSTRING: /* make-string */
4282 { 4370 {
4283 int fill = ' '; 4371 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4284 int len; 4372 int len = ivalue_unchecked (x);
4285 4373
4286 len = ivalue (car (SCHEME_V->args));
4287
4288 if (cdr (SCHEME_V->args) != NIL)
4289 fill = charvalue (cadr (SCHEME_V->args));
4290
4291 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4374 s_return (mk_empty_string (SCHEME_A_ len, fill));
4292 } 4375 }
4293 4376
4294 case OP_STRLEN: /* string-length */ 4377 case OP_STRLEN: /* string-length */
4295 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4378 s_return (mk_integer (SCHEME_A_ strlength (x)));
4296 4379
4297 case OP_STRREF: /* string-ref */ 4380 case OP_STRREF: /* string-ref */
4298 { 4381 {
4299 char *str; 4382 char *str = strvalue (x);
4300 int index;
4301
4302 str = strvalue (car (SCHEME_V->args));
4303
4304 index = ivalue (cadr (SCHEME_V->args)); 4383 int index = ivalue_unchecked (cadr (args));
4305 4384
4306 if (index >= strlength (car (SCHEME_V->args))) 4385 if (index >= strlength (x))
4307 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4386 Error_1 ("string-ref: out of bounds:", cadr (args));
4308 4387
4309 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4388 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4310 } 4389 }
4311 4390
4312 case OP_STRSET: /* string-set! */ 4391 case OP_STRSET: /* string-set! */
4313 { 4392 {
4314 char *str; 4393 char *str = strvalue (x);
4315 int index; 4394 int index = ivalue_unchecked (cadr (args));
4316 int c; 4395 int c;
4317 4396
4318 if (is_immutable (car (SCHEME_V->args))) 4397 if (is_immutable (x))
4319 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4398 Error_1 ("string-set!: unable to alter immutable string:", x);
4320 4399
4321 str = strvalue (car (SCHEME_V->args));
4322
4323 index = ivalue (cadr (SCHEME_V->args));
4324
4325 if (index >= strlength (car (SCHEME_V->args))) 4400 if (index >= strlength (x))
4326 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("string-set!: out of bounds:", cadr (args));
4327 4402
4328 c = charvalue (caddr (SCHEME_V->args)); 4403 c = charvalue (caddr (args));
4329 4404
4330 str[index] = (char) c; 4405 str[index] = c;
4331 s_return (car (SCHEME_V->args)); 4406 s_return (car (args));
4332 } 4407 }
4333 4408
4334 case OP_STRAPPEND: /* string-append */ 4409 case OP_STRAPPEND: /* string-append */
4335 { 4410 {
4336 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4411 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4337 int len = 0; 4412 int len = 0;
4338 pointer newstr; 4413 pointer newstr;
4339 char *pos; 4414 char *pos;
4340 4415
4341 /* compute needed length for new string */ 4416 /* compute needed length for new string */
4342 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4417 for (x = args; x != NIL; x = cdr (x))
4343 len += strlength (car (x)); 4418 len += strlength (car (x));
4344 4419
4345 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4420 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4346 4421
4347 /* store the contents of the argument strings into the new string */ 4422 /* store the contents of the argument strings into the new string */
4348 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4423 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4349 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4424 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4350 4425
4351 s_return (newstr); 4426 s_return (newstr);
4352 } 4427 }
4353 4428
4354 case OP_SUBSTR: /* substring */ 4429 case OP_SUBSTR: /* substring */
4355 { 4430 {
4356 char *str; 4431 char *str = strvalue (x);
4357 int index0; 4432 int index0 = ivalue_unchecked (cadr (args));
4358 int index1; 4433 int index1;
4359 int len; 4434 int len;
4360 4435
4361 str = strvalue (car (SCHEME_V->args));
4362
4363 index0 = ivalue (cadr (SCHEME_V->args));
4364
4365 if (index0 > strlength (car (SCHEME_V->args))) 4436 if (index0 > strlength (x))
4366 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4437 Error_1 ("substring: start out of bounds:", cadr (args));
4367 4438
4368 if (cddr (SCHEME_V->args) != NIL) 4439 if (cddr (args) != NIL)
4369 { 4440 {
4370 index1 = ivalue (caddr (SCHEME_V->args)); 4441 index1 = ivalue_unchecked (caddr (args));
4371 4442
4372 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4443 if (index1 > strlength (x) || index1 < index0)
4373 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4444 Error_1 ("substring: end out of bounds:", caddr (args));
4374 } 4445 }
4375 else 4446 else
4376 index1 = strlength (car (SCHEME_V->args)); 4447 index1 = strlength (x);
4377 4448
4378 len = index1 - index0; 4449 len = index1 - index0;
4379 x = mk_empty_string (SCHEME_A_ len, ' '); 4450 x = mk_empty_string (SCHEME_A_ len, ' ');
4380 memcpy (strvalue (x), str + index0, len); 4451 memcpy (strvalue (x), str + index0, len);
4381 strvalue (x)[len] = 0; 4452 strvalue (x)[len] = 0;
… …
4385 4456
4386 case OP_VECTOR: /* vector */ 4457 case OP_VECTOR: /* vector */
4387 { 4458 {
4388 int i; 4459 int i;
4389 pointer vec; 4460 pointer vec;
4390 int len = list_length (SCHEME_A_ SCHEME_V->args); 4461 int len = list_length (SCHEME_A_ args);
4391 4462
4392 if (len < 0) 4463 if (len < 0)
4393 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4464 Error_1 ("vector: not a proper list:", args);
4394 4465
4395 vec = mk_vector (SCHEME_A_ len); 4466 vec = mk_vector (SCHEME_A_ len);
4396 4467
4397#if USE_ERROR_CHECKING 4468#if USE_ERROR_CHECKING
4398 if (SCHEME_V->no_memory) 4469 if (SCHEME_V->no_memory)
4399 s_return (S_SINK); 4470 s_return (S_SINK);
4400#endif 4471#endif
4401 4472
4402 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4473 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4403 set_vector_elem (vec, i, car (x)); 4474 vector_set (vec, i, car (x));
4404 4475
4405 s_return (vec); 4476 s_return (vec);
4406 } 4477 }
4407 4478
4408 case OP_MKVECTOR: /* make-vector */ 4479 case OP_MKVECTOR: /* make-vector */
4409 { 4480 {
4410 pointer fill = NIL; 4481 pointer fill = NIL;
4411 int len;
4412 pointer vec; 4482 pointer vec;
4483 int len = ivalue_unchecked (x);
4413 4484
4414 len = ivalue (car (SCHEME_V->args));
4415
4416 if (cdr (SCHEME_V->args) != NIL) 4485 if (cdr (args) != NIL)
4417 fill = cadr (SCHEME_V->args); 4486 fill = cadr (args);
4418 4487
4419 vec = mk_vector (SCHEME_A_ len); 4488 vec = mk_vector (SCHEME_A_ len);
4420 4489
4421#if USE_ERROR_CHECKING 4490#if USE_ERROR_CHECKING
4422 if (SCHEME_V->no_memory) 4491 if (SCHEME_V->no_memory)
4423 s_return (S_SINK); 4492 s_return (S_SINK);
4424#endif 4493#endif
4425 4494
4426 if (fill != NIL) 4495 if (fill != NIL)
4427 fill_vector (vec, fill); 4496 fill_vector (vec, 0, fill);
4428 4497
4429 s_return (vec); 4498 s_return (vec);
4430 } 4499 }
4431 4500
4432 case OP_VECLEN: /* vector-length */ 4501 case OP_VECLEN: /* vector-length */
4433 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4502 s_return (mk_integer (SCHEME_A_ veclength (x)));
4503
4504 case OP_VECRESIZE:
4505 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4506 s_return (x);
4434 4507
4435 case OP_VECREF: /* vector-ref */ 4508 case OP_VECREF: /* vector-ref */
4436 { 4509 {
4437 int index;
4438
4439 index = ivalue (cadr (SCHEME_V->args)); 4510 int index = ivalue_unchecked (cadr (args));
4440 4511
4441 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4512 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4442 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4513 Error_1 ("vector-ref: out of bounds:", cadr (args));
4443 4514
4444 s_return (vector_elem (car (SCHEME_V->args), index)); 4515 s_return (vector_get (x, index));
4445 } 4516 }
4446 4517
4447 case OP_VECSET: /* vector-set! */ 4518 case OP_VECSET: /* vector-set! */
4448 { 4519 {
4449 int index; 4520 int index = ivalue_unchecked (cadr (args));
4450 4521
4451 if (is_immutable (car (SCHEME_V->args))) 4522 if (is_immutable (x))
4452 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4523 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4453 4524
4454 index = ivalue (cadr (SCHEME_V->args));
4455
4456 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4525 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4457 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4526 Error_1 ("vector-set!: out of bounds:", cadr (args));
4458 4527
4459 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4528 vector_set (x, index, caddr (args));
4460 s_return (car (SCHEME_V->args)); 4529 s_return (x);
4461 } 4530 }
4462 } 4531 }
4463 4532
4464 return S_T; 4533 if (USE_ERROR_CHECKING) abort ();
4465} 4534}
4466 4535
4467INTERFACE int
4468is_list (SCHEME_P_ pointer a)
4469{
4470 return list_length (SCHEME_A_ a) >= 0;
4471}
4472
4473/* Result is:
4474 proper list: length
4475 circular list: -1
4476 not even a pair: -2
4477 dotted list: -2 minus length before dot
4478*/
4479INTERFACE int
4480list_length (SCHEME_P_ pointer a)
4481{
4482 int i = 0;
4483 pointer slow, fast;
4484
4485 slow = fast = a;
4486
4487 while (1)
4488 {
4489 if (fast == NIL)
4490 return i;
4491
4492 if (!is_pair (fast))
4493 return -2 - i;
4494
4495 fast = cdr (fast);
4496 ++i;
4497
4498 if (fast == NIL)
4499 return i;
4500
4501 if (!is_pair (fast))
4502 return -2 - i;
4503
4504 ++i;
4505 fast = cdr (fast);
4506
4507 /* Safe because we would have already returned if `fast'
4508 encountered a non-pair. */
4509 slow = cdr (slow);
4510
4511 if (fast == slow)
4512 {
4513 /* the fast pointer has looped back around and caught up
4514 with the slow pointer, hence the structure is circular,
4515 not of finite length, and therefore not a list */
4516 return -1;
4517 }
4518 }
4519}
4520
4521static pointer 4536static int
4522opexe_r (SCHEME_P_ enum scheme_opcodes op) 4537opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4538{
4524 pointer x = SCHEME_V->args; 4539 pointer x = SCHEME_V->args;
4525 4540
4526 for (;;) 4541 for (;;)
4527 { 4542 {
… …
4547 } 4562 }
4548 4563
4549 s_return (S_T); 4564 s_return (S_T);
4550} 4565}
4551 4566
4552static pointer 4567static int
4553opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4568opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4554{ 4569{
4555 pointer x = SCHEME_V->args; 4570 pointer args = SCHEME_V->args;
4556 pointer a = car (x); 4571 pointer a = car (args);
4557 pointer d = cdr (x); 4572 pointer d = cdr (args);
4558 int r; 4573 int r;
4559 4574
4560 switch (op) 4575 switch (op)
4561 { 4576 {
4562 case OP_NOT: /* not */ 4577 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 r = is_false (a); break; 4578 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4564 4579 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4565 case OP_BOOLP: /* boolean? */ 4580 case OP_NULLP: /* null? */ r = a == NIL ; break;
4566 r = a == S_F || a == S_T; break; 4581 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4567 4582 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4568 case OP_EOFOBJP: /* eof-object? */ 4583 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4569 r = a == S_EOF; break; 4584 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4570 4585 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4571 case OP_NULLP: /* null? */ 4586 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4572 r = a == NIL; break; 4587 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4573
4574 case OP_SYMBOLP: /* symbol? */
4575 r = is_symbol (a); break;
4576
4577 case OP_NUMBERP: /* number? */
4578 r = is_number (a); break;
4579
4580 case OP_STRINGP: /* string? */
4581 r = is_string (a); break;
4582
4583 case OP_INTEGERP: /* integer? */
4584 r = is_integer (a); break;
4585
4586 case OP_REALP: /* real? */
4587 r = is_number (a); break; /* all numbers are real */
4588
4589 case OP_CHARP: /* char? */
4590 r = is_character (a); break;
4591 4588
4592#if USE_CHAR_CLASSIFIERS 4589#if USE_CHAR_CLASSIFIERS
4593 case OP_CHARAP: /* char-alphabetic? */ 4590 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4594 r = Cisalpha (ivalue (a)); break; 4591 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4595 4592 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4596 case OP_CHARNP: /* char-numeric? */ 4593 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4597 r = Cisdigit (ivalue (a)); break; 4594 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4598
4599 case OP_CHARWP: /* char-whitespace? */
4600 r = Cisspace (ivalue (a)); break;
4601
4602 case OP_CHARUP: /* char-upper-case? */
4603 r = Cisupper (ivalue (a)); break;
4604
4605 case OP_CHARLP: /* char-lower-case? */
4606 r = Cislower (ivalue (a)); break;
4607#endif 4595#endif
4608 4596
4609#if USE_PORTS 4597#if USE_PORTS
4610 case OP_PORTP: /* port? */ 4598 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4611 r = is_port (a); break;
4612
4613 case OP_INPORTP: /* input-port? */ 4599 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4614 r = is_inport (a); break;
4615
4616 case OP_OUTPORTP: /* output-port? */ 4600 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4617 r = is_outport (a); break;
4618#endif 4601#endif
4619 4602
4620 case OP_PROCP: /* procedure? */ 4603 case OP_PROCP: /* procedure? */
4621 4604
4622 /*-- 4605 /*--
… …
4625 * in R^3 report sec. 6.9 4608 * in R^3 report sec. 6.9
4626 */ 4609 */
4627 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a); 4610 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4628 break; 4611 break;
4629 4612
4630 case OP_PAIRP: /* pair? */ 4613 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4631 r = is_pair (a); break; 4614 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4632 4615 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4633 case OP_LISTP: /* list? */ 4616 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4634 r = list_length (SCHEME_A_ a) >= 0; break; 4617 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4635 4618 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4636 case OP_ENVP: /* environment? */
4637 r = is_environment (a); break;
4638
4639 case OP_VECTORP: /* vector? */
4640 r = is_vector (a); break;
4641
4642 case OP_EQ: /* eq? */
4643 r = a == cadr (x); break;
4644
4645 case OP_EQV: /* eqv? */
4646 r = eqv (a, cadr (x)); break;
4647 } 4619 }
4648 4620
4649 s_retbool (r); 4621 s_retbool (r);
4650} 4622}
4651 4623
4652static pointer 4624static int
4653opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4625opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4654{ 4626{
4627 pointer args = SCHEME_V->args;
4628 pointer a = car (args);
4655 pointer x, y; 4629 pointer x, y;
4656 4630
4657 switch (op) 4631 switch (op)
4658 { 4632 {
4659 case OP_FORCE: /* force */ 4633 case OP_FORCE: /* force */
4660 SCHEME_V->code = car (SCHEME_V->args); 4634 SCHEME_V->code = a;
4661 4635
4662 if (is_promise (SCHEME_V->code)) 4636 if (is_promise (SCHEME_V->code))
4663 { 4637 {
4664 /* Should change type to closure here */ 4638 /* Should change type to closure here */
4665 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4639 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4686 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4660 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4687 SCHEME_V->outport = cadr (SCHEME_V->args); 4661 SCHEME_V->outport = cadr (SCHEME_V->args);
4688 } 4662 }
4689 } 4663 }
4690 4664
4691 SCHEME_V->args = car (SCHEME_V->args); 4665 SCHEME_V->args = a;
4692 4666
4693 if (op == OP_WRITE) 4667 if (op == OP_WRITE)
4694 SCHEME_V->print_flag = 1; 4668 SCHEME_V->print_flag = 1;
4695 else 4669 else
4696 SCHEME_V->print_flag = 0; 4670 SCHEME_V->print_flag = 0;
4697 4671
4698 s_goto (OP_P0LIST); 4672 s_goto (OP_P0LIST);
4699 4673
4700 case OP_NEWLINE: /* newline */ 4674 case OP_NEWLINE: /* newline */
4701 if (is_pair (SCHEME_V->args)) 4675 if (is_pair (args))
4702 { 4676 {
4703 if (car (SCHEME_V->args) != SCHEME_V->outport) 4677 if (a != SCHEME_V->outport)
4704 { 4678 {
4705 x = cons (SCHEME_V->outport, NIL); 4679 x = cons (SCHEME_V->outport, NIL);
4706 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4680 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4707 SCHEME_V->outport = car (SCHEME_V->args); 4681 SCHEME_V->outport = a;
4708 } 4682 }
4709 } 4683 }
4710 4684
4711 putstr (SCHEME_A_ "\n"); 4685 putstr (SCHEME_A_ "\n");
4712 s_return (S_T); 4686 s_return (S_T);
4713#endif 4687#endif
4714 4688
4715 case OP_ERR0: /* error */ 4689 case OP_ERR0: /* error */
4716 SCHEME_V->retcode = -1; 4690 SCHEME_V->retcode = -1;
4717 4691
4718 if (!is_string (car (SCHEME_V->args))) 4692 if (!is_string (a))
4719 { 4693 {
4720 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4694 args = cons (mk_string (SCHEME_A_ " -- "), args);
4721 setimmutable (car (SCHEME_V->args)); 4695 setimmutable (car (args));
4722 } 4696 }
4723 4697
4724 putstr (SCHEME_A_ "Error: "); 4698 putstr (SCHEME_A_ "Error: ");
4725 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4699 putstr (SCHEME_A_ strvalue (car (args)));
4726 SCHEME_V->args = cdr (SCHEME_V->args); 4700 SCHEME_V->args = cdr (args);
4727 s_goto (OP_ERR1); 4701 s_goto (OP_ERR1);
4728 4702
4729 case OP_ERR1: /* error */ 4703 case OP_ERR1: /* error */
4730 putstr (SCHEME_A_ " "); 4704 putstr (SCHEME_A_ " ");
4731 4705
4732 if (SCHEME_V->args != NIL) 4706 if (args != NIL)
4733 { 4707 {
4734 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4708 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4735 SCHEME_V->args = car (SCHEME_V->args); 4709 SCHEME_V->args = a;
4736 SCHEME_V->print_flag = 1; 4710 SCHEME_V->print_flag = 1;
4737 s_goto (OP_P0LIST); 4711 s_goto (OP_P0LIST);
4738 } 4712 }
4739 else 4713 else
4740 { 4714 {
4741 putstr (SCHEME_A_ "\n"); 4715 putstr (SCHEME_A_ "\n");
4742 4716
4743 if (SCHEME_V->interactive_repl) 4717 if (SCHEME_V->interactive_repl)
4744 s_goto (OP_T0LVL); 4718 s_goto (OP_T0LVL);
4745 else 4719 else
4746 return NIL; 4720 return -1;
4747 } 4721 }
4748 4722
4749 case OP_REVERSE: /* reverse */ 4723 case OP_REVERSE: /* reverse */
4750 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4724 s_return (reverse (SCHEME_A_ a));
4751 4725
4752 case OP_LIST_STAR: /* list* */ 4726 case OP_LIST_STAR: /* list* */
4753 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4727 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4754 4728
4755 case OP_APPEND: /* append */ 4729 case OP_APPEND: /* append */
4756 x = NIL; 4730 x = NIL;
4757 y = SCHEME_V->args; 4731 y = args;
4758 4732
4759 if (y == x) 4733 if (y == x)
4760 s_return (x); 4734 s_return (x);
4761 4735
4762 /* cdr() in the while condition is not a typo. If car() */ 4736 /* cdr() in the while condition is not a typo. If car() */
… …
4773 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4747 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4774 4748
4775#if USE_PLIST 4749#if USE_PLIST
4776 4750
4777 case OP_PUT: /* put */ 4751 case OP_PUT: /* put */
4778 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4752 if (!hasprop (a) || !hasprop (cadr (args)))
4779 Error_0 ("illegal use of put"); 4753 Error_0 ("illegal use of put");
4780 4754
4781 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4755 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4782 { 4756 {
4783 if (caar (x) == y) 4757 if (caar (x) == y)
4784 break; 4758 break;
4785 } 4759 }
4786 4760
4787 if (x != NIL) 4761 if (x != NIL)
4788 cdar (x) = caddr (SCHEME_V->args); 4762 cdar (x) = caddr (args);
4789 else 4763 else
4790 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4764 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4791 4765
4792 s_return (S_T); 4766 s_return (S_T);
4793 4767
4794 case OP_GET: /* get */ 4768 case OP_GET: /* get */
4795 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4769 if (!hasprop (a) || !hasprop (cadr (args)))
4796 Error_0 ("illegal use of get"); 4770 Error_0 ("illegal use of get");
4797 4771
4798 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4772 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4799 if (caar (x) == y) 4773 if (caar (x) == y)
4800 break; 4774 break;
4801 4775
4802 if (x != NIL) 4776 if (x != NIL)
4803 s_return (cdar (x)); 4777 s_return (cdar (x));
… …
4805 s_return (NIL); 4779 s_return (NIL);
4806 4780
4807#endif /* USE_PLIST */ 4781#endif /* USE_PLIST */
4808 4782
4809 case OP_QUIT: /* quit */ 4783 case OP_QUIT: /* quit */
4810 if (is_pair (SCHEME_V->args)) 4784 if (is_pair (args))
4811 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4785 SCHEME_V->retcode = ivalue (a);
4812 4786
4813 return NIL; 4787 return -1;
4814 4788
4815 case OP_GC: /* gc */ 4789 case OP_GC: /* gc */
4816 gc (SCHEME_A_ NIL, NIL); 4790 gc (SCHEME_A_ NIL, NIL);
4817 s_return (S_T); 4791 s_return (S_T);
4818 4792
4819 case OP_GCVERB: /* gc-verbose */ 4793 case OP_GCVERB: /* gc-verbose */
4820 { 4794 {
4821 int was = SCHEME_V->gc_verbose; 4795 int was = SCHEME_V->gc_verbose;
4822 4796
4823 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4797 SCHEME_V->gc_verbose = (a != S_F);
4824 s_retbool (was); 4798 s_retbool (was);
4825 } 4799 }
4826 4800
4827 case OP_NEWSEGMENT: /* new-segment */ 4801 case OP_NEWSEGMENT: /* new-segment */
4828 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4802 if (!is_pair (args) || !is_number (a))
4829 Error_0 ("new-segment: argument must be a number"); 4803 Error_0 ("new-segment: argument must be a number");
4830 4804
4831 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4805 alloc_cellseg (SCHEME_A_ ivalue (a));
4832 4806
4833 s_return (S_T); 4807 s_return (S_T);
4834 4808
4835 case OP_OBLIST: /* oblist */ 4809 case OP_OBLIST: /* oblist */
4836 s_return (oblist_all_symbols (SCHEME_A)); 4810 s_return (oblist_all_symbols (SCHEME_A));
… …
4863 case OP_OPEN_INOUTFILE: 4837 case OP_OPEN_INOUTFILE:
4864 prop = port_input | port_output; 4838 prop = port_input | port_output;
4865 break; 4839 break;
4866 } 4840 }
4867 4841
4868 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4842 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4869 4843
4870 if (p == NIL) 4844 s_return (p == NIL ? S_F : p);
4871 s_return (S_F);
4872
4873 s_return (p);
4874 } 4845 }
4875 4846
4876# if USE_STRING_PORTS 4847# if USE_STRING_PORTS
4877 4848
4878 case OP_OPEN_INSTRING: /* open-input-string */ 4849 case OP_OPEN_INSTRING: /* open-input-string */
… …
4890 case OP_OPEN_INOUTSTRING: 4861 case OP_OPEN_INOUTSTRING:
4891 prop = port_input | port_output; 4862 prop = port_input | port_output;
4892 break; 4863 break;
4893 } 4864 }
4894 4865
4895 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4866 p = port_from_string (SCHEME_A_ strvalue (a),
4896 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4867 strvalue (a) + strlength (a), prop);
4897 4868
4898 if (p == NIL) 4869 s_return (p == NIL ? S_F : p);
4899 s_return (S_F);
4900
4901 s_return (p);
4902 } 4870 }
4903 4871
4904 case OP_OPEN_OUTSTRING: /* open-output-string */ 4872 case OP_OPEN_OUTSTRING: /* open-output-string */
4905 { 4873 {
4906 pointer p; 4874 pointer p;
4907 4875
4908 if (car (SCHEME_V->args) == NIL) 4876 if (a == NIL)
4909 {
4910 p = port_from_scratch (SCHEME_A); 4877 p = port_from_scratch (SCHEME_A);
4911
4912 if (p == NIL)
4913 s_return (S_F);
4914 }
4915 else 4878 else
4916 {
4917 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4879 p = port_from_string (SCHEME_A_ strvalue (a),
4918 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4880 strvalue (a) + strlength (a), port_output);
4919 4881
4920 if (p == NIL) 4882 s_return (p == NIL ? S_F : p);
4921 s_return (S_F);
4922 }
4923
4924 s_return (p);
4925 } 4883 }
4926 4884
4927 case OP_GET_OUTSTRING: /* get-output-string */ 4885 case OP_GET_OUTSTRING: /* get-output-string */
4928 { 4886 {
4929 port *p; 4887 port *p;
4930 4888
4931 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4889 if ((p = a->object.port)->kind & port_string)
4932 { 4890 {
4933 off_t size; 4891 off_t size;
4934 char *str; 4892 char *str;
4935 4893
4936 size = p->rep.string.curr - p->rep.string.start + 1; 4894 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4952 } 4910 }
4953 4911
4954# endif 4912# endif
4955 4913
4956 case OP_CLOSE_INPORT: /* close-input-port */ 4914 case OP_CLOSE_INPORT: /* close-input-port */
4957 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4915 port_close (SCHEME_A_ a, port_input);
4958 s_return (S_T); 4916 s_return (S_T);
4959 4917
4960 case OP_CLOSE_OUTPORT: /* close-output-port */ 4918 case OP_CLOSE_OUTPORT: /* close-output-port */
4961 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4919 port_close (SCHEME_A_ a, port_output);
4962 s_return (S_T); 4920 s_return (S_T);
4963#endif 4921#endif
4964 4922
4965 case OP_INT_ENV: /* interaction-environment */ 4923 case OP_INT_ENV: /* interaction-environment */
4966 s_return (SCHEME_V->global_env); 4924 s_return (SCHEME_V->global_env);
… …
4968 case OP_CURR_ENV: /* current-environment */ 4926 case OP_CURR_ENV: /* current-environment */
4969 s_return (SCHEME_V->envir); 4927 s_return (SCHEME_V->envir);
4970 4928
4971 } 4929 }
4972 4930
4973 abort (); 4931 if (USE_ERROR_CHECKING) abort ();
4974} 4932}
4975 4933
4976static pointer 4934static int
4977opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4935opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4978{ 4936{
4937 pointer args = SCHEME_V->args;
4979 pointer x; 4938 pointer x;
4980 4939
4981 if (SCHEME_V->nesting != 0) 4940 if (SCHEME_V->nesting != 0)
4982 { 4941 {
4983 int n = SCHEME_V->nesting; 4942 int n = SCHEME_V->nesting;
… …
4990 switch (op) 4949 switch (op)
4991 { 4950 {
4992 /* ========== reading part ========== */ 4951 /* ========== reading part ========== */
4993#if USE_PORTS 4952#if USE_PORTS
4994 case OP_READ: 4953 case OP_READ:
4995 if (!is_pair (SCHEME_V->args)) 4954 if (!is_pair (args))
4996 s_goto (OP_READ_INTERNAL); 4955 s_goto (OP_READ_INTERNAL);
4997 4956
4998 if (!is_inport (car (SCHEME_V->args))) 4957 if (!is_inport (car (args)))
4999 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4958 Error_1 ("read: not an input port:", car (args));
5000 4959
5001 if (car (SCHEME_V->args) == SCHEME_V->inport) 4960 if (car (args) == SCHEME_V->inport)
5002 s_goto (OP_READ_INTERNAL); 4961 s_goto (OP_READ_INTERNAL);
5003 4962
5004 x = SCHEME_V->inport; 4963 x = SCHEME_V->inport;
5005 SCHEME_V->inport = car (SCHEME_V->args); 4964 SCHEME_V->inport = car (args);
5006 x = cons (x, NIL); 4965 x = cons (x, NIL);
5007 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4966 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5008 s_goto (OP_READ_INTERNAL); 4967 s_goto (OP_READ_INTERNAL);
5009 4968
5010 case OP_READ_CHAR: /* read-char */ 4969 case OP_READ_CHAR: /* read-char */
5011 case OP_PEEK_CHAR: /* peek-char */ 4970 case OP_PEEK_CHAR: /* peek-char */
5012 { 4971 {
5013 int c; 4972 int c;
5014 4973
5015 if (is_pair (SCHEME_V->args)) 4974 if (is_pair (args))
5016 { 4975 {
5017 if (car (SCHEME_V->args) != SCHEME_V->inport) 4976 if (car (args) != SCHEME_V->inport)
5018 { 4977 {
5019 x = SCHEME_V->inport; 4978 x = SCHEME_V->inport;
5020 x = cons (x, NIL); 4979 x = cons (x, NIL);
5021 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4980 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5022 SCHEME_V->inport = car (SCHEME_V->args); 4981 SCHEME_V->inport = car (args);
5023 } 4982 }
5024 } 4983 }
5025 4984
5026 c = inchar (SCHEME_A); 4985 c = inchar (SCHEME_A);
5027 4986
… …
5037 case OP_CHAR_READY: /* char-ready? */ 4996 case OP_CHAR_READY: /* char-ready? */
5038 { 4997 {
5039 pointer p = SCHEME_V->inport; 4998 pointer p = SCHEME_V->inport;
5040 int res; 4999 int res;
5041 5000
5042 if (is_pair (SCHEME_V->args)) 5001 if (is_pair (args))
5043 p = car (SCHEME_V->args); 5002 p = car (args);
5044 5003
5045 res = p->object.port->kind & port_string; 5004 res = p->object.port->kind & port_string;
5046 5005
5047 s_retbool (res); 5006 s_retbool (res);
5048 } 5007 }
5049 5008
5050 case OP_SET_INPORT: /* set-input-port */ 5009 case OP_SET_INPORT: /* set-input-port */
5051 SCHEME_V->inport = car (SCHEME_V->args); 5010 SCHEME_V->inport = car (args);
5052 s_return (SCHEME_V->value); 5011 s_return (SCHEME_V->value);
5053 5012
5054 case OP_SET_OUTPORT: /* set-output-port */ 5013 case OP_SET_OUTPORT: /* set-output-port */
5055 SCHEME_V->outport = car (SCHEME_V->args); 5014 SCHEME_V->outport = car (args);
5056 s_return (SCHEME_V->value); 5015 s_return (SCHEME_V->value);
5057#endif 5016#endif
5058 5017
5059 case OP_RDSEXPR: 5018 case OP_RDSEXPR:
5060 switch (SCHEME_V->tok) 5019 switch (SCHEME_V->tok)
… …
5109 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5068 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5110 SCHEME_V->tok = token (SCHEME_A); 5069 SCHEME_V->tok = token (SCHEME_A);
5111 s_goto (OP_RDSEXPR); 5070 s_goto (OP_RDSEXPR);
5112 5071
5113 case TOK_ATOM: 5072 case TOK_ATOM:
5114 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5073 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5074
5075 case TOK_DOTATOM:
5076 SCHEME_V->strbuff[0] = '.';
5077 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5078
5079 case TOK_STRATOM:
5080 x = readstrexp (SCHEME_A_ '|');
5081 //TODO: haven't checked whether the garbage collector could interfere
5082 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5115 5083
5116 case TOK_DQUOTE: 5084 case TOK_DQUOTE:
5117 x = readstrexp (SCHEME_A); 5085 x = readstrexp (SCHEME_A_ '"');
5118 5086
5119 if (x == S_F) 5087 if (x == S_F)
5120 Error_0 ("Error reading string"); 5088 Error_0 ("Error reading string");
5121 5089
5122 setimmutable (x); 5090 setimmutable (x);
… …
5134 s_goto (OP_EVAL); 5102 s_goto (OP_EVAL);
5135 } 5103 }
5136 } 5104 }
5137 5105
5138 case TOK_SHARP_CONST: 5106 case TOK_SHARP_CONST:
5139 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5107 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5140 Error_0 ("undefined sharp expression"); 5108 Error_0 ("undefined sharp expression");
5141 else 5109 else
5142 s_return (x); 5110 s_return (x);
5143 5111
5144 default: 5112 default:
… …
5146 } 5114 }
5147 5115
5148 break; 5116 break;
5149 5117
5150 case OP_RDLIST: 5118 case OP_RDLIST:
5151 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5119 SCHEME_V->args = cons (SCHEME_V->value, args);
5152 SCHEME_V->tok = token (SCHEME_A); 5120 SCHEME_V->tok = token (SCHEME_A);
5153 5121
5154 switch (SCHEME_V->tok) 5122 switch (SCHEME_V->tok)
5155 { 5123 {
5156 case TOK_EOF: 5124 case TOK_EOF:
… …
5184 case OP_RDDOT: 5152 case OP_RDDOT:
5185 if (token (SCHEME_A) != TOK_RPAREN) 5153 if (token (SCHEME_A) != TOK_RPAREN)
5186 Error_0 ("syntax error: illegal dot expression"); 5154 Error_0 ("syntax error: illegal dot expression");
5187 5155
5188 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5156 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5189 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5157 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5190 5158
5191 case OP_RDQUOTE: 5159 case OP_RDQUOTE:
5192 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5160 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5193 5161
5194 case OP_RDQQUOTE: 5162 case OP_RDQQUOTE:
… …
5216 SCHEME_V->args = SCHEME_V->value; 5184 SCHEME_V->args = SCHEME_V->value;
5217 s_goto (OP_VECTOR); 5185 s_goto (OP_VECTOR);
5218 5186
5219 /* ========== printing part ========== */ 5187 /* ========== printing part ========== */
5220 case OP_P0LIST: 5188 case OP_P0LIST:
5221 if (is_vector (SCHEME_V->args)) 5189 if (is_vector (args))
5222 { 5190 {
5223 putstr (SCHEME_A_ "#("); 5191 putstr (SCHEME_A_ "#(");
5224 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5192 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5225 s_goto (OP_PVECFROM); 5193 s_goto (OP_PVECFROM);
5226 } 5194 }
5227 else if (is_environment (SCHEME_V->args)) 5195 else if (is_environment (args))
5228 { 5196 {
5229 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5197 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5230 s_return (S_T); 5198 s_return (S_T);
5231 } 5199 }
5232 else if (!is_pair (SCHEME_V->args)) 5200 else if (!is_pair (args))
5233 { 5201 {
5234 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5235 s_return (S_T); 5203 s_return (S_T);
5236 } 5204 }
5237 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5205 else
5238 { 5206 {
5207 pointer a = car (args);
5208 pointer b = cdr (args);
5209 int ok_abbr = ok_abbrev (b);
5210 SCHEME_V->args = car (b);
5211
5212 if (a == SCHEME_V->QUOTE && ok_abbr)
5239 putstr (SCHEME_A_ "'"); 5213 putstr (SCHEME_A_ "'");
5240 SCHEME_V->args = cadr (SCHEME_V->args); 5214 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5215 putstr (SCHEME_A_ "`");
5216 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5217 putstr (SCHEME_A_ ",");
5218 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5219 putstr (SCHEME_A_ ",@");
5220 else
5221 {
5222 putstr (SCHEME_A_ "(");
5223 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5224 SCHEME_V->args = a;
5225 }
5226
5241 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5242 } 5228 }
5243 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5229
5230 case OP_P1LIST:
5231 if (is_pair (args))
5244 { 5232 {
5233 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5245 putstr (SCHEME_A_ "`"); 5234 putstr (SCHEME_A_ " ");
5246 SCHEME_V->args = cadr (SCHEME_V->args); 5235 SCHEME_V->args = car (args);
5247 s_goto (OP_P0LIST); 5236 s_goto (OP_P0LIST);
5248 } 5237 }
5249 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5250 {
5251 putstr (SCHEME_A_ ",");
5252 SCHEME_V->args = cadr (SCHEME_V->args);
5253 s_goto (OP_P0LIST);
5254 }
5255 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5256 {
5257 putstr (SCHEME_A_ ",@");
5258 SCHEME_V->args = cadr (SCHEME_V->args);
5259 s_goto (OP_P0LIST);
5260 }
5261 else
5262 {
5263 putstr (SCHEME_A_ "(");
5264 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5265 SCHEME_V->args = car (SCHEME_V->args);
5266 s_goto (OP_P0LIST);
5267 }
5268
5269 case OP_P1LIST:
5270 if (is_pair (SCHEME_V->args))
5271 {
5272 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5273 putstr (SCHEME_A_ " ");
5274 SCHEME_V->args = car (SCHEME_V->args);
5275 s_goto (OP_P0LIST);
5276 }
5277 else if (is_vector (SCHEME_V->args)) 5238 else if (is_vector (args))
5278 { 5239 {
5279 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5240 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5280 putstr (SCHEME_A_ " . "); 5241 putstr (SCHEME_A_ " . ");
5281 s_goto (OP_P0LIST); 5242 s_goto (OP_P0LIST);
5282 } 5243 }
5283 else 5244 else
5284 { 5245 {
5285 if (SCHEME_V->args != NIL) 5246 if (args != NIL)
5286 { 5247 {
5287 putstr (SCHEME_A_ " . "); 5248 putstr (SCHEME_A_ " . ");
5288 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5249 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5289 } 5250 }
5290 5251
5291 putstr (SCHEME_A_ ")"); 5252 putstr (SCHEME_A_ ")");
5292 s_return (S_T); 5253 s_return (S_T);
5293 } 5254 }
5294 5255
5295 case OP_PVECFROM: 5256 case OP_PVECFROM:
5296 { 5257 {
5297 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5258 int i = ivalue_unchecked (cdr (args));
5298 pointer vec = car (SCHEME_V->args); 5259 pointer vec = car (args);
5299 int len = veclength (vec); 5260 int len = veclength (vec);
5300 5261
5301 if (i == len) 5262 if (i == len)
5302 { 5263 {
5303 putstr (SCHEME_A_ ")"); 5264 putstr (SCHEME_A_ ")");
5304 s_return (S_T); 5265 s_return (S_T);
5305 } 5266 }
5306 else 5267 else
5307 { 5268 {
5308 pointer elem = vector_elem (vec, i); 5269 pointer elem = vector_get (vec, i);
5309 5270
5310 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5271 ivalue_unchecked (cdr (args)) = i + 1;
5311 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5272 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5312 SCHEME_V->args = elem; 5273 SCHEME_V->args = elem;
5313 5274
5314 if (i > 0) 5275 if (i > 0)
5315 putstr (SCHEME_A_ " "); 5276 putstr (SCHEME_A_ " ");
5316 5277
5317 s_goto (OP_P0LIST); 5278 s_goto (OP_P0LIST);
5318 } 5279 }
5319 } 5280 }
5320 } 5281 }
5321 5282
5322 abort (); 5283 if (USE_ERROR_CHECKING) abort ();
5323} 5284}
5324 5285
5325static pointer 5286static int
5326opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5287opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5327{ 5288{
5289 pointer args = SCHEME_V->args;
5290 pointer a = car (args);
5328 pointer x, y; 5291 pointer x, y;
5329 5292
5330 switch (op) 5293 switch (op)
5331 { 5294 {
5332 case OP_LIST_LENGTH: /* length *//* a.k */ 5295 case OP_LIST_LENGTH: /* length *//* a.k */
5333 { 5296 {
5334 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5297 long v = list_length (SCHEME_A_ a);
5335 5298
5336 if (v < 0) 5299 if (v < 0)
5337 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5300 Error_1 ("length: not a list:", a);
5338 5301
5339 s_return (mk_integer (SCHEME_A_ v)); 5302 s_return (mk_integer (SCHEME_A_ v));
5340 } 5303 }
5341 5304
5342 case OP_ASSQ: /* assq *//* a.k */ 5305 case OP_ASSQ: /* assq *//* a.k */
5343 x = car (SCHEME_V->args); 5306 x = a;
5344 5307
5345 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5308 for (y = cadr (args); is_pair (y); y = cdr (y))
5346 { 5309 {
5347 if (!is_pair (car (y))) 5310 if (!is_pair (car (y)))
5348 Error_0 ("unable to handle non pair element"); 5311 Error_0 ("unable to handle non pair element");
5349 5312
5350 if (x == caar (y)) 5313 if (x == caar (y))
… …
5356 else 5319 else
5357 s_return (S_F); 5320 s_return (S_F);
5358 5321
5359 5322
5360 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5323 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5361 SCHEME_V->args = car (SCHEME_V->args); 5324 SCHEME_V->args = a;
5362 5325
5363 if (SCHEME_V->args == NIL) 5326 if (SCHEME_V->args == NIL)
5364 s_return (S_F); 5327 s_return (S_F);
5365 else if (is_closure (SCHEME_V->args)) 5328 else if (is_closure (SCHEME_V->args))
5366 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5329 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5371 5334
5372 case OP_CLOSUREP: /* closure? */ 5335 case OP_CLOSUREP: /* closure? */
5373 /* 5336 /*
5374 * Note, macro object is also a closure. 5337 * Note, macro object is also a closure.
5375 * Therefore, (closure? <#MACRO>) ==> #t 5338 * Therefore, (closure? <#MACRO>) ==> #t
5339 * (schmorp) well, obviously not, fix? TODO
5376 */ 5340 */
5377 s_retbool (is_closure (car (SCHEME_V->args))); 5341 s_retbool (is_closure (a));
5378 5342
5379 case OP_MACROP: /* macro? */ 5343 case OP_MACROP: /* macro? */
5380 s_retbool (is_macro (car (SCHEME_V->args))); 5344 s_retbool (is_macro (a));
5381 } 5345 }
5382 5346
5383 abort (); 5347 if (USE_ERROR_CHECKING) abort ();
5384} 5348}
5385 5349
5350/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5386typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5351typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5387 5352
5388typedef int (*test_predicate) (pointer); 5353typedef int (*test_predicate)(pointer);
5389static int 5354static int
5390is_any (pointer p) 5355tst_any (pointer p)
5391{ 5356{
5392 return 1; 5357 return 1;
5393} 5358}
5394 5359
5395static int 5360static int
5396is_nonneg (pointer p) 5361tst_inonneg (pointer p)
5397{ 5362{
5398 return ivalue (p) >= 0 && is_integer (p); 5363 return is_integer (p) && ivalue_unchecked (p) >= 0;
5364}
5365
5366static int
5367tst_is_list (SCHEME_P_ pointer p)
5368{
5369 return p == NIL || is_pair (p);
5399} 5370}
5400 5371
5401/* Correspond carefully with following defines! */ 5372/* Correspond carefully with following defines! */
5402static struct 5373static struct
5403{ 5374{
5404 test_predicate fct; 5375 test_predicate fct;
5405 const char *kind; 5376 const char *kind;
5406} tests[] = 5377} tests[] = {
5407{ 5378 { tst_any , 0 },
5408 { 0, 0}, /* unused */ 5379 { is_string , "string" },
5409 { is_any, 0}, 5380 { is_symbol , "symbol" },
5410 { is_string, "string" }, 5381 { is_port , "port" },
5411 { is_symbol, "symbol" },
5412 { is_port, "port" },
5413 { is_inport, "input port" }, 5382 { is_inport , "input port" },
5414 { is_outport, "output port" }, 5383 { is_outport , "output port" },
5415 { is_environment, "environment" }, 5384 { is_environment, "environment" },
5416 { is_pair, "pair" }, 5385 { is_pair , "pair" },
5417 { 0, "pair or '()" }, 5386 { 0 , "pair or '()" },
5418 { is_character, "character" }, 5387 { is_character , "character" },
5419 { is_vector, "vector" }, 5388 { is_vector , "vector" },
5420 { is_number, "number" }, 5389 { is_number , "number" },
5421 { is_integer, "integer" }, 5390 { is_integer , "integer" },
5422 { is_nonneg, "non-negative integer" } 5391 { tst_inonneg , "non-negative integer" }
5423}; 5392};
5424 5393
5425#define TST_NONE 0 5394#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5426#define TST_ANY "\001" 5395#define TST_ANY "\001"
5427#define TST_STRING "\002" 5396#define TST_STRING "\002"
5428#define TST_SYMBOL "\003" 5397#define TST_SYMBOL "\003"
5429#define TST_PORT "\004" 5398#define TST_PORT "\004"
5430#define TST_INPORT "\005" 5399#define TST_INPORT "\005"
5431#define TST_OUTPORT "\006" 5400#define TST_OUTPORT "\006"
5432#define TST_ENVIRONMENT "\007" 5401#define TST_ENVIRONMENT "\007"
5433#define TST_PAIR "\010" 5402#define TST_PAIR "\010"
5434#define TST_LIST "\011" 5403#define TST_LIST "\011"
5435#define TST_CHAR "\012" 5404#define TST_CHAR "\012"
5436#define TST_VECTOR "\013" 5405#define TST_VECTOR "\013"
5437#define TST_NUMBER "\014" 5406#define TST_NUMBER "\014"
5438#define TST_INTEGER "\015" 5407#define TST_INTEGER "\015"
5439#define TST_NATURAL "\016" 5408#define TST_NATURAL "\016"
5409
5410#define INF_ARG 0xff
5411#define UNNAMED_OP ""
5412
5413static const char opnames[] =
5414#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5415#include "opdefines.h"
5416#undef OP_DEF
5417;
5418
5419static const char *
5420opname (int idx)
5421{
5422 const char *name = opnames;
5423
5424 /* should do this at compile time, but would require external program, right? */
5425 while (idx--)
5426 name += strlen (name) + 1;
5427
5428 return *name ? name : "ILLEGAL";
5429}
5430
5431static const char *
5432procname (pointer x)
5433{
5434 return opname (procnum (x));
5435}
5440 5436
5441typedef struct 5437typedef struct
5442{ 5438{
5443 dispatch_func func; 5439 uint8_t func;
5444 char *name; 5440 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5441 uint8_t builtin;
5442#if USE_ERROR_CHECKING
5445 int min_arity; 5443 uint8_t min_arity;
5446 int max_arity; 5444 uint8_t max_arity;
5447 char *arg_tests_encoding; 5445 char arg_tests_encoding[3];
5446#endif
5448} op_code_info; 5447} op_code_info;
5449 5448
5450#define INF_ARG 0xffff
5451
5452static op_code_info dispatch_table[] = { 5449static const op_code_info dispatch_table[] = {
5453#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5450#if USE_ERROR_CHECKING
5451#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5452#else
5453#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5454#endif
5454#include "opdefines.h" 5455#include "opdefines.h"
5456#undef OP_DEF
5455 {0} 5457 {0}
5456}; 5458};
5457 5459
5458static const char *
5459procname (pointer x)
5460{
5461 int n = procnum (x);
5462 const char *name = dispatch_table[n].name;
5463
5464 if (name == 0)
5465 name = "ILLEGAL!";
5466
5467 return name;
5468}
5469
5470/* kernel of this interpreter */ 5460/* kernel of this interpreter */
5471static void 5461static void ecb_hot
5472Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5462Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5473{ 5463{
5474 SCHEME_V->op = op; 5464 SCHEME_V->op = op;
5475 5465
5476 for (;;) 5466 for (;;)
5477 { 5467 {
5478 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5468 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5479 5469
5480#if USE_ERROR_CHECKING 5470#if USE_ERROR_CHECKING
5481 if (pcd->name) /* if built-in function, check arguments */ 5471 if (pcd->builtin) /* if built-in function, check arguments */
5482 { 5472 {
5483 int ok = 1;
5484 char msg[STRBUFFSIZE]; 5473 char msg[STRBUFFSIZE];
5485 int n = list_length (SCHEME_A_ SCHEME_V->args); 5474 int n = list_length (SCHEME_A_ SCHEME_V->args);
5486 5475
5487 /* Check number of arguments */ 5476 /* Check number of arguments */
5488 if (ecb_expect_false (n < pcd->min_arity)) 5477 if (ecb_expect_false (n < pcd->min_arity))
5489 { 5478 {
5490 ok = 0;
5491 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5479 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5492 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5480 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5481 xError_1 (SCHEME_A_ msg, 0);
5482 continue;
5493 } 5483 }
5494 else if (ecb_excpect_false (n > pcd->max_arity)) 5484 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5495 { 5485 {
5496 ok = 0;
5497 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5486 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5498 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5487 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5488 xError_1 (SCHEME_A_ msg, 0);
5489 continue;
5499 } 5490 }
5500 5491 else
5501 if (ecb_expect_false (ok))
5502 { 5492 {
5503 if (pcd->arg_tests_encoding) 5493 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5504 { 5494 {
5505 int i = 0; 5495 int i = 0;
5506 int j; 5496 int j;
5507 const char *t = pcd->arg_tests_encoding; 5497 const char *t = pcd->arg_tests_encoding;
5508 pointer arglist = SCHEME_V->args; 5498 pointer arglist = SCHEME_V->args;
5509 5499
5510 do 5500 do
5511 { 5501 {
5512 pointer arg = car (arglist); 5502 pointer arg = car (arglist);
5513 5503
5514 j = (int) t[0]; 5504 j = t[0];
5515 5505
5506 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5516 if (j == TST_LIST[0]) 5507 if (j == TST_LIST[0])
5517 { 5508 {
5518 if (arg != NIL && !is_pair (arg)) 5509 if (!tst_is_list (SCHEME_A_ arg))
5519 break; 5510 break;
5520 } 5511 }
5521 else 5512 else
5522 { 5513 {
5523 if (!tests[j].fct (arg)) 5514 if (!tests[j - 1].fct (arg))
5524 break; 5515 break;
5525 } 5516 }
5526 5517
5527 if (t[1] != 0) /* last test is replicated as necessary */ 5518 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5528 t++; 5519 t++;
5529 5520
5530 arglist = cdr (arglist); 5521 arglist = cdr (arglist);
5531 i++; 5522 i++;
5532 } 5523 }
5533 while (i < n); 5524 while (i < n);
5534 5525
5535 if (i < n) 5526 if (i < n)
5536 { 5527 {
5537 ok = 0;
5538 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5528 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5529 xError_1 (SCHEME_A_ msg, 0);
5530 continue;
5539 } 5531 }
5540 } 5532 }
5541 } 5533 }
5542
5543 if (!ok)
5544 {
5545 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5546 return;
5547
5548 pcd = dispatch_table + SCHEME_V->op;
5549 }
5550 } 5534 }
5551#endif 5535#endif
5552 5536
5553 ok_to_freely_gc (SCHEME_A); 5537 ok_to_freely_gc (SCHEME_A);
5554 5538
5539 static const dispatch_func dispatch_funcs[] = {
5540 opexe_0,
5541 opexe_1,
5542 opexe_2,
5543 opexe_3,
5544 opexe_4,
5545 opexe_5,
5546 opexe_6,
5547 };
5548
5555 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5549 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5556 return; 5550 return;
5557 5551
5558 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5552 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5559 { 5553 {
5560 xwrstr ("No memory!\n"); 5554 xwrstr ("No memory!\n");
… …
5584mk_proc (SCHEME_P_ enum scheme_opcodes op) 5578mk_proc (SCHEME_P_ enum scheme_opcodes op)
5585{ 5579{
5586 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5580 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5587 set_typeflag (y, (T_PROC | T_ATOM)); 5581 set_typeflag (y, (T_PROC | T_ATOM));
5588 ivalue_unchecked (y) = op; 5582 ivalue_unchecked (y) = op;
5589 set_num_integer (y);
5590 return y; 5583 return y;
5591} 5584}
5592 5585
5593/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5586/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5594static int 5587static int
5595syntaxnum (pointer p) 5588syntaxnum (pointer p)
5596{ 5589{
5597 const char *s = strvalue (car (p)); 5590 const char *s = strvalue (p);
5598 5591
5599 switch (strlength (car (p))) 5592 switch (strlength (p))
5600 { 5593 {
5601 case 2: 5594 case 2:
5602 if (s[0] == 'i') 5595 if (s[0] == 'i')
5603 return OP_IF0; /* if */ 5596 return OP_IF0; /* if */
5604 else 5597 else
… …
5659 return OP_C0STREAM; /* cons-stream */ 5652 return OP_C0STREAM; /* cons-stream */
5660 } 5653 }
5661} 5654}
5662 5655
5663#if USE_MULTIPLICITY 5656#if USE_MULTIPLICITY
5664scheme * 5657ecb_cold scheme *
5665scheme_init_new () 5658scheme_init_new ()
5666{ 5659{
5667 scheme *sc = malloc (sizeof (scheme)); 5660 scheme *sc = malloc (sizeof (scheme));
5668 5661
5669 if (!scheme_init (SCHEME_A)) 5662 if (!scheme_init (SCHEME_A))
… …
5674 else 5667 else
5675 return sc; 5668 return sc;
5676} 5669}
5677#endif 5670#endif
5678 5671
5679int 5672ecb_cold int
5680scheme_init (SCHEME_P) 5673scheme_init (SCHEME_P)
5681{ 5674{
5682 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5675 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5683 pointer x; 5676 pointer x;
5677
5678 memset (SCHEME_V, 0, sizeof (*SCHEME_V));//TODO !iso c
5684 5679
5685 num_set_fixnum (num_zero, 1); 5680 num_set_fixnum (num_zero, 1);
5686 num_set_ivalue (num_zero, 0); 5681 num_set_ivalue (num_zero, 0);
5687 num_set_fixnum (num_one, 1); 5682 num_set_fixnum (num_one, 1);
5688 num_set_ivalue (num_one, 1); 5683 num_set_ivalue (num_one, 1);
… …
5757 5752
5758 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5753 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5759 assign_syntax (SCHEME_A_ syntax_names[i]); 5754 assign_syntax (SCHEME_A_ syntax_names[i]);
5760 } 5755 }
5761 5756
5757 // TODO: should iterate via strlen, to avoid n² complexity
5762 for (i = 0; i < n; i++) 5758 for (i = 0; i < n; i++)
5763 if (dispatch_table[i].name != 0) 5759 if (dispatch_table[i].builtin)
5764 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5760 assign_proc (SCHEME_A_ i, opname (i));
5765 5761
5766 /* initialization of global pointers to special symbols */ 5762 /* initialization of global pointers to special symbols */
5767 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5763 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5768 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5764 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5769 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5765 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5808scheme_set_external_data (SCHEME_P_ void *p) 5804scheme_set_external_data (SCHEME_P_ void *p)
5809{ 5805{
5810 SCHEME_V->ext_data = p; 5806 SCHEME_V->ext_data = p;
5811} 5807}
5812 5808
5813void 5809ecb_cold void
5814scheme_deinit (SCHEME_P) 5810scheme_deinit (SCHEME_P)
5815{ 5811{
5816 int i; 5812 int i;
5817 5813
5818#if SHOW_ERROR_LINE 5814#if SHOW_ERROR_LINE
… …
5910{ 5906{
5911 dump_stack_reset (SCHEME_A); 5907 dump_stack_reset (SCHEME_A);
5912 SCHEME_V->envir = SCHEME_V->global_env; 5908 SCHEME_V->envir = SCHEME_V->global_env;
5913 SCHEME_V->file_i = 0; 5909 SCHEME_V->file_i = 0;
5914 SCHEME_V->load_stack[0].kind = port_input | port_string; 5910 SCHEME_V->load_stack[0].kind = port_input | port_string;
5915 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5911 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5916 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5912 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5917 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5913 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5918#if USE_PORTS 5914#if USE_PORTS
5919 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5915 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5920#endif 5916#endif
5921 SCHEME_V->retcode = 0; 5917 SCHEME_V->retcode = 0;
5922 SCHEME_V->interactive_repl = 0; 5918 SCHEME_V->interactive_repl = 0;
… …
6039# endif 6035# endif
6040 int fin; 6036 int fin;
6041 char *file_name = InitFile; 6037 char *file_name = InitFile;
6042 int retcode; 6038 int retcode;
6043 int isfile = 1; 6039 int isfile = 1;
6040 system ("ps v $PPID");//D
6044 6041
6045 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6042 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6046 { 6043 {
6047 xwrstr ("Usage: tinyscheme -?\n"); 6044 xwrstr ("Usage: tinyscheme -?\n");
6048 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6045 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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