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.16 by root, Thu Nov 26 10:02:58 2015 UTC vs.
Revision 1.40 by root, Mon Nov 30 05:19:01 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 74 TOK_SHARP_CONST,
58 TOK_VEC 75 TOK_VEC
59}; 76};
60 77
61#define BACKQUOTE '`' 78#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 79#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE
63 81
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 85#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 86#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 87
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 88#if !USE_MULTIPLICITY
81static scheme sc; 89static scheme sc;
82#endif 90#endif
83 91
84static void 92static void
… …
153 161
154#define toupper(c) xtoupper (c) 162#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 163#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 164#define isdigit(c) xisdigit (c)
157 165
158#if USE_STRLWR 166#if USE_IGNORECASE
159static const char * 167static const char *
160strlwr (char *s) 168xstrlwr (char *s)
161{ 169{
162 const char *p = s; 170 const char *p = s;
163 171
164 while (*s) 172 while (*s)
165 { 173 {
… …
167 s++; 175 s++;
168 } 176 }
169 177
170 return p; 178 return p;
171} 179}
172#endif
173 180
181#define stricmp(a,b) strcasecmp (a, b)
182#define strlwr(s) xstrlwr (s)
183
184#else
174#define stricmp(a,b) strcmp (a, b) 185# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 186# define strlwr(s) (s)
187#endif
176 188
177#ifndef prompt 189#ifndef prompt
178# define prompt "ts> " 190# define prompt "ts> "
179#endif 191#endif
180 192
… …
186# define FIRST_CELLSEGS 3 198# define FIRST_CELLSEGS 3
187#endif 199#endif
188 200
189enum scheme_types 201enum scheme_types
190{ 202{
203 T_INTEGER,
191 T_FREE, 204 T_REAL,
192 T_STRING, 205 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 206 T_SYMBOL,
195 T_PROC, 207 T_PROC,
196 T_PAIR, 208 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 209 T_CLOSURE,
198 T_CONTINUATION, 210 T_CONTINUATION,
199 T_FOREIGN, 211 T_FOREIGN,
200 T_CHARACTER, 212 T_CHARACTER,
201 T_PORT, 213 T_PORT,
… …
211#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
215 227
228/* num, for generic arithmetic */
229struct num
230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 255
218static num num_op (enum num_op op, num a, num b); 256static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 258static num num_rem (num a, num b);
… …
223#if USE_MATH 261#if USE_MATH
224static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
225#endif 263#endif
226static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
227 265
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233
234static num num_zero; 266static num num_zero;
235static num num_one; 267static num num_one;
236 268
237/* macros for cell operations */ 269/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 270#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 271#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 272#define type(p) (typeflag (p) & T_MASKTYPE)
241 273
242INTERFACE INLINE int 274INTERFACE int
243is_string (pointer p) 275is_string (pointer p)
244{ 276{
245 return type (p) == T_STRING; 277 return type (p) == T_STRING;
246} 278}
247 279
248#define strvalue(p) ((p)->object.string.svalue) 280#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 281#define strlength(p) ((p)->object.string.length)
250 282
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 283INTERFACE int
253is_vector (pointer p) 284is_vector (pointer p)
254{ 285{
255 return type (p) == T_VECTOR; 286 return type (p) == T_VECTOR;
256} 287}
257 288
258#define vecvalue(p) ((p)->object.vector.vvalue) 289#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 290#define veclength(p) ((p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 291INTERFACE 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); 292INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 294
265INTERFACE uint32_t 295INTERFACE int
266vector_length (pointer vec) 296is_integer (pointer p)
267{ 297{
268 return vec->object.vector.length; 298 return type (p) == T_INTEGER;
269} 299}
270 300
301/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 302INTERFACE int
303is_real (pointer p)
304{
305 return type (p) == T_REAL;
306}
307
308INTERFACE int
272is_number (pointer p) 309is_number (pointer p)
273{ 310{
274 return type (p) == T_NUMBER; 311 return is_integer (p) || is_real (p);
275} 312}
276 313
277INTERFACE INLINE int 314INTERFACE 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) 315is_character (pointer p)
297{ 316{
298 return type (p) == T_CHARACTER; 317 return type (p) == T_CHARACTER;
299} 318}
300 319
301INTERFACE INLINE char * 320INTERFACE char *
302string_value (pointer p) 321string_value (pointer p)
303{ 322{
304 return strvalue (p); 323 return strvalue (p);
305} 324}
306 325
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) 326#define ivalue_unchecked(p) (p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v)
328
338#if USE_REAL 329#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 330#define rvalue_unchecked(p) (p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 331#define set_rvalue(p,v) (p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 332#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define rvalue_unchecked(p) (p)->object.ivalue
344# define set_num_integer(p) 0 334#define set_rvalue(p,v) (p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 335#endif
336
347INTERFACE long 337INTERFACE long
348charvalue (pointer p) 338charvalue (pointer p)
349{ 339{
350 return ivalue_unchecked (p); 340 return ivalue_unchecked (p);
351} 341}
352 342
353INTERFACE INLINE int 343INTERFACE int
354is_port (pointer p) 344is_port (pointer p)
355{ 345{
356 return type (p) == T_PORT; 346 return type (p) == T_PORT;
357} 347}
358 348
359INTERFACE INLINE int 349INTERFACE int
360is_inport (pointer p) 350is_inport (pointer p)
361{ 351{
362 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && p->object.port->kind & port_input;
363} 353}
364 354
365INTERFACE INLINE int 355INTERFACE int
366is_outport (pointer p) 356is_outport (pointer p)
367{ 357{
368 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && p->object.port->kind & port_output;
369} 359}
370 360
371INTERFACE INLINE int 361INTERFACE int
372is_pair (pointer p) 362is_pair (pointer p)
373{ 363{
374 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
375} 365}
376 366
… …
408pair_cdr (pointer p) 398pair_cdr (pointer p)
409{ 399{
410 return cdr (p); 400 return cdr (p);
411} 401}
412 402
413INTERFACE INLINE int 403INTERFACE int
414is_symbol (pointer p) 404is_symbol (pointer p)
415{ 405{
416 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
417} 407}
418 408
419INTERFACE INLINE char * 409INTERFACE char *
420symname (pointer p) 410symname (pointer p)
421{ 411{
422 return strvalue (car (p)); 412 return strvalue (p);
423} 413}
424 414
425#if USE_PLIST 415#if USE_PLIST
426SCHEME_EXPORT INLINE int 416SCHEME_EXPORT int
427hasprop (pointer p) 417hasprop (pointer p)
428{ 418{
429 return typeflag (p) & T_SYMBOL; 419 return typeflag (p) & T_SYMBOL;
430} 420}
431 421
432# define symprop(p) cdr(p) 422# define symprop(p) cdr(p)
433#endif 423#endif
434 424
435INTERFACE INLINE int 425INTERFACE int
436is_syntax (pointer p) 426is_syntax (pointer p)
437{ 427{
438 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
439} 429}
440 430
441INTERFACE INLINE int 431INTERFACE int
442is_proc (pointer p) 432is_proc (pointer p)
443{ 433{
444 return type (p) == T_PROC; 434 return type (p) == T_PROC;
445} 435}
446 436
447INTERFACE INLINE int 437INTERFACE int
448is_foreign (pointer p) 438is_foreign (pointer p)
449{ 439{
450 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
451} 441}
452 442
453INTERFACE INLINE char * 443INTERFACE char *
454syntaxname (pointer p) 444syntaxname (pointer p)
455{ 445{
456 return strvalue (car (p)); 446 return strvalue (p);
457} 447}
458 448
459#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 450static const char *procname (pointer x);
461 451
462INTERFACE INLINE int 452INTERFACE int
463is_closure (pointer p) 453is_closure (pointer p)
464{ 454{
465 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
466} 456}
467 457
468INTERFACE INLINE int 458INTERFACE int
469is_macro (pointer p) 459is_macro (pointer p)
470{ 460{
471 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
472} 462}
473 463
474INTERFACE INLINE pointer 464INTERFACE pointer
475closure_code (pointer p) 465closure_code (pointer p)
476{ 466{
477 return car (p); 467 return car (p);
478} 468}
479 469
480INTERFACE INLINE pointer 470INTERFACE pointer
481closure_env (pointer p) 471closure_env (pointer p)
482{ 472{
483 return cdr (p); 473 return cdr (p);
484} 474}
485 475
486INTERFACE INLINE int 476INTERFACE int
487is_continuation (pointer p) 477is_continuation (pointer p)
488{ 478{
489 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
490} 480}
491 481
492#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
494 484
495/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 486INTERFACE int
497is_promise (pointer p) 487is_promise (pointer p)
498{ 488{
499 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
500} 490}
501 491
502INTERFACE INLINE int 492INTERFACE int
503is_environment (pointer p) 493is_environment (pointer p)
504{ 494{
505 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
506} 496}
507 497
… …
513 503
514#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 507
518INTERFACE INLINE int 508INTERFACE int
519is_immutable (pointer p) 509is_immutable (pointer p)
520{ 510{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 512}
523 513
524INTERFACE INLINE void 514INTERFACE void
525setimmutable (pointer p) 515setimmutable (pointer p)
526{ 516{
527#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 519#endif
530} 520}
531 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
532#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
533static INLINE int 577ecb_inline int
534Cisalpha (int c) 578Cisalpha (int c)
535{ 579{
536 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
537} 581}
538 582
539static INLINE int 583ecb_inline int
540Cisdigit (int c) 584Cisdigit (int c)
541{ 585{
542 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
543} 587}
544 588
545static INLINE int 589ecb_inline int
546Cisspace (int c) 590Cisspace (int c)
547{ 591{
548 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
549} 593}
550 594
551static INLINE int 595ecb_inline int
552Cisupper (int c) 596Cisupper (int c)
553{ 597{
554 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
555} 599}
556 600
557static INLINE int 601ecb_inline int
558Cislower (int c) 602Cislower (int c)
559{ 603{
560 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
561} 605}
562#endif 606#endif
… …
623#endif 667#endif
624 668
625static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 694static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 702static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static 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); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
753
683static num 754static num
684num_op (enum num_op op, num a, num b) 755num_op (enum num_op op, num a, num b)
685{ 756{
686 num ret; 757 num ret;
687 758
688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
689 760
690 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
691 { 762 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 763 switch (op)
696 { 764 {
697 case NUM_ADD: av += bv; break; 765 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 766 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 767 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 769 }
702 770
703 num_set_ivalue (ret, av); 771 num_set_ivalue (ret, a.ivalue);
704 } 772 }
773#if USE_REAL
705 else 774 else
706 { 775 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 776 switch (op)
711 { 777 {
712 case NUM_ADD: av += bv; break; 778 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 779 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 780 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 782 }
717 783
718 num_set_rvalue (ret, av); 784 num_set_rvalue (ret, a.rvalue);
719 } 785 }
786#endif
720 787
721 return ret; 788 return ret;
722} 789}
723 790
724static num 791static num
725num_div (num a, num b) 792num_div (num a, num b)
726{ 793{
727 num ret; 794 num ret;
728 795
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
730 797
731 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 800 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 802
736 return ret; 803 return ret;
737} 804}
738 805
739static num 806static num
… …
741{ 808{
742 num ret; 809 num ret;
743 long e1, e2, res; 810 long e1, e2, res;
744 811
745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 812 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
746 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
748 res = e1 % e2; 815 res = e1 % e2;
749 816
750 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
751 if (res > 0) 818 if (res > 0)
752 { 819 {
… …
768{ 835{
769 num ret; 836 num ret;
770 long e1, e2, res; 837 long e1, e2, res;
771 838
772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 839 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
773 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
775 res = e1 % e2; 842 res = e1 % e2;
776 843
777 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 845 if (res * e2 < 0)
779 res += e2; 846 res += e2;
780 847
781 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
782 return ret; 849 return ret;
783} 850}
784 851
785/* this completely disrespects NaNs */ 852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 853static int
787num_cmp (num a, num b) 854num_cmp (num a, num b)
788{ 855{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 857 int ret;
791 858
792 if (is_fixnum) 859 if (is_fixnum)
793 { 860 {
794 IVALUE av = num_get_ivalue (a); 861 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 862 IVALUE bv = num_ivalue (b);
796 863
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 864 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 865 }
799 else 866 else
800 { 867 {
801 RVALUE av = num_get_rvalue (a); 868 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 869 RVALUE bv = num_rvalue (b);
803 870
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 871 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 872 }
806 873
807 return ret; 874 return ret;
… …
833#endif 900#endif
834 901
835static int 902static int
836is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
837{ 904{
905 return x == 0;
906#if 0
838#if USE_REAL 907#if USE_REAL
839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
840#else 909#else
841 return x == 0; 910 return x == 0;
911#endif
842#endif 912#endif
843} 913}
844 914
845/* allocate new cell segment */ 915/* allocate new cell segment */
846static int 916static int
… …
867 return k; 937 return k;
868 938
869 i = ++SCHEME_V->last_cell_seg; 939 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 940 SCHEME_V->alloc_seg[i] = cp;
871 941
872 /* insert new segment in address order */
873 newp = (pointer)cp; 942 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 943 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 944 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; 945 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 946 last = newp + segsize - 1;
893 947
894 for (p = newp; p <= last; p++) 948 for (p = newp; p <= last; p++)
895 { 949 {
896 set_typeflag (p, T_FREE); 950 set_typeflag (p, T_PAIR);
897 set_car (p, NIL); 951 set_car (p, NIL);
898 set_cdr (p, p + 1); 952 set_cdr (p, p + 1);
899 } 953 }
900 954
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); 955 set_cdr (last, SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 956 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 } 957 }
918 958
919 return n; 959 return n;
920} 960}
921 961
922/* get new cell. parameter a, b is marked by gc. */ 962/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 963ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 964get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 965{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 966 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 967 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1000 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1042
1003 v->object.vector.vvalue = e; 1043 v->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1044 v->object.vector.length = len;
1005 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1047
1008 return v; 1048 return v;
1009} 1049}
1010 1050
1011static INLINE void 1051ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1013{ 1053{
1014 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1015} 1055}
1016 1056
… …
1055 return x; 1095 return x;
1056} 1096}
1057 1097
1058/* ========== oblist implementation ========== */ 1098/* ========== oblist implementation ========== */
1059 1099
1100static pointer
1101generate_symbol (SCHEME_P_ const char *name)
1102{
1103 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x;
1107}
1108
1060#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1061 1110
1111static int
1062static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1063 1122
1064static pointer 1123static pointer
1065oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1066{ 1125{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1069 1128
1070/* returns the new symbol */ 1129/* returns the new symbol */
1071static pointer 1130static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1132{
1074 int location; 1133 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)); 1134 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))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1082 return x; 1136 return x;
1083} 1137}
1084 1138
1085static INLINE pointer 1139ecb_inline pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1141{
1088 int location; 1142 int location;
1089 pointer x; 1143 pointer x;
1090 char *s; 1144 char *s;
1091 1145
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1147
1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1095 { 1149 {
1096 s = symname (car (x)); 1150 s = symname (car (x));
1097 1151
1098 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1109 int i; 1163 int i;
1110 pointer x; 1164 pointer x;
1111 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1112 1166
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1115 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1116 1170
1117 return ob_list; 1171 return ob_list;
1118} 1172}
1119 1173
… …
1123oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1124{ 1178{
1125 return NIL; 1179 return NIL;
1126} 1180}
1127 1181
1128static INLINE pointer 1182ecb_inline pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1184{
1131 pointer x; 1185 pointer x;
1132 char *s; 1186 char *s;
1133 1187
… …
1145 1199
1146/* returns the new symbol */ 1200/* returns the new symbol */
1147static pointer 1201static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1203{
1150 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x)); 1206 setimmutable (x);
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1208 return x;
1157} 1209}
1158 1210
1159static pointer 1211static pointer
… …
1192mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1193{ 1245{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1247
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1197 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1250
1199 return x; 1251 return x;
1200} 1252}
1201 1253
1202/* get number atom (integer) */ 1254/* get number atom (integer) */
1203INTERFACE pointer 1255INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1205{ 1257{
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1259
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1209 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1210 set_num_integer (x); 1262
1211 return x; 1263 return x;
1212} 1264}
1213 1265
1214INTERFACE pointer 1266INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1216{ 1268{
1269#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1271
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1220 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1221 set_num_real (x); 1274
1222 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1223} 1279}
1224 1280
1225static pointer 1281static pointer
1226mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1227{ 1283{
1284#if USE_REAL
1228 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1290#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1291}
1233 1292
1234/* allocate name to string area */ 1293/* allocate name to string area */
1235static char * 1294static char *
1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1242 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1244 } 1303 }
1245 1304
1246 if (str) 1305 if (str)
1247 { 1306 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 1307 else
1257 {
1258 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1259 q[len_str] = 0; 1310 q[len_str] = 0;
1260 }
1261 1311
1262 return q; 1312 return q;
1263} 1313}
1264 1314
1265INTERFACE pointer 1315INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1330
1281 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1333 strlength (x) = len;
1334
1284 return x; 1335 return x;
1285} 1336}
1286 1337
1287INTERFACE pointer 1338INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1295{ 1346{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1348}
1298 1349
1299INTERFACE void 1350INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1352{
1302 int i; 1353 int i;
1303 1354
1304 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1306} 1357}
1307 1358
1359INTERFACE void
1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1366}
1367
1308INTERFACE pointer 1368INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1310{ 1370{
1311 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1312} 1372}
1313 1373
1314INTERFACE void 1374INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1376{
1317 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1318} 1378}
1319 1379
1320/* get new symbol */ 1380/* get new symbol */
… …
1332 1392
1333INTERFACE pointer 1393INTERFACE pointer
1334gensym (SCHEME_P) 1394gensym (SCHEME_P)
1335{ 1395{
1336 pointer x; 1396 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1397 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, SCHEME_V->gensym_cnt);
1342 1399
1343 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name);
1345
1346 if (x == NIL)
1347 {
1348 x = oblist_add_by_name (SCHEME_A_ name);
1349 return x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1401}
1355 1402
1356/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1357static pointer 1404static pointer
1358mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1412 } 1459 }
1413 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1414 { 1461 {
1415 if (!has_fp_exp) 1462 if (!has_fp_exp)
1416 { 1463 {
1417 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1465 p++;
1420 1466
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1468 continue;
1423 } 1469 }
… …
1511 1557
1512 if (ecb_expect_false (is_vector (p))) 1558 if (ecb_expect_false (is_vector (p)))
1513 { 1559 {
1514 int i; 1560 int i;
1515 1561
1516 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1518 } 1564 }
1519 1565
1520 if (is_atom (p)) 1566 if (is_atom (p))
1521 goto E6; 1567 goto E6;
… …
1619 if (is_mark (p)) 1665 if (is_mark (p))
1620 clrmark (p); 1666 clrmark (p);
1621 else 1667 else
1622 { 1668 {
1623 /* reclaim cell */ 1669 /* reclaim cell */
1624 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1625 { 1671 {
1626 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1628 set_car (p, NIL); 1674 set_car (p, NIL);
1629 } 1675 }
1630 1676
1631 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1634 } 1680 }
1635 } 1681 }
1636 } 1682 }
1637 1683
1638 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1640} 1688}
1641 1689
1642static void 1690static void
1643finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1644{ 1692{
1645 /* TODO, fast bitmap check? */ 1693 /* TODO, fast bitmap check? */
1646 if (is_string (a)) 1694 if (is_string (a) || is_symbol (a))
1647 free (strvalue (a)); 1695 free (strvalue (a));
1648 else if (is_vector (a)) 1696 else if (is_vector (a))
1649 free (vecvalue (a)); 1697 free (vecvalue (a));
1650#if USE_PORTS 1698#if USE_PORTS
1651 else if (is_port (a)) 1699 else if (is_port (a))
… …
2073#endif 2121#endif
2074} 2122}
2075 2123
2076/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2077static char * 2125static char *
2078readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2127{
2080 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2081 2129
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2131
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2133 *p = 0;
… …
2092 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2093} 2141}
2094 2142
2095/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2096static pointer 2144static pointer
2097readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2098{ 2146{
2099 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2100 int c; 2148 int c;
2101 int c1 = 0; 2149 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2150 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2151
2105 for (;;) 2152 for (;;)
2106 { 2153 {
2107 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2108 2155
… …
2110 return S_F; 2157 return S_F;
2111 2158
2112 switch (state) 2159 switch (state)
2113 { 2160 {
2114 case st_ok: 2161 case st_ok:
2115 switch (c) 2162 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); 2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2164
2125 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2126 *p++ = c; 2168 *p++ = c;
2127 break;
2128 }
2129 2169
2130 break; 2170 break;
2131 2171
2132 case st_bsl: 2172 case st_bsl:
2133 switch (c) 2173 switch (c)
… …
2163 case 'r': 2203 case 'r':
2164 *p++ = '\r'; 2204 *p++ = '\r';
2165 state = st_ok; 2205 state = st_ok;
2166 break; 2206 break;
2167 2207
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2208 default:
2174 *p++ = c; 2209 *p++ = c;
2175 state = st_ok; 2210 state = st_ok;
2176 break; 2211 break;
2177 } 2212 }
2178 2213
2179 break; 2214 break;
2180 2215
2181 case st_x1: 2216 case st_x1:
2182 case st_x2: 2217 case st_x2:
2183 c = toupper (c); 2218 c = tolower (c);
2184 2219
2185 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2189 else 2222 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2223 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 2224 else
2201 return S_F; 2225 return S_F;
2226
2227 if (state == st_x1)
2228 state = st_x2;
2229 else
2230 {
2231 *p++ = c1;
2232 state = st_ok;
2233 }
2202 2234
2203 break; 2235 break;
2204 2236
2205 case st_oct1: 2237 case st_oct1:
2206 case st_oct2: 2238 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2211 state = st_ok; 2243 state = st_ok;
2212 } 2244 }
2213 else 2245 else
2214 { 2246 {
2215 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2248 return S_F;
2217 2249
2218 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2219 2251
2220 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2225 state = st_ok; 2257 state = st_ok;
2226 } 2258 }
2227 } 2259 }
2228 2260
2229 break; 2261 break;
2230
2231 } 2262 }
2232 } 2263 }
2233} 2264}
2234 2265
2235/* check c is in chars */ 2266/* check c is in chars */
2236static INLINE int 2267ecb_inline int
2237is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2238{ 2269{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2270 return c == EOF || !!strchr (s, c);
2243} 2271}
2244 2272
2245/* skip white characters */ 2273/* skip white characters */
2246static INLINE int 2274ecb_inline int
2247skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2248{ 2276{
2249 int c, curr_line = 0; 2277 int c, curr_line = 0;
2250 2278
2251 do 2279 do
… …
2254#if SHOW_ERROR_LINE 2282#if SHOW_ERROR_LINE
2255 if (c == '\n') 2283 if (c == '\n')
2256 curr_line++; 2284 curr_line++;
2257#endif 2285#endif
2258 } 2286 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2287 while (is_one_of (WHITESPACE, c));
2260 2288
2261 /* record it */ 2289 /* record it */
2262#if SHOW_ERROR_LINE 2290#if SHOW_ERROR_LINE
2263 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2264 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
… …
2294 return TOK_RPAREN; 2322 return TOK_RPAREN;
2295 2323
2296 case '.': 2324 case '.':
2297 c = inchar (SCHEME_A); 2325 c = inchar (SCHEME_A);
2298 2326
2299 if (is_one_of (" \n\t", c)) 2327 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2328 return TOK_DOT;
2301 else 2329 else
2302 { 2330 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2331 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2332 return TOK_DOTATOM;
2307 } 2333 }
2334
2335 case '|':
2336 return TOK_STRATOM;
2308 2337
2309 case '\'': 2338 case '\'':
2310 return TOK_QUOTE; 2339 return TOK_QUOTE;
2311 2340
2312 case ';': 2341 case ';':
… …
2444 } 2473 }
2445 2474
2446 putcharacter (SCHEME_A_ '"'); 2475 putcharacter (SCHEME_A_ '"');
2447} 2476}
2448 2477
2449
2450/* print atoms */ 2478/* print atoms */
2451static void 2479static void
2452printatom (SCHEME_P_ pointer l, int f) 2480printatom (SCHEME_P_ pointer l, int f)
2453{ 2481{
2454 char *p; 2482 char *p;
2455 int len; 2483 int len;
2456 2484
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2485 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2486 putchars (SCHEME_A_ p, len);
2459} 2487}
2460
2461 2488
2462/* Uses internal buffer unless string pointer is already available */ 2489/* Uses internal buffer unless string pointer is already available */
2463static void 2490static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2492{
… …
2479 { 2506 {
2480 p = SCHEME_V->strbuff; 2507 p = SCHEME_V->strbuff;
2481 2508
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2509 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2510 {
2484 if (num_is_integer (l)) 2511 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2512 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2513#if USE_REAL
2487 else 2514 else
2488 { 2515 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2516 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2653#endif
2627 } 2654 }
2628 else if (is_continuation (l)) 2655 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2656 p = "#<CONTINUATION>";
2630 else 2657 else
2658 {
2659#if USE_PRINTF
2660 p = SCHEME_V->strbuff;
2661 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2662#else
2631 p = "#<ERROR>"; 2663 p = "#<ERROR>";
2664#endif
2665 }
2632 2666
2633 *pp = p; 2667 *pp = p;
2634 *plen = strlen (p); 2668 *plen = strlen (p);
2635} 2669}
2636 2670
… …
2744 return 0; 2778 return 0;
2745 } 2779 }
2746 else if (is_number (a)) 2780 else if (is_number (a))
2747 { 2781 {
2748 if (is_number (b)) 2782 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2783 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2784
2752 return 0; 2785 return 0;
2753 } 2786 }
2754 else if (is_character (a)) 2787 else if (is_character (a))
2755 { 2788 {
… …
2781/* () is #t in R5RS */ 2814/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2815#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2816#define is_false(p) ((p) == S_F)
2784 2817
2785/* ========== Environment implementation ========== */ 2818/* ========== 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 2819
2802#ifndef USE_ALIST_ENV 2820#ifndef USE_ALIST_ENV
2803 2821
2804/* 2822/*
2805 * In this implementation, each frame of the environment may be 2823 * In this implementation, each frame of the environment may be
… …
2822 2840
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2841 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2842 setenvironment (SCHEME_V->envir);
2825} 2843}
2826 2844
2827static INLINE void 2845static uint32_t
2846sym_hash (pointer sym, uint32_t size)
2847{
2848 uintptr_t ptr = (uintptr_t)sym;
2849
2850#if 0
2851 /* table size is prime, so why mix */
2852 ptr += ptr >> 32;
2853 ptr += ptr >> 16;
2854 ptr += ptr >> 8;
2855#endif
2856
2857 return ptr % size;
2858}
2859
2860ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2861new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2862{
2830 pointer slot = immutable_cons (variable, value); 2863 pointer slot = immutable_cons (variable, value);
2831 2864
2832 if (is_vector (car (env))) 2865 if (is_vector (car (env)))
2833 { 2866 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2867 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2868 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2869 }
2838 else 2870 else
2839 set_car (env, immutable_cons (slot, car (env))); 2871 set_car (env, immutable_cons (slot, car (env)));
2840} 2872}
2841 2873
2842static pointer 2874static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2876{
2845 pointer x, y; 2877 pointer x, y;
2846 int location;
2847 2878
2848 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
2849 { 2880 {
2850 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
2851 { 2882 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2883 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
2854 } 2885 }
2855 else 2886 else
2856 y = car (x); 2887 y = car (x);
2857 2888
2858 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
2860 break; 2891 break;
2861 2892
2862 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
2863 break; 2897 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2898 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2899
2872 return NIL; 2900 return NIL;
2873} 2901}
2874 2902
2875#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
2876 2904
2877static INLINE void 2905ecb_inline void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2907{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
2882} 2910}
2883 2911
2884static INLINE void 2912ecb_inline void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2914{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2916}
2889 2917
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2925 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2926 if (caar (y) == hdl)
2899 break; 2927 break;
2900 2928
2901 if (y != NIL) 2929 if (y != NIL)
2930 return car (y);
2902 break; 2931 break;
2903 2932
2904 if (!all) 2933 if (!all)
2905 return NIL; 2934 break;
2906 } 2935 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2936
2911 return NIL; 2937 return NIL;
2912} 2938}
2913 2939
2914#endif /* USE_ALIST_ENV else */ 2940#endif /* USE_ALIST_ENV else */
2915 2941
2916static INLINE void 2942ecb_inline void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2944{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2946 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2947}
2921 2948
2922static INLINE void 2949ecb_inline void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2951{
2925 set_cdr (slot, value); 2952 set_cdr (slot, value);
2926} 2953}
2927 2954
2928static INLINE pointer 2955ecb_inline pointer
2929slot_value_in_env (pointer slot) 2956slot_value_in_env (pointer slot)
2930{ 2957{
2931 return cdr (slot); 2958 return cdr (slot);
2932} 2959}
2933 2960
2934/* ========== Evaluation Cycle ========== */ 2961/* ========== Evaluation Cycle ========== */
2935 2962
2936static pointer 2963static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2964xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2965{
2939#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
2940 pointer x; 2967 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2968 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3003 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3004 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3005 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3006 SCHEME_V->op = OP_EVAL;
2980 3007
2981 return S_T; 3008 return 0;
2982 } 3009 }
2983#endif 3010#endif
2984 3011
2985 if (a) 3012 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3013 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3015 SCHEME_V->args = NIL;
2989 3016
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3017 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3018 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3019 SCHEME_V->op = OP_ERR0;
3020
2993 return S_T; 3021 return 0;
2994} 3022}
2995 3023
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3024#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3025#define Error_0(s) Error_1 (s, 0)
2998 3026
2999/* Too small to turn into function */ 3027/* Too small to turn into function */
3000#define BEGIN do { 3028#define BEGIN do {
3001#define END } while (0) 3029#define END } while (0)
3002#define s_goto(a) BEGIN \ 3030#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3031 SCHEME_V->op = a; \
3004 return S_T; END 3032 return 0; END
3005 3033
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3034#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3035
3008#ifndef USE_SCHEME_STACK 3036#ifndef USE_SCHEME_STACK
3009 3037
… …
3039 next_frame->code = code; 3067 next_frame->code = code;
3040 3068
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3070}
3043 3071
3044static pointer 3072static int
3045xs_return (SCHEME_P_ pointer a) 3073xs_return (SCHEME_P_ pointer a)
3046{ 3074{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3075 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3076 struct dump_stack_frame *frame;
3049 3077
3050 SCHEME_V->value = a; 3078 SCHEME_V->value = a;
3051 3079
3052 if (nframes <= 0) 3080 if (nframes <= 0)
3053 return NIL; 3081 return -1;
3054 3082
3055 frame = &SCHEME_V->dump_base[--nframes]; 3083 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3084 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3085 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3086 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3087 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3089
3062 return S_T; 3090 return 0;
3063} 3091}
3064 3092
3065static INLINE void 3093ecb_inline void
3066dump_stack_reset (SCHEME_P) 3094dump_stack_reset (SCHEME_P)
3067{ 3095{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3096 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3097 SCHEME_V->dump = (pointer)+0;
3070} 3098}
3071 3099
3072static INLINE void 3100ecb_inline void
3073dump_stack_initialize (SCHEME_P) 3101dump_stack_initialize (SCHEME_P)
3074{ 3102{
3075 SCHEME_V->dump_size = 0; 3103 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3104 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3105 dump_stack_reset (SCHEME_A);
… …
3130 int i = 0; 3158 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3159 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3160
3133 while (cont != NIL) 3161 while (cont != NIL)
3134 { 3162 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3163 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3164 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3165 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3166 frame->code = car (cont) ; cont = cdr (cont);
3139 3167
3140 ++frame; 3168 ++frame;
3141 ++i; 3169 ++i;
3142 } 3170 }
3143 3171
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3172 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3173}
3146 3174
3147#else 3175#else
3148 3176
3149static INLINE void 3177ecb_inline void
3150dump_stack_reset (SCHEME_P) 3178dump_stack_reset (SCHEME_P)
3151{ 3179{
3152 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3153} 3181}
3154 3182
3155static INLINE void 3183ecb_inline void
3156dump_stack_initialize (SCHEME_P) 3184dump_stack_initialize (SCHEME_P)
3157{ 3185{
3158 dump_stack_reset (SCHEME_A); 3186 dump_stack_reset (SCHEME_A);
3159} 3187}
3160 3188
… …
3162dump_stack_free (SCHEME_P) 3190dump_stack_free (SCHEME_P)
3163{ 3191{
3164 SCHEME_V->dump = NIL; 3192 SCHEME_V->dump = NIL;
3165} 3193}
3166 3194
3167static pointer 3195static int
3168xs_return (SCHEME_P_ pointer a) 3196xs_return (SCHEME_P_ pointer a)
3169{ 3197{
3170 pointer dump = SCHEME_V->dump; 3198 pointer dump = SCHEME_V->dump;
3171 3199
3172 SCHEME_V->value = a; 3200 SCHEME_V->value = a;
3173 3201
3174 if (dump == NIL) 3202 if (dump == NIL)
3175 return NIL; 3203 return -1;
3176 3204
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3205 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3209
3182 SCHEME_V->dump = dump; 3210 SCHEME_V->dump = dump;
3183 3211
3184 return S_T; 3212 return 0;
3185} 3213}
3186 3214
3187static void 3215static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3217{
… …
3214 3242
3215#endif 3243#endif
3216 3244
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3246
3247#if 1
3219static pointer 3248static int
3249debug (SCHEME_P_ int indent, pointer x)
3250{
3251 int c;
3252
3253 if (is_syntax (x))
3254 {
3255 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3256 return 8 + 8;
3257 }
3258
3259 if (x == NIL)
3260 {
3261 printf ("%*sNIL\n", indent, "");
3262 return 3;
3263 }
3264
3265 switch (type (x))
3266 {
3267 case T_INTEGER:
3268 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3269 return 32+8;
3270
3271 case T_SYMBOL:
3272 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8;
3274
3275 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3279
3280 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1;
3285
3286 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8;
3289
3290 case T_VECTOR:
3291 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8;
3293
3294 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3297
3298 default:
3299 printf ("unhandled type %d\n", type (x));
3300 break;
3301 }
3302}
3303#endif
3304
3305static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3306opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3307{
3222 pointer args = SCHEME_V->args; 3308 pointer args = SCHEME_V->args;
3223 pointer x, y; 3309 pointer x, y;
3224 3310
3225 switch (op) 3311 switch (op)
3226 { 3312 {
3313#if 1 //D
3314 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3316 printf ("\n");
3317 s_return (S_T);
3318#endif
3227 case OP_LOAD: /* load */ 3319 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3320 if (file_interactive (SCHEME_A))
3229 { 3321 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3322 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))); 3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
… …
3354 } 3446 }
3355 else 3447 else
3356 s_return (SCHEME_V->code); 3448 s_return (SCHEME_V->code);
3357 3449
3358 case OP_E0ARGS: /* eval arguments */ 3450 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3452 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3454 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3455 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3456 s_goto (OP_APPLY);
… …
3391 3483
3392 case OP_TRACING: 3484 case OP_TRACING:
3393 { 3485 {
3394 int tr = SCHEME_V->tracing; 3486 int tr = SCHEME_V->tracing;
3395 3487
3396 SCHEME_V->tracing = ivalue (car (args)); 3488 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3489 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3490 }
3399 3491
3400#endif 3492#endif
3401 3493
… …
3413 /* fall through */ 3505 /* fall through */
3414 3506
3415 case OP_REAL_APPLY: 3507 case OP_REAL_APPLY:
3416#endif 3508#endif
3417 if (is_proc (SCHEME_V->code)) 3509 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3511 else if (is_foreign (SCHEME_V->code))
3422 { 3512 {
3423 /* Keep nested calls from GC'ing the arglist */ 3513 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3514 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
… …
3592 3682
3593 case OP_IF1: /* if */ 3683 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3684 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3685 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3686 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3601 3689
3602 case OP_LET0: /* let */ 3690 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3691 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3692 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (args); 4002 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4003 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 4004 s_goto (OP_APPLY);
3917 } 4005 }
3918 4006
3919 abort (); 4007 if (USE_ERROR_CHECKING) abort ();
3920} 4008}
3921 4009
3922static pointer 4010static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4011opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 4012{
3925 pointer args = SCHEME_V->args; 4013 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 4014 pointer x = car (args);
3927 num v; 4015 num v;
3928 4016
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 4017 switch (op)
3934 { 4018 {
3935#if USE_MATH 4019#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 4020 case OP_INEX2EX: /* inexact->exact */
4021 {
3937 if (num_is_integer (x)) 4022 if (is_integer (x))
3938 s_return (x); 4023 s_return (x);
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 4024
4025 RVALUE r = rvalue_unchecked (x);
4026
4027 if (r == (RVALUE)(IVALUE)r)
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3941 else 4029 else
3942 Error_1 ("inexact->exact: not integral:", x); 4030 Error_1 ("inexact->exact: not integral:", x);
4031 }
3943 4032
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4033 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)))); 4034 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)))); 4035 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)))); 4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
… …
3965 { 4054 {
3966 RVALUE result; 4055 RVALUE result;
3967 int real_result = 1; 4056 int real_result = 1;
3968 pointer y = cadr (args); 4057 pointer y = cadr (args);
3969 4058
3970 if (num_is_integer (x) && num_is_integer (y)) 4059 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 4060 real_result = 0;
3972 4061
3973 /* This 'if' is an R5RS compatibility fix. */ 4062 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 4063 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 4064 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4070 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4071 if (!real_result)
3983 { 4072 {
3984 long result_as_long = result; 4073 long result_as_long = result;
3985 4074
3986 if (result != (RVALUE) result_as_long) 4075 if (result != result_as_long)
3987 real_result = 1; 4076 real_result = 1;
3988 } 4077 }
3989 4078
3990 if (real_result) 4079 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4080 s_return (mk_real (SCHEME_A_ result));
… …
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4085 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)))); 4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998 4087
3999 case OP_TRUNCATE: 4088 case OP_TRUNCATE:
4000 { 4089 {
4001 RVALUE rvalue_of_x; 4090 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))); 4091 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 } 4092 }
4010 4093
4011 case OP_ROUND: 4094 case OP_ROUND:
4012 if (num_is_integer (x)) 4095 if (is_integer (x))
4013 s_return (x); 4096 s_return (x);
4014 4097
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4099#endif
4017 4100
4018 case OP_ADD: /* + */ 4101 case OP_ADD: /* + */
4019 v = num_zero; 4102 v = num_zero;
4020 4103
4021 for (x = args; x != NIL; x = cdr (x)) 4104 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4105 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4106
4024 s_return (mk_number (SCHEME_A_ v)); 4107 s_return (mk_number (SCHEME_A_ v));
4025 4108
4026 case OP_MUL: /* * */ 4109 case OP_MUL: /* * */
4027 v = num_one; 4110 v = num_one;
4028 4111
4029 for (x = args; x != NIL; x = cdr (x)) 4112 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4113 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4114
4032 s_return (mk_number (SCHEME_A_ v)); 4115 s_return (mk_number (SCHEME_A_ v));
4033 4116
4034 case OP_SUB: /* - */ 4117 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4118 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4125 x = cdr (args);
4043 v = nvalue (car (args)); 4126 v = nvalue (car (args));
4044 } 4127 }
4045 4128
4046 for (; x != NIL; x = cdr (x)) 4129 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4130 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4131
4049 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4050 4133
4051 case OP_DIV: /* / */ 4134 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4135 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4142 x = cdr (args);
4060 v = nvalue (car (args)); 4143 v = nvalue (car (args));
4061 } 4144 }
4062 4145
4063 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4147 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4148 v = num_div (v, nvalue (car (x)));
4067 else 4149 else
4068 Error_0 ("/: division by zero"); 4150 Error_0 ("/: division by zero");
4069 }
4070 4151
4071 s_return (mk_number (SCHEME_A_ v)); 4152 s_return (mk_number (SCHEME_A_ v));
4072 4153
4073 case OP_INTDIV: /* quotient */ 4154 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4155 if (cdr (args) == NIL)
… …
4083 } 4164 }
4084 4165
4085 for (; x != NIL; x = cdr (x)) 4166 for (; x != NIL; x = cdr (x))
4086 { 4167 {
4087 if (ivalue (car (x)) != 0) 4168 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4169 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4170 else
4090 Error_0 ("quotient: division by zero"); 4171 Error_0 ("quotient: division by zero");
4091 } 4172 }
4092 4173
4093 s_return (mk_number (SCHEME_A_ v)); 4174 s_return (mk_number (SCHEME_A_ v));
… …
4139 } 4220 }
4140 else 4221 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4222 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4223
4143 case OP_CHAR2INT: /* char->integer */ 4224 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4225 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4226
4146 case OP_INT2CHAR: /* integer->char */ 4227 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4228 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4229
4149 case OP_CHARUPCASE: 4230 case OP_CHARUPCASE:
4150 { 4231 {
4151 unsigned char c = ivalue (x); 4232 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4233 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4234 s_return (mk_character (SCHEME_A_ c));
4154 } 4235 }
4155 4236
4156 case OP_CHARDNCASE: 4237 case OP_CHARDNCASE:
4157 { 4238 {
4158 unsigned char c = ivalue (x); 4239 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4240 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4241 s_return (mk_character (SCHEME_A_ c));
4161 } 4242 }
4162 4243
4163 case OP_STR2SYM: /* string->symbol */ 4244 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4321 Error_1 ("atom->string: not an atom:", x);
4241 } 4322 }
4242 4323
4243 case OP_MKSTRING: /* make-string */ 4324 case OP_MKSTRING: /* make-string */
4244 { 4325 {
4245 int fill = ' '; 4326 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4327 int len = ivalue_unchecked (x);
4249 4328
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252
4253 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4329 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4330 }
4255 4331
4256 case OP_STRLEN: /* string-length */ 4332 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4333 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4334
4259 case OP_STRREF: /* string-ref */ 4335 case OP_STRREF: /* string-ref */
4260 { 4336 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4337 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4338 int index = ivalue_unchecked (cadr (args));
4267 4339
4268 if (index >= strlength (x)) 4340 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4341 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4342
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4343 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4344 }
4273 4345
4274 case OP_STRSET: /* string-set! */ 4346 case OP_STRSET: /* string-set! */
4275 { 4347 {
4276 char *str; 4348 char *str = strvalue (x);
4277 int index; 4349 int index = ivalue_unchecked (cadr (args));
4278 int c; 4350 int c;
4279 4351
4280 if (is_immutable (x)) 4352 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4353 Error_1 ("string-set!: unable to alter immutable string:", x);
4282 4354
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286
4287 if (index >= strlength (x)) 4355 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4356 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4357
4290 c = charvalue (caddr (args)); 4358 c = charvalue (caddr (args));
4291 4359
4292 str[index] = (char)c; 4360 str[index] = c;
4293 s_return (car (args)); 4361 s_return (car (args));
4294 } 4362 }
4295 4363
4296 case OP_STRAPPEND: /* string-append */ 4364 case OP_STRAPPEND: /* string-append */
4297 { 4365 {
… …
4313 s_return (newstr); 4381 s_return (newstr);
4314 } 4382 }
4315 4383
4316 case OP_SUBSTR: /* substring */ 4384 case OP_SUBSTR: /* substring */
4317 { 4385 {
4318 char *str; 4386 char *str = strvalue (x);
4319 int index0; 4387 int index0 = ivalue_unchecked (cadr (args));
4320 int index1; 4388 int index1;
4321 int len; 4389 int len;
4322 4390
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4391 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4392 Error_1 ("substring: start out of bounds:", cadr (args));
4329 4393
4330 if (cddr (args) != NIL) 4394 if (cddr (args) != NIL)
4331 { 4395 {
4332 index1 = ivalue (caddr (args)); 4396 index1 = ivalue_unchecked (caddr (args));
4333 4397
4334 if (index1 > strlength (x) || index1 < index0) 4398 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4399 Error_1 ("substring: end out of bounds:", caddr (args));
4336 } 4400 }
4337 else 4401 else
… …
4360 if (SCHEME_V->no_memory) 4424 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4425 s_return (S_SINK);
4362#endif 4426#endif
4363 4427
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4428 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4429 vector_set (vec, i, car (x));
4366 4430
4367 s_return (vec); 4431 s_return (vec);
4368 } 4432 }
4369 4433
4370 case OP_MKVECTOR: /* make-vector */ 4434 case OP_MKVECTOR: /* make-vector */
4371 { 4435 {
4372 pointer fill = NIL; 4436 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4437 pointer vec;
4375
4376 len = ivalue (x); 4438 int len = ivalue_unchecked (x);
4377 4439
4378 if (cdr (args) != NIL) 4440 if (cdr (args) != NIL)
4379 fill = cadr (args); 4441 fill = cadr (args);
4380 4442
4381 vec = mk_vector (SCHEME_A_ len); 4443 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4446 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4447 s_return (S_SINK);
4386#endif 4448#endif
4387 4449
4388 if (fill != NIL) 4450 if (fill != NIL)
4389 fill_vector (vec, fill); 4451 fill_vector (vec, 0, fill);
4390 4452
4391 s_return (vec); 4453 s_return (vec);
4392 } 4454 }
4393 4455
4394 case OP_VECLEN: /* vector-length */ 4456 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4457 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4458
4459 case OP_VECRESIZE:
4460 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4461 s_return (x);
4462
4397 case OP_VECREF: /* vector-ref */ 4463 case OP_VECREF: /* vector-ref */
4398 { 4464 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4465 int index = ivalue_unchecked (cadr (args));
4402 4466
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4467 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4468 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4469
4406 s_return (vector_elem (x, index)); 4470 s_return (vector_get (x, index));
4407 } 4471 }
4408 4472
4409 case OP_VECSET: /* vector-set! */ 4473 case OP_VECSET: /* vector-set! */
4410 { 4474 {
4411 int index; 4475 int index = ivalue_unchecked (cadr (args));
4412 4476
4413 if (is_immutable (x)) 4477 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4478 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4479
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4480 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4481 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4482
4421 set_vector_elem (x, index, caddr (args)); 4483 vector_set (x, index, caddr (args));
4422 s_return (x); 4484 s_return (x);
4423 } 4485 }
4424 } 4486 }
4425 4487
4426 return S_T; 4488 if (USE_ERROR_CHECKING) abort ();
4427} 4489}
4428 4490
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 4491static int
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4492opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4493{
4486 pointer x = SCHEME_V->args; 4494 pointer x = SCHEME_V->args;
4487 4495
4488 for (;;) 4496 for (;;)
4489 { 4497 {
… …
4509 } 4517 }
4510 4518
4511 s_return (S_T); 4519 s_return (S_T);
4512} 4520}
4513 4521
4514static pointer 4522static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4523opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4524{
4517 pointer args = SCHEME_V->args; 4525 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4526 pointer a = car (args);
4519 pointer d = cdr (args); 4527 pointer d = cdr (args);
… …
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4542
4535#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4547 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4548 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4549#endif
4542 4550
4543#if USE_PORTS 4551#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4552 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4553 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4573 }
4566 4574
4567 s_retbool (r); 4575 s_retbool (r);
4568} 4576}
4569 4577
4570static pointer 4578static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4579opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4580{
4573 pointer args = SCHEME_V->args; 4581 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4582 pointer a = car (args);
4575 pointer x, y; 4583 pointer x, y;
… …
4661 putstr (SCHEME_A_ "\n"); 4669 putstr (SCHEME_A_ "\n");
4662 4670
4663 if (SCHEME_V->interactive_repl) 4671 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4672 s_goto (OP_T0LVL);
4665 else 4673 else
4666 return NIL; 4674 return -1;
4667 } 4675 }
4668 4676
4669 case OP_REVERSE: /* reverse */ 4677 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4678 s_return (reverse (SCHEME_A_ a));
4671 4679
… …
4728 4736
4729 case OP_QUIT: /* quit */ 4737 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4738 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4739 SCHEME_V->retcode = ivalue (a);
4732 4740
4733 return NIL; 4741 return -1;
4734 4742
4735 case OP_GC: /* gc */ 4743 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4744 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4745 s_return (S_T);
4738 4746
… …
4746 4754
4747 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
4748 if (!is_pair (args) || !is_number (a)) 4756 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4757 Error_0 ("new-segment: argument must be a number");
4750 4758
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4759 alloc_cellseg (SCHEME_A_ ivalue (a));
4752 4760
4753 s_return (S_T); 4761 s_return (S_T);
4754 4762
4755 case OP_OBLIST: /* oblist */ 4763 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4764 s_return (oblist_all_symbols (SCHEME_A));
… …
4785 break; 4793 break;
4786 } 4794 }
4787 4795
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4796 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4797
4790 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4799 }
4795 4800
4796# if USE_STRING_PORTS 4801# if USE_STRING_PORTS
4797 4802
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4803 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4818 }
4814 4819
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4820 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4821 strvalue (a) + strlength (a), prop);
4817 4822
4818 if (p == NIL) 4823 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4824 }
4823 4825
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4826 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4827 {
4826 pointer p; 4828 pointer p;
4827 4829
4828 if (a == NIL) 4830 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4831 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4832 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4833 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4834 strvalue (a) + strlength (a), port_output);
4839 4835
4840 if (p == NIL) 4836 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4837 }
4846 4838
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4839 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4840 {
4849 port *p; 4841 port *p;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4880 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4881 s_return (SCHEME_V->envir);
4890 4882
4891 } 4883 }
4892 4884
4893 abort (); 4885 if (USE_ERROR_CHECKING) abort ();
4894} 4886}
4895 4887
4896static pointer 4888static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4889opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4890{
4891 pointer args = SCHEME_V->args;
4899 pointer x; 4892 pointer x;
4900 4893
4901 if (SCHEME_V->nesting != 0) 4894 if (SCHEME_V->nesting != 0)
4902 { 4895 {
4903 int n = SCHEME_V->nesting; 4896 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4903 switch (op)
4911 { 4904 {
4912 /* ========== reading part ========== */ 4905 /* ========== reading part ========== */
4913#if USE_PORTS 4906#if USE_PORTS
4914 case OP_READ: 4907 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4908 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4909 s_goto (OP_READ_INTERNAL);
4917 4910
4918 if (!is_inport (car (SCHEME_V->args))) 4911 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4912 Error_1 ("read: not an input port:", car (args));
4920 4913
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4914 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4915 s_goto (OP_READ_INTERNAL);
4923 4916
4924 x = SCHEME_V->inport; 4917 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4918 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4919 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4920 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4921 s_goto (OP_READ_INTERNAL);
4929 4922
4930 case OP_READ_CHAR: /* read-char */ 4923 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4924 case OP_PEEK_CHAR: /* peek-char */
4932 { 4925 {
4933 int c; 4926 int c;
4934 4927
4935 if (is_pair (SCHEME_V->args)) 4928 if (is_pair (args))
4936 { 4929 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4930 if (car (args) != SCHEME_V->inport)
4938 { 4931 {
4939 x = SCHEME_V->inport; 4932 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4933 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4934 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4935 SCHEME_V->inport = car (args);
4943 } 4936 }
4944 } 4937 }
4945 4938
4946 c = inchar (SCHEME_A); 4939 c = inchar (SCHEME_A);
4947 4940
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4950 case OP_CHAR_READY: /* char-ready? */
4958 { 4951 {
4959 pointer p = SCHEME_V->inport; 4952 pointer p = SCHEME_V->inport;
4960 int res; 4953 int res;
4961 4954
4962 if (is_pair (SCHEME_V->args)) 4955 if (is_pair (args))
4963 p = car (SCHEME_V->args); 4956 p = car (args);
4964 4957
4965 res = p->object.port->kind & port_string; 4958 res = p->object.port->kind & port_string;
4966 4959
4967 s_retbool (res); 4960 s_retbool (res);
4968 } 4961 }
4969 4962
4970 case OP_SET_INPORT: /* set-input-port */ 4963 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 4964 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 4965 s_return (SCHEME_V->value);
4973 4966
4974 case OP_SET_OUTPORT: /* set-output-port */ 4967 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 4968 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 4969 s_return (SCHEME_V->value);
4977#endif 4970#endif
4978 4971
4979 case OP_RDSEXPR: 4972 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 4973 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5022 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 5023 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 5024 s_goto (OP_RDSEXPR);
5032 5025
5033 case TOK_ATOM: 5026 case TOK_ATOM:
5034 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5027 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5028
5029 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032
5033 case TOK_STRATOM:
5034 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5035 5037
5036 case TOK_DQUOTE: 5038 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 5039 x = readstrexp (SCHEME_A_ '"');
5038 5040
5039 if (x == S_F) 5041 if (x == S_F)
5040 Error_0 ("Error reading string"); 5042 Error_0 ("Error reading string");
5041 5043
5042 setimmutable (x); 5044 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 5056 s_goto (OP_EVAL);
5055 } 5057 }
5056 } 5058 }
5057 5059
5058 case TOK_SHARP_CONST: 5060 case TOK_SHARP_CONST:
5059 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5060 Error_0 ("undefined sharp expression"); 5062 Error_0 ("undefined sharp expression");
5061 else 5063 else
5062 s_return (x); 5064 s_return (x);
5063 5065
5064 default: 5066 default:
… …
5066 } 5068 }
5067 5069
5068 break; 5070 break;
5069 5071
5070 case OP_RDLIST: 5072 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5073 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5074 SCHEME_V->tok = token (SCHEME_A);
5073 5075
5074 switch (SCHEME_V->tok) 5076 switch (SCHEME_V->tok)
5075 { 5077 {
5076 case TOK_EOF: 5078 case TOK_EOF:
… …
5104 case OP_RDDOT: 5106 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5107 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5108 Error_0 ("syntax error: illegal dot expression");
5107 5109
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5110 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5111 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5110 5112
5111 case OP_RDQUOTE: 5113 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5114 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5115
5114 case OP_RDQQUOTE: 5116 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5138 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5139 s_goto (OP_VECTOR);
5138 5140
5139 /* ========== printing part ========== */ 5141 /* ========== printing part ========== */
5140 case OP_P0LIST: 5142 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5143 if (is_vector (args))
5142 { 5144 {
5143 putstr (SCHEME_A_ "#("); 5145 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5146 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5147 s_goto (OP_PVECFROM);
5146 } 5148 }
5147 else if (is_environment (SCHEME_V->args)) 5149 else if (is_environment (args))
5148 { 5150 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5151 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5152 s_return (S_T);
5151 } 5153 }
5152 else if (!is_pair (SCHEME_V->args)) 5154 else if (!is_pair (args))
5153 { 5155 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5156 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5157 s_return (S_T);
5156 } 5158 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5159 else
5158 { 5160 {
5161 pointer a = car (args);
5162 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b);
5165
5166 if (a == SCHEME_V->QUOTE && ok_abbr)
5159 putstr (SCHEME_A_ "'"); 5167 putstr (SCHEME_A_ "'");
5160 SCHEME_V->args = cadr (SCHEME_V->args); 5168 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`");
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ",");
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@");
5174 else
5175 {
5176 putstr (SCHEME_A_ "(");
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a;
5179 }
5180
5161 s_goto (OP_P0LIST); 5181 s_goto (OP_P0LIST);
5162 } 5182 }
5163 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5183
5184 case OP_P1LIST:
5185 if (is_pair (args))
5164 { 5186 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5188 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5189 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5190 s_goto (OP_P0LIST);
5168 } 5191 }
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)) 5192 else if (is_vector (args))
5198 { 5193 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5194 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5195 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5196 s_goto (OP_P0LIST);
5202 } 5197 }
5203 else 5198 else
5204 { 5199 {
5205 if (SCHEME_V->args != NIL) 5200 if (args != NIL)
5206 { 5201 {
5207 putstr (SCHEME_A_ " . "); 5202 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5204 }
5210 5205
5211 putstr (SCHEME_A_ ")"); 5206 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5207 s_return (S_T);
5213 } 5208 }
5214 5209
5215 case OP_PVECFROM: 5210 case OP_PVECFROM:
5216 { 5211 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5212 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5213 pointer vec = car (args);
5219 int len = veclength (vec); 5214 int len = veclength (vec);
5220 5215
5221 if (i == len) 5216 if (i == len)
5222 { 5217 {
5223 putstr (SCHEME_A_ ")"); 5218 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5219 s_return (S_T);
5225 } 5220 }
5226 else 5221 else
5227 { 5222 {
5228 pointer elem = vector_elem (vec, i); 5223 pointer elem = vector_get (vec, i);
5229 5224
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5225 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5227 SCHEME_V->args = elem;
5233 5228
5234 if (i > 0) 5229 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5230 putstr (SCHEME_A_ " ");
5236 5231
5237 s_goto (OP_P0LIST); 5232 s_goto (OP_P0LIST);
5238 } 5233 }
5239 } 5234 }
5240 } 5235 }
5241 5236
5242 abort (); 5237 if (USE_ERROR_CHECKING) abort ();
5243} 5238}
5244 5239
5245static pointer 5240static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5241opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5242{
5243 pointer args = SCHEME_V->args;
5244 pointer a = car (args);
5248 pointer x, y; 5245 pointer x, y;
5249 5246
5250 switch (op) 5247 switch (op)
5251 { 5248 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5249 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5250 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5251 long v = list_length (SCHEME_A_ a);
5255 5252
5256 if (v < 0) 5253 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5254 Error_1 ("length: not a list:", a);
5258 5255
5259 s_return (mk_integer (SCHEME_A_ v)); 5256 s_return (mk_integer (SCHEME_A_ v));
5260 } 5257 }
5261 5258
5262 case OP_ASSQ: /* assq *//* a.k */ 5259 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5260 x = a;
5264 5261
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5262 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5263 {
5267 if (!is_pair (car (y))) 5264 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5265 Error_0 ("unable to handle non pair element");
5269 5266
5270 if (x == caar (y)) 5267 if (x == caar (y))
… …
5276 else 5273 else
5277 s_return (S_F); 5274 s_return (S_F);
5278 5275
5279 5276
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5278 SCHEME_V->args = a;
5282 5279
5283 if (SCHEME_V->args == NIL) 5280 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5281 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5282 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5291 5288
5292 case OP_CLOSUREP: /* closure? */ 5289 case OP_CLOSUREP: /* closure? */
5293 /* 5290 /*
5294 * Note, macro object is also a closure. 5291 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5292 * Therefore, (closure? <#MACRO>) ==> #t
5293 * (schmorp) well, obviously not, fix? TODO
5296 */ 5294 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5295 s_retbool (is_closure (a));
5298 5296
5299 case OP_MACROP: /* macro? */ 5297 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5298 s_retbool (is_macro (a));
5301 } 5299 }
5302 5300
5303 abort (); 5301 if (USE_ERROR_CHECKING) abort ();
5304} 5302}
5305 5303
5304/* 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); 5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5306
5308typedef int (*test_predicate) (pointer); 5307typedef int (*test_predicate)(pointer);
5309static int 5308static int
5310is_any (pointer p) 5309tst_any (pointer p)
5311{ 5310{
5312 return 1; 5311 return 1;
5313} 5312}
5314 5313
5315static int 5314static int
5316is_nonneg (pointer p) 5315tst_inonneg (pointer p)
5317{ 5316{
5318 return ivalue (p) >= 0 && is_integer (p); 5317 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318}
5319
5320static int
5321tst_is_list (SCHEME_P_ pointer p)
5322{
5323 return p == NIL || is_pair (p);
5319} 5324}
5320 5325
5321/* Correspond carefully with following defines! */ 5326/* Correspond carefully with following defines! */
5322static struct 5327static struct
5323{ 5328{
5324 test_predicate fct; 5329 test_predicate fct;
5325 const char *kind; 5330 const char *kind;
5326} tests[] = 5331} tests[] = {
5327{ 5332 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5333 { is_string , "string" },
5329 { is_any, 0}, 5334 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5335 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5336 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5337 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5338 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5339 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5340 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5341 { is_character , "character" },
5339 { is_vector, "vector" }, 5342 { is_vector , "vector" },
5340 { is_number, "number" }, 5343 { is_number , "number" },
5341 { is_integer, "integer" }, 5344 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5345 { tst_inonneg , "non-negative integer" }
5343}; 5346};
5344 5347
5345#define TST_NONE 0 5348#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5349#define TST_ANY "\001"
5347#define TST_STRING "\002" 5350#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5351#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5352#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5353#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5354#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5355#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5356#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5357#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5358#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5359#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5360#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5361#define TST_INTEGER "\015"
5359#define TST_NATURAL "\016" 5362#define TST_NATURAL "\016"
5363
5364#define INF_ARG 0xff
5365#define UNNAMED_OP ""
5366
5367static const char opnames[] =
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h"
5370#undef OP_DEF
5371;
5372
5373static const char *
5374opname (int idx)
5375{
5376 const char *name = opnames;
5377
5378 /* should do this at compile time, but would require external program, right? */
5379 while (idx--)
5380 name += strlen (name) + 1;
5381
5382 return *name ? name : "ILLEGAL";
5383}
5384
5385static const char *
5386procname (pointer x)
5387{
5388 return opname (procnum (x));
5389}
5360 5390
5361typedef struct 5391typedef struct
5362{ 5392{
5363 dispatch_func func; 5393 uint8_t func;
5364 char *name; 5394 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5395 uint8_t builtin;
5396#if USE_ERROR_CHECKING
5365 int min_arity; 5397 uint8_t min_arity;
5366 int max_arity; 5398 uint8_t max_arity;
5367 char *arg_tests_encoding; 5399 char arg_tests_encoding[3];
5400#endif
5368} op_code_info; 5401} op_code_info;
5369 5402
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5403static const op_code_info dispatch_table[] = {
5373#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5404#if USE_ERROR_CHECKING
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5406#else
5407#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5408#endif
5374#include "opdefines.h" 5409#include "opdefines.h"
5410#undef OP_DEF
5375 {0} 5411 {0}
5376}; 5412};
5377 5413
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 */ 5414/* kernel of this interpreter */
5391static void 5415static void ecb_hot
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5417{
5394 SCHEME_V->op = op; 5418 SCHEME_V->op = op;
5395 5419
5396 for (;;) 5420 for (;;)
5397 { 5421 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5422 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5423
5400#if USE_ERROR_CHECKING 5424#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5425 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5426 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5427 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5428 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5429
5407 /* Check number of arguments */ 5430 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5431 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5432 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5433 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5434 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5435 xError_1 (SCHEME_A_ msg, 0);
5436 continue;
5413 } 5437 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5438 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5439 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5440 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5441 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5442 xError_1 (SCHEME_A_ msg, 0);
5443 continue;
5419 } 5444 }
5420 5445 else
5421 if (ecb_expect_false (ok))
5422 { 5446 {
5423 if (pcd->arg_tests_encoding) 5447 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5448 {
5425 int i = 0; 5449 int i = 0;
5426 int j; 5450 int j;
5427 const char *t = pcd->arg_tests_encoding; 5451 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5452 pointer arglist = SCHEME_V->args;
5429 5453
5430 do 5454 do
5431 { 5455 {
5432 pointer arg = car (arglist); 5456 pointer arg = car (arglist);
5433 5457
5434 j = (int) t[0]; 5458 j = t[0];
5435 5459
5460 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5461 if (j == TST_LIST[0])
5437 { 5462 {
5438 if (arg != NIL && !is_pair (arg)) 5463 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5464 break;
5440 } 5465 }
5441 else 5466 else
5442 { 5467 {
5443 if (!tests[j].fct (arg)) 5468 if (!tests[j - 1].fct (arg))
5444 break; 5469 break;
5445 } 5470 }
5446 5471
5447 if (t[1] != 0) /* last test is replicated as necessary */ 5472 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5448 t++; 5473 t++;
5449 5474
5450 arglist = cdr (arglist); 5475 arglist = cdr (arglist);
5451 i++; 5476 i++;
5452 } 5477 }
5453 while (i < n); 5478 while (i < n);
5454 5479
5455 if (i < n) 5480 if (i < n)
5456 { 5481 {
5457 ok = 0;
5458 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5482 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5483 xError_1 (SCHEME_A_ msg, 0);
5484 continue;
5459 } 5485 }
5460 } 5486 }
5461 } 5487 }
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 } 5488 }
5471#endif 5489#endif
5472 5490
5473 ok_to_freely_gc (SCHEME_A); 5491 ok_to_freely_gc (SCHEME_A);
5474 5492
5493 static const dispatch_func dispatch_funcs[] = {
5494 opexe_0,
5495 opexe_1,
5496 opexe_2,
5497 opexe_3,
5498 opexe_4,
5499 opexe_5,
5500 opexe_6,
5501 };
5502
5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5476 return; 5504 return;
5477 5505
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5507 {
5480 xwrstr ("No memory!\n"); 5508 xwrstr ("No memory!\n");
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5532mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5533{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5534 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5535 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5536 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5537 return y;
5511} 5538}
5512 5539
5513/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5514static int 5541static int
5515syntaxnum (pointer p) 5542syntaxnum (pointer p)
5516{ 5543{
5517 const char *s = strvalue (car (p)); 5544 const char *s = strvalue (p);
5518 5545
5519 switch (strlength (car (p))) 5546 switch (strlength (p))
5520 { 5547 {
5521 case 2: 5548 case 2:
5522 if (s[0] == 'i') 5549 if (s[0] == 'i')
5523 return OP_IF0; /* if */ 5550 return OP_IF0; /* if */
5524 else 5551 else
… …
5579 return OP_C0STREAM; /* cons-stream */ 5606 return OP_C0STREAM; /* cons-stream */
5580 } 5607 }
5581} 5608}
5582 5609
5583#if USE_MULTIPLICITY 5610#if USE_MULTIPLICITY
5584scheme * 5611ecb_cold scheme *
5585scheme_init_new () 5612scheme_init_new ()
5586{ 5613{
5587 scheme *sc = malloc (sizeof (scheme)); 5614 scheme *sc = malloc (sizeof (scheme));
5588 5615
5589 if (!scheme_init (SCHEME_A)) 5616 if (!scheme_init (SCHEME_A))
… …
5594 else 5621 else
5595 return sc; 5622 return sc;
5596} 5623}
5597#endif 5624#endif
5598 5625
5599int 5626ecb_cold int
5600scheme_init (SCHEME_P) 5627scheme_init (SCHEME_P)
5601{ 5628{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 pointer x; 5630 pointer x;
5604 5631
… …
5677 5704
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5705 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5706 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5707 }
5681 5708
5709 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5710 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5711 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5712 assign_proc (SCHEME_A_ i, opname (i));
5685 5713
5686 /* initialization of global pointers to special symbols */ 5714 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5715 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5716 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5717 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5728scheme_set_external_data (SCHEME_P_ void *p) 5756scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5757{
5730 SCHEME_V->ext_data = p; 5758 SCHEME_V->ext_data = p;
5731} 5759}
5732 5760
5733void 5761ecb_cold void
5734scheme_deinit (SCHEME_P) 5762scheme_deinit (SCHEME_P)
5735{ 5763{
5736 int i; 5764 int i;
5737 5765
5738#if SHOW_ERROR_LINE 5766#if SHOW_ERROR_LINE
… …
5830{ 5858{
5831 dump_stack_reset (SCHEME_A); 5859 dump_stack_reset (SCHEME_A);
5832 SCHEME_V->envir = SCHEME_V->global_env; 5860 SCHEME_V->envir = SCHEME_V->global_env;
5833 SCHEME_V->file_i = 0; 5861 SCHEME_V->file_i = 0;
5834 SCHEME_V->load_stack[0].kind = port_input | port_string; 5862 SCHEME_V->load_stack[0].kind = port_input | port_string;
5835 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5836 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5837 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5838#if USE_PORTS 5866#if USE_PORTS
5839 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5840#endif 5868#endif
5841 SCHEME_V->retcode = 0; 5869 SCHEME_V->retcode = 0;
5842 SCHEME_V->interactive_repl = 0; 5870 SCHEME_V->interactive_repl = 0;
… …
5959# endif 5987# endif
5960 int fin; 5988 int fin;
5961 char *file_name = InitFile; 5989 char *file_name = InitFile;
5962 int retcode; 5990 int retcode;
5963 int isfile = 1; 5991 int isfile = 1;
5992 system ("ps v $PPID");//D
5964 5993
5965 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5994 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5966 { 5995 {
5967 xwrstr ("Usage: tinyscheme -?\n"); 5996 xwrstr ("Usage: tinyscheme -?\n");
5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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