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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.43 by root, Mon Nov 30 06:40:57 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#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 419SCHEME_EXPORT int
423hasprop (pointer p) 420hasprop (pointer p)
424{ 421{
425 return typeflag (p) & T_SYMBOL; 422 return typeflag (p) & T_SYMBOL;
426} 423}
427
428# define symprop(p) cdr(p)
429#endif 424#endif
430 425
431INTERFACE INLINE int 426INTERFACE int
432is_syntax (pointer p) 427is_syntax (pointer p)
433{ 428{
434 return typeflag (p) & T_SYNTAX; 429 return typeflag (p) & T_SYNTAX;
435} 430}
436 431
437INTERFACE INLINE int 432INTERFACE int
438is_proc (pointer p) 433is_proc (pointer p)
439{ 434{
440 return type (p) == T_PROC; 435 return type (p) == T_PROC;
441} 436}
442 437
443INTERFACE INLINE int 438INTERFACE int
444is_foreign (pointer p) 439is_foreign (pointer p)
445{ 440{
446 return type (p) == T_FOREIGN; 441 return type (p) == T_FOREIGN;
447} 442}
448 443
449INTERFACE INLINE char * 444INTERFACE char *
450syntaxname (pointer p) 445syntaxname (pointer p)
451{ 446{
452 return strvalue (car (p)); 447 return strvalue (p);
453} 448}
454 449
455#define procnum(p) ivalue (p) 450#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 451static const char *procname (pointer x);
457 452
458INTERFACE INLINE int 453INTERFACE int
459is_closure (pointer p) 454is_closure (pointer p)
460{ 455{
461 return type (p) == T_CLOSURE; 456 return type (p) == T_CLOSURE;
462} 457}
463 458
464INTERFACE INLINE int 459INTERFACE int
465is_macro (pointer p) 460is_macro (pointer p)
466{ 461{
467 return type (p) == T_MACRO; 462 return type (p) == T_MACRO;
468} 463}
469 464
470INTERFACE INLINE pointer 465INTERFACE pointer
471closure_code (pointer p) 466closure_code (pointer p)
472{ 467{
473 return car (p); 468 return car (p);
474} 469}
475 470
476INTERFACE INLINE pointer 471INTERFACE pointer
477closure_env (pointer p) 472closure_env (pointer p)
478{ 473{
479 return cdr (p); 474 return cdr (p);
480} 475}
481 476
482INTERFACE INLINE int 477INTERFACE int
483is_continuation (pointer p) 478is_continuation (pointer p)
484{ 479{
485 return type (p) == T_CONTINUATION; 480 return type (p) == T_CONTINUATION;
486} 481}
487 482
488#define cont_dump(p) cdr (p) 483#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 484#define set_cont_dump(p,v) set_cdr ((p), (v))
490 485
491/* To do: promise should be forced ONCE only */ 486/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 487INTERFACE int
493is_promise (pointer p) 488is_promise (pointer p)
494{ 489{
495 return type (p) == T_PROMISE; 490 return type (p) == T_PROMISE;
496} 491}
497 492
498INTERFACE INLINE int 493INTERFACE int
499is_environment (pointer p) 494is_environment (pointer p)
500{ 495{
501 return type (p) == T_ENVIRONMENT; 496 return type (p) == T_ENVIRONMENT;
502} 497}
503 498
… …
509 504
510#define is_mark(p) (typeflag (p) & T_MARK) 505#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 506#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 507#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 508
514INTERFACE INLINE int 509INTERFACE int
515is_immutable (pointer p) 510is_immutable (pointer p)
516{ 511{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 512 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 513}
519 514
520INTERFACE INLINE void 515INTERFACE void
521setimmutable (pointer p) 516setimmutable (pointer p)
522{ 517{
523#if USE_ERROR_CHECKING 518#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 519 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 520#endif
526} 521}
527 522
523/* Result is:
524 proper list: length
525 circular list: -1
526 not even a pair: -2
527 dotted list: -2 minus length before dot
528*/
529INTERFACE int
530list_length (SCHEME_P_ pointer a)
531{
532 int i = 0;
533 pointer slow, fast;
534
535 slow = fast = a;
536
537 while (1)
538 {
539 if (fast == NIL)
540 return i;
541
542 if (!is_pair (fast))
543 return -2 - i;
544
545 fast = cdr (fast);
546 ++i;
547
548 if (fast == NIL)
549 return i;
550
551 if (!is_pair (fast))
552 return -2 - i;
553
554 ++i;
555 fast = cdr (fast);
556
557 /* Safe because we would have already returned if `fast'
558 encountered a non-pair. */
559 slow = cdr (slow);
560
561 if (fast == slow)
562 {
563 /* the fast pointer has looped back around and caught up
564 with the slow pointer, hence the structure is circular,
565 not of finite length, and therefore not a list */
566 return -1;
567 }
568 }
569}
570
571INTERFACE int
572is_list (SCHEME_P_ pointer a)
573{
574 return list_length (SCHEME_A_ a) >= 0;
575}
576
528#if USE_CHAR_CLASSIFIERS 577#if USE_CHAR_CLASSIFIERS
529static INLINE int 578ecb_inline int
530Cisalpha (int c) 579Cisalpha (int c)
531{ 580{
532 return isascii (c) && isalpha (c); 581 return isascii (c) && isalpha (c);
533} 582}
534 583
535static INLINE int 584ecb_inline int
536Cisdigit (int c) 585Cisdigit (int c)
537{ 586{
538 return isascii (c) && isdigit (c); 587 return isascii (c) && isdigit (c);
539} 588}
540 589
541static INLINE int 590ecb_inline int
542Cisspace (int c) 591Cisspace (int c)
543{ 592{
544 return isascii (c) && isspace (c); 593 return isascii (c) && isspace (c);
545} 594}
546 595
547static INLINE int 596ecb_inline int
548Cisupper (int c) 597Cisupper (int c)
549{ 598{
550 return isascii (c) && isupper (c); 599 return isascii (c) && isupper (c);
551} 600}
552 601
553static INLINE int 602ecb_inline int
554Cislower (int c) 603Cislower (int c)
555{ 604{
556 return isascii (c) && islower (c); 605 return isascii (c) && islower (c);
557} 606}
558#endif 607#endif
… …
619#endif 668#endif
620 669
621static int file_push (SCHEME_P_ const char *fname); 670static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 671static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 672static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 673ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 674static int alloc_cellseg (SCHEME_P_ int n);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 675ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 676static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 677static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 678static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 679static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 680static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
647static void mark (pointer a); 695static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 696static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 697static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 698static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 699static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 700static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 701static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 702ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 703static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 704static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 705static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 706static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 707static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 711static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 712static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 713static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 714static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 715static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
717static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 722static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 723static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 724static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 725static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 726static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 727
728static IVALUE
729ivalue (pointer x)
730{
731 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
732}
733
734static RVALUE
735rvalue (pointer x)
736{
737 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
738}
739
740INTERFACE num
741nvalue (pointer x)
742{
743 num n;
744
745 num_set_fixnum (n, is_integer (x));
746
747 if (num_is_fixnum (n))
748 num_set_ivalue (n, ivalue_unchecked (x));
749 else
750 num_set_rvalue (n, rvalue_unchecked (x));
751
752 return n;
753}
754
679static num 755static num
680num_add (num a, num b) 756num_op (enum num_op op, num a, num b)
681{ 757{
682 num ret; 758 num ret;
683 759
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 761
686 if (num_is_fixnum (ret)) 762 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 763 {
764 switch (op)
765 {
766 case NUM_ADD: a.ivalue += b.ivalue; break;
767 case NUM_SUB: a.ivalue -= b.ivalue; break;
768 case NUM_MUL: a.ivalue *= b.ivalue; break;
769 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
770 }
771
772 num_set_ivalue (ret, a.ivalue);
773 }
774#if USE_REAL
688 else 775 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 776 {
777 switch (op)
778 {
779 case NUM_ADD: a.rvalue += b.rvalue; break;
780 case NUM_SUB: a.rvalue -= b.rvalue; break;
781 case NUM_MUL: a.rvalue *= b.rvalue; break;
782 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
783 }
690 784
691 return ret; 785 num_set_rvalue (ret, a.rvalue);
692} 786 }
693 787#endif
694static num
695num_mul (num a, num b)
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 788
706 return ret; 789 return ret;
707} 790}
708 791
709static num 792static num
710num_div (num a, num b) 793num_div (num a, num b)
711{ 794{
712 num ret; 795 num ret;
713 796
714 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 797 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
715 798
716 if (num_is_fixnum (ret)) 799 if (num_is_fixnum (ret))
717 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 800 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
718 else 801 else
719 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 802 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
720
721 return ret;
722}
723
724static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750 803
751 return ret; 804 return ret;
752} 805}
753 806
754static num 807static num
… …
756{ 809{
757 num ret; 810 num ret;
758 long e1, e2, res; 811 long e1, e2, res;
759 812
760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 813 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
761 e1 = num_get_ivalue (a); 814 e1 = num_ivalue (a);
762 e2 = num_get_ivalue (b); 815 e2 = num_ivalue (b);
763 res = e1 % e2; 816 res = e1 % e2;
764 817
765 /* remainder should have same sign as second operand */ 818 /* remainder should have same sign as second operand */
766 if (res > 0) 819 if (res > 0)
767 { 820 {
… …
783{ 836{
784 num ret; 837 num ret;
785 long e1, e2, res; 838 long e1, e2, res;
786 839
787 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 840 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
788 e1 = num_get_ivalue (a); 841 e1 = num_ivalue (a);
789 e2 = num_get_ivalue (b); 842 e2 = num_ivalue (b);
790 res = e1 % e2; 843 res = e1 % e2;
791 844
792 /* modulo should have same sign as second operand */ 845 /* modulo should have same sign as second operand */
793 if (res * e2 < 0) 846 if (res * e2 < 0)
794 res += e2; 847 res += e2;
795 848
796 num_set_ivalue (ret, res); 849 num_set_ivalue (ret, res);
797 return ret; 850 return ret;
798} 851}
799 852
853/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 854static int
801num_eq (num a, num b) 855num_cmp (num a, num b)
802{ 856{
857 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 858 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 859
806 if (is_fixnum) 860 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 861 {
862 IVALUE av = num_ivalue (a);
863 IVALUE bv = num_ivalue (b);
864
865 ret = av == bv ? 0 : av < bv ? -1 : +1;
866 }
808 else 867 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 868 {
869 RVALUE av = num_rvalue (a);
870 RVALUE bv = num_rvalue (b);
871
872 ret = av == bv ? 0 : av < bv ? -1 : +1;
873 }
810 874
811 return ret; 875 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 876}
854 877
855#if USE_MATH 878#if USE_MATH
856 879
857/* Round to nearest. Round to even if midway */ 880/* Round to nearest. Round to even if midway */
… …
867 return ce; 890 return ce;
868 else if (dfl < dce) 891 else if (dfl < dce)
869 return fl; 892 return fl;
870 else 893 else
871 { 894 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 895 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 896 return fl;
874 else 897 else
875 return ce; 898 return ce;
876 } 899 }
877} 900}
878#endif 901#endif
879 902
880static int 903static int
881is_zero_rvalue (RVALUE x) 904is_zero_rvalue (RVALUE x)
882{ 905{
906 return x == 0;
907#if 0
883#if USE_REAL 908#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 909 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 910#else
886 return x == 0; 911 return x == 0;
887#endif 912#endif
888} 913#endif
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 914}
904 915
905/* allocate new cell segment */ 916/* allocate new cell segment */
906static int 917static int
907alloc_cellseg (SCHEME_P_ int n) 918alloc_cellseg (SCHEME_P_ int n)
… …
927 return k; 938 return k;
928 939
929 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
930 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
931 942
932 /* insert new segment in address order */
933 newp = (pointer)cp; 943 newp = (pointer)cp;
934 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
935 SCHEME_V->cell_segsize[i] = segsize; 945 SCHEME_V->cell_segsize[i] = segsize;
936
937 //TODO: insert, not swap
938 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
939 {
940 p = SCHEME_V->cell_seg[i];
941 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
942 SCHEME_V->cell_seg[i - 1] = p;
943
944 k = SCHEME_V->cell_segsize[i];
945 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
946 SCHEME_V->cell_segsize[i - 1] = k;
947
948 --i;
949 }
950
951 SCHEME_V->fcells += segsize; 946 SCHEME_V->fcells += segsize;
952 last = newp + segsize - 1; 947 last = newp + segsize - 1;
953 948
954 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
955 { 950 {
956 set_typeflag (p, T_FREE); 951 set_typeflag (p, T_PAIR);
957 set_car (p, NIL); 952 set_car (p, NIL);
958 set_cdr (p, p + 1); 953 set_cdr (p, p + 1);
959 } 954 }
960 955
961 /* insert new cells in address order on free list */
962 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
963 {
964 set_cdr (last, SCHEME_V->free_cell); 956 set_cdr (last, SCHEME_V->free_cell);
965 SCHEME_V->free_cell = newp; 957 SCHEME_V->free_cell = newp;
966 }
967 else
968 {
969 p = SCHEME_V->free_cell;
970
971 while (cdr (p) != NIL && newp > cdr (p))
972 p = cdr (p);
973
974 set_cdr (last, cdr (p));
975 set_cdr (p, newp);
976 }
977 } 958 }
978 959
979 return n; 960 return n;
980} 961}
981 962
982/* get new cell. parameter a, b is marked by gc. */ 963/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 964ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 965get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 966{
986 if (SCHEME_V->free_cell == NIL) 967 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 968 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 969 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 970 return S_SINK;
990 971
991 if (SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->free_cell == NIL)
… …
1060 /* Record it as a vector so that gc understands it. */ 1041 /* Record it as a vector so that gc understands it. */
1061 set_typeflag (v, T_VECTOR | T_ATOM); 1042 set_typeflag (v, T_VECTOR | T_ATOM);
1062 1043
1063 v->object.vector.vvalue = e; 1044 v->object.vector.vvalue = e;
1064 v->object.vector.length = len; 1045 v->object.vector.length = len;
1065 fill_vector (v, init); 1046 fill_vector (v, 0, init);
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1047 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1048
1068 return v; 1049 return v;
1069} 1050}
1070 1051
1071static INLINE void 1052ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1053ok_to_freely_gc (SCHEME_P)
1073{ 1054{
1074 set_car (S_SINK, NIL); 1055 set_car (S_SINK, NIL);
1075} 1056}
1076 1057
… …
1113 set_cdr (x, b); 1094 set_cdr (x, b);
1114 1095
1115 return x; 1096 return x;
1116} 1097}
1117 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x;
1106}
1107
1118/* ========== oblist implementation ========== */ 1108/* ========== oblist implementation ========== */
1119 1109
1120#ifndef USE_OBJECT_LIST 1110#ifndef USE_OBJECT_LIST
1121 1111
1112static int
1122static int hash_fn (const char *key, int table_size); 1113hash_fn (const char *key, int table_size)
1114{
1115 const unsigned char *p = key;
1116 uint32_t hash = 2166136261;
1117
1118 while (*p)
1119 hash = (hash ^ *p++) * 16777619;
1120
1121 return hash % table_size;
1122}
1123 1123
1124static pointer 1124static pointer
1125oblist_initial_value (SCHEME_P) 1125oblist_initial_value (SCHEME_P)
1126{ 1126{
1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1129 1129
1130/* returns the new symbol */ 1130/* returns the new symbol */
1131static pointer 1131static pointer
1132oblist_add_by_name (SCHEME_P_ const char *name) 1132oblist_add_by_name (SCHEME_P_ const char *name)
1133{ 1133{
1134 int location; 1134 pointer x = generate_symbol (SCHEME_A_ name);
1135
1136 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1137 set_typeflag (x, T_SYMBOL);
1138 setimmutable (car (x));
1139
1140 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1135 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1141 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1136 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1142 return x; 1137 return x;
1143} 1138}
1144 1139
1145static INLINE pointer 1140ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1141oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1142{
1148 int location; 1143 int location;
1149 pointer x; 1144 pointer x;
1150 char *s; 1145 char *s;
1151 1146
1152 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1147 location = hash_fn (name, veclength (SCHEME_V->oblist));
1153 1148
1154 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1149 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1155 { 1150 {
1156 s = symname (car (x)); 1151 s = symname (car (x));
1157 1152
1158 /* case-insensitive, per R5RS section 2 */ 1153 /* case-insensitive, per R5RS section 2 */
1159 if (stricmp (name, s) == 0) 1154 if (stricmp (name, s) == 0)
… …
1169 int i; 1164 int i;
1170 pointer x; 1165 pointer x;
1171 pointer ob_list = NIL; 1166 pointer ob_list = NIL;
1172 1167
1173 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1168 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1174 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1169 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1175 ob_list = cons (x, ob_list); 1170 ob_list = cons (x, ob_list);
1176 1171
1177 return ob_list; 1172 return ob_list;
1178} 1173}
1179 1174
… …
1183oblist_initial_value (SCHEME_P) 1178oblist_initial_value (SCHEME_P)
1184{ 1179{
1185 return NIL; 1180 return NIL;
1186} 1181}
1187 1182
1188static INLINE pointer 1183ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1184oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1185{
1191 pointer x; 1186 pointer x;
1192 char *s; 1187 char *s;
1193 1188
… …
1205 1200
1206/* returns the new symbol */ 1201/* returns the new symbol */
1207static pointer 1202static pointer
1208oblist_add_by_name (SCHEME_P_ const char *name) 1203oblist_add_by_name (SCHEME_P_ const char *name)
1209{ 1204{
1210 pointer x; 1205 pointer x = mk_string (SCHEME_A_ name);
1211
1212 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1213 set_typeflag (x, T_SYMBOL); 1206 set_typeflag (x, T_SYMBOL);
1214 setimmutable (car (x)); 1207 setimmutable (x);
1215 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1208 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1216 return x; 1209 return x;
1217} 1210}
1218 1211
1219static pointer 1212static pointer
… …
1252mk_character (SCHEME_P_ int c) 1245mk_character (SCHEME_P_ int c)
1253{ 1246{
1254 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1247 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1255 1248
1256 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1249 set_typeflag (x, (T_CHARACTER | T_ATOM));
1257 ivalue_unchecked (x) = c & 0xff; 1250 set_ivalue (x, c & 0xff);
1258 set_num_integer (x); 1251
1259 return x; 1252 return x;
1260} 1253}
1261 1254
1262/* get number atom (integer) */ 1255/* get number atom (integer) */
1263INTERFACE pointer 1256INTERFACE pointer
1264mk_integer (SCHEME_P_ long num) 1257mk_integer (SCHEME_P_ long n)
1265{ 1258{
1266 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1259 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1267 1260
1268 set_typeflag (x, (T_NUMBER | T_ATOM)); 1261 set_typeflag (x, (T_INTEGER | T_ATOM));
1269 ivalue_unchecked (x) = num; 1262 set_ivalue (x, n);
1270 set_num_integer (x); 1263
1271 return x; 1264 return x;
1272} 1265}
1273 1266
1274INTERFACE pointer 1267INTERFACE pointer
1275mk_real (SCHEME_P_ RVALUE n) 1268mk_real (SCHEME_P_ RVALUE n)
1276{ 1269{
1270#if USE_REAL
1277 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1271 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1278 1272
1279 set_typeflag (x, (T_NUMBER | T_ATOM)); 1273 set_typeflag (x, (T_REAL | T_ATOM));
1280 rvalue_unchecked (x) = n; 1274 set_rvalue (x, n);
1281 set_num_real (x); 1275
1282 return x; 1276 return x;
1277#else
1278 return mk_integer (SCHEME_A_ n);
1279#endif
1283} 1280}
1284 1281
1285static pointer 1282static pointer
1286mk_number (SCHEME_P_ const num n) 1283mk_number (SCHEME_P_ const num n)
1287{ 1284{
1285#if USE_REAL
1288 if (num_is_fixnum (n)) 1286 return num_is_fixnum (n)
1287 ? mk_integer (SCHEME_A_ num_ivalue (n))
1288 : mk_real (SCHEME_A_ num_rvalue (n));
1289#else
1289 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1290 return mk_integer (SCHEME_A_ num_ivalue (n));
1290 else 1291#endif
1291 return mk_real (SCHEME_A_ num_get_rvalue (n));
1292} 1292}
1293 1293
1294/* allocate name to string area */ 1294/* allocate name to string area */
1295static char * 1295static char *
1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1302 SCHEME_V->no_memory = 1; 1302 SCHEME_V->no_memory = 1;
1303 return SCHEME_V->strbuff; 1303 return SCHEME_V->strbuff;
1304 } 1304 }
1305 1305
1306 if (str) 1306 if (str)
1307 { 1307 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1308 int l = strlen (str);
1309
1310 if (l > len_str)
1311 l = len_str;
1312
1313 memcpy (q, str, l);
1314 q[l] = 0;
1315 }
1316 else 1308 else
1317 {
1318 memset (q, fill, len_str); 1309 memset (q, fill, len_str);
1310
1319 q[len_str] = 0; 1311 q[len_str] = 0;
1320 }
1321 1312
1322 return q; 1313 return q;
1323}
1324
1325/* get new string */
1326INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str)
1328{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str));
1330}
1331
1332INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{
1335 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1336
1337 set_typeflag (x, T_STRING | T_ATOM);
1338 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1339 strlength (x) = len;
1340 return x;
1341} 1314}
1342 1315
1343INTERFACE pointer 1316INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1317mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1345{ 1318{
… …
1350 strlength (x) = len; 1323 strlength (x) = len;
1351 return x; 1324 return x;
1352} 1325}
1353 1326
1354INTERFACE pointer 1327INTERFACE pointer
1328mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1329{
1330 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1331
1332 set_typeflag (x, T_STRING | T_ATOM);
1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1334 strlength (x) = len;
1335
1336 return x;
1337}
1338
1339INTERFACE pointer
1340mk_string (SCHEME_P_ const char *str)
1341{
1342 return mk_counted_string (SCHEME_A_ str, strlen (str));
1343}
1344
1345INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1346mk_vector (SCHEME_P_ uint32_t len)
1356{ 1347{
1357 return get_vector_object (SCHEME_A_ len, NIL); 1348 return get_vector_object (SCHEME_A_ len, NIL);
1358} 1349}
1359 1350
1360INTERFACE void 1351INTERFACE void
1361fill_vector (pointer vec, pointer obj) 1352fill_vector (pointer vec, uint32_t start, pointer obj)
1362{ 1353{
1363 int i; 1354 int i;
1364 1355
1365 for (i = 0; i < vec->object.vector.length; i++) 1356 for (i = start; i < veclength (vec); i++)
1366 vecvalue (vec)[i] = obj; 1357 vecvalue (vec)[i] = obj;
1367} 1358}
1368 1359
1360INTERFACE void
1361vector_resize (pointer vec, uint32_t newsize, pointer fill)
1362{
1363 uint32_t oldsize = veclength (vec);
1364 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1365 veclength (vec) = newsize;
1366 fill_vector (vec, oldsize, fill);
1367}
1368
1369INTERFACE pointer 1369INTERFACE pointer
1370vector_elem (pointer vec, uint32_t ielem) 1370vector_get (pointer vec, uint32_t ielem)
1371{ 1371{
1372 return vecvalue(vec)[ielem]; 1372 return vecvalue(vec)[ielem];
1373} 1373}
1374 1374
1375INTERFACE void 1375INTERFACE void
1376set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1376vector_set (pointer vec, uint32_t ielem, pointer a)
1377{ 1377{
1378 vecvalue(vec)[ielem] = a; 1378 vecvalue(vec)[ielem] = a;
1379} 1379}
1380 1380
1381/* get new symbol */ 1381/* get new symbol */
… …
1393 1393
1394INTERFACE pointer 1394INTERFACE pointer
1395gensym (SCHEME_P) 1395gensym (SCHEME_P)
1396{ 1396{
1397 pointer x; 1397 pointer x;
1398 char name[40]; 1398 char name[40] = "gensym-";
1399
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 {
1402 strcpy (name, "gensym-");
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1399 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1404 1400
1405 /* first check oblist */ 1401 return generate_symbol (SCHEME_A_ name);
1406 x = oblist_find_by_name (SCHEME_A_ name); 1402}
1407 1403
1408 if (x != NIL) 1404static int
1409 continue; 1405is_gensym (SCHEME_P_ pointer x)
1410 else 1406{
1411 { 1407 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1412 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x;
1414 }
1415 }
1416
1417 return NIL;
1418} 1408}
1419 1409
1420/* make symbol or number atom from string */ 1410/* make symbol or number atom from string */
1421static pointer 1411static pointer
1422mk_atom (SCHEME_P_ char *q) 1412mk_atom (SCHEME_P_ char *q)
… …
1424 char c, *p; 1414 char c, *p;
1425 int has_dec_point = 0; 1415 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1416 int has_fp_exp = 0;
1427 1417
1428#if USE_COLON_HOOK 1418#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1419 if ((p = strstr (q, "::")) != 0)
1431 { 1420 {
1432 *p = 0; 1421 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1422 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1423 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1424 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1425 }
1437
1438#endif 1426#endif
1439 1427
1440 p = q; 1428 p = q;
1441 c = *p++; 1429 c = *p++;
1442 1430
… …
1478 } 1466 }
1479 else if ((c == 'e') || (c == 'E')) 1467 else if ((c == 'e') || (c == 'E'))
1480 { 1468 {
1481 if (!has_fp_exp) 1469 if (!has_fp_exp)
1482 { 1470 {
1483 has_dec_point = 1; /* decimal point illegal 1471 has_dec_point = 1; /* decimal point illegal from now on */
1484 from now on */
1485 p++; 1472 p++;
1486 1473
1487 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1474 if ((*p == '-') || (*p == '+') || isdigit (*p))
1488 continue; 1475 continue;
1489 } 1476 }
… …
1503 1490
1504/* make constant */ 1491/* make constant */
1505static pointer 1492static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1493mk_sharp_const (SCHEME_P_ char *name)
1507{ 1494{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1495 if (!strcmp (name, "t"))
1512 return S_T; 1496 return S_T;
1513 else if (!strcmp (name, "f")) 1497 else if (!strcmp (name, "f"))
1514 return S_F; 1498 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1499 else if (*name == '\\') /* #\w (character) */
1536 { 1500 {
1537 int c = 0; 1501 int c;
1538 1502
1539 if (stricmp (name + 1, "space") == 0) 1503 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1504 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1505 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1506 c = '\n';
… …
1544 c = '\r'; 1508 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1509 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1510 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1511 else if (name[1] == 'x' && name[2] != 0)
1548 { 1512 {
1549 int c1 = strtol (name + 2, 0, 16); 1513 long c1 = strtol (name + 2, 0, 16);
1550 1514
1551 if (c1 <= UCHAR_MAX) 1515 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1516 c = c1;
1553 else 1517 else
1554 return NIL; 1518 return NIL;
1555 1519 }
1556#if USE_ASCII_NAMES 1520#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1521 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1522 /* nothing */;
1561#endif 1523#endif
1562 }
1563 else if (name[2] == 0) 1524 else if (name[2] == 0)
1564 c = name[1]; 1525 c = name[1];
1565 else 1526 else
1566 return NIL; 1527 return NIL;
1567 1528
1568 return mk_character (SCHEME_A_ c); 1529 return mk_character (SCHEME_A_ c);
1569 } 1530 }
1570 else 1531 else
1532 {
1533 /* identify base by string index */
1534 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1535 char *base = strchr (baseidx, *name);
1536
1537 if (base)
1538 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1539
1571 return NIL; 1540 return NIL;
1541 }
1572} 1542}
1573 1543
1574/* ========== garbage collector ========== */ 1544/* ========== garbage collector ========== */
1575 1545
1576/*-- 1546/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1547 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1548 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1549 * for marking.
1550 *
1551 * The exception is vectors - vectors are currently marked recursively,
1552 * which is inherited form tinyscheme and could be fixed by having another
1553 * word of context in the vector
1580 */ 1554 */
1581static void 1555static void
1582mark (pointer a) 1556mark (pointer a)
1583{ 1557{
1584 pointer t, q, p; 1558 pointer t, q, p;
… …
1586 t = 0; 1560 t = 0;
1587 p = a; 1561 p = a;
1588E2: 1562E2:
1589 setmark (p); 1563 setmark (p);
1590 1564
1591 if (is_vector (p)) 1565 if (ecb_expect_false (is_vector (p)))
1592 { 1566 {
1593 int i; 1567 int i;
1594 1568
1595 for (i = 0; i < p->object.vector.length; i++) 1569 for (i = 0; i < veclength (p); i++)
1596 mark (vecvalue (p)[i]); 1570 mark (vecvalue (p)[i]);
1597 } 1571 }
1598 1572
1599 if (is_atom (p)) 1573 if (is_atom (p))
1600 goto E6; 1574 goto E6;
… …
1698 if (is_mark (p)) 1672 if (is_mark (p))
1699 clrmark (p); 1673 clrmark (p);
1700 else 1674 else
1701 { 1675 {
1702 /* reclaim cell */ 1676 /* reclaim cell */
1703 if (typeflag (p) != T_FREE) 1677 if (typeflag (p) != T_PAIR)
1704 { 1678 {
1705 finalize_cell (SCHEME_A_ p); 1679 finalize_cell (SCHEME_A_ p);
1706 set_typeflag (p, T_FREE); 1680 set_typeflag (p, T_PAIR);
1707 set_car (p, NIL); 1681 set_car (p, NIL);
1708 } 1682 }
1709 1683
1710 ++SCHEME_V->fcells; 1684 ++SCHEME_V->fcells;
1711 set_cdr (p, SCHEME_V->free_cell); 1685 set_cdr (p, SCHEME_V->free_cell);
… …
1713 } 1687 }
1714 } 1688 }
1715 } 1689 }
1716 1690
1717 if (SCHEME_V->gc_verbose) 1691 if (SCHEME_V->gc_verbose)
1692 {
1718 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1693 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1694 }
1719} 1695}
1720 1696
1721static void 1697static void
1722finalize_cell (SCHEME_P_ pointer a) 1698finalize_cell (SCHEME_P_ pointer a)
1723{ 1699{
1724 if (is_string (a)) 1700 /* TODO, fast bitmap check? */
1701 if (is_string (a) || is_symbol (a))
1725 free (strvalue (a)); 1702 free (strvalue (a));
1726 else if (is_vector (a)) 1703 else if (is_vector (a))
1727 free (vecvalue (a)); 1704 free (vecvalue (a));
1728#if USE_PORTS 1705#if USE_PORTS
1729 else if (is_port (a)) 1706 else if (is_port (a))
… …
2151#endif 2128#endif
2152} 2129}
2153 2130
2154/* read characters up to delimiter, but cater to character constants */ 2131/* read characters up to delimiter, but cater to character constants */
2155static char * 2132static char *
2156readstr_upto (SCHEME_P_ char *delim) 2133readstr_upto (SCHEME_P_ int skip, const char *delim)
2157{ 2134{
2158 char *p = SCHEME_V->strbuff; 2135 char *p = SCHEME_V->strbuff + skip;
2159 2136
2160 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2137 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2161 2138
2162 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2139 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2163 *p = 0; 2140 *p = 0;
… …
2170 return SCHEME_V->strbuff; 2147 return SCHEME_V->strbuff;
2171} 2148}
2172 2149
2173/* read string expression "xxx...xxx" */ 2150/* read string expression "xxx...xxx" */
2174static pointer 2151static pointer
2175readstrexp (SCHEME_P) 2152readstrexp (SCHEME_P_ char delim)
2176{ 2153{
2177 char *p = SCHEME_V->strbuff; 2154 char *p = SCHEME_V->strbuff;
2178 int c; 2155 int c;
2179 int c1 = 0; 2156 int c1 = 0;
2180 enum
2181 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2157 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2182 2158
2183 for (;;) 2159 for (;;)
2184 { 2160 {
2185 c = inchar (SCHEME_A); 2161 c = inchar (SCHEME_A);
2186 2162
… …
2188 return S_F; 2164 return S_F;
2189 2165
2190 switch (state) 2166 switch (state)
2191 { 2167 {
2192 case st_ok: 2168 case st_ok:
2193 switch (c) 2169 if (ecb_expect_false (c == delim))
2194 {
2195 case '\\':
2196 state = st_bsl;
2197 break;
2198
2199 case '"':
2200 *p = 0;
2201 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2170 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2202 2171
2203 default: 2172 if (ecb_expect_false (c == '\\'))
2173 state = st_bsl;
2174 else
2204 *p++ = c; 2175 *p++ = c;
2205 break;
2206 }
2207 2176
2208 break; 2177 break;
2209 2178
2210 case st_bsl: 2179 case st_bsl:
2211 switch (c) 2180 switch (c)
… …
2241 case 'r': 2210 case 'r':
2242 *p++ = '\r'; 2211 *p++ = '\r';
2243 state = st_ok; 2212 state = st_ok;
2244 break; 2213 break;
2245 2214
2246 case '"':
2247 *p++ = '"';
2248 state = st_ok;
2249 break;
2250
2251 default: 2215 default:
2252 *p++ = c; 2216 *p++ = c;
2253 state = st_ok; 2217 state = st_ok;
2254 break; 2218 break;
2255 } 2219 }
2256 2220
2257 break; 2221 break;
2258 2222
2259 case st_x1: 2223 case st_x1:
2260 case st_x2: 2224 case st_x2:
2261 c = toupper (c); 2225 c = tolower (c);
2262 2226
2263 if (c >= '0' && c <= 'F') 2227 if (c >= '0' && c <= '9')
2264 {
2265 if (c <= '9')
2266 c1 = (c1 << 4) + c - '0'; 2228 c1 = (c1 << 4) + c - '0';
2267 else 2229 else if (c >= 'a' && c <= 'f')
2268 c1 = (c1 << 4) + c - 'A' + 10; 2230 c1 = (c1 << 4) + c - 'a' + 10;
2269
2270 if (state == st_x1)
2271 state = st_x2;
2272 else
2273 {
2274 *p++ = c1;
2275 state = st_ok;
2276 }
2277 }
2278 else 2231 else
2279 return S_F; 2232 return S_F;
2233
2234 if (state == st_x1)
2235 state = st_x2;
2236 else
2237 {
2238 *p++ = c1;
2239 state = st_ok;
2240 }
2280 2241
2281 break; 2242 break;
2282 2243
2283 case st_oct1: 2244 case st_oct1:
2284 case st_oct2: 2245 case st_oct2:
… …
2288 backchar (SCHEME_A_ c); 2249 backchar (SCHEME_A_ c);
2289 state = st_ok; 2250 state = st_ok;
2290 } 2251 }
2291 else 2252 else
2292 { 2253 {
2293 if (state == st_oct2 && c1 >= 32) 2254 if (state == st_oct2 && c1 >= ' ')
2294 return S_F; 2255 return S_F;
2295 2256
2296 c1 = (c1 << 3) + (c - '0'); 2257 c1 = (c1 << 3) + (c - '0');
2297 2258
2298 if (state == st_oct1) 2259 if (state == st_oct1)
… …
2303 state = st_ok; 2264 state = st_ok;
2304 } 2265 }
2305 } 2266 }
2306 2267
2307 break; 2268 break;
2308
2309 } 2269 }
2310 } 2270 }
2311} 2271}
2312 2272
2313/* check c is in chars */ 2273/* check c is in chars */
2314static INLINE int 2274ecb_inline int
2315is_one_of (char *s, int c) 2275is_one_of (const char *s, int c)
2316{ 2276{
2317 if (c == EOF)
2318 return 1;
2319
2320 return !!strchr (s, c); 2277 return c == EOF || !!strchr (s, c);
2321} 2278}
2322 2279
2323/* skip white characters */ 2280/* skip white characters */
2324static INLINE int 2281ecb_inline int
2325skipspace (SCHEME_P) 2282skipspace (SCHEME_P)
2326{ 2283{
2327 int c, curr_line = 0; 2284 int c, curr_line = 0;
2328 2285
2329 do 2286 do
2330 { 2287 {
2331 c = inchar (SCHEME_A); 2288 c = inchar (SCHEME_A);
2289
2332#if SHOW_ERROR_LINE 2290#if SHOW_ERROR_LINE
2333 if (c == '\n') 2291 if (ecb_expect_false (c == '\n'))
2334 curr_line++; 2292 curr_line++;
2335#endif 2293#endif
2294
2295 if (ecb_expect_false (c == EOF))
2296 return c;
2336 } 2297 }
2337 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2298 while (is_one_of (WHITESPACE, c));
2338 2299
2339 /* record it */ 2300 /* record it */
2340#if SHOW_ERROR_LINE 2301#if SHOW_ERROR_LINE
2341 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2302 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2342 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2303 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2343#endif 2304#endif
2344 2305
2345 if (c != EOF)
2346 {
2347 backchar (SCHEME_A_ c); 2306 backchar (SCHEME_A_ c);
2348 return 1; 2307 return 1;
2349 }
2350 else
2351 return EOF;
2352} 2308}
2353 2309
2354/* get token */ 2310/* get token */
2355static int 2311static int
2356token (SCHEME_P) 2312token (SCHEME_P)
… …
2372 return TOK_RPAREN; 2328 return TOK_RPAREN;
2373 2329
2374 case '.': 2330 case '.':
2375 c = inchar (SCHEME_A); 2331 c = inchar (SCHEME_A);
2376 2332
2377 if (is_one_of (" \n\t", c)) 2333 if (is_one_of (WHITESPACE, c))
2378 return TOK_DOT; 2334 return TOK_DOT;
2379 else 2335 else
2380 { 2336 {
2381 //TODO: ungetc twice in a row is not supported in C
2382 backchar (SCHEME_A_ c); 2337 backchar (SCHEME_A_ c);
2383 backchar (SCHEME_A_ '.');
2384 return TOK_ATOM; 2338 return TOK_DOTATOM;
2385 } 2339 }
2340
2341 case '|':
2342 return TOK_STRATOM;
2386 2343
2387 case '\'': 2344 case '\'':
2388 return TOK_QUOTE; 2345 return TOK_QUOTE;
2389 2346
2390 case ';': 2347 case ';':
… …
2522 } 2479 }
2523 2480
2524 putcharacter (SCHEME_A_ '"'); 2481 putcharacter (SCHEME_A_ '"');
2525} 2482}
2526 2483
2527
2528/* print atoms */ 2484/* print atoms */
2529static void 2485static void
2530printatom (SCHEME_P_ pointer l, int f) 2486printatom (SCHEME_P_ pointer l, int f)
2531{ 2487{
2532 char *p; 2488 char *p;
2533 int len; 2489 int len;
2534 2490
2535 atom2str (SCHEME_A_ l, f, &p, &len); 2491 atom2str (SCHEME_A_ l, f, &p, &len);
2536 putchars (SCHEME_A_ p, len); 2492 putchars (SCHEME_A_ p, len);
2537} 2493}
2538
2539 2494
2540/* Uses internal buffer unless string pointer is already available */ 2495/* Uses internal buffer unless string pointer is already available */
2541static void 2496static void
2542atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2497atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2543{ 2498{
… …
2557 { 2512 {
2558 p = SCHEME_V->strbuff; 2513 p = SCHEME_V->strbuff;
2559 2514
2560 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2515 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2561 { 2516 {
2562 if (num_is_integer (l)) 2517 if (is_integer (l))
2563 xnum (p, ivalue_unchecked (l)); 2518 xnum (p, ivalue_unchecked (l));
2564#if USE_REAL 2519#if USE_REAL
2565 else 2520 else
2566 { 2521 {
2567 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2522 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2704#endif 2659#endif
2705 } 2660 }
2706 else if (is_continuation (l)) 2661 else if (is_continuation (l))
2707 p = "#<CONTINUATION>"; 2662 p = "#<CONTINUATION>";
2708 else 2663 else
2664 {
2665#if USE_PRINTF
2666 p = SCHEME_V->strbuff;
2667 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2668#else
2709 p = "#<ERROR>"; 2669 p = "#<ERROR>";
2670#endif
2671 }
2710 2672
2711 *pp = p; 2673 *pp = p;
2712 *plen = strlen (p); 2674 *plen = strlen (p);
2713} 2675}
2714 2676
… …
2822 return 0; 2784 return 0;
2823 } 2785 }
2824 else if (is_number (a)) 2786 else if (is_number (a))
2825 { 2787 {
2826 if (is_number (b)) 2788 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2789 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2790
2830 return 0; 2791 return 0;
2831 } 2792 }
2832 else if (is_character (a)) 2793 else if (is_character (a))
2833 { 2794 {
… …
2859/* () is #t in R5RS */ 2820/* () is #t in R5RS */
2860#define is_true(p) ((p) != S_F) 2821#define is_true(p) ((p) != S_F)
2861#define is_false(p) ((p) == S_F) 2822#define is_false(p) ((p) == S_F)
2862 2823
2863/* ========== Environment implementation ========== */ 2824/* ========== Environment implementation ========== */
2864
2865#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2866
2867static int
2868hash_fn (const char *key, int table_size)
2869{
2870 const unsigned char *p = key;
2871 uint32_t hash = 2166136261;
2872
2873 while (*p)
2874 hash = (hash ^ *p++) * 16777619;
2875
2876 return hash % table_size;
2877}
2878#endif
2879 2825
2880#ifndef USE_ALIST_ENV 2826#ifndef USE_ALIST_ENV
2881 2827
2882/* 2828/*
2883 * In this implementation, each frame of the environment may be 2829 * In this implementation, each frame of the environment may be
… …
2900 2846
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2847 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2848 setenvironment (SCHEME_V->envir);
2903} 2849}
2904 2850
2905static INLINE void 2851static uint32_t
2852sym_hash (pointer sym, uint32_t size)
2853{
2854 uintptr_t ptr = (uintptr_t)sym;
2855
2856#if 0
2857 /* table size is prime, so why mix */
2858 ptr += ptr >> 32;
2859 ptr += ptr >> 16;
2860 ptr += ptr >> 8;
2861#endif
2862
2863 return ptr % size;
2864}
2865
2866ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2867new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2868{
2908 pointer slot = immutable_cons (variable, value); 2869 pointer slot = immutable_cons (variable, value);
2909 2870
2910 if (is_vector (car (env))) 2871 if (is_vector (car (env)))
2911 { 2872 {
2912 int location = hash_fn (symname (variable), veclength (car (env))); 2873 int location = sym_hash (variable, veclength (car (env)));
2913
2914 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2874 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2915 } 2875 }
2916 else 2876 else
2917 set_car (env, immutable_cons (slot, car (env))); 2877 set_car (env, immutable_cons (slot, car (env)));
2918} 2878}
2919 2879
2920static pointer 2880static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2881find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2882{
2923 pointer x, y; 2883 pointer x, y;
2924 int location;
2925 2884
2926 for (x = env; x != NIL; x = cdr (x)) 2885 for (x = env; x != NIL; x = cdr (x))
2927 { 2886 {
2928 if (is_vector (car (x))) 2887 if (is_vector (car (x)))
2929 { 2888 {
2930 location = hash_fn (symname (hdl), veclength (car (x))); 2889 int location = sym_hash (hdl, veclength (car (x)));
2931 y = vector_elem (car (x), location); 2890 y = vector_get (car (x), location);
2932 } 2891 }
2933 else 2892 else
2934 y = car (x); 2893 y = car (x);
2935 2894
2936 for (; y != NIL; y = cdr (y)) 2895 for (; y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2896 if (caar (y) == hdl)
2938 break; 2897 break;
2939 2898
2940 if (y != NIL) 2899 if (y != NIL)
2900 return car (y);
2901
2902 if (!all)
2941 break; 2903 break;
2942
2943 if (!all)
2944 return NIL;
2945 } 2904 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2905
2950 return NIL; 2906 return NIL;
2951} 2907}
2952 2908
2953#else /* USE_ALIST_ENV */ 2909#else /* USE_ALIST_ENV */
2954 2910
2955static INLINE void 2911ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2912new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2913{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2914 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2915 setenvironment (SCHEME_V->envir);
2960} 2916}
2961 2917
2962static INLINE void 2918ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2919new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2920{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2921 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2922}
2967 2923
… …
2975 for (y = car (x); y != NIL; y = cdr (y)) 2931 for (y = car (x); y != NIL; y = cdr (y))
2976 if (caar (y) == hdl) 2932 if (caar (y) == hdl)
2977 break; 2933 break;
2978 2934
2979 if (y != NIL) 2935 if (y != NIL)
2936 return car (y);
2980 break; 2937 break;
2981 2938
2982 if (!all) 2939 if (!all)
2983 return NIL; 2940 break;
2984 } 2941 }
2985
2986 if (x != NIL)
2987 return car (y);
2988 2942
2989 return NIL; 2943 return NIL;
2990} 2944}
2991 2945
2992#endif /* USE_ALIST_ENV else */ 2946#endif /* USE_ALIST_ENV else */
2993 2947
2994static INLINE void 2948ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2949new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2950{
2951 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2952 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2953}
2999 2954
3000static INLINE void 2955ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2956set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2957{
3003 set_cdr (slot, value); 2958 set_cdr (slot, value);
3004} 2959}
3005 2960
3006static INLINE pointer 2961ecb_inline pointer
3007slot_value_in_env (pointer slot) 2962slot_value_in_env (pointer slot)
3008{ 2963{
3009 return cdr (slot); 2964 return cdr (slot);
3010} 2965}
3011 2966
3012/* ========== Evaluation Cycle ========== */ 2967/* ========== Evaluation Cycle ========== */
3013 2968
3014static pointer 2969static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2970xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2971{
3017#if USE_ERROR_HOOK 2972#if USE_ERROR_HOOK
3018 pointer x; 2973 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2974 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 3009 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 3010 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 3011 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 3012 SCHEME_V->op = OP_EVAL;
3058 3013
3059 return S_T; 3014 return 0;
3060 } 3015 }
3061#endif 3016#endif
3062 3017
3063 if (a) 3018 if (a)
3064 SCHEME_V->args = cons (a, NIL); 3019 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 3021 SCHEME_V->args = NIL;
3067 3022
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3023 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 3024 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 3025 SCHEME_V->op = OP_ERR0;
3026
3071 return S_T; 3027 return 0;
3072} 3028}
3073 3029
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3030#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 3031#define Error_0(s) Error_1 (s, 0)
3076 3032
3077/* Too small to turn into function */ 3033/* Too small to turn into function */
3078#define BEGIN do { 3034#define BEGIN do {
3079#define END } while (0) 3035#define END } while (0)
3080#define s_goto(a) BEGIN \ 3036#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3037 SCHEME_V->op = a; \
3082 return S_T; END 3038 return 0; END
3083 3039
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3040#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3041
3086#ifndef USE_SCHEME_STACK 3042#ifndef USE_SCHEME_STACK
3087 3043
… …
3112 next_frame = SCHEME_V->dump_base + nframes; 3068 next_frame = SCHEME_V->dump_base + nframes;
3113 3069
3114 next_frame->op = op; 3070 next_frame->op = op;
3115 next_frame->args = args; 3071 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3072 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3073 next_frame->code = code;
3118 3074
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3075 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3076}
3121 3077
3122static pointer 3078static int
3123xs_return (SCHEME_P_ pointer a) 3079xs_return (SCHEME_P_ pointer a)
3124{ 3080{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3081 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3082 struct dump_stack_frame *frame;
3127 3083
3128 SCHEME_V->value = a; 3084 SCHEME_V->value = a;
3129 3085
3130 if (nframes <= 0) 3086 if (nframes <= 0)
3131 return NIL; 3087 return -1;
3132 3088
3133 frame = &SCHEME_V->dump_base[--nframes]; 3089 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3090 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3091 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3092 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3093 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3094 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3095
3140 return S_T; 3096 return 0;
3141} 3097}
3142 3098
3143static INLINE void 3099ecb_inline void
3144dump_stack_reset (SCHEME_P) 3100dump_stack_reset (SCHEME_P)
3145{ 3101{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3102 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3103 SCHEME_V->dump = (pointer)+0;
3148} 3104}
3149 3105
3150static INLINE void 3106ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3107dump_stack_initialize (SCHEME_P)
3152{ 3108{
3153 SCHEME_V->dump_size = 0; 3109 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3110 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3111 dump_stack_reset (SCHEME_A);
… …
3208 int i = 0; 3164 int i = 0;
3209 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3165 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3210 3166
3211 while (cont != NIL) 3167 while (cont != NIL)
3212 { 3168 {
3213 frame->op = ivalue (car (cont)); cont = cdr (cont); 3169 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3214 frame->args = car (cont) ; cont = cdr (cont); 3170 frame->args = car (cont) ; cont = cdr (cont);
3215 frame->envir = car (cont) ; cont = cdr (cont); 3171 frame->envir = car (cont) ; cont = cdr (cont);
3216 frame->code = car (cont) ; cont = cdr (cont); 3172 frame->code = car (cont) ; cont = cdr (cont);
3217 3173
3218 ++frame; 3174 ++frame;
3219 ++i; 3175 ++i;
3220 } 3176 }
3221 3177
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3178 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3179}
3224 3180
3225#else 3181#else
3226 3182
3227static INLINE void 3183ecb_inline void
3228dump_stack_reset (SCHEME_P) 3184dump_stack_reset (SCHEME_P)
3229{ 3185{
3230 SCHEME_V->dump = NIL; 3186 SCHEME_V->dump = NIL;
3231} 3187}
3232 3188
3233static INLINE void 3189ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3190dump_stack_initialize (SCHEME_P)
3235{ 3191{
3236 dump_stack_reset (SCHEME_A); 3192 dump_stack_reset (SCHEME_A);
3237} 3193}
3238 3194
… …
3240dump_stack_free (SCHEME_P) 3196dump_stack_free (SCHEME_P)
3241{ 3197{
3242 SCHEME_V->dump = NIL; 3198 SCHEME_V->dump = NIL;
3243} 3199}
3244 3200
3245static pointer 3201static int
3246xs_return (SCHEME_P_ pointer a) 3202xs_return (SCHEME_P_ pointer a)
3247{ 3203{
3248 pointer dump = SCHEME_V->dump; 3204 pointer dump = SCHEME_V->dump;
3249 3205
3250 SCHEME_V->value = a; 3206 SCHEME_V->value = a;
3251 3207
3252 if (dump == NIL) 3208 if (dump == NIL)
3253 return NIL; 3209 return -1;
3254 3210
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3211 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3212 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3213 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3214 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3215
3260 SCHEME_V->dump = dump; 3216 SCHEME_V->dump = dump;
3261 3217
3262 return S_T; 3218 return 0;
3263} 3219}
3264 3220
3265static void 3221static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3222s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3223{
… …
3292 3248
3293#endif 3249#endif
3294 3250
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3251#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3252
3253#if EXPERIMENT
3297static pointer 3254static int
3255debug (SCHEME_P_ int indent, pointer x)
3256{
3257 int c;
3258
3259 if (is_syntax (x))
3260 {
3261 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3262 return 8 + 8;
3263 }
3264
3265 if (x == NIL)
3266 {
3267 printf ("%*sNIL\n", indent, "");
3268 return 3;
3269 }
3270
3271 switch (type (x))
3272 {
3273 case T_INTEGER:
3274 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3275 return 32+8;
3276
3277 case T_SYMBOL:
3278 printf ("%*sS<%s>\n", indent, "", symname (x));
3279 return 24+8;
3280
3281 case T_CLOSURE:
3282 printf ("%*sS<%s>\n", indent, "", "closure");
3283 debug (SCHEME_A_ indent + 3, cdr(x));
3284 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3285
3286 case T_PAIR:
3287 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3288 c = debug (SCHEME_A_ indent + 3, car (x));
3289 c += debug (SCHEME_A_ indent + 3, cdr (x));
3290 return c + 1;
3291
3292 case T_PORT:
3293 printf ("%*sS<%s>\n", indent, "", "port");
3294 return 24+8;
3295
3296 case T_VECTOR:
3297 printf ("%*sS<%s>\n", indent, "", "vector");
3298 return 24+8;
3299
3300 case T_ENVIRONMENT:
3301 printf ("%*sS<%s>\n", indent, "", "environment");
3302 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3303
3304 default:
3305 printf ("unhandled type %d\n", type (x));
3306 break;
3307 }
3308}
3309#endif
3310
3311static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3312opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3313{
3314 pointer args = SCHEME_V->args;
3300 pointer x, y; 3315 pointer x, y;
3301 3316
3302 switch (op) 3317 switch (op)
3303 { 3318 {
3319#if EXPERIMENT //D
3320 case OP_DEBUG:
3321 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3322 printf ("\n");
3323 s_return (S_T);
3324#endif
3304 case OP_LOAD: /* load */ 3325 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3326 if (file_interactive (SCHEME_A))
3306 { 3327 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3328 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3329 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3330 }
3310 3331
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3332 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3333 Error_1 ("unable to open", car (args));
3313 else 3334 else
3314 { 3335 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3336 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3337 s_goto (OP_T0LVL);
3317 } 3338 }
… …
3391 case OP_EVAL: /* main part of evaluation */ 3412 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3413#if USE_TRACING
3393 if (SCHEME_V->tracing) 3414 if (SCHEME_V->tracing)
3394 { 3415 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3416 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3417 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3418 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3419 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3420 s_goto (OP_P0LIST);
3400 } 3421 }
3401 3422
… …
3431 } 3452 }
3432 else 3453 else
3433 s_return (SCHEME_V->code); 3454 s_return (SCHEME_V->code);
3434 3455
3435 case OP_E0ARGS: /* eval arguments */ 3456 case OP_E0ARGS: /* eval arguments */
3436 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3457 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3437 { 3458 {
3438 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3459 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3439 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3460 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3440 SCHEME_V->code = SCHEME_V->value; 3461 SCHEME_V->code = SCHEME_V->value;
3441 s_goto (OP_APPLY); 3462 s_goto (OP_APPLY);
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3466 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3467 s_goto (OP_E1ARGS);
3447 } 3468 }
3448 3469
3449 case OP_E1ARGS: /* eval arguments */ 3470 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3471 args = cons (SCHEME_V->value, args);
3451 3472
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3473 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3474 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3475 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3476 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3477 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3478 s_goto (OP_EVAL);
3458 } 3479 }
3459 else /* end */ 3480 else /* end */
3460 { 3481 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3482 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3483 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3484 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3465 } 3486 }
3466 3487
3467#if USE_TRACING 3488#if USE_TRACING
3468 3489
3469 case OP_TRACING: 3490 case OP_TRACING:
3470 { 3491 {
3471 int tr = SCHEME_V->tracing; 3492 int tr = SCHEME_V->tracing;
3472 3493
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3494 SCHEME_V->tracing = ivalue_unchecked (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3495 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3496 }
3476 3497
3477#endif 3498#endif
3478 3499
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3500 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3501#if USE_TRACING
3481 if (SCHEME_V->tracing) 3502 if (SCHEME_V->tracing)
3482 { 3503 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3504 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3505 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3506 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3507 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3508 s_goto (OP_P0LIST);
3488 } 3509 }
3489 3510
3490 /* fall through */ 3511 /* fall through */
3491 3512
3492 case OP_REAL_APPLY: 3513 case OP_REAL_APPLY:
3493#endif 3514#endif
3494 if (is_proc (SCHEME_V->code)) 3515 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3516 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3517 else if (is_foreign (SCHEME_V->code))
3499 { 3518 {
3500 /* Keep nested calls from GC'ing the arglist */ 3519 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3520 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3521 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3503 3522
3504 s_return (x); 3523 s_return (x);
3505 } 3524 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3525 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3526 {
3508 /* Should not accept promise */ 3527 /* Should not accept promise */
3509 /* make environment */ 3528 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3529 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3530
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3531 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3532 {
3514 if (y == NIL) 3533 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3534 Error_0 ("not enough arguments");
3516 else 3535 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3536 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3554 s_goto (OP_BEGIN);
3536 } 3555 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3556 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3557 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3558 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3559 s_return (args != NIL ? car (args) : NIL);
3541 } 3560 }
3542 else 3561 else
3543 Error_0 ("illegal function"); 3562 Error_0 ("illegal function");
3544 3563
3545 case OP_DOMACRO: /* do macro */ 3564 case OP_DOMACRO: /* do macro */
… …
3554 { 3573 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3574 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3575
3557 if (f != NIL) 3576 if (f != NIL)
3558 { 3577 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3578 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3579 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3580 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3581 s_goto (OP_APPLY);
3563 } 3582 }
3564 3583
… …
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3594 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576 3595
3577#endif 3596#endif
3578 3597
3579 case OP_MKCLOSURE: /* make-closure */ 3598 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3599 x = car (args);
3581 3600
3582 if (car (x) == SCHEME_V->LAMBDA) 3601 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3602 x = cdr (x);
3584 3603
3585 if (cdr (SCHEME_V->args) == NIL) 3604 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3605 y = SCHEME_V->envir;
3587 else 3606 else
3588 y = cadr (SCHEME_V->args); 3607 y = cadr (args);
3589 3608
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3609 s_return (mk_closure (SCHEME_A_ x, y));
3591 3610
3592 case OP_QUOTE: /* quote */ 3611 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3612 s_return (car (SCHEME_V->code));
… …
3625 3644
3626 3645
3627 case OP_DEFP: /* defined? */ 3646 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3647 x = SCHEME_V->envir;
3629 3648
3630 if (cdr (SCHEME_V->args) != NIL) 3649 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3650 x = cadr (args);
3632 3651
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3652 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3653
3635 case OP_SET0: /* set! */ 3654 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3655 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3656 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3657
… …
3669 3688
3670 case OP_IF1: /* if */ 3689 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3690 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3691 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3692 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3693 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3694 s_goto (OP_EVAL);
3678 3695
3679 case OP_LET0: /* let */ 3696 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3697 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3698 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3699 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3700 s_goto (OP_LET1);
3684 3701
3685 case OP_LET1: /* let (calculate parameters) */ 3702 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3703 args = cons (SCHEME_V->value, args);
3687 3704
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3705 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3706 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3707 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3708 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3709
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3710 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3711 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3712 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3713 s_goto (OP_EVAL);
3697 } 3714 }
3698 else /* end */ 3715 else /* end */
3699 { 3716 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3717 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3718 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3719 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3720 s_goto (OP_LET2);
3704 } 3721 }
3705 3722
3706 case OP_LET2: /* let */ 3723 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3724 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3725
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3726 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3727 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3728 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3729
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3730 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3731 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3732 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3733 {
3717 if (!is_pair (x)) 3734 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3735 Error_1 ("Bad syntax of binding in let :", x);
3719 3736
3720 if (!is_list (SCHEME_A_ car (x))) 3737 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3738 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3739
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3740 args = cons (caar (x), args);
3724 } 3741 }
3725 3742
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3743 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3744 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3745 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3746 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3747 }
3733 else 3748 else
3734 { 3749 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3750 SCHEME_V->code = cdr (SCHEME_V->code);
3751 }
3752
3736 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3754 s_goto (OP_BEGIN);
3740 3755
3741 case OP_LET0AST: /* let* */ 3756 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3757 if (car (SCHEME_V->code) == NIL)
3743 { 3758 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3776 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3777 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3778
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3779 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3780 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3781 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3782 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3783 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3784 s_goto (OP_EVAL);
3770 } 3785 }
3771 else /* end */ 3786 else /* end */
3772 { 3787 {
3773 SCHEME_V->code = SCHEME_V->args; 3788 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3789 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3790 s_goto (OP_BEGIN);
3776 } 3791 }
3777 3792
3778 case OP_LET0REC: /* letrec */ 3793 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3796 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3797 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3798 s_goto (OP_LET1REC);
3784 3799
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3800 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3801 args = cons (SCHEME_V->value, args);
3787 3802
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3803 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3804 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3805 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3806 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3807
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3808 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3809 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3810 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3811 s_goto (OP_EVAL);
3797 } 3812 }
3798 else /* end */ 3813 else /* end */
3799 { 3814 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3815 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3816 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3817 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3818 s_goto (OP_LET2REC);
3804 } 3819 }
3805 3820
3806 case OP_LET2REC: /* letrec */ 3821 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3822 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3823 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3824
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3825 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3826 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3827 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3913 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3914 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3915 s_goto (OP_EVAL);
3901 3916
3902 case OP_C1STREAM: /* cons-stream */ 3917 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3918 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3919 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3920 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3921 s_return (cons (args, x));
3907 3922
3908 case OP_MACRO0: /* macro */ 3923 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3924 if (is_pair (car (SCHEME_V->code)))
3910 { 3925 {
3911 x = caar (SCHEME_V->code); 3926 x = caar (SCHEME_V->code);
… …
3944 { 3959 {
3945 if (!is_pair (y = caar (x))) 3960 if (!is_pair (y = caar (x)))
3946 break; 3961 break;
3947 3962
3948 for (; y != NIL; y = cdr (y)) 3963 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3964 if (eqv (car (y), SCHEME_V->value))
3951 break; 3965 break;
3952 }
3953 3966
3954 if (y != NIL) 3967 if (y != NIL)
3955 break; 3968 break;
3956 } 3969 }
3957 3970
… …
3977 s_goto (OP_BEGIN); 3990 s_goto (OP_BEGIN);
3978 else 3991 else
3979 s_return (NIL); 3992 s_return (NIL);
3980 3993
3981 case OP_PAPPLY: /* apply */ 3994 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 3995 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3996 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3997 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 3998 s_goto (OP_APPLY);
3986 3999
3987 case OP_PEVAL: /* eval */ 4000 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 4001 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 4002 SCHEME_V->envir = cadr (args);
3990 4003
3991 SCHEME_V->code = car (SCHEME_V->args); 4004 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 4005 s_goto (OP_EVAL);
3993 4006
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 4007 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 4008 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4009 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 4010 s_goto (OP_APPLY);
3998 } 4011 }
3999 4012
4000 return S_T; 4013 if (USE_ERROR_CHECKING) abort ();
4001} 4014}
4002 4015
4003static pointer 4016static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4017opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 4018{
4006 pointer x; 4019 pointer args = SCHEME_V->args;
4020 pointer x = car (args);
4007 num v; 4021 num v;
4008 4022
4023 switch (op)
4024 {
4009#if USE_MATH 4025#if USE_MATH
4010 RVALUE dd;
4011#endif
4012
4013 switch (op)
4014 {
4015#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 4026 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args); 4027 {
4019
4020 if (num_is_integer (x)) 4028 if (is_integer (x))
4021 s_return (x); 4029 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4030
4031 RVALUE r = rvalue_unchecked (x);
4032
4033 if (r == (RVALUE)(IVALUE)r)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4034 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4024 else 4035 else
4025 Error_1 ("inexact->exact: not integral:", x); 4036 Error_1 ("inexact->exact: not integral:", x);
4037 }
4026 4038
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4039 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4040 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4041 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4042 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4043 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4044 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4045 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 4046
4055 case OP_ATAN: 4047 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 4048 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4049 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 4050 else
4061 { 4051 {
4062 pointer y = cadr (SCHEME_V->args); 4052 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4053 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 4054 }
4066 4055
4067 case OP_SQRT: 4056 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4057 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 4058
4071 case OP_EXPT: 4059 case OP_EXPT:
4072 { 4060 {
4073 RVALUE result; 4061 RVALUE result;
4074 int real_result = 1; 4062 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 4063 pointer y = cadr (args);
4076 4064
4077 x = car (SCHEME_V->args);
4078
4079 if (num_is_integer (x) && num_is_integer (y)) 4065 if (is_integer (x) && is_integer (y))
4080 real_result = 0; 4066 real_result = 0;
4081 4067
4082 /* This 'if' is an R5RS compatibility fix. */ 4068 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 4069 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 4070 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 4071 result = 0;
4086 else 4072 else
4087 result = pow (rvalue (x), rvalue (y)); 4073 result = pow (rvalue (x), rvalue (y));
4088 4074
4089 /* Before returning integer result make sure we can. */ 4075 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 4076 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 4077 if (!real_result)
4092 { 4078 {
4093 long result_as_long = (long) result; 4079 long result_as_long = result;
4094 4080
4095 if (result != (RVALUE) result_as_long) 4081 if (result != result_as_long)
4096 real_result = 1; 4082 real_result = 1;
4097 } 4083 }
4098 4084
4099 if (real_result) 4085 if (real_result)
4100 s_return (mk_real (SCHEME_A_ result)); 4086 s_return (mk_real (SCHEME_A_ result));
4101 else 4087 else
4102 s_return (mk_integer (SCHEME_A_ result)); 4088 s_return (mk_integer (SCHEME_A_ result));
4103 } 4089 }
4104 4090
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4091 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4092 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 4093
4113 case OP_TRUNCATE: 4094 case OP_TRUNCATE:
4114 { 4095 {
4115 RVALUE rvalue_of_x; 4096 RVALUE n = rvalue (x);
4116
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x);
4119
4120 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4097 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4122 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4098 }
4125 4099
4126 case OP_ROUND: 4100 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4101 if (is_integer (x))
4130 s_return (x); 4102 s_return (x);
4131 4103
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4104 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4105#endif
4134 4106
4135 case OP_ADD: /* + */ 4107 case OP_ADD: /* + */
4136 v = num_zero; 4108 v = num_zero;
4137 4109
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4110 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4111 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4112
4141 s_return (mk_number (SCHEME_A_ v)); 4113 s_return (mk_number (SCHEME_A_ v));
4142 4114
4143 case OP_MUL: /* * */ 4115 case OP_MUL: /* * */
4144 v = num_one; 4116 v = num_one;
4145 4117
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4118 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4119 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4120
4149 s_return (mk_number (SCHEME_A_ v)); 4121 s_return (mk_number (SCHEME_A_ v));
4150 4122
4151 case OP_SUB: /* - */ 4123 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4124 if (cdr (args) == NIL)
4153 { 4125 {
4154 x = SCHEME_V->args; 4126 x = args;
4155 v = num_zero; 4127 v = num_zero;
4156 } 4128 }
4157 else 4129 else
4158 { 4130 {
4159 x = cdr (SCHEME_V->args); 4131 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4132 v = nvalue (car (args));
4161 } 4133 }
4162 4134
4163 for (; x != NIL; x = cdr (x)) 4135 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4136 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4137
4166 s_return (mk_number (SCHEME_A_ v)); 4138 s_return (mk_number (SCHEME_A_ v));
4167 4139
4168 case OP_DIV: /* / */ 4140 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4141 if (cdr (args) == NIL)
4170 { 4142 {
4171 x = SCHEME_V->args; 4143 x = args;
4172 v = num_one; 4144 v = num_one;
4173 } 4145 }
4174 else 4146 else
4175 { 4147 {
4176 x = cdr (SCHEME_V->args); 4148 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4149 v = nvalue (car (args));
4178 } 4150 }
4179 4151
4180 for (; x != NIL; x = cdr (x)) 4152 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4153 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4154 v = num_div (v, nvalue (car (x)));
4184 else 4155 else
4185 Error_0 ("/: division by zero"); 4156 Error_0 ("/: division by zero");
4186 }
4187 4157
4188 s_return (mk_number (SCHEME_A_ v)); 4158 s_return (mk_number (SCHEME_A_ v));
4189 4159
4190 case OP_INTDIV: /* quotient */ 4160 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4161 if (cdr (args) == NIL)
4192 { 4162 {
4193 x = SCHEME_V->args; 4163 x = args;
4194 v = num_one; 4164 v = num_one;
4195 } 4165 }
4196 else 4166 else
4197 { 4167 {
4198 x = cdr (SCHEME_V->args); 4168 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4169 v = nvalue (car (args));
4200 } 4170 }
4201 4171
4202 for (; x != NIL; x = cdr (x)) 4172 for (; x != NIL; x = cdr (x))
4203 { 4173 {
4204 if (ivalue (car (x)) != 0) 4174 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4175 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4176 else
4207 Error_0 ("quotient: division by zero"); 4177 Error_0 ("quotient: division by zero");
4208 } 4178 }
4209 4179
4210 s_return (mk_number (SCHEME_A_ v)); 4180 s_return (mk_number (SCHEME_A_ v));
4211 4181
4212 case OP_REM: /* remainder */ 4182 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4183 v = nvalue (x);
4214 4184
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4185 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4186 v = num_rem (v, nvalue (cadr (args)));
4217 else 4187 else
4218 Error_0 ("remainder: division by zero"); 4188 Error_0 ("remainder: division by zero");
4219 4189
4220 s_return (mk_number (SCHEME_A_ v)); 4190 s_return (mk_number (SCHEME_A_ v));
4221 4191
4222 case OP_MOD: /* modulo */ 4192 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4193 v = nvalue (x);
4224 4194
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4195 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4196 v = num_mod (v, nvalue (cadr (args)));
4227 else 4197 else
4228 Error_0 ("modulo: division by zero"); 4198 Error_0 ("modulo: division by zero");
4229 4199
4230 s_return (mk_number (SCHEME_A_ v)); 4200 s_return (mk_number (SCHEME_A_ v));
4231 4201
4232 case OP_CAR: /* car */ 4202 case OP_CAR: /* car */
4233 s_return (caar (SCHEME_V->args)); 4203 s_return (caar (args));
4234 4204
4235 case OP_CDR: /* cdr */ 4205 case OP_CDR: /* cdr */
4236 s_return (cdar (SCHEME_V->args)); 4206 s_return (cdar (args));
4237 4207
4238 case OP_CONS: /* cons */ 4208 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4209 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4210 s_return (args);
4241 4211
4242 case OP_SETCAR: /* set-car! */ 4212 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4213 if (!is_immutable (x))
4244 { 4214 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4215 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4216 s_return (car (args));
4247 } 4217 }
4248 else 4218 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4219 Error_0 ("set-car!: unable to alter immutable pair");
4250 4220
4251 case OP_SETCDR: /* set-cdr! */ 4221 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4222 if (!is_immutable (x))
4253 { 4223 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4224 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4225 s_return (car (args));
4256 } 4226 }
4257 else 4227 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4228 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4229
4260 case OP_CHAR2INT: /* char->integer */ 4230 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4231 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4262 4232
4263 case OP_INT2CHAR: /* integer->char */ 4233 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4234 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4265 4235
4266 case OP_CHARUPCASE: 4236 case OP_CHARUPCASE:
4267 { 4237 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4269 c = toupper (c); 4239 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4271 } 4241 }
4272 4242
4273 case OP_CHARDNCASE: 4243 case OP_CHARDNCASE:
4274 { 4244 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4245 unsigned char c = ivalue_unchecked (x);
4276 c = tolower (c); 4246 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4247 s_return (mk_character (SCHEME_A_ c));
4278 } 4248 }
4279 4249
4280 case OP_STR2SYM: /* string->symbol */ 4250 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4251 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4252
4283 case OP_STR2ATOM: /* string->atom */ 4253 case OP_STR2ATOM: /* string->atom */
4284 { 4254 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4255 char *s = strvalue (x);
4286 long pf = 0; 4256 long pf = 0;
4287 4257
4288 if (cdr (SCHEME_V->args) != NIL) 4258 if (cdr (args) != NIL)
4289 { 4259 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4260 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4261 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4262 pf = ivalue_unchecked (cadr (args));
4293 4263
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4264 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4265 {
4296 /* base is OK */ 4266 /* base is OK */
4297 } 4267 }
4298 else 4268 else
4299 pf = -1; 4269 pf = -1;
4300 } 4270 }
4301 4271
4302 if (pf < 0) 4272 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4273 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4274 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4275 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4276 else
4307 { 4277 {
4308 if (pf == 0 || pf == 10) 4278 if (pf == 0 || pf == 10)
… …
4319 } 4289 }
4320 } 4290 }
4321 } 4291 }
4322 4292
4323 case OP_SYM2STR: /* symbol->string */ 4293 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4294 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4295 setimmutable (x);
4326 s_return (x); 4296 s_return (x);
4327 4297
4328 case OP_ATOM2STR: /* atom->string */ 4298 case OP_ATOM2STR: /* atom->string */
4329 { 4299 {
4330 long pf = 0; 4300 long pf = 0;
4331 4301
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4302 if (cdr (args) != NIL)
4335 { 4303 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4304 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4305 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4306 pf = ivalue_unchecked (cadr (args));
4339 4307
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4308 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4309 {
4342 /* base is OK */ 4310 /* base is OK */
4343 } 4311 }
4344 else 4312 else
4345 pf = -1; 4313 pf = -1;
4346 } 4314 }
4347 4315
4348 if (pf < 0) 4316 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4317 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4318 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4319 {
4352 char *p; 4320 char *p;
4353 int len; 4321 int len;
4354 4322
… …
4359 Error_1 ("atom->string: not an atom:", x); 4327 Error_1 ("atom->string: not an atom:", x);
4360 } 4328 }
4361 4329
4362 case OP_MKSTRING: /* make-string */ 4330 case OP_MKSTRING: /* make-string */
4363 { 4331 {
4364 int fill = ' '; 4332 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4365 int len; 4333 int len = ivalue_unchecked (x);
4366 4334
4367 len = ivalue (car (SCHEME_V->args));
4368
4369 if (cdr (SCHEME_V->args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args));
4371
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4335 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4336 }
4374 4337
4375 case OP_STRLEN: /* string-length */ 4338 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4339 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4340
4378 case OP_STRREF: /* string-ref */ 4341 case OP_STRREF: /* string-ref */
4379 { 4342 {
4380 char *str; 4343 char *str = strvalue (x);
4381 int index;
4382
4383 str = strvalue (car (SCHEME_V->args));
4384
4385 index = ivalue (cadr (SCHEME_V->args)); 4344 int index = ivalue_unchecked (cadr (args));
4386 4345
4387 if (index >= strlength (car (SCHEME_V->args))) 4346 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4347 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4348
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4349 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4350 }
4392 4351
4393 case OP_STRSET: /* string-set! */ 4352 case OP_STRSET: /* string-set! */
4394 { 4353 {
4395 char *str; 4354 char *str = strvalue (x);
4396 int index; 4355 int index = ivalue_unchecked (cadr (args));
4397 int c; 4356 int c;
4398 4357
4399 if (is_immutable (car (SCHEME_V->args))) 4358 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4359 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4360
4402 str = strvalue (car (SCHEME_V->args));
4403
4404 index = ivalue (cadr (SCHEME_V->args));
4405
4406 if (index >= strlength (car (SCHEME_V->args))) 4361 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4362 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4363
4409 c = charvalue (caddr (SCHEME_V->args)); 4364 c = charvalue (caddr (args));
4410 4365
4411 str[index] = (char) c; 4366 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4367 s_return (car (args));
4413 } 4368 }
4414 4369
4415 case OP_STRAPPEND: /* string-append */ 4370 case OP_STRAPPEND: /* string-append */
4416 { 4371 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4372 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4373 int len = 0;
4419 pointer newstr; 4374 pointer newstr;
4420 char *pos; 4375 char *pos;
4421 4376
4422 /* compute needed length for new string */ 4377 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4378 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4379 len += strlength (car (x));
4425 4380
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4381 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4382
4428 /* store the contents of the argument strings into the new string */ 4383 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4384 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4385 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4386
4432 s_return (newstr); 4387 s_return (newstr);
4433 } 4388 }
4434 4389
4435 case OP_SUBSTR: /* substring */ 4390 case OP_SUBSTR: /* substring */
4436 { 4391 {
4437 char *str; 4392 char *str = strvalue (x);
4438 int index0; 4393 int index0 = ivalue_unchecked (cadr (args));
4439 int index1; 4394 int index1;
4440 int len; 4395 int len;
4441 4396
4442 str = strvalue (car (SCHEME_V->args));
4443
4444 index0 = ivalue (cadr (SCHEME_V->args));
4445
4446 if (index0 > strlength (car (SCHEME_V->args))) 4397 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4398 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4399
4449 if (cddr (SCHEME_V->args) != NIL) 4400 if (cddr (args) != NIL)
4450 { 4401 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4402 index1 = ivalue_unchecked (caddr (args));
4452 4403
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4404 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4405 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4406 }
4456 else 4407 else
4457 index1 = strlength (car (SCHEME_V->args)); 4408 index1 = strlength (x);
4458 4409
4459 len = index1 - index0; 4410 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4411 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4412 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4413 strvalue (x)[len] = 0;
… …
4466 4417
4467 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
4468 { 4419 {
4469 int i; 4420 int i;
4470 pointer vec; 4421 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4422 int len = list_length (SCHEME_A_ args);
4472 4423
4473 if (len < 0) 4424 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4425 Error_1 ("vector: not a proper list:", args);
4475 4426
4476 vec = mk_vector (SCHEME_A_ len); 4427 vec = mk_vector (SCHEME_A_ len);
4477 4428
4478#if USE_ERROR_CHECKING 4429#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4430 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4431 s_return (S_SINK);
4481#endif 4432#endif
4482 4433
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4434 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4435 vector_set (vec, i, car (x));
4485 4436
4486 s_return (vec); 4437 s_return (vec);
4487 } 4438 }
4488 4439
4489 case OP_MKVECTOR: /* make-vector */ 4440 case OP_MKVECTOR: /* make-vector */
4490 { 4441 {
4491 pointer fill = NIL; 4442 pointer fill = NIL;
4492 int len;
4493 pointer vec; 4443 pointer vec;
4444 int len = ivalue_unchecked (x);
4494 4445
4495 len = ivalue (car (SCHEME_V->args));
4496
4497 if (cdr (SCHEME_V->args) != NIL) 4446 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4447 fill = cadr (args);
4499 4448
4500 vec = mk_vector (SCHEME_A_ len); 4449 vec = mk_vector (SCHEME_A_ len);
4501 4450
4502#if USE_ERROR_CHECKING 4451#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4452 if (SCHEME_V->no_memory)
4504 s_return (S_SINK); 4453 s_return (S_SINK);
4505#endif 4454#endif
4506 4455
4507 if (fill != NIL) 4456 if (fill != NIL)
4508 fill_vector (vec, fill); 4457 fill_vector (vec, 0, fill);
4509 4458
4510 s_return (vec); 4459 s_return (vec);
4511 } 4460 }
4512 4461
4513 case OP_VECLEN: /* vector-length */ 4462 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4463 s_return (mk_integer (SCHEME_A_ veclength (x)));
4464
4465 case OP_VECRESIZE:
4466 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4467 s_return (x);
4515 4468
4516 case OP_VECREF: /* vector-ref */ 4469 case OP_VECREF: /* vector-ref */
4517 { 4470 {
4518 int index;
4519
4520 index = ivalue (cadr (SCHEME_V->args)); 4471 int index = ivalue_unchecked (cadr (args));
4521 4472
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4473 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4474 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4475
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4476 s_return (vector_get (x, index));
4526 } 4477 }
4527 4478
4528 case OP_VECSET: /* vector-set! */ 4479 case OP_VECSET: /* vector-set! */
4529 { 4480 {
4530 int index; 4481 int index = ivalue_unchecked (cadr (args));
4531 4482
4532 if (is_immutable (car (SCHEME_V->args))) 4483 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4484 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4485
4535 index = ivalue (cadr (SCHEME_V->args));
4536
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4486 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4487 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4488
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4489 vector_set (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4490 s_return (x);
4542 } 4491 }
4543 } 4492 }
4544 4493
4545 return S_T; 4494 if (USE_ERROR_CHECKING) abort ();
4546} 4495}
4547 4496
4548INTERFACE int 4497static int
4549is_list (SCHEME_P_ pointer a) 4498opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4550{ 4499{
4551 return list_length (SCHEME_A_ a) >= 0; 4500 pointer x = SCHEME_V->args;
4552}
4553 4501
4554/* Result is: 4502 for (;;)
4555 proper list: length
4556 circular list: -1
4557 not even a pair: -2
4558 dotted list: -2 minus length before dot
4559*/
4560INTERFACE int
4561list_length (SCHEME_P_ pointer a)
4562{
4563 int i = 0;
4564 pointer slow, fast;
4565
4566 slow = fast = a;
4567
4568 while (1)
4569 { 4503 {
4504 num v = nvalue (car (x));
4505 x = cdr (x);
4506
4570 if (fast == NIL) 4507 if (x == NIL)
4571 return i; 4508 break;
4572 4509
4573 if (!is_pair (fast)) 4510 int r = num_cmp (v, nvalue (car (x)));
4574 return -2 - i;
4575 4511
4576 fast = cdr (fast); 4512 switch (op)
4577 ++i;
4578
4579 if (fast == NIL)
4580 return i;
4581
4582 if (!is_pair (fast))
4583 return -2 - i;
4584
4585 ++i;
4586 fast = cdr (fast);
4587
4588 /* Safe because we would have already returned if `fast'
4589 encountered a non-pair. */
4590 slow = cdr (slow);
4591
4592 if (fast == slow)
4593 { 4513 {
4594 /* the fast pointer has looped back around and caught up 4514 case OP_NUMEQ: r = r == 0; break;
4595 with the slow pointer, hence the structure is circular, 4515 case OP_LESS: r = r < 0; break;
4596 not of finite length, and therefore not a list */ 4516 case OP_GRE: r = r > 0; break;
4597 return -1; 4517 case OP_LEQ: r = r <= 0; break;
4518 case OP_GEQ: r = r >= 0; break;
4598 } 4519 }
4599 }
4600}
4601 4520
4521 if (!r)
4522 s_return (S_F);
4523 }
4524
4525 s_return (S_T);
4526}
4527
4602static pointer 4528static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4529opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4530{
4605 pointer x; 4531 pointer args = SCHEME_V->args;
4606 num v; 4532 pointer a = car (args);
4607 int (*comp_func) (num, num); 4533 pointer d = cdr (args);
4534 int r;
4608 4535
4609 switch (op) 4536 switch (op)
4610 { 4537 {
4611 case OP_NOT: /* not */ 4538 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4539 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4540 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4541 case OP_NULLP: /* null? */ r = a == NIL ; break;
4542 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4543 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4544 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4545 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4546 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4547 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4548 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4549
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4550#if USE_CHAR_CLASSIFIERS
4683 4551 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4684 case OP_CHARAP: /* char-alphabetic? */ 4552 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4553 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4686 4554 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4687 case OP_CHARNP: /* char-numeric? */ 4555 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4556#endif
4557
4699#if USE_PORTS 4558#if USE_PORTS
4700 4559 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4560 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4561 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4562#endif
4710 4563
4711 case OP_PROCP: /* procedure? */ 4564 case OP_PROCP: /* procedure? */
4712 4565
4713 /*-- 4566 /*--
4714 * continuation should be procedure by the example 4567 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4568 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4569 * in R^3 report sec. 6.9
4717 */ 4570 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4571 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4572 break;
4720 4573
4721 case OP_PAIRP: /* pair? */ 4574 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4575 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4576 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4577 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4578 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4579 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4580 }
4739 4581
4740 return S_T; 4582 s_retbool (r);
4741} 4583}
4742 4584
4743static pointer 4585static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4586opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4587{
4588 pointer args = SCHEME_V->args;
4589 pointer a = car (args);
4746 pointer x, y; 4590 pointer x, y;
4747 4591
4748 switch (op) 4592 switch (op)
4749 { 4593 {
4750 case OP_FORCE: /* force */ 4594 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4595 SCHEME_V->code = a;
4752 4596
4753 if (is_promise (SCHEME_V->code)) 4597 if (is_promise (SCHEME_V->code))
4754 { 4598 {
4755 /* Should change type to closure here */ 4599 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4600 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4621 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4622 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4623 }
4780 } 4624 }
4781 4625
4782 SCHEME_V->args = car (SCHEME_V->args); 4626 SCHEME_V->args = a;
4783 4627
4784 if (op == OP_WRITE) 4628 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4629 SCHEME_V->print_flag = 1;
4786 else 4630 else
4787 SCHEME_V->print_flag = 0; 4631 SCHEME_V->print_flag = 0;
4788 4632
4789 s_goto (OP_P0LIST); 4633 s_goto (OP_P0LIST);
4790 4634
4791 case OP_NEWLINE: /* newline */ 4635 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4636 if (is_pair (args))
4793 { 4637 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4638 if (a != SCHEME_V->outport)
4795 { 4639 {
4796 x = cons (SCHEME_V->outport, NIL); 4640 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4641 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4642 SCHEME_V->outport = a;
4799 } 4643 }
4800 } 4644 }
4801 4645
4802 putstr (SCHEME_A_ "\n"); 4646 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4647 s_return (S_T);
4804#endif 4648#endif
4805 4649
4806 case OP_ERR0: /* error */ 4650 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4651 SCHEME_V->retcode = -1;
4808 4652
4809 if (!is_string (car (SCHEME_V->args))) 4653 if (!is_string (a))
4810 { 4654 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4655 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4656 setimmutable (car (args));
4813 } 4657 }
4814 4658
4815 putstr (SCHEME_A_ "Error: "); 4659 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4660 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4661 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4662 s_goto (OP_ERR1);
4819 4663
4820 case OP_ERR1: /* error */ 4664 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4665 putstr (SCHEME_A_ " ");
4822 4666
4823 if (SCHEME_V->args != NIL) 4667 if (args != NIL)
4824 { 4668 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4669 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4670 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4671 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4672 s_goto (OP_P0LIST);
4829 } 4673 }
4830 else 4674 else
4831 { 4675 {
4832 putstr (SCHEME_A_ "\n"); 4676 putstr (SCHEME_A_ "\n");
4833 4677
4834 if (SCHEME_V->interactive_repl) 4678 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4679 s_goto (OP_T0LVL);
4836 else 4680 else
4837 return NIL; 4681 return -1;
4838 } 4682 }
4839 4683
4840 case OP_REVERSE: /* reverse */ 4684 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4685 s_return (reverse (SCHEME_A_ a));
4842 4686
4843 case OP_LIST_STAR: /* list* */ 4687 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4688 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4689
4846 case OP_APPEND: /* append */ 4690 case OP_APPEND: /* append */
4847 x = NIL; 4691 x = NIL;
4848 y = SCHEME_V->args; 4692 y = args;
4849 4693
4850 if (y == x) 4694 if (y == x)
4851 s_return (x); 4695 s_return (x);
4852 4696
4853 /* cdr() in the while condition is not a typo. If car() */ 4697 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4708 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4709
4866#if USE_PLIST 4710#if USE_PLIST
4867 4711
4868 case OP_PUT: /* put */ 4712 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4713 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4714 Error_0 ("illegal use of put");
4871 4715
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4716 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4717 {
4874 if (caar (x) == y) 4718 if (caar (x) == y)
4875 break; 4719 break;
4876 } 4720 }
4877 4721
4878 if (x != NIL) 4722 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4723 cdar (x) = caddr (args);
4880 else 4724 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4725 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4726
4883 s_return (S_T); 4727 s_return (S_T);
4884 4728
4885 case OP_GET: /* get */ 4729 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4730 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4731 Error_0 ("illegal use of get");
4888 4732
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4733 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4734 if (caar (x) == y)
4891 break; 4735 break;
4892 4736
4893 if (x != NIL) 4737 if (x != NIL)
4894 s_return (cdar (x)); 4738 s_return (cdar (x));
… …
4896 s_return (NIL); 4740 s_return (NIL);
4897 4741
4898#endif /* USE_PLIST */ 4742#endif /* USE_PLIST */
4899 4743
4900 case OP_QUIT: /* quit */ 4744 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4745 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4746 SCHEME_V->retcode = ivalue (a);
4903 4747
4904 return NIL; 4748 return -1;
4905 4749
4906 case OP_GC: /* gc */ 4750 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4751 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4752 s_return (S_T);
4909 4753
4910 case OP_GCVERB: /* gc-verbose */ 4754 case OP_GCVERB: /* gc-verbose */
4911 { 4755 {
4912 int was = SCHEME_V->gc_verbose; 4756 int was = SCHEME_V->gc_verbose;
4913 4757
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4758 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4759 s_retbool (was);
4916 } 4760 }
4917 4761
4918 case OP_NEWSEGMENT: /* new-segment */ 4762 case OP_NEWSEGMENT: /* new-segment */
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4763 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4764 Error_0 ("new-segment: argument must be a number");
4921 4765
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4766 alloc_cellseg (SCHEME_A_ ivalue (a));
4923 4767
4924 s_return (S_T); 4768 s_return (S_T);
4925 4769
4926 case OP_OBLIST: /* oblist */ 4770 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4771 s_return (oblist_all_symbols (SCHEME_A));
… …
4954 case OP_OPEN_INOUTFILE: 4798 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4799 prop = port_input | port_output;
4956 break; 4800 break;
4957 } 4801 }
4958 4802
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4803 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4804
4961 if (p == NIL) 4805 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4806 }
4966 4807
4967# if USE_STRING_PORTS 4808# if USE_STRING_PORTS
4968 4809
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4810 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4822 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4823 prop = port_input | port_output;
4983 break; 4824 break;
4984 } 4825 }
4985 4826
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4827 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4828 strvalue (a) + strlength (a), prop);
4988 4829
4989 if (p == NIL) 4830 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4831 }
4994 4832
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4833 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4834 {
4997 pointer p; 4835 pointer p;
4998 4836
4999 if (car (SCHEME_V->args) == NIL) 4837 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4838 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4839 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4840 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4841 strvalue (a) + strlength (a), port_output);
5010 4842
5011 if (p == NIL) 4843 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4844 }
5017 4845
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4846 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4847 {
5020 port *p; 4848 port *p;
5021 4849
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4850 if ((p = a->object.port)->kind & port_string)
5023 { 4851 {
5024 off_t size; 4852 off_t size;
5025 char *str; 4853 char *str;
5026 4854
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4855 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4871 }
5044 4872
5045# endif 4873# endif
5046 4874
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4875 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4876 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4877 s_return (S_T);
5050 4878
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4879 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4880 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4881 s_return (S_T);
5054#endif 4882#endif
5055 4883
5056 case OP_INT_ENV: /* interaction-environment */ 4884 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4885 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4887 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4888 s_return (SCHEME_V->envir);
5061 4889
5062 } 4890 }
5063 4891
5064 return S_T; 4892 if (USE_ERROR_CHECKING) abort ();
5065} 4893}
5066 4894
5067static pointer 4895static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4896opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4897{
4898 pointer args = SCHEME_V->args;
5070 pointer x; 4899 pointer x;
5071 4900
5072 if (SCHEME_V->nesting != 0) 4901 if (SCHEME_V->nesting != 0)
5073 { 4902 {
5074 int n = SCHEME_V->nesting; 4903 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4910 switch (op)
5082 { 4911 {
5083 /* ========== reading part ========== */ 4912 /* ========== reading part ========== */
5084#if USE_PORTS 4913#if USE_PORTS
5085 case OP_READ: 4914 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4915 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4916 s_goto (OP_READ_INTERNAL);
5088 4917
5089 if (!is_inport (car (SCHEME_V->args))) 4918 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4919 Error_1 ("read: not an input port:", car (args));
5091 4920
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4921 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4922 s_goto (OP_READ_INTERNAL);
5094 4923
5095 x = SCHEME_V->inport; 4924 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4925 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4926 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4928 s_goto (OP_READ_INTERNAL);
5100 4929
5101 case OP_READ_CHAR: /* read-char */ 4930 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4931 case OP_PEEK_CHAR: /* peek-char */
5103 { 4932 {
5104 int c; 4933 int c;
5105 4934
5106 if (is_pair (SCHEME_V->args)) 4935 if (is_pair (args))
5107 { 4936 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4937 if (car (args) != SCHEME_V->inport)
5109 { 4938 {
5110 x = SCHEME_V->inport; 4939 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4940 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4942 SCHEME_V->inport = car (args);
5114 } 4943 }
5115 } 4944 }
5116 4945
5117 c = inchar (SCHEME_A); 4946 c = inchar (SCHEME_A);
5118 4947
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4957 case OP_CHAR_READY: /* char-ready? */
5129 { 4958 {
5130 pointer p = SCHEME_V->inport; 4959 pointer p = SCHEME_V->inport;
5131 int res; 4960 int res;
5132 4961
5133 if (is_pair (SCHEME_V->args)) 4962 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4963 p = car (args);
5135 4964
5136 res = p->object.port->kind & port_string; 4965 res = p->object.port->kind & port_string;
5137 4966
5138 s_retbool (res); 4967 s_retbool (res);
5139 } 4968 }
5140 4969
5141 case OP_SET_INPORT: /* set-input-port */ 4970 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 4971 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 4972 s_return (SCHEME_V->value);
5144 4973
5145 case OP_SET_OUTPORT: /* set-output-port */ 4974 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 4975 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 4976 s_return (SCHEME_V->value);
5148#endif 4977#endif
5149 4978
5150 case OP_RDSEXPR: 4979 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 4980 switch (SCHEME_V->tok)
… …
5200 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5201 SCHEME_V->tok = token (SCHEME_A); 5030 SCHEME_V->tok = token (SCHEME_A);
5202 s_goto (OP_RDSEXPR); 5031 s_goto (OP_RDSEXPR);
5203 5032
5204 case TOK_ATOM: 5033 case TOK_ATOM:
5205 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5034 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5035
5036 case TOK_DOTATOM:
5037 SCHEME_V->strbuff[0] = '.';
5038 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5039
5040 case TOK_STRATOM:
5041 x = readstrexp (SCHEME_A_ '|');
5042 //TODO: haven't checked whether the garbage collector could interfere
5043 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5206 5044
5207 case TOK_DQUOTE: 5045 case TOK_DQUOTE:
5208 x = readstrexp (SCHEME_A); 5046 x = readstrexp (SCHEME_A_ '"');
5209 5047
5210 if (x == S_F) 5048 if (x == S_F)
5211 Error_0 ("Error reading string"); 5049 Error_0 ("Error reading string");
5212 5050
5213 setimmutable (x); 5051 setimmutable (x);
… …
5225 s_goto (OP_EVAL); 5063 s_goto (OP_EVAL);
5226 } 5064 }
5227 } 5065 }
5228 5066
5229 case TOK_SHARP_CONST: 5067 case TOK_SHARP_CONST:
5230 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5068 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5231 Error_0 ("undefined sharp expression"); 5069 Error_0 ("undefined sharp expression");
5232 else 5070 else
5233 s_return (x); 5071 s_return (x);
5234 5072
5235 default: 5073 default:
… …
5237 } 5075 }
5238 5076
5239 break; 5077 break;
5240 5078
5241 case OP_RDLIST: 5079 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5080 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5081 SCHEME_V->tok = token (SCHEME_A);
5244 5082
5245 switch (SCHEME_V->tok) 5083 switch (SCHEME_V->tok)
5246 { 5084 {
5247 case TOK_EOF: 5085 case TOK_EOF:
… …
5275 case OP_RDDOT: 5113 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5114 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5115 Error_0 ("syntax error: illegal dot expression");
5278 5116
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5117 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5118 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5119
5282 case OP_RDQUOTE: 5120 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5121 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5122
5285 case OP_RDQQUOTE: 5123 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5145 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5146 s_goto (OP_VECTOR);
5309 5147
5310 /* ========== printing part ========== */ 5148 /* ========== printing part ========== */
5311 case OP_P0LIST: 5149 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5150 if (is_vector (args))
5313 { 5151 {
5314 putstr (SCHEME_A_ "#("); 5152 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5153 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5154 s_goto (OP_PVECFROM);
5317 } 5155 }
5318 else if (is_environment (SCHEME_V->args)) 5156 else if (is_environment (args))
5319 { 5157 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5158 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5159 s_return (S_T);
5322 } 5160 }
5323 else if (!is_pair (SCHEME_V->args)) 5161 else if (!is_pair (args))
5324 { 5162 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5163 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5164 s_return (S_T);
5327 } 5165 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5166 else
5329 { 5167 {
5168 pointer a = car (args);
5169 pointer b = cdr (args);
5170 int ok_abbr = ok_abbrev (b);
5171 SCHEME_V->args = car (b);
5172
5173 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5174 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5175 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5176 putstr (SCHEME_A_ "`");
5177 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5178 putstr (SCHEME_A_ ",");
5179 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5180 putstr (SCHEME_A_ ",@");
5181 else
5182 {
5183 putstr (SCHEME_A_ "(");
5184 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5185 SCHEME_V->args = a;
5186 }
5187
5332 s_goto (OP_P0LIST); 5188 s_goto (OP_P0LIST);
5333 } 5189 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5190
5191 case OP_P1LIST:
5192 if (is_pair (args))
5335 { 5193 {
5194 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5195 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5196 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5197 s_goto (OP_P0LIST);
5339 } 5198 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5199 else if (is_vector (args))
5369 { 5200 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5201 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5202 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5203 s_goto (OP_P0LIST);
5373 } 5204 }
5374 else 5205 else
5375 { 5206 {
5376 if (SCHEME_V->args != NIL) 5207 if (args != NIL)
5377 { 5208 {
5378 putstr (SCHEME_A_ " . "); 5209 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5210 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5211 }
5381 5212
5382 putstr (SCHEME_A_ ")"); 5213 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5214 s_return (S_T);
5384 } 5215 }
5385 5216
5386 case OP_PVECFROM: 5217 case OP_PVECFROM:
5387 { 5218 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5219 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5220 pointer vec = car (args);
5390 int len = veclength (vec); 5221 int len = veclength (vec);
5391 5222
5392 if (i == len) 5223 if (i == len)
5393 { 5224 {
5394 putstr (SCHEME_A_ ")"); 5225 putstr (SCHEME_A_ ")");
5395 s_return (S_T); 5226 s_return (S_T);
5396 } 5227 }
5397 else 5228 else
5398 { 5229 {
5399 pointer elem = vector_elem (vec, i); 5230 pointer elem = vector_get (vec, i);
5400 5231
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5232 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5233 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5234 SCHEME_V->args = elem;
5404 5235
5405 if (i > 0) 5236 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5237 putstr (SCHEME_A_ " ");
5407 5238
5408 s_goto (OP_P0LIST); 5239 s_goto (OP_P0LIST);
5409 } 5240 }
5410 } 5241 }
5411 } 5242 }
5412 5243
5413 return S_T; 5244 if (USE_ERROR_CHECKING) abort ();
5414} 5245}
5415 5246
5416static pointer 5247static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5248opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5249{
5250 pointer args = SCHEME_V->args;
5251 pointer a = car (args);
5419 pointer x, y; 5252 pointer x, y;
5420 5253
5421 switch (op) 5254 switch (op)
5422 { 5255 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5256 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5257 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5258 long v = list_length (SCHEME_A_ a);
5426 5259
5427 if (v < 0) 5260 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5261 Error_1 ("length: not a list:", a);
5429 5262
5430 s_return (mk_integer (SCHEME_A_ v)); 5263 s_return (mk_integer (SCHEME_A_ v));
5431 } 5264 }
5432 5265
5433 case OP_ASSQ: /* assq *//* a.k */ 5266 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5267 x = a;
5435 5268
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5269 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5270 {
5438 if (!is_pair (car (y))) 5271 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5272 Error_0 ("unable to handle non pair element");
5440 5273
5441 if (x == caar (y)) 5274 if (x == caar (y))
… …
5447 else 5280 else
5448 s_return (S_F); 5281 s_return (S_F);
5449 5282
5450 5283
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5284 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5285 SCHEME_V->args = a;
5453 5286
5454 if (SCHEME_V->args == NIL) 5287 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5288 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5289 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5290 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5462 5295
5463 case OP_CLOSUREP: /* closure? */ 5296 case OP_CLOSUREP: /* closure? */
5464 /* 5297 /*
5465 * Note, macro object is also a closure. 5298 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5299 * Therefore, (closure? <#MACRO>) ==> #t
5300 * (schmorp) well, obviously not, fix? TODO
5467 */ 5301 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5302 s_retbool (is_closure (a));
5469 5303
5470 case OP_MACROP: /* macro? */ 5304 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5305 s_retbool (is_macro (a));
5472 } 5306 }
5473 5307
5474 return S_T; /* NOTREACHED */ 5308 if (USE_ERROR_CHECKING) abort ();
5475} 5309}
5476 5310
5311/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5312typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5313
5479typedef int (*test_predicate) (pointer); 5314typedef int (*test_predicate)(pointer);
5480static int 5315static int
5481is_any (pointer p) 5316tst_any (pointer p)
5482{ 5317{
5483 return 1; 5318 return 1;
5484} 5319}
5485 5320
5486static int 5321static int
5487is_nonneg (pointer p) 5322tst_inonneg (pointer p)
5488{ 5323{
5489 return ivalue (p) >= 0 && is_integer (p); 5324 return is_integer (p) && ivalue_unchecked (p) >= 0;
5325}
5326
5327static int
5328tst_is_list (SCHEME_P_ pointer p)
5329{
5330 return p == NIL || is_pair (p);
5490} 5331}
5491 5332
5492/* Correspond carefully with following defines! */ 5333/* Correspond carefully with following defines! */
5493static struct 5334static struct
5494{ 5335{
5495 test_predicate fct; 5336 test_predicate fct;
5496 const char *kind; 5337 const char *kind;
5497} tests[] = 5338} tests[] = {
5498{ 5339 { tst_any , 0 },
5499 { 0, 0}, /* unused */ 5340 { is_string , "string" },
5500 { is_any, 0}, 5341 { is_symbol , "symbol" },
5501 { is_string, "string" }, 5342 { is_port , "port" },
5502 { is_symbol, "symbol" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5343 { is_inport , "input port" },
5505 { is_outport, "output port" }, 5344 { is_outport , "output port" },
5506 { is_environment, "environment" }, 5345 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5346 { is_pair , "pair" },
5508 { 0, "pair or '()" }, 5347 { 0 , "pair or '()" },
5509 { is_character, "character" }, 5348 { is_character , "character" },
5510 { is_vector, "vector" }, 5349 { is_vector , "vector" },
5511 { is_number, "number" }, 5350 { is_number , "number" },
5512 { is_integer, "integer" }, 5351 { is_integer , "integer" },
5513 { is_nonneg, "non-negative integer" } 5352 { tst_inonneg , "non-negative integer" }
5514}; 5353};
5515 5354
5516#define TST_NONE 0 5355#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5356#define TST_ANY "\001"
5518#define TST_STRING "\002" 5357#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5358#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5359#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5360#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5361#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5362#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5363#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5364#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5365#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5366#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5367#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5368#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5369#define TST_NATURAL "\016"
5370
5371#define INF_ARG 0xff
5372#define UNNAMED_OP ""
5373
5374static const char opnames[] =
5375#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5376#include "opdefines.h"
5377#undef OP_DEF
5378;
5379
5380static const char *
5381opname (int idx)
5382{
5383 const char *name = opnames;
5384
5385 /* should do this at compile time, but would require external program, right? */
5386 while (idx--)
5387 name += strlen (name) + 1;
5388
5389 return *name ? name : "ILLEGAL";
5390}
5391
5392static const char *
5393procname (pointer x)
5394{
5395 return opname (procnum (x));
5396}
5531 5397
5532typedef struct 5398typedef struct
5533{ 5399{
5534 dispatch_func func; 5400 uint8_t func;
5535 char *name; 5401 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5402 uint8_t builtin;
5403#if USE_ERROR_CHECKING
5536 int min_arity; 5404 uint8_t min_arity;
5537 int max_arity; 5405 uint8_t max_arity;
5538 char *arg_tests_encoding; 5406 char arg_tests_encoding[3];
5407#endif
5539} op_code_info; 5408} op_code_info;
5540 5409
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5410static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5411#if USE_ERROR_CHECKING
5412#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5413#else
5414#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5415#endif
5545#include "opdefines.h" 5416#include "opdefines.h"
5417#undef OP_DEF
5546 {0} 5418 {0}
5547}; 5419};
5548 5420
5549static const char *
5550procname (pointer x)
5551{
5552 int n = procnum (x);
5553 const char *name = dispatch_table[n].name;
5554
5555 if (name == 0)
5556 name = "ILLEGAL!";
5557
5558 return name;
5559}
5560
5561/* kernel of this interpreter */ 5421/* kernel of this interpreter */
5562static void 5422static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5423Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5424{
5565 SCHEME_V->op = op; 5425 SCHEME_V->op = op;
5566 5426
5567 for (;;) 5427 for (;;)
5568 { 5428 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5429 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5430
5571#if USE_ERROR_CHECKING 5431#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5432 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5433 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5434 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5435 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5436
5578 /* Check number of arguments */ 5437 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5438 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5439 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5440 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5441 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5442 xError_1 (SCHEME_A_ msg, 0);
5443 continue;
5584 } 5444 }
5585 5445 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5446 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5447 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5448 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5449 xError_1 (SCHEME_A_ msg, 0);
5450 continue;
5591 } 5451 }
5592 5452 else
5593 if (ok)
5594 { 5453 {
5595 if (pcd->arg_tests_encoding) 5454 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5455 {
5597 int i = 0; 5456 int i = 0;
5598 int j; 5457 int j;
5599 const char *t = pcd->arg_tests_encoding; 5458 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5459 pointer arglist = SCHEME_V->args;
5601 5460
5602 do 5461 do
5603 { 5462 {
5604 pointer arg = car (arglist); 5463 pointer arg = car (arglist);
5605 5464
5606 j = (int) t[0]; 5465 j = t[0];
5607 5466
5467 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5608 if (j == TST_LIST[0]) 5468 if (j == TST_LIST[0])
5609 { 5469 {
5610 if (arg != NIL && !is_pair (arg)) 5470 if (!tst_is_list (SCHEME_A_ arg))
5611 break; 5471 break;
5612 } 5472 }
5613 else 5473 else
5614 { 5474 {
5615 if (!tests[j].fct (arg)) 5475 if (!tests[j - 1].fct (arg))
5616 break; 5476 break;
5617 } 5477 }
5618 5478
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5479 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5620 t++; 5480 t++;
5621 5481
5622 arglist = cdr (arglist); 5482 arglist = cdr (arglist);
5623 i++; 5483 i++;
5624 } 5484 }
5625 while (i < n); 5485 while (i < n);
5626 5486
5627 if (i < n) 5487 if (i < n)
5628 { 5488 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5489 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5490 xError_1 (SCHEME_A_ msg, 0);
5491 continue;
5631 } 5492 }
5632 } 5493 }
5633 } 5494 }
5634
5635 if (!ok)
5636 {
5637 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5638 return;
5639
5640 pcd = dispatch_table + SCHEME_V->op;
5641 }
5642 } 5495 }
5643#endif 5496#endif
5644 5497
5645 ok_to_freely_gc (SCHEME_A); 5498 ok_to_freely_gc (SCHEME_A);
5646 5499
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5500 static const dispatch_func dispatch_funcs[] = {
5501 opexe_0,
5502 opexe_1,
5503 opexe_2,
5504 opexe_3,
5505 opexe_4,
5506 opexe_5,
5507 opexe_6,
5508 };
5509
5510 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5511 return;
5649 5512
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5513 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5514 {
5652 xwrstr ("No memory!\n"); 5515 xwrstr ("No memory!\n");
… …
5676mk_proc (SCHEME_P_ enum scheme_opcodes op) 5539mk_proc (SCHEME_P_ enum scheme_opcodes op)
5677{ 5540{
5678 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5541 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5679 set_typeflag (y, (T_PROC | T_ATOM)); 5542 set_typeflag (y, (T_PROC | T_ATOM));
5680 ivalue_unchecked (y) = op; 5543 ivalue_unchecked (y) = op;
5681 set_num_integer (y);
5682 return y; 5544 return y;
5683} 5545}
5684 5546
5685/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5547/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5686static int 5548static int
5687syntaxnum (pointer p) 5549syntaxnum (pointer p)
5688{ 5550{
5689 const char *s = strvalue (car (p)); 5551 const char *s = strvalue (p);
5690 5552
5691 switch (strlength (car (p))) 5553 switch (strlength (p))
5692 { 5554 {
5693 case 2: 5555 case 2:
5694 if (s[0] == 'i') 5556 if (s[0] == 'i')
5695 return OP_IF0; /* if */ 5557 return OP_IF0; /* if */
5696 else 5558 else
… …
5710 5572
5711 case 'd': 5573 case 'd':
5712 return OP_COND0; /* cond */ 5574 return OP_COND0; /* cond */
5713 5575
5714 case '*': 5576 case '*':
5715 return OP_LET0AST; /* let* */ 5577 return OP_LET0AST;/* let* */
5716 5578
5717 default: 5579 default:
5718 return OP_SET0; /* set! */ 5580 return OP_SET0; /* set! */
5719 } 5581 }
5720 5582
… …
5742 5604
5743 case 'f': 5605 case 'f':
5744 return OP_DEF0; /* define */ 5606 return OP_DEF0; /* define */
5745 5607
5746 default: 5608 default:
5747 return OP_LET0REC; /* letrec */ 5609 return OP_LET0REC;/* letrec */
5748 } 5610 }
5749 5611
5750 default: 5612 default:
5751 return OP_C0STREAM; /* cons-stream */ 5613 return OP_C0STREAM; /* cons-stream */
5752 } 5614 }
5753} 5615}
5754 5616
5755#if USE_MULTIPLICITY 5617#if USE_MULTIPLICITY
5756scheme * 5618ecb_cold scheme *
5757scheme_init_new () 5619scheme_init_new ()
5758{ 5620{
5759 scheme *sc = malloc (sizeof (scheme)); 5621 scheme *sc = malloc (sizeof (scheme));
5760 5622
5761 if (!scheme_init (SCHEME_A)) 5623 if (!scheme_init (SCHEME_A))
… …
5766 else 5628 else
5767 return sc; 5629 return sc;
5768} 5630}
5769#endif 5631#endif
5770 5632
5771int 5633ecb_cold int
5772scheme_init (SCHEME_P) 5634scheme_init (SCHEME_P)
5773{ 5635{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5636 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5637 pointer x;
5776 5638
… …
5849 5711
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5712 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5713 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5714 }
5853 5715
5716 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5717 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5718 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5719 assign_proc (SCHEME_A_ i, opname (i));
5857 5720
5858 /* initialization of global pointers to special symbols */ 5721 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5722 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5723 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5724 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5763scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5764{
5902 SCHEME_V->ext_data = p; 5765 SCHEME_V->ext_data = p;
5903} 5766}
5904 5767
5905void 5768ecb_cold void
5906scheme_deinit (SCHEME_P) 5769scheme_deinit (SCHEME_P)
5907{ 5770{
5908 int i; 5771 int i;
5909 5772
5910#if SHOW_ERROR_LINE 5773#if SHOW_ERROR_LINE
… …
6002{ 5865{
6003 dump_stack_reset (SCHEME_A); 5866 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5867 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5868 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5869 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5870 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5871 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5872 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5873#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5874 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5875#endif
6013 SCHEME_V->retcode = 0; 5876 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5877 SCHEME_V->interactive_repl = 0;
… …
6131# endif 5994# endif
6132 int fin; 5995 int fin;
6133 char *file_name = InitFile; 5996 char *file_name = InitFile;
6134 int retcode; 5997 int retcode;
6135 int isfile = 1; 5998 int isfile = 1;
5999 system ("ps v $PPID");//D
6136 6000
6137 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6001 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6138 { 6002 {
6139 xwrstr ("Usage: tinyscheme -?\n"); 6003 xwrstr ("Usage: tinyscheme -?\n");
6140 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6004 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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