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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC vs.
Revision 1.45 by root, Mon Nov 30 07:44:23 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#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 419SCHEME_EXPORT int
427hasprop (pointer p) 420hasprop (pointer p)
428{ 421{
429 return typeflag (p) & T_SYMBOL; 422 return typeflag (p) & T_SYMBOL;
430} 423}
431
432# define symprop(p) cdr(p)
433#endif 424#endif
434 425
435INTERFACE INLINE int 426INTERFACE int
436is_syntax (pointer p) 427is_syntax (pointer p)
437{ 428{
438 return typeflag (p) & T_SYNTAX; 429 return typeflag (p) & T_SYNTAX;
439} 430}
440 431
441INTERFACE INLINE int 432INTERFACE int
442is_proc (pointer p) 433is_proc (pointer p)
443{ 434{
444 return type (p) == T_PROC; 435 return type (p) == T_PROC;
445} 436}
446 437
447INTERFACE INLINE int 438INTERFACE int
448is_foreign (pointer p) 439is_foreign (pointer p)
449{ 440{
450 return type (p) == T_FOREIGN; 441 return type (p) == T_FOREIGN;
451} 442}
452 443
453INTERFACE INLINE char * 444INTERFACE char *
454syntaxname (pointer p) 445syntaxname (pointer p)
455{ 446{
456 return strvalue (car (p)); 447 return strvalue (p);
457} 448}
458 449
459#define procnum(p) ivalue (p) 450#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 451static const char *procname (pointer x);
461 452
462INTERFACE INLINE int 453INTERFACE int
463is_closure (pointer p) 454is_closure (pointer p)
464{ 455{
465 return type (p) == T_CLOSURE; 456 return type (p) == T_CLOSURE;
466} 457}
467 458
468INTERFACE INLINE int 459INTERFACE int
469is_macro (pointer p) 460is_macro (pointer p)
470{ 461{
471 return type (p) == T_MACRO; 462 return type (p) == T_MACRO;
472} 463}
473 464
474INTERFACE INLINE pointer 465INTERFACE pointer
475closure_code (pointer p) 466closure_code (pointer p)
476{ 467{
477 return car (p); 468 return car (p);
478} 469}
479 470
480INTERFACE INLINE pointer 471INTERFACE pointer
481closure_env (pointer p) 472closure_env (pointer p)
482{ 473{
483 return cdr (p); 474 return cdr (p);
484} 475}
485 476
486INTERFACE INLINE int 477INTERFACE int
487is_continuation (pointer p) 478is_continuation (pointer p)
488{ 479{
489 return type (p) == T_CONTINUATION; 480 return type (p) == T_CONTINUATION;
490} 481}
491 482
492#define cont_dump(p) cdr (p) 483#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 484#define set_cont_dump(p,v) set_cdr ((p), (v))
494 485
495/* To do: promise should be forced ONCE only */ 486/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 487INTERFACE int
497is_promise (pointer p) 488is_promise (pointer p)
498{ 489{
499 return type (p) == T_PROMISE; 490 return type (p) == T_PROMISE;
500} 491}
501 492
502INTERFACE INLINE int 493INTERFACE int
503is_environment (pointer p) 494is_environment (pointer p)
504{ 495{
505 return type (p) == T_ENVIRONMENT; 496 return type (p) == T_ENVIRONMENT;
506} 497}
507 498
… …
513 504
514#define is_mark(p) (typeflag (p) & T_MARK) 505#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 506#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 507#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 508
518INTERFACE INLINE int 509INTERFACE int
519is_immutable (pointer p) 510is_immutable (pointer p)
520{ 511{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 512 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 513}
523 514
524INTERFACE INLINE void 515INTERFACE void
525setimmutable (pointer p) 516setimmutable (pointer p)
526{ 517{
527#if USE_ERROR_CHECKING 518#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 519 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 520#endif
530} 521}
531 522
523/* Result is:
524 proper list: length
525 circular list: -1
526 not even a pair: -2
527 dotted list: -2 minus length before dot
528*/
529INTERFACE int
530list_length (SCHEME_P_ pointer a)
531{
532 int i = 0;
533 pointer slow, fast;
534
535 slow = fast = a;
536
537 while (1)
538 {
539 if (fast == NIL)
540 return i;
541
542 if (!is_pair (fast))
543 return -2 - i;
544
545 fast = cdr (fast);
546 ++i;
547
548 if (fast == NIL)
549 return i;
550
551 if (!is_pair (fast))
552 return -2 - i;
553
554 ++i;
555 fast = cdr (fast);
556
557 /* Safe because we would have already returned if `fast'
558 encountered a non-pair. */
559 slow = cdr (slow);
560
561 if (fast == slow)
562 {
563 /* the fast pointer has looped back around and caught up
564 with the slow pointer, hence the structure is circular,
565 not of finite length, and therefore not a list */
566 return -1;
567 }
568 }
569}
570
571INTERFACE int
572is_list (SCHEME_P_ pointer a)
573{
574 return list_length (SCHEME_A_ a) >= 0;
575}
576
532#if USE_CHAR_CLASSIFIERS 577#if USE_CHAR_CLASSIFIERS
533static INLINE int 578ecb_inline int
534Cisalpha (int c) 579Cisalpha (int c)
535{ 580{
536 return isascii (c) && isalpha (c); 581 return isascii (c) && isalpha (c);
537} 582}
538 583
539static INLINE int 584ecb_inline int
540Cisdigit (int c) 585Cisdigit (int c)
541{ 586{
542 return isascii (c) && isdigit (c); 587 return isascii (c) && isdigit (c);
543} 588}
544 589
545static INLINE int 590ecb_inline int
546Cisspace (int c) 591Cisspace (int c)
547{ 592{
548 return isascii (c) && isspace (c); 593 return isascii (c) && isspace (c);
549} 594}
550 595
551static INLINE int 596ecb_inline int
552Cisupper (int c) 597Cisupper (int c)
553{ 598{
554 return isascii (c) && isupper (c); 599 return isascii (c) && isupper (c);
555} 600}
556 601
557static INLINE int 602ecb_inline int
558Cislower (int c) 603Cislower (int c)
559{ 604{
560 return isascii (c) && islower (c); 605 return isascii (c) && islower (c);
561} 606}
562#endif 607#endif
… …
623#endif 668#endif
624 669
625static int file_push (SCHEME_P_ const char *fname); 670static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 671static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 672static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 673ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 674static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 675ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 676static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 677static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 678static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 679static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 680static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 695static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 696static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 697static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 698static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 699static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 700static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 701static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 702ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 703static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 704static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 705static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 706static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 707static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 711static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 712static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 713static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 714static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 715static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
717static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 718static 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); 719static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 722static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 723static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 724static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 725static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 726static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 727
728static IVALUE
729ivalue (pointer x)
730{
731 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
732}
733
734static RVALUE
735rvalue (pointer x)
736{
737 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
738}
739
740INTERFACE num
741nvalue (pointer x)
742{
743 num n;
744
745 num_set_fixnum (n, is_integer (x));
746
747 if (num_is_fixnum (n))
748 num_set_ivalue (n, ivalue_unchecked (x));
749 else
750 num_set_rvalue (n, rvalue_unchecked (x));
751
752 return n;
753}
754
683static num 755static num
684num_op (enum num_op op, num a, num b) 756num_op (enum num_op op, num a, num b)
685{ 757{
686 num ret; 758 num ret;
687 759
688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
689 761
690 if (num_is_fixnum (ret)) 762 if (num_is_fixnum (ret))
691 { 763 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 764 switch (op)
696 { 765 {
697 case NUM_ADD: av += bv; break; 766 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 767 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 768 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 769 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 770 }
702 771
703 num_set_ivalue (ret, av); 772 num_set_ivalue (ret, a.ivalue);
704 } 773 }
774#if USE_REAL
705 else 775 else
706 { 776 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 777 switch (op)
711 { 778 {
712 case NUM_ADD: av += bv; break; 779 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 780 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 781 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 782 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 783 }
717 784
718 num_set_rvalue (ret, av); 785 num_set_rvalue (ret, a.rvalue);
719 } 786 }
787#endif
720 788
721 return ret; 789 return ret;
722} 790}
723 791
724static num 792static num
725num_div (num a, num b) 793num_div (num a, num b)
726{ 794{
727 num ret; 795 num ret;
728 796
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 797 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
730 798
731 if (num_is_fixnum (ret)) 799 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 800 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 801 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 802 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 803
736 return ret; 804 return ret;
737} 805}
738 806
739static num 807static num
… …
741{ 809{
742 num ret; 810 num ret;
743 long e1, e2, res; 811 long e1, e2, res;
744 812
745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 813 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
746 e1 = num_get_ivalue (a); 814 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 815 e2 = num_ivalue (b);
748 res = e1 % e2; 816 res = e1 % e2;
749 817
750 /* remainder should have same sign as second operand */ 818 /* remainder should have same sign as second operand */
751 if (res > 0) 819 if (res > 0)
752 { 820 {
… …
768{ 836{
769 num ret; 837 num ret;
770 long e1, e2, res; 838 long e1, e2, res;
771 839
772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 840 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
773 e1 = num_get_ivalue (a); 841 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 842 e2 = num_ivalue (b);
775 res = e1 % e2; 843 res = e1 % e2;
776 844
777 /* modulo should have same sign as second operand */ 845 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 846 if (res * e2 < 0)
779 res += e2; 847 res += e2;
780 848
781 num_set_ivalue (ret, res); 849 num_set_ivalue (ret, res);
782 return ret; 850 return ret;
783} 851}
784 852
785/* this completely disrespects NaNs */ 853/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 854static int
787num_cmp (num a, num b) 855num_cmp (num a, num b)
788{ 856{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 857 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 858 int ret;
791 859
792 if (is_fixnum) 860 if (is_fixnum)
793 { 861 {
794 IVALUE av = num_get_ivalue (a); 862 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 863 IVALUE bv = num_ivalue (b);
796 864
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 865 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 866 }
799 else 867 else
800 { 868 {
801 RVALUE av = num_get_rvalue (a); 869 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 870 RVALUE bv = num_rvalue (b);
803 871
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 872 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 873 }
806 874
807 return ret; 875 return ret;
… …
833#endif 901#endif
834 902
835static int 903static int
836is_zero_rvalue (RVALUE x) 904is_zero_rvalue (RVALUE x)
837{ 905{
906 return x == 0;
907#if 0
838#if USE_REAL 908#if USE_REAL
839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 909 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
840#else 910#else
841 return x == 0; 911 return x == 0;
912#endif
842#endif 913#endif
843} 914}
844 915
845/* allocate new cell segment */ 916/* allocate new cell segment */
846static int 917static int
… …
867 return k; 938 return k;
868 939
869 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
871 942
872 /* insert new segment in address order */
873 newp = (pointer)cp; 943 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 945 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; 946 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 947 last = newp + segsize - 1;
893 948
894 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
895 { 950 {
896 set_typeflag (p, T_FREE); 951 set_typeflag (p, T_PAIR);
897 set_car (p, NIL); 952 set_car (p, NIL);
898 set_cdr (p, p + 1); 953 set_cdr (p, p + 1);
899 } 954 }
900 955
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); 956 set_cdr (last, SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 957 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 } 958 }
918 959
919 return n; 960 return n;
920} 961}
921 962
922/* get new cell. parameter a, b is marked by gc. */ 963/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 964ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 965get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 966{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 967 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 968 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 969 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
929 return S_SINK; 970 return S_SINK;
930 971
931 if (SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->free_cell == NIL)
932 { 973 {
933 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 974 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
934 975
935 gc (SCHEME_A_ a, b); 976 gc (SCHEME_A_ a, b);
936 977
937 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 978 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
938 { 979 {
… …
989} 1030}
990 1031
991static pointer 1032static pointer
992get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1033get_vector_object (SCHEME_P_ uint32_t len, pointer init)
993{ 1034{
994 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1035 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
995 pointer *e = malloc (len * sizeof (pointer)); 1036 pointer *e = malloc (len * sizeof (pointer));
996 1037
997 if (!e && USE_ERROR_CHECKING) 1038 if (!e && USE_ERROR_CHECKING)
998 return S_SINK; 1039 return S_SINK;
999 1040
1000 /* Record it as a vector so that gc understands it. */ 1041 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1042 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1043
1003 v->object.vector.vvalue = e; 1044 v->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1045 v->object.vector.length = len;
1005 fill_vector (v, init); 1046 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1047 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1048
1008 return v; 1049 return v;
1009} 1050}
1010 1051
1011static INLINE void 1052ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1053ok_to_freely_gc (SCHEME_P)
1013{ 1054{
1014 set_car (S_SINK, NIL); 1055 set_car (S_SINK, NIL);
1015} 1056}
1016 1057
… …
1053 set_cdr (x, b); 1094 set_cdr (x, b);
1054 1095
1055 return x; 1096 return x;
1056} 1097}
1057 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x;
1106}
1107
1058/* ========== oblist implementation ========== */ 1108/* ========== oblist implementation ========== */
1059 1109
1060#ifndef USE_OBJECT_LIST 1110#ifndef USE_OBJECT_LIST
1061 1111
1112static int
1062static int hash_fn (const char *key, int table_size); 1113hash_fn (const char *key, int table_size)
1114{
1115 const unsigned char *p = key;
1116 uint32_t hash = 2166136261;
1117
1118 while (*p)
1119 hash = (hash ^ *p++) * 16777619;
1120
1121 return hash % table_size;
1122}
1063 1123
1064static pointer 1124static pointer
1065oblist_initial_value (SCHEME_P) 1125oblist_initial_value (SCHEME_P)
1066{ 1126{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1069 1129
1070/* returns the new symbol */ 1130/* returns the new symbol */
1071static pointer 1131static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1132oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1133{
1074 int location; 1134 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)); 1135 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))); 1136 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1082 return x; 1137 return x;
1083} 1138}
1084 1139
1085static INLINE pointer 1140ecb_inline pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1141oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1142{
1088 int location; 1143 int location;
1089 pointer x; 1144 pointer x;
1090 char *s; 1145 char *s;
1091 1146
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1147 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1148
1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1149 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1095 { 1150 {
1096 s = symname (car (x)); 1151 s = symname (car (x));
1097 1152
1098 /* case-insensitive, per R5RS section 2 */ 1153 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1154 if (stricmp (name, s) == 0)
… …
1109 int i; 1164 int i;
1110 pointer x; 1165 pointer x;
1111 pointer ob_list = NIL; 1166 pointer ob_list = NIL;
1112 1167
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1168 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1169 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1115 ob_list = cons (x, ob_list); 1170 ob_list = cons (x, ob_list);
1116 1171
1117 return ob_list; 1172 return ob_list;
1118} 1173}
1119 1174
… …
1123oblist_initial_value (SCHEME_P) 1178oblist_initial_value (SCHEME_P)
1124{ 1179{
1125 return NIL; 1180 return NIL;
1126} 1181}
1127 1182
1128static INLINE pointer 1183ecb_inline pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1184oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1185{
1131 pointer x; 1186 pointer x;
1132 char *s; 1187 char *s;
1133 1188
… …
1145 1200
1146/* returns the new symbol */ 1201/* returns the new symbol */
1147static pointer 1202static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1203oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1204{
1150 pointer x; 1205 pointer x = mk_string (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL); 1206 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x)); 1207 setimmutable (x);
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1208 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1209 return x;
1157} 1210}
1158 1211
1159static pointer 1212static pointer
… …
1192mk_character (SCHEME_P_ int c) 1245mk_character (SCHEME_P_ int c)
1193{ 1246{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1247 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1248
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1249 set_typeflag (x, (T_CHARACTER | T_ATOM));
1197 ivalue_unchecked (x) = c & 0xff; 1250 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1251
1199 return x; 1252 return x;
1200} 1253}
1201 1254
1202/* get number atom (integer) */ 1255/* get number atom (integer) */
1203INTERFACE pointer 1256INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1257mk_integer (SCHEME_P_ long n)
1205{ 1258{
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1259 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1260
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1261 set_typeflag (x, (T_INTEGER | T_ATOM));
1209 ivalue_unchecked (x) = num; 1262 set_ivalue (x, n);
1210 set_num_integer (x); 1263
1211 return x; 1264 return x;
1212} 1265}
1213 1266
1214INTERFACE pointer 1267INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1268mk_real (SCHEME_P_ RVALUE n)
1216{ 1269{
1270#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1271 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1272
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1273 set_typeflag (x, (T_REAL | T_ATOM));
1220 rvalue_unchecked (x) = n; 1274 set_rvalue (x, n);
1221 set_num_real (x); 1275
1222 return x; 1276 return x;
1277#else
1278 return mk_integer (SCHEME_A_ n);
1279#endif
1223} 1280}
1224 1281
1225static pointer 1282static pointer
1226mk_number (SCHEME_P_ const num n) 1283mk_number (SCHEME_P_ const num n)
1227{ 1284{
1285#if USE_REAL
1228 if (num_is_fixnum (n)) 1286 return num_is_fixnum (n)
1287 ? mk_integer (SCHEME_A_ num_ivalue (n))
1288 : mk_real (SCHEME_A_ num_rvalue (n));
1289#else
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1290 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1291#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1292}
1233 1293
1234/* allocate name to string area */ 1294/* allocate name to string area */
1235static char * 1295static char *
1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1242 SCHEME_V->no_memory = 1; 1302 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1303 return SCHEME_V->strbuff;
1244 } 1304 }
1245 1305
1246 if (str) 1306 if (str)
1247 { 1307 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 1308 else
1257 {
1258 memset (q, fill, len_str); 1309 memset (q, fill, len_str);
1310
1259 q[len_str] = 0; 1311 q[len_str] = 0;
1260 }
1261 1312
1262 return q; 1313 return q;
1263} 1314}
1264 1315
1265INTERFACE pointer 1316INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1330 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1331
1281 set_typeflag (x, T_STRING | T_ATOM); 1332 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1334 strlength (x) = len;
1335
1284 return x; 1336 return x;
1285} 1337}
1286 1338
1287INTERFACE pointer 1339INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1340mk_string (SCHEME_P_ const char *str)
… …
1295{ 1347{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1348 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1349}
1298 1350
1299INTERFACE void 1351INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1352fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1353{
1302 int i; 1354 int i;
1303 1355
1304 for (i = 0; i < vec->object.vector.length; i++) 1356 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1357 vecvalue (vec)[i] = obj;
1306} 1358}
1307 1359
1360INTERFACE void
1361vector_resize (pointer vec, uint32_t newsize, pointer fill)
1362{
1363 uint32_t oldsize = veclength (vec);
1364 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1365 veclength (vec) = newsize;
1366 fill_vector (vec, oldsize, fill);
1367}
1368
1308INTERFACE pointer 1369INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1370vector_get (pointer vec, uint32_t ielem)
1310{ 1371{
1311 return vecvalue(vec)[ielem]; 1372 return vecvalue(vec)[ielem];
1312} 1373}
1313 1374
1314INTERFACE void 1375INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1376vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1377{
1317 vecvalue(vec)[ielem] = a; 1378 vecvalue(vec)[ielem] = a;
1318} 1379}
1319 1380
1320/* get new symbol */ 1381/* get new symbol */
… …
1332 1393
1333INTERFACE pointer 1394INTERFACE pointer
1334gensym (SCHEME_P) 1395gensym (SCHEME_P)
1335{ 1396{
1336 pointer x; 1397 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1398 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1399 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1342 1400
1343 /* first check oblist */ 1401 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name); 1402}
1345 1403
1346 if (x == NIL) 1404static int
1347 { 1405is_gensym (SCHEME_P_ pointer x)
1348 x = oblist_add_by_name (SCHEME_A_ name); 1406{
1349 return x; 1407 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1408}
1355 1409
1356/* make symbol or number atom from string */ 1410/* make symbol or number atom from string */
1357static pointer 1411static pointer
1358mk_atom (SCHEME_P_ char *q) 1412mk_atom (SCHEME_P_ char *q)
… …
1412 } 1466 }
1413 else if ((c == 'e') || (c == 'E')) 1467 else if ((c == 'e') || (c == 'E'))
1414 { 1468 {
1415 if (!has_fp_exp) 1469 if (!has_fp_exp)
1416 { 1470 {
1417 has_dec_point = 1; /* decimal point illegal 1471 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1472 p++;
1420 1473
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1474 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1475 continue;
1423 } 1476 }
… …
1511 1564
1512 if (ecb_expect_false (is_vector (p))) 1565 if (ecb_expect_false (is_vector (p)))
1513 { 1566 {
1514 int i; 1567 int i;
1515 1568
1516 for (i = 0; i < p->object.vector.length; i++) 1569 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1570 mark (vecvalue (p)[i]);
1518 } 1571 }
1519 1572
1520 if (is_atom (p)) 1573 if (is_atom (p))
1521 goto E6; 1574 goto E6;
… …
1603 /* garbage collect */ 1656 /* garbage collect */
1604 clrmark (NIL); 1657 clrmark (NIL);
1605 SCHEME_V->fcells = 0; 1658 SCHEME_V->fcells = 0;
1606 SCHEME_V->free_cell = NIL; 1659 SCHEME_V->free_cell = NIL;
1607 1660
1608 /* free-list is kept sorted by address so as to maintain consecutive 1661 if (SCHEME_V->gc_verbose)
1609 ranges, if possible, for use with vectors. Here we scan the cells 1662 xwrstr ("freeing...");
1610 (which are also kept sorted by address) downwards to build the 1663
1611 free-list in sorted order. 1664 uint32_t total = 0;
1612 */ 1665
1666 /* Here we scan the cells to build the free-list. */
1613 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1667 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1614 { 1668 {
1615 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1669 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1670 total += SCHEME_V->cell_segsize [i];
1616 1671
1617 while (--p >= SCHEME_V->cell_seg[i]) 1672 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1618 { 1673 {
1619 if (is_mark (p)) 1674 if (is_mark (p))
1620 clrmark (p); 1675 clrmark (p);
1621 else 1676 else
1622 { 1677 {
1623 /* reclaim cell */ 1678 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1679 if (typeflag (p) != T_PAIR)
1625 { 1680 {
1626 finalize_cell (SCHEME_A_ p); 1681 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE); 1682 set_typeflag (p, T_PAIR);
1628 set_car (p, NIL); 1683 set_car (p, NIL);
1629 } 1684 }
1630 1685
1631 ++SCHEME_V->fcells; 1686 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1687 set_cdr (p, SCHEME_V->free_cell);
… …
1634 } 1689 }
1635 } 1690 }
1636 } 1691 }
1637 1692
1638 if (SCHEME_V->gc_verbose) 1693 if (SCHEME_V->gc_verbose)
1694 {
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1695 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1696 }
1640} 1697}
1641 1698
1642static void 1699static void
1643finalize_cell (SCHEME_P_ pointer a) 1700finalize_cell (SCHEME_P_ pointer a)
1644{ 1701{
1645 /* TODO, fast bitmap check? */ 1702 /* TODO, fast bitmap check? */
1646 if (is_string (a)) 1703 if (is_string (a) || is_symbol (a))
1647 free (strvalue (a)); 1704 free (strvalue (a));
1648 else if (is_vector (a)) 1705 else if (is_vector (a))
1649 free (vecvalue (a)); 1706 free (vecvalue (a));
1650#if USE_PORTS 1707#if USE_PORTS
1651 else if (is_port (a)) 1708 else if (is_port (a))
… …
2073#endif 2130#endif
2074} 2131}
2075 2132
2076/* read characters up to delimiter, but cater to character constants */ 2133/* read characters up to delimiter, but cater to character constants */
2077static char * 2134static char *
2078readstr_upto (SCHEME_P_ char *delim) 2135readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2136{
2080 char *p = SCHEME_V->strbuff; 2137 char *p = SCHEME_V->strbuff + skip;
2081 2138
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2139 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2140
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2141 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2142 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2149 return SCHEME_V->strbuff;
2093} 2150}
2094 2151
2095/* read string expression "xxx...xxx" */ 2152/* read string expression "xxx...xxx" */
2096static pointer 2153static pointer
2097readstrexp (SCHEME_P) 2154readstrexp (SCHEME_P_ char delim)
2098{ 2155{
2099 char *p = SCHEME_V->strbuff; 2156 char *p = SCHEME_V->strbuff;
2100 int c; 2157 int c;
2101 int c1 = 0; 2158 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2159 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2160
2105 for (;;) 2161 for (;;)
2106 { 2162 {
2107 c = inchar (SCHEME_A); 2163 c = inchar (SCHEME_A);
2108 2164
… …
2110 return S_F; 2166 return S_F;
2111 2167
2112 switch (state) 2168 switch (state)
2113 { 2169 {
2114 case st_ok: 2170 case st_ok:
2115 switch (c) 2171 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); 2172 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2173
2125 default: 2174 if (ecb_expect_false (c == '\\'))
2175 state = st_bsl;
2176 else
2126 *p++ = c; 2177 *p++ = c;
2127 break;
2128 }
2129 2178
2130 break; 2179 break;
2131 2180
2132 case st_bsl: 2181 case st_bsl:
2133 switch (c) 2182 switch (c)
… …
2163 case 'r': 2212 case 'r':
2164 *p++ = '\r'; 2213 *p++ = '\r';
2165 state = st_ok; 2214 state = st_ok;
2166 break; 2215 break;
2167 2216
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2217 default:
2174 *p++ = c; 2218 *p++ = c;
2175 state = st_ok; 2219 state = st_ok;
2176 break; 2220 break;
2177 } 2221 }
2178 2222
2179 break; 2223 break;
2180 2224
2181 case st_x1: 2225 case st_x1:
2182 case st_x2: 2226 case st_x2:
2183 c = toupper (c); 2227 c = tolower (c);
2184 2228
2185 if (c >= '0' && c <= 'F') 2229 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2230 c1 = (c1 << 4) + c - '0';
2189 else 2231 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2232 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 2233 else
2201 return S_F; 2234 return S_F;
2235
2236 if (state == st_x1)
2237 state = st_x2;
2238 else
2239 {
2240 *p++ = c1;
2241 state = st_ok;
2242 }
2202 2243
2203 break; 2244 break;
2204 2245
2205 case st_oct1: 2246 case st_oct1:
2206 case st_oct2: 2247 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2251 backchar (SCHEME_A_ c);
2211 state = st_ok; 2252 state = st_ok;
2212 } 2253 }
2213 else 2254 else
2214 { 2255 {
2215 if (state == st_oct2 && c1 >= 32) 2256 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2257 return S_F;
2217 2258
2218 c1 = (c1 << 3) + (c - '0'); 2259 c1 = (c1 << 3) + (c - '0');
2219 2260
2220 if (state == st_oct1) 2261 if (state == st_oct1)
… …
2225 state = st_ok; 2266 state = st_ok;
2226 } 2267 }
2227 } 2268 }
2228 2269
2229 break; 2270 break;
2230
2231 } 2271 }
2232 } 2272 }
2233} 2273}
2234 2274
2235/* check c is in chars */ 2275/* check c is in chars */
2236static INLINE int 2276ecb_inline int
2237is_one_of (char *s, int c) 2277is_one_of (const char *s, int c)
2238{ 2278{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2279 return c == EOF || !!strchr (s, c);
2243} 2280}
2244 2281
2245/* skip white characters */ 2282/* skip white characters */
2246static INLINE int 2283ecb_inline int
2247skipspace (SCHEME_P) 2284skipspace (SCHEME_P)
2248{ 2285{
2249 int c, curr_line = 0; 2286 int c, curr_line = 0;
2250 2287
2251 do 2288 do
2252 { 2289 {
2253 c = inchar (SCHEME_A); 2290 c = inchar (SCHEME_A);
2291
2254#if SHOW_ERROR_LINE 2292#if SHOW_ERROR_LINE
2255 if (c == '\n') 2293 if (ecb_expect_false (c == '\n'))
2256 curr_line++; 2294 curr_line++;
2257#endif 2295#endif
2296
2297 if (ecb_expect_false (c == EOF))
2298 return c;
2258 } 2299 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2300 while (is_one_of (WHITESPACE, c));
2260 2301
2261 /* record it */ 2302 /* record it */
2262#if SHOW_ERROR_LINE 2303#if SHOW_ERROR_LINE
2263 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2304 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; 2305 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2265#endif 2306#endif
2266 2307
2267 if (c != EOF)
2268 {
2269 backchar (SCHEME_A_ c); 2308 backchar (SCHEME_A_ c);
2270 return 1; 2309 return 1;
2271 }
2272 else
2273 return EOF;
2274} 2310}
2275 2311
2276/* get token */ 2312/* get token */
2277static int 2313static int
2278token (SCHEME_P) 2314token (SCHEME_P)
… …
2294 return TOK_RPAREN; 2330 return TOK_RPAREN;
2295 2331
2296 case '.': 2332 case '.':
2297 c = inchar (SCHEME_A); 2333 c = inchar (SCHEME_A);
2298 2334
2299 if (is_one_of (" \n\t", c)) 2335 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2336 return TOK_DOT;
2301 else 2337 else
2302 { 2338 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2339 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2340 return TOK_DOTATOM;
2307 } 2341 }
2342
2343 case '|':
2344 return TOK_STRATOM;
2308 2345
2309 case '\'': 2346 case '\'':
2310 return TOK_QUOTE; 2347 return TOK_QUOTE;
2311 2348
2312 case ';': 2349 case ';':
… …
2444 } 2481 }
2445 2482
2446 putcharacter (SCHEME_A_ '"'); 2483 putcharacter (SCHEME_A_ '"');
2447} 2484}
2448 2485
2449
2450/* print atoms */ 2486/* print atoms */
2451static void 2487static void
2452printatom (SCHEME_P_ pointer l, int f) 2488printatom (SCHEME_P_ pointer l, int f)
2453{ 2489{
2454 char *p; 2490 char *p;
2455 int len; 2491 int len;
2456 2492
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2493 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2494 putchars (SCHEME_A_ p, len);
2459} 2495}
2460
2461 2496
2462/* Uses internal buffer unless string pointer is already available */ 2497/* Uses internal buffer unless string pointer is already available */
2463static void 2498static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2499atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2500{
… …
2479 { 2514 {
2480 p = SCHEME_V->strbuff; 2515 p = SCHEME_V->strbuff;
2481 2516
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2517 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2518 {
2484 if (num_is_integer (l)) 2519 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2520 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2521#if USE_REAL
2487 else 2522 else
2488 { 2523 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2524 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2661#endif
2627 } 2662 }
2628 else if (is_continuation (l)) 2663 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2664 p = "#<CONTINUATION>";
2630 else 2665 else
2666 {
2667#if USE_PRINTF
2668 p = SCHEME_V->strbuff;
2669 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2670#else
2631 p = "#<ERROR>"; 2671 p = "#<ERROR>";
2672#endif
2673 }
2632 2674
2633 *pp = p; 2675 *pp = p;
2634 *plen = strlen (p); 2676 *plen = strlen (p);
2635} 2677}
2636 2678
… …
2744 return 0; 2786 return 0;
2745 } 2787 }
2746 else if (is_number (a)) 2788 else if (is_number (a))
2747 { 2789 {
2748 if (is_number (b)) 2790 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2791 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2792
2752 return 0; 2793 return 0;
2753 } 2794 }
2754 else if (is_character (a)) 2795 else if (is_character (a))
2755 { 2796 {
… …
2781/* () is #t in R5RS */ 2822/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2823#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2824#define is_false(p) ((p) == S_F)
2784 2825
2785/* ========== Environment implementation ========== */ 2826/* ========== 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 2827
2802#ifndef USE_ALIST_ENV 2828#ifndef USE_ALIST_ENV
2803 2829
2804/* 2830/*
2805 * In this implementation, each frame of the environment may be 2831 * In this implementation, each frame of the environment may be
… …
2822 2848
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2849 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2850 setenvironment (SCHEME_V->envir);
2825} 2851}
2826 2852
2827static INLINE void 2853static uint32_t
2854sym_hash (pointer sym, uint32_t size)
2855{
2856 uintptr_t ptr = (uintptr_t)sym;
2857
2858#if 0
2859 /* table size is prime, so why mix */
2860 ptr += ptr >> 32;
2861 ptr += ptr >> 16;
2862 ptr += ptr >> 8;
2863#endif
2864
2865 return ptr % size;
2866}
2867
2868ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2869new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2870{
2830 pointer slot = immutable_cons (variable, value); 2871 pointer slot = immutable_cons (variable, value);
2831 2872
2832 if (is_vector (car (env))) 2873 if (is_vector (car (env)))
2833 { 2874 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2875 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2876 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2877 }
2838 else 2878 else
2839 set_car (env, immutable_cons (slot, car (env))); 2879 set_car (env, immutable_cons (slot, car (env)));
2840} 2880}
2841 2881
2842static pointer 2882static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2883find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2884{
2845 pointer x, y; 2885 pointer x, y;
2846 int location;
2847 2886
2848 for (x = env; x != NIL; x = cdr (x)) 2887 for (x = env; x != NIL; x = cdr (x))
2849 { 2888 {
2850 if (is_vector (car (x))) 2889 if (is_vector (car (x)))
2851 { 2890 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2891 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2892 y = vector_get (car (x), location);
2854 } 2893 }
2855 else 2894 else
2856 y = car (x); 2895 y = car (x);
2857 2896
2858 for (; y != NIL; y = cdr (y)) 2897 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2898 if (caar (y) == hdl)
2860 break; 2899 break;
2861 2900
2862 if (y != NIL) 2901 if (y != NIL)
2902 return car (y);
2903
2904 if (!all)
2863 break; 2905 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2906 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2907
2872 return NIL; 2908 return NIL;
2873} 2909}
2874 2910
2875#else /* USE_ALIST_ENV */ 2911#else /* USE_ALIST_ENV */
2876 2912
2877static INLINE void 2913ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2914new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2915{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2916 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2917 setenvironment (SCHEME_V->envir);
2882} 2918}
2883 2919
2884static INLINE void 2920ecb_inline void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2921new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2922{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2923 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2924}
2889 2925
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2933 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2934 if (caar (y) == hdl)
2899 break; 2935 break;
2900 2936
2901 if (y != NIL) 2937 if (y != NIL)
2938 return car (y);
2902 break; 2939 break;
2903 2940
2904 if (!all) 2941 if (!all)
2905 return NIL; 2942 break;
2906 } 2943 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2944
2911 return NIL; 2945 return NIL;
2912} 2946}
2913 2947
2914#endif /* USE_ALIST_ENV else */ 2948#endif /* USE_ALIST_ENV else */
2915 2949
2916static INLINE void 2950ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2951new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2952{
2953 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2954 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2955}
2921 2956
2922static INLINE void 2957ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2958set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2959{
2925 set_cdr (slot, value); 2960 set_cdr (slot, value);
2926} 2961}
2927 2962
2928static INLINE pointer 2963ecb_inline pointer
2929slot_value_in_env (pointer slot) 2964slot_value_in_env (pointer slot)
2930{ 2965{
2931 return cdr (slot); 2966 return cdr (slot);
2932} 2967}
2933 2968
2934/* ========== Evaluation Cycle ========== */ 2969/* ========== Evaluation Cycle ========== */
2935 2970
2936static pointer 2971static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2972xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2973{
2939#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
2940 pointer x; 2975 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2976 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3011 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3012 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3013 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3014 SCHEME_V->op = OP_EVAL;
2980 3015
2981 return S_T; 3016 return 0;
2982 } 3017 }
2983#endif 3018#endif
2984 3019
2985 if (a) 3020 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3021 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3023 SCHEME_V->args = NIL;
2989 3024
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3025 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3026 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3027 SCHEME_V->op = OP_ERR0;
3028
2993 return S_T; 3029 return 0;
2994} 3030}
2995 3031
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3032#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3033#define Error_0(s) Error_1 (s, 0)
2998 3034
2999/* Too small to turn into function */ 3035/* Too small to turn into function */
3000#define BEGIN do { 3036#define BEGIN do {
3001#define END } while (0) 3037#define END } while (0)
3002#define s_goto(a) BEGIN \ 3038#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3039 SCHEME_V->op = a; \
3004 return S_T; END 3040 return 0; END
3005 3041
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3042#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3043
3008#ifndef USE_SCHEME_STACK 3044#ifndef USE_SCHEME_STACK
3009 3045
… …
3039 next_frame->code = code; 3075 next_frame->code = code;
3040 3076
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3077 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3078}
3043 3079
3044static pointer 3080static int
3045xs_return (SCHEME_P_ pointer a) 3081xs_return (SCHEME_P_ pointer a)
3046{ 3082{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3083 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3084 struct dump_stack_frame *frame;
3049 3085
3050 SCHEME_V->value = a; 3086 SCHEME_V->value = a;
3051 3087
3052 if (nframes <= 0) 3088 if (nframes <= 0)
3053 return NIL; 3089 return -1;
3054 3090
3055 frame = &SCHEME_V->dump_base[--nframes]; 3091 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3092 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3093 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3094 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3095 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3096 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3097
3062 return S_T; 3098 return 0;
3063} 3099}
3064 3100
3065static INLINE void 3101ecb_inline void
3066dump_stack_reset (SCHEME_P) 3102dump_stack_reset (SCHEME_P)
3067{ 3103{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3104 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3105 SCHEME_V->dump = (pointer)+0;
3070} 3106}
3071 3107
3072static INLINE void 3108ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3109dump_stack_initialize (SCHEME_P)
3074{ 3110{
3075 SCHEME_V->dump_size = 0; 3111 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3112 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3113 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3166 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3167 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3168
3133 while (cont != NIL) 3169 while (cont != NIL)
3134 { 3170 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3171 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3172 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3173 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3174 frame->code = car (cont) ; cont = cdr (cont);
3139 3175
3140 ++frame; 3176 ++frame;
3141 ++i; 3177 ++i;
3142 } 3178 }
3143 3179
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3180 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3181}
3146 3182
3147#else 3183#else
3148 3184
3149static INLINE void 3185ecb_inline void
3150dump_stack_reset (SCHEME_P) 3186dump_stack_reset (SCHEME_P)
3151{ 3187{
3152 SCHEME_V->dump = NIL; 3188 SCHEME_V->dump = NIL;
3153} 3189}
3154 3190
3155static INLINE void 3191ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3192dump_stack_initialize (SCHEME_P)
3157{ 3193{
3158 dump_stack_reset (SCHEME_A); 3194 dump_stack_reset (SCHEME_A);
3159} 3195}
3160 3196
… …
3162dump_stack_free (SCHEME_P) 3198dump_stack_free (SCHEME_P)
3163{ 3199{
3164 SCHEME_V->dump = NIL; 3200 SCHEME_V->dump = NIL;
3165} 3201}
3166 3202
3167static pointer 3203static int
3168xs_return (SCHEME_P_ pointer a) 3204xs_return (SCHEME_P_ pointer a)
3169{ 3205{
3170 pointer dump = SCHEME_V->dump; 3206 pointer dump = SCHEME_V->dump;
3171 3207
3172 SCHEME_V->value = a; 3208 SCHEME_V->value = a;
3173 3209
3174 if (dump == NIL) 3210 if (dump == NIL)
3175 return NIL; 3211 return -1;
3176 3212
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3213 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3214 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3215 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3216 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3217
3182 SCHEME_V->dump = dump; 3218 SCHEME_V->dump = dump;
3183 3219
3184 return S_T; 3220 return 0;
3185} 3221}
3186 3222
3187static void 3223static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3224s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3225{
… …
3214 3250
3215#endif 3251#endif
3216 3252
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3253#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3254
3255#if EXPERIMENT
3219static pointer 3256static int
3257debug (SCHEME_P_ int indent, pointer x)
3258{
3259 int c;
3260
3261 if (is_syntax (x))
3262 {
3263 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3264 return 8 + 8;
3265 }
3266
3267 if (x == NIL)
3268 {
3269 printf ("%*sNIL\n", indent, "");
3270 return 3;
3271 }
3272
3273 switch (type (x))
3274 {
3275 case T_INTEGER:
3276 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3277 return 32+8;
3278
3279 case T_SYMBOL:
3280 printf ("%*sS<%s>\n", indent, "", symname (x));
3281 return 24+8;
3282
3283 case T_CLOSURE:
3284 printf ("%*sS<%s>\n", indent, "", "closure");
3285 debug (SCHEME_A_ indent + 3, cdr(x));
3286 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3287
3288 case T_PAIR:
3289 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3290 c = debug (SCHEME_A_ indent + 3, car (x));
3291 c += debug (SCHEME_A_ indent + 3, cdr (x));
3292 return c + 1;
3293
3294 case T_PORT:
3295 printf ("%*sS<%s>\n", indent, "", "port");
3296 return 24+8;
3297
3298 case T_VECTOR:
3299 printf ("%*sS<%s>\n", indent, "", "vector");
3300 return 24+8;
3301
3302 case T_ENVIRONMENT:
3303 printf ("%*sS<%s>\n", indent, "", "environment");
3304 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3305
3306 default:
3307 printf ("unhandled type %d\n", type (x));
3308 break;
3309 }
3310}
3311#endif
3312
3313static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3314opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3315{
3222 pointer args = SCHEME_V->args; 3316 pointer args = SCHEME_V->args;
3223 pointer x, y; 3317 pointer x, y;
3224 3318
3225 switch (op) 3319 switch (op)
3226 { 3320 {
3321#if EXPERIMENT //D
3322 case OP_DEBUG:
3323 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3324 printf ("\n");
3325 s_return (S_T);
3326#endif
3227 case OP_LOAD: /* load */ 3327 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3328 if (file_interactive (SCHEME_A))
3229 { 3329 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3330 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))); 3331 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
… …
3354 } 3454 }
3355 else 3455 else
3356 s_return (SCHEME_V->code); 3456 s_return (SCHEME_V->code);
3357 3457
3358 case OP_E0ARGS: /* eval arguments */ 3458 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3459 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3460 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3461 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3462 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3463 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3464 s_goto (OP_APPLY);
… …
3391 3491
3392 case OP_TRACING: 3492 case OP_TRACING:
3393 { 3493 {
3394 int tr = SCHEME_V->tracing; 3494 int tr = SCHEME_V->tracing;
3395 3495
3396 SCHEME_V->tracing = ivalue (car (args)); 3496 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3497 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3498 }
3399 3499
3400#endif 3500#endif
3401 3501
… …
3413 /* fall through */ 3513 /* fall through */
3414 3514
3415 case OP_REAL_APPLY: 3515 case OP_REAL_APPLY:
3416#endif 3516#endif
3417 if (is_proc (SCHEME_V->code)) 3517 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3518 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3519 else if (is_foreign (SCHEME_V->code))
3422 { 3520 {
3423 /* Keep nested calls from GC'ing the arglist */ 3521 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3522 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3523 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
… …
3592 3690
3593 case OP_IF1: /* if */ 3691 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3692 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3693 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3694 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3695 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3696 s_goto (OP_EVAL);
3601 3697
3602 case OP_LET0: /* let */ 3698 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3699 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3700 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (args); 4010 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4011 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 4012 s_goto (OP_APPLY);
3917 } 4013 }
3918 4014
3919 abort (); 4015 if (USE_ERROR_CHECKING) abort ();
3920} 4016}
3921 4017
3922static pointer 4018static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4019opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 4020{
3925 pointer args = SCHEME_V->args; 4021 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 4022 pointer x = car (args);
3927 num v; 4023 num v;
3928 4024
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 4025 switch (op)
3934 { 4026 {
3935#if USE_MATH 4027#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 4028 case OP_INEX2EX: /* inexact->exact */
4029 {
3937 if (num_is_integer (x)) 4030 if (is_integer (x))
3938 s_return (x); 4031 s_return (x);
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 4032
4033 RVALUE r = rvalue_unchecked (x);
4034
4035 if (r == (RVALUE)(IVALUE)r)
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4036 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3941 else 4037 else
3942 Error_1 ("inexact->exact: not integral:", x); 4038 Error_1 ("inexact->exact: not integral:", x);
4039 }
3943 4040
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4041 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)))); 4042 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)))); 4043 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)))); 4044 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3965 { 4062 {
3966 RVALUE result; 4063 RVALUE result;
3967 int real_result = 1; 4064 int real_result = 1;
3968 pointer y = cadr (args); 4065 pointer y = cadr (args);
3969 4066
3970 if (num_is_integer (x) && num_is_integer (y)) 4067 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 4068 real_result = 0;
3972 4069
3973 /* This 'if' is an R5RS compatibility fix. */ 4070 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 4071 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 4072 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4078 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4079 if (!real_result)
3983 { 4080 {
3984 long result_as_long = result; 4081 long result_as_long = result;
3985 4082
3986 if (result != (RVALUE) result_as_long) 4083 if (result != result_as_long)
3987 real_result = 1; 4084 real_result = 1;
3988 } 4085 }
3989 4086
3990 if (real_result) 4087 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4088 s_return (mk_real (SCHEME_A_ result));
… …
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4093 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)))); 4094 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998 4095
3999 case OP_TRUNCATE: 4096 case OP_TRUNCATE:
4000 { 4097 {
4001 RVALUE rvalue_of_x; 4098 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))); 4099 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 } 4100 }
4010 4101
4011 case OP_ROUND: 4102 case OP_ROUND:
4012 if (num_is_integer (x)) 4103 if (is_integer (x))
4013 s_return (x); 4104 s_return (x);
4014 4105
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4106 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4107#endif
4017 4108
4018 case OP_ADD: /* + */ 4109 case OP_ADD: /* + */
4019 v = num_zero; 4110 v = num_zero;
4020 4111
4021 for (x = args; x != NIL; x = cdr (x)) 4112 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4113 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4114
4024 s_return (mk_number (SCHEME_A_ v)); 4115 s_return (mk_number (SCHEME_A_ v));
4025 4116
4026 case OP_MUL: /* * */ 4117 case OP_MUL: /* * */
4027 v = num_one; 4118 v = num_one;
4028 4119
4029 for (x = args; x != NIL; x = cdr (x)) 4120 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4121 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4122
4032 s_return (mk_number (SCHEME_A_ v)); 4123 s_return (mk_number (SCHEME_A_ v));
4033 4124
4034 case OP_SUB: /* - */ 4125 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4126 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4133 x = cdr (args);
4043 v = nvalue (car (args)); 4134 v = nvalue (car (args));
4044 } 4135 }
4045 4136
4046 for (; x != NIL; x = cdr (x)) 4137 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4138 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4139
4049 s_return (mk_number (SCHEME_A_ v)); 4140 s_return (mk_number (SCHEME_A_ v));
4050 4141
4051 case OP_DIV: /* / */ 4142 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4143 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4150 x = cdr (args);
4060 v = nvalue (car (args)); 4151 v = nvalue (car (args));
4061 } 4152 }
4062 4153
4063 for (; x != NIL; x = cdr (x)) 4154 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4155 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4156 v = num_div (v, nvalue (car (x)));
4067 else 4157 else
4068 Error_0 ("/: division by zero"); 4158 Error_0 ("/: division by zero");
4069 }
4070 4159
4071 s_return (mk_number (SCHEME_A_ v)); 4160 s_return (mk_number (SCHEME_A_ v));
4072 4161
4073 case OP_INTDIV: /* quotient */ 4162 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4163 if (cdr (args) == NIL)
… …
4083 } 4172 }
4084 4173
4085 for (; x != NIL; x = cdr (x)) 4174 for (; x != NIL; x = cdr (x))
4086 { 4175 {
4087 if (ivalue (car (x)) != 0) 4176 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4177 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4178 else
4090 Error_0 ("quotient: division by zero"); 4179 Error_0 ("quotient: division by zero");
4091 } 4180 }
4092 4181
4093 s_return (mk_number (SCHEME_A_ v)); 4182 s_return (mk_number (SCHEME_A_ v));
… …
4139 } 4228 }
4140 else 4229 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4230 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4231
4143 case OP_CHAR2INT: /* char->integer */ 4232 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4233 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4234
4146 case OP_INT2CHAR: /* integer->char */ 4235 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4236 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4237
4149 case OP_CHARUPCASE: 4238 case OP_CHARUPCASE:
4150 { 4239 {
4151 unsigned char c = ivalue (x); 4240 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4241 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4242 s_return (mk_character (SCHEME_A_ c));
4154 } 4243 }
4155 4244
4156 case OP_CHARDNCASE: 4245 case OP_CHARDNCASE:
4157 { 4246 {
4158 unsigned char c = ivalue (x); 4247 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4248 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4249 s_return (mk_character (SCHEME_A_ c));
4161 } 4250 }
4162 4251
4163 case OP_STR2SYM: /* string->symbol */ 4252 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4329 Error_1 ("atom->string: not an atom:", x);
4241 } 4330 }
4242 4331
4243 case OP_MKSTRING: /* make-string */ 4332 case OP_MKSTRING: /* make-string */
4244 { 4333 {
4245 int fill = ' '; 4334 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4335 int len = ivalue_unchecked (x);
4249
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252 4336
4253 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4337 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4338 }
4255 4339
4256 case OP_STRLEN: /* string-length */ 4340 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4341 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4342
4259 case OP_STRREF: /* string-ref */ 4343 case OP_STRREF: /* string-ref */
4260 { 4344 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4345 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4346 int index = ivalue_unchecked (cadr (args));
4267 4347
4268 if (index >= strlength (x)) 4348 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4349 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4350
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4351 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4352 }
4273 4353
4274 case OP_STRSET: /* string-set! */ 4354 case OP_STRSET: /* string-set! */
4275 { 4355 {
4276 char *str; 4356 char *str = strvalue (x);
4277 int index; 4357 int index = ivalue_unchecked (cadr (args));
4278 int c; 4358 int c;
4279 4359
4280 if (is_immutable (x)) 4360 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4361 Error_1 ("string-set!: unable to alter immutable string:", x);
4282
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286 4362
4287 if (index >= strlength (x)) 4363 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4364 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4365
4290 c = charvalue (caddr (args)); 4366 c = charvalue (caddr (args));
… …
4313 s_return (newstr); 4389 s_return (newstr);
4314 } 4390 }
4315 4391
4316 case OP_SUBSTR: /* substring */ 4392 case OP_SUBSTR: /* substring */
4317 { 4393 {
4318 char *str; 4394 char *str = strvalue (x);
4319 int index0; 4395 int index0 = ivalue_unchecked (cadr (args));
4320 int index1; 4396 int index1;
4321 int len; 4397 int len;
4322 4398
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("substring: start out of bounds:", cadr (args));
4329 4401
4330 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4331 { 4403 {
4332 index1 = ivalue (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4333 4405
4334 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("substring: end out of bounds:", caddr (args));
4336 } 4408 }
4337 else 4409 else
… …
4360 if (SCHEME_V->no_memory) 4432 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4433 s_return (S_SINK);
4362#endif 4434#endif
4363 4435
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4436 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4437 vector_set (vec, i, car (x));
4366 4438
4367 s_return (vec); 4439 s_return (vec);
4368 } 4440 }
4369 4441
4370 case OP_MKVECTOR: /* make-vector */ 4442 case OP_MKVECTOR: /* make-vector */
4371 { 4443 {
4372 pointer fill = NIL; 4444 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4445 pointer vec;
4375
4376 len = ivalue (x); 4446 int len = ivalue_unchecked (x);
4377 4447
4378 if (cdr (args) != NIL) 4448 if (cdr (args) != NIL)
4379 fill = cadr (args); 4449 fill = cadr (args);
4380 4450
4381 vec = mk_vector (SCHEME_A_ len); 4451 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4454 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4455 s_return (S_SINK);
4386#endif 4456#endif
4387 4457
4388 if (fill != NIL) 4458 if (fill != NIL)
4389 fill_vector (vec, fill); 4459 fill_vector (vec, 0, fill);
4390 4460
4391 s_return (vec); 4461 s_return (vec);
4392 } 4462 }
4393 4463
4394 case OP_VECLEN: /* vector-length */ 4464 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4465 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4466
4467 case OP_VECRESIZE:
4468 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4469 s_return (x);
4470
4397 case OP_VECREF: /* vector-ref */ 4471 case OP_VECREF: /* vector-ref */
4398 { 4472 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4473 int index = ivalue_unchecked (cadr (args));
4402 4474
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4475 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4476 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4477
4406 s_return (vector_elem (x, index)); 4478 s_return (vector_get (x, index));
4407 } 4479 }
4408 4480
4409 case OP_VECSET: /* vector-set! */ 4481 case OP_VECSET: /* vector-set! */
4410 { 4482 {
4411 int index; 4483 int index = ivalue_unchecked (cadr (args));
4412 4484
4413 if (is_immutable (x)) 4485 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4486 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4487
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4488 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4489 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4490
4421 set_vector_elem (x, index, caddr (args)); 4491 vector_set (x, index, caddr (args));
4422 s_return (x); 4492 s_return (x);
4423 } 4493 }
4424 } 4494 }
4425 4495
4426 return S_T; 4496 if (USE_ERROR_CHECKING) abort ();
4427} 4497}
4428 4498
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 4499static int
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4500opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4501{
4486 pointer x = SCHEME_V->args; 4502 pointer x = SCHEME_V->args;
4487 4503
4488 for (;;) 4504 for (;;)
4489 { 4505 {
… …
4509 } 4525 }
4510 4526
4511 s_return (S_T); 4527 s_return (S_T);
4512} 4528}
4513 4529
4514static pointer 4530static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4532{
4517 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4534 pointer a = car (args);
4519 pointer d = cdr (args); 4535 pointer d = cdr (args);
4520 int r; 4536 int r;
4521 4537
4522 switch (op) 4538 switch (op)
4523 { 4539 {
4524 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4541 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4544 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4545 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4549 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4551
4535#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4556 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4557 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4558#endif
4542 4559
4543#if USE_PORTS 4560#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4561 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4562 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4582 }
4566 4583
4567 s_retbool (r); 4584 s_retbool (r);
4568} 4585}
4569 4586
4570static pointer 4587static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4588opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4589{
4573 pointer args = SCHEME_V->args; 4590 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4591 pointer a = car (args);
4575 pointer x, y; 4592 pointer x, y;
… …
4661 putstr (SCHEME_A_ "\n"); 4678 putstr (SCHEME_A_ "\n");
4662 4679
4663 if (SCHEME_V->interactive_repl) 4680 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4681 s_goto (OP_T0LVL);
4665 else 4682 else
4666 return NIL; 4683 return -1;
4667 } 4684 }
4668 4685
4669 case OP_REVERSE: /* reverse */ 4686 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4687 s_return (reverse (SCHEME_A_ a));
4671 4688
… …
4728 4745
4729 case OP_QUIT: /* quit */ 4746 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4747 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4748 SCHEME_V->retcode = ivalue (a);
4732 4749
4733 return NIL; 4750 return -1;
4734 4751
4735 case OP_GC: /* gc */ 4752 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4753 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4754 s_return (S_T);
4738 4755
… …
4746 4763
4747 case OP_NEWSEGMENT: /* new-segment */ 4764 case OP_NEWSEGMENT: /* new-segment */
4748 if (!is_pair (args) || !is_number (a)) 4765 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4766 Error_0 ("new-segment: argument must be a number");
4750 4767
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4768 alloc_cellseg (SCHEME_A_ ivalue (a));
4752 4769
4753 s_return (S_T); 4770 s_return (S_T);
4754 4771
4755 case OP_OBLIST: /* oblist */ 4772 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4773 s_return (oblist_all_symbols (SCHEME_A));
… …
4785 break; 4802 break;
4786 } 4803 }
4787 4804
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4805 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4806
4790 if (p == NIL) 4807 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4808 }
4795 4809
4796# if USE_STRING_PORTS 4810# if USE_STRING_PORTS
4797 4811
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4812 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4827 }
4814 4828
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4829 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4830 strvalue (a) + strlength (a), prop);
4817 4831
4818 if (p == NIL) 4832 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4833 }
4823 4834
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4835 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4836 {
4826 pointer p; 4837 pointer p;
4827 4838
4828 if (a == NIL) 4839 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4840 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4841 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4842 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4843 strvalue (a) + strlength (a), port_output);
4839 4844
4840 if (p == NIL) 4845 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4846 }
4846 4847
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4848 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4849 {
4849 port *p; 4850 port *p;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4889 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4890 s_return (SCHEME_V->envir);
4890 4891
4891 } 4892 }
4892 4893
4893 abort (); 4894 if (USE_ERROR_CHECKING) abort ();
4894} 4895}
4895 4896
4896static pointer 4897static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4898opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4899{
4900 pointer args = SCHEME_V->args;
4899 pointer x; 4901 pointer x;
4900 4902
4901 if (SCHEME_V->nesting != 0) 4903 if (SCHEME_V->nesting != 0)
4902 { 4904 {
4903 int n = SCHEME_V->nesting; 4905 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4912 switch (op)
4911 { 4913 {
4912 /* ========== reading part ========== */ 4914 /* ========== reading part ========== */
4913#if USE_PORTS 4915#if USE_PORTS
4914 case OP_READ: 4916 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4917 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4918 s_goto (OP_READ_INTERNAL);
4917 4919
4918 if (!is_inport (car (SCHEME_V->args))) 4920 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4921 Error_1 ("read: not an input port:", car (args));
4920 4922
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4923 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4924 s_goto (OP_READ_INTERNAL);
4923 4925
4924 x = SCHEME_V->inport; 4926 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4927 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4928 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4929 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4930 s_goto (OP_READ_INTERNAL);
4929 4931
4930 case OP_READ_CHAR: /* read-char */ 4932 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4933 case OP_PEEK_CHAR: /* peek-char */
4932 { 4934 {
4933 int c; 4935 int c;
4934 4936
4935 if (is_pair (SCHEME_V->args)) 4937 if (is_pair (args))
4936 { 4938 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4939 if (car (args) != SCHEME_V->inport)
4938 { 4940 {
4939 x = SCHEME_V->inport; 4941 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4942 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4943 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4944 SCHEME_V->inport = car (args);
4943 } 4945 }
4944 } 4946 }
4945 4947
4946 c = inchar (SCHEME_A); 4948 c = inchar (SCHEME_A);
4947 4949
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4959 case OP_CHAR_READY: /* char-ready? */
4958 { 4960 {
4959 pointer p = SCHEME_V->inport; 4961 pointer p = SCHEME_V->inport;
4960 int res; 4962 int res;
4961 4963
4962 if (is_pair (SCHEME_V->args)) 4964 if (is_pair (args))
4963 p = car (SCHEME_V->args); 4965 p = car (args);
4964 4966
4965 res = p->object.port->kind & port_string; 4967 res = p->object.port->kind & port_string;
4966 4968
4967 s_retbool (res); 4969 s_retbool (res);
4968 } 4970 }
4969 4971
4970 case OP_SET_INPORT: /* set-input-port */ 4972 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 4973 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 4974 s_return (SCHEME_V->value);
4973 4975
4974 case OP_SET_OUTPORT: /* set-output-port */ 4976 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 4977 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 4978 s_return (SCHEME_V->value);
4977#endif 4979#endif
4978 4980
4979 case OP_RDSEXPR: 4981 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 4982 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5031 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 5032 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 5033 s_goto (OP_RDSEXPR);
5032 5034
5033 case TOK_ATOM: 5035 case TOK_ATOM:
5034 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5036 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5037
5038 case TOK_DOTATOM:
5039 SCHEME_V->strbuff[0] = '.';
5040 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5041
5042 case TOK_STRATOM:
5043 x = readstrexp (SCHEME_A_ '|');
5044 //TODO: haven't checked whether the garbage collector could interfere
5045 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5035 5046
5036 case TOK_DQUOTE: 5047 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 5048 x = readstrexp (SCHEME_A_ '"');
5038 5049
5039 if (x == S_F) 5050 if (x == S_F)
5040 Error_0 ("Error reading string"); 5051 Error_0 ("Error reading string");
5041 5052
5042 setimmutable (x); 5053 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 5065 s_goto (OP_EVAL);
5055 } 5066 }
5056 } 5067 }
5057 5068
5058 case TOK_SHARP_CONST: 5069 case TOK_SHARP_CONST:
5059 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5070 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5060 Error_0 ("undefined sharp expression"); 5071 Error_0 ("undefined sharp expression");
5061 else 5072 else
5062 s_return (x); 5073 s_return (x);
5063 5074
5064 default: 5075 default:
… …
5066 } 5077 }
5067 5078
5068 break; 5079 break;
5069 5080
5070 case OP_RDLIST: 5081 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5082 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5083 SCHEME_V->tok = token (SCHEME_A);
5073 5084
5074 switch (SCHEME_V->tok) 5085 switch (SCHEME_V->tok)
5075 { 5086 {
5076 case TOK_EOF: 5087 case TOK_EOF:
… …
5104 case OP_RDDOT: 5115 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5116 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5117 Error_0 ("syntax error: illegal dot expression");
5107 5118
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5119 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5120 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5110 5121
5111 case OP_RDQUOTE: 5122 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5123 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5124
5114 case OP_RDQQUOTE: 5125 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5147 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5148 s_goto (OP_VECTOR);
5138 5149
5139 /* ========== printing part ========== */ 5150 /* ========== printing part ========== */
5140 case OP_P0LIST: 5151 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5152 if (is_vector (args))
5142 { 5153 {
5143 putstr (SCHEME_A_ "#("); 5154 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5155 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5156 s_goto (OP_PVECFROM);
5146 } 5157 }
5147 else if (is_environment (SCHEME_V->args)) 5158 else if (is_environment (args))
5148 { 5159 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5160 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5161 s_return (S_T);
5151 } 5162 }
5152 else if (!is_pair (SCHEME_V->args)) 5163 else if (!is_pair (args))
5153 { 5164 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5165 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5166 s_return (S_T);
5156 } 5167 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5168 else
5158 { 5169 {
5170 pointer a = car (args);
5171 pointer b = cdr (args);
5172 int ok_abbr = ok_abbrev (b);
5173 SCHEME_V->args = car (b);
5174
5175 if (a == SCHEME_V->QUOTE && ok_abbr)
5159 putstr (SCHEME_A_ "'"); 5176 putstr (SCHEME_A_ "'");
5160 SCHEME_V->args = cadr (SCHEME_V->args); 5177 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5178 putstr (SCHEME_A_ "`");
5179 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5180 putstr (SCHEME_A_ ",");
5181 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5182 putstr (SCHEME_A_ ",@");
5183 else
5184 {
5185 putstr (SCHEME_A_ "(");
5186 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5187 SCHEME_V->args = a;
5188 }
5189
5161 s_goto (OP_P0LIST); 5190 s_goto (OP_P0LIST);
5162 } 5191 }
5163 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5192
5193 case OP_P1LIST:
5194 if (is_pair (args))
5164 { 5195 {
5196 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5197 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5198 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5199 s_goto (OP_P0LIST);
5168 } 5200 }
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)) 5201 else if (is_vector (args))
5198 { 5202 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5203 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5204 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5205 s_goto (OP_P0LIST);
5202 } 5206 }
5203 else 5207 else
5204 { 5208 {
5205 if (SCHEME_V->args != NIL) 5209 if (args != NIL)
5206 { 5210 {
5207 putstr (SCHEME_A_ " . "); 5211 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5212 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5213 }
5210 5214
5211 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5216 s_return (S_T);
5213 } 5217 }
5214 5218
5215 case OP_PVECFROM: 5219 case OP_PVECFROM:
5216 { 5220 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5221 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5222 pointer vec = car (args);
5219 int len = veclength (vec); 5223 int len = veclength (vec);
5220 5224
5221 if (i == len) 5225 if (i == len)
5222 { 5226 {
5223 putstr (SCHEME_A_ ")"); 5227 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5228 s_return (S_T);
5225 } 5229 }
5226 else 5230 else
5227 { 5231 {
5228 pointer elem = vector_elem (vec, i); 5232 pointer elem = vector_get (vec, i);
5229 5233
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5234 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5235 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5236 SCHEME_V->args = elem;
5233 5237
5234 if (i > 0) 5238 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5239 putstr (SCHEME_A_ " ");
5236 5240
5237 s_goto (OP_P0LIST); 5241 s_goto (OP_P0LIST);
5238 } 5242 }
5239 } 5243 }
5240 } 5244 }
5241 5245
5242 abort (); 5246 if (USE_ERROR_CHECKING) abort ();
5243} 5247}
5244 5248
5245static pointer 5249static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5250opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5251{
5252 pointer args = SCHEME_V->args;
5253 pointer a = car (args);
5248 pointer x, y; 5254 pointer x, y;
5249 5255
5250 switch (op) 5256 switch (op)
5251 { 5257 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5258 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5259 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5260 long v = list_length (SCHEME_A_ a);
5255 5261
5256 if (v < 0) 5262 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5263 Error_1 ("length: not a list:", a);
5258 5264
5259 s_return (mk_integer (SCHEME_A_ v)); 5265 s_return (mk_integer (SCHEME_A_ v));
5260 } 5266 }
5261 5267
5262 case OP_ASSQ: /* assq *//* a.k */ 5268 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5269 x = a;
5264 5270
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5271 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5272 {
5267 if (!is_pair (car (y))) 5273 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5274 Error_0 ("unable to handle non pair element");
5269 5275
5270 if (x == caar (y)) 5276 if (x == caar (y))
… …
5276 else 5282 else
5277 s_return (S_F); 5283 s_return (S_F);
5278 5284
5279 5285
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5286 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5287 SCHEME_V->args = a;
5282 5288
5283 if (SCHEME_V->args == NIL) 5289 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5290 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5291 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5292 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5291 5297
5292 case OP_CLOSUREP: /* closure? */ 5298 case OP_CLOSUREP: /* closure? */
5293 /* 5299 /*
5294 * Note, macro object is also a closure. 5300 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5301 * Therefore, (closure? <#MACRO>) ==> #t
5302 * (schmorp) well, obviously not, fix? TODO
5296 */ 5303 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5304 s_retbool (is_closure (a));
5298 5305
5299 case OP_MACROP: /* macro? */ 5306 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5307 s_retbool (is_macro (a));
5301 } 5308 }
5302 5309
5303 abort (); 5310 if (USE_ERROR_CHECKING) abort ();
5304} 5311}
5305 5312
5313/* 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); 5314typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5315
5308typedef int (*test_predicate) (pointer); 5316typedef int (*test_predicate)(pointer);
5309static int 5317static int
5310is_any (pointer p) 5318tst_any (pointer p)
5311{ 5319{
5312 return 1; 5320 return 1;
5313} 5321}
5314 5322
5315static int 5323static int
5316is_nonneg (pointer p) 5324tst_inonneg (pointer p)
5317{ 5325{
5318 return ivalue (p) >= 0 && is_integer (p); 5326 return is_integer (p) && ivalue_unchecked (p) >= 0;
5327}
5328
5329static int
5330tst_is_list (SCHEME_P_ pointer p)
5331{
5332 return p == NIL || is_pair (p);
5319} 5333}
5320 5334
5321/* Correspond carefully with following defines! */ 5335/* Correspond carefully with following defines! */
5322static struct 5336static struct
5323{ 5337{
5324 test_predicate fct; 5338 test_predicate fct;
5325 const char *kind; 5339 const char *kind;
5326} tests[] = 5340} tests[] = {
5327{ 5341 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5342 { is_string , "string" },
5329 { is_any, 0}, 5343 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5344 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5345 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5346 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5347 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5348 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5349 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5350 { is_character , "character" },
5339 { is_vector, "vector" }, 5351 { is_vector , "vector" },
5340 { is_number, "number" }, 5352 { is_number , "number" },
5341 { is_integer, "integer" }, 5353 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5354 { tst_inonneg , "non-negative integer" }
5343}; 5355};
5344 5356
5345#define TST_NONE 0 5357#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5358#define TST_ANY "\001"
5347#define TST_STRING "\002" 5359#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5360#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5361#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5362#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5363#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5364#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5365#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5366#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5367#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5368#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5369#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5370#define TST_INTEGER "\015"
5359#define TST_NATURAL "\016" 5371#define TST_NATURAL "\016"
5372
5373#define INF_ARG 0xff
5374#define UNNAMED_OP ""
5375
5376static const char opnames[] =
5377#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5378#include "opdefines.h"
5379#undef OP_DEF
5380;
5381
5382static const char *
5383opname (int idx)
5384{
5385 const char *name = opnames;
5386
5387 /* should do this at compile time, but would require external program, right? */
5388 while (idx--)
5389 name += strlen (name) + 1;
5390
5391 return *name ? name : "ILLEGAL";
5392}
5393
5394static const char *
5395procname (pointer x)
5396{
5397 return opname (procnum (x));
5398}
5360 5399
5361typedef struct 5400typedef struct
5362{ 5401{
5363 dispatch_func func; 5402 uint8_t func;
5364 char *name; 5403 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5404 uint8_t builtin;
5405#if USE_ERROR_CHECKING
5365 int min_arity; 5406 uint8_t min_arity;
5366 int max_arity; 5407 uint8_t max_arity;
5367 char *arg_tests_encoding; 5408 char arg_tests_encoding[3];
5409#endif
5368} op_code_info; 5410} op_code_info;
5369 5411
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5412static const op_code_info dispatch_table[] = {
5373#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5413#if USE_ERROR_CHECKING
5414#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5415#else
5416#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5417#endif
5374#include "opdefines.h" 5418#include "opdefines.h"
5419#undef OP_DEF
5375 {0} 5420 {0}
5376}; 5421};
5377 5422
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 */ 5423/* kernel of this interpreter */
5391static void 5424static void ecb_hot
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5425Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5426{
5394 SCHEME_V->op = op; 5427 SCHEME_V->op = op;
5395 5428
5396 for (;;) 5429 for (;;)
5397 { 5430 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5431 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5432
5400#if USE_ERROR_CHECKING 5433#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5434 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5435 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5436 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5437 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5438
5407 /* Check number of arguments */ 5439 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5440 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5441 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5442 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5443 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5444 xError_1 (SCHEME_A_ msg, 0);
5445 continue;
5413 } 5446 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5447 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5448 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5449 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5450 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5451 xError_1 (SCHEME_A_ msg, 0);
5452 continue;
5419 } 5453 }
5420 5454 else
5421 if (ecb_expect_false (ok))
5422 { 5455 {
5423 if (pcd->arg_tests_encoding) 5456 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5457 {
5425 int i = 0; 5458 int i = 0;
5426 int j; 5459 int j;
5427 const char *t = pcd->arg_tests_encoding; 5460 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5461 pointer arglist = SCHEME_V->args;
5429 5462
5430 do 5463 do
5431 { 5464 {
5432 pointer arg = car (arglist); 5465 pointer arg = car (arglist);
5433 5466
5434 j = (int) t[0]; 5467 j = t[0];
5435 5468
5469 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5470 if (j == TST_LIST[0])
5437 { 5471 {
5438 if (arg != NIL && !is_pair (arg)) 5472 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5473 break;
5440 } 5474 }
5441 else 5475 else
5442 { 5476 {
5443 if (!tests[j].fct (arg)) 5477 if (!tests[j - 1].fct (arg))
5444 break; 5478 break;
5445 } 5479 }
5446 5480
5447 if (t[1] != 0) /* last test is replicated as necessary */ 5481 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5448 t++; 5482 t++;
5449 5483
5450 arglist = cdr (arglist); 5484 arglist = cdr (arglist);
5451 i++; 5485 i++;
5452 } 5486 }
5453 while (i < n); 5487 while (i < n);
5454 5488
5455 if (i < n) 5489 if (i < n)
5456 { 5490 {
5457 ok = 0;
5458 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5491 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5492 xError_1 (SCHEME_A_ msg, 0);
5493 continue;
5459 } 5494 }
5460 } 5495 }
5461 } 5496 }
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 } 5497 }
5471#endif 5498#endif
5472 5499
5473 ok_to_freely_gc (SCHEME_A); 5500 ok_to_freely_gc (SCHEME_A);
5474 5501
5502 static const dispatch_func dispatch_funcs[] = {
5503 opexe_0,
5504 opexe_1,
5505 opexe_2,
5506 opexe_3,
5507 opexe_4,
5508 opexe_5,
5509 opexe_6,
5510 };
5511
5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5512 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5476 return; 5513 return;
5477 5514
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5515 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5516 {
5480 xwrstr ("No memory!\n"); 5517 xwrstr ("No memory!\n");
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5541mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5542{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5543 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5544 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5545 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5546 return y;
5511} 5547}
5512 5548
5513/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5549/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5514static int 5550static int
5515syntaxnum (pointer p) 5551syntaxnum (pointer p)
5516{ 5552{
5517 const char *s = strvalue (car (p)); 5553 const char *s = strvalue (p);
5518 5554
5519 switch (strlength (car (p))) 5555 switch (strlength (p))
5520 { 5556 {
5521 case 2: 5557 case 2:
5522 if (s[0] == 'i') 5558 if (s[0] == 'i')
5523 return OP_IF0; /* if */ 5559 return OP_IF0; /* if */
5524 else 5560 else
… …
5579 return OP_C0STREAM; /* cons-stream */ 5615 return OP_C0STREAM; /* cons-stream */
5580 } 5616 }
5581} 5617}
5582 5618
5583#if USE_MULTIPLICITY 5619#if USE_MULTIPLICITY
5584scheme * 5620ecb_cold scheme *
5585scheme_init_new () 5621scheme_init_new ()
5586{ 5622{
5587 scheme *sc = malloc (sizeof (scheme)); 5623 scheme *sc = malloc (sizeof (scheme));
5588 5624
5589 if (!scheme_init (SCHEME_A)) 5625 if (!scheme_init (SCHEME_A))
… …
5594 else 5630 else
5595 return sc; 5631 return sc;
5596} 5632}
5597#endif 5633#endif
5598 5634
5599int 5635ecb_cold int
5600scheme_init (SCHEME_P) 5636scheme_init (SCHEME_P)
5601{ 5637{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5638 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 pointer x; 5639 pointer x;
5604 5640
… …
5677 5713
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5714 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5715 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5716 }
5681 5717
5718 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5719 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5720 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5721 assign_proc (SCHEME_A_ i, opname (i));
5685 5722
5686 /* initialization of global pointers to special symbols */ 5723 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5724 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5725 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5726 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5728scheme_set_external_data (SCHEME_P_ void *p) 5765scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5766{
5730 SCHEME_V->ext_data = p; 5767 SCHEME_V->ext_data = p;
5731} 5768}
5732 5769
5733void 5770ecb_cold void
5734scheme_deinit (SCHEME_P) 5771scheme_deinit (SCHEME_P)
5735{ 5772{
5736 int i; 5773 int i;
5737 5774
5738#if SHOW_ERROR_LINE 5775#if SHOW_ERROR_LINE
… …
5959# endif 5996# endif
5960 int fin; 5997 int fin;
5961 char *file_name = InitFile; 5998 char *file_name = InitFile;
5962 int retcode; 5999 int retcode;
5963 int isfile = 1; 6000 int isfile = 1;
6001 system ("ps v $PPID");//D
5964 6002
5965 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6003 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5966 { 6004 {
5967 xwrstr ("Usage: tinyscheme -?\n"); 6005 xwrstr ("Usage: tinyscheme -?\n");
5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6006 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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