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

Comparing microscheme/scheme.c (file contents):
Revision 1.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.25 by root, Fri Nov 27 04:37:26 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
… …
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
213static num num_add (num a, num b); 212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
214static num num_mul (num a, num b); 213
215static num num_div (num a, num b); 214static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 215static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 216static num num_rem (num a, num b);
219static num num_mod (num a, num b); 217static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 218
226#if USE_MATH 219#if USE_MATH
227static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
228#endif 221#endif
229static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
230
231static INLINE int
232num_is_integer (pointer p)
233{
234 return num_is_fixnum (p->object.number);
235}
236 223
237static num num_zero; 224static num num_zero;
238static num num_one; 225static num num_one;
239 226
240/* macros for cell operations */ 227/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 228#define typeflag(p) ((p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 229#define set_typeflag(p,v) ((p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 230#define type(p) (typeflag (p) & T_MASKTYPE)
244 231
245INTERFACE INLINE int 232INTERFACE int
246is_string (pointer p) 233is_string (pointer p)
247{ 234{
248 return type (p) == T_STRING; 235 return type (p) == T_STRING;
249} 236}
250 237
251#define strvalue(p) ((p)->object.string.svalue) 238#define strvalue(p) ((p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 239#define strlength(p) ((p)->object.string.length)
253 240
254INTERFACE int is_list (SCHEME_P_ pointer p); 241INTERFACE int is_list (SCHEME_P_ pointer p);
242
255INTERFACE INLINE int 243INTERFACE int
256is_vector (pointer p) 244is_vector (pointer p)
257{ 245{
258 return type (p) == T_VECTOR; 246 return type (p) == T_VECTOR;
259} 247}
260 248
… …
269vector_length (pointer vec) 257vector_length (pointer vec)
270{ 258{
271 return vec->object.vector.length; 259 return vec->object.vector.length;
272} 260}
273 261
274INTERFACE INLINE int 262INTERFACE int
275is_number (pointer p) 263is_number (pointer p)
276{ 264{
277 return type (p) == T_NUMBER; 265 return type (p) == T_NUMBER;
278} 266}
279 267
280INTERFACE INLINE int 268INTERFACE int
281is_integer (pointer p) 269is_integer (pointer p)
282{ 270{
283 if (!is_number (p)) 271 return is_number (p) && num_is_fixnum (p->object.number);
284 return 0;
285
286 if (num_is_integer (p) || ivalue (p) == rvalue (p))
287 return 1;
288
289 return 0;
290} 272}
291 273
292INTERFACE INLINE int 274INTERFACE int
293is_real (pointer p) 275is_real (pointer p)
294{ 276{
295 return is_number (p) && !num_is_fixnum (p->object.number); 277 return is_number (p) && !num_is_fixnum (p->object.number);
296} 278}
297 279
298INTERFACE INLINE int 280INTERFACE int
299is_character (pointer p) 281is_character (pointer p)
300{ 282{
301 return type (p) == T_CHARACTER; 283 return type (p) == T_CHARACTER;
302} 284}
303 285
304INTERFACE INLINE char * 286INTERFACE char *
305string_value (pointer p) 287string_value (pointer p)
306{ 288{
307 return strvalue (p); 289 return strvalue (p);
308} 290}
309 291
310INLINE num 292ecb_inline num
311nvalue (pointer p) 293nvalue (pointer p)
312{ 294{
313 return (p)->object.number; 295 return (p)->object.number;
314} 296}
315 297
… …
345#else 327#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
347# define set_num_integer(p) 0 329# define set_num_integer(p) 0
348# define set_num_real(p) 0 330# define set_num_real(p) 0
349#endif 331#endif
332
350INTERFACE long 333INTERFACE long
351charvalue (pointer p) 334charvalue (pointer p)
352{ 335{
353 return ivalue_unchecked (p); 336 return ivalue_unchecked (p);
354} 337}
355 338
356INTERFACE INLINE int 339INTERFACE int
357is_port (pointer p) 340is_port (pointer p)
358{ 341{
359 return type (p) == T_PORT; 342 return type (p) == T_PORT;
360} 343}
361 344
362INTERFACE INLINE int 345INTERFACE int
363is_inport (pointer p) 346is_inport (pointer p)
364{ 347{
365 return is_port (p) && p->object.port->kind & port_input; 348 return is_port (p) && p->object.port->kind & port_input;
366} 349}
367 350
368INTERFACE INLINE int 351INTERFACE int
369is_outport (pointer p) 352is_outport (pointer p)
370{ 353{
371 return is_port (p) && p->object.port->kind & port_output; 354 return is_port (p) && p->object.port->kind & port_output;
372} 355}
373 356
374INTERFACE INLINE int 357INTERFACE int
375is_pair (pointer p) 358is_pair (pointer p)
376{ 359{
377 return type (p) == T_PAIR; 360 return type (p) == T_PAIR;
378} 361}
379 362
380#define car(p) ((p)->object.cons.car + 0) 363#define car(p) ((p)->object.cons.car + 0)
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 364#define cdr(p) ((p)->object.cons.cdr + 0)
382 365
383#define caar(p) car (car (p)) 366static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 367static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 368static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 369static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 370
388#define cadar(p) car (cdr (car (p))) 371static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 372static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 373static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 374
392INTERFACE void 375INTERFACE void
393set_car (pointer p, pointer q) 376set_car (pointer p, pointer q)
394{ 377{
395 p->object.cons.car = q; 378 p->object.cons.car = q;
… …
411pair_cdr (pointer p) 394pair_cdr (pointer p)
412{ 395{
413 return cdr (p); 396 return cdr (p);
414} 397}
415 398
416INTERFACE INLINE int 399INTERFACE int
417is_symbol (pointer p) 400is_symbol (pointer p)
418{ 401{
419 return type (p) == T_SYMBOL; 402 return type (p) == T_SYMBOL;
420} 403}
421 404
422INTERFACE INLINE char * 405INTERFACE char *
423symname (pointer p) 406symname (pointer p)
424{ 407{
425 return strvalue (car (p)); 408 return strvalue (car (p));
426} 409}
427 410
428#if USE_PLIST 411#if USE_PLIST
429SCHEME_EXPORT INLINE int 412SCHEME_EXPORT int
430hasprop (pointer p) 413hasprop (pointer p)
431{ 414{
432 return typeflag (p) & T_SYMBOL; 415 return typeflag (p) & T_SYMBOL;
433} 416}
434 417
435# define symprop(p) cdr(p) 418# define symprop(p) cdr(p)
436#endif 419#endif
437 420
438INTERFACE INLINE int 421INTERFACE int
439is_syntax (pointer p) 422is_syntax (pointer p)
440{ 423{
441 return typeflag (p) & T_SYNTAX; 424 return typeflag (p) & T_SYNTAX;
442} 425}
443 426
444INTERFACE INLINE int 427INTERFACE int
445is_proc (pointer p) 428is_proc (pointer p)
446{ 429{
447 return type (p) == T_PROC; 430 return type (p) == T_PROC;
448} 431}
449 432
450INTERFACE INLINE int 433INTERFACE int
451is_foreign (pointer p) 434is_foreign (pointer p)
452{ 435{
453 return type (p) == T_FOREIGN; 436 return type (p) == T_FOREIGN;
454} 437}
455 438
456INTERFACE INLINE char * 439INTERFACE char *
457syntaxname (pointer p) 440syntaxname (pointer p)
458{ 441{
459 return strvalue (car (p)); 442 return strvalue (car (p));
460} 443}
461 444
462#define procnum(p) ivalue (p) 445#define procnum(p) ivalue (p)
463static const char *procname (pointer x); 446static const char *procname (pointer x);
464 447
465INTERFACE INLINE int 448INTERFACE int
466is_closure (pointer p) 449is_closure (pointer p)
467{ 450{
468 return type (p) == T_CLOSURE; 451 return type (p) == T_CLOSURE;
469} 452}
470 453
471INTERFACE INLINE int 454INTERFACE int
472is_macro (pointer p) 455is_macro (pointer p)
473{ 456{
474 return type (p) == T_MACRO; 457 return type (p) == T_MACRO;
475} 458}
476 459
477INTERFACE INLINE pointer 460INTERFACE pointer
478closure_code (pointer p) 461closure_code (pointer p)
479{ 462{
480 return car (p); 463 return car (p);
481} 464}
482 465
483INTERFACE INLINE pointer 466INTERFACE pointer
484closure_env (pointer p) 467closure_env (pointer p)
485{ 468{
486 return cdr (p); 469 return cdr (p);
487} 470}
488 471
489INTERFACE INLINE int 472INTERFACE int
490is_continuation (pointer p) 473is_continuation (pointer p)
491{ 474{
492 return type (p) == T_CONTINUATION; 475 return type (p) == T_CONTINUATION;
493} 476}
494 477
495#define cont_dump(p) cdr (p) 478#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 479#define set_cont_dump(p,v) set_cdr ((p), (v))
497 480
498/* To do: promise should be forced ONCE only */ 481/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 482INTERFACE int
500is_promise (pointer p) 483is_promise (pointer p)
501{ 484{
502 return type (p) == T_PROMISE; 485 return type (p) == T_PROMISE;
503} 486}
504 487
505INTERFACE INLINE int 488INTERFACE int
506is_environment (pointer p) 489is_environment (pointer p)
507{ 490{
508 return type (p) == T_ENVIRONMENT; 491 return type (p) == T_ENVIRONMENT;
509} 492}
510 493
… …
516 499
517#define is_mark(p) (typeflag (p) & T_MARK) 500#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 501#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 502#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 503
521INTERFACE INLINE int 504INTERFACE int
522is_immutable (pointer p) 505is_immutable (pointer p)
523{ 506{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 508}
526 509
527INTERFACE INLINE void 510INTERFACE void
528setimmutable (pointer p) 511setimmutable (pointer p)
529{ 512{
530#if USE_ERROR_CHECKING 513#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 514 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 515#endif
533} 516}
534 517
535#if USE_CHAR_CLASSIFIERS 518#if USE_CHAR_CLASSIFIERS
536static INLINE int 519ecb_inline int
537Cisalpha (int c) 520Cisalpha (int c)
538{ 521{
539 return isascii (c) && isalpha (c); 522 return isascii (c) && isalpha (c);
540} 523}
541 524
542static INLINE int 525ecb_inline int
543Cisdigit (int c) 526Cisdigit (int c)
544{ 527{
545 return isascii (c) && isdigit (c); 528 return isascii (c) && isdigit (c);
546} 529}
547 530
548static INLINE int 531ecb_inline int
549Cisspace (int c) 532Cisspace (int c)
550{ 533{
551 return isascii (c) && isspace (c); 534 return isascii (c) && isspace (c);
552} 535}
553 536
554static INLINE int 537ecb_inline int
555Cisupper (int c) 538Cisupper (int c)
556{ 539{
557 return isascii (c) && isupper (c); 540 return isascii (c) && isupper (c);
558} 541}
559 542
560static INLINE int 543ecb_inline int
561Cislower (int c) 544Cislower (int c)
562{ 545{
563 return isascii (c) && islower (c); 546 return isascii (c) && islower (c);
564} 547}
565#endif 548#endif
… …
626#endif 609#endif
627 610
628static int file_push (SCHEME_P_ const char *fname); 611static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 612static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 613static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 614ecb_inline int is_one_of (char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 615static int alloc_cellseg (SCHEME_P_ int n);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 617static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 618static int count_consecutive_cells (pointer x, int needed);
636static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
637static pointer mk_number (SCHEME_P_ const num n); 620static pointer mk_number (SCHEME_P_ const num n);
638static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 621static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
655static int basic_inchar (port *pt); 638static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 639static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 640static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 641static char *readstr_upto (SCHEME_P_ char *delim);
659static pointer readstrexp (SCHEME_P); 642static pointer readstrexp (SCHEME_P);
660static INLINE int skipspace (SCHEME_P); 643ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 644static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 645static void printslashstring (SCHEME_P_ char *s, int len);
663static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
664static void printatom (SCHEME_P_ pointer l, int f); 647static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 652static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 653static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 654static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 655static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 656static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 657static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
658static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 659static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 660static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 661static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 662static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 663static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 665static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 666static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 668
685static num 669static num
686num_add (num a, num b) 670num_op (enum num_op op, num a, num b)
687{ 671{
688 num ret; 672 num ret;
689 673
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
691 675
692 if (num_is_fixnum (ret)) 676 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 677 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op)
682 {
683 case NUM_ADD: av += bv; break;
684 case NUM_SUB: av -= bv; break;
685 case NUM_MUL: av *= bv; break;
686 case NUM_INTDIV: av /= bv; break;
687 }
688
689 num_set_ivalue (ret, av);
690 }
694 else 691 else
695 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 692 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
696 695
697 return ret; 696 switch (op)
698} 697 {
698 case NUM_ADD: av += bv; break;
699 case NUM_SUB: av -= bv; break;
700 case NUM_MUL: av *= bv; break;
701 case NUM_INTDIV: av /= bv; break;
702 }
699 703
700static num 704 num_set_rvalue (ret, av);
701num_mul (num a, num b) 705 }
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 706
712 return ret; 707 return ret;
713} 708}
714 709
715static num 710static num
… …
726 721
727 return ret; 722 return ret;
728} 723}
729 724
730static num 725static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756
757 return ret;
758}
759
760static num
761num_rem (num a, num b) 726num_rem (num a, num b)
762{ 727{
763 num ret; 728 num ret;
764 long e1, e2, res; 729 long e1, e2, res;
765 730
… …
801 766
802 num_set_ivalue (ret, res); 767 num_set_ivalue (ret, res);
803 return ret; 768 return ret;
804} 769}
805 770
771/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 772static int
807num_eq (num a, num b) 773num_cmp (num a, num b)
808{ 774{
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 776 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 777
812 if (is_fixnum) 778 if (is_fixnum)
813 ret = num_get_ivalue (a) == num_get_ivalue (b); 779 {
780 IVALUE av = num_get_ivalue (a);
781 IVALUE bv = num_get_ivalue (b);
782
783 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 }
814 else 785 else
815 ret = num_get_rvalue (a) == num_get_rvalue (b); 786 {
787 RVALUE av = num_get_rvalue (a);
788 RVALUE bv = num_get_rvalue (b);
789
790 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 }
816 792
817 return ret; 793 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 794}
860 795
861#if USE_MATH 796#if USE_MATH
862 797
863/* Round to nearest. Round to even if midway */ 798/* Round to nearest. Round to even if midway */
… …
873 return ce; 808 return ce;
874 else if (dfl < dce) 809 else if (dfl < dce)
875 return fl; 810 return fl;
876 else 811 else
877 { 812 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 813 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 814 return fl;
880 else 815 else
881 return ce; 816 return ce;
882 } 817 }
883} 818}
884#endif 819#endif
885 820
886static int 821static int
887is_zero_rvalue (RVALUE x) 822is_zero_rvalue (RVALUE x)
888{ 823{
824 return x == 0;
825#if 0
889#if USE_REAL 826#if USE_REAL
890 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 827 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
891#else 828#else
892 return x == 0; 829 return x == 0;
830#endif
893#endif 831#endif
894} 832}
895 833
896/* allocate new cell segment */ 834/* allocate new cell segment */
897static int 835static int
… …
969 907
970 return n; 908 return n;
971} 909}
972 910
973/* get new cell. parameter a, b is marked by gc. */ 911/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 912ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 913get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 914{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 915 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 916 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1057 push_recent_alloc (SCHEME_A_ v, NIL); 995 push_recent_alloc (SCHEME_A_ v, NIL);
1058 996
1059 return v; 997 return v;
1060} 998}
1061 999
1062static INLINE void 1000ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1001ok_to_freely_gc (SCHEME_P)
1064{ 1002{
1065 set_car (S_SINK, NIL); 1003 set_car (S_SINK, NIL);
1066} 1004}
1067 1005
… …
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1069 location = hash_fn (name, veclength (SCHEME_V->oblist));
1132 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1133 return x; 1071 return x;
1134} 1072}
1135 1073
1136static INLINE pointer 1074ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1075oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1076{
1139 int location; 1077 int location;
1140 pointer x; 1078 pointer x;
1141 char *s; 1079 char *s;
… …
1174oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1175{ 1113{
1176 return NIL; 1114 return NIL;
1177} 1115}
1178 1116
1179static INLINE pointer 1117ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1118oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1119{
1182 pointer x; 1120 pointer x;
1183 char *s; 1121 char *s;
1184 1122
… …
2282 } 2220 }
2283 } 2221 }
2284} 2222}
2285 2223
2286/* check c is in chars */ 2224/* check c is in chars */
2287static INLINE int 2225ecb_inline int
2288is_one_of (char *s, int c) 2226is_one_of (char *s, int c)
2289{ 2227{
2290 if (c == EOF) 2228 if (c == EOF)
2291 return 1; 2229 return 1;
2292 2230
2293 return !!strchr (s, c); 2231 return !!strchr (s, c);
2294} 2232}
2295 2233
2296/* skip white characters */ 2234/* skip white characters */
2297static INLINE int 2235ecb_inline int
2298skipspace (SCHEME_P) 2236skipspace (SCHEME_P)
2299{ 2237{
2300 int c, curr_line = 0; 2238 int c, curr_line = 0;
2301 2239
2302 do 2240 do
… …
2530 { 2468 {
2531 p = SCHEME_V->strbuff; 2469 p = SCHEME_V->strbuff;
2532 2470
2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2471 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2534 { 2472 {
2535 if (num_is_integer (l)) 2473 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2474 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2475#if USE_REAL
2538 else 2476 else
2539 { 2477 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2478 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2795 return 0; 2733 return 0;
2796 } 2734 }
2797 else if (is_number (a)) 2735 else if (is_number (a))
2798 { 2736 {
2799 if (is_number (b)) 2737 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2738 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2739
2803 return 0; 2740 return 0;
2804 } 2741 }
2805 else if (is_character (a)) 2742 else if (is_character (a))
2806 { 2743 {
… …
2873 2810
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2811 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2812 setenvironment (SCHEME_V->envir);
2876} 2813}
2877 2814
2878static INLINE void 2815ecb_inline void
2879new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2880{ 2817{
2881 pointer slot = immutable_cons (variable, value); 2818 pointer slot = immutable_cons (variable, value);
2882 2819
2883 if (is_vector (car (env))) 2820 if (is_vector (car (env)))
… …
2923 return NIL; 2860 return NIL;
2924} 2861}
2925 2862
2926#else /* USE_ALIST_ENV */ 2863#else /* USE_ALIST_ENV */
2927 2864
2928static INLINE void 2865ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2866new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2867{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2868 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2869 setenvironment (SCHEME_V->envir);
2933} 2870}
2934 2871
2935static INLINE void 2872ecb_inline void
2936new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2937{ 2874{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2876}
2940 2877
… …
2962 return NIL; 2899 return NIL;
2963} 2900}
2964 2901
2965#endif /* USE_ALIST_ENV else */ 2902#endif /* USE_ALIST_ENV else */
2966 2903
2967static INLINE void 2904ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2906{
2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2971} 2908}
2972 2909
2973static INLINE void 2910ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2912{
2976 set_cdr (slot, value); 2913 set_cdr (slot, value);
2977} 2914}
2978 2915
2979static INLINE pointer 2916ecb_inline pointer
2980slot_value_in_env (pointer slot) 2917slot_value_in_env (pointer slot)
2981{ 2918{
2982 return cdr (slot); 2919 return cdr (slot);
2983} 2920}
2984 2921
2985/* ========== Evaluation Cycle ========== */ 2922/* ========== Evaluation Cycle ========== */
2986 2923
2987static pointer 2924static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 2925xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 2926{
2990#if USE_ERROR_HOOK 2927#if USE_ERROR_HOOK
2991 pointer x; 2928 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 2929 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 2964 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 2965 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 2966 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 2967 SCHEME_V->op = OP_EVAL;
3031 2968
3032 return S_T; 2969 return 0;
3033 } 2970 }
3034#endif 2971#endif
3035 2972
3036 if (a) 2973 if (a)
3037 SCHEME_V->args = cons (a, NIL); 2974 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 2976 SCHEME_V->args = NIL;
3040 2977
3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2978 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3042 setimmutable (car (SCHEME_V->args)); 2979 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 2980 SCHEME_V->op = OP_ERR0;
2981
3044 return S_T; 2982 return 0;
3045} 2983}
3046 2984
3047#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 2985#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3048#define Error_0(s) Error_1 (s, 0) 2986#define Error_0(s) Error_1 (s, 0)
3049 2987
3050/* Too small to turn into function */ 2988/* Too small to turn into function */
3051#define BEGIN do { 2989#define BEGIN do {
3052#define END } while (0) 2990#define END } while (0)
3053#define s_goto(a) BEGIN \ 2991#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 2992 SCHEME_V->op = a; \
3055 return S_T; END 2993 return 0; END
3056 2994
3057#define s_return(a) return xs_return (SCHEME_A_ a) 2995#define s_return(a) return xs_return (SCHEME_A_ a)
3058 2996
3059#ifndef USE_SCHEME_STACK 2997#ifndef USE_SCHEME_STACK
3060 2998
… …
3085 next_frame = SCHEME_V->dump_base + nframes; 3023 next_frame = SCHEME_V->dump_base + nframes;
3086 3024
3087 next_frame->op = op; 3025 next_frame->op = op;
3088 next_frame->args = args; 3026 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3027 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3028 next_frame->code = code;
3091 3029
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3031}
3094 3032
3095static pointer 3033static int
3096xs_return (SCHEME_P_ pointer a) 3034xs_return (SCHEME_P_ pointer a)
3097{ 3035{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3036 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3037 struct dump_stack_frame *frame;
3100 3038
3101 SCHEME_V->value = a; 3039 SCHEME_V->value = a;
3102 3040
3103 if (nframes <= 0) 3041 if (nframes <= 0)
3104 return NIL; 3042 return -1;
3105 3043
3106 frame = &SCHEME_V->dump_base[--nframes]; 3044 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3045 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3046 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3047 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3048 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3050
3113 return S_T; 3051 return 0;
3114} 3052}
3115 3053
3116static INLINE void 3054ecb_inline void
3117dump_stack_reset (SCHEME_P) 3055dump_stack_reset (SCHEME_P)
3118{ 3056{
3119 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3057 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3120 SCHEME_V->dump = (pointer)+0; 3058 SCHEME_V->dump = (pointer)+0;
3121} 3059}
3122 3060
3123static INLINE void 3061ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3062dump_stack_initialize (SCHEME_P)
3125{ 3063{
3126 SCHEME_V->dump_size = 0; 3064 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3065 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3066 dump_stack_reset (SCHEME_A);
… …
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3133 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3134}
3197 3135
3198#else 3136#else
3199 3137
3200static INLINE void 3138ecb_inline void
3201dump_stack_reset (SCHEME_P) 3139dump_stack_reset (SCHEME_P)
3202{ 3140{
3203 SCHEME_V->dump = NIL; 3141 SCHEME_V->dump = NIL;
3204} 3142}
3205 3143
3206static INLINE void 3144ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3145dump_stack_initialize (SCHEME_P)
3208{ 3146{
3209 dump_stack_reset (SCHEME_A); 3147 dump_stack_reset (SCHEME_A);
3210} 3148}
3211 3149
… …
3213dump_stack_free (SCHEME_P) 3151dump_stack_free (SCHEME_P)
3214{ 3152{
3215 SCHEME_V->dump = NIL; 3153 SCHEME_V->dump = NIL;
3216} 3154}
3217 3155
3218static pointer 3156static int
3219xs_return (SCHEME_P_ pointer a) 3157xs_return (SCHEME_P_ pointer a)
3220{ 3158{
3221 pointer dump = SCHEME_V->dump; 3159 pointer dump = SCHEME_V->dump;
3222 3160
3223 SCHEME_V->value = a; 3161 SCHEME_V->value = a;
3224 3162
3225 if (dump == NIL) 3163 if (dump == NIL)
3226 return NIL; 3164 return -1;
3227 3165
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3167 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3169 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3170
3233 SCHEME_V->dump = dump; 3171 SCHEME_V->dump = dump;
3234 3172
3235 return S_T; 3173 return 0;
3236} 3174}
3237 3175
3238static void 3176static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3178{
… …
3265 3203
3266#endif 3204#endif
3267 3205
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3207
3270static pointer 3208static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3209opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3210{
3211 pointer args = SCHEME_V->args;
3273 pointer x, y; 3212 pointer x, y;
3274 3213
3275 switch (op) 3214 switch (op)
3276 { 3215 {
3277 case OP_LOAD: /* load */ 3216 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3217 if (file_interactive (SCHEME_A))
3279 { 3218 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3221 }
3283 3222
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3223 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3224 Error_1 ("unable to open", car (args));
3286 else 3225 else
3287 { 3226 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3228 s_goto (OP_T0LVL);
3290 } 3229 }
… …
3364 case OP_EVAL: /* main part of evaluation */ 3303 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3304#if USE_TRACING
3366 if (SCHEME_V->tracing) 3305 if (SCHEME_V->tracing)
3367 { 3306 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3307 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3308 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3309 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3310 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3311 s_goto (OP_P0LIST);
3373 } 3312 }
3374 3313
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3357 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3358 s_goto (OP_E1ARGS);
3420 } 3359 }
3421 3360
3422 case OP_E1ARGS: /* eval arguments */ 3361 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3362 args = cons (SCHEME_V->value, args);
3424 3363
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3364 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3365 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3366 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3367 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3368 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3369 s_goto (OP_EVAL);
3431 } 3370 }
3432 else /* end */ 3371 else /* end */
3433 { 3372 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3373 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3374 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3375 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3376 s_goto (OP_APPLY);
3438 } 3377 }
3439 3378
3440#if USE_TRACING 3379#if USE_TRACING
3441 3380
3442 case OP_TRACING: 3381 case OP_TRACING:
3443 { 3382 {
3444 int tr = SCHEME_V->tracing; 3383 int tr = SCHEME_V->tracing;
3445 3384
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3385 SCHEME_V->tracing = ivalue (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3386 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3387 }
3449 3388
3450#endif 3389#endif
3451 3390
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3391 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3392#if USE_TRACING
3454 if (SCHEME_V->tracing) 3393 if (SCHEME_V->tracing)
3455 { 3394 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3395 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3396 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3397 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3398 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3399 s_goto (OP_P0LIST);
3461 } 3400 }
3462 3401
3463 /* fall through */ 3402 /* fall through */
3464 3403
3465 case OP_REAL_APPLY: 3404 case OP_REAL_APPLY:
3466#endif 3405#endif
3467 if (is_proc (SCHEME_V->code)) 3406 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3408 else if (is_foreign (SCHEME_V->code))
3472 { 3409 {
3473 /* Keep nested calls from GC'ing the arglist */ 3410 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3411 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3413
3477 s_return (x); 3414 s_return (x);
3478 } 3415 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3416 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3417 {
3481 /* Should not accept promise */ 3418 /* Should not accept promise */
3482 /* make environment */ 3419 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3420 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3421
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3422 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3423 {
3487 if (y == NIL) 3424 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3425 Error_0 ("not enough arguments");
3489 else 3426 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3427 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3445 s_goto (OP_BEGIN);
3509 } 3446 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3447 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3448 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3449 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3450 s_return (args != NIL ? car (args) : NIL);
3514 } 3451 }
3515 else 3452 else
3516 Error_0 ("illegal function"); 3453 Error_0 ("illegal function");
3517 3454
3518 case OP_DOMACRO: /* do macro */ 3455 case OP_DOMACRO: /* do macro */
… …
3527 { 3464 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3465 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3466
3530 if (f != NIL) 3467 if (f != NIL)
3531 { 3468 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3469 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3470 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3471 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3472 s_goto (OP_APPLY);
3536 } 3473 }
3537 3474
… …
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3485 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549 3486
3550#endif 3487#endif
3551 3488
3552 case OP_MKCLOSURE: /* make-closure */ 3489 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3490 x = car (args);
3554 3491
3555 if (car (x) == SCHEME_V->LAMBDA) 3492 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3493 x = cdr (x);
3557 3494
3558 if (cdr (SCHEME_V->args) == NIL) 3495 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3496 y = SCHEME_V->envir;
3560 else 3497 else
3561 y = cadr (SCHEME_V->args); 3498 y = cadr (args);
3562 3499
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3500 s_return (mk_closure (SCHEME_A_ x, y));
3564 3501
3565 case OP_QUOTE: /* quote */ 3502 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3503 s_return (car (SCHEME_V->code));
… …
3598 3535
3599 3536
3600 case OP_DEFP: /* defined? */ 3537 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3538 x = SCHEME_V->envir;
3602 3539
3603 if (cdr (SCHEME_V->args) != NIL) 3540 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3541 x = cadr (args);
3605 3542
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3543 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3544
3608 case OP_SET0: /* set! */ 3545 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3546 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3547 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3548
… …
3642 3579
3643 case OP_IF1: /* if */ 3580 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3581 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3582 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3583 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3584 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3585 s_goto (OP_EVAL);
3651 3586
3652 case OP_LET0: /* let */ 3587 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3588 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3589 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3590 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3591 s_goto (OP_LET1);
3657 3592
3658 case OP_LET1: /* let (calculate parameters) */ 3593 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3594 args = cons (SCHEME_V->value, args);
3660 3595
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3596 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3597 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3598 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3664 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3599 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3600
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3601 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3602 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3603 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3604 s_goto (OP_EVAL);
3670 } 3605 }
3671 else /* end */ 3606 else /* end */
3672 { 3607 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3608 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3609 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3610 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3611 s_goto (OP_LET2);
3677 } 3612 }
3678 3613
3679 case OP_LET2: /* let */ 3614 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3616
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3617 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3618 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3619 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3620
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3621 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3622 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3623 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3624 {
3690 if (!is_pair (x)) 3625 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3626 Error_1 ("Bad syntax of binding in let :", x);
3692 3627
3693 if (!is_list (SCHEME_A_ car (x))) 3628 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3629 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3630
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3631 args = cons (caar (x), args);
3697 } 3632 }
3698 3633
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3634 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3635 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3636 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3637 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3638 }
3706 else 3639 else
3707 { 3640 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3641 SCHEME_V->code = cdr (SCHEME_V->code);
3642 }
3643
3709 SCHEME_V->args = NIL; 3644 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3645 s_goto (OP_BEGIN);
3713 3646
3714 case OP_LET0AST: /* let* */ 3647 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3648 if (car (SCHEME_V->code) == NIL)
3716 { 3649 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3667 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3669
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3670 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3671 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3672 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3673 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3743 } 3676 }
3744 else /* end */ 3677 else /* end */
3745 { 3678 {
3746 SCHEME_V->code = SCHEME_V->args; 3679 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3680 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3681 s_goto (OP_BEGIN);
3749 } 3682 }
3750 3683
3751 case OP_LET0REC: /* letrec */ 3684 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3687 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3688 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3689 s_goto (OP_LET1REC);
3757 3690
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3691 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3692 args = cons (SCHEME_V->value, args);
3760 3693
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3694 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3695 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3696 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3764 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3697 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3698
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3699 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3770 } 3703 }
3771 else /* end */ 3704 else /* end */
3772 { 3705 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3706 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3707 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3708 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3709 s_goto (OP_LET2REC);
3777 } 3710 }
3778 3711
3779 case OP_LET2REC: /* letrec */ 3712 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3713 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3714 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3715
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3716 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3718 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3805 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3806 s_goto (OP_EVAL);
3874 3807
3875 case OP_C1STREAM: /* cons-stream */ 3808 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3809 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3877 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3810 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3811 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3812 s_return (cons (args, x));
3880 3813
3881 case OP_MACRO0: /* macro */ 3814 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3815 if (is_pair (car (SCHEME_V->code)))
3883 { 3816 {
3884 x = caar (SCHEME_V->code); 3817 x = caar (SCHEME_V->code);
… …
3917 { 3850 {
3918 if (!is_pair (y = caar (x))) 3851 if (!is_pair (y = caar (x)))
3919 break; 3852 break;
3920 3853
3921 for (; y != NIL; y = cdr (y)) 3854 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3855 if (eqv (car (y), SCHEME_V->value))
3924 break; 3856 break;
3925 }
3926 3857
3927 if (y != NIL) 3858 if (y != NIL)
3928 break; 3859 break;
3929 } 3860 }
3930 3861
… …
3950 s_goto (OP_BEGIN); 3881 s_goto (OP_BEGIN);
3951 else 3882 else
3952 s_return (NIL); 3883 s_return (NIL);
3953 3884
3954 case OP_PAPPLY: /* apply */ 3885 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3886 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3888 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3889 s_goto (OP_APPLY);
3959 3890
3960 case OP_PEVAL: /* eval */ 3891 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3892 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3893 SCHEME_V->envir = cadr (args);
3963 3894
3964 SCHEME_V->code = car (SCHEME_V->args); 3895 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3896 s_goto (OP_EVAL);
3966 3897
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3898 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3900 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 3901 s_goto (OP_APPLY);
3971 } 3902 }
3972 3903
3973 return S_T; 3904 if (USE_ERROR_CHECKING) abort ();
3974} 3905}
3975 3906
3976static pointer 3907static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3908opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3909{
3979 pointer x; 3910 pointer args = SCHEME_V->args;
3911 pointer x = car (args);
3980 num v; 3912 num v;
3981 3913
3982#if USE_MATH 3914#if USE_MATH
3983 RVALUE dd; 3915 RVALUE dd;
3984#endif 3916#endif
3985 3917
3986 switch (op) 3918 switch (op)
3987 { 3919 {
3988#if USE_MATH 3920#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3921 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args);
3992
3993 if (num_is_integer (x)) 3922 if (is_integer (x))
3994 s_return (x); 3923 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3924 else if (modf (rvalue_unchecked (x), &dd) == 0)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3925 s_return (mk_integer (SCHEME_A_ ivalue (x)));
3997 else 3926 else
3998 Error_1 ("inexact->exact: not integral:", x); 3927 Error_1 ("inexact->exact: not integral:", x);
3999 3928
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 3936
4028 case OP_ATAN: 3937 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 3938 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 3940 else
4034 { 3941 {
4035 pointer y = cadr (SCHEME_V->args); 3942 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 3944 }
4039 3945
4040 case OP_SQRT: 3946 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 3948
4044 case OP_EXPT: 3949 case OP_EXPT:
4045 { 3950 {
4046 RVALUE result; 3951 RVALUE result;
4047 int real_result = 1; 3952 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 3953 pointer y = cadr (args);
4049 3954
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 3955 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 3956 real_result = 0;
4054 3957
4055 /* This 'if' is an R5RS compatibility fix. */ 3958 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 3959 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 3960 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 3961 result = 0;
4059 else 3962 else
4060 result = pow (rvalue (x), rvalue (y)); 3963 result = pow (rvalue (x), rvalue (y));
4061 3964
4062 /* Before returning integer result make sure we can. */ 3965 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 3966 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 3967 if (!real_result)
4065 { 3968 {
4066 long result_as_long = (long) result; 3969 long result_as_long = result;
4067 3970
4068 if (result != (RVALUE) result_as_long) 3971 if (result != (RVALUE) result_as_long)
4069 real_result = 1; 3972 real_result = 1;
4070 } 3973 }
4071 3974
… …
4073 s_return (mk_real (SCHEME_A_ result)); 3976 s_return (mk_real (SCHEME_A_ result));
4074 else 3977 else
4075 s_return (mk_integer (SCHEME_A_ result)); 3978 s_return (mk_integer (SCHEME_A_ result));
4076 } 3979 }
4077 3980
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 3983
4086 case OP_TRUNCATE: 3984 case OP_TRUNCATE:
4087 { 3985 {
4088 RVALUE rvalue_of_x; 3986 RVALUE rvalue_of_x;
4089 3987
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x); 3988 rvalue_of_x = rvalue (x);
4092 3989
4093 if (rvalue_of_x > 0) 3990 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4095 else 3992 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 3994 }
4098 3995
4099 case OP_ROUND: 3996 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 3997 if (num_is_integer (x))
4103 s_return (x); 3998 s_return (x);
4104 3999
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4001#endif
4107 4002
4108 case OP_ADD: /* + */ 4003 case OP_ADD: /* + */
4109 v = num_zero; 4004 v = num_zero;
4110 4005
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4006 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4007 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4008
4114 s_return (mk_number (SCHEME_A_ v)); 4009 s_return (mk_number (SCHEME_A_ v));
4115 4010
4116 case OP_MUL: /* * */ 4011 case OP_MUL: /* * */
4117 v = num_one; 4012 v = num_one;
4118 4013
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4014 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4015 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4016
4122 s_return (mk_number (SCHEME_A_ v)); 4017 s_return (mk_number (SCHEME_A_ v));
4123 4018
4124 case OP_SUB: /* - */ 4019 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4020 if (cdr (args) == NIL)
4126 { 4021 {
4127 x = SCHEME_V->args; 4022 x = args;
4128 v = num_zero; 4023 v = num_zero;
4129 } 4024 }
4130 else 4025 else
4131 { 4026 {
4132 x = cdr (SCHEME_V->args); 4027 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4028 v = nvalue (car (args));
4134 } 4029 }
4135 4030
4136 for (; x != NIL; x = cdr (x)) 4031 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4032 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4033
4139 s_return (mk_number (SCHEME_A_ v)); 4034 s_return (mk_number (SCHEME_A_ v));
4140 4035
4141 case OP_DIV: /* / */ 4036 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4037 if (cdr (args) == NIL)
4143 { 4038 {
4144 x = SCHEME_V->args; 4039 x = args;
4145 v = num_one; 4040 v = num_one;
4146 } 4041 }
4147 else 4042 else
4148 { 4043 {
4149 x = cdr (SCHEME_V->args); 4044 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4045 v = nvalue (car (args));
4151 } 4046 }
4152 4047
4153 for (; x != NIL; x = cdr (x)) 4048 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4049 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4050 v = num_div (v, nvalue (car (x)));
4157 else 4051 else
4158 Error_0 ("/: division by zero"); 4052 Error_0 ("/: division by zero");
4159 }
4160 4053
4161 s_return (mk_number (SCHEME_A_ v)); 4054 s_return (mk_number (SCHEME_A_ v));
4162 4055
4163 case OP_INTDIV: /* quotient */ 4056 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4057 if (cdr (args) == NIL)
4165 { 4058 {
4166 x = SCHEME_V->args; 4059 x = args;
4167 v = num_one; 4060 v = num_one;
4168 } 4061 }
4169 else 4062 else
4170 { 4063 {
4171 x = cdr (SCHEME_V->args); 4064 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4065 v = nvalue (car (args));
4173 } 4066 }
4174 4067
4175 for (; x != NIL; x = cdr (x)) 4068 for (; x != NIL; x = cdr (x))
4176 { 4069 {
4177 if (ivalue (car (x)) != 0) 4070 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4071 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4072 else
4180 Error_0 ("quotient: division by zero"); 4073 Error_0 ("quotient: division by zero");
4181 } 4074 }
4182 4075
4183 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4184 4077
4185 case OP_REM: /* remainder */ 4078 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4079 v = nvalue (x);
4187 4080
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4081 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4082 v = num_rem (v, nvalue (cadr (args)));
4190 else 4083 else
4191 Error_0 ("remainder: division by zero"); 4084 Error_0 ("remainder: division by zero");
4192 4085
4193 s_return (mk_number (SCHEME_A_ v)); 4086 s_return (mk_number (SCHEME_A_ v));
4194 4087
4195 case OP_MOD: /* modulo */ 4088 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4089 v = nvalue (x);
4197 4090
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4091 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4092 v = num_mod (v, nvalue (cadr (args)));
4200 else 4093 else
4201 Error_0 ("modulo: division by zero"); 4094 Error_0 ("modulo: division by zero");
4202 4095
4203 s_return (mk_number (SCHEME_A_ v)); 4096 s_return (mk_number (SCHEME_A_ v));
4204 4097
4205 case OP_CAR: /* car */ 4098 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4099 s_return (caar (args));
4207 4100
4208 case OP_CDR: /* cdr */ 4101 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4102 s_return (cdar (args));
4210 4103
4211 case OP_CONS: /* cons */ 4104 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4105 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4106 s_return (args);
4214 4107
4215 case OP_SETCAR: /* set-car! */ 4108 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4109 if (!is_immutable (x))
4217 { 4110 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4111 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4112 s_return (car (args));
4220 } 4113 }
4221 else 4114 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4115 Error_0 ("set-car!: unable to alter immutable pair");
4223 4116
4224 case OP_SETCDR: /* set-cdr! */ 4117 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4118 if (!is_immutable (x))
4226 { 4119 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4120 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4121 s_return (car (args));
4229 } 4122 }
4230 else 4123 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4124 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4125
4233 case OP_CHAR2INT: /* char->integer */ 4126 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4127 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4235 4128
4236 case OP_INT2CHAR: /* integer->char */ 4129 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4130 s_return (mk_character (SCHEME_A_ ivalue (x)));
4238 4131
4239 case OP_CHARUPCASE: 4132 case OP_CHARUPCASE:
4240 { 4133 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4134 unsigned char c = ivalue (x);
4242 c = toupper (c); 4135 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4136 s_return (mk_character (SCHEME_A_ c));
4244 } 4137 }
4245 4138
4246 case OP_CHARDNCASE: 4139 case OP_CHARDNCASE:
4247 { 4140 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4141 unsigned char c = ivalue (x);
4249 c = tolower (c); 4142 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4143 s_return (mk_character (SCHEME_A_ c));
4251 } 4144 }
4252 4145
4253 case OP_STR2SYM: /* string->symbol */ 4146 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4147 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4148
4256 case OP_STR2ATOM: /* string->atom */ 4149 case OP_STR2ATOM: /* string->atom */
4257 { 4150 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4151 char *s = strvalue (x);
4259 long pf = 0; 4152 long pf = 0;
4260 4153
4261 if (cdr (SCHEME_V->args) != NIL) 4154 if (cdr (args) != NIL)
4262 { 4155 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4156 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4157 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4158 pf = ivalue_unchecked (cadr (args));
4266 4159
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4160 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4161 {
4269 /* base is OK */ 4162 /* base is OK */
4270 } 4163 }
4271 else 4164 else
4272 pf = -1; 4165 pf = -1;
4273 } 4166 }
4274 4167
4275 if (pf < 0) 4168 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4169 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4170 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4171 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4172 else
4280 { 4173 {
4281 if (pf == 0 || pf == 10) 4174 if (pf == 0 || pf == 10)
… …
4292 } 4185 }
4293 } 4186 }
4294 } 4187 }
4295 4188
4296 case OP_SYM2STR: /* symbol->string */ 4189 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4190 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4191 setimmutable (x);
4299 s_return (x); 4192 s_return (x);
4300 4193
4301 case OP_ATOM2STR: /* atom->string */ 4194 case OP_ATOM2STR: /* atom->string */
4302 { 4195 {
4303 long pf = 0; 4196 long pf = 0;
4304 4197
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4198 if (cdr (args) != NIL)
4308 { 4199 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4200 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4201 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4202 pf = ivalue_unchecked (cadr (args));
4312 4203
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4204 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4205 {
4315 /* base is OK */ 4206 /* base is OK */
4316 } 4207 }
4317 else 4208 else
4318 pf = -1; 4209 pf = -1;
4319 } 4210 }
4320 4211
4321 if (pf < 0) 4212 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4213 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4214 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4215 {
4325 char *p; 4216 char *p;
4326 int len; 4217 int len;
4327 4218
… …
4335 case OP_MKSTRING: /* make-string */ 4226 case OP_MKSTRING: /* make-string */
4336 { 4227 {
4337 int fill = ' '; 4228 int fill = ' ';
4338 int len; 4229 int len;
4339 4230
4340 len = ivalue (car (SCHEME_V->args)); 4231 len = ivalue (x);
4341 4232
4342 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args)); 4234 fill = charvalue (cadr (args));
4344 4235
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4236 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4237 }
4347 4238
4348 case OP_STRLEN: /* string-length */ 4239 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4240 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4241
4351 case OP_STRREF: /* string-ref */ 4242 case OP_STRREF: /* string-ref */
4352 { 4243 {
4353 char *str; 4244 char *str;
4354 int index; 4245 int index;
4355 4246
4356 str = strvalue (car (SCHEME_V->args)); 4247 str = strvalue (x);
4357 4248
4358 index = ivalue (cadr (SCHEME_V->args)); 4249 index = ivalue (cadr (args));
4359 4250
4360 if (index >= strlength (car (SCHEME_V->args))) 4251 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4252 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4253
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4255 }
4365 4256
4366 case OP_STRSET: /* string-set! */ 4257 case OP_STRSET: /* string-set! */
4367 { 4258 {
4368 char *str; 4259 char *str;
4369 int index; 4260 int index;
4370 int c; 4261 int c;
4371 4262
4372 if (is_immutable (car (SCHEME_V->args))) 4263 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4264 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4265
4375 str = strvalue (car (SCHEME_V->args)); 4266 str = strvalue (x);
4376 4267
4377 index = ivalue (cadr (SCHEME_V->args)); 4268 index = ivalue (cadr (args));
4378 4269
4379 if (index >= strlength (car (SCHEME_V->args))) 4270 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4271 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4272
4382 c = charvalue (caddr (SCHEME_V->args)); 4273 c = charvalue (caddr (args));
4383 4274
4384 str[index] = (char) c; 4275 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4276 s_return (car (args));
4386 } 4277 }
4387 4278
4388 case OP_STRAPPEND: /* string-append */ 4279 case OP_STRAPPEND: /* string-append */
4389 { 4280 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4281 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4282 int len = 0;
4392 pointer newstr; 4283 pointer newstr;
4393 char *pos; 4284 char *pos;
4394 4285
4395 /* compute needed length for new string */ 4286 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4287 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4288 len += strlength (car (x));
4398 4289
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4290 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4291
4401 /* store the contents of the argument strings into the new string */ 4292 /* store the contents of the argument strings into the new string */
4402 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4293 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4294 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4295
4405 s_return (newstr); 4296 s_return (newstr);
4406 } 4297 }
4407 4298
… …
4410 char *str; 4301 char *str;
4411 int index0; 4302 int index0;
4412 int index1; 4303 int index1;
4413 int len; 4304 int len;
4414 4305
4415 str = strvalue (car (SCHEME_V->args)); 4306 str = strvalue (x);
4416 4307
4417 index0 = ivalue (cadr (SCHEME_V->args)); 4308 index0 = ivalue (cadr (args));
4418 4309
4419 if (index0 > strlength (car (SCHEME_V->args))) 4310 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4311 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4312
4422 if (cddr (SCHEME_V->args) != NIL) 4313 if (cddr (args) != NIL)
4423 { 4314 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4315 index1 = ivalue (caddr (args));
4425 4316
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4317 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4318 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4319 }
4429 else 4320 else
4430 index1 = strlength (car (SCHEME_V->args)); 4321 index1 = strlength (x);
4431 4322
4432 len = index1 - index0; 4323 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4324 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4325 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4326 strvalue (x)[len] = 0;
… …
4439 4330
4440 case OP_VECTOR: /* vector */ 4331 case OP_VECTOR: /* vector */
4441 { 4332 {
4442 int i; 4333 int i;
4443 pointer vec; 4334 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4335 int len = list_length (SCHEME_A_ args);
4445 4336
4446 if (len < 0) 4337 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4338 Error_1 ("vector: not a proper list:", args);
4448 4339
4449 vec = mk_vector (SCHEME_A_ len); 4340 vec = mk_vector (SCHEME_A_ len);
4450 4341
4451#if USE_ERROR_CHECKING 4342#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4343 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4344 s_return (S_SINK);
4454#endif 4345#endif
4455 4346
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4348 set_vector_elem (vec, i, car (x));
4458 4349
4459 s_return (vec); 4350 s_return (vec);
4460 } 4351 }
4461 4352
… …
4463 { 4354 {
4464 pointer fill = NIL; 4355 pointer fill = NIL;
4465 int len; 4356 int len;
4466 pointer vec; 4357 pointer vec;
4467 4358
4468 len = ivalue (car (SCHEME_V->args)); 4359 len = ivalue (x);
4469 4360
4470 if (cdr (SCHEME_V->args) != NIL) 4361 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4362 fill = cadr (args);
4472 4363
4473 vec = mk_vector (SCHEME_A_ len); 4364 vec = mk_vector (SCHEME_A_ len);
4474 4365
4475#if USE_ERROR_CHECKING 4366#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4367 if (SCHEME_V->no_memory)
… …
4482 4373
4483 s_return (vec); 4374 s_return (vec);
4484 } 4375 }
4485 4376
4486 case OP_VECLEN: /* vector-length */ 4377 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4378 s_return (mk_integer (SCHEME_A_ veclength (x)));
4488 4379
4489 case OP_VECREF: /* vector-ref */ 4380 case OP_VECREF: /* vector-ref */
4490 { 4381 {
4491 int index; 4382 int index;
4492 4383
4493 index = ivalue (cadr (SCHEME_V->args)); 4384 index = ivalue (cadr (args));
4494 4385
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4387 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4388
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4389 s_return (vector_elem (x, index));
4499 } 4390 }
4500 4391
4501 case OP_VECSET: /* vector-set! */ 4392 case OP_VECSET: /* vector-set! */
4502 { 4393 {
4503 int index; 4394 int index;
4504 4395
4505 if (is_immutable (car (SCHEME_V->args))) 4396 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4397 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4398
4508 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4509 4400
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4403
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4404 set_vector_elem (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4405 s_return (x);
4515 } 4406 }
4516 } 4407 }
4517 4408
4518 return S_T; 4409 if (USE_ERROR_CHECKING) abort ();
4519} 4410}
4520 4411
4521INTERFACE int 4412INTERFACE int
4522is_list (SCHEME_P_ pointer a) 4413is_list (SCHEME_P_ pointer a)
4523{ 4414{
… …
4570 return -1; 4461 return -1;
4571 } 4462 }
4572 } 4463 }
4573} 4464}
4574 4465
4575static pointer 4466static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{
4469 pointer x = SCHEME_V->args;
4470
4471 for (;;)
4472 {
4473 num v = nvalue (car (x));
4474 x = cdr (x);
4475
4476 if (x == NIL)
4477 break;
4478
4479 int r = num_cmp (v, nvalue (car (x)));
4480
4481 switch (op)
4482 {
4483 case OP_NUMEQ: r = r == 0; break;
4484 case OP_LESS: r = r < 0; break;
4485 case OP_GRE: r = r > 0; break;
4486 case OP_LEQ: r = r <= 0; break;
4487 case OP_GEQ: r = r >= 0; break;
4488 }
4489
4490 if (!r)
4491 s_return (S_F);
4492 }
4493
4494 s_return (S_T);
4495}
4496
4497static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4498opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4499{
4578 pointer x; 4500 pointer args = SCHEME_V->args;
4579 num v; 4501 pointer a = car (args);
4580 int (*comp_func) (num, num); 4502 pointer d = cdr (args);
4503 int r;
4581 4504
4582 switch (op) 4505 switch (op)
4583 { 4506 {
4584 case OP_NOT: /* not */ 4507 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4517
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4518#if USE_CHAR_CLASSIFIERS
4656
4657 case OP_CHARAP: /* char-alphabetic? */ 4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4659
4660 case OP_CHARNP: /* char-numeric? */
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */ 4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */ 4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */ 4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4524#endif
4525
4672#if USE_PORTS 4526#if USE_PORTS
4673 4527 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4529 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4530#endif
4683 4531
4684 case OP_PROCP: /* procedure? */ 4532 case OP_PROCP: /* procedure? */
4685 4533
4686 /*-- 4534 /*--
4687 * continuation should be procedure by the example 4535 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4536 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4537 * in R^3 report sec. 6.9
4690 */ 4538 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4539 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4540 break;
4693 4541
4694 case OP_PAIRP: /* pair? */ 4542 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4543 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4544 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4545 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4546 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4547 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4548 }
4712 4549
4713 return S_T; 4550 s_retbool (r);
4714} 4551}
4715 4552
4716static pointer 4553static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4554opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4555{
4556 pointer args = SCHEME_V->args;
4557 pointer a = car (args);
4719 pointer x, y; 4558 pointer x, y;
4720 4559
4721 switch (op) 4560 switch (op)
4722 { 4561 {
4723 case OP_FORCE: /* force */ 4562 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4563 SCHEME_V->code = a;
4725 4564
4726 if (is_promise (SCHEME_V->code)) 4565 if (is_promise (SCHEME_V->code))
4727 { 4566 {
4728 /* Should change type to closure here */ 4567 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4568 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4589 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4590 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4591 }
4753 } 4592 }
4754 4593
4755 SCHEME_V->args = car (SCHEME_V->args); 4594 SCHEME_V->args = a;
4756 4595
4757 if (op == OP_WRITE) 4596 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4759 else 4598 else
4760 SCHEME_V->print_flag = 0; 4599 SCHEME_V->print_flag = 0;
4761 4600
4762 s_goto (OP_P0LIST); 4601 s_goto (OP_P0LIST);
4763 4602
4764 case OP_NEWLINE: /* newline */ 4603 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4604 if (is_pair (args))
4766 { 4605 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4606 if (a != SCHEME_V->outport)
4768 { 4607 {
4769 x = cons (SCHEME_V->outport, NIL); 4608 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4610 SCHEME_V->outport = a;
4772 } 4611 }
4773 } 4612 }
4774 4613
4775 putstr (SCHEME_A_ "\n"); 4614 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4615 s_return (S_T);
4777#endif 4616#endif
4778 4617
4779 case OP_ERR0: /* error */ 4618 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4619 SCHEME_V->retcode = -1;
4781 4620
4782 if (!is_string (car (SCHEME_V->args))) 4621 if (!is_string (a))
4783 { 4622 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4623 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4624 setimmutable (car (args));
4786 } 4625 }
4787 4626
4788 putstr (SCHEME_A_ "Error: "); 4627 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4628 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4629 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4630 s_goto (OP_ERR1);
4792 4631
4793 case OP_ERR1: /* error */ 4632 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4633 putstr (SCHEME_A_ " ");
4795 4634
4796 if (SCHEME_V->args != NIL) 4635 if (args != NIL)
4797 { 4636 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4638 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4639 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4640 s_goto (OP_P0LIST);
4802 } 4641 }
4803 else 4642 else
4804 { 4643 {
4805 putstr (SCHEME_A_ "\n"); 4644 putstr (SCHEME_A_ "\n");
4806 4645
4807 if (SCHEME_V->interactive_repl) 4646 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4647 s_goto (OP_T0LVL);
4809 else 4648 else
4810 return NIL; 4649 return -1;
4811 } 4650 }
4812 4651
4813 case OP_REVERSE: /* reverse */ 4652 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4653 s_return (reverse (SCHEME_A_ a));
4815 4654
4816 case OP_LIST_STAR: /* list* */ 4655 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4656 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4657
4819 case OP_APPEND: /* append */ 4658 case OP_APPEND: /* append */
4820 x = NIL; 4659 x = NIL;
4821 y = SCHEME_V->args; 4660 y = args;
4822 4661
4823 if (y == x) 4662 if (y == x)
4824 s_return (x); 4663 s_return (x);
4825 4664
4826 /* cdr() in the while condition is not a typo. If car() */ 4665 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4676 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4677
4839#if USE_PLIST 4678#if USE_PLIST
4840 4679
4841 case OP_PUT: /* put */ 4680 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4681 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4682 Error_0 ("illegal use of put");
4844 4683
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4684 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4685 {
4847 if (caar (x) == y) 4686 if (caar (x) == y)
4848 break; 4687 break;
4849 } 4688 }
4850 4689
4851 if (x != NIL) 4690 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4691 cdar (x) = caddr (args);
4853 else 4692 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4693 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4694
4856 s_return (S_T); 4695 s_return (S_T);
4857 4696
4858 case OP_GET: /* get */ 4697 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4699 Error_0 ("illegal use of get");
4861 4700
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4701 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4702 if (caar (x) == y)
4864 break; 4703 break;
4865 4704
4866 if (x != NIL) 4705 if (x != NIL)
4867 s_return (cdar (x)); 4706 s_return (cdar (x));
… …
4869 s_return (NIL); 4708 s_return (NIL);
4870 4709
4871#endif /* USE_PLIST */ 4710#endif /* USE_PLIST */
4872 4711
4873 case OP_QUIT: /* quit */ 4712 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4713 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4714 SCHEME_V->retcode = ivalue (a);
4876 4715
4877 return NIL; 4716 return -1;
4878 4717
4879 case OP_GC: /* gc */ 4718 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4719 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4720 s_return (S_T);
4882 4721
4883 case OP_GCVERB: /* gc-verbose */ 4722 case OP_GCVERB: /* gc-verbose */
4884 { 4723 {
4885 int was = SCHEME_V->gc_verbose; 4724 int was = SCHEME_V->gc_verbose;
4886 4725
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4726 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4727 s_retbool (was);
4889 } 4728 }
4890 4729
4891 case OP_NEWSEGMENT: /* new-segment */ 4730 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4731 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4732 Error_0 ("new-segment: argument must be a number");
4894 4733
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4896 4735
4897 s_return (S_T); 4736 s_return (S_T);
4898 4737
4899 case OP_OBLIST: /* oblist */ 4738 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4739 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4766 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4767 prop = port_input | port_output;
4929 break; 4768 break;
4930 } 4769 }
4931 4770
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4771 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4772
4934 if (p == NIL) 4773 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4774 }
4939 4775
4940# if USE_STRING_PORTS 4776# if USE_STRING_PORTS
4941 4777
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4778 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4790 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4791 prop = port_input | port_output;
4956 break; 4792 break;
4957 } 4793 }
4958 4794
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4795 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4796 strvalue (a) + strlength (a), prop);
4961 4797
4962 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4799 }
4967 4800
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4801 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4802 {
4970 pointer p; 4803 pointer p;
4971 4804
4972 if (car (SCHEME_V->args) == NIL) 4805 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4806 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4807 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4809 strvalue (a) + strlength (a), port_output);
4983 4810
4984 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4812 }
4990 4813
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4814 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4815 {
4993 port *p; 4816 port *p;
4994 4817
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4818 if ((p = a->object.port)->kind & port_string)
4996 { 4819 {
4997 off_t size; 4820 off_t size;
4998 char *str; 4821 char *str;
4999 4822
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4823 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4839 }
5017 4840
5018# endif 4841# endif
5019 4842
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4843 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4844 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4845 s_return (S_T);
5023 4846
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4847 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4848 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4849 s_return (S_T);
5027#endif 4850#endif
5028 4851
5029 case OP_INT_ENV: /* interaction-environment */ 4852 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4853 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4855 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4856 s_return (SCHEME_V->envir);
5034 4857
5035 } 4858 }
5036 4859
5037 return S_T; 4860 if (USE_ERROR_CHECKING) abort ();
5038} 4861}
5039 4862
5040static pointer 4863static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4864opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4865{
4866 pointer args = SCHEME_V->args;
5043 pointer x; 4867 pointer x;
5044 4868
5045 if (SCHEME_V->nesting != 0) 4869 if (SCHEME_V->nesting != 0)
5046 { 4870 {
5047 int n = SCHEME_V->nesting; 4871 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4878 switch (op)
5055 { 4879 {
5056 /* ========== reading part ========== */ 4880 /* ========== reading part ========== */
5057#if USE_PORTS 4881#if USE_PORTS
5058 case OP_READ: 4882 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4883 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4884 s_goto (OP_READ_INTERNAL);
5061 4885
5062 if (!is_inport (car (SCHEME_V->args))) 4886 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4887 Error_1 ("read: not an input port:", car (args));
5064 4888
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4889 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4890 s_goto (OP_READ_INTERNAL);
5067 4891
5068 x = SCHEME_V->inport; 4892 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4893 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4894 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4895 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4896 s_goto (OP_READ_INTERNAL);
5073 4897
5074 case OP_READ_CHAR: /* read-char */ 4898 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4899 case OP_PEEK_CHAR: /* peek-char */
5076 { 4900 {
5077 int c; 4901 int c;
5078 4902
5079 if (is_pair (SCHEME_V->args)) 4903 if (is_pair (args))
5080 { 4904 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4905 if (car (args) != SCHEME_V->inport)
5082 { 4906 {
5083 x = SCHEME_V->inport; 4907 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4908 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4909 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4910 SCHEME_V->inport = car (args);
5087 } 4911 }
5088 } 4912 }
5089 4913
5090 c = inchar (SCHEME_A); 4914 c = inchar (SCHEME_A);
5091 4915
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4925 case OP_CHAR_READY: /* char-ready? */
5102 { 4926 {
5103 pointer p = SCHEME_V->inport; 4927 pointer p = SCHEME_V->inport;
5104 int res; 4928 int res;
5105 4929
5106 if (is_pair (SCHEME_V->args)) 4930 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4931 p = car (args);
5108 4932
5109 res = p->object.port->kind & port_string; 4933 res = p->object.port->kind & port_string;
5110 4934
5111 s_retbool (res); 4935 s_retbool (res);
5112 } 4936 }
5113 4937
5114 case OP_SET_INPORT: /* set-input-port */ 4938 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 4939 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 4940 s_return (SCHEME_V->value);
5117 4941
5118 case OP_SET_OUTPORT: /* set-output-port */ 4942 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 4943 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 4944 s_return (SCHEME_V->value);
5121#endif 4945#endif
5122 4946
5123 case OP_RDSEXPR: 4947 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 4948 switch (SCHEME_V->tok)
… …
5210 } 5034 }
5211 5035
5212 break; 5036 break;
5213 5037
5214 case OP_RDLIST: 5038 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5039 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5040 SCHEME_V->tok = token (SCHEME_A);
5217 5041
5218 switch (SCHEME_V->tok) 5042 switch (SCHEME_V->tok)
5219 { 5043 {
5220 case TOK_EOF: 5044 case TOK_EOF:
… …
5248 case OP_RDDOT: 5072 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5073 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5074 Error_0 ("syntax error: illegal dot expression");
5251 5075
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5076 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5077 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5078
5255 case OP_RDQUOTE: 5079 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5080 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5081
5258 case OP_RDQQUOTE: 5082 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5104 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5105 s_goto (OP_VECTOR);
5282 5106
5283 /* ========== printing part ========== */ 5107 /* ========== printing part ========== */
5284 case OP_P0LIST: 5108 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5109 if (is_vector (args))
5286 { 5110 {
5287 putstr (SCHEME_A_ "#("); 5111 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5112 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5113 s_goto (OP_PVECFROM);
5290 } 5114 }
5291 else if (is_environment (SCHEME_V->args)) 5115 else if (is_environment (args))
5292 { 5116 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5117 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5118 s_return (S_T);
5295 } 5119 }
5296 else if (!is_pair (SCHEME_V->args)) 5120 else if (!is_pair (args))
5297 { 5121 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5122 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5123 s_return (S_T);
5300 } 5124 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5125 else
5302 { 5126 {
5127 pointer a = car (args);
5128 pointer b = cdr (args);
5129 int ok_abbr = ok_abbrev (b);
5130 SCHEME_V->args = car (b);
5131
5132 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5133 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5134 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ "`");
5136 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5137 putstr (SCHEME_A_ ",");
5138 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5139 putstr (SCHEME_A_ ",@");
5140 else
5141 {
5142 putstr (SCHEME_A_ "(");
5143 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5144 SCHEME_V->args = a;
5145 }
5146
5305 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5306 } 5148 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5149
5150 case OP_P1LIST:
5151 if (is_pair (args))
5308 { 5152 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5154 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5155 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5312 } 5157 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5158 else if (is_vector (args))
5342 { 5159 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5160 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5161 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5162 s_goto (OP_P0LIST);
5346 } 5163 }
5347 else 5164 else
5348 { 5165 {
5349 if (SCHEME_V->args != NIL) 5166 if (args != NIL)
5350 { 5167 {
5351 putstr (SCHEME_A_ " . "); 5168 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5170 }
5354 5171
5355 putstr (SCHEME_A_ ")"); 5172 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5173 s_return (S_T);
5357 } 5174 }
5358 5175
5359 case OP_PVECFROM: 5176 case OP_PVECFROM:
5360 { 5177 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5178 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5179 pointer vec = car (args);
5363 int len = veclength (vec); 5180 int len = veclength (vec);
5364 5181
5365 if (i == len) 5182 if (i == len)
5366 { 5183 {
5367 putstr (SCHEME_A_ ")"); 5184 putstr (SCHEME_A_ ")");
… …
5369 } 5186 }
5370 else 5187 else
5371 { 5188 {
5372 pointer elem = vector_elem (vec, i); 5189 pointer elem = vector_elem (vec, i);
5373 5190
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5191 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5193 SCHEME_V->args = elem;
5377 5194
5378 if (i > 0) 5195 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5196 putstr (SCHEME_A_ " ");
5380 5197
5381 s_goto (OP_P0LIST); 5198 s_goto (OP_P0LIST);
5382 } 5199 }
5383 } 5200 }
5384 } 5201 }
5385 5202
5386 return S_T; 5203 if (USE_ERROR_CHECKING) abort ();
5387} 5204}
5388 5205
5389static pointer 5206static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5207opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5208{
5209 pointer args = SCHEME_V->args;
5210 pointer a = car (args);
5392 pointer x, y; 5211 pointer x, y;
5393 5212
5394 switch (op) 5213 switch (op)
5395 { 5214 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5215 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5216 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5217 long v = list_length (SCHEME_A_ a);
5399 5218
5400 if (v < 0) 5219 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5220 Error_1 ("length: not a list:", a);
5402 5221
5403 s_return (mk_integer (SCHEME_A_ v)); 5222 s_return (mk_integer (SCHEME_A_ v));
5404 } 5223 }
5405 5224
5406 case OP_ASSQ: /* assq *//* a.k */ 5225 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5226 x = a;
5408 5227
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5228 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5229 {
5411 if (!is_pair (car (y))) 5230 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5231 Error_0 ("unable to handle non pair element");
5413 5232
5414 if (x == caar (y)) 5233 if (x == caar (y))
… …
5420 else 5239 else
5421 s_return (S_F); 5240 s_return (S_F);
5422 5241
5423 5242
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5243 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5244 SCHEME_V->args = a;
5426 5245
5427 if (SCHEME_V->args == NIL) 5246 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5247 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5248 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5436 case OP_CLOSUREP: /* closure? */ 5255 case OP_CLOSUREP: /* closure? */
5437 /* 5256 /*
5438 * Note, macro object is also a closure. 5257 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5258 * Therefore, (closure? <#MACRO>) ==> #t
5440 */ 5259 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5260 s_retbool (is_closure (a));
5442 5261
5443 case OP_MACROP: /* macro? */ 5262 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5263 s_retbool (is_macro (a));
5445 } 5264 }
5446 5265
5447 return S_T; /* NOTREACHED */ 5266 if (USE_ERROR_CHECKING) abort ();
5448} 5267}
5449 5268
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5271
5452typedef int (*test_predicate) (pointer); 5272typedef int (*test_predicate)(pointer);
5453static int 5273static int
5454is_any (pointer p) 5274is_any (pointer p)
5455{ 5275{
5456 return 1; 5276 return 1;
5457} 5277}
5458 5278
5459static int 5279static int
5460is_nonneg (pointer p) 5280is_nonneg (pointer p)
5461{ 5281{
5462 return ivalue (p) >= 0 && is_integer (p); 5282 return ivalue (p) >= 0 && is_integer (p);
5283}
5284
5285static int
5286tst_is_list (pointer p)
5287{
5288 return p == NIL || is_pair (p);
5463} 5289}
5464 5290
5465/* Correspond carefully with following defines! */ 5291/* Correspond carefully with following defines! */
5466static struct 5292static struct
5467{ 5293{
5468 test_predicate fct; 5294 test_predicate fct;
5469 const char *kind; 5295 const char *kind;
5470} tests[] = 5296} tests[] =
5471{ 5297{
5472 { 0, 0}, /* unused */ 5298 { is_any, 0 },
5473 { is_any, 0}, 5299 { is_string, "string" },
5474 { is_string, "string" }, 5300 { is_symbol, "symbol" },
5475 { is_symbol, "symbol" }, 5301 { is_port, "port" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5302 { is_inport, "input port" },
5478 { is_outport, "output port" }, 5303 { is_outport, "output port" },
5479 { is_environment, "environment" }, 5304 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5305 { is_pair, "pair" },
5481 { 0, "pair or '()" }, 5306 { tst_is_list, "pair or '()" },
5482 { is_character, "character" }, 5307 { is_character, "character" },
5483 { is_vector, "vector" }, 5308 { is_vector, "vector" },
5484 { is_number, "number" }, 5309 { is_number, "number" },
5485 { is_integer, "integer" }, 5310 { is_integer, "integer" },
5486 { is_nonneg, "non-negative integer" } 5311 { is_nonneg, "non-negative integer" }
5487}; 5312};
5488 5313
5489#define TST_NONE 0 5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5315#define TST_ANY "\001"
5491#define TST_STRING "\002" 5316#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5317#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5318#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5319#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5320#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5321#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5322#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5323#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5324#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5325#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5326#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5327#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5328#define TST_NATURAL "\016"
5329
5330#define INF_ARG 0xff
5331#define UNNAMED_OP ""
5332
5333static const char opnames[] =
5334#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5335#include "opdefines.h"
5336#undef OP_DEF
5337;
5338
5339static const char *
5340opname (int idx)
5341{
5342 const char *name = opnames;
5343
5344 /* should do this at compile time, but would require external program, right? */
5345 while (idx--)
5346 name += strlen (name) + 1;
5347
5348 return *name ? name : "ILLEGAL";
5349}
5350
5351static const char *
5352procname (pointer x)
5353{
5354 return opname (procnum (x));
5355}
5504 5356
5505typedef struct 5357typedef struct
5506{ 5358{
5507 dispatch_func func; 5359 uint8_t func;
5508 char *name; 5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin;
5509 int min_arity; 5362 uint8_t min_arity;
5510 int max_arity; 5363 uint8_t max_arity;
5511 char *arg_tests_encoding; 5364 char arg_tests_encoding[3];
5512} op_code_info; 5365} op_code_info;
5513 5366
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5367static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5518#include "opdefines.h" 5369#include "opdefines.h"
5370#undef OP_DEF
5519 {0} 5371 {0}
5520}; 5372};
5521 5373
5522static const char *
5523procname (pointer x)
5524{
5525 int n = procnum (x);
5526 const char *name = dispatch_table[n].name;
5527
5528 if (name == 0)
5529 name = "ILLEGAL!";
5530
5531 return name;
5532}
5533
5534/* kernel of this interpreter */ 5374/* kernel of this interpreter */
5535static void 5375static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5377{
5538 SCHEME_V->op = op; 5378 SCHEME_V->op = op;
5539 5379
5540 for (;;) 5380 for (;;)
5541 { 5381 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5382 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5383
5544#if USE_ERROR_CHECKING 5384#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5385 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5386 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5387 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5388 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5389
5551 /* Check number of arguments */ 5390 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5391 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5392 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5393 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5394 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5395 xError_1 (SCHEME_A_ msg, 0);
5396 continue;
5557 } 5397 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5398 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5399 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5400 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5401 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5402 xError_1 (SCHEME_A_ msg, 0);
5403 continue;
5563 } 5404 }
5564 5405 else
5565 if (ecb_expect_false (ok))
5566 { 5406 {
5567 if (pcd->arg_tests_encoding) 5407 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5408 {
5569 int i = 0; 5409 int i = 0;
5570 int j; 5410 int j;
5571 const char *t = pcd->arg_tests_encoding; 5411 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5412 pointer arglist = SCHEME_V->args;
5573 5413
5574 do 5414 do
5575 { 5415 {
5576 pointer arg = car (arglist); 5416 pointer arg = car (arglist);
5577 5417
5578 j = (int) t[0]; 5418 j = t[0];
5579 5419
5580 if (j == TST_LIST[0]) 5420 if (!tests[j - 1].fct (arg))
5581 {
5582 if (arg != NIL && !is_pair (arg))
5583 break; 5421 break;
5584 }
5585 else
5586 {
5587 if (!tests[j].fct (arg))
5588 break;
5589 }
5590 5422
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5423 if (t[1]) /* last test is replicated as necessary */
5592 t++; 5424 t++;
5593 5425
5594 arglist = cdr (arglist); 5426 arglist = cdr (arglist);
5595 i++; 5427 i++;
5596 } 5428 }
5597 while (i < n); 5429 while (i < n);
5598 5430
5599 if (i < n) 5431 if (i < n)
5600 { 5432 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5433 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5603 } 5436 }
5604 } 5437 }
5605 } 5438 }
5606
5607 if (!ok)
5608 {
5609 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5610 return;
5611
5612 pcd = dispatch_table + SCHEME_V->op;
5613 }
5614 } 5439 }
5615#endif 5440#endif
5616 5441
5617 ok_to_freely_gc (SCHEME_A); 5442 ok_to_freely_gc (SCHEME_A);
5618 5443
5444 static const dispatch_func dispatch_funcs[] = {
5445 opexe_0,
5446 opexe_1,
5447 opexe_2,
5448 opexe_3,
5449 opexe_4,
5450 opexe_5,
5451 opexe_6,
5452 };
5453
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5454 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5455 return;
5621 5456
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5458 {
5624 xwrstr ("No memory!\n"); 5459 xwrstr ("No memory!\n");
… …
5723 return OP_C0STREAM; /* cons-stream */ 5558 return OP_C0STREAM; /* cons-stream */
5724 } 5559 }
5725} 5560}
5726 5561
5727#if USE_MULTIPLICITY 5562#if USE_MULTIPLICITY
5728scheme * 5563ecb_cold scheme *
5729scheme_init_new () 5564scheme_init_new ()
5730{ 5565{
5731 scheme *sc = malloc (sizeof (scheme)); 5566 scheme *sc = malloc (sizeof (scheme));
5732 5567
5733 if (!scheme_init (SCHEME_A)) 5568 if (!scheme_init (SCHEME_A))
… …
5738 else 5573 else
5739 return sc; 5574 return sc;
5740} 5575}
5741#endif 5576#endif
5742 5577
5743int 5578ecb_cold int
5744scheme_init (SCHEME_P) 5579scheme_init (SCHEME_P)
5745{ 5580{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5582 pointer x;
5748 5583
… …
5821 5656
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5657 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5658 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5659 }
5825 5660
5661 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5662 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5663 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5664 assign_proc (SCHEME_A_ i, opname (i));
5829 5665
5830 /* initialization of global pointers to special symbols */ 5666 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5667 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5668 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5669 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5708scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5709{
5874 SCHEME_V->ext_data = p; 5710 SCHEME_V->ext_data = p;
5875} 5711}
5876 5712
5877void 5713ecb_cold void
5878scheme_deinit (SCHEME_P) 5714scheme_deinit (SCHEME_P)
5879{ 5715{
5880 int i; 5716 int i;
5881 5717
5882#if SHOW_ERROR_LINE 5718#if SHOW_ERROR_LINE
… …
5974{ 5810{
5975 dump_stack_reset (SCHEME_A); 5811 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5812 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5813 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5814 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5815 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5816 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5818#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5820#endif
5985 SCHEME_V->retcode = 0; 5821 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5822 SCHEME_V->interactive_repl = 0;

Diff Legend

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