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

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

Diff Legend

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