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

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

Diff Legend

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