ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/microscheme/scheme.c
(Generate patch)

Comparing microscheme/scheme.c (file contents):
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC vs.
Revision 1.49 by root, Mon Nov 30 13:09:56 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#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79
80#if !USE_MULTIPLICITY 90#if !USE_MULTIPLICITY
81static scheme sc; 91static scheme sc;
82#endif 92#endif
83 93
84static void 94static void
… …
153 163
154#define toupper(c) xtoupper (c) 164#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 165#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 166#define isdigit(c) xisdigit (c)
157 167
158#if USE_STRLWR 168#if USE_IGNORECASE
159static const char * 169static const char *
160strlwr (char *s) 170xstrlwr (char *s)
161{ 171{
162 const char *p = s; 172 const char *p = s;
163 173
164 while (*s) 174 while (*s)
165 { 175 {
… …
167 s++; 177 s++;
168 } 178 }
169 179
170 return p; 180 return p;
171} 181}
172#endif
173 182
183#define stricmp(a,b) strcasecmp (a, b)
184#define strlwr(s) xstrlwr (s)
185
186#else
174#define stricmp(a,b) strcmp (a, b) 187# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 188# define strlwr(s) (s)
189#endif
176 190
177#ifndef prompt 191#ifndef prompt
178# define prompt "ts> " 192# define prompt "ts> "
179#endif 193#endif
180 194
… …
186# define FIRST_CELLSEGS 3 200# define FIRST_CELLSEGS 3
187#endif 201#endif
188 202
189enum scheme_types 203enum scheme_types
190{ 204{
205 T_INTEGER,
191 T_FREE, 206 T_REAL,
192 T_STRING, 207 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 208 T_SYMBOL,
195 T_PROC, 209 T_PROC,
196 T_PAIR, 210 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 211 T_CLOSURE,
198 T_CONTINUATION, 212 T_CONTINUATION,
199 T_FOREIGN, 213 T_FOREIGN,
200 T_CHARACTER, 214 T_CHARACTER,
201 T_PORT, 215 T_PORT,
… …
211#define T_SYNTAX 0x0010 225#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 226#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 227#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 228#define T_MARK 0x0080 /* only for gc */
215 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
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 256enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 257
218static num num_op (enum num_op op, num a, num b); 258static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 259static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 260static num num_rem (num a, num b);
… …
223#if USE_MATH 263#if USE_MATH
224static double round_per_R5RS (double x); 264static double round_per_R5RS (double x);
225#endif 265#endif
226static int is_zero_rvalue (RVALUE x); 266static int is_zero_rvalue (RVALUE x);
227 267
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233
234static num num_zero; 268static num num_zero;
235static num num_one; 269static num num_one;
236 270
237/* macros for cell operations */ 271/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 272#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 273#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 274#define type(p) (typeflag (p) & T_MASKTYPE)
241 275
242INTERFACE INLINE int 276INTERFACE int
243is_string (pointer p) 277is_string (pointer p)
244{ 278{
245 return type (p) == T_STRING; 279 return type (p) == T_STRING;
246} 280}
247 281
248#define strvalue(p) ((p)->object.string.svalue) 282#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 283#define strlength(p) ((p)->object.string.length)
250 284
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 285INTERFACE int
253is_vector (pointer p) 286is_vector (pointer p)
254{ 287{
255 return type (p) == T_VECTOR; 288 return type (p) == T_VECTOR;
256} 289}
257 290
258#define vecvalue(p) ((p)->object.vector.vvalue) 291#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 292#define veclength(p) ((p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 294INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 296
265INTERFACE uint32_t 297INTERFACE int
266vector_length (pointer vec) 298is_integer (pointer p)
267{ 299{
268 return vec->object.vector.length; 300 return type (p) == T_INTEGER;
269} 301}
270 302
303/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 304INTERFACE int
305is_real (pointer p)
306{
307 return type (p) == T_REAL;
308}
309
310INTERFACE int
272is_number (pointer p) 311is_number (pointer p)
273{ 312{
274 return type (p) == T_NUMBER; 313 return is_integer (p) || is_real (p);
275} 314}
276 315
277INTERFACE INLINE int 316INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 317is_character (pointer p)
297{ 318{
298 return type (p) == T_CHARACTER; 319 return type (p) == T_CHARACTER;
299} 320}
300 321
301INTERFACE INLINE char * 322INTERFACE char *
302string_value (pointer p) 323string_value (pointer p)
303{ 324{
304 return strvalue (p); 325 return strvalue (p);
305} 326}
306 327
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#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
338#if USE_REAL 331#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 332#define rvalue_unchecked(p) (p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 333#define set_rvalue(p,v) (p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 334#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 335#define rvalue_unchecked(p) (p)->object.ivalue
344# define set_num_integer(p) 0 336#define set_rvalue(p,v) (p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 337#endif
338
347INTERFACE long 339INTERFACE long
348charvalue (pointer p) 340charvalue (pointer p)
349{ 341{
350 return ivalue_unchecked (p); 342 return ivalue_unchecked (p);
351} 343}
352 344
353INTERFACE INLINE int 345INTERFACE int
354is_port (pointer p) 346is_port (pointer p)
355{ 347{
356 return type (p) == T_PORT; 348 return type (p) == T_PORT;
357} 349}
358 350
359INTERFACE INLINE int 351INTERFACE int
360is_inport (pointer p) 352is_inport (pointer p)
361{ 353{
362 return is_port (p) && p->object.port->kind & port_input; 354 return is_port (p) && p->object.port->kind & port_input;
363} 355}
364 356
365INTERFACE INLINE int 357INTERFACE int
366is_outport (pointer p) 358is_outport (pointer p)
367{ 359{
368 return is_port (p) && p->object.port->kind & port_output; 360 return is_port (p) && p->object.port->kind & port_output;
369} 361}
370 362
371INTERFACE INLINE int 363INTERFACE int
372is_pair (pointer p) 364is_pair (pointer p)
373{ 365{
374 return type (p) == T_PAIR; 366 return type (p) == T_PAIR;
375} 367}
376 368
… …
408pair_cdr (pointer p) 400pair_cdr (pointer p)
409{ 401{
410 return cdr (p); 402 return cdr (p);
411} 403}
412 404
413INTERFACE INLINE int 405INTERFACE int
414is_symbol (pointer p) 406is_symbol (pointer p)
415{ 407{
416 return type (p) == T_SYMBOL; 408 return type (p) == T_SYMBOL;
417} 409}
418 410
419INTERFACE INLINE char * 411INTERFACE char *
420symname (pointer p) 412symname (pointer p)
421{ 413{
422 return strvalue (car (p)); 414 return strvalue (p);
423} 415}
424 416
425#if USE_PLIST 417#if USE_PLIST
418#error plists are broken because symbols are no longer pairs
419#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 420SCHEME_EXPORT int
427hasprop (pointer p) 421hasprop (pointer p)
428{ 422{
429 return typeflag (p) & T_SYMBOL; 423 return typeflag (p) & T_SYMBOL;
430} 424}
431
432# define symprop(p) cdr(p)
433#endif 425#endif
434 426
435INTERFACE INLINE int 427INTERFACE int
436is_syntax (pointer p) 428is_syntax (pointer p)
437{ 429{
438 return typeflag (p) & T_SYNTAX; 430 return typeflag (p) & T_SYNTAX;
439} 431}
440 432
441INTERFACE INLINE int 433INTERFACE int
442is_proc (pointer p) 434is_proc (pointer p)
443{ 435{
444 return type (p) == T_PROC; 436 return type (p) == T_PROC;
445} 437}
446 438
447INTERFACE INLINE int 439INTERFACE int
448is_foreign (pointer p) 440is_foreign (pointer p)
449{ 441{
450 return type (p) == T_FOREIGN; 442 return type (p) == T_FOREIGN;
451} 443}
452 444
453INTERFACE INLINE char * 445INTERFACE char *
454syntaxname (pointer p) 446syntaxname (pointer p)
455{ 447{
456 return strvalue (car (p)); 448 return strvalue (p);
457} 449}
458 450
459#define procnum(p) ivalue (p) 451#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 452static const char *procname (pointer x);
461 453
462INTERFACE INLINE int 454INTERFACE int
463is_closure (pointer p) 455is_closure (pointer p)
464{ 456{
465 return type (p) == T_CLOSURE; 457 return type (p) == T_CLOSURE;
466} 458}
467 459
468INTERFACE INLINE int 460INTERFACE int
469is_macro (pointer p) 461is_macro (pointer p)
470{ 462{
471 return type (p) == T_MACRO; 463 return type (p) == T_MACRO;
472} 464}
473 465
474INTERFACE INLINE pointer 466INTERFACE pointer
475closure_code (pointer p) 467closure_code (pointer p)
476{ 468{
477 return car (p); 469 return car (p);
478} 470}
479 471
480INTERFACE INLINE pointer 472INTERFACE pointer
481closure_env (pointer p) 473closure_env (pointer p)
482{ 474{
483 return cdr (p); 475 return cdr (p);
484} 476}
485 477
486INTERFACE INLINE int 478INTERFACE int
487is_continuation (pointer p) 479is_continuation (pointer p)
488{ 480{
489 return type (p) == T_CONTINUATION; 481 return type (p) == T_CONTINUATION;
490} 482}
491 483
492#define cont_dump(p) cdr (p) 484#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 485#define set_cont_dump(p,v) set_cdr ((p), (v))
494 486
495/* To do: promise should be forced ONCE only */ 487/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 488INTERFACE int
497is_promise (pointer p) 489is_promise (pointer p)
498{ 490{
499 return type (p) == T_PROMISE; 491 return type (p) == T_PROMISE;
500} 492}
501 493
502INTERFACE INLINE int 494INTERFACE int
503is_environment (pointer p) 495is_environment (pointer p)
504{ 496{
505 return type (p) == T_ENVIRONMENT; 497 return type (p) == T_ENVIRONMENT;
506} 498}
507 499
… …
513 505
514#define is_mark(p) (typeflag (p) & T_MARK) 506#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 507#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 508#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 509
518INTERFACE INLINE int 510INTERFACE int
519is_immutable (pointer p) 511is_immutable (pointer p)
520{ 512{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 513 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 514}
523 515
524INTERFACE INLINE void 516INTERFACE void
525setimmutable (pointer p) 517setimmutable (pointer p)
526{ 518{
527#if USE_ERROR_CHECKING 519#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 520 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 521#endif
530} 522}
531 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
532#if USE_CHAR_CLASSIFIERS 578#if USE_CHAR_CLASSIFIERS
533static INLINE int 579ecb_inline int
534Cisalpha (int c) 580Cisalpha (int c)
535{ 581{
536 return isascii (c) && isalpha (c); 582 return isascii (c) && isalpha (c);
537} 583}
538 584
539static INLINE int 585ecb_inline int
540Cisdigit (int c) 586Cisdigit (int c)
541{ 587{
542 return isascii (c) && isdigit (c); 588 return isascii (c) && isdigit (c);
543} 589}
544 590
545static INLINE int 591ecb_inline int
546Cisspace (int c) 592Cisspace (int c)
547{ 593{
548 return isascii (c) && isspace (c); 594 return isascii (c) && isspace (c);
549} 595}
550 596
551static INLINE int 597ecb_inline int
552Cisupper (int c) 598Cisupper (int c)
553{ 599{
554 return isascii (c) && isupper (c); 600 return isascii (c) && isupper (c);
555} 601}
556 602
557static INLINE int 603ecb_inline int
558Cislower (int c) 604Cislower (int c)
559{ 605{
560 return isascii (c) && islower (c); 606 return isascii (c) && islower (c);
561} 607}
562#endif 608#endif
… …
623#endif 669#endif
624 670
625static int file_push (SCHEME_P_ const char *fname); 671static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 672static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 673static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 674ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 675static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 677static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 678static int count_consecutive_cells (pointer x, int needed);
633static 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);
634static pointer mk_number (SCHEME_P_ const num n); 680static pointer mk_number (SCHEME_P_ const num n);
635static 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);
… …
650static void mark (pointer a); 696static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 697static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 698static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 699static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 700static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 701static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 702static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 703ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 704static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 705static void printslashstring (SCHEME_P_ char *s, int len);
660static 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);
661static void printatom (SCHEME_P_ pointer l, int f); 707static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 708static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 712static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 713static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 714static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 715static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 716static void dump_stack_mark (SCHEME_P);
671static 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);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 722static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 724static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 725static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 726static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 727static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 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
683static num 756static num
684num_op (enum num_op op, num a, num b) 757num_op (enum num_op op, num a, num b)
685{ 758{
686 num ret; 759 num ret;
687 760
688 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));
689 762
690 if (num_is_fixnum (ret)) 763 if (num_is_fixnum (ret))
691 { 764 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 765 switch (op)
696 { 766 {
697 case NUM_ADD: av += bv; break; 767 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 768 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 769 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 770 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 771 }
702 772
703 num_set_ivalue (ret, av); 773 num_set_ivalue (ret, a.ivalue);
704 } 774 }
775#if USE_REAL
705 else 776 else
706 { 777 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 778 switch (op)
711 { 779 {
712 case NUM_ADD: av += bv; break; 780 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 781 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 782 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 783 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 784 }
717 785
718 num_set_rvalue (ret, av); 786 num_set_rvalue (ret, a.rvalue);
719 } 787 }
788#endif
720 789
721 return ret; 790 return ret;
722} 791}
723 792
724static num 793static num
725num_div (num a, num b) 794num_div (num a, num b)
726{ 795{
727 num ret; 796 num ret;
728 797
729 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);
730 799
731 if (num_is_fixnum (ret)) 800 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 801 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 802 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 803 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 804
736 return ret; 805 return ret;
737} 806}
738 807
739static num 808static num
… …
741{ 810{
742 num ret; 811 num ret;
743 long e1, e2, res; 812 long e1, e2, res;
744 813
745 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));
746 e1 = num_get_ivalue (a); 815 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 816 e2 = num_ivalue (b);
748 res = e1 % e2; 817 res = e1 % e2;
749 818
750 /* remainder should have same sign as second operand */ 819 /* remainder should have same sign as second operand */
751 if (res > 0) 820 if (res > 0)
752 { 821 {
… …
768{ 837{
769 num ret; 838 num ret;
770 long e1, e2, res; 839 long e1, e2, res;
771 840
772 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));
773 e1 = num_get_ivalue (a); 842 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 843 e2 = num_ivalue (b);
775 res = e1 % e2; 844 res = e1 % e2;
776 845
777 /* modulo should have same sign as second operand */ 846 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 847 if (res * e2 < 0)
779 res += e2; 848 res += e2;
780 849
781 num_set_ivalue (ret, res); 850 num_set_ivalue (ret, res);
782 return ret; 851 return ret;
783} 852}
784 853
785/* this completely disrespects NaNs */ 854/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 855static int
787num_cmp (num a, num b) 856num_cmp (num a, num b)
788{ 857{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 858 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 859 int ret;
791 860
792 if (is_fixnum) 861 if (is_fixnum)
793 { 862 {
794 IVALUE av = num_get_ivalue (a); 863 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 864 IVALUE bv = num_ivalue (b);
796 865
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 866 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 867 }
799 else 868 else
800 { 869 {
801 RVALUE av = num_get_rvalue (a); 870 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 871 RVALUE bv = num_rvalue (b);
803 872
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 873 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 874 }
806 875
807 return ret; 876 return ret;
… …
833#endif 902#endif
834 903
835static int 904static int
836is_zero_rvalue (RVALUE x) 905is_zero_rvalue (RVALUE x)
837{ 906{
907 return x == 0;
908#if 0
838#if USE_REAL 909#if USE_REAL
839 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. */
840#else 911#else
841 return x == 0; 912 return x == 0;
913#endif
842#endif 914#endif
843} 915}
844 916
845/* allocate new cell segment */ 917/* allocate new cell segment */
846static int 918static int
… …
867 return k; 939 return k;
868 940
869 i = ++SCHEME_V->last_cell_seg; 941 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 942 SCHEME_V->alloc_seg[i] = cp;
871 943
872 /* insert new segment in address order */
873 newp = (pointer)cp; 944 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 945 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 946 SCHEME_V->cell_segsize[i] = segsize;
876
877 //TODO: insert, not swap
878 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
879 {
880 p = SCHEME_V->cell_seg[i];
881 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
882 SCHEME_V->cell_seg[i - 1] = p;
883
884 k = SCHEME_V->cell_segsize[i];
885 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
886 SCHEME_V->cell_segsize[i - 1] = k;
887
888 --i;
889 }
890
891 SCHEME_V->fcells += segsize; 947 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 948 last = newp + segsize - 1;
893 949
894 for (p = newp; p <= last; p++) 950 for (p = newp; p <= last; p++)
895 { 951 {
896 set_typeflag (p, T_FREE); 952 set_typeflag (p, T_PAIR);
897 set_car (p, NIL); 953 set_car (p, NIL);
898 set_cdr (p, p + 1); 954 set_cdr (p, p + 1);
899 } 955 }
900 956
901 /* insert new cells in address order on free list */
902 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
903 {
904 set_cdr (last, SCHEME_V->free_cell); 957 set_cdr (last, SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 958 SCHEME_V->free_cell = newp;
906 }
907 else
908 {
909 p = SCHEME_V->free_cell;
910
911 while (cdr (p) != NIL && newp > cdr (p))
912 p = cdr (p);
913
914 set_cdr (last, cdr (p));
915 set_cdr (p, newp);
916 }
917 } 959 }
918 960
919 return n; 961 return n;
920} 962}
921 963
922/* get new cell. parameter a, b is marked by gc. */ 964/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 965ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 966get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 967{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 968 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 969 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
929 return S_SINK; 971 return S_SINK;
930 972
931 if (SCHEME_V->free_cell == NIL) 973 if (SCHEME_V->free_cell == NIL)
932 { 974 {
933 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;
934 976
935 gc (SCHEME_A_ a, b); 977 gc (SCHEME_A_ a, b);
936 978
937 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)
938 { 980 {
… …
989} 1031}
990 1032
991static pointer 1033static pointer
992get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1034get_vector_object (SCHEME_P_ uint32_t len, pointer init)
993{ 1035{
994 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1036 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
995 pointer *e = malloc (len * sizeof (pointer)); 1037 pointer *e = malloc (len * sizeof (pointer));
996 1038
997 if (!e && USE_ERROR_CHECKING) 1039 if (!e && USE_ERROR_CHECKING)
998 return S_SINK; 1040 return S_SINK;
999 1041
1000 /* Record it as a vector so that gc understands it. */ 1042 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1043 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1044
1003 v->object.vector.vvalue = e; 1045 v->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1046 v->object.vector.length = len;
1005 fill_vector (v, init); 1047 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1048 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1049
1008 return v; 1050 return v;
1009} 1051}
1010 1052
1011static INLINE void 1053ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1054ok_to_freely_gc (SCHEME_P)
1013{ 1055{
1014 set_car (S_SINK, NIL); 1056 set_car (S_SINK, NIL);
1015} 1057}
1016 1058
… …
1053 set_cdr (x, b); 1095 set_cdr (x, b);
1054 1096
1055 return x; 1097 return x;
1056} 1098}
1057 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
1058/* ========== oblist implementation ========== */ 1109/* ========== oblist implementation ========== */
1059 1110
1060#ifndef USE_OBJECT_LIST 1111#ifndef USE_OBJECT_LIST
1061 1112
1113static int
1062static 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}
1063 1124
1064static pointer 1125static pointer
1065oblist_initial_value (SCHEME_P) 1126oblist_initial_value (SCHEME_P)
1066{ 1127{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1069 1130
1070/* returns the new symbol */ 1131/* returns the new symbol */
1071static pointer 1132static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1133oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1134{
1074 int location; 1135 pointer x = generate_symbol (SCHEME_A_ name);
1075
1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1077 set_typeflag (x, T_SYMBOL);
1078 setimmutable (car (x));
1079
1080 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1136 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1081 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)));
1082 return x; 1138 return x;
1083} 1139}
1084 1140
1085static INLINE pointer 1141ecb_inline pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1142oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1143{
1088 int location; 1144 int location;
1089 pointer x; 1145 pointer x;
1090 char *s; 1146 char *s;
1091 1147
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1148 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1149
1094 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))
1095 { 1151 {
1096 s = symname (car (x)); 1152 s = symname (car (x));
1097 1153
1098 /* case-insensitive, per R5RS section 2 */ 1154 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1155 if (stricmp (name, s) == 0)
… …
1109 int i; 1165 int i;
1110 pointer x; 1166 pointer x;
1111 pointer ob_list = NIL; 1167 pointer ob_list = NIL;
1112 1168
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1169 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 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))
1115 ob_list = cons (x, ob_list); 1171 ob_list = cons (x, ob_list);
1116 1172
1117 return ob_list; 1173 return ob_list;
1118} 1174}
1119 1175
… …
1123oblist_initial_value (SCHEME_P) 1179oblist_initial_value (SCHEME_P)
1124{ 1180{
1125 return NIL; 1181 return NIL;
1126} 1182}
1127 1183
1128static INLINE pointer 1184ecb_inline pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1185oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1186{
1131 pointer x; 1187 pointer x;
1132 char *s; 1188 char *s;
1133 1189
… …
1145 1201
1146/* returns the new symbol */ 1202/* returns the new symbol */
1147static pointer 1203static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1204oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1205{
1150 pointer x; 1206 pointer x = generate_symbol (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x));
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1208 return x;
1157} 1209}
1158 1210
1159static pointer 1211static pointer
… …
1180pointer 1232pointer
1181mk_foreign_func (SCHEME_P_ foreign_func f) 1233mk_foreign_func (SCHEME_P_ foreign_func f)
1182{ 1234{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1235 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1236
1185 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1237 set_typeflag (x, T_FOREIGN | T_ATOM);
1186 x->object.ff = f; 1238 x->object.ff = f;
1187 1239
1188 return x; 1240 return x;
1189} 1241}
1190 1242
1191INTERFACE pointer 1243INTERFACE pointer
1192mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1193{ 1245{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1247
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, T_CHARACTER | T_ATOM);
1197 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1250
1199 return x; 1251 return x;
1200} 1252}
1201 1253
1202/* get number atom (integer) */ 1254/* get number atom (integer) */
1203INTERFACE pointer 1255INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1205{ 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 {
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1269
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1270 set_typeflag (x, T_INTEGER | T_ATOM);
1209 ivalue_unchecked (x) = num; 1271 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1210 set_num_integer (x); 1272 set_ivalue (x, n);
1273
1274 *pp = x;
1275 }
1276
1211 return x; 1277 return *pp;
1212} 1278}
1213 1279
1214INTERFACE pointer 1280INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1281mk_real (SCHEME_P_ RVALUE n)
1216{ 1282{
1283#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1284 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1285
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1286 set_typeflag (x, T_REAL | T_ATOM);
1220 rvalue_unchecked (x) = n; 1287 set_rvalue (x, n);
1221 set_num_real (x); 1288
1222 return x; 1289 return x;
1290#else
1291 return mk_integer (SCHEME_A_ n);
1292#endif
1223} 1293}
1224 1294
1225static pointer 1295static pointer
1226mk_number (SCHEME_P_ const num n) 1296mk_number (SCHEME_P_ const num n)
1227{ 1297{
1298#if USE_REAL
1228 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
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1303 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1304#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1305}
1233 1306
1234/* allocate name to string area */ 1307/* allocate name to string area */
1235static char * 1308static char *
1236store_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)
… …
1242 SCHEME_V->no_memory = 1; 1315 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1316 return SCHEME_V->strbuff;
1244 } 1317 }
1245 1318
1246 if (str) 1319 if (str)
1247 { 1320 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1248 int l = strlen (str);
1249
1250 if (l > len_str)
1251 l = len_str;
1252
1253 memcpy (q, str, l);
1254 q[l] = 0;
1255 }
1256 else 1321 else
1257 {
1258 memset (q, fill, len_str); 1322 memset (q, fill, len_str);
1323
1259 q[len_str] = 0; 1324 q[len_str] = 0;
1260 }
1261 1325
1262 return q; 1326 return q;
1263} 1327}
1264 1328
1265INTERFACE pointer 1329INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1343 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1344
1281 set_typeflag (x, T_STRING | T_ATOM); 1345 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1346 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1347 strlength (x) = len;
1348
1284 return x; 1349 return x;
1285} 1350}
1286 1351
1287INTERFACE pointer 1352INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1353mk_string (SCHEME_P_ const char *str)
… …
1295{ 1360{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1361 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1362}
1298 1363
1299INTERFACE void 1364INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1365fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1366{
1302 int i; 1367 int i;
1303 1368
1304 for (i = 0; i < vec->object.vector.length; i++) 1369 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1370 vecvalue (vec)[i] = obj;
1306} 1371}
1307 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
1308INTERFACE pointer 1382INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1383vector_get (pointer vec, uint32_t ielem)
1310{ 1384{
1311 return vecvalue(vec)[ielem]; 1385 return vecvalue(vec)[ielem];
1312} 1386}
1313 1387
1314INTERFACE void 1388INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1389vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1390{
1317 vecvalue(vec)[ielem] = a; 1391 vecvalue(vec)[ielem] = a;
1318} 1392}
1319 1393
1320/* get new symbol */ 1394/* get new symbol */
… …
1332 1406
1333INTERFACE pointer 1407INTERFACE pointer
1334gensym (SCHEME_P) 1408gensym (SCHEME_P)
1335{ 1409{
1336 pointer x; 1410 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1411 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1412 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1342 1413
1343 /* first check oblist */ 1414 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name); 1415}
1345 1416
1346 if (x == NIL) 1417static int
1347 { 1418is_gensym (SCHEME_P_ pointer x)
1348 x = oblist_add_by_name (SCHEME_A_ name); 1419{
1349 return x; 1420 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1421}
1355 1422
1356/* make symbol or number atom from string */ 1423/* make symbol or number atom from string */
1357static pointer 1424static pointer
1358mk_atom (SCHEME_P_ char *q) 1425mk_atom (SCHEME_P_ char *q)
… …
1412 } 1479 }
1413 else if ((c == 'e') || (c == 'E')) 1480 else if ((c == 'e') || (c == 'E'))
1414 { 1481 {
1415 if (!has_fp_exp) 1482 if (!has_fp_exp)
1416 { 1483 {
1417 has_dec_point = 1; /* decimal point illegal 1484 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1485 p++;
1420 1486
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1487 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1488 continue;
1423 } 1489 }
… …
1511 1577
1512 if (ecb_expect_false (is_vector (p))) 1578 if (ecb_expect_false (is_vector (p)))
1513 { 1579 {
1514 int i; 1580 int i;
1515 1581
1516 for (i = 0; i < p->object.vector.length; i++) 1582 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1583 mark (vecvalue (p)[i]);
1518 } 1584 }
1519 1585
1520 if (is_atom (p)) 1586 if (is_atom (p))
1521 goto E6; 1587 goto E6;
… …
1594 /* Mark recent objects the interpreter doesn't know about yet. */ 1660 /* Mark recent objects the interpreter doesn't know about yet. */
1595 mark (car (S_SINK)); 1661 mark (car (S_SINK));
1596 /* Mark any older stuff above nested C calls */ 1662 /* Mark any older stuff above nested C calls */
1597 mark (SCHEME_V->c_nest); 1663 mark (SCHEME_V->c_nest);
1598 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
1599 /* mark variables a, b */ 1672 /* mark variables a, b */
1600 mark (a); 1673 mark (a);
1601 mark (b); 1674 mark (b);
1602 1675
1603 /* garbage collect */ 1676 /* garbage collect */
1604 clrmark (NIL); 1677 clrmark (NIL);
1605 SCHEME_V->fcells = 0; 1678 SCHEME_V->fcells = 0;
1606 SCHEME_V->free_cell = NIL; 1679 SCHEME_V->free_cell = NIL;
1607 1680
1608 /* free-list is kept sorted by address so as to maintain consecutive 1681 if (SCHEME_V->gc_verbose)
1609 ranges, if possible, for use with vectors. Here we scan the cells 1682 xwrstr ("freeing...");
1610 (which are also kept sorted by address) downwards to build the 1683
1611 free-list in sorted order. 1684 uint32_t total = 0;
1612 */ 1685
1686 /* Here we scan the cells to build the free-list. */
1613 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1687 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1614 { 1688 {
1615 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];
1616 1691
1617 while (--p >= SCHEME_V->cell_seg[i]) 1692 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1618 { 1693 {
1619 if (is_mark (p)) 1694 if (is_mark (p))
1620 clrmark (p); 1695 clrmark (p);
1621 else 1696 else
1622 { 1697 {
1623 /* reclaim cell */ 1698 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1699 if (typeflag (p) != T_PAIR)
1625 { 1700 {
1626 finalize_cell (SCHEME_A_ p); 1701 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE); 1702 set_typeflag (p, T_PAIR);
1628 set_car (p, NIL); 1703 set_car (p, NIL);
1629 } 1704 }
1630 1705
1631 ++SCHEME_V->fcells; 1706 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1707 set_cdr (p, SCHEME_V->free_cell);
… …
1634 } 1709 }
1635 } 1710 }
1636 } 1711 }
1637 1712
1638 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1714 {
1639 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 }
1640} 1717}
1641 1718
1642static void 1719static void
1643finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1644{ 1721{
1645 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1646 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1647 free (strvalue (a)); 1724 free (strvalue (a));
1648 else if (is_vector (a)) 1725 else if (is_vector (a))
1649 free (vecvalue (a)); 1726 free (vecvalue (a));
1650#if USE_PORTS 1727#if USE_PORTS
1651 else if (is_port (a)) 1728 else if (is_port (a))
… …
2073#endif 2150#endif
2074} 2151}
2075 2152
2076/* read characters up to delimiter, but cater to character constants */ 2153/* read characters up to delimiter, but cater to character constants */
2077static char * 2154static char *
2078readstr_upto (SCHEME_P_ char *delim) 2155readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2156{
2080 char *p = SCHEME_V->strbuff; 2157 char *p = SCHEME_V->strbuff + skip;
2081 2158
2082 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))));
2083 2160
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2161 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2162 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2169 return SCHEME_V->strbuff;
2093} 2170}
2094 2171
2095/* read string expression "xxx...xxx" */ 2172/* read string expression "xxx...xxx" */
2096static pointer 2173static pointer
2097readstrexp (SCHEME_P) 2174readstrexp (SCHEME_P_ char delim)
2098{ 2175{
2099 char *p = SCHEME_V->strbuff; 2176 char *p = SCHEME_V->strbuff;
2100 int c; 2177 int c;
2101 int c1 = 0; 2178 int c1 = 0;
2102 enum
2103 { 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;
2104 2180
2105 for (;;) 2181 for (;;)
2106 { 2182 {
2107 c = inchar (SCHEME_A); 2183 c = inchar (SCHEME_A);
2108 2184
… …
2110 return S_F; 2186 return S_F;
2111 2187
2112 switch (state) 2188 switch (state)
2113 { 2189 {
2114 case st_ok: 2190 case st_ok:
2115 switch (c) 2191 if (ecb_expect_false (c == delim))
2116 {
2117 case '\\':
2118 state = st_bsl;
2119 break;
2120
2121 case '"':
2122 *p = 0;
2123 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);
2124 2193
2125 default: 2194 if (ecb_expect_false (c == '\\'))
2195 state = st_bsl;
2196 else
2126 *p++ = c; 2197 *p++ = c;
2127 break;
2128 }
2129 2198
2130 break; 2199 break;
2131 2200
2132 case st_bsl: 2201 case st_bsl:
2133 switch (c) 2202 switch (c)
… …
2163 case 'r': 2232 case 'r':
2164 *p++ = '\r'; 2233 *p++ = '\r';
2165 state = st_ok; 2234 state = st_ok;
2166 break; 2235 break;
2167 2236
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2237 default:
2174 *p++ = c; 2238 *p++ = c;
2175 state = st_ok; 2239 state = st_ok;
2176 break; 2240 break;
2177 } 2241 }
2178 2242
2179 break; 2243 break;
2180 2244
2181 case st_x1: 2245 case st_x1:
2182 case st_x2: 2246 case st_x2:
2183 c = toupper (c); 2247 c = tolower (c);
2184 2248
2185 if (c >= '0' && c <= 'F') 2249 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2250 c1 = (c1 << 4) + c - '0';
2189 else 2251 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2252 c1 = (c1 << 4) + c - 'a' + 10;
2191
2192 if (state == st_x1)
2193 state = st_x2;
2194 else
2195 {
2196 *p++ = c1;
2197 state = st_ok;
2198 }
2199 }
2200 else 2253 else
2201 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 }
2202 2263
2203 break; 2264 break;
2204 2265
2205 case st_oct1: 2266 case st_oct1:
2206 case st_oct2: 2267 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2271 backchar (SCHEME_A_ c);
2211 state = st_ok; 2272 state = st_ok;
2212 } 2273 }
2213 else 2274 else
2214 { 2275 {
2215 if (state == st_oct2 && c1 >= 32) 2276 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2277 return S_F;
2217 2278
2218 c1 = (c1 << 3) + (c - '0'); 2279 c1 = (c1 << 3) + (c - '0');
2219 2280
2220 if (state == st_oct1) 2281 if (state == st_oct1)
… …
2225 state = st_ok; 2286 state = st_ok;
2226 } 2287 }
2227 } 2288 }
2228 2289
2229 break; 2290 break;
2230
2231 } 2291 }
2232 } 2292 }
2233} 2293}
2234 2294
2235/* check c is in chars */ 2295/* check c is in chars */
2236static INLINE int 2296ecb_inline int
2237is_one_of (char *s, int c) 2297is_one_of (const char *s, int c)
2238{ 2298{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2299 return c == EOF || !!strchr (s, c);
2243} 2300}
2244 2301
2245/* skip white characters */ 2302/* skip white characters */
2246static INLINE int 2303ecb_inline int
2247skipspace (SCHEME_P) 2304skipspace (SCHEME_P)
2248{ 2305{
2249 int c, curr_line = 0; 2306 int c, curr_line = 0;
2250 2307
2251 do 2308 do
2252 { 2309 {
2253 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2311
2254#if SHOW_ERROR_LINE 2312#if SHOW_ERROR_LINE
2255 if (c == '\n') 2313 if (ecb_expect_false (c == '\n'))
2256 curr_line++; 2314 curr_line++;
2257#endif 2315#endif
2316
2317 if (ecb_expect_false (c == EOF))
2318 return c;
2258 } 2319 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2320 while (is_one_of (WHITESPACE, c));
2260 2321
2261 /* record it */ 2322 /* record it */
2262#if SHOW_ERROR_LINE 2323#if SHOW_ERROR_LINE
2263 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)
2264 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;
2265#endif 2326#endif
2266 2327
2267 if (c != EOF)
2268 {
2269 backchar (SCHEME_A_ c); 2328 backchar (SCHEME_A_ c);
2270 return 1; 2329 return 1;
2271 }
2272 else
2273 return EOF;
2274} 2330}
2275 2331
2276/* get token */ 2332/* get token */
2277static int 2333static int
2278token (SCHEME_P) 2334token (SCHEME_P)
… …
2294 return TOK_RPAREN; 2350 return TOK_RPAREN;
2295 2351
2296 case '.': 2352 case '.':
2297 c = inchar (SCHEME_A); 2353 c = inchar (SCHEME_A);
2298 2354
2299 if (is_one_of (" \n\t", c)) 2355 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2356 return TOK_DOT;
2301 else 2357 else
2302 { 2358 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2359 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2360 return TOK_DOTATOM;
2307 } 2361 }
2362
2363 case '|':
2364 return TOK_STRATOM;
2308 2365
2309 case '\'': 2366 case '\'':
2310 return TOK_QUOTE; 2367 return TOK_QUOTE;
2311 2368
2312 case ';': 2369 case ';':
… …
2444 } 2501 }
2445 2502
2446 putcharacter (SCHEME_A_ '"'); 2503 putcharacter (SCHEME_A_ '"');
2447} 2504}
2448 2505
2449
2450/* print atoms */ 2506/* print atoms */
2451static void 2507static void
2452printatom (SCHEME_P_ pointer l, int f) 2508printatom (SCHEME_P_ pointer l, int f)
2453{ 2509{
2454 char *p; 2510 char *p;
2455 int len; 2511 int len;
2456 2512
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2513 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2514 putchars (SCHEME_A_ p, len);
2459} 2515}
2460
2461 2516
2462/* Uses internal buffer unless string pointer is already available */ 2517/* Uses internal buffer unless string pointer is already available */
2463static void 2518static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2519atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2520{
… …
2479 { 2534 {
2480 p = SCHEME_V->strbuff; 2535 p = SCHEME_V->strbuff;
2481 2536
2482 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 */
2483 { 2538 {
2484 if (num_is_integer (l)) 2539 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2540 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2541#if USE_REAL
2487 else 2542 else
2488 { 2543 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2544 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2681#endif
2627 } 2682 }
2628 else if (is_continuation (l)) 2683 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2684 p = "#<CONTINUATION>";
2630 else 2685 else
2686 {
2687#if USE_PRINTF
2688 p = SCHEME_V->strbuff;
2689 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2690#else
2631 p = "#<ERROR>"; 2691 p = "#<ERROR>";
2692#endif
2693 }
2632 2694
2633 *pp = p; 2695 *pp = p;
2634 *plen = strlen (p); 2696 *plen = strlen (p);
2635} 2697}
2636 2698
… …
2744 return 0; 2806 return 0;
2745 } 2807 }
2746 else if (is_number (a)) 2808 else if (is_number (a))
2747 { 2809 {
2748 if (is_number (b)) 2810 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2811 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2812
2752 return 0; 2813 return 0;
2753 } 2814 }
2754 else if (is_character (a)) 2815 else if (is_character (a))
2755 { 2816 {
… …
2781/* () is #t in R5RS */ 2842/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2843#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2844#define is_false(p) ((p) == S_F)
2784 2845
2785/* ========== Environment implementation ========== */ 2846/* ========== Environment implementation ========== */
2786
2787#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2788
2789static int
2790hash_fn (const char *key, int table_size)
2791{
2792 const unsigned char *p = key;
2793 uint32_t hash = 2166136261;
2794
2795 while (*p)
2796 hash = (hash ^ *p++) * 16777619;
2797
2798 return hash % table_size;
2799}
2800#endif
2801 2847
2802#ifndef USE_ALIST_ENV 2848#ifndef USE_ALIST_ENV
2803 2849
2804/* 2850/*
2805 * In this implementation, each frame of the environment may be 2851 * In this implementation, each frame of the environment may be
… …
2822 2868
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2869 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2870 setenvironment (SCHEME_V->envir);
2825} 2871}
2826 2872
2827static 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
2828new_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)
2829{ 2890{
2830 pointer slot = immutable_cons (variable, value); 2891 pointer slot = immutable_cons (variable, value);
2831 2892
2832 if (is_vector (car (env))) 2893 if (is_vector (car (env)))
2833 { 2894 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2895 int location = sym_hash (variable, veclength (car (env)));
2835
2836 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)));
2837 } 2897 }
2838 else 2898 else
2839 set_car (env, immutable_cons (slot, car (env))); 2899 set_car (env, immutable_cons (slot, car (env)));
2840} 2900}
2841 2901
2842static pointer 2902static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2903find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2904{
2845 pointer x, y; 2905 pointer x, y;
2846 int location;
2847 2906
2848 for (x = env; x != NIL; x = cdr (x)) 2907 for (x = env; x != NIL; x = cdr (x))
2849 { 2908 {
2850 if (is_vector (car (x))) 2909 if (is_vector (car (x)))
2851 { 2910 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2911 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2912 y = vector_get (car (x), location);
2854 } 2913 }
2855 else 2914 else
2856 y = car (x); 2915 y = car (x);
2857 2916
2858 for (; y != NIL; y = cdr (y)) 2917 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2918 if (caar (y) == hdl)
2860 break; 2919 break;
2861 2920
2862 if (y != NIL) 2921 if (y != NIL)
2922 return car (y);
2923
2924 if (!all)
2863 break; 2925 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2926 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2927
2872 return NIL; 2928 return NIL;
2873} 2929}
2874 2930
2875#else /* USE_ALIST_ENV */ 2931#else /* USE_ALIST_ENV */
2876 2932
2877static INLINE void 2933ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2934new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2935{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2936 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2937 setenvironment (SCHEME_V->envir);
2882} 2938}
2883 2939
2884static INLINE void 2940ecb_inline void
2885new_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)
2886{ 2942{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2943 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2944}
2889 2945
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2953 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2954 if (caar (y) == hdl)
2899 break; 2955 break;
2900 2956
2901 if (y != NIL) 2957 if (y != NIL)
2958 return car (y);
2902 break; 2959 break;
2903 2960
2904 if (!all) 2961 if (!all)
2905 return NIL; 2962 break;
2906 } 2963 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2964
2911 return NIL; 2965 return NIL;
2912} 2966}
2913 2967
2914#endif /* USE_ALIST_ENV else */ 2968#endif /* USE_ALIST_ENV else */
2915 2969
2916static INLINE void 2970ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2971new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2972{
2973 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 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);
2920} 2975}
2921 2976
2922static INLINE void 2977ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2978set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2979{
2925 set_cdr (slot, value); 2980 set_cdr (slot, value);
2926} 2981}
2927 2982
2928static INLINE pointer 2983ecb_inline pointer
2929slot_value_in_env (pointer slot) 2984slot_value_in_env (pointer slot)
2930{ 2985{
2931 return cdr (slot); 2986 return cdr (slot);
2932} 2987}
2933 2988
2934/* ========== Evaluation Cycle ========== */ 2989/* ========== Evaluation Cycle ========== */
2935 2990
2936static pointer 2991static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2992xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2993{
2939#if USE_ERROR_HOOK 2994#if USE_ERROR_HOOK
2940 pointer x; 2995 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2996 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3031 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3032 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3033 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3034 SCHEME_V->op = OP_EVAL;
2980 3035
2981 return S_T; 3036 return 0;
2982 } 3037 }
2983#endif 3038#endif
2984 3039
2985 if (a) 3040 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3041 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3043 SCHEME_V->args = NIL;
2989 3044
2990 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);
2991 setimmutable (car (SCHEME_V->args)); 3046 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3047 SCHEME_V->op = OP_ERR0;
3048
2993 return S_T; 3049 return 0;
2994} 3050}
2995 3051
2996#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)
2997#define Error_0(s) Error_1 (s, 0) 3053#define Error_0(s) Error_1 (s, 0)
2998 3054
2999/* Too small to turn into function */ 3055/* Too small to turn into function */
3000#define BEGIN do { 3056#define BEGIN do {
3001#define END } while (0) 3057#define END } while (0)
3002#define s_goto(a) BEGIN \ 3058#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3059 SCHEME_V->op = a; \
3004 return S_T; END 3060 return 0; END
3005 3061
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3062#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3063
3008#ifndef USE_SCHEME_STACK 3064#ifndef USE_SCHEME_STACK
3009 3065
… …
3039 next_frame->code = code; 3095 next_frame->code = code;
3040 3096
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3097 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3098}
3043 3099
3044static pointer 3100static int
3045xs_return (SCHEME_P_ pointer a) 3101xs_return (SCHEME_P_ pointer a)
3046{ 3102{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3104 struct dump_stack_frame *frame;
3049 3105
3050 SCHEME_V->value = a; 3106 SCHEME_V->value = a;
3051 3107
3052 if (nframes <= 0) 3108 if (nframes <= 0)
3053 return NIL; 3109 return -1;
3054 3110
3055 frame = &SCHEME_V->dump_base[--nframes]; 3111 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3112 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3113 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3114 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3115 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3116 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3117
3062 return S_T; 3118 return 0;
3063} 3119}
3064 3120
3065static INLINE void 3121ecb_inline void
3066dump_stack_reset (SCHEME_P) 3122dump_stack_reset (SCHEME_P)
3067{ 3123{
3068 /* 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 */
3069 SCHEME_V->dump = (pointer)+0; 3125 SCHEME_V->dump = (pointer)+0;
3070} 3126}
3071 3127
3072static INLINE void 3128ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3129dump_stack_initialize (SCHEME_P)
3074{ 3130{
3075 SCHEME_V->dump_size = 0; 3131 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3132 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3133 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3186 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3187 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3188
3133 while (cont != NIL) 3189 while (cont != NIL)
3134 { 3190 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3191 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3192 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3193 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3194 frame->code = car (cont) ; cont = cdr (cont);
3139 3195
3140 ++frame; 3196 ++frame;
3141 ++i; 3197 ++i;
3142 } 3198 }
3143 3199
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3200 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3201}
3146 3202
3147#else 3203#else
3148 3204
3149static INLINE void 3205ecb_inline void
3150dump_stack_reset (SCHEME_P) 3206dump_stack_reset (SCHEME_P)
3151{ 3207{
3152 SCHEME_V->dump = NIL; 3208 SCHEME_V->dump = NIL;
3153} 3209}
3154 3210
3155static INLINE void 3211ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3212dump_stack_initialize (SCHEME_P)
3157{ 3213{
3158 dump_stack_reset (SCHEME_A); 3214 dump_stack_reset (SCHEME_A);
3159} 3215}
3160 3216
… …
3162dump_stack_free (SCHEME_P) 3218dump_stack_free (SCHEME_P)
3163{ 3219{
3164 SCHEME_V->dump = NIL; 3220 SCHEME_V->dump = NIL;
3165} 3221}
3166 3222
3167static pointer 3223static int
3168xs_return (SCHEME_P_ pointer a) 3224xs_return (SCHEME_P_ pointer a)
3169{ 3225{
3170 pointer dump = SCHEME_V->dump; 3226 pointer dump = SCHEME_V->dump;
3171 3227
3172 SCHEME_V->value = a; 3228 SCHEME_V->value = a;
3173 3229
3174 if (dump == NIL) 3230 if (dump == NIL)
3175 return NIL; 3231 return -1;
3176 3232
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3233 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3234 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3235 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3236 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3237
3182 SCHEME_V->dump = dump; 3238 SCHEME_V->dump = dump;
3183 3239
3184 return S_T; 3240 return 0;
3185} 3241}
3186 3242
3187static void 3243static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3244s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3245{
… …
3214 3270
3215#endif 3271#endif
3216 3272
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3273#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3274
3275#if EXPERIMENT
3219static 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
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3334opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3335{
3222 pointer args = SCHEME_V->args; 3336 pointer args = SCHEME_V->args;
3223 pointer x, y; 3337 pointer x, y;
3224 3338
3225 switch (op) 3339 switch (op)
3226 { 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
3227 case OP_LOAD: /* load */ 3347 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3348 if (file_interactive (SCHEME_A))
3229 { 3349 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3350 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3351 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
… …
3354 } 3474 }
3355 else 3475 else
3356 s_return (SCHEME_V->code); 3476 s_return (SCHEME_V->code);
3357 3477
3358 case OP_E0ARGS: /* eval arguments */ 3478 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3479 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3480 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3481 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3482 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3483 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3484 s_goto (OP_APPLY);
… …
3391 3511
3392 case OP_TRACING: 3512 case OP_TRACING:
3393 { 3513 {
3394 int tr = SCHEME_V->tracing; 3514 int tr = SCHEME_V->tracing;
3395 3515
3396 SCHEME_V->tracing = ivalue (car (args)); 3516 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3517 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3518 }
3399 3519
3400#endif 3520#endif
3401 3521
… …
3413 /* fall through */ 3533 /* fall through */
3414 3534
3415 case OP_REAL_APPLY: 3535 case OP_REAL_APPLY:
3416#endif 3536#endif
3417 if (is_proc (SCHEME_V->code)) 3537 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3538 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3539 else if (is_foreign (SCHEME_V->code))
3422 { 3540 {
3423 /* Keep nested calls from GC'ing the arglist */ 3541 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3542 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3543 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
… …
3467 3585
3468 case OP_DOMACRO: /* do macro */ 3586 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3587 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3588 s_goto (OP_EVAL);
3471 3589
3472#if 1
3473
3474 case OP_LAMBDA: /* lambda */ 3590 case OP_LAMBDA: /* lambda */
3475 /* 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
3476 set SCHEME_V->value fall thru */ 3592 set SCHEME_V->value fall thru */
3477 { 3593 {
3478 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);
… …
3484 SCHEME_V->code = slot_value_in_env (f); 3600 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3601 s_goto (OP_APPLY);
3486 } 3602 }
3487 3603
3488 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3605 }
3606 /* Fallthru */
3491 3607
3492 case OP_LAMBDA1: 3608 case OP_LAMBDA1:
3493 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));
3494
3495#else
3496
3497 case OP_LAMBDA: /* lambda */
3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3499
3500#endif
3501 3610
3502 case OP_MKCLOSURE: /* make-closure */ 3611 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3612 x = car (args);
3504 3613
3505 if (car (x) == SCHEME_V->LAMBDA) 3614 if (car (x) == SCHEME_V->LAMBDA)
… …
3592 3701
3593 case OP_IF1: /* if */ 3702 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3703 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3704 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3705 else
3597 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 */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3707 s_goto (OP_EVAL);
3601 3708
3602 case OP_LET0: /* let */ 3709 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3710 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3711 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (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 args = SCHEME_V->args; 4032 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 4033 pointer x = car (args);
3927 num v; 4034 num v;
3928 4035
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 4036 switch (op)
3934 { 4037 {
3935#if USE_MATH 4038#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 4039 case OP_INEX2EX: /* inexact->exact */
4040 {
3937 if (num_is_integer (x)) 4041 if (is_integer (x))
3938 s_return (x); 4042 s_return (x);
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 4043
4044 RVALUE r = rvalue_unchecked (x);
4045
4046 if (r == (RVALUE)(IVALUE)r)
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4047 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3941 else 4048 else
3942 Error_1 ("inexact->exact: not integral:", x); 4049 Error_1 ("inexact->exact: not integral:", x);
4050 }
3943 4051
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4052 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4053 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4054 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4055 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3965 { 4073 {
3966 RVALUE result; 4074 RVALUE result;
3967 int real_result = 1; 4075 int real_result = 1;
3968 pointer y = cadr (args); 4076 pointer y = cadr (args);
3969 4077
3970 if (num_is_integer (x) && num_is_integer (y)) 4078 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 4079 real_result = 0;
3972 4080
3973 /* This 'if' is an R5RS compatibility fix. */ 4081 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 4082 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 4083 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4089 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4090 if (!real_result)
3983 { 4091 {
3984 long result_as_long = result; 4092 long result_as_long = result;
3985 4093
3986 if (result != (RVALUE) result_as_long) 4094 if (result != result_as_long)
3987 real_result = 1; 4095 real_result = 1;
3988 } 4096 }
3989 4097
3990 if (real_result) 4098 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4099 s_return (mk_real (SCHEME_A_ result));
… …
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4104 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4105 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998 4106
3999 case OP_TRUNCATE: 4107 case OP_TRUNCATE:
4000 { 4108 {
4001 RVALUE rvalue_of_x; 4109 RVALUE n = rvalue (x);
4002
4003 rvalue_of_x = rvalue (x);
4004
4005 if (rvalue_of_x > 0)
4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4110 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4007 else
4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4009 } 4111 }
4010 4112
4011 case OP_ROUND: 4113 case OP_ROUND:
4012 if (num_is_integer (x)) 4114 if (is_integer (x))
4013 s_return (x); 4115 s_return (x);
4014 4116
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4117 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4118#endif
4017 4119
4018 case OP_ADD: /* + */ 4120 case OP_ADD: /* + */
4019 v = num_zero; 4121 v = num_zero;
4020 4122
4021 for (x = args; x != NIL; x = cdr (x)) 4123 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4124 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4125
4024 s_return (mk_number (SCHEME_A_ v)); 4126 s_return (mk_number (SCHEME_A_ v));
4025 4127
4026 case OP_MUL: /* * */ 4128 case OP_MUL: /* * */
4027 v = num_one; 4129 v = num_one;
4028 4130
4029 for (x = args; x != NIL; x = cdr (x)) 4131 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4132 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4133
4032 s_return (mk_number (SCHEME_A_ v)); 4134 s_return (mk_number (SCHEME_A_ v));
4033 4135
4034 case OP_SUB: /* - */ 4136 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4137 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4144 x = cdr (args);
4043 v = nvalue (car (args)); 4145 v = nvalue (car (args));
4044 } 4146 }
4045 4147
4046 for (; x != NIL; x = cdr (x)) 4148 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4149 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4150
4049 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4050 4152
4051 case OP_DIV: /* / */ 4153 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4154 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4161 x = cdr (args);
4060 v = nvalue (car (args)); 4162 v = nvalue (car (args));
4061 } 4163 }
4062 4164
4063 for (; x != NIL; x = cdr (x)) 4165 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4166 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4167 v = num_div (v, nvalue (car (x)));
4067 else 4168 else
4068 Error_0 ("/: division by zero"); 4169 Error_0 ("/: division by zero");
4069 }
4070 4170
4071 s_return (mk_number (SCHEME_A_ v)); 4171 s_return (mk_number (SCHEME_A_ v));
4072 4172
4073 case OP_INTDIV: /* quotient */ 4173 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4174 if (cdr (args) == NIL)
… …
4083 } 4183 }
4084 4184
4085 for (; x != NIL; x = cdr (x)) 4185 for (; x != NIL; x = cdr (x))
4086 { 4186 {
4087 if (ivalue (car (x)) != 0) 4187 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4188 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4189 else
4090 Error_0 ("quotient: division by zero"); 4190 Error_0 ("quotient: division by zero");
4091 } 4191 }
4092 4192
4093 s_return (mk_number (SCHEME_A_ v)); 4193 s_return (mk_number (SCHEME_A_ v));
… …
4110 else 4210 else
4111 Error_0 ("modulo: division by zero"); 4211 Error_0 ("modulo: division by zero");
4112 4212
4113 s_return (mk_number (SCHEME_A_ v)); 4213 s_return (mk_number (SCHEME_A_ v));
4114 4214
4115 case OP_CAR: /* car */ 4215 /* the compiler will optimize this mess... */
4116 s_return (caar (args)); 4216 case OP_CAR: op_car: s_return (car (x));
4117 4217 case OP_CDR: op_cdr: s_return (cdr (x));
4118 case OP_CDR: /* cdr */ 4218 case OP_CAAR: op_caar: x = car (x); goto op_car;
4119 s_return (cdar (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;
4120 4246
4121 case OP_CONS: /* cons */ 4247 case OP_CONS: /* cons */
4122 set_cdr (args, cadr (args)); 4248 set_cdr (args, cadr (args));
4123 s_return (args); 4249 s_return (args);
4124 4250
… …
4139 } 4265 }
4140 else 4266 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4267 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4268
4143 case OP_CHAR2INT: /* char->integer */ 4269 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4270 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4271
4146 case OP_INT2CHAR: /* integer->char */ 4272 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4273 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4274
4149 case OP_CHARUPCASE: 4275 case OP_CHARUPCASE:
4150 { 4276 {
4151 unsigned char c = ivalue (x); 4277 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4278 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4279 s_return (mk_character (SCHEME_A_ c));
4154 } 4280 }
4155 4281
4156 case OP_CHARDNCASE: 4282 case OP_CHARDNCASE:
4157 { 4283 {
4158 unsigned char c = ivalue (x); 4284 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4285 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4286 s_return (mk_character (SCHEME_A_ c));
4161 } 4287 }
4162 4288
4163 case OP_STR2SYM: /* string->symbol */ 4289 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4366 Error_1 ("atom->string: not an atom:", x);
4241 } 4367 }
4242 4368
4243 case OP_MKSTRING: /* make-string */ 4369 case OP_MKSTRING: /* make-string */
4244 { 4370 {
4245 int fill = ' '; 4371 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4372 int len = ivalue_unchecked (x);
4249
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252 4373
4253 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4374 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4375 }
4255 4376
4256 case OP_STRLEN: /* string-length */ 4377 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4378 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4379
4259 case OP_STRREF: /* string-ref */ 4380 case OP_STRREF: /* string-ref */
4260 { 4381 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4382 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4383 int index = ivalue_unchecked (cadr (args));
4267 4384
4268 if (index >= strlength (x)) 4385 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4386 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4387
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4388 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4389 }
4273 4390
4274 case OP_STRSET: /* string-set! */ 4391 case OP_STRSET: /* string-set! */
4275 { 4392 {
4276 char *str; 4393 char *str = strvalue (x);
4277 int index; 4394 int index = ivalue_unchecked (cadr (args));
4278 int c; 4395 int c;
4279 4396
4280 if (is_immutable (x)) 4397 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4398 Error_1 ("string-set!: unable to alter immutable string:", x);
4282
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286 4399
4287 if (index >= strlength (x)) 4400 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4401 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4402
4290 c = charvalue (caddr (args)); 4403 c = charvalue (caddr (args));
… …
4313 s_return (newstr); 4426 s_return (newstr);
4314 } 4427 }
4315 4428
4316 case OP_SUBSTR: /* substring */ 4429 case OP_SUBSTR: /* substring */
4317 { 4430 {
4318 char *str; 4431 char *str = strvalue (x);
4319 int index0; 4432 int index0 = ivalue_unchecked (cadr (args));
4320 int index1; 4433 int index1;
4321 int len; 4434 int len;
4322 4435
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4436 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4437 Error_1 ("substring: start out of bounds:", cadr (args));
4329 4438
4330 if (cddr (args) != NIL) 4439 if (cddr (args) != NIL)
4331 { 4440 {
4332 index1 = ivalue (caddr (args)); 4441 index1 = ivalue_unchecked (caddr (args));
4333 4442
4334 if (index1 > strlength (x) || index1 < index0) 4443 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4444 Error_1 ("substring: end out of bounds:", caddr (args));
4336 } 4445 }
4337 else 4446 else
… …
4360 if (SCHEME_V->no_memory) 4469 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4470 s_return (S_SINK);
4362#endif 4471#endif
4363 4472
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4473 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4474 vector_set (vec, i, car (x));
4366 4475
4367 s_return (vec); 4476 s_return (vec);
4368 } 4477 }
4369 4478
4370 case OP_MKVECTOR: /* make-vector */ 4479 case OP_MKVECTOR: /* make-vector */
4371 { 4480 {
4372 pointer fill = NIL; 4481 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4482 pointer vec;
4375
4376 len = ivalue (x); 4483 int len = ivalue_unchecked (x);
4377 4484
4378 if (cdr (args) != NIL) 4485 if (cdr (args) != NIL)
4379 fill = cadr (args); 4486 fill = cadr (args);
4380 4487
4381 vec = mk_vector (SCHEME_A_ len); 4488 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4491 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4492 s_return (S_SINK);
4386#endif 4493#endif
4387 4494
4388 if (fill != NIL) 4495 if (fill != NIL)
4389 fill_vector (vec, fill); 4496 fill_vector (vec, 0, fill);
4390 4497
4391 s_return (vec); 4498 s_return (vec);
4392 } 4499 }
4393 4500
4394 case OP_VECLEN: /* vector-length */ 4501 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4502 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4503
4504 case OP_VECRESIZE:
4505 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4506 s_return (x);
4507
4397 case OP_VECREF: /* vector-ref */ 4508 case OP_VECREF: /* vector-ref */
4398 { 4509 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4510 int index = ivalue_unchecked (cadr (args));
4402 4511
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4512 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4513 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4514
4406 s_return (vector_elem (x, index)); 4515 s_return (vector_get (x, index));
4407 } 4516 }
4408 4517
4409 case OP_VECSET: /* vector-set! */ 4518 case OP_VECSET: /* vector-set! */
4410 { 4519 {
4411 int index; 4520 int index = ivalue_unchecked (cadr (args));
4412 4521
4413 if (is_immutable (x)) 4522 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4523 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4524
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4525 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4526 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4527
4421 set_vector_elem (x, index, caddr (args)); 4528 vector_set (x, index, caddr (args));
4422 s_return (x); 4529 s_return (x);
4423 } 4530 }
4424 } 4531 }
4425 4532
4426 return S_T; 4533 if (USE_ERROR_CHECKING) abort ();
4427} 4534}
4428 4535
4429INTERFACE int
4430is_list (SCHEME_P_ pointer a)
4431{
4432 return list_length (SCHEME_A_ a) >= 0;
4433}
4434
4435/* Result is:
4436 proper list: length
4437 circular list: -1
4438 not even a pair: -2
4439 dotted list: -2 minus length before dot
4440*/
4441INTERFACE int
4442list_length (SCHEME_P_ pointer a)
4443{
4444 int i = 0;
4445 pointer slow, fast;
4446
4447 slow = fast = a;
4448
4449 while (1)
4450 {
4451 if (fast == NIL)
4452 return i;
4453
4454 if (!is_pair (fast))
4455 return -2 - i;
4456
4457 fast = cdr (fast);
4458 ++i;
4459
4460 if (fast == NIL)
4461 return i;
4462
4463 if (!is_pair (fast))
4464 return -2 - i;
4465
4466 ++i;
4467 fast = cdr (fast);
4468
4469 /* Safe because we would have already returned if `fast'
4470 encountered a non-pair. */
4471 slow = cdr (slow);
4472
4473 if (fast == slow)
4474 {
4475 /* the fast pointer has looped back around and caught up
4476 with the slow pointer, hence the structure is circular,
4477 not of finite length, and therefore not a list */
4478 return -1;
4479 }
4480 }
4481}
4482
4483static pointer 4536static int
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4537opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4538{
4486 pointer x = SCHEME_V->args; 4539 pointer x = SCHEME_V->args;
4487 4540
4488 for (;;) 4541 for (;;)
4489 { 4542 {
… …
4509 } 4562 }
4510 4563
4511 s_return (S_T); 4564 s_return (S_T);
4512} 4565}
4513 4566
4514static pointer 4567static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4568opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4569{
4517 pointer args = SCHEME_V->args; 4570 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4571 pointer a = car (args);
4519 pointer d = cdr (args); 4572 pointer d = cdr (args);
4520 int r; 4573 int r;
4521 4574
4522 switch (op) 4575 switch (op)
4523 { 4576 {
4524 case OP_NOT: /* not */ r = is_false (a) ; break; 4577 case OP_NOT: /* not */ r = is_false (a) ; break;
4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4578 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4579 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break; 4580 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4581 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4582 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4583 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4584 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4585 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4586 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4587 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4588
4535#if USE_CHAR_CLASSIFIERS 4589#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4590 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4591 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4592 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4593 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4594 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4595#endif
4542 4596
4543#if USE_PORTS 4597#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4598 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4599 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4619 }
4566 4620
4567 s_retbool (r); 4621 s_retbool (r);
4568} 4622}
4569 4623
4570static pointer 4624static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4625opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4626{
4573 pointer args = SCHEME_V->args; 4627 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4628 pointer a = car (args);
4575 pointer x, y; 4629 pointer x, y;
… …
4661 putstr (SCHEME_A_ "\n"); 4715 putstr (SCHEME_A_ "\n");
4662 4716
4663 if (SCHEME_V->interactive_repl) 4717 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4718 s_goto (OP_T0LVL);
4665 else 4719 else
4666 return NIL; 4720 return -1;
4667 } 4721 }
4668 4722
4669 case OP_REVERSE: /* reverse */ 4723 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4724 s_return (reverse (SCHEME_A_ a));
4671 4725
… …
4728 4782
4729 case OP_QUIT: /* quit */ 4783 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4784 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4785 SCHEME_V->retcode = ivalue (a);
4732 4786
4733 return NIL; 4787 return -1;
4734 4788
4735 case OP_GC: /* gc */ 4789 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4790 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4791 s_return (S_T);
4738 4792
… …
4746 4800
4747 case OP_NEWSEGMENT: /* new-segment */ 4801 case OP_NEWSEGMENT: /* new-segment */
4748 if (!is_pair (args) || !is_number (a)) 4802 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4803 Error_0 ("new-segment: argument must be a number");
4750 4804
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4805 alloc_cellseg (SCHEME_A_ ivalue (a));
4752 4806
4753 s_return (S_T); 4807 s_return (S_T);
4754 4808
4755 case OP_OBLIST: /* oblist */ 4809 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4810 s_return (oblist_all_symbols (SCHEME_A));
… …
4785 break; 4839 break;
4786 } 4840 }
4787 4841
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4842 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4843
4790 if (p == NIL) 4844 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4845 }
4795 4846
4796# if USE_STRING_PORTS 4847# if USE_STRING_PORTS
4797 4848
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4849 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4864 }
4814 4865
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4866 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4867 strvalue (a) + strlength (a), prop);
4817 4868
4818 if (p == NIL) 4869 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4870 }
4823 4871
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4872 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4873 {
4826 pointer p; 4874 pointer p;
4827 4875
4828 if (a == NIL) 4876 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4877 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4878 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4879 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4880 strvalue (a) + strlength (a), port_output);
4839 4881
4840 if (p == NIL) 4882 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4883 }
4846 4884
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4885 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4886 {
4849 port *p; 4887 port *p;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4926 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4927 s_return (SCHEME_V->envir);
4890 4928
4891 } 4929 }
4892 4930
4893 abort (); 4931 if (USE_ERROR_CHECKING) abort ();
4894} 4932}
4895 4933
4896static pointer 4934static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4935opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4936{
4937 pointer args = SCHEME_V->args;
4899 pointer x; 4938 pointer x;
4900 4939
4901 if (SCHEME_V->nesting != 0) 4940 if (SCHEME_V->nesting != 0)
4902 { 4941 {
4903 int n = SCHEME_V->nesting; 4942 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4949 switch (op)
4911 { 4950 {
4912 /* ========== reading part ========== */ 4951 /* ========== reading part ========== */
4913#if USE_PORTS 4952#if USE_PORTS
4914 case OP_READ: 4953 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4954 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4955 s_goto (OP_READ_INTERNAL);
4917 4956
4918 if (!is_inport (car (SCHEME_V->args))) 4957 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4958 Error_1 ("read: not an input port:", car (args));
4920 4959
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4960 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4961 s_goto (OP_READ_INTERNAL);
4923 4962
4924 x = SCHEME_V->inport; 4963 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4964 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4965 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4966 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4967 s_goto (OP_READ_INTERNAL);
4929 4968
4930 case OP_READ_CHAR: /* read-char */ 4969 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4970 case OP_PEEK_CHAR: /* peek-char */
4932 { 4971 {
4933 int c; 4972 int c;
4934 4973
4935 if (is_pair (SCHEME_V->args)) 4974 if (is_pair (args))
4936 { 4975 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4976 if (car (args) != SCHEME_V->inport)
4938 { 4977 {
4939 x = SCHEME_V->inport; 4978 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4979 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4980 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4981 SCHEME_V->inport = car (args);
4943 } 4982 }
4944 } 4983 }
4945 4984
4946 c = inchar (SCHEME_A); 4985 c = inchar (SCHEME_A);
4947 4986
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4996 case OP_CHAR_READY: /* char-ready? */
4958 { 4997 {
4959 pointer p = SCHEME_V->inport; 4998 pointer p = SCHEME_V->inport;
4960 int res; 4999 int res;
4961 5000
4962 if (is_pair (SCHEME_V->args)) 5001 if (is_pair (args))
4963 p = car (SCHEME_V->args); 5002 p = car (args);
4964 5003
4965 res = p->object.port->kind & port_string; 5004 res = p->object.port->kind & port_string;
4966 5005
4967 s_retbool (res); 5006 s_retbool (res);
4968 } 5007 }
4969 5008
4970 case OP_SET_INPORT: /* set-input-port */ 5009 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 5010 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 5011 s_return (SCHEME_V->value);
4973 5012
4974 case OP_SET_OUTPORT: /* set-output-port */ 5013 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 5014 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 5015 s_return (SCHEME_V->value);
4977#endif 5016#endif
4978 5017
4979 case OP_RDSEXPR: 5018 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 5019 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5068 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 5069 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 5070 s_goto (OP_RDSEXPR);
5032 5071
5033 case TOK_ATOM: 5072 case TOK_ATOM:
5034 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)));
5035 5083
5036 case TOK_DQUOTE: 5084 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 5085 x = readstrexp (SCHEME_A_ '"');
5038 5086
5039 if (x == S_F) 5087 if (x == S_F)
5040 Error_0 ("Error reading string"); 5088 Error_0 ("Error reading string");
5041 5089
5042 setimmutable (x); 5090 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 5102 s_goto (OP_EVAL);
5055 } 5103 }
5056 } 5104 }
5057 5105
5058 case TOK_SHARP_CONST: 5106 case TOK_SHARP_CONST:
5059 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)
5060 Error_0 ("undefined sharp expression"); 5108 Error_0 ("undefined sharp expression");
5061 else 5109 else
5062 s_return (x); 5110 s_return (x);
5063 5111
5064 default: 5112 default:
… …
5066 } 5114 }
5067 5115
5068 break; 5116 break;
5069 5117
5070 case OP_RDLIST: 5118 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5119 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5120 SCHEME_V->tok = token (SCHEME_A);
5073 5121
5074 switch (SCHEME_V->tok) 5122 switch (SCHEME_V->tok)
5075 { 5123 {
5076 case TOK_EOF: 5124 case TOK_EOF:
… …
5104 case OP_RDDOT: 5152 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5153 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5154 Error_0 ("syntax error: illegal dot expression");
5107 5155
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5156 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 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));
5110 5158
5111 case OP_RDQUOTE: 5159 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5160 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5161
5114 case OP_RDQQUOTE: 5162 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5184 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5185 s_goto (OP_VECTOR);
5138 5186
5139 /* ========== printing part ========== */ 5187 /* ========== printing part ========== */
5140 case OP_P0LIST: 5188 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5189 if (is_vector (args))
5142 { 5190 {
5143 putstr (SCHEME_A_ "#("); 5191 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5192 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5193 s_goto (OP_PVECFROM);
5146 } 5194 }
5147 else if (is_environment (SCHEME_V->args)) 5195 else if (is_environment (args))
5148 { 5196 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5197 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5198 s_return (S_T);
5151 } 5199 }
5152 else if (!is_pair (SCHEME_V->args)) 5200 else if (!is_pair (args))
5153 { 5201 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5203 s_return (S_T);
5156 } 5204 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5205 else
5158 { 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)
5159 putstr (SCHEME_A_ "'"); 5213 putstr (SCHEME_A_ "'");
5160 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
5161 s_goto (OP_P0LIST); 5227 s_goto (OP_P0LIST);
5162 } 5228 }
5163 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))
5164 { 5232 {
5233 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5234 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5235 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5236 s_goto (OP_P0LIST);
5168 } 5237 }
5169 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5170 {
5171 putstr (SCHEME_A_ ",");
5172 SCHEME_V->args = cadr (SCHEME_V->args);
5173 s_goto (OP_P0LIST);
5174 }
5175 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5176 {
5177 putstr (SCHEME_A_ ",@");
5178 SCHEME_V->args = cadr (SCHEME_V->args);
5179 s_goto (OP_P0LIST);
5180 }
5181 else
5182 {
5183 putstr (SCHEME_A_ "(");
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5185 SCHEME_V->args = car (SCHEME_V->args);
5186 s_goto (OP_P0LIST);
5187 }
5188
5189 case OP_P1LIST:
5190 if (is_pair (SCHEME_V->args))
5191 {
5192 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5193 putstr (SCHEME_A_ " ");
5194 SCHEME_V->args = car (SCHEME_V->args);
5195 s_goto (OP_P0LIST);
5196 }
5197 else if (is_vector (SCHEME_V->args)) 5238 else if (is_vector (args))
5198 { 5239 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5240 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5241 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5242 s_goto (OP_P0LIST);
5202 } 5243 }
5203 else 5244 else
5204 { 5245 {
5205 if (SCHEME_V->args != NIL) 5246 if (args != NIL)
5206 { 5247 {
5207 putstr (SCHEME_A_ " . "); 5248 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5249 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5250 }
5210 5251
5211 putstr (SCHEME_A_ ")"); 5252 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5253 s_return (S_T);
5213 } 5254 }
5214 5255
5215 case OP_PVECFROM: 5256 case OP_PVECFROM:
5216 { 5257 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5258 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5259 pointer vec = car (args);
5219 int len = veclength (vec); 5260 int len = veclength (vec);
5220 5261
5221 if (i == len) 5262 if (i == len)
5222 { 5263 {
5223 putstr (SCHEME_A_ ")"); 5264 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5265 s_return (S_T);
5225 } 5266 }
5226 else 5267 else
5227 { 5268 {
5228 pointer elem = vector_elem (vec, i); 5269 pointer elem = vector_get (vec, i);
5229 5270
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5271 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5272 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5273 SCHEME_V->args = elem;
5233 5274
5234 if (i > 0) 5275 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5276 putstr (SCHEME_A_ " ");
5236 5277
5237 s_goto (OP_P0LIST); 5278 s_goto (OP_P0LIST);
5238 } 5279 }
5239 } 5280 }
5240 } 5281 }
5241 5282
5242 abort (); 5283 if (USE_ERROR_CHECKING) abort ();
5243} 5284}
5244 5285
5245static pointer 5286static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5287opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5288{
5289 pointer args = SCHEME_V->args;
5290 pointer a = car (args);
5248 pointer x, y; 5291 pointer x, y;
5249 5292
5250 switch (op) 5293 switch (op)
5251 { 5294 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5295 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5296 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5297 long v = list_length (SCHEME_A_ a);
5255 5298
5256 if (v < 0) 5299 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5300 Error_1 ("length: not a list:", a);
5258 5301
5259 s_return (mk_integer (SCHEME_A_ v)); 5302 s_return (mk_integer (SCHEME_A_ v));
5260 } 5303 }
5261 5304
5262 case OP_ASSQ: /* assq *//* a.k */ 5305 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5306 x = a;
5264 5307
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5308 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5309 {
5267 if (!is_pair (car (y))) 5310 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5311 Error_0 ("unable to handle non pair element");
5269 5312
5270 if (x == caar (y)) 5313 if (x == caar (y))
… …
5276 else 5319 else
5277 s_return (S_F); 5320 s_return (S_F);
5278 5321
5279 5322
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5323 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5324 SCHEME_V->args = a;
5282 5325
5283 if (SCHEME_V->args == NIL) 5326 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5327 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5328 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5329 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5291 5334
5292 case OP_CLOSUREP: /* closure? */ 5335 case OP_CLOSUREP: /* closure? */
5293 /* 5336 /*
5294 * Note, macro object is also a closure. 5337 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5338 * Therefore, (closure? <#MACRO>) ==> #t
5339 * (schmorp) well, obviously not, fix? TODO
5296 */ 5340 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5341 s_retbool (is_closure (a));
5298 5342
5299 case OP_MACROP: /* macro? */ 5343 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5344 s_retbool (is_macro (a));
5301 } 5345 }
5302 5346
5303 abort (); 5347 if (USE_ERROR_CHECKING) abort ();
5304} 5348}
5305 5349
5350/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5351typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5352
5308typedef int (*test_predicate) (pointer); 5353typedef int (*test_predicate)(pointer);
5309static int 5354static int
5310is_any (pointer p) 5355tst_any (pointer p)
5311{ 5356{
5312 return 1; 5357 return 1;
5313} 5358}
5314 5359
5315static int 5360static int
5316is_nonneg (pointer p) 5361tst_inonneg (pointer p)
5317{ 5362{
5318 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);
5319} 5370}
5320 5371
5321/* Correspond carefully with following defines! */ 5372/* Correspond carefully with following defines! */
5322static struct 5373static struct
5323{ 5374{
5324 test_predicate fct; 5375 test_predicate fct;
5325 const char *kind; 5376 const char *kind;
5326} tests[] = 5377} tests[] = {
5327{ 5378 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5379 { is_string , "string" },
5329 { is_any, 0}, 5380 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5381 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5382 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5383 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5384 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5385 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5386 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5387 { is_character , "character" },
5339 { is_vector, "vector" }, 5388 { is_vector , "vector" },
5340 { is_number, "number" }, 5389 { is_number , "number" },
5341 { is_integer, "integer" }, 5390 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5391 { tst_inonneg , "non-negative integer" }
5343}; 5392};
5344 5393
5345#define TST_NONE 0 5394#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5395#define TST_ANY "\001"
5347#define TST_STRING "\002" 5396#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5397#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5398#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5399#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5400#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5401#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5402#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5403#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5404#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5405#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5406#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5407#define TST_INTEGER "\015"
5359#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}
5360 5436
5361typedef struct 5437typedef struct
5362{ 5438{
5363 dispatch_func func; 5439 uint8_t func;
5364 char *name; 5440 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5441 uint8_t builtin;
5442#if USE_ERROR_CHECKING
5365 int min_arity; 5443 uint8_t min_arity;
5366 int max_arity; 5444 uint8_t max_arity;
5367 char *arg_tests_encoding; 5445 char arg_tests_encoding[3];
5446#endif
5368} op_code_info; 5447} op_code_info;
5369 5448
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5449static const op_code_info dispatch_table[] = {
5373#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
5374#include "opdefines.h" 5455#include "opdefines.h"
5456#undef OP_DEF
5375 {0} 5457 {0}
5376}; 5458};
5377 5459
5378static const char *
5379procname (pointer x)
5380{
5381 int n = procnum (x);
5382 const char *name = dispatch_table[n].name;
5383
5384 if (name == 0)
5385 name = "ILLEGAL!";
5386
5387 return name;
5388}
5389
5390/* kernel of this interpreter */ 5460/* kernel of this interpreter */
5391static void 5461static void ecb_hot
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5462Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5463{
5394 SCHEME_V->op = op; 5464 SCHEME_V->op = op;
5395 5465
5396 for (;;) 5466 for (;;)
5397 { 5467 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5468 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5469
5400#if USE_ERROR_CHECKING 5470#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5471 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5472 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5473 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5474 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5475
5407 /* Check number of arguments */ 5476 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5477 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5478 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5479 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 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;
5413 } 5483 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5484 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5485 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5486 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 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;
5419 } 5490 }
5420 5491 else
5421 if (ecb_expect_false (ok))
5422 { 5492 {
5423 if (pcd->arg_tests_encoding) 5493 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5494 {
5425 int i = 0; 5495 int i = 0;
5426 int j; 5496 int j;
5427 const char *t = pcd->arg_tests_encoding; 5497 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5498 pointer arglist = SCHEME_V->args;
5429 5499
5430 do 5500 do
5431 { 5501 {
5432 pointer arg = car (arglist); 5502 pointer arg = car (arglist);
5433 5503
5434 j = (int) t[0]; 5504 j = t[0];
5435 5505
5506 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5507 if (j == TST_LIST[0])
5437 { 5508 {
5438 if (arg != NIL && !is_pair (arg)) 5509 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5510 break;
5440 } 5511 }
5441 else 5512 else
5442 { 5513 {
5443 if (!tests[j].fct (arg)) 5514 if (!tests[j - 1].fct (arg))
5444 break; 5515 break;
5445 } 5516 }
5446 5517
5447 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 */
5448 t++; 5519 t++;
5449 5520
5450 arglist = cdr (arglist); 5521 arglist = cdr (arglist);
5451 i++; 5522 i++;
5452 } 5523 }
5453 while (i < n); 5524 while (i < n);
5454 5525
5455 if (i < n) 5526 if (i < n)
5456 { 5527 {
5457 ok = 0;
5458 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;
5459 } 5531 }
5460 } 5532 }
5461 } 5533 }
5462
5463 if (!ok)
5464 {
5465 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5466 return;
5467
5468 pcd = dispatch_table + SCHEME_V->op;
5469 }
5470 } 5534 }
5471#endif 5535#endif
5472 5536
5473 ok_to_freely_gc (SCHEME_A); 5537 ok_to_freely_gc (SCHEME_A);
5474 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
5475 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))
5476 return; 5550 return;
5477 5551
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5552 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5553 {
5480 xwrstr ("No memory!\n"); 5554 xwrstr ("No memory!\n");
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5578mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5579{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5580 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5581 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5582 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5583 return y;
5511} 5584}
5512 5585
5513/* 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! */
5514static int 5587static int
5515syntaxnum (pointer p) 5588syntaxnum (pointer p)
5516{ 5589{
5517 const char *s = strvalue (car (p)); 5590 const char *s = strvalue (p);
5518 5591
5519 switch (strlength (car (p))) 5592 switch (strlength (p))
5520 { 5593 {
5521 case 2: 5594 case 2:
5522 if (s[0] == 'i') 5595 if (s[0] == 'i')
5523 return OP_IF0; /* if */ 5596 return OP_IF0; /* if */
5524 else 5597 else
… …
5579 return OP_C0STREAM; /* cons-stream */ 5652 return OP_C0STREAM; /* cons-stream */
5580 } 5653 }
5581} 5654}
5582 5655
5583#if USE_MULTIPLICITY 5656#if USE_MULTIPLICITY
5584scheme * 5657ecb_cold scheme *
5585scheme_init_new () 5658scheme_init_new ()
5586{ 5659{
5587 scheme *sc = malloc (sizeof (scheme)); 5660 scheme *sc = malloc (sizeof (scheme));
5588 5661
5589 if (!scheme_init (SCHEME_A)) 5662 if (!scheme_init (SCHEME_A))
… …
5594 else 5667 else
5595 return sc; 5668 return sc;
5596} 5669}
5597#endif 5670#endif
5598 5671
5599int 5672ecb_cold int
5600scheme_init (SCHEME_P) 5673scheme_init (SCHEME_P)
5601{ 5674{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5675 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 pointer x; 5676 pointer x;
5677
5678 /* this memset is not strictly correct, as we assume (intcache)
5679 * that memset 0 will also set pointers to 0, but memset does
5680 * of course not guarantee that. screw such systems.
5681 */
5682 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5604 5683
5605 num_set_fixnum (num_zero, 1); 5684 num_set_fixnum (num_zero, 1);
5606 num_set_ivalue (num_zero, 0); 5685 num_set_ivalue (num_zero, 0);
5607 num_set_fixnum (num_one, 1); 5686 num_set_fixnum (num_one, 1);
5608 num_set_ivalue (num_one, 1); 5687 num_set_ivalue (num_one, 1);
… …
5677 5756
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5757 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5758 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5759 }
5681 5760
5761 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5762 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5763 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5764 assign_proc (SCHEME_A_ i, opname (i));
5685 5765
5686 /* initialization of global pointers to special symbols */ 5766 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5767 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5768 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5769 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5728scheme_set_external_data (SCHEME_P_ void *p) 5808scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5809{
5730 SCHEME_V->ext_data = p; 5810 SCHEME_V->ext_data = p;
5731} 5811}
5732 5812
5733void 5813ecb_cold void
5734scheme_deinit (SCHEME_P) 5814scheme_deinit (SCHEME_P)
5735{ 5815{
5736 int i; 5816 int i;
5737 5817
5738#if SHOW_ERROR_LINE 5818#if SHOW_ERROR_LINE
… …
5959# endif 6039# endif
5960 int fin; 6040 int fin;
5961 char *file_name = InitFile; 6041 char *file_name = InitFile;
5962 int retcode; 6042 int retcode;
5963 int isfile = 1; 6043 int isfile = 1;
6044 system ("ps v $PPID");//D
5964 6045
5965 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6046 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5966 { 6047 {
5967 xwrstr ("Usage: tinyscheme -?\n"); 6048 xwrstr ("Usage: tinyscheme -?\n");
5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6049 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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