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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.13 by root, Thu Nov 26 07:59:42 2015 UTC vs.
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
37#include <string.h> 39#include <string.h>
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 69#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 70#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 71
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76
77#if !USE_MULTIPLICITY 72#if !USE_MULTIPLICITY
78static scheme sc; 73static scheme sc;
79#endif 74#endif
80 75
81static void 76static void
… …
150 145
151#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
154 149
155#if USE_STRLWR 150#if USE_IGNORECASE
156static const char * 151static const char *
157strlwr (char *s) 152xstrlwr (char *s)
158{ 153{
159 const char *p = s; 154 const char *p = s;
160 155
161 while (*s) 156 while (*s)
162 { 157 {
… …
164 s++; 159 s++;
165 } 160 }
166 161
167 return p; 162 return p;
168} 163}
169#endif
170 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
171#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
173 172
174#ifndef prompt 173#ifndef prompt
175# define prompt "ts> " 174# define prompt "ts> "
176#endif 175#endif
177 176
… …
183# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
184#endif 183#endif
185 184
186enum scheme_types 185enum scheme_types
187{ 186{
187 T_INTEGER,
188 T_FREE, 188 T_REAL,
189 T_STRING, 189 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 190 T_SYMBOL,
192 T_PROC, 191 T_PROC,
193 T_PAIR, 192 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 193 T_CLOSURE,
195 T_CONTINUATION, 194 T_CONTINUATION,
196 T_FOREIGN, 195 T_FOREIGN,
197 T_CHARACTER, 196 T_CHARACTER,
198 T_PORT, 197 T_PORT,
… …
208#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
212 211
212/* num, for generic arithmetic */
213struct num
214{
215 IVALUE ivalue;
216#if USE_REAL
217 RVALUE rvalue;
218 char is_fixnum;
219#endif
220};
221
222#if USE_REAL
223# define num_is_fixnum(n) (n).is_fixnum
224# define num_set_fixnum(n,f) (n).is_fixnum = (f)
225# define num_ivalue(n) (n).ivalue
226# define num_rvalue(n) (n).rvalue
227# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
228# define num_set_rvalue(n,r) (n).rvalue = (r)
229#else
230# define num_is_fixnum(n) 1
231# define num_set_fixnum(n,f) 0
232# define num_ivalue(n) (n).ivalue
233# define num_rvalue(n) (n).ivalue
234# define num_set_ivalue(n,i) (n).ivalue = (i)
235# define num_set_rvalue(n,r) (n).ivalue = (r)
236#endif
237
238enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
239
213static num num_op (char op, num a, num b); 240static num num_op (enum num_op op, num a, num b);
214static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
215static num num_rem (num a, num b); 242static num num_rem (num a, num b);
216static num num_mod (num a, num b); 243static num num_mod (num a, num b);
217static int num_eq (num a, num b);
218static int num_gt (num a, num b);
219static int num_ge (num a, num b);
220static int num_lt (num a, num b);
221static int num_le (num a, num b);
222 244
223#if USE_MATH 245#if USE_MATH
224static double round_per_R5RS (double x); 246static double round_per_R5RS (double x);
225#endif 247#endif
226static int is_zero_rvalue (RVALUE x); 248static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 249
234static num num_zero; 250static num num_zero;
235static num num_one; 251static num num_one;
236 252
237/* macros for cell operations */ 253/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 254#define typeflag(p) ((p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 255#define set_typeflag(p,v) ((p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 256#define type(p) (typeflag (p) & T_MASKTYPE)
241 257
242INTERFACE INLINE int 258INTERFACE int
243is_string (pointer p) 259is_string (pointer p)
244{ 260{
245 return type (p) == T_STRING; 261 return type (p) == T_STRING;
246} 262}
247 263
248#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
250 266
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 267INTERFACE int
253is_vector (pointer p) 268is_vector (pointer p)
254{ 269{
255 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
256} 271}
257 272
258#define vecvalue(p) ((p)->object.vector.vvalue) 273#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 274#define veclength(p) ((p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 276INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 278
265INTERFACE uint32_t 279INTERFACE int
266vector_length (pointer vec) 280is_integer (pointer p)
267{ 281{
268 return vec->object.vector.length; 282 return type (p) == T_INTEGER;
269} 283}
270 284
285/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 286INTERFACE int
287is_real (pointer p)
288{
289 return type (p) == T_REAL;
290}
291
292INTERFACE int
272is_number (pointer p) 293is_number (pointer p)
273{ 294{
274 return type (p) == T_NUMBER; 295 return is_integer (p) || is_real (p);
275} 296}
276 297
277INTERFACE INLINE int 298INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 299is_character (pointer p)
297{ 300{
298 return type (p) == T_CHARACTER; 301 return type (p) == T_CHARACTER;
299} 302}
300 303
301INTERFACE INLINE char * 304INTERFACE char *
302string_value (pointer p) 305string_value (pointer p)
303{ 306{
304 return strvalue (p); 307 return strvalue (p);
305} 308}
306 309
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 310#define ivalue_unchecked(p) (p)->object.ivalue
311#define set_ivalue(p,v) (p)->object.ivalue = (v)
312
338#if USE_REAL 313#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 314#define rvalue_unchecked(p) (p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 315#define set_rvalue(p,v) (p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 316#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 317#define rvalue_unchecked(p) (p)->object.ivalue
344# define set_num_integer(p) 0 318#define set_rvalue(p,v) (p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 319#endif
320
347INTERFACE long 321INTERFACE long
348charvalue (pointer p) 322charvalue (pointer p)
349{ 323{
350 return ivalue_unchecked (p); 324 return ivalue_unchecked (p);
351} 325}
352 326
353INTERFACE INLINE int 327INTERFACE int
354is_port (pointer p) 328is_port (pointer p)
355{ 329{
356 return type (p) == T_PORT; 330 return type (p) == T_PORT;
357} 331}
358 332
359INTERFACE INLINE int 333INTERFACE int
360is_inport (pointer p) 334is_inport (pointer p)
361{ 335{
362 return is_port (p) && p->object.port->kind & port_input; 336 return is_port (p) && p->object.port->kind & port_input;
363} 337}
364 338
365INTERFACE INLINE int 339INTERFACE int
366is_outport (pointer p) 340is_outport (pointer p)
367{ 341{
368 return is_port (p) && p->object.port->kind & port_output; 342 return is_port (p) && p->object.port->kind & port_output;
369} 343}
370 344
371INTERFACE INLINE int 345INTERFACE int
372is_pair (pointer p) 346is_pair (pointer p)
373{ 347{
374 return type (p) == T_PAIR; 348 return type (p) == T_PAIR;
375} 349}
376 350
… …
408pair_cdr (pointer p) 382pair_cdr (pointer p)
409{ 383{
410 return cdr (p); 384 return cdr (p);
411} 385}
412 386
413INTERFACE INLINE int 387INTERFACE int
414is_symbol (pointer p) 388is_symbol (pointer p)
415{ 389{
416 return type (p) == T_SYMBOL; 390 return type (p) == T_SYMBOL;
417} 391}
418 392
419INTERFACE INLINE char * 393INTERFACE char *
420symname (pointer p) 394symname (pointer p)
421{ 395{
422 return strvalue (car (p)); 396 return strvalue (car (p));
423} 397}
424 398
425#if USE_PLIST 399#if USE_PLIST
426SCHEME_EXPORT INLINE int 400SCHEME_EXPORT int
427hasprop (pointer p) 401hasprop (pointer p)
428{ 402{
429 return typeflag (p) & T_SYMBOL; 403 return typeflag (p) & T_SYMBOL;
430} 404}
431 405
432# define symprop(p) cdr(p) 406# define symprop(p) cdr(p)
433#endif 407#endif
434 408
435INTERFACE INLINE int 409INTERFACE int
436is_syntax (pointer p) 410is_syntax (pointer p)
437{ 411{
438 return typeflag (p) & T_SYNTAX; 412 return typeflag (p) & T_SYNTAX;
439} 413}
440 414
441INTERFACE INLINE int 415INTERFACE int
442is_proc (pointer p) 416is_proc (pointer p)
443{ 417{
444 return type (p) == T_PROC; 418 return type (p) == T_PROC;
445} 419}
446 420
447INTERFACE INLINE int 421INTERFACE int
448is_foreign (pointer p) 422is_foreign (pointer p)
449{ 423{
450 return type (p) == T_FOREIGN; 424 return type (p) == T_FOREIGN;
451} 425}
452 426
453INTERFACE INLINE char * 427INTERFACE char *
454syntaxname (pointer p) 428syntaxname (pointer p)
455{ 429{
456 return strvalue (car (p)); 430 return strvalue (car (p));
457} 431}
458 432
459#define procnum(p) ivalue (p) 433#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 434static const char *procname (pointer x);
461 435
462INTERFACE INLINE int 436INTERFACE int
463is_closure (pointer p) 437is_closure (pointer p)
464{ 438{
465 return type (p) == T_CLOSURE; 439 return type (p) == T_CLOSURE;
466} 440}
467 441
468INTERFACE INLINE int 442INTERFACE int
469is_macro (pointer p) 443is_macro (pointer p)
470{ 444{
471 return type (p) == T_MACRO; 445 return type (p) == T_MACRO;
472} 446}
473 447
474INTERFACE INLINE pointer 448INTERFACE pointer
475closure_code (pointer p) 449closure_code (pointer p)
476{ 450{
477 return car (p); 451 return car (p);
478} 452}
479 453
480INTERFACE INLINE pointer 454INTERFACE pointer
481closure_env (pointer p) 455closure_env (pointer p)
482{ 456{
483 return cdr (p); 457 return cdr (p);
484} 458}
485 459
486INTERFACE INLINE int 460INTERFACE int
487is_continuation (pointer p) 461is_continuation (pointer p)
488{ 462{
489 return type (p) == T_CONTINUATION; 463 return type (p) == T_CONTINUATION;
490} 464}
491 465
492#define cont_dump(p) cdr (p) 466#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 467#define set_cont_dump(p,v) set_cdr ((p), (v))
494 468
495/* To do: promise should be forced ONCE only */ 469/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 470INTERFACE int
497is_promise (pointer p) 471is_promise (pointer p)
498{ 472{
499 return type (p) == T_PROMISE; 473 return type (p) == T_PROMISE;
500} 474}
501 475
502INTERFACE INLINE int 476INTERFACE int
503is_environment (pointer p) 477is_environment (pointer p)
504{ 478{
505 return type (p) == T_ENVIRONMENT; 479 return type (p) == T_ENVIRONMENT;
506} 480}
507 481
… …
513 487
514#define is_mark(p) (typeflag (p) & T_MARK) 488#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 489#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 490#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 491
518INTERFACE INLINE int 492INTERFACE int
519is_immutable (pointer p) 493is_immutable (pointer p)
520{ 494{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 495 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 496}
523 497
524INTERFACE INLINE void 498INTERFACE void
525setimmutable (pointer p) 499setimmutable (pointer p)
526{ 500{
527#if USE_ERROR_CHECKING 501#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 502 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 503#endif
530} 504}
531 505
506/* Result is:
507 proper list: length
508 circular list: -1
509 not even a pair: -2
510 dotted list: -2 minus length before dot
511*/
512INTERFACE int
513list_length (SCHEME_P_ pointer a)
514{
515 int i = 0;
516 pointer slow, fast;
517
518 slow = fast = a;
519
520 while (1)
521 {
522 if (fast == NIL)
523 return i;
524
525 if (!is_pair (fast))
526 return -2 - i;
527
528 fast = cdr (fast);
529 ++i;
530
531 if (fast == NIL)
532 return i;
533
534 if (!is_pair (fast))
535 return -2 - i;
536
537 ++i;
538 fast = cdr (fast);
539
540 /* Safe because we would have already returned if `fast'
541 encountered a non-pair. */
542 slow = cdr (slow);
543
544 if (fast == slow)
545 {
546 /* the fast pointer has looped back around and caught up
547 with the slow pointer, hence the structure is circular,
548 not of finite length, and therefore not a list */
549 return -1;
550 }
551 }
552}
553
554INTERFACE int
555is_list (SCHEME_P_ pointer a)
556{
557 return list_length (SCHEME_A_ a) >= 0;
558}
559
532#if USE_CHAR_CLASSIFIERS 560#if USE_CHAR_CLASSIFIERS
533static INLINE int 561ecb_inline int
534Cisalpha (int c) 562Cisalpha (int c)
535{ 563{
536 return isascii (c) && isalpha (c); 564 return isascii (c) && isalpha (c);
537} 565}
538 566
539static INLINE int 567ecb_inline int
540Cisdigit (int c) 568Cisdigit (int c)
541{ 569{
542 return isascii (c) && isdigit (c); 570 return isascii (c) && isdigit (c);
543} 571}
544 572
545static INLINE int 573ecb_inline int
546Cisspace (int c) 574Cisspace (int c)
547{ 575{
548 return isascii (c) && isspace (c); 576 return isascii (c) && isspace (c);
549} 577}
550 578
551static INLINE int 579ecb_inline int
552Cisupper (int c) 580Cisupper (int c)
553{ 581{
554 return isascii (c) && isupper (c); 582 return isascii (c) && isupper (c);
555} 583}
556 584
557static INLINE int 585ecb_inline int
558Cislower (int c) 586Cislower (int c)
559{ 587{
560 return isascii (c) && islower (c); 588 return isascii (c) && islower (c);
561} 589}
562#endif 590#endif
… …
623#endif 651#endif
624 652
625static int file_push (SCHEME_P_ const char *fname); 653static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 654static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 655static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 656ecb_inline int is_one_of (char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 657static int alloc_cellseg (SCHEME_P_ int n);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 659static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 660static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 662static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
652static int basic_inchar (port *pt); 680static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 681static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 682static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 683static char *readstr_upto (SCHEME_P_ char *delim);
656static pointer readstrexp (SCHEME_P); 684static pointer readstrexp (SCHEME_P);
657static INLINE int skipspace (SCHEME_P); 685ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 686static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 687static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 689static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 694static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 695static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 696static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 697static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 698static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 699static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
700static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 701static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 702static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 703static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 704static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 705static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
677static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 706static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
678static void assign_syntax (SCHEME_P_ const char *name); 707static void assign_syntax (SCHEME_P_ const char *name);
679static int syntaxnum (pointer p); 708static int syntaxnum (pointer p);
680static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 709static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
681 710
711static IVALUE
712ivalue (pointer x)
713{
714 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
715}
716
717static RVALUE
718rvalue (pointer x)
719{
720 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
721}
722
723INTERFACE num
724nvalue (pointer x)
725{
726 num n;
727
728 num_set_fixnum (n, is_integer (x));
729
730 if (num_is_fixnum (n))
731 num_set_ivalue (n, ivalue_unchecked (x));
732 else
733 num_set_rvalue (n, rvalue_unchecked (x));
734
735 return n;
736}
737
682static num 738static num
683num_op (char op, num a, num b) 739num_op (enum num_op op, num a, num b)
684{ 740{
685 num ret; 741 num ret;
686 742
687 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
688 744
689 if (num_is_fixnum (ret)) 745 if (num_is_fixnum (ret))
690 { 746 {
691 IVALUE av = num_get_ivalue (a);
692 IVALUE bv = num_get_ivalue (b);
693
694 switch (op) 747 switch (op)
695 { 748 {
696 case '+': av += bv; break; 749 case NUM_ADD: a.ivalue += b.ivalue; break;
697 case '-': av -= bv; break; 750 case NUM_SUB: a.ivalue -= b.ivalue; break;
698 case '*': av *= bv; break; 751 case NUM_MUL: a.ivalue *= b.ivalue; break;
699 case '/': av /= bv; break; 752 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
700 } 753 }
701 754
702 num_set_ivalue (ret, av); 755 num_set_ivalue (ret, a.ivalue);
703 } 756 }
757#if USE_REAL
704 else 758 else
705 { 759 {
706 RVALUE av = num_get_rvalue (a);
707 RVALUE bv = num_get_rvalue (b);
708
709 switch (op) 760 switch (op)
710 { 761 {
711 case '+': av += bv; break; 762 case NUM_ADD: a.rvalue += b.rvalue; break;
712 case '-': av -= bv; break; 763 case NUM_SUB: a.rvalue -= b.rvalue; break;
713 case '*': av *= bv; break; 764 case NUM_MUL: a.rvalue *= b.rvalue; break;
714 case '/': av /= bv; break; 765 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
715 } 766 }
716 767
717 num_set_rvalue (ret, av); 768 num_set_rvalue (ret, a.rvalue);
718 } 769 }
770#endif
719 771
720 return ret; 772 return ret;
721} 773}
722 774
723static num 775static num
724num_div (num a, num b) 776num_div (num a, num b)
725{ 777{
726 num ret; 778 num ret;
727 779
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
729 781
730 if (num_is_fixnum (ret)) 782 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 783 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
732 else 784 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 785 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
734 786
735 return ret; 787 return ret;
736} 788}
737 789
738static num 790static num
… …
740{ 792{
741 num ret; 793 num ret;
742 long e1, e2, res; 794 long e1, e2, res;
743 795
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745 e1 = num_get_ivalue (a); 797 e1 = num_ivalue (a);
746 e2 = num_get_ivalue (b); 798 e2 = num_ivalue (b);
747 res = e1 % e2; 799 res = e1 % e2;
748 800
749 /* remainder should have same sign as second operand */ 801 /* remainder should have same sign as second operand */
750 if (res > 0) 802 if (res > 0)
751 { 803 {
… …
767{ 819{
768 num ret; 820 num ret;
769 long e1, e2, res; 821 long e1, e2, res;
770 822
771 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 823 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
772 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
773 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
774 res = e1 % e2; 826 res = e1 % e2;
775 827
776 /* modulo should have same sign as second operand */ 828 /* modulo should have same sign as second operand */
777 if (res * e2 < 0) 829 if (res * e2 < 0)
778 res += e2; 830 res += e2;
779 831
780 num_set_ivalue (ret, res); 832 num_set_ivalue (ret, res);
781 return ret; 833 return ret;
782} 834}
783 835
836/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
784static int 837static int
785num_eq (num a, num b) 838num_cmp (num a, num b)
786{ 839{
840 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
787 int ret; 841 int ret;
788 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
789 842
790 if (is_fixnum) 843 if (is_fixnum)
791 ret = num_get_ivalue (a) == num_get_ivalue (b); 844 {
845 IVALUE av = num_ivalue (a);
846 IVALUE bv = num_ivalue (b);
847
848 ret = av == bv ? 0 : av < bv ? -1 : +1;
849 }
792 else 850 else
793 ret = num_get_rvalue (a) == num_get_rvalue (b); 851 {
852 RVALUE av = num_rvalue (a);
853 RVALUE bv = num_rvalue (b);
854
855 ret = av == bv ? 0 : av < bv ? -1 : +1;
856 }
794 857
795 return ret; 858 return ret;
796}
797
798
799static int
800num_gt (num a, num b)
801{
802 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804
805 if (is_fixnum)
806 ret = num_get_ivalue (a) > num_get_ivalue (b);
807 else
808 ret = num_get_rvalue (a) > num_get_rvalue (b);
809
810 return ret;
811}
812
813static int
814num_ge (num a, num b)
815{
816 return !num_lt (a, b);
817}
818
819static int
820num_lt (num a, num b)
821{
822 int ret;
823 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
824
825 if (is_fixnum)
826 ret = num_get_ivalue (a) < num_get_ivalue (b);
827 else
828 ret = num_get_rvalue (a) < num_get_rvalue (b);
829
830 return ret;
831}
832
833static int
834num_le (num a, num b)
835{
836 return !num_gt (a, b);
837} 859}
838 860
839#if USE_MATH 861#if USE_MATH
840 862
841/* Round to nearest. Round to even if midway */ 863/* Round to nearest. Round to even if midway */
… …
851 return ce; 873 return ce;
852 else if (dfl < dce) 874 else if (dfl < dce)
853 return fl; 875 return fl;
854 else 876 else
855 { 877 {
856 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 878 if (fmod (fl, 2) == 0) /* I imagine this holds */
857 return fl; 879 return fl;
858 else 880 else
859 return ce; 881 return ce;
860 } 882 }
861} 883}
862#endif 884#endif
863 885
864static int 886static int
865is_zero_rvalue (RVALUE x) 887is_zero_rvalue (RVALUE x)
866{ 888{
889 return x == 0;
890#if 0
867#if USE_REAL 891#if USE_REAL
868 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 892 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
869#else 893#else
870 return x == 0; 894 return x == 0;
895#endif
871#endif 896#endif
872} 897}
873 898
874/* allocate new cell segment */ 899/* allocate new cell segment */
875static int 900static int
… …
896 return k; 921 return k;
897 922
898 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
899 SCHEME_V->alloc_seg[i] = cp; 924 SCHEME_V->alloc_seg[i] = cp;
900 925
901 /* insert new segment in address order */
902 newp = (pointer)cp; 926 newp = (pointer)cp;
903 SCHEME_V->cell_seg[i] = newp; 927 SCHEME_V->cell_seg[i] = newp;
904 SCHEME_V->cell_segsize[i] = segsize; 928 SCHEME_V->cell_segsize[i] = segsize;
905
906 //TODO: insert, not swap
907 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
908 {
909 p = SCHEME_V->cell_seg[i];
910 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
911 SCHEME_V->cell_seg[i - 1] = p;
912
913 k = SCHEME_V->cell_segsize[i];
914 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
915 SCHEME_V->cell_segsize[i - 1] = k;
916
917 --i;
918 }
919
920 SCHEME_V->fcells += segsize; 929 SCHEME_V->fcells += segsize;
921 last = newp + segsize - 1; 930 last = newp + segsize - 1;
922 931
923 for (p = newp; p <= last; p++) 932 for (p = newp; p <= last; p++)
924 { 933 {
925 set_typeflag (p, T_FREE); 934 set_typeflag (p, T_PAIR);
926 set_car (p, NIL); 935 set_car (p, NIL);
927 set_cdr (p, p + 1); 936 set_cdr (p, p + 1);
928 } 937 }
929 938
930 /* insert new cells in address order on free list */
931 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
932 {
933 set_cdr (last, SCHEME_V->free_cell); 939 set_cdr (last, SCHEME_V->free_cell);
934 SCHEME_V->free_cell = newp; 940 SCHEME_V->free_cell = newp;
935 }
936 else
937 {
938 p = SCHEME_V->free_cell;
939
940 while (cdr (p) != NIL && newp > cdr (p))
941 p = cdr (p);
942
943 set_cdr (last, cdr (p));
944 set_cdr (p, newp);
945 }
946 } 941 }
947 942
948 return n; 943 return n;
949} 944}
950 945
951/* get new cell. parameter a, b is marked by gc. */ 946/* get new cell. parameter a, b is marked by gc. */
952static INLINE pointer 947ecb_inline pointer
953get_cell_x (SCHEME_P_ pointer a, pointer b) 948get_cell_x (SCHEME_P_ pointer a, pointer b)
954{ 949{
955 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 950 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
956 { 951 {
957 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1029 /* Record it as a vector so that gc understands it. */ 1024 /* Record it as a vector so that gc understands it. */
1030 set_typeflag (v, T_VECTOR | T_ATOM); 1025 set_typeflag (v, T_VECTOR | T_ATOM);
1031 1026
1032 v->object.vector.vvalue = e; 1027 v->object.vector.vvalue = e;
1033 v->object.vector.length = len; 1028 v->object.vector.length = len;
1034 fill_vector (v, init); 1029 fill_vector (v, 0, init);
1035 push_recent_alloc (SCHEME_A_ v, NIL); 1030 push_recent_alloc (SCHEME_A_ v, NIL);
1036 1031
1037 return v; 1032 return v;
1038} 1033}
1039 1034
1040static INLINE void 1035ecb_inline void
1041ok_to_freely_gc (SCHEME_P) 1036ok_to_freely_gc (SCHEME_P)
1042{ 1037{
1043 set_car (S_SINK, NIL); 1038 set_car (S_SINK, NIL);
1044} 1039}
1045 1040
… …
1105 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1106 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1107 setimmutable (car (x)); 1102 setimmutable (car (x));
1108 1103
1109 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1104 location = hash_fn (name, veclength (SCHEME_V->oblist));
1110 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1111 return x; 1106 return x;
1112} 1107}
1113 1108
1114static INLINE pointer 1109ecb_inline pointer
1115oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1116{ 1111{
1117 int location; 1112 int location;
1118 pointer x; 1113 pointer x;
1119 char *s; 1114 char *s;
1120 1115
1121 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1122 1117
1123 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1118 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1124 { 1119 {
1125 s = symname (car (x)); 1120 s = symname (car (x));
1126 1121
1127 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1128 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1138 int i; 1133 int i;
1139 pointer x; 1134 pointer x;
1140 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1141 1136
1142 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1143 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1144 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1145 1140
1146 return ob_list; 1141 return ob_list;
1147} 1142}
1148 1143
… …
1152oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1153{ 1148{
1154 return NIL; 1149 return NIL;
1155} 1150}
1156 1151
1157static INLINE pointer 1152ecb_inline pointer
1158oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1159{ 1154{
1160 pointer x; 1155 pointer x;
1161 char *s; 1156 char *s;
1162 1157
… …
1221mk_character (SCHEME_P_ int c) 1216mk_character (SCHEME_P_ int c)
1222{ 1217{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1219
1225 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1220 set_typeflag (x, (T_CHARACTER | T_ATOM));
1226 ivalue_unchecked (x) = c & 0xff; 1221 set_ivalue (x, c & 0xff);
1227 set_num_integer (x); 1222
1228 return x; 1223 return x;
1229} 1224}
1230 1225
1231/* get number atom (integer) */ 1226/* get number atom (integer) */
1232INTERFACE pointer 1227INTERFACE pointer
1233mk_integer (SCHEME_P_ long num) 1228mk_integer (SCHEME_P_ long n)
1234{ 1229{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1231
1237 set_typeflag (x, (T_NUMBER | T_ATOM)); 1232 set_typeflag (x, (T_INTEGER | T_ATOM));
1238 ivalue_unchecked (x) = num; 1233 set_ivalue (x, n);
1239 set_num_integer (x); 1234
1240 return x; 1235 return x;
1241} 1236}
1242 1237
1243INTERFACE pointer 1238INTERFACE pointer
1244mk_real (SCHEME_P_ RVALUE n) 1239mk_real (SCHEME_P_ RVALUE n)
1245{ 1240{
1241#if USE_REAL
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1243
1248 set_typeflag (x, (T_NUMBER | T_ATOM)); 1244 set_typeflag (x, (T_REAL | T_ATOM));
1249 rvalue_unchecked (x) = n; 1245 set_rvalue (x, n);
1250 set_num_real (x); 1246
1251 return x; 1247 return x;
1248#else
1249 return mk_integer (SCHEME_A_ n);
1250#endif
1252} 1251}
1253 1252
1254static pointer 1253static pointer
1255mk_number (SCHEME_P_ const num n) 1254mk_number (SCHEME_P_ const num n)
1256{ 1255{
1256#if USE_REAL
1257 if (num_is_fixnum (n)) 1257 return num_is_fixnum (n)
1258 ? mk_integer (SCHEME_A_ num_ivalue (n))
1259 : mk_real (SCHEME_A_ num_rvalue (n));
1260#else
1258 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1261 return mk_integer (SCHEME_A_ num_ivalue (n));
1259 else 1262#endif
1260 return mk_real (SCHEME_A_ num_get_rvalue (n));
1261} 1263}
1262 1264
1263/* allocate name to string area */ 1265/* allocate name to string area */
1264static char * 1266static char *
1265store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1267store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1324{ 1326{
1325 return get_vector_object (SCHEME_A_ len, NIL); 1327 return get_vector_object (SCHEME_A_ len, NIL);
1326} 1328}
1327 1329
1328INTERFACE void 1330INTERFACE void
1329fill_vector (pointer vec, pointer obj) 1331fill_vector (pointer vec, uint32_t start, pointer obj)
1330{ 1332{
1331 int i; 1333 int i;
1332 1334
1333 for (i = 0; i < vec->object.vector.length; i++) 1335 for (i = start; i < veclength (vec); i++)
1334 vecvalue (vec)[i] = obj; 1336 vecvalue (vec)[i] = obj;
1335} 1337}
1336 1338
1337INTERFACE pointer 1339INTERFACE pointer
1338vector_elem (pointer vec, uint32_t ielem) 1340vector_get (pointer vec, uint32_t ielem)
1339{ 1341{
1340 return vecvalue(vec)[ielem]; 1342 return vecvalue(vec)[ielem];
1341} 1343}
1342 1344
1343INTERFACE void 1345INTERFACE void
1344set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1346vector_set (pointer vec, uint32_t ielem, pointer a)
1345{ 1347{
1346 vecvalue(vec)[ielem] = a; 1348 vecvalue(vec)[ielem] = a;
1347} 1349}
1348 1350
1349/* get new symbol */ 1351/* get new symbol */
… …
1441 } 1443 }
1442 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1443 { 1445 {
1444 if (!has_fp_exp) 1446 if (!has_fp_exp)
1445 { 1447 {
1446 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1447 from now on */
1448 p++; 1449 p++;
1449 1450
1450 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1451 continue; 1452 continue;
1452 } 1453 }
… …
1540 1541
1541 if (ecb_expect_false (is_vector (p))) 1542 if (ecb_expect_false (is_vector (p)))
1542 { 1543 {
1543 int i; 1544 int i;
1544 1545
1545 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1546 mark (vecvalue (p)[i]); 1547 mark (vecvalue (p)[i]);
1547 } 1548 }
1548 1549
1549 if (is_atom (p)) 1550 if (is_atom (p))
1550 goto E6; 1551 goto E6;
… …
1648 if (is_mark (p)) 1649 if (is_mark (p))
1649 clrmark (p); 1650 clrmark (p);
1650 else 1651 else
1651 { 1652 {
1652 /* reclaim cell */ 1653 /* reclaim cell */
1653 if (typeflag (p) != T_FREE) 1654 if (typeflag (p) != T_PAIR)
1654 { 1655 {
1655 finalize_cell (SCHEME_A_ p); 1656 finalize_cell (SCHEME_A_ p);
1656 set_typeflag (p, T_FREE); 1657 set_typeflag (p, T_PAIR);
1657 set_car (p, NIL); 1658 set_car (p, NIL);
1658 } 1659 }
1659 1660
1660 ++SCHEME_V->fcells; 1661 ++SCHEME_V->fcells;
1661 set_cdr (p, SCHEME_V->free_cell); 1662 set_cdr (p, SCHEME_V->free_cell);
… …
1663 } 1664 }
1664 } 1665 }
1665 } 1666 }
1666 1667
1667 if (SCHEME_V->gc_verbose) 1668 if (SCHEME_V->gc_verbose)
1669 {
1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1669} 1672}
1670 1673
1671static void 1674static void
1672finalize_cell (SCHEME_P_ pointer a) 1675finalize_cell (SCHEME_P_ pointer a)
1673{ 1676{
… …
2260 } 2263 }
2261 } 2264 }
2262} 2265}
2263 2266
2264/* check c is in chars */ 2267/* check c is in chars */
2265static INLINE int 2268ecb_inline int
2266is_one_of (char *s, int c) 2269is_one_of (char *s, int c)
2267{ 2270{
2268 if (c == EOF) 2271 if (c == EOF)
2269 return 1; 2272 return 1;
2270 2273
2271 return !!strchr (s, c); 2274 return !!strchr (s, c);
2272} 2275}
2273 2276
2274/* skip white characters */ 2277/* skip white characters */
2275static INLINE int 2278ecb_inline int
2276skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2277{ 2280{
2278 int c, curr_line = 0; 2281 int c, curr_line = 0;
2279 2282
2280 do 2283 do
… …
2508 { 2511 {
2509 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2510 2513
2511 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2512 { 2515 {
2513 if (num_is_integer (l)) 2516 if (is_integer (l))
2514 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2515#if USE_REAL 2518#if USE_REAL
2516 else 2519 else
2517 { 2520 {
2518 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2773 return 0; 2776 return 0;
2774 } 2777 }
2775 else if (is_number (a)) 2778 else if (is_number (a))
2776 { 2779 {
2777 if (is_number (b)) 2780 if (is_number (b))
2778 if (num_is_integer (a) == num_is_integer (b))
2779 return num_eq (nvalue (a), nvalue (b)); 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2780 2782
2781 return 0; 2783 return 0;
2782 } 2784 }
2783 else if (is_character (a)) 2785 else if (is_character (a))
2784 { 2786 {
… …
2851 2853
2852 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2854 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2853 setenvironment (SCHEME_V->envir); 2855 setenvironment (SCHEME_V->envir);
2854} 2856}
2855 2857
2856static INLINE void 2858ecb_inline void
2857new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2858{ 2860{
2859 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
2860 2862
2861 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
2862 { 2864 {
2863 int location = hash_fn (symname (variable), veclength (car (env))); 2865 int location = hash_fn (symname (variable), veclength (car (env)));
2864 2866
2865 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2866 } 2868 }
2867 else 2869 else
2868 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
2869} 2871}
2870 2872
… …
2877 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
2878 { 2880 {
2879 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
2880 { 2882 {
2881 location = hash_fn (symname (hdl), veclength (car (x))); 2883 location = hash_fn (symname (hdl), veclength (car (x)));
2882 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
2883 } 2885 }
2884 else 2886 else
2885 y = car (x); 2887 y = car (x);
2886 2888
2887 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
2888 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
2889 break; 2891 break;
2890 2892
2891 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
2892 break; 2897 break;
2893
2894 if (!all)
2895 return NIL;
2896 } 2898 }
2897
2898 if (x != NIL)
2899 return car (y);
2900 2899
2901 return NIL; 2900 return NIL;
2902} 2901}
2903 2902
2904#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
2905 2904
2906static INLINE void 2905ecb_inline void
2907new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
2908{ 2907{
2909 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
2910 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
2911} 2910}
2912 2911
2913static INLINE void 2912ecb_inline void
2914new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2915{ 2914{
2916 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2917} 2916}
2918 2917
… …
2940 return NIL; 2939 return NIL;
2941} 2940}
2942 2941
2943#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
2944 2943
2945static INLINE void 2944ecb_inline void
2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2947{ 2946{
2948 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2949} 2948}
2950 2949
2951static INLINE void 2950ecb_inline void
2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2953{ 2952{
2954 set_cdr (slot, value); 2953 set_cdr (slot, value);
2955} 2954}
2956 2955
2957static INLINE pointer 2956ecb_inline pointer
2958slot_value_in_env (pointer slot) 2957slot_value_in_env (pointer slot)
2959{ 2958{
2960 return cdr (slot); 2959 return cdr (slot);
2961} 2960}
2962 2961
2963/* ========== Evaluation Cycle ========== */ 2962/* ========== Evaluation Cycle ========== */
2964 2963
2965static pointer 2964static int
2966xError_1 (SCHEME_P_ const char *s, pointer a) 2965xError_1 (SCHEME_P_ const char *s, pointer a)
2967{ 2966{
2968#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
2969 pointer x; 2968 pointer x;
2970 pointer hdl = SCHEME_V->ERROR_HOOK; 2969 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3005 code = cons (mk_string (SCHEME_A_ s), code); 3004 code = cons (mk_string (SCHEME_A_ s), code);
3006 setimmutable (car (code)); 3005 setimmutable (car (code));
3007 SCHEME_V->code = cons (slot_value_in_env (x), code); 3006 SCHEME_V->code = cons (slot_value_in_env (x), code);
3008 SCHEME_V->op = OP_EVAL; 3007 SCHEME_V->op = OP_EVAL;
3009 3008
3010 return S_T; 3009 return 0;
3011 } 3010 }
3012#endif 3011#endif
3013 3012
3014 if (a) 3013 if (a)
3015 SCHEME_V->args = cons (a, NIL); 3014 SCHEME_V->args = cons (a, NIL);
… …
3017 SCHEME_V->args = NIL; 3016 SCHEME_V->args = NIL;
3018 3017
3019 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3018 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3020 setimmutable (car (SCHEME_V->args)); 3019 setimmutable (car (SCHEME_V->args));
3021 SCHEME_V->op = OP_ERR0; 3020 SCHEME_V->op = OP_ERR0;
3021
3022 return S_T; 3022 return 0;
3023} 3023}
3024 3024
3025#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3025#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3026#define Error_0(s) Error_1 (s, 0) 3026#define Error_0(s) Error_1 (s, 0)
3027 3027
3028/* Too small to turn into function */ 3028/* Too small to turn into function */
3029#define BEGIN do { 3029#define BEGIN do {
3030#define END } while (0) 3030#define END } while (0)
3031#define s_goto(a) BEGIN \ 3031#define s_goto(a) BEGIN \
3032 SCHEME_V->op = a; \ 3032 SCHEME_V->op = a; \
3033 return S_T; END 3033 return 0; END
3034 3034
3035#define s_return(a) return xs_return (SCHEME_A_ a) 3035#define s_return(a) return xs_return (SCHEME_A_ a)
3036 3036
3037#ifndef USE_SCHEME_STACK 3037#ifndef USE_SCHEME_STACK
3038 3038
… …
3063 next_frame = SCHEME_V->dump_base + nframes; 3063 next_frame = SCHEME_V->dump_base + nframes;
3064 3064
3065 next_frame->op = op; 3065 next_frame->op = op;
3066 next_frame->args = args; 3066 next_frame->args = args;
3067 next_frame->envir = SCHEME_V->envir; 3067 next_frame->envir = SCHEME_V->envir;
3068 next_frame->code = code; 3068 next_frame->code = code;
3069 3069
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3071}
3072 3072
3073static pointer 3073static int
3074xs_return (SCHEME_P_ pointer a) 3074xs_return (SCHEME_P_ pointer a)
3075{ 3075{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3077 struct dump_stack_frame *frame;
3078 3078
3079 SCHEME_V->value = a; 3079 SCHEME_V->value = a;
3080 3080
3081 if (nframes <= 0) 3081 if (nframes <= 0)
3082 return NIL; 3082 return -1;
3083 3083
3084 frame = &SCHEME_V->dump_base[--nframes]; 3084 frame = &SCHEME_V->dump_base[--nframes];
3085 SCHEME_V->op = frame->op; 3085 SCHEME_V->op = frame->op;
3086 SCHEME_V->args = frame->args; 3086 SCHEME_V->args = frame->args;
3087 SCHEME_V->envir = frame->envir; 3087 SCHEME_V->envir = frame->envir;
3088 SCHEME_V->code = frame->code; 3088 SCHEME_V->code = frame->code;
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3090
3091 return S_T; 3091 return 0;
3092} 3092}
3093 3093
3094static INLINE void 3094ecb_inline void
3095dump_stack_reset (SCHEME_P) 3095dump_stack_reset (SCHEME_P)
3096{ 3096{
3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3098 SCHEME_V->dump = (pointer)+0; 3098 SCHEME_V->dump = (pointer)+0;
3099} 3099}
3100 3100
3101static INLINE void 3101ecb_inline void
3102dump_stack_initialize (SCHEME_P) 3102dump_stack_initialize (SCHEME_P)
3103{ 3103{
3104 SCHEME_V->dump_size = 0; 3104 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3105 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3106 dump_stack_reset (SCHEME_A);
… …
3159 int i = 0; 3159 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3160 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3161
3162 while (cont != NIL) 3162 while (cont != NIL)
3163 { 3163 {
3164 frame->op = ivalue (car (cont)); cont = cdr (cont); 3164 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3165 frame->args = car (cont) ; cont = cdr (cont); 3165 frame->args = car (cont) ; cont = cdr (cont);
3166 frame->envir = car (cont) ; cont = cdr (cont); 3166 frame->envir = car (cont) ; cont = cdr (cont);
3167 frame->code = car (cont) ; cont = cdr (cont); 3167 frame->code = car (cont) ; cont = cdr (cont);
3168 3168
3169 ++frame; 3169 ++frame;
3170 ++i; 3170 ++i;
3171 } 3171 }
3172 3172
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3173 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3174}
3175 3175
3176#else 3176#else
3177 3177
3178static INLINE void 3178ecb_inline void
3179dump_stack_reset (SCHEME_P) 3179dump_stack_reset (SCHEME_P)
3180{ 3180{
3181 SCHEME_V->dump = NIL; 3181 SCHEME_V->dump = NIL;
3182} 3182}
3183 3183
3184static INLINE void 3184ecb_inline void
3185dump_stack_initialize (SCHEME_P) 3185dump_stack_initialize (SCHEME_P)
3186{ 3186{
3187 dump_stack_reset (SCHEME_A); 3187 dump_stack_reset (SCHEME_A);
3188} 3188}
3189 3189
… …
3191dump_stack_free (SCHEME_P) 3191dump_stack_free (SCHEME_P)
3192{ 3192{
3193 SCHEME_V->dump = NIL; 3193 SCHEME_V->dump = NIL;
3194} 3194}
3195 3195
3196static pointer 3196static int
3197xs_return (SCHEME_P_ pointer a) 3197xs_return (SCHEME_P_ pointer a)
3198{ 3198{
3199 pointer dump = SCHEME_V->dump; 3199 pointer dump = SCHEME_V->dump;
3200 3200
3201 SCHEME_V->value = a; 3201 SCHEME_V->value = a;
3202 3202
3203 if (dump == NIL) 3203 if (dump == NIL)
3204 return NIL; 3204 return -1;
3205 3205
3206 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3206 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3207 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3209 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3210 3210
3211 SCHEME_V->dump = dump; 3211 SCHEME_V->dump = dump;
3212 3212
3213 return S_T; 3213 return 0;
3214} 3214}
3215 3215
3216static void 3216static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3218{
… …
3243 3243
3244#endif 3244#endif
3245 3245
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3247
3248static pointer 3248static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3249opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3250{
3251 pointer args = SCHEME_V->args;
3251 pointer x, y; 3252 pointer x, y;
3252 3253
3253 switch (op) 3254 switch (op)
3254 { 3255 {
3255 case OP_LOAD: /* load */ 3256 case OP_LOAD: /* load */
3256 if (file_interactive (SCHEME_A)) 3257 if (file_interactive (SCHEME_A))
3257 { 3258 {
3258 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3259 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3260 } 3261 }
3261 3262
3262 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3263 if (!file_push (SCHEME_A_ strvalue (car (args))))
3263 Error_1 ("unable to open", car (SCHEME_V->args)); 3264 Error_1 ("unable to open", car (args));
3264 else 3265 else
3265 { 3266 {
3266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3267 s_goto (OP_T0LVL); 3268 s_goto (OP_T0LVL);
3268 } 3269 }
… …
3342 case OP_EVAL: /* main part of evaluation */ 3343 case OP_EVAL: /* main part of evaluation */
3343#if USE_TRACING 3344#if USE_TRACING
3344 if (SCHEME_V->tracing) 3345 if (SCHEME_V->tracing)
3345 { 3346 {
3346 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3347 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3347 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3348 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3348 SCHEME_V->args = SCHEME_V->code; 3349 SCHEME_V->args = SCHEME_V->code;
3349 putstr (SCHEME_A_ "\nEval: "); 3350 putstr (SCHEME_A_ "\nEval: ");
3350 s_goto (OP_P0LIST); 3351 s_goto (OP_P0LIST);
3351 } 3352 }
3352 3353
… …
3396 SCHEME_V->code = cdr (SCHEME_V->code); 3397 SCHEME_V->code = cdr (SCHEME_V->code);
3397 s_goto (OP_E1ARGS); 3398 s_goto (OP_E1ARGS);
3398 } 3399 }
3399 3400
3400 case OP_E1ARGS: /* eval arguments */ 3401 case OP_E1ARGS: /* eval arguments */
3401 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3402 args = cons (SCHEME_V->value, args);
3402 3403
3403 if (is_pair (SCHEME_V->code)) /* continue */ 3404 if (is_pair (SCHEME_V->code)) /* continue */
3404 { 3405 {
3405 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3406 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3406 SCHEME_V->code = car (SCHEME_V->code); 3407 SCHEME_V->code = car (SCHEME_V->code);
3407 SCHEME_V->args = NIL; 3408 SCHEME_V->args = NIL;
3408 s_goto (OP_EVAL); 3409 s_goto (OP_EVAL);
3409 } 3410 }
3410 else /* end */ 3411 else /* end */
3411 { 3412 {
3412 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3413 args = reverse_in_place (SCHEME_A_ NIL, args);
3413 SCHEME_V->code = car (SCHEME_V->args); 3414 SCHEME_V->code = car (args);
3414 SCHEME_V->args = cdr (SCHEME_V->args); 3415 SCHEME_V->args = cdr (args);
3415 s_goto (OP_APPLY); 3416 s_goto (OP_APPLY);
3416 } 3417 }
3417 3418
3418#if USE_TRACING 3419#if USE_TRACING
3419 3420
3420 case OP_TRACING: 3421 case OP_TRACING:
3421 { 3422 {
3422 int tr = SCHEME_V->tracing; 3423 int tr = SCHEME_V->tracing;
3423 3424
3424 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3425 SCHEME_V->tracing = ivalue_unchecked (car (args));
3425 s_return (mk_integer (SCHEME_A_ tr)); 3426 s_return (mk_integer (SCHEME_A_ tr));
3426 } 3427 }
3427 3428
3428#endif 3429#endif
3429 3430
3430 case OP_APPLY: /* apply 'code' to 'args' */ 3431 case OP_APPLY: /* apply 'code' to 'args' */
3431#if USE_TRACING 3432#if USE_TRACING
3432 if (SCHEME_V->tracing) 3433 if (SCHEME_V->tracing)
3433 { 3434 {
3434 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3435 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3435 SCHEME_V->print_flag = 1; 3436 SCHEME_V->print_flag = 1;
3436 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3437 /* args=cons(SCHEME_V->code,args); */
3437 putstr (SCHEME_A_ "\nApply to: "); 3438 putstr (SCHEME_A_ "\nApply to: ");
3438 s_goto (OP_P0LIST); 3439 s_goto (OP_P0LIST);
3439 } 3440 }
3440 3441
3441 /* fall through */ 3442 /* fall through */
3442 3443
3443 case OP_REAL_APPLY: 3444 case OP_REAL_APPLY:
3444#endif 3445#endif
3445 if (is_proc (SCHEME_V->code)) 3446 if (is_proc (SCHEME_V->code))
3446 {
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 }
3449 else if (is_foreign (SCHEME_V->code)) 3448 else if (is_foreign (SCHEME_V->code))
3450 { 3449 {
3451 /* Keep nested calls from GC'ing the arglist */ 3450 /* Keep nested calls from GC'ing the arglist */
3452 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3451 push_recent_alloc (SCHEME_A_ args, NIL);
3453 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3454 3453
3455 s_return (x); 3454 s_return (x);
3456 } 3455 }
3457 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3458 { 3457 {
3459 /* Should not accept promise */ 3458 /* Should not accept promise */
3460 /* make environment */ 3459 /* make environment */
3461 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3460 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3462 3461
3463 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3462 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3464 { 3463 {
3465 if (y == NIL) 3464 if (y == NIL)
3466 Error_0 ("not enough arguments"); 3465 Error_0 ("not enough arguments");
3467 else 3466 else
3468 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3467 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3486 s_goto (OP_BEGIN); 3485 s_goto (OP_BEGIN);
3487 } 3486 }
3488 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3487 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3489 { 3488 {
3490 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3489 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3491 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3490 s_return (args != NIL ? car (args) : NIL);
3492 } 3491 }
3493 else 3492 else
3494 Error_0 ("illegal function"); 3493 Error_0 ("illegal function");
3495 3494
3496 case OP_DOMACRO: /* do macro */ 3495 case OP_DOMACRO: /* do macro */
… …
3505 { 3504 {
3506 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3507 3506
3508 if (f != NIL) 3507 if (f != NIL)
3509 { 3508 {
3510 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3509 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3511 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3510 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3512 SCHEME_V->code = slot_value_in_env (f); 3511 SCHEME_V->code = slot_value_in_env (f);
3513 s_goto (OP_APPLY); 3512 s_goto (OP_APPLY);
3514 } 3513 }
3515 3514
… …
3526 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3527 3526
3528#endif 3527#endif
3529 3528
3530 case OP_MKCLOSURE: /* make-closure */ 3529 case OP_MKCLOSURE: /* make-closure */
3531 x = car (SCHEME_V->args); 3530 x = car (args);
3532 3531
3533 if (car (x) == SCHEME_V->LAMBDA) 3532 if (car (x) == SCHEME_V->LAMBDA)
3534 x = cdr (x); 3533 x = cdr (x);
3535 3534
3536 if (cdr (SCHEME_V->args) == NIL) 3535 if (cdr (args) == NIL)
3537 y = SCHEME_V->envir; 3536 y = SCHEME_V->envir;
3538 else 3537 else
3539 y = cadr (SCHEME_V->args); 3538 y = cadr (args);
3540 3539
3541 s_return (mk_closure (SCHEME_A_ x, y)); 3540 s_return (mk_closure (SCHEME_A_ x, y));
3542 3541
3543 case OP_QUOTE: /* quote */ 3542 case OP_QUOTE: /* quote */
3544 s_return (car (SCHEME_V->code)); 3543 s_return (car (SCHEME_V->code));
… …
3576 3575
3577 3576
3578 case OP_DEFP: /* defined? */ 3577 case OP_DEFP: /* defined? */
3579 x = SCHEME_V->envir; 3578 x = SCHEME_V->envir;
3580 3579
3581 if (cdr (SCHEME_V->args) != NIL) 3580 if (cdr (args) != NIL)
3582 x = cadr (SCHEME_V->args); 3581 x = cadr (args);
3583 3582
3584 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3583 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3585 3584
3586 case OP_SET0: /* set! */ 3585 case OP_SET0: /* set! */
3587 if (is_immutable (car (SCHEME_V->code))) 3586 if (is_immutable (car (SCHEME_V->code)))
3588 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3587 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3589 3588
… …
3620 3619
3621 case OP_IF1: /* if */ 3620 case OP_IF1: /* if */
3622 if (is_true (SCHEME_V->value)) 3621 if (is_true (SCHEME_V->value))
3623 SCHEME_V->code = car (SCHEME_V->code); 3622 SCHEME_V->code = car (SCHEME_V->code);
3624 else 3623 else
3625 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3624 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3626
3627 * car(NIL) = NIL */
3628 s_goto (OP_EVAL); 3625 s_goto (OP_EVAL);
3629 3626
3630 case OP_LET0: /* let */ 3627 case OP_LET0: /* let */
3631 SCHEME_V->args = NIL; 3628 SCHEME_V->args = NIL;
3632 SCHEME_V->value = SCHEME_V->code; 3629 SCHEME_V->value = SCHEME_V->code;
3633 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3630 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3634 s_goto (OP_LET1); 3631 s_goto (OP_LET1);
3635 3632
3636 case OP_LET1: /* let (calculate parameters) */ 3633 case OP_LET1: /* let (calculate parameters) */
3637 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3634 args = cons (SCHEME_V->value, args);
3638 3635
3639 if (is_pair (SCHEME_V->code)) /* continue */ 3636 if (is_pair (SCHEME_V->code)) /* continue */
3640 { 3637 {
3641 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3638 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3642 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3639 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3643 3640
3644 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3641 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3645 SCHEME_V->code = cadar (SCHEME_V->code); 3642 SCHEME_V->code = cadar (SCHEME_V->code);
3646 SCHEME_V->args = NIL; 3643 SCHEME_V->args = NIL;
3647 s_goto (OP_EVAL); 3644 s_goto (OP_EVAL);
3648 } 3645 }
3649 else /* end */ 3646 else /* end */
3650 { 3647 {
3651 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3648 args = reverse_in_place (SCHEME_A_ NIL, args);
3652 SCHEME_V->code = car (SCHEME_V->args); 3649 SCHEME_V->code = car (args);
3653 SCHEME_V->args = cdr (SCHEME_V->args); 3650 SCHEME_V->args = cdr (args);
3654 s_goto (OP_LET2); 3651 s_goto (OP_LET2);
3655 } 3652 }
3656 3653
3657 case OP_LET2: /* let */ 3654 case OP_LET2: /* let */
3658 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3659 3656
3660 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3657 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3661 y != NIL; x = cdr (x), y = cdr (y)) 3658 y != NIL; x = cdr (x), y = cdr (y))
3662 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3659 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3663 3660
3664 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3661 if (is_symbol (car (SCHEME_V->code))) /* named let */
3665 { 3662 {
3666 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3663 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3667 { 3664 {
3668 if (!is_pair (x)) 3665 if (!is_pair (x))
3669 Error_1 ("Bad syntax of binding in let :", x); 3666 Error_1 ("Bad syntax of binding in let :", x);
3670 3667
3671 if (!is_list (SCHEME_A_ car (x))) 3668 if (!is_list (SCHEME_A_ car (x)))
3672 Error_1 ("Bad syntax of binding in let :", car (x)); 3669 Error_1 ("Bad syntax of binding in let :", car (x));
3673 3670
3674 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3671 args = cons (caar (x), args);
3675 } 3672 }
3676 3673
3677 x =
3678 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3674 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3679 SCHEME_V->envir); 3675 SCHEME_V->envir);
3680 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3676 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3681 SCHEME_V->code = cddr (SCHEME_V->code); 3677 SCHEME_V->code = cddr (SCHEME_V->code);
3682 SCHEME_V->args = NIL;
3683 } 3678 }
3684 else 3679 else
3685 { 3680 {
3686 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3682 }
3683
3687 SCHEME_V->args = NIL; 3684 SCHEME_V->args = NIL;
3688 }
3689
3690 s_goto (OP_BEGIN); 3685 s_goto (OP_BEGIN);
3691 3686
3692 case OP_LET0AST: /* let* */ 3687 case OP_LET0AST: /* let* */
3693 if (car (SCHEME_V->code) == NIL) 3688 if (car (SCHEME_V->code) == NIL)
3694 { 3689 {
… …
3712 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3707 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3713 SCHEME_V->code = cdr (SCHEME_V->code); 3708 SCHEME_V->code = cdr (SCHEME_V->code);
3714 3709
3715 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3716 { 3711 {
3717 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3712 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3718 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3719 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3720 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3721 } 3716 }
3722 else /* end */ 3717 else /* end */
3723 { 3718 {
3724 SCHEME_V->code = SCHEME_V->args; 3719 SCHEME_V->code = args;
3725 SCHEME_V->args = NIL; 3720 SCHEME_V->args = NIL;
3726 s_goto (OP_BEGIN); 3721 s_goto (OP_BEGIN);
3727 } 3722 }
3728 3723
3729 case OP_LET0REC: /* letrec */ 3724 case OP_LET0REC: /* letrec */
… …
3732 SCHEME_V->value = SCHEME_V->code; 3727 SCHEME_V->value = SCHEME_V->code;
3733 SCHEME_V->code = car (SCHEME_V->code); 3728 SCHEME_V->code = car (SCHEME_V->code);
3734 s_goto (OP_LET1REC); 3729 s_goto (OP_LET1REC);
3735 3730
3736 case OP_LET1REC: /* letrec (calculate parameters) */ 3731 case OP_LET1REC: /* letrec (calculate parameters) */
3737 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3732 args = cons (SCHEME_V->value, args);
3738 3733
3739 if (is_pair (SCHEME_V->code)) /* continue */ 3734 if (is_pair (SCHEME_V->code)) /* continue */
3740 { 3735 {
3741 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3736 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3742 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3737 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3743 3738
3744 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3739 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3745 SCHEME_V->code = cadar (SCHEME_V->code); 3740 SCHEME_V->code = cadar (SCHEME_V->code);
3746 SCHEME_V->args = NIL; 3741 SCHEME_V->args = NIL;
3747 s_goto (OP_EVAL); 3742 s_goto (OP_EVAL);
3748 } 3743 }
3749 else /* end */ 3744 else /* end */
3750 { 3745 {
3751 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3746 args = reverse_in_place (SCHEME_A_ NIL, args);
3752 SCHEME_V->code = car (SCHEME_V->args); 3747 SCHEME_V->code = car (args);
3753 SCHEME_V->args = cdr (SCHEME_V->args); 3748 SCHEME_V->args = cdr (args);
3754 s_goto (OP_LET2REC); 3749 s_goto (OP_LET2REC);
3755 } 3750 }
3756 3751
3757 case OP_LET2REC: /* letrec */ 3752 case OP_LET2REC: /* letrec */
3758 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3753 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3759 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3754 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3760 3755
3761 SCHEME_V->code = cdr (SCHEME_V->code); 3756 SCHEME_V->code = cdr (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3757 SCHEME_V->args = NIL;
3763 s_goto (OP_BEGIN); 3758 s_goto (OP_BEGIN);
… …
3849 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3850 SCHEME_V->code = car (SCHEME_V->code); 3845 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3846 s_goto (OP_EVAL);
3852 3847
3853 case OP_C1STREAM: /* cons-stream */ 3848 case OP_C1STREAM: /* cons-stream */
3854 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3849 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3855 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3850 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3856 set_typeflag (x, T_PROMISE); 3851 set_typeflag (x, T_PROMISE);
3857 s_return (cons (SCHEME_V->args, x)); 3852 s_return (cons (args, x));
3858 3853
3859 case OP_MACRO0: /* macro */ 3854 case OP_MACRO0: /* macro */
3860 if (is_pair (car (SCHEME_V->code))) 3855 if (is_pair (car (SCHEME_V->code)))
3861 { 3856 {
3862 x = caar (SCHEME_V->code); 3857 x = caar (SCHEME_V->code);
… …
3895 { 3890 {
3896 if (!is_pair (y = caar (x))) 3891 if (!is_pair (y = caar (x)))
3897 break; 3892 break;
3898 3893
3899 for (; y != NIL; y = cdr (y)) 3894 for (; y != NIL; y = cdr (y))
3900 {
3901 if (eqv (car (y), SCHEME_V->value)) 3895 if (eqv (car (y), SCHEME_V->value))
3902 break; 3896 break;
3903 }
3904 3897
3905 if (y != NIL) 3898 if (y != NIL)
3906 break; 3899 break;
3907 } 3900 }
3908 3901
… …
3928 s_goto (OP_BEGIN); 3921 s_goto (OP_BEGIN);
3929 else 3922 else
3930 s_return (NIL); 3923 s_return (NIL);
3931 3924
3932 case OP_PAPPLY: /* apply */ 3925 case OP_PAPPLY: /* apply */
3933 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3934 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3935 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3928 /*SCHEME_V->args = cadr(args); */
3936 s_goto (OP_APPLY); 3929 s_goto (OP_APPLY);
3937 3930
3938 case OP_PEVAL: /* eval */ 3931 case OP_PEVAL: /* eval */
3939 if (cdr (SCHEME_V->args) != NIL) 3932 if (cdr (args) != NIL)
3940 SCHEME_V->envir = cadr (SCHEME_V->args); 3933 SCHEME_V->envir = cadr (args);
3941 3934
3942 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
3943 s_goto (OP_EVAL); 3936 s_goto (OP_EVAL);
3944 3937
3945 case OP_CONTINUATION: /* call-with-current-continuation */ 3938 case OP_CONTINUATION: /* call-with-current-continuation */
3946 SCHEME_V->code = car (SCHEME_V->args); 3939 SCHEME_V->code = car (args);
3947 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3940 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3948 s_goto (OP_APPLY); 3941 s_goto (OP_APPLY);
3949 } 3942 }
3950 3943
3951 return S_T; 3944 if (USE_ERROR_CHECKING) abort ();
3952} 3945}
3953 3946
3954static pointer 3947static int
3955opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3948opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3956{ 3949{
3957 pointer x; 3950 pointer args = SCHEME_V->args;
3951 pointer x = car (args);
3958 num v; 3952 num v;
3959 3953
3954 switch (op)
3955 {
3960#if USE_MATH 3956#if USE_MATH
3961 RVALUE dd;
3962#endif
3963
3964 switch (op)
3965 {
3966#if USE_MATH
3967
3968 case OP_INEX2EX: /* inexact->exact */ 3957 case OP_INEX2EX: /* inexact->exact */
3969 x = car (SCHEME_V->args); 3958 {
3970
3971 if (num_is_integer (x)) 3959 if (is_integer (x))
3972 s_return (x); 3960 s_return (x);
3973 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3961
3962 RVALUE r = rvalue_unchecked (x);
3963
3964 if (r == (RVALUE)(IVALUE)r)
3974 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3975 else 3966 else
3976 Error_1 ("inexact->exact: not integral:", x); 3967 Error_1 ("inexact->exact: not integral:", x);
3968 }
3977 3969
3978 case OP_EXP:
3979 x = car (SCHEME_V->args);
3980 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3970 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3981
3982 case OP_LOG:
3983 x = car (SCHEME_V->args);
3984 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3971 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3985
3986 case OP_SIN:
3987 x = car (SCHEME_V->args);
3988 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3972 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3989
3990 case OP_COS:
3991 x = car (SCHEME_V->args);
3992 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3973 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3993
3994 case OP_TAN:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3974 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3997
3998 case OP_ASIN:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3975 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4001
4002 case OP_ACOS:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4005 3977
4006 case OP_ATAN: 3978 case OP_ATAN:
4007 x = car (SCHEME_V->args);
4008
4009 if (cdr (SCHEME_V->args) == NIL) 3979 if (cdr (args) == NIL)
4010 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4011 else 3981 else
4012 { 3982 {
4013 pointer y = cadr (SCHEME_V->args); 3983 pointer y = cadr (args);
4014
4015 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4016 } 3985 }
4017 3986
4018 case OP_SQRT: 3987 case OP_SQRT:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4021 3989
4022 case OP_EXPT: 3990 case OP_EXPT:
4023 { 3991 {
4024 RVALUE result; 3992 RVALUE result;
4025 int real_result = 1; 3993 int real_result = 1;
4026 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4027 3995
4028 x = car (SCHEME_V->args);
4029
4030 if (num_is_integer (x) && num_is_integer (y)) 3996 if (is_integer (x) && is_integer (y))
4031 real_result = 0; 3997 real_result = 0;
4032 3998
4033 /* This 'if' is an R5RS compatibility fix. */ 3999 /* This 'if' is an R5RS compatibility fix. */
4034 /* NOTE: Remove this 'if' fix for R6RS. */ 4000 /* NOTE: Remove this 'if' fix for R6RS. */
4035 if (rvalue (x) == 0 && rvalue (y) < 0) 4001 if (rvalue (x) == 0 && rvalue (y) < 0)
4036 result = 0.0; 4002 result = 0;
4037 else 4003 else
4038 result = pow (rvalue (x), rvalue (y)); 4004 result = pow (rvalue (x), rvalue (y));
4039 4005
4040 /* Before returning integer result make sure we can. */ 4006 /* Before returning integer result make sure we can. */
4041 /* If the test fails, result is too big for integer. */ 4007 /* If the test fails, result is too big for integer. */
4042 if (!real_result) 4008 if (!real_result)
4043 { 4009 {
4044 long result_as_long = (long) result; 4010 long result_as_long = result;
4045 4011
4046 if (result != (RVALUE) result_as_long) 4012 if (result != result_as_long)
4047 real_result = 1; 4013 real_result = 1;
4048 } 4014 }
4049 4015
4050 if (real_result) 4016 if (real_result)
4051 s_return (mk_real (SCHEME_A_ result)); 4017 s_return (mk_real (SCHEME_A_ result));
4052 else 4018 else
4053 s_return (mk_integer (SCHEME_A_ result)); 4019 s_return (mk_integer (SCHEME_A_ result));
4054 } 4020 }
4055 4021
4056 case OP_FLOOR:
4057 x = car (SCHEME_V->args);
4058 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4022 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4059
4060 case OP_CEILING:
4061 x = car (SCHEME_V->args);
4062 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4063 4024
4064 case OP_TRUNCATE: 4025 case OP_TRUNCATE:
4065 { 4026 {
4066 RVALUE rvalue_of_x; 4027 RVALUE n = rvalue (x);
4067
4068 x = car (SCHEME_V->args);
4069 rvalue_of_x = rvalue (x);
4070
4071 if (rvalue_of_x > 0)
4072 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4028 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4073 else
4074 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4075 } 4029 }
4076 4030
4077 case OP_ROUND: 4031 case OP_ROUND:
4078 x = car (SCHEME_V->args);
4079
4080 if (num_is_integer (x)) 4032 if (is_integer (x))
4081 s_return (x); 4033 s_return (x);
4082 4034
4083 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4084#endif 4036#endif
4085 4037
4086 case OP_ADD: /* + */ 4038 case OP_ADD: /* + */
4087 v = num_zero; 4039 v = num_zero;
4088 4040
4089 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4041 for (x = args; x != NIL; x = cdr (x))
4090 v = num_op ('+', v, nvalue (car (x))); 4042 v = num_op (NUM_ADD, v, nvalue (car (x)));
4091 4043
4092 s_return (mk_number (SCHEME_A_ v)); 4044 s_return (mk_number (SCHEME_A_ v));
4093 4045
4094 case OP_MUL: /* * */ 4046 case OP_MUL: /* * */
4095 v = num_one; 4047 v = num_one;
4096 4048
4097 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4049 for (x = args; x != NIL; x = cdr (x))
4098 v = num_op ('+', v, nvalue (car (x))); 4050 v = num_op (NUM_MUL, v, nvalue (car (x)));
4099 4051
4100 s_return (mk_number (SCHEME_A_ v)); 4052 s_return (mk_number (SCHEME_A_ v));
4101 4053
4102 case OP_SUB: /* - */ 4054 case OP_SUB: /* - */
4103 if (cdr (SCHEME_V->args) == NIL) 4055 if (cdr (args) == NIL)
4104 { 4056 {
4105 x = SCHEME_V->args; 4057 x = args;
4106 v = num_zero; 4058 v = num_zero;
4107 } 4059 }
4108 else 4060 else
4109 { 4061 {
4110 x = cdr (SCHEME_V->args); 4062 x = cdr (args);
4111 v = nvalue (car (SCHEME_V->args)); 4063 v = nvalue (car (args));
4112 } 4064 }
4113 4065
4114 for (; x != NIL; x = cdr (x)) 4066 for (; x != NIL; x = cdr (x))
4115 v = num_op ('+', v, nvalue (car (x))); 4067 v = num_op (NUM_SUB, v, nvalue (car (x)));
4116 4068
4117 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4118 4070
4119 case OP_DIV: /* / */ 4071 case OP_DIV: /* / */
4120 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4121 { 4073 {
4122 x = SCHEME_V->args; 4074 x = args;
4123 v = num_one; 4075 v = num_one;
4124 } 4076 }
4125 else 4077 else
4126 { 4078 {
4127 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4128 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4129 } 4081 }
4130 4082
4131 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4132 {
4133 if (!is_zero_rvalue (rvalue (car (x)))) 4084 if (!is_zero_rvalue (rvalue (car (x))))
4134 v = num_div (v, nvalue (car (x))); 4085 v = num_div (v, nvalue (car (x)));
4135 else 4086 else
4136 Error_0 ("/: division by zero"); 4087 Error_0 ("/: division by zero");
4137 }
4138 4088
4139 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4140 4090
4141 case OP_INTDIV: /* quotient */ 4091 case OP_INTDIV: /* quotient */
4142 if (cdr (SCHEME_V->args) == NIL) 4092 if (cdr (args) == NIL)
4143 { 4093 {
4144 x = SCHEME_V->args; 4094 x = args;
4145 v = num_one; 4095 v = num_one;
4146 } 4096 }
4147 else 4097 else
4148 { 4098 {
4149 x = cdr (SCHEME_V->args); 4099 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4100 v = nvalue (car (args));
4151 } 4101 }
4152 4102
4153 for (; x != NIL; x = cdr (x)) 4103 for (; x != NIL; x = cdr (x))
4154 { 4104 {
4155 if (ivalue (car (x)) != 0) 4105 if (ivalue (car (x)) != 0)
4156 v = num_op ('/', v, nvalue (car (x))); 4106 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4157 else 4107 else
4158 Error_0 ("quotient: division by zero"); 4108 Error_0 ("quotient: division by zero");
4159 } 4109 }
4160 4110
4161 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4162 4112
4163 case OP_REM: /* remainder */ 4113 case OP_REM: /* remainder */
4164 v = nvalue (car (SCHEME_V->args)); 4114 v = nvalue (x);
4165 4115
4166 if (ivalue (cadr (SCHEME_V->args)) != 0) 4116 if (ivalue (cadr (args)) != 0)
4167 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4117 v = num_rem (v, nvalue (cadr (args)));
4168 else 4118 else
4169 Error_0 ("remainder: division by zero"); 4119 Error_0 ("remainder: division by zero");
4170 4120
4171 s_return (mk_number (SCHEME_A_ v)); 4121 s_return (mk_number (SCHEME_A_ v));
4172 4122
4173 case OP_MOD: /* modulo */ 4123 case OP_MOD: /* modulo */
4174 v = nvalue (car (SCHEME_V->args)); 4124 v = nvalue (x);
4175 4125
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4126 if (ivalue (cadr (args)) != 0)
4177 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4127 v = num_mod (v, nvalue (cadr (args)));
4178 else 4128 else
4179 Error_0 ("modulo: division by zero"); 4129 Error_0 ("modulo: division by zero");
4180 4130
4181 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4182 4132
4183 case OP_CAR: /* car */ 4133 case OP_CAR: /* car */
4184 s_return (caar (SCHEME_V->args)); 4134 s_return (caar (args));
4185 4135
4186 case OP_CDR: /* cdr */ 4136 case OP_CDR: /* cdr */
4187 s_return (cdar (SCHEME_V->args)); 4137 s_return (cdar (args));
4188 4138
4189 case OP_CONS: /* cons */ 4139 case OP_CONS: /* cons */
4190 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4140 set_cdr (args, cadr (args));
4191 s_return (SCHEME_V->args); 4141 s_return (args);
4192 4142
4193 case OP_SETCAR: /* set-car! */ 4143 case OP_SETCAR: /* set-car! */
4194 if (!is_immutable (car (SCHEME_V->args))) 4144 if (!is_immutable (x))
4195 { 4145 {
4196 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4146 set_car (x, cadr (args));
4197 s_return (car (SCHEME_V->args)); 4147 s_return (car (args));
4198 } 4148 }
4199 else 4149 else
4200 Error_0 ("set-car!: unable to alter immutable pair"); 4150 Error_0 ("set-car!: unable to alter immutable pair");
4201 4151
4202 case OP_SETCDR: /* set-cdr! */ 4152 case OP_SETCDR: /* set-cdr! */
4203 if (!is_immutable (car (SCHEME_V->args))) 4153 if (!is_immutable (x))
4204 { 4154 {
4205 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4155 set_cdr (x, cadr (args));
4206 s_return (car (SCHEME_V->args)); 4156 s_return (car (args));
4207 } 4157 }
4208 else 4158 else
4209 Error_0 ("set-cdr!: unable to alter immutable pair"); 4159 Error_0 ("set-cdr!: unable to alter immutable pair");
4210 4160
4211 case OP_CHAR2INT: /* char->integer */ 4161 case OP_CHAR2INT: /* char->integer */
4212 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4162 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4213 4163
4214 case OP_INT2CHAR: /* integer->char */ 4164 case OP_INT2CHAR: /* integer->char */
4215 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4165 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4216 4166
4217 case OP_CHARUPCASE: 4167 case OP_CHARUPCASE:
4218 { 4168 {
4219 unsigned char c = ivalue (car (SCHEME_V->args)); 4169 unsigned char c = ivalue_unchecked (x);
4220 c = toupper (c); 4170 c = toupper (c);
4221 s_return (mk_character (SCHEME_A_ c)); 4171 s_return (mk_character (SCHEME_A_ c));
4222 } 4172 }
4223 4173
4224 case OP_CHARDNCASE: 4174 case OP_CHARDNCASE:
4225 { 4175 {
4226 unsigned char c = ivalue (car (SCHEME_V->args)); 4176 unsigned char c = ivalue_unchecked (x);
4227 c = tolower (c); 4177 c = tolower (c);
4228 s_return (mk_character (SCHEME_A_ c)); 4178 s_return (mk_character (SCHEME_A_ c));
4229 } 4179 }
4230 4180
4231 case OP_STR2SYM: /* string->symbol */ 4181 case OP_STR2SYM: /* string->symbol */
4232 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4182 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4233 4183
4234 case OP_STR2ATOM: /* string->atom */ 4184 case OP_STR2ATOM: /* string->atom */
4235 { 4185 {
4236 char *s = strvalue (car (SCHEME_V->args)); 4186 char *s = strvalue (x);
4237 long pf = 0; 4187 long pf = 0;
4238 4188
4239 if (cdr (SCHEME_V->args) != NIL) 4189 if (cdr (args) != NIL)
4240 { 4190 {
4241 /* we know cadr(SCHEME_V->args) is a natural number */ 4191 /* we know cadr(args) is a natural number */
4242 /* see if it is 2, 8, 10, or 16, or error */ 4192 /* see if it is 2, 8, 10, or 16, or error */
4243 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4193 pf = ivalue_unchecked (cadr (args));
4244 4194
4245 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4195 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4246 { 4196 {
4247 /* base is OK */ 4197 /* base is OK */
4248 } 4198 }
4249 else 4199 else
4250 pf = -1; 4200 pf = -1;
4251 } 4201 }
4252 4202
4253 if (pf < 0) 4203 if (pf < 0)
4254 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4204 Error_1 ("string->atom: bad base:", cadr (args));
4255 else if (*s == '#') /* no use of base! */ 4205 else if (*s == '#') /* no use of base! */
4256 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4206 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4257 else 4207 else
4258 { 4208 {
4259 if (pf == 0 || pf == 10) 4209 if (pf == 0 || pf == 10)
… …
4270 } 4220 }
4271 } 4221 }
4272 } 4222 }
4273 4223
4274 case OP_SYM2STR: /* symbol->string */ 4224 case OP_SYM2STR: /* symbol->string */
4275 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4225 x = mk_string (SCHEME_A_ symname (x));
4276 setimmutable (x); 4226 setimmutable (x);
4277 s_return (x); 4227 s_return (x);
4278 4228
4279 case OP_ATOM2STR: /* atom->string */ 4229 case OP_ATOM2STR: /* atom->string */
4280 { 4230 {
4281 long pf = 0; 4231 long pf = 0;
4282 4232
4283 x = car (SCHEME_V->args);
4284
4285 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4286 { 4234 {
4287 /* we know cadr(SCHEME_V->args) is a natural number */ 4235 /* we know cadr(args) is a natural number */
4288 /* see if it is 2, 8, 10, or 16, or error */ 4236 /* see if it is 2, 8, 10, or 16, or error */
4289 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4237 pf = ivalue_unchecked (cadr (args));
4290 4238
4291 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4239 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4292 { 4240 {
4293 /* base is OK */ 4241 /* base is OK */
4294 } 4242 }
4295 else 4243 else
4296 pf = -1; 4244 pf = -1;
4297 } 4245 }
4298 4246
4299 if (pf < 0) 4247 if (pf < 0)
4300 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4248 Error_1 ("atom->string: bad base:", cadr (args));
4301 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4249 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4302 { 4250 {
4303 char *p; 4251 char *p;
4304 int len; 4252 int len;
4305 4253
… …
4310 Error_1 ("atom->string: not an atom:", x); 4258 Error_1 ("atom->string: not an atom:", x);
4311 } 4259 }
4312 4260
4313 case OP_MKSTRING: /* make-string */ 4261 case OP_MKSTRING: /* make-string */
4314 { 4262 {
4315 int fill = ' '; 4263 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4316 int len; 4264 int len = ivalue_unchecked (x);
4317 4265
4318 len = ivalue (car (SCHEME_V->args));
4319
4320 if (cdr (SCHEME_V->args) != NIL)
4321 fill = charvalue (cadr (SCHEME_V->args));
4322
4323 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4266 s_return (mk_empty_string (SCHEME_A_ len, fill));
4324 } 4267 }
4325 4268
4326 case OP_STRLEN: /* string-length */ 4269 case OP_STRLEN: /* string-length */
4327 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4270 s_return (mk_integer (SCHEME_A_ strlength (x)));
4328 4271
4329 case OP_STRREF: /* string-ref */ 4272 case OP_STRREF: /* string-ref */
4330 { 4273 {
4331 char *str; 4274 char *str = strvalue (x);
4332 int index;
4333
4334 str = strvalue (car (SCHEME_V->args));
4335
4336 index = ivalue (cadr (SCHEME_V->args)); 4275 int index = ivalue_unchecked (cadr (args));
4337 4276
4338 if (index >= strlength (car (SCHEME_V->args))) 4277 if (index >= strlength (x))
4339 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4278 Error_1 ("string-ref: out of bounds:", cadr (args));
4340 4279
4341 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4280 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4342 } 4281 }
4343 4282
4344 case OP_STRSET: /* string-set! */ 4283 case OP_STRSET: /* string-set! */
4345 { 4284 {
4346 char *str; 4285 char *str = strvalue (x);
4347 int index; 4286 int index = ivalue_unchecked (cadr (args));
4348 int c; 4287 int c;
4349 4288
4350 if (is_immutable (car (SCHEME_V->args))) 4289 if (is_immutable (x))
4351 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4290 Error_1 ("string-set!: unable to alter immutable string:", x);
4352 4291
4353 str = strvalue (car (SCHEME_V->args));
4354
4355 index = ivalue (cadr (SCHEME_V->args));
4356
4357 if (index >= strlength (car (SCHEME_V->args))) 4292 if (index >= strlength (x))
4358 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4293 Error_1 ("string-set!: out of bounds:", cadr (args));
4359 4294
4360 c = charvalue (caddr (SCHEME_V->args)); 4295 c = charvalue (caddr (args));
4361 4296
4362 str[index] = (char) c; 4297 str[index] = c;
4363 s_return (car (SCHEME_V->args)); 4298 s_return (car (args));
4364 } 4299 }
4365 4300
4366 case OP_STRAPPEND: /* string-append */ 4301 case OP_STRAPPEND: /* string-append */
4367 { 4302 {
4368 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4303 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4369 int len = 0; 4304 int len = 0;
4370 pointer newstr; 4305 pointer newstr;
4371 char *pos; 4306 char *pos;
4372 4307
4373 /* compute needed length for new string */ 4308 /* compute needed length for new string */
4374 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4309 for (x = args; x != NIL; x = cdr (x))
4375 len += strlength (car (x)); 4310 len += strlength (car (x));
4376 4311
4377 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4312 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4378 4313
4379 /* store the contents of the argument strings into the new string */ 4314 /* store the contents of the argument strings into the new string */
4380 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4315 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4381 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4316 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4382 4317
4383 s_return (newstr); 4318 s_return (newstr);
4384 } 4319 }
4385 4320
4386 case OP_SUBSTR: /* substring */ 4321 case OP_SUBSTR: /* substring */
4387 { 4322 {
4388 char *str; 4323 char *str = strvalue (x);
4389 int index0; 4324 int index0 = ivalue_unchecked (cadr (args));
4390 int index1; 4325 int index1;
4391 int len; 4326 int len;
4392 4327
4393 str = strvalue (car (SCHEME_V->args));
4394
4395 index0 = ivalue (cadr (SCHEME_V->args));
4396
4397 if (index0 > strlength (car (SCHEME_V->args))) 4328 if (index0 > strlength (x))
4398 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4329 Error_1 ("substring: start out of bounds:", cadr (args));
4399 4330
4400 if (cddr (SCHEME_V->args) != NIL) 4331 if (cddr (args) != NIL)
4401 { 4332 {
4402 index1 = ivalue (caddr (SCHEME_V->args)); 4333 index1 = ivalue_unchecked (caddr (args));
4403 4334
4404 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4335 if (index1 > strlength (x) || index1 < index0)
4405 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4336 Error_1 ("substring: end out of bounds:", caddr (args));
4406 } 4337 }
4407 else 4338 else
4408 index1 = strlength (car (SCHEME_V->args)); 4339 index1 = strlength (x);
4409 4340
4410 len = index1 - index0; 4341 len = index1 - index0;
4411 x = mk_empty_string (SCHEME_A_ len, ' '); 4342 x = mk_empty_string (SCHEME_A_ len, ' ');
4412 memcpy (strvalue (x), str + index0, len); 4343 memcpy (strvalue (x), str + index0, len);
4413 strvalue (x)[len] = 0; 4344 strvalue (x)[len] = 0;
… …
4417 4348
4418 case OP_VECTOR: /* vector */ 4349 case OP_VECTOR: /* vector */
4419 { 4350 {
4420 int i; 4351 int i;
4421 pointer vec; 4352 pointer vec;
4422 int len = list_length (SCHEME_A_ SCHEME_V->args); 4353 int len = list_length (SCHEME_A_ args);
4423 4354
4424 if (len < 0) 4355 if (len < 0)
4425 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4356 Error_1 ("vector: not a proper list:", args);
4426 4357
4427 vec = mk_vector (SCHEME_A_ len); 4358 vec = mk_vector (SCHEME_A_ len);
4428 4359
4429#if USE_ERROR_CHECKING 4360#if USE_ERROR_CHECKING
4430 if (SCHEME_V->no_memory) 4361 if (SCHEME_V->no_memory)
4431 s_return (S_SINK); 4362 s_return (S_SINK);
4432#endif 4363#endif
4433 4364
4434 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4365 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4435 set_vector_elem (vec, i, car (x)); 4366 vector_set (vec, i, car (x));
4436 4367
4437 s_return (vec); 4368 s_return (vec);
4438 } 4369 }
4439 4370
4440 case OP_MKVECTOR: /* make-vector */ 4371 case OP_MKVECTOR: /* make-vector */
4441 { 4372 {
4442 pointer fill = NIL; 4373 pointer fill = NIL;
4443 int len;
4444 pointer vec; 4374 pointer vec;
4375 int len = ivalue_unchecked (x);
4445 4376
4446 len = ivalue (car (SCHEME_V->args));
4447
4448 if (cdr (SCHEME_V->args) != NIL) 4377 if (cdr (args) != NIL)
4449 fill = cadr (SCHEME_V->args); 4378 fill = cadr (args);
4450 4379
4451 vec = mk_vector (SCHEME_A_ len); 4380 vec = mk_vector (SCHEME_A_ len);
4452 4381
4453#if USE_ERROR_CHECKING 4382#if USE_ERROR_CHECKING
4454 if (SCHEME_V->no_memory) 4383 if (SCHEME_V->no_memory)
4455 s_return (S_SINK); 4384 s_return (S_SINK);
4456#endif 4385#endif
4457 4386
4458 if (fill != NIL) 4387 if (fill != NIL)
4459 fill_vector (vec, fill); 4388 fill_vector (vec, 0, fill);
4460 4389
4461 s_return (vec); 4390 s_return (vec);
4462 } 4391 }
4463 4392
4464 case OP_VECLEN: /* vector-length */ 4393 case OP_VECLEN: /* vector-length */
4465 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4394 s_return (mk_integer (SCHEME_A_ veclength (x)));
4466 4395
4467 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4468 { 4397 {
4469 int index;
4470
4471 index = ivalue (cadr (SCHEME_V->args)); 4398 int index = ivalue_unchecked (cadr (args));
4472 4399
4473 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4474 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4475 4402
4476 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_get (x, index));
4477 } 4404 }
4478 4405
4479 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4480 { 4407 {
4481 int index; 4408 int index = ivalue_unchecked (cadr (args));
4482 4409
4483 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4484 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4485 4412
4486 index = ivalue (cadr (SCHEME_V->args));
4487
4488 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4489 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4490 4415
4491 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4416 vector_set (x, index, caddr (args));
4492 s_return (car (SCHEME_V->args)); 4417 s_return (x);
4493 } 4418 }
4494 } 4419 }
4495 4420
4496 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4497} 4422}
4498 4423
4499INTERFACE int 4424static int
4500is_list (SCHEME_P_ pointer a) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4501{ 4426{
4502 return list_length (SCHEME_A_ a) >= 0; 4427 pointer x = SCHEME_V->args;
4503}
4504 4428
4505/* Result is: 4429 for (;;)
4506 proper list: length
4507 circular list: -1
4508 not even a pair: -2
4509 dotted list: -2 minus length before dot
4510*/
4511INTERFACE int
4512list_length (SCHEME_P_ pointer a)
4513{
4514 int i = 0;
4515 pointer slow, fast;
4516
4517 slow = fast = a;
4518
4519 while (1)
4520 { 4430 {
4431 num v = nvalue (car (x));
4432 x = cdr (x);
4433
4521 if (fast == NIL) 4434 if (x == NIL)
4522 return i; 4435 break;
4523 4436
4524 if (!is_pair (fast)) 4437 int r = num_cmp (v, nvalue (car (x)));
4525 return -2 - i;
4526 4438
4527 fast = cdr (fast); 4439 switch (op)
4528 ++i;
4529
4530 if (fast == NIL)
4531 return i;
4532
4533 if (!is_pair (fast))
4534 return -2 - i;
4535
4536 ++i;
4537 fast = cdr (fast);
4538
4539 /* Safe because we would have already returned if `fast'
4540 encountered a non-pair. */
4541 slow = cdr (slow);
4542
4543 if (fast == slow)
4544 { 4440 {
4545 /* the fast pointer has looped back around and caught up 4441 case OP_NUMEQ: r = r == 0; break;
4546 with the slow pointer, hence the structure is circular, 4442 case OP_LESS: r = r < 0; break;
4547 not of finite length, and therefore not a list */ 4443 case OP_GRE: r = r > 0; break;
4548 return -1; 4444 case OP_LEQ: r = r <= 0; break;
4445 case OP_GEQ: r = r >= 0; break;
4549 } 4446 }
4550 }
4551}
4552 4447
4448 if (!r)
4449 s_return (S_F);
4450 }
4451
4452 s_return (S_T);
4453}
4454
4553static pointer 4455static int
4554opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4457{
4556 pointer x; 4458 pointer args = SCHEME_V->args;
4557 num v; 4459 pointer a = car (args);
4558 int (*comp_func) (num, num); 4460 pointer d = cdr (args);
4461 int r;
4559 4462
4560 switch (op) 4463 switch (op)
4561 { 4464 {
4562 case OP_NOT: /* not */ 4465 case OP_NOT: /* not */ r = is_false (a) ; break;
4563 s_retbool (is_false (car (SCHEME_V->args))); 4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4564 4475
4565 case OP_BOOLP: /* boolean? */
4566 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4567
4568 case OP_EOFOBJP: /* boolean? */
4569 s_retbool (car (SCHEME_V->args) == S_EOF);
4570
4571 case OP_NULLP: /* null? */
4572 s_retbool (car (SCHEME_V->args) == NIL);
4573
4574 case OP_NUMEQ: /* = */
4575 case OP_LESS: /* < */
4576 case OP_GRE: /* > */
4577 case OP_LEQ: /* <= */
4578 case OP_GEQ: /* >= */
4579 switch (op)
4580 {
4581 case OP_NUMEQ:
4582 comp_func = num_eq;
4583 break;
4584
4585 case OP_LESS:
4586 comp_func = num_lt;
4587 break;
4588
4589 case OP_GRE:
4590 comp_func = num_gt;
4591 break;
4592
4593 case OP_LEQ:
4594 comp_func = num_le;
4595 break;
4596
4597 case OP_GEQ:
4598 comp_func = num_ge;
4599 break;
4600 }
4601
4602 x = SCHEME_V->args;
4603 v = nvalue (car (x));
4604 x = cdr (x);
4605
4606 for (; x != NIL; x = cdr (x))
4607 {
4608 if (!comp_func (v, nvalue (car (x))))
4609 s_retbool (0);
4610
4611 v = nvalue (car (x));
4612 }
4613
4614 s_retbool (1);
4615
4616 case OP_SYMBOLP: /* symbol? */
4617 s_retbool (is_symbol (car (SCHEME_V->args)));
4618
4619 case OP_NUMBERP: /* number? */
4620 s_retbool (is_number (car (SCHEME_V->args)));
4621
4622 case OP_STRINGP: /* string? */
4623 s_retbool (is_string (car (SCHEME_V->args)));
4624
4625 case OP_INTEGERP: /* integer? */
4626 s_retbool (is_integer (car (SCHEME_V->args)));
4627
4628 case OP_REALP: /* real? */
4629 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4630
4631 case OP_CHARP: /* char? */
4632 s_retbool (is_character (car (SCHEME_V->args)));
4633#if USE_CHAR_CLASSIFIERS 4476#if USE_CHAR_CLASSIFIERS
4634 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4635 case OP_CHARAP: /* char-alphabetic? */ 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4636 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4637 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4638 case OP_CHARNP: /* char-numeric? */ 4481 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4639 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4640
4641 case OP_CHARWP: /* char-whitespace? */
4642 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4643
4644 case OP_CHARUP: /* char-upper-case? */
4645 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4646
4647 case OP_CHARLP: /* char-lower-case? */
4648 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4649#endif 4482#endif
4483
4650#if USE_PORTS 4484#if USE_PORTS
4651 4485 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4652 case OP_PORTP: /* port? */
4653 s_retbool (is_port (car (SCHEME_V->args)));
4654
4655 case OP_INPORTP: /* input-port? */ 4486 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4656 s_retbool (is_inport (car (SCHEME_V->args)));
4657
4658 case OP_OUTPORTP: /* output-port? */ 4487 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4659 s_retbool (is_outport (car (SCHEME_V->args)));
4660#endif 4488#endif
4661 4489
4662 case OP_PROCP: /* procedure? */ 4490 case OP_PROCP: /* procedure? */
4663 4491
4664 /*-- 4492 /*--
4665 * continuation should be procedure by the example 4493 * continuation should be procedure by the example
4666 * (call-with-current-continuation procedure?) ==> #t 4494 * (call-with-current-continuation procedure?) ==> #t
4667 * in R^3 report sec. 6.9 4495 * in R^3 report sec. 6.9
4668 */ 4496 */
4669 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4497 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4670 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4498 break;
4671 4499
4672 case OP_PAIRP: /* pair? */ 4500 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4673 s_retbool (is_pair (car (SCHEME_V->args))); 4501 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4674 4502 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4675 case OP_LISTP: /* list? */ 4503 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4676 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4504 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4677 4505 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4678 case OP_ENVP: /* environment? */
4679 s_retbool (is_environment (car (SCHEME_V->args)));
4680
4681 case OP_VECTORP: /* vector? */
4682 s_retbool (is_vector (car (SCHEME_V->args)));
4683
4684 case OP_EQ: /* eq? */
4685 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4686
4687 case OP_EQV: /* eqv? */
4688 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4689 } 4506 }
4690 4507
4691 return S_T; 4508 s_retbool (r);
4692} 4509}
4693 4510
4694static pointer 4511static int
4695opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4696{ 4513{
4514 pointer args = SCHEME_V->args;
4515 pointer a = car (args);
4697 pointer x, y; 4516 pointer x, y;
4698 4517
4699 switch (op) 4518 switch (op)
4700 { 4519 {
4701 case OP_FORCE: /* force */ 4520 case OP_FORCE: /* force */
4702 SCHEME_V->code = car (SCHEME_V->args); 4521 SCHEME_V->code = a;
4703 4522
4704 if (is_promise (SCHEME_V->code)) 4523 if (is_promise (SCHEME_V->code))
4705 { 4524 {
4706 /* Should change type to closure here */ 4525 /* Should change type to closure here */
4707 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4526 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4728 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4547 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4729 SCHEME_V->outport = cadr (SCHEME_V->args); 4548 SCHEME_V->outport = cadr (SCHEME_V->args);
4730 } 4549 }
4731 } 4550 }
4732 4551
4733 SCHEME_V->args = car (SCHEME_V->args); 4552 SCHEME_V->args = a;
4734 4553
4735 if (op == OP_WRITE) 4554 if (op == OP_WRITE)
4736 SCHEME_V->print_flag = 1; 4555 SCHEME_V->print_flag = 1;
4737 else 4556 else
4738 SCHEME_V->print_flag = 0; 4557 SCHEME_V->print_flag = 0;
4739 4558
4740 s_goto (OP_P0LIST); 4559 s_goto (OP_P0LIST);
4741 4560
4742 case OP_NEWLINE: /* newline */ 4561 case OP_NEWLINE: /* newline */
4743 if (is_pair (SCHEME_V->args)) 4562 if (is_pair (args))
4744 { 4563 {
4745 if (car (SCHEME_V->args) != SCHEME_V->outport) 4564 if (a != SCHEME_V->outport)
4746 { 4565 {
4747 x = cons (SCHEME_V->outport, NIL); 4566 x = cons (SCHEME_V->outport, NIL);
4748 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4749 SCHEME_V->outport = car (SCHEME_V->args); 4568 SCHEME_V->outport = a;
4750 } 4569 }
4751 } 4570 }
4752 4571
4753 putstr (SCHEME_A_ "\n"); 4572 putstr (SCHEME_A_ "\n");
4754 s_return (S_T); 4573 s_return (S_T);
4755#endif 4574#endif
4756 4575
4757 case OP_ERR0: /* error */ 4576 case OP_ERR0: /* error */
4758 SCHEME_V->retcode = -1; 4577 SCHEME_V->retcode = -1;
4759 4578
4760 if (!is_string (car (SCHEME_V->args))) 4579 if (!is_string (a))
4761 { 4580 {
4762 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4581 args = cons (mk_string (SCHEME_A_ " -- "), args);
4763 setimmutable (car (SCHEME_V->args)); 4582 setimmutable (car (args));
4764 } 4583 }
4765 4584
4766 putstr (SCHEME_A_ "Error: "); 4585 putstr (SCHEME_A_ "Error: ");
4767 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4586 putstr (SCHEME_A_ strvalue (car (args)));
4768 SCHEME_V->args = cdr (SCHEME_V->args); 4587 SCHEME_V->args = cdr (args);
4769 s_goto (OP_ERR1); 4588 s_goto (OP_ERR1);
4770 4589
4771 case OP_ERR1: /* error */ 4590 case OP_ERR1: /* error */
4772 putstr (SCHEME_A_ " "); 4591 putstr (SCHEME_A_ " ");
4773 4592
4774 if (SCHEME_V->args != NIL) 4593 if (args != NIL)
4775 { 4594 {
4776 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4777 SCHEME_V->args = car (SCHEME_V->args); 4596 SCHEME_V->args = a;
4778 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4779 s_goto (OP_P0LIST); 4598 s_goto (OP_P0LIST);
4780 } 4599 }
4781 else 4600 else
4782 { 4601 {
4783 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4784 4603
4785 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4786 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4787 else 4606 else
4788 return NIL; 4607 return -1;
4789 } 4608 }
4790 4609
4791 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4792 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4611 s_return (reverse (SCHEME_A_ a));
4793 4612
4794 case OP_LIST_STAR: /* list* */ 4613 case OP_LIST_STAR: /* list* */
4795 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4614 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4796 4615
4797 case OP_APPEND: /* append */ 4616 case OP_APPEND: /* append */
4798 x = NIL; 4617 x = NIL;
4799 y = SCHEME_V->args; 4618 y = args;
4800 4619
4801 if (y == x) 4620 if (y == x)
4802 s_return (x); 4621 s_return (x);
4803 4622
4804 /* cdr() in the while condition is not a typo. If car() */ 4623 /* cdr() in the while condition is not a typo. If car() */
… …
4815 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4634 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4816 4635
4817#if USE_PLIST 4636#if USE_PLIST
4818 4637
4819 case OP_PUT: /* put */ 4638 case OP_PUT: /* put */
4820 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4639 if (!hasprop (a) || !hasprop (cadr (args)))
4821 Error_0 ("illegal use of put"); 4640 Error_0 ("illegal use of put");
4822 4641
4823 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4642 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4824 { 4643 {
4825 if (caar (x) == y) 4644 if (caar (x) == y)
4826 break; 4645 break;
4827 } 4646 }
4828 4647
4829 if (x != NIL) 4648 if (x != NIL)
4830 cdar (x) = caddr (SCHEME_V->args); 4649 cdar (x) = caddr (args);
4831 else 4650 else
4832 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4651 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4833 4652
4834 s_return (S_T); 4653 s_return (S_T);
4835 4654
4836 case OP_GET: /* get */ 4655 case OP_GET: /* get */
4837 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4656 if (!hasprop (a) || !hasprop (cadr (args)))
4838 Error_0 ("illegal use of get"); 4657 Error_0 ("illegal use of get");
4839 4658
4840 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4659 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4841 if (caar (x) == y) 4660 if (caar (x) == y)
4842 break; 4661 break;
4843 4662
4844 if (x != NIL) 4663 if (x != NIL)
4845 s_return (cdar (x)); 4664 s_return (cdar (x));
… …
4847 s_return (NIL); 4666 s_return (NIL);
4848 4667
4849#endif /* USE_PLIST */ 4668#endif /* USE_PLIST */
4850 4669
4851 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
4852 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
4853 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4672 SCHEME_V->retcode = ivalue (a);
4854 4673
4855 return NIL; 4674 return -1;
4856 4675
4857 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
4858 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
4859 s_return (S_T); 4678 s_return (S_T);
4860 4679
4861 case OP_GCVERB: /* gc-verbose */ 4680 case OP_GCVERB: /* gc-verbose */
4862 { 4681 {
4863 int was = SCHEME_V->gc_verbose; 4682 int was = SCHEME_V->gc_verbose;
4864 4683
4865 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4684 SCHEME_V->gc_verbose = (a != S_F);
4866 s_retbool (was); 4685 s_retbool (was);
4867 } 4686 }
4868 4687
4869 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
4870 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4689 if (!is_pair (args) || !is_number (a))
4871 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
4872 4691
4873 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
4874 4693
4875 s_return (S_T); 4694 s_return (S_T);
4876 4695
4877 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
4878 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
4905 case OP_OPEN_INOUTFILE: 4724 case OP_OPEN_INOUTFILE:
4906 prop = port_input | port_output; 4725 prop = port_input | port_output;
4907 break; 4726 break;
4908 } 4727 }
4909 4728
4910 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4911 4730
4912 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
4913 s_return (S_F);
4914
4915 s_return (p);
4916 } 4732 }
4917 4733
4918# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
4919 4735
4920 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
4932 case OP_OPEN_INOUTSTRING: 4748 case OP_OPEN_INOUTSTRING:
4933 prop = port_input | port_output; 4749 prop = port_input | port_output;
4934 break; 4750 break;
4935 } 4751 }
4936 4752
4937 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4938 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4754 strvalue (a) + strlength (a), prop);
4939 4755
4940 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4941 s_return (S_F);
4942
4943 s_return (p);
4944 } 4757 }
4945 4758
4946 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
4947 { 4760 {
4948 pointer p; 4761 pointer p;
4949 4762
4950 if (car (SCHEME_V->args) == NIL) 4763 if (a == NIL)
4951 {
4952 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
4953
4954 if (p == NIL)
4955 s_return (S_F);
4956 }
4957 else 4765 else
4958 {
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4767 strvalue (a) + strlength (a), port_output);
4961 4768
4962 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964 }
4965
4966 s_return (p);
4967 } 4770 }
4968 4771
4969 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
4970 { 4773 {
4971 port *p; 4774 port *p;
4972 4775
4973 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4776 if ((p = a->object.port)->kind & port_string)
4974 { 4777 {
4975 off_t size; 4778 off_t size;
4976 char *str; 4779 char *str;
4977 4780
4978 size = p->rep.string.curr - p->rep.string.start + 1; 4781 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4994 } 4797 }
4995 4798
4996# endif 4799# endif
4997 4800
4998 case OP_CLOSE_INPORT: /* close-input-port */ 4801 case OP_CLOSE_INPORT: /* close-input-port */
4999 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4802 port_close (SCHEME_A_ a, port_input);
5000 s_return (S_T); 4803 s_return (S_T);
5001 4804
5002 case OP_CLOSE_OUTPORT: /* close-output-port */ 4805 case OP_CLOSE_OUTPORT: /* close-output-port */
5003 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4806 port_close (SCHEME_A_ a, port_output);
5004 s_return (S_T); 4807 s_return (S_T);
5005#endif 4808#endif
5006 4809
5007 case OP_INT_ENV: /* interaction-environment */ 4810 case OP_INT_ENV: /* interaction-environment */
5008 s_return (SCHEME_V->global_env); 4811 s_return (SCHEME_V->global_env);
… …
5010 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
5011 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
5012 4815
5013 } 4816 }
5014 4817
5015 return S_T; 4818 if (USE_ERROR_CHECKING) abort ();
5016} 4819}
5017 4820
5018static pointer 4821static int
5019opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5020{ 4823{
4824 pointer args = SCHEME_V->args;
5021 pointer x; 4825 pointer x;
5022 4826
5023 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
5024 { 4828 {
5025 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
5032 switch (op) 4836 switch (op)
5033 { 4837 {
5034 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
5035#if USE_PORTS 4839#if USE_PORTS
5036 case OP_READ: 4840 case OP_READ:
5037 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
5038 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
5039 4843
5040 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
5041 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
5042 4846
5043 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
5044 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
5045 4849
5046 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
5047 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
5048 x = cons (x, NIL); 4852 x = cons (x, NIL);
5049 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5050 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
5051 4855
5052 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
5053 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
5054 { 4858 {
5055 int c; 4859 int c;
5056 4860
5057 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
5058 { 4862 {
5059 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
5060 { 4864 {
5061 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
5062 x = cons (x, NIL); 4866 x = cons (x, NIL);
5063 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5064 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
5065 } 4869 }
5066 } 4870 }
5067 4871
5068 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
5069 4873
… …
5079 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
5080 { 4884 {
5081 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
5082 int res; 4886 int res;
5083 4887
5084 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
5085 p = car (SCHEME_V->args); 4889 p = car (args);
5086 4890
5087 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
5088 4892
5089 s_retbool (res); 4893 s_retbool (res);
5090 } 4894 }
5091 4895
5092 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
5093 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
5094 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
5095 4899
5096 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
5097 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
5098 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
5099#endif 4903#endif
5100 4904
5101 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
5102 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5188 } 4992 }
5189 4993
5190 break; 4994 break;
5191 4995
5192 case OP_RDLIST: 4996 case OP_RDLIST:
5193 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4997 SCHEME_V->args = cons (SCHEME_V->value, args);
5194 SCHEME_V->tok = token (SCHEME_A); 4998 SCHEME_V->tok = token (SCHEME_A);
5195 4999
5196 switch (SCHEME_V->tok) 5000 switch (SCHEME_V->tok)
5197 { 5001 {
5198 case TOK_EOF: 5002 case TOK_EOF:
… …
5226 case OP_RDDOT: 5030 case OP_RDDOT:
5227 if (token (SCHEME_A) != TOK_RPAREN) 5031 if (token (SCHEME_A) != TOK_RPAREN)
5228 Error_0 ("syntax error: illegal dot expression"); 5032 Error_0 ("syntax error: illegal dot expression");
5229 5033
5230 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5034 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5231 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5035 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5232 5036
5233 case OP_RDQUOTE: 5037 case OP_RDQUOTE:
5234 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5038 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5235 5039
5236 case OP_RDQQUOTE: 5040 case OP_RDQQUOTE:
… …
5258 SCHEME_V->args = SCHEME_V->value; 5062 SCHEME_V->args = SCHEME_V->value;
5259 s_goto (OP_VECTOR); 5063 s_goto (OP_VECTOR);
5260 5064
5261 /* ========== printing part ========== */ 5065 /* ========== printing part ========== */
5262 case OP_P0LIST: 5066 case OP_P0LIST:
5263 if (is_vector (SCHEME_V->args)) 5067 if (is_vector (args))
5264 { 5068 {
5265 putstr (SCHEME_A_ "#("); 5069 putstr (SCHEME_A_ "#(");
5266 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5070 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5267 s_goto (OP_PVECFROM); 5071 s_goto (OP_PVECFROM);
5268 } 5072 }
5269 else if (is_environment (SCHEME_V->args)) 5073 else if (is_environment (args))
5270 { 5074 {
5271 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5075 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5272 s_return (S_T); 5076 s_return (S_T);
5273 } 5077 }
5274 else if (!is_pair (SCHEME_V->args)) 5078 else if (!is_pair (args))
5275 { 5079 {
5276 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5080 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5277 s_return (S_T); 5081 s_return (S_T);
5278 } 5082 }
5279 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5083 else
5280 { 5084 {
5085 pointer a = car (args);
5086 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b);
5089
5090 if (a == SCHEME_V->QUOTE && ok_abbr)
5281 putstr (SCHEME_A_ "'"); 5091 putstr (SCHEME_A_ "'");
5282 SCHEME_V->args = cadr (SCHEME_V->args); 5092 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`");
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ",");
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@");
5098 else
5099 {
5100 putstr (SCHEME_A_ "(");
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a;
5103 }
5104
5283 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5284 } 5106 }
5285 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5107
5108 case OP_P1LIST:
5109 if (is_pair (args))
5286 { 5110 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5287 putstr (SCHEME_A_ "`"); 5112 putstr (SCHEME_A_ " ");
5288 SCHEME_V->args = cadr (SCHEME_V->args); 5113 SCHEME_V->args = car (args);
5289 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5290 } 5115 }
5291 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5292 {
5293 putstr (SCHEME_A_ ",");
5294 SCHEME_V->args = cadr (SCHEME_V->args);
5295 s_goto (OP_P0LIST);
5296 }
5297 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5298 {
5299 putstr (SCHEME_A_ ",@");
5300 SCHEME_V->args = cadr (SCHEME_V->args);
5301 s_goto (OP_P0LIST);
5302 }
5303 else
5304 {
5305 putstr (SCHEME_A_ "(");
5306 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5307 SCHEME_V->args = car (SCHEME_V->args);
5308 s_goto (OP_P0LIST);
5309 }
5310
5311 case OP_P1LIST:
5312 if (is_pair (SCHEME_V->args))
5313 {
5314 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5315 putstr (SCHEME_A_ " ");
5316 SCHEME_V->args = car (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (is_vector (SCHEME_V->args)) 5116 else if (is_vector (args))
5320 { 5117 {
5321 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5118 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5322 putstr (SCHEME_A_ " . "); 5119 putstr (SCHEME_A_ " . ");
5323 s_goto (OP_P0LIST); 5120 s_goto (OP_P0LIST);
5324 } 5121 }
5325 else 5122 else
5326 { 5123 {
5327 if (SCHEME_V->args != NIL) 5124 if (args != NIL)
5328 { 5125 {
5329 putstr (SCHEME_A_ " . "); 5126 putstr (SCHEME_A_ " . ");
5330 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5331 } 5128 }
5332 5129
5333 putstr (SCHEME_A_ ")"); 5130 putstr (SCHEME_A_ ")");
5334 s_return (S_T); 5131 s_return (S_T);
5335 } 5132 }
5336 5133
5337 case OP_PVECFROM: 5134 case OP_PVECFROM:
5338 { 5135 {
5339 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5136 int i = ivalue_unchecked (cdr (args));
5340 pointer vec = car (SCHEME_V->args); 5137 pointer vec = car (args);
5341 int len = veclength (vec); 5138 int len = veclength (vec);
5342 5139
5343 if (i == len) 5140 if (i == len)
5344 { 5141 {
5345 putstr (SCHEME_A_ ")"); 5142 putstr (SCHEME_A_ ")");
5346 s_return (S_T); 5143 s_return (S_T);
5347 } 5144 }
5348 else 5145 else
5349 { 5146 {
5350 pointer elem = vector_elem (vec, i); 5147 pointer elem = vector_get (vec, i);
5351 5148
5352 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5149 ivalue_unchecked (cdr (args)) = i + 1;
5353 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5354 SCHEME_V->args = elem; 5151 SCHEME_V->args = elem;
5355 5152
5356 if (i > 0) 5153 if (i > 0)
5357 putstr (SCHEME_A_ " "); 5154 putstr (SCHEME_A_ " ");
5358 5155
5359 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5360 } 5157 }
5361 } 5158 }
5362 } 5159 }
5363 5160
5364 return S_T; 5161 if (USE_ERROR_CHECKING) abort ();
5365} 5162}
5366 5163
5367static pointer 5164static int
5368opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5165opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5369{ 5166{
5167 pointer args = SCHEME_V->args;
5168 pointer a = car (args);
5370 pointer x, y; 5169 pointer x, y;
5371 5170
5372 switch (op) 5171 switch (op)
5373 { 5172 {
5374 case OP_LIST_LENGTH: /* length *//* a.k */ 5173 case OP_LIST_LENGTH: /* length *//* a.k */
5375 { 5174 {
5376 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5175 long v = list_length (SCHEME_A_ a);
5377 5176
5378 if (v < 0) 5177 if (v < 0)
5379 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5178 Error_1 ("length: not a list:", a);
5380 5179
5381 s_return (mk_integer (SCHEME_A_ v)); 5180 s_return (mk_integer (SCHEME_A_ v));
5382 } 5181 }
5383 5182
5384 case OP_ASSQ: /* assq *//* a.k */ 5183 case OP_ASSQ: /* assq *//* a.k */
5385 x = car (SCHEME_V->args); 5184 x = a;
5386 5185
5387 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5186 for (y = cadr (args); is_pair (y); y = cdr (y))
5388 { 5187 {
5389 if (!is_pair (car (y))) 5188 if (!is_pair (car (y)))
5390 Error_0 ("unable to handle non pair element"); 5189 Error_0 ("unable to handle non pair element");
5391 5190
5392 if (x == caar (y)) 5191 if (x == caar (y))
… …
5398 else 5197 else
5399 s_return (S_F); 5198 s_return (S_F);
5400 5199
5401 5200
5402 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5201 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5403 SCHEME_V->args = car (SCHEME_V->args); 5202 SCHEME_V->args = a;
5404 5203
5405 if (SCHEME_V->args == NIL) 5204 if (SCHEME_V->args == NIL)
5406 s_return (S_F); 5205 s_return (S_F);
5407 else if (is_closure (SCHEME_V->args)) 5206 else if (is_closure (SCHEME_V->args))
5408 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5207 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5414 case OP_CLOSUREP: /* closure? */ 5213 case OP_CLOSUREP: /* closure? */
5415 /* 5214 /*
5416 * Note, macro object is also a closure. 5215 * Note, macro object is also a closure.
5417 * Therefore, (closure? <#MACRO>) ==> #t 5216 * Therefore, (closure? <#MACRO>) ==> #t
5418 */ 5217 */
5419 s_retbool (is_closure (car (SCHEME_V->args))); 5218 s_retbool (is_closure (a));
5420 5219
5421 case OP_MACROP: /* macro? */ 5220 case OP_MACROP: /* macro? */
5422 s_retbool (is_macro (car (SCHEME_V->args))); 5221 s_retbool (is_macro (a));
5423 } 5222 }
5424 5223
5425 return S_T; /* NOTREACHED */ 5224 if (USE_ERROR_CHECKING) abort ();
5426} 5225}
5427 5226
5227/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5428typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5429 5229
5430typedef int (*test_predicate) (pointer); 5230typedef int (*test_predicate)(pointer);
5431static int 5231static int
5432is_any (pointer p) 5232tst_any (pointer p)
5433{ 5233{
5434 return 1; 5234 return 1;
5435} 5235}
5436 5236
5437static int 5237static int
5438is_nonneg (pointer p) 5238tst_inonneg (pointer p)
5439{ 5239{
5440 return ivalue (p) >= 0 && is_integer (p); 5240 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241}
5242
5243static int
5244tst_is_list (SCHEME_P_ pointer p)
5245{
5246 return p == NIL || is_pair (p);
5441} 5247}
5442 5248
5443/* Correspond carefully with following defines! */ 5249/* Correspond carefully with following defines! */
5444static struct 5250static struct
5445{ 5251{
5446 test_predicate fct; 5252 test_predicate fct;
5447 const char *kind; 5253 const char *kind;
5448} tests[] = 5254} tests[] = {
5449{ 5255 { tst_any , 0 },
5450 { 0, 0}, /* unused */ 5256 { is_string , "string" },
5451 { is_any, 0}, 5257 { is_symbol , "symbol" },
5452 { is_string, "string" }, 5258 { is_port , "port" },
5453 { is_symbol, "symbol" },
5454 { is_port, "port" },
5455 { is_inport, "input port" }, 5259 { is_inport , "input port" },
5456 { is_outport, "output port" }, 5260 { is_outport , "output port" },
5457 { is_environment, "environment" }, 5261 { is_environment, "environment" },
5458 { is_pair, "pair" }, 5262 { is_pair , "pair" },
5459 { 0, "pair or '()" }, 5263 { 0 , "pair or '()" },
5460 { is_character, "character" }, 5264 { is_character , "character" },
5461 { is_vector, "vector" }, 5265 { is_vector , "vector" },
5462 { is_number, "number" }, 5266 { is_number , "number" },
5463 { is_integer, "integer" }, 5267 { is_integer , "integer" },
5464 { is_nonneg, "non-negative integer" } 5268 { tst_inonneg , "non-negative integer" }
5465}; 5269};
5466 5270
5467#define TST_NONE 0 5271#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5468#define TST_ANY "\001" 5272#define TST_ANY "\001"
5469#define TST_STRING "\002" 5273#define TST_STRING "\002"
5470#define TST_SYMBOL "\003" 5274#define TST_SYMBOL "\003"
5471#define TST_PORT "\004" 5275#define TST_PORT "\004"
5472#define TST_INPORT "\005" 5276#define TST_INPORT "\005"
5473#define TST_OUTPORT "\006" 5277#define TST_OUTPORT "\006"
5474#define TST_ENVIRONMENT "\007" 5278#define TST_ENVIRONMENT "\007"
5475#define TST_PAIR "\010" 5279#define TST_PAIR "\010"
5476#define TST_LIST "\011" 5280#define TST_LIST "\011"
5477#define TST_CHAR "\012" 5281#define TST_CHAR "\012"
5478#define TST_VECTOR "\013" 5282#define TST_VECTOR "\013"
5479#define TST_NUMBER "\014" 5283#define TST_NUMBER "\014"
5480#define TST_INTEGER "\015" 5284#define TST_INTEGER "\015"
5481#define TST_NATURAL "\016" 5285#define TST_NATURAL "\016"
5286
5287#define INF_ARG 0xff
5288#define UNNAMED_OP ""
5289
5290static const char opnames[] =
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h"
5293#undef OP_DEF
5294;
5295
5296static const char *
5297opname (int idx)
5298{
5299 const char *name = opnames;
5300
5301 /* should do this at compile time, but would require external program, right? */
5302 while (idx--)
5303 name += strlen (name) + 1;
5304
5305 return *name ? name : "ILLEGAL";
5306}
5307
5308static const char *
5309procname (pointer x)
5310{
5311 return opname (procnum (x));
5312}
5482 5313
5483typedef struct 5314typedef struct
5484{ 5315{
5485 dispatch_func func; 5316 uint8_t func;
5486 char *name; 5317 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5318 uint8_t builtin;
5319#if USE_ERROR_CHECKING
5487 int min_arity; 5320 uint8_t min_arity;
5488 int max_arity; 5321 uint8_t max_arity;
5489 char *arg_tests_encoding; 5322 char arg_tests_encoding[3];
5323#endif
5490} op_code_info; 5324} op_code_info;
5491 5325
5492#define INF_ARG 0xffff
5493
5494static op_code_info dispatch_table[] = { 5326static const op_code_info dispatch_table[] = {
5495#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5327#if USE_ERROR_CHECKING
5328#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5329#else
5330#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5331#endif
5496#include "opdefines.h" 5332#include "opdefines.h"
5333#undef OP_DEF
5497 {0} 5334 {0}
5498}; 5335};
5499 5336
5500static const char *
5501procname (pointer x)
5502{
5503 int n = procnum (x);
5504 const char *name = dispatch_table[n].name;
5505
5506 if (name == 0)
5507 name = "ILLEGAL!";
5508
5509 return name;
5510}
5511
5512/* kernel of this interpreter */ 5337/* kernel of this interpreter */
5513static void 5338static void ecb_hot
5514Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5515{ 5340{
5516 SCHEME_V->op = op; 5341 SCHEME_V->op = op;
5517 5342
5518 for (;;) 5343 for (;;)
5519 { 5344 {
5520 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5345 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5521 5346
5522#if USE_ERROR_CHECKING 5347#if USE_ERROR_CHECKING
5523 if (pcd->name) /* if built-in function, check arguments */ 5348 if (pcd->builtin) /* if built-in function, check arguments */
5524 { 5349 {
5525 int ok = 1;
5526 char msg[STRBUFFSIZE]; 5350 char msg[STRBUFFSIZE];
5527 int n = list_length (SCHEME_A_ SCHEME_V->args); 5351 int n = list_length (SCHEME_A_ SCHEME_V->args);
5528 5352
5529 /* Check number of arguments */ 5353 /* Check number of arguments */
5530 if (ecb_expect_false (n < pcd->min_arity)) 5354 if (ecb_expect_false (n < pcd->min_arity))
5531 { 5355 {
5532 ok = 0;
5533 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5356 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5534 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5357 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5358 xError_1 (SCHEME_A_ msg, 0);
5359 continue;
5535 } 5360 }
5536 else if (ecb_excpect_false (n > pcd->max_arity)) 5361 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5537 { 5362 {
5538 ok = 0;
5539 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5363 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5540 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5364 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5365 xError_1 (SCHEME_A_ msg, 0);
5366 continue;
5541 } 5367 }
5542 5368 else
5543 if (ecb_expect_false (ok))
5544 { 5369 {
5545 if (pcd->arg_tests_encoding) 5370 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5546 { 5371 {
5547 int i = 0; 5372 int i = 0;
5548 int j; 5373 int j;
5549 const char *t = pcd->arg_tests_encoding; 5374 const char *t = pcd->arg_tests_encoding;
5550 pointer arglist = SCHEME_V->args; 5375 pointer arglist = SCHEME_V->args;
5551 5376
5552 do 5377 do
5553 { 5378 {
5554 pointer arg = car (arglist); 5379 pointer arg = car (arglist);
5555 5380
5556 j = (int) t[0]; 5381 j = t[0];
5557 5382
5383 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5558 if (j == TST_LIST[0]) 5384 if (j == TST_LIST[0])
5559 { 5385 {
5560 if (arg != NIL && !is_pair (arg)) 5386 if (!tst_is_list (SCHEME_A_ arg))
5561 break; 5387 break;
5562 } 5388 }
5563 else 5389 else
5564 { 5390 {
5565 if (!tests[j].fct (arg)) 5391 if (!tests[j - 1].fct (arg))
5566 break; 5392 break;
5567 } 5393 }
5568 5394
5569 if (t[1] != 0) /* last test is replicated as necessary */ 5395 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5570 t++; 5396 t++;
5571 5397
5572 arglist = cdr (arglist); 5398 arglist = cdr (arglist);
5573 i++; 5399 i++;
5574 } 5400 }
5575 while (i < n); 5401 while (i < n);
5576 5402
5577 if (i < n) 5403 if (i < n)
5578 { 5404 {
5579 ok = 0;
5580 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5405 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5406 xError_1 (SCHEME_A_ msg, 0);
5407 continue;
5581 } 5408 }
5582 } 5409 }
5583 } 5410 }
5584
5585 if (!ok)
5586 {
5587 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5588 return;
5589
5590 pcd = dispatch_table + SCHEME_V->op;
5591 }
5592 } 5411 }
5593#endif 5412#endif
5594 5413
5595 ok_to_freely_gc (SCHEME_A); 5414 ok_to_freely_gc (SCHEME_A);
5596 5415
5416 static const dispatch_func dispatch_funcs[] = {
5417 opexe_0,
5418 opexe_1,
5419 opexe_2,
5420 opexe_3,
5421 opexe_4,
5422 opexe_5,
5423 opexe_6,
5424 };
5425
5597 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5598 return; 5427 return;
5599 5428
5600 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5601 { 5430 {
5602 xwrstr ("No memory!\n"); 5431 xwrstr ("No memory!\n");
… …
5626mk_proc (SCHEME_P_ enum scheme_opcodes op) 5455mk_proc (SCHEME_P_ enum scheme_opcodes op)
5627{ 5456{
5628 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5457 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5629 set_typeflag (y, (T_PROC | T_ATOM)); 5458 set_typeflag (y, (T_PROC | T_ATOM));
5630 ivalue_unchecked (y) = op; 5459 ivalue_unchecked (y) = op;
5631 set_num_integer (y);
5632 return y; 5460 return y;
5633} 5461}
5634 5462
5635/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5636static int 5464static int
… …
5701 return OP_C0STREAM; /* cons-stream */ 5529 return OP_C0STREAM; /* cons-stream */
5702 } 5530 }
5703} 5531}
5704 5532
5705#if USE_MULTIPLICITY 5533#if USE_MULTIPLICITY
5706scheme * 5534ecb_cold scheme *
5707scheme_init_new () 5535scheme_init_new ()
5708{ 5536{
5709 scheme *sc = malloc (sizeof (scheme)); 5537 scheme *sc = malloc (sizeof (scheme));
5710 5538
5711 if (!scheme_init (SCHEME_A)) 5539 if (!scheme_init (SCHEME_A))
… …
5716 else 5544 else
5717 return sc; 5545 return sc;
5718} 5546}
5719#endif 5547#endif
5720 5548
5721int 5549ecb_cold int
5722scheme_init (SCHEME_P) 5550scheme_init (SCHEME_P)
5723{ 5551{
5724 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5725 pointer x; 5553 pointer x;
5726 5554
… …
5799 5627
5800 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5628 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5801 assign_syntax (SCHEME_A_ syntax_names[i]); 5629 assign_syntax (SCHEME_A_ syntax_names[i]);
5802 } 5630 }
5803 5631
5632 // TODO: should iterate via strlen, to avoid n² complexity
5804 for (i = 0; i < n; i++) 5633 for (i = 0; i < n; i++)
5805 if (dispatch_table[i].name != 0) 5634 if (dispatch_table[i].builtin)
5806 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5635 assign_proc (SCHEME_A_ i, opname (i));
5807 5636
5808 /* initialization of global pointers to special symbols */ 5637 /* initialization of global pointers to special symbols */
5809 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5638 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5810 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5639 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5811 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5640 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5850scheme_set_external_data (SCHEME_P_ void *p) 5679scheme_set_external_data (SCHEME_P_ void *p)
5851{ 5680{
5852 SCHEME_V->ext_data = p; 5681 SCHEME_V->ext_data = p;
5853} 5682}
5854 5683
5855void 5684ecb_cold void
5856scheme_deinit (SCHEME_P) 5685scheme_deinit (SCHEME_P)
5857{ 5686{
5858 int i; 5687 int i;
5859 5688
5860#if SHOW_ERROR_LINE 5689#if SHOW_ERROR_LINE
… …
5952{ 5781{
5953 dump_stack_reset (SCHEME_A); 5782 dump_stack_reset (SCHEME_A);
5954 SCHEME_V->envir = SCHEME_V->global_env; 5783 SCHEME_V->envir = SCHEME_V->global_env;
5955 SCHEME_V->file_i = 0; 5784 SCHEME_V->file_i = 0;
5956 SCHEME_V->load_stack[0].kind = port_input | port_string; 5785 SCHEME_V->load_stack[0].kind = port_input | port_string;
5957 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5786 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5958 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5787 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5959 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5960#if USE_PORTS 5789#if USE_PORTS
5961 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5962#endif 5791#endif
5963 SCHEME_V->retcode = 0; 5792 SCHEME_V->retcode = 0;
5964 SCHEME_V->interactive_repl = 0; 5793 SCHEME_V->interactive_repl = 0;

Diff Legend

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