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.13 by root, Thu Nov 26 07:59:42 2015 UTC vs.
Revision 1.50 by root, Tue Dec 1 00:47:54 2015 UTC

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

Diff Legend

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