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

Comparing microscheme/scheme.c (file contents):
Revision 1.12 by root, Thu Nov 26 07:30:25 2015 UTC vs.
Revision 1.49 by root, Mon Nov 30 13:09:56 2015 UTC

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

Diff Legend

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