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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.1 by root, Wed Nov 25 05:02:56 2015 UTC vs.
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
26#endif 31#endif
27 32
28#include <sys/types.h> 33#include <sys/types.h>
29#include <sys/stat.h> 34#include <sys/stat.h>
30#include <fcntl.h> 35#include <fcntl.h>
36
37#include <string.h>
38#include <stdlib.h>
31 39
32#include <limits.h> 40#include <limits.h>
33#include <inttypes.h> 41#include <inttypes.h>
34#include <float.h> 42#include <float.h>
35//#include <ctype.h> 43//#include <ctype.h>
… …
52 60
53#define BACKQUOTE '`' 61#define BACKQUOTE '`'
54#define DELIMITERS "()\";\f\t\v\n\r " 62#define DELIMITERS "()\";\f\t\v\n\r "
55 63
56#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
57#define S_T (&SCHEME_V->xT) 65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
58#define S_F (&SCHEME_V->xF) 66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
59#define S_SINK (&SCHEME_V->xsink) 67#define S_SINK (&SCHEME_V->xsink)
60#define S_EOF (&SCHEME_V->xEOF_OBJ) 68#define S_EOF (&SCHEME_V->xEOF_OBJ)
61 69
62/* 70/* should use libecb */
63 * Basic memory allocation units 71#if __GNUC__ >= 4
64 */ 72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
65 73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
66#define banner "TinyScheme 1.41-s" 74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
67 75#else
68#include <string.h> 76# define ecb_expect_false(expr) !!(expr)
69#include <stdlib.h> 77# define ecb_expect_true(expr) !!(expr)
78#endif
70 79
71#if !USE_MULTIPLICITY 80#if !USE_MULTIPLICITY
72static scheme sc; 81static scheme sc;
73#endif 82#endif
74 83
… …
134 c += 'a' - 'A'; 143 c += 'a' - 'A';
135 144
136 return c; 145 return c;
137} 146}
138 147
148static int
149xisdigit (char c)
150{
151 return c >= '0' && c <= '9';
152}
153
154#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c)
157
139#if USE_STRLWR 158#if USE_STRLWR
140static const char * 159static const char *
141strlwr (char *s) 160strlwr (char *s)
142{ 161{
143 const char *p = s; 162 const char *p = s;
… …
152} 171}
153#endif 172#endif
154 173
155#define stricmp(a,b) strcmp (a, b) 174#define stricmp(a,b) strcmp (a, b)
156#define strlwr(s) (s) 175#define strlwr(s) (s)
157#define toupper(c) xtoupper(c)
158#define tolower(c) xtolower(c)
159 176
160#ifndef prompt 177#ifndef prompt
161# define prompt "ts> " 178# define prompt "ts> "
162#endif 179#endif
163 180
… …
169# define FIRST_CELLSEGS 3 186# define FIRST_CELLSEGS 3
170#endif 187#endif
171 188
172enum scheme_types 189enum scheme_types
173{ 190{
174 T_NULL, 191 T_FREE,
175 T_STRING, 192 T_STRING,
176 T_NUMBER, 193 T_NUMBER,
177 T_SYMBOL, 194 T_SYMBOL,
178 T_PROC, 195 T_PROC,
179 T_PAIR, 196 T_PAIR,
… …
184 T_PORT, 201 T_PORT,
185 T_VECTOR, 202 T_VECTOR,
186 T_MACRO, 203 T_MACRO,
187 T_PROMISE, 204 T_PROMISE,
188 T_ENVIRONMENT, 205 T_ENVIRONMENT,
206 /* one more... */
189 T_NUM_SYSTEM_TYPES 207 T_NUM_SYSTEM_TYPES
190}; 208};
191 209
192#define T_MASKTYPE 31 /* 0000000000011111 */ 210#define T_MASKTYPE 0x000f
193#define T_SYNTAX 4096 /* 0001000000000000 */ 211#define T_SYNTAX 0x0010
194#define T_IMMUTABLE 8192 /* 0010000000000000 */ 212#define T_IMMUTABLE 0x0020
195#define T_ATOM 16384 /* 0100000000000000 */ /* only for gc */ 213#define T_ATOM 0x0040 /* only for gc */
196#define CLRATOM 49151 /* 1011111111111111 */ /* only for gc */ 214#define T_MARK 0x0080 /* only for gc */
197#define MARK 32768 /* 1000000000000000 */
198#define UNMARK 32767 /* 0111111111111111 */
199 215
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
200 217
201static num num_add (num a, num b); 218static num num_op (enum num_op op, num a, num b);
202static num num_mul (num a, num b);
203static num num_div (num a, num b);
204static num num_intdiv (num a, num b); 219static num num_intdiv (num a, num b);
205static num num_sub (num a, num b);
206static num num_rem (num a, num b); 220static num num_rem (num a, num b);
207static num num_mod (num a, num b); 221static num num_mod (num a, num b);
208static int num_eq (num a, num b);
209static int num_gt (num a, num b);
210static int num_ge (num a, num b);
211static int num_lt (num a, num b);
212static int num_le (num a, num b);
213 222
214#if USE_MATH 223#if USE_MATH
215static double round_per_R5RS (double x); 224static double round_per_R5RS (double x);
216#endif 225#endif
217static int is_zero_rvalue (RVALUE x); 226static int is_zero_rvalue (RVALUE x);
… …
244is_vector (pointer p) 253is_vector (pointer p)
245{ 254{
246 return type (p) == T_VECTOR; 255 return type (p) == T_VECTOR;
247} 256}
248 257
258#define vecvalue(p) ((p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length)
249INTERFACE void fill_vector (pointer vec, pointer obj); 260INTERFACE void fill_vector (pointer vec, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
250INTERFACE pointer vector_elem (pointer vec, int ielem); 262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);
251INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);
264
265INTERFACE uint32_t
266vector_length (pointer vec)
267{
268 return vec->object.vector.length;
269}
252 270
253INTERFACE INLINE int 271INTERFACE INLINE int
254is_number (pointer p) 272is_number (pointer p)
255{ 273{
256 return type (p) == T_NUMBER; 274 return type (p) == T_NUMBER;
… …
290nvalue (pointer p) 308nvalue (pointer p)
291{ 309{
292 return (p)->object.number; 310 return (p)->object.number;
293} 311}
294 312
295INTERFACE long 313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
296ivalue (pointer p) 326ivalue (pointer p)
297{ 327{
298 return num_is_integer (p) ? num_ivalue ((p)->object.number) : (long) num_rvalue ((p)->object.number); 328 return num_get_ivalue (p->object.number);
299} 329}
300 330
301INTERFACE RVALUE 331INTERFACE RVALUE
302rvalue (pointer p) 332rvalue (pointer p)
303{ 333{
304 return num_is_integer (p) ? (RVALUE) num_ivalue ((p)->object.number) : num_rvalue ((p)->object.number); 334 return num_get_rvalue (p->object.number);
305} 335}
306 336
307#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)
308#if USE_FLOAT 338#if USE_REAL
309# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)
310# define set_num_integer(p) (p)->object.number.is_fixnum=1; 340# define set_num_integer(p) (p)->object.number.is_fixnum=1;
311# define set_num_real(p) (p)->object.number.is_fixnum=0; 341# define set_num_real(p) (p)->object.number.is_fixnum=0;
312#else 342#else
313# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
… …
343{ 373{
344 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
345} 375}
346 376
347#define car(p) ((p)->object.cons.car + 0) 377#define car(p) ((p)->object.cons.car + 0)
348#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) ((p)->object.cons.cdr + 0)
349 379
350#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
351#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
352#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
353#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
354 384
355#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
356#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
357#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
358 388
359INTERFACE void 389INTERFACE void
360set_car (pointer p, pointer q) 390set_car (pointer p, pointer q)
361{ 391{
362 p->object.cons.car = q; 392 p->object.cons.car = q;
… …
424syntaxname (pointer p) 454syntaxname (pointer p)
425{ 455{
426 return strvalue (car (p)); 456 return strvalue (car (p));
427} 457}
428 458
429#define procnum(p) ivalue(p) 459#define procnum(p) ivalue (p)
430static const char *procname (pointer x); 460static const char *procname (pointer x);
431 461
432INTERFACE INLINE int 462INTERFACE INLINE int
433is_closure (pointer p) 463is_closure (pointer p)
434{ 464{
… …
477 507
478#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 508#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
479 509
480#define is_atom(p) (typeflag (p) & T_ATOM) 510#define is_atom(p) (typeflag (p) & T_ATOM)
481#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 511#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
482#define clratom(p) set_typeflag ((p), typeflag (p) & CLRATOM) 512#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
483 513
484#define is_mark(p) (typeflag (p) & MARK) 514#define is_mark(p) (typeflag (p) & T_MARK)
485#define setmark(p) set_typeflag ((p), typeflag (p) | MARK) 515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
486#define clrmark(p) set_typeflag ((p), typeflag (p) & UNMARK) 516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
487 517
488INTERFACE INLINE int 518INTERFACE INLINE int
489is_immutable (pointer p) 519is_immutable (pointer p)
490{ 520{
491 return typeflag (p) & T_IMMUTABLE; 521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
492} 522}
493 523
494INTERFACE INLINE void 524INTERFACE INLINE void
495setimmutable (pointer p) 525setimmutable (pointer p)
496{ 526{
527#if USE_ERROR_CHECKING
497 set_typeflag (p, T_IMMUTABLE); 528 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif
498} 530}
499 531
500#if USE_CHAR_CLASSIFIERS 532#if USE_CHAR_CLASSIFIERS
501static INLINE int 533static INLINE int
502Cisalpha (int c) 534Cisalpha (int c)
… …
593static int file_push (SCHEME_P_ const char *fname); 625static int file_push (SCHEME_P_ const char *fname);
594static void file_pop (SCHEME_P); 626static void file_pop (SCHEME_P);
595static int file_interactive (SCHEME_P); 627static int file_interactive (SCHEME_P);
596static INLINE int is_one_of (char *s, int c); 628static INLINE int is_one_of (char *s, int c);
597static int alloc_cellseg (SCHEME_P_ int n); 629static int alloc_cellseg (SCHEME_P_ int n);
598static long binary_decode (const char *s);
599static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b);
600static pointer xget_cell (SCHEME_P_ pointer a, pointer b);
601static pointer reserve_cells (SCHEME_P_ int n);
602static pointer get_consecutive_cells (SCHEME_P_ int n);
603static pointer find_consecutive_cells (SCHEME_P_ int n);
604static void finalize_cell (SCHEME_P_ pointer a); 631static void finalize_cell (SCHEME_P_ pointer a);
605static int count_consecutive_cells (pointer x, int needed); 632static int count_consecutive_cells (pointer x, int needed);
606static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
607static pointer mk_number (SCHEME_P_ num n); 634static pointer mk_number (SCHEME_P_ const num n);
608static char *store_string (SCHEME_P_ int len, const char *str, char fill); 635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
609static pointer mk_vector (SCHEME_P_ int len); 636static pointer mk_vector (SCHEME_P_ uint32_t len);
610static pointer mk_atom (SCHEME_P_ char *q); 637static pointer mk_atom (SCHEME_P_ char *q);
611static pointer mk_sharp_const (SCHEME_P_ char *name); 638static pointer mk_sharp_const (SCHEME_P_ char *name);
612 639
613#if USE_PORTS 640#if USE_PORTS
614static pointer mk_port (SCHEME_P_ port *p); 641static pointer mk_port (SCHEME_P_ port *p);
… …
641static pointer ss_get_cont (SCHEME_P); 668static pointer ss_get_cont (SCHEME_P);
642static void ss_set_cont (SCHEME_P_ pointer cont); 669static void ss_set_cont (SCHEME_P_ pointer cont);
643static void dump_stack_mark (SCHEME_P); 670static void dump_stack_mark (SCHEME_P);
644static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op);
645static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
646static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op);
647static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op);
648static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op);
649static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op);
650static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
651static void assign_syntax (SCHEME_P_ char *name); 679static void assign_syntax (SCHEME_P_ const char *name);
652static int syntaxnum (pointer p); 680static int syntaxnum (pointer p);
653static void assign_proc (SCHEME_P_ enum scheme_opcodes, char *name); 681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
654 682
655static num 683static num
656num_add (num a, num b) 684num_op (enum num_op op, num a, num b)
657{ 685{
658 num ret; 686 num ret;
659 687
660 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
661 689
662 if (num_is_fixnum (ret)) 690 if (num_is_fixnum (ret))
663 num_set_ivalue (ret, a.value.ivalue + b.value.ivalue); 691 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op)
696 {
697 case NUM_ADD: av += bv; break;
698 case NUM_SUB: av -= bv; break;
699 case NUM_MUL: av *= bv; break;
700 case NUM_INTDIV: av /= bv; break;
701 }
702
703 num_set_ivalue (ret, av);
704 }
664 else 705 else
665 num_set_rvalue (ret, num_rvalue (a) + num_rvalue (b)); 706 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
666 709
667 return ret; 710 switch (op)
668} 711 {
712 case NUM_ADD: av += bv; break;
713 case NUM_SUB: av -= bv; break;
714 case NUM_MUL: av *= bv; break;
715 case NUM_INTDIV: av /= bv; break;
716 }
669 717
670static num 718 num_set_rvalue (ret, av);
671num_mul (num a, num b) 719 }
672{
673 num ret;
674
675 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
676
677 if (num_is_fixnum (ret))
678 num_set_ivalue (ret, a.value.ivalue * b.value.ivalue);
679 else
680 num_set_rvalue (ret, num_rvalue (a) * num_rvalue (b));
681 720
682 return ret; 721 return ret;
683} 722}
684 723
685static num 724static num
686num_div (num a, num b) 725num_div (num a, num b)
687{ 726{
688 num ret; 727 num ret;
689 728
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && a.value.ivalue % b.value.ivalue == 0); 729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);
691 730
692 if (num_is_fixnum (ret)) 731 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue); 732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
694 else 733 else
695 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b)); 734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
696
697 return ret;
698}
699
700static num
701num_intdiv (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue);
709 else
710 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
711
712 return ret;
713}
714
715static num
716num_sub (num a, num b)
717{
718 num ret;
719
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
721
722 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, a.value.ivalue - b.value.ivalue);
724 else
725 num_set_rvalue (ret, num_rvalue (a) - num_rvalue (b));
726 735
727 return ret; 736 return ret;
728} 737}
729 738
730static num 739static num
… …
732{ 741{
733 num ret; 742 num ret;
734 long e1, e2, res; 743 long e1, e2, res;
735 744
736 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
737 e1 = num_ivalue (a); 746 e1 = num_get_ivalue (a);
738 e2 = num_ivalue (b); 747 e2 = num_get_ivalue (b);
739 res = e1 % e2; 748 res = e1 % e2;
740 749
741 /* remainder should have same sign as second operand */ 750 /* remainder should have same sign as second operand */
742 if (res > 0) 751 if (res > 0)
743 { 752 {
… …
759{ 768{
760 num ret; 769 num ret;
761 long e1, e2, res; 770 long e1, e2, res;
762 771
763 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
764 e1 = num_ivalue (a); 773 e1 = num_get_ivalue (a);
765 e2 = num_ivalue (b); 774 e2 = num_get_ivalue (b);
766 res = e1 % e2; 775 res = e1 % e2;
767 776
768 /* modulo should have same sign as second operand */ 777 /* modulo should have same sign as second operand */
769 if (res * e2 < 0) 778 if (res * e2 < 0)
770 res += e2; 779 res += e2;
771 780
772 num_set_ivalue (ret, res); 781 num_set_ivalue (ret, res);
773 return ret; 782 return ret;
774} 783}
775 784
785/* this completely disrespects NaNs */
776static int 786static int
777num_eq (num a, num b) 787num_cmp (num a, num b)
778{ 788{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
779 int ret; 790 int ret;
780 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
781 791
782 if (is_fixnum) 792 if (is_fixnum)
783 ret = a.value.ivalue == b.value.ivalue; 793 {
794 IVALUE av = num_get_ivalue (a);
795 IVALUE bv = num_get_ivalue (b);
796
797 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 }
784 else 799 else
785 ret = num_rvalue (a) == num_rvalue (b); 800 {
801 RVALUE av = num_get_rvalue (a);
802 RVALUE bv = num_get_rvalue (b);
803
804 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 }
786 806
787 return ret; 807 return ret;
788}
789
790
791static int
792num_gt (num a, num b)
793{
794 int ret;
795 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796
797 if (is_fixnum)
798 ret = a.value.ivalue > b.value.ivalue;
799 else
800 ret = num_rvalue (a) > num_rvalue (b);
801
802 return ret;
803}
804
805static int
806num_ge (num a, num b)
807{
808 return !num_lt (a, b);
809}
810
811static int
812num_lt (num a, num b)
813{
814 int ret;
815 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
816
817 if (is_fixnum)
818 ret = a.value.ivalue < b.value.ivalue;
819 else
820 ret = num_rvalue (a) < num_rvalue (b);
821
822 return ret;
823}
824
825static int
826num_le (num a, num b)
827{
828 return !num_gt (a, b);
829} 808}
830 809
831#if USE_MATH 810#if USE_MATH
832 811
833/* Round to nearest. Round to even if midway */ 812/* Round to nearest. Round to even if midway */
… …
843 return ce; 822 return ce;
844 else if (dfl < dce) 823 else if (dfl < dce)
845 return fl; 824 return fl;
846 else 825 else
847 { 826 {
848 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 827 if (fmod (fl, 2) == 0) /* I imagine this holds */
849 return fl; 828 return fl;
850 else 829 else
851 return ce; 830 return ce;
852 } 831 }
853} 832}
854#endif 833#endif
855 834
856static int 835static int
857is_zero_rvalue (RVALUE x) 836is_zero_rvalue (RVALUE x)
858{ 837{
859#if USE_FLOAT 838#if USE_REAL
860 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
861#else 840#else
862 return x == 0; 841 return x == 0;
863#endif 842#endif
864}
865
866static long
867binary_decode (const char *s)
868{
869 long x = 0;
870
871 while (*s != 0 && (*s == '1' || *s == '0'))
872 {
873 x <<= 1;
874 x += *s - '0';
875 s++;
876 }
877
878 return x;
879} 843}
880 844
881/* allocate new cell segment */ 845/* allocate new cell segment */
882static int 846static int
883alloc_cellseg (SCHEME_P_ int n) 847alloc_cellseg (SCHEME_P_ int n)
… …
927 SCHEME_V->fcells += segsize; 891 SCHEME_V->fcells += segsize;
928 last = newp + segsize - 1; 892 last = newp + segsize - 1;
929 893
930 for (p = newp; p <= last; p++) 894 for (p = newp; p <= last; p++)
931 { 895 {
932 set_typeflag (p, 0); 896 set_typeflag (p, T_FREE);
897 set_car (p, NIL);
933 set_cdr (p, p + 1); 898 set_cdr (p, p + 1);
934 set_car (p, NIL);
935 } 899 }
936 900
937 /* insert new cells in address order on free list */ 901 /* insert new cells in address order on free list */
938 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell) 902 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
939 { 903 {
… …
953 } 917 }
954 918
955 return n; 919 return n;
956} 920}
957 921
958/* get new cell. parameter a, b is marked by gc. */ 922/* get new cell. parameter a, b is marked by gc. */
959static INLINE pointer 923static INLINE pointer
960get_cell_x (SCHEME_P_ pointer a, pointer b) 924get_cell_x (SCHEME_P_ pointer a, pointer b)
961{ 925{
962 if (SCHEME_V->free_cell == NIL) 926 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
963 { 927 {
964 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
965 return S_SINK; 929 return S_SINK;
966 930
967 if (SCHEME_V->free_cell == NIL) 931 if (SCHEME_V->free_cell == NIL)
… …
991 --SCHEME_V->fcells; 955 --SCHEME_V->fcells;
992 return x; 956 return x;
993 } 957 }
994} 958}
995 959
996/* make sure that there is a given number of cells free */
997static pointer
998reserve_cells (SCHEME_P_ int n)
999{
1000 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1001 return NIL;
1002
1003 /* Are there enough cells available? */
1004 if (SCHEME_V->fcells < n)
1005 {
1006 /* If not, try gc'ing some */
1007 gc (SCHEME_A_ NIL, NIL);
1008
1009 if (SCHEME_V->fcells < n)
1010 {
1011 /* If there still aren't, try getting more heap */
1012 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1013 {
1014 SCHEME_V->no_memory = 1;
1015 return NIL;
1016 }
1017 }
1018
1019 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1020 {
1021 /* If all fail, report failure */
1022 SCHEME_V->no_memory = 1;
1023 return NIL;
1024 }
1025 }
1026
1027 return S_T;
1028}
1029
1030static pointer
1031get_consecutive_cells (SCHEME_P_ int n)
1032{
1033 pointer x;
1034
1035 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1036 return S_SINK;
1037
1038 /* Are there any cells available? */
1039 x = find_consecutive_cells (SCHEME_A_ n);
1040
1041 if (x != NIL)
1042 return x;
1043
1044 /* If not, try gc'ing some */
1045 gc (SCHEME_A_ NIL, NIL);
1046
1047 for (;;)
1048 {
1049 x = find_consecutive_cells (SCHEME_A_ n);
1050
1051 if (x != NIL)
1052 return x;
1053
1054 /* If there still aren't, try getting more heap */
1055 if (!alloc_cellseg (SCHEME_A_ 1))
1056 {
1057#if USE_ERROR_CHECKING
1058 SCHEME_V->no_memory = 1;
1059 return S_SINK;
1060#endif
1061 }
1062 }
1063}
1064
1065static int
1066count_consecutive_cells (pointer x, int needed)
1067{
1068 int n = 1;
1069
1070 while (cdr (x) == x + 1)
1071 {
1072 x = cdr (x);
1073 n++;
1074
1075 if (n > needed)
1076 return n;
1077 }
1078
1079 return n;
1080}
1081
1082static pointer
1083find_consecutive_cells (SCHEME_P_ int n)
1084{
1085 pointer *pp;
1086 int cnt;
1087
1088 pp = &SCHEME_V->free_cell;
1089
1090 while (*pp != NIL)
1091 {
1092 cnt = count_consecutive_cells (*pp, n);
1093
1094 if (cnt >= n)
1095 {
1096 pointer x = *pp;
1097
1098 *pp = cdr (*pp + n - 1);
1099 SCHEME_V->fcells -= n;
1100 return x;
1101 }
1102
1103 pp = &cdr (*pp + cnt - 1);
1104 }
1105
1106 return NIL;
1107}
1108
1109/* To retain recent allocs before interpreter knows about them - 960/* To retain recent allocs before interpreter knows about them -
1110 Tehom */ 961 Tehom */
1111 962
1112static void 963static void
1113push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 964push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1114{ 965{
1115 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 966 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1116 967
1117 set_typeflag (holder, T_PAIR | T_IMMUTABLE); 968 set_typeflag (holder, T_PAIR);
969 setimmutable (holder);
1118 set_car (holder, recent); 970 set_car (holder, recent);
1119 set_cdr (holder, car (S_SINK)); 971 set_cdr (holder, car (S_SINK));
1120 set_car (S_SINK, holder); 972 set_car (S_SINK, holder);
1121} 973}
1122 974
… …
1135 987
1136 return cell; 988 return cell;
1137} 989}
1138 990
1139static pointer 991static pointer
1140get_vector_object (SCHEME_P_ int len, pointer init) 992get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1141{ 993{
1142 pointer cells = get_consecutive_cells (SCHEME_A_ len / 2 + len % 2 + 1); 994 pointer v = get_cell_x (SCHEME_A_ 0, 0);
995 pointer *e = malloc (len * sizeof (pointer));
1143 996
1144#if USE_ERROR_CHECKING 997 if (!e && USE_ERROR_CHECKING)
1145 if (SCHEME_V->no_memory)
1146 return S_SINK; 998 return S_SINK;
1147#endif
1148 999
1149 /* Record it as a vector so that gc understands it. */ 1000 /* Record it as a vector so that gc understands it. */
1150 set_typeflag (cells, T_VECTOR | T_ATOM); 1001 set_typeflag (v, T_VECTOR | T_ATOM);
1151 ivalue_unchecked (cells) = len; 1002
1152 set_num_integer (cells); 1003 v->object.vector.vvalue = e;
1004 v->object.vector.length = len;
1153 fill_vector (cells, init); 1005 fill_vector (v, init);
1154 push_recent_alloc (SCHEME_A_ cells, NIL); 1006 push_recent_alloc (SCHEME_A_ v, NIL);
1155 1007
1156 return cells; 1008 return v;
1157} 1009}
1158 1010
1159static INLINE void 1011static INLINE void
1160ok_to_freely_gc (SCHEME_P) 1012ok_to_freely_gc (SCHEME_P)
1161{ 1013{
… …
1164 1016
1165#if defined TSGRIND 1017#if defined TSGRIND
1166static void 1018static void
1167check_cell_alloced (pointer p, int expect_alloced) 1019check_cell_alloced (pointer p, int expect_alloced)
1168{ 1020{
1169 /* Can't use putstr(SCHEME_A_ str) because callers have no access to 1021 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1170 sc. */
1171 if (typeflag (p) & !expect_alloced) 1022 if (typeflag (p) & !expect_alloced)
1172 xwrstr ("Cell is already allocated!\n"); 1023 xwrstr ("Cell is already allocated!\n");
1173 1024
1174 if (!(typeflag (p)) & expect_alloced) 1025 if (!(typeflag (p)) & expect_alloced)
1175 xwrstr ("Cell is not allocated!\n"); 1026 xwrstr ("Cell is not allocated!\n");
… …
1198 if (immutable) 1049 if (immutable)
1199 setimmutable (x); 1050 setimmutable (x);
1200 1051
1201 set_car (x, a); 1052 set_car (x, a);
1202 set_cdr (x, b); 1053 set_cdr (x, b);
1054
1203 return x; 1055 return x;
1204} 1056}
1205 1057
1206/* ========== oblist implementation ========== */ 1058/* ========== oblist implementation ========== */
1207 1059
… …
1217 1069
1218/* returns the new symbol */ 1070/* returns the new symbol */
1219static pointer 1071static pointer
1220oblist_add_by_name (SCHEME_P_ const char *name) 1072oblist_add_by_name (SCHEME_P_ const char *name)
1221{ 1073{
1222 pointer x;
1223 int location; 1074 int location;
1224 1075
1225 x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1226 set_typeflag (x, T_SYMBOL); 1077 set_typeflag (x, T_SYMBOL);
1227 setimmutable (car (x)); 1078 setimmutable (car (x));
1228 1079
1229 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1080 location = hash_fn (name, veclength (SCHEME_V->oblist));
1230 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1081 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1231 return x; 1082 return x;
1232} 1083}
1233 1084
1234static INLINE pointer 1085static INLINE pointer
… …
1236{ 1087{
1237 int location; 1088 int location;
1238 pointer x; 1089 pointer x;
1239 char *s; 1090 char *s;
1240 1091
1241 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1092 location = hash_fn (name, veclength (SCHEME_V->oblist));
1242 1093
1243 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1244 { 1095 {
1245 s = symname (car (x)); 1096 s = symname (car (x));
1246 1097
… …
1257{ 1108{
1258 int i; 1109 int i;
1259 pointer x; 1110 pointer x;
1260 pointer ob_list = NIL; 1111 pointer ob_list = NIL;
1261 1112
1262 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1263 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1264 ob_list = cons (x, ob_list); 1115 ob_list = cons (x, ob_list);
1265 1116
1266 return ob_list; 1117 return ob_list;
1267} 1118}
… …
1341mk_character (SCHEME_P_ int c) 1192mk_character (SCHEME_P_ int c)
1342{ 1193{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1194 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1344 1195
1345 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1196 set_typeflag (x, (T_CHARACTER | T_ATOM));
1346 ivalue_unchecked (x) = c; 1197 ivalue_unchecked (x) = c & 0xff;
1347 set_num_integer (x); 1198 set_num_integer (x);
1348 return x; 1199 return x;
1349} 1200}
1350 1201
1351/* get number atom (integer) */ 1202/* get number atom (integer) */
… …
1370 set_num_real (x); 1221 set_num_real (x);
1371 return x; 1222 return x;
1372} 1223}
1373 1224
1374static pointer 1225static pointer
1375mk_number (SCHEME_P_ num n) 1226mk_number (SCHEME_P_ const num n)
1376{ 1227{
1377 if (num_is_fixnum (n)) 1228 if (num_is_fixnum (n))
1378 {
1379 return mk_integer (SCHEME_A_ num_ivalue (n)); 1229 return mk_integer (SCHEME_A_ num_get_ivalue (n));
1380 }
1381 else 1230 else
1382 {
1383 return mk_real (SCHEME_A_ num_rvalue (n)); 1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1384 }
1385} 1232}
1386 1233
1387/* allocate name to string area */ 1234/* allocate name to string area */
1388static char * 1235static char *
1389store_string (SCHEME_P_ int len_str, const char *str, char fill) 1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1390{ 1237{
1391 char *q;
1392
1393 q = (char *)malloc (len_str + 1); 1238 char *q = malloc (len_str + 1);
1394 1239
1395 if (q == 0) 1240 if (q == 0 && USE_ERROR_CHECKING)
1396 { 1241 {
1397#if USE_ERROR_CHECKING
1398 SCHEME_V->no_memory = 1; 1242 SCHEME_V->no_memory = 1;
1399 return SCHEME_V->strbuff; 1243 return SCHEME_V->strbuff;
1400#endif
1401 } 1244 }
1402 1245
1403 if (str) 1246 if (str)
1404 { 1247 {
1405 int l = strlen (str); 1248 int l = strlen (str);
1406 1249
1407 if (l > len_str) 1250 if (l > len_str)
1408 l = len_str; 1251 l = len_str;
1409 1252
1410 memcpy (q, str, l + 1); 1253 memcpy (q, str, l);
1411 q[l + 1] = 0; 1254 q[l] = 0;
1412 } 1255 }
1413 else 1256 else
1414 { 1257 {
1415 memset (q, fill, len_str); 1258 memset (q, fill, len_str);
1416 q[len_str] = 0; 1259 q[len_str] = 0;
1417 } 1260 }
1418 1261
1419 return q; 1262 return q;
1420} 1263}
1421 1264
1422/* get new string */
1423INTERFACE pointer 1265INTERFACE pointer
1424mk_string (SCHEME_P_ const char *str) 1266mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1425{ 1267{
1426 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269
1270 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1272 strlength (x) = len;
1273 return x;
1427} 1274}
1428 1275
1429INTERFACE pointer 1276INTERFACE pointer
1430mk_counted_string (SCHEME_P_ const char *str, int len) 1277mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1431{ 1278{
1432 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1279 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1433 1280
1434 set_typeflag (x, T_STRING | T_ATOM); 1281 set_typeflag (x, T_STRING | T_ATOM);
1435 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1436 strlength (x) = len; 1283 strlength (x) = len;
1437 return x; 1284 return x;
1438} 1285}
1439 1286
1440INTERFACE pointer 1287INTERFACE pointer
1441mk_empty_string (SCHEME_P_ int len, char fill) 1288mk_string (SCHEME_P_ const char *str)
1442{ 1289{
1443 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1290 return mk_counted_string (SCHEME_A_ str, strlen (str));
1444
1445 set_typeflag (x, T_STRING | T_ATOM);
1446 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1447 strlength (x) = len;
1448 return x;
1449} 1291}
1450 1292
1451INTERFACE pointer 1293INTERFACE pointer
1452mk_vector (SCHEME_P_ int len) 1294mk_vector (SCHEME_P_ uint32_t len)
1453{ 1295{
1454 return get_vector_object (SCHEME_A_ len, NIL); 1296 return get_vector_object (SCHEME_A_ len, NIL);
1455} 1297}
1456 1298
1457INTERFACE void 1299INTERFACE void
1458fill_vector (pointer vec, pointer obj) 1300fill_vector (pointer vec, pointer obj)
1459{ 1301{
1460 int i; 1302 int i;
1461 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1462 1303
1463 for (i = 0; i < num; i++) 1304 for (i = 0; i < vec->object.vector.length; i++)
1464 { 1305 vecvalue (vec)[i] = obj;
1465 set_typeflag (vec + 1 + i, T_PAIR);
1466 setimmutable (vec + 1 + i);
1467 set_car (vec + 1 + i, obj);
1468 set_cdr (vec + 1 + i, obj);
1469 }
1470} 1306}
1471 1307
1472INTERFACE pointer 1308INTERFACE pointer
1473vector_elem (pointer vec, int ielem) 1309vector_elem (pointer vec, uint32_t ielem)
1474{ 1310{
1475 int n = ielem / 2; 1311 return vecvalue(vec)[ielem];
1476
1477 if (ielem % 2 == 0)
1478 return car (vec + 1 + n);
1479 else
1480 return cdr (vec + 1 + n);
1481} 1312}
1482 1313
1483INTERFACE void 1314INTERFACE void
1484set_vector_elem (pointer vec, int ielem, pointer a) 1315set_vector_elem (pointer vec, uint32_t ielem, pointer a)
1485{ 1316{
1486 int n = ielem / 2; 1317 vecvalue(vec)[ielem] = a;
1487
1488 if (ielem % 2 == 0)
1489 set_car (vec + 1 + n, a);
1490 else
1491 set_cdr (vec + 1 + n, a);
1492} 1318}
1493 1319
1494/* get new symbol */ 1320/* get new symbol */
1495INTERFACE pointer 1321INTERFACE pointer
1496mk_symbol (SCHEME_P_ const char *name) 1322mk_symbol (SCHEME_P_ const char *name)
1497{ 1323{
1498 pointer x;
1499
1500 /* first check oblist */ 1324 /* first check oblist */
1501 x = oblist_find_by_name (SCHEME_A_ name); 1325 pointer x = oblist_find_by_name (SCHEME_A_ name);
1502 1326
1503 if (x != NIL) 1327 if (x == NIL)
1504 return x;
1505 else
1506 {
1507 x = oblist_add_by_name (SCHEME_A_ name); 1328 x = oblist_add_by_name (SCHEME_A_ name);
1329
1508 return x; 1330 return x;
1509 }
1510} 1331}
1511 1332
1512INTERFACE pointer 1333INTERFACE pointer
1513gensym (SCHEME_P) 1334gensym (SCHEME_P)
1514{ 1335{
1515 pointer x; 1336 pointer x;
1516 char name[40];
1517 1337
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 { 1339 {
1520 strcpy (name, "gensym-"); 1340 char name[40] = "gensym-";
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1341 xnum (name + 7, SCHEME_V->gensym_cnt);
1522 1342
1523 /* first check oblist */ 1343 /* first check oblist */
1524 x = oblist_find_by_name (SCHEME_A_ name); 1344 x = oblist_find_by_name (SCHEME_A_ name);
1525 1345
1526 if (x != NIL) 1346 if (x == NIL)
1527 continue;
1528 else
1529 { 1347 {
1530 x = oblist_add_by_name (SCHEME_A_ name); 1348 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x; 1349 return x;
1532 } 1350 }
1533 } 1351 }
… …
1542 char c, *p; 1360 char c, *p;
1543 int has_dec_point = 0; 1361 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1362 int has_fp_exp = 0;
1545 1363
1546#if USE_COLON_HOOK 1364#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1365 if ((p = strstr (q, "::")) != 0)
1549 { 1366 {
1550 *p = 0; 1367 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1368 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1369 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1370 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1371 }
1555
1556#endif 1372#endif
1557 1373
1558 p = q; 1374 p = q;
1559 c = *p++; 1375 c = *p++;
1560 1376
… …
1567 has_dec_point = 1; 1383 has_dec_point = 1;
1568 c = *p++; 1384 c = *p++;
1569 } 1385 }
1570 1386
1571 if (!isdigit (c)) 1387 if (!isdigit (c))
1572 {
1573 return mk_symbol (SCHEME_A_ strlwr (q)); 1388 return mk_symbol (SCHEME_A_ strlwr (q));
1574 }
1575 } 1389 }
1576 else if (c == '.') 1390 else if (c == '.')
1577 { 1391 {
1578 has_dec_point = 1; 1392 has_dec_point = 1;
1579 c = *p++; 1393 c = *p++;
1580 1394
1581 if (!isdigit (c)) 1395 if (!isdigit (c))
1582 {
1583 return mk_symbol (SCHEME_A_ strlwr (q)); 1396 return mk_symbol (SCHEME_A_ strlwr (q));
1584 }
1585 } 1397 }
1586 else if (!isdigit (c)) 1398 else if (!isdigit (c))
1587 {
1588 return mk_symbol (SCHEME_A_ strlwr (q)); 1399 return mk_symbol (SCHEME_A_ strlwr (q));
1589 }
1590 1400
1591 for (; (c = *p) != 0; ++p) 1401 for (; (c = *p) != 0; ++p)
1592 { 1402 {
1593 if (!isdigit (c)) 1403 if (!isdigit (c))
1594 { 1404 {
… …
1607 has_dec_point = 1; /* decimal point illegal 1417 has_dec_point = 1; /* decimal point illegal
1608 from now on */ 1418 from now on */
1609 p++; 1419 p++;
1610 1420
1611 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1421 if ((*p == '-') || (*p == '+') || isdigit (*p))
1612 {
1613 continue; 1422 continue;
1614 }
1615 } 1423 }
1616 } 1424 }
1617 1425
1618 return mk_symbol (SCHEME_A_ strlwr (q)); 1426 return mk_symbol (SCHEME_A_ strlwr (q));
1619 } 1427 }
1620 } 1428 }
1621 1429
1622#if USE_FLOAT 1430#if USE_REAL
1623 if (has_dec_point) 1431 if (has_dec_point)
1624 return mk_real (SCHEME_A_ atof (q)); 1432 return mk_real (SCHEME_A_ atof (q));
1625#endif 1433#endif
1626 1434
1627 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1435 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1629 1437
1630/* make constant */ 1438/* make constant */
1631static pointer 1439static pointer
1632mk_sharp_const (SCHEME_P_ char *name) 1440mk_sharp_const (SCHEME_P_ char *name)
1633{ 1441{
1634 long x;
1635 char tmp[STRBUFFSIZE];
1636
1637 if (!strcmp (name, "t")) 1442 if (!strcmp (name, "t"))
1638 return S_T; 1443 return S_T;
1639 else if (!strcmp (name, "f")) 1444 else if (!strcmp (name, "f"))
1640 return S_F; 1445 return S_F;
1641 else if (*name == 'o') /* #o (octal) */
1642 {
1643 x = strtol (name + 1, 0, 8);
1644 return mk_integer (SCHEME_A_ x);
1645 }
1646 else if (*name == 'd') /* #d (decimal) */
1647 {
1648 x = strtol (name + 1, 0, 10);
1649 return mk_integer (SCHEME_A_ x);
1650 }
1651 else if (*name == 'x') /* #x (hex) */
1652 {
1653 x = strtol (name + 1, 0, 16);
1654 return mk_integer (SCHEME_A_ x);
1655 }
1656 else if (*name == 'b') /* #b (binary) */
1657 {
1658 x = binary_decode (name + 1);
1659 return mk_integer (SCHEME_A_ x);
1660 }
1661 else if (*name == '\\') /* #\w (character) */ 1446 else if (*name == '\\') /* #\w (character) */
1662 { 1447 {
1663 int c = 0; 1448 int c;
1664 1449
1665 if (stricmp (name + 1, "space") == 0) 1450 if (stricmp (name + 1, "space") == 0)
1666 c = ' '; 1451 c = ' ';
1667 else if (stricmp (name + 1, "newline") == 0) 1452 else if (stricmp (name + 1, "newline") == 0)
1668 c = '\n'; 1453 c = '\n';
… …
1670 c = '\r'; 1455 c = '\r';
1671 else if (stricmp (name + 1, "tab") == 0) 1456 else if (stricmp (name + 1, "tab") == 0)
1672 c = '\t'; 1457 c = '\t';
1673 else if (name[1] == 'x' && name[2] != 0) 1458 else if (name[1] == 'x' && name[2] != 0)
1674 { 1459 {
1675 int c1 = strtol (name + 2, 0, 16); 1460 long c1 = strtol (name + 2, 0, 16);
1676 1461
1677 if (c1 <= UCHAR_MAX) 1462 if (0 <= c1 && c1 <= UCHAR_MAX)
1678 c = c1; 1463 c = c1;
1679 else 1464 else
1680 return NIL; 1465 return NIL;
1681 1466 }
1682#if USE_ASCII_NAMES 1467#if USE_ASCII_NAMES
1683 }
1684 else if (is_ascii_name (name + 1, &c)) 1468 else if (is_ascii_name (name + 1, &c))
1685 {
1686 /* nothing */ 1469 /* nothing */;
1687#endif 1470#endif
1688 }
1689 else if (name[2] == 0) 1471 else if (name[2] == 0)
1690 c = name[1]; 1472 c = name[1];
1691 else 1473 else
1692 return NIL; 1474 return NIL;
1693 1475
1694 return mk_character (SCHEME_A_ c); 1476 return mk_character (SCHEME_A_ c);
1695 } 1477 }
1696 else 1478 else
1479 {
1480 /* identify base by string index */
1481 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1482 char *base = strchr (baseidx, *name);
1483
1484 if (base)
1485 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1486
1697 return NIL; 1487 return NIL;
1488 }
1698} 1489}
1699 1490
1700/* ========== garbage collector ========== */ 1491/* ========== garbage collector ========== */
1701 1492
1702/*-- 1493/*--
1703 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1494 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1704 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1495 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1705 * for marking. 1496 * for marking.
1497 *
1498 * The exception is vectors - vectors are currently marked recursively,
1499 * which is inherited form tinyscheme and could be fixed by having another
1500 * word of context in the vector
1706 */ 1501 */
1707static void 1502static void
1708mark (pointer a) 1503mark (pointer a)
1709{ 1504{
1710 pointer t, q, p; 1505 pointer t, q, p;
1711 1506
1712 t = (pointer) 0; 1507 t = 0;
1713 p = a; 1508 p = a;
1714E2: 1509E2:
1715 setmark (p); 1510 setmark (p);
1716 printf ("mark %p %x\n", p, p->flag);//D
1717 1511
1718 if (is_vector (p)) 1512 if (ecb_expect_false (is_vector (p)))
1719 { 1513 {
1720 int i; 1514 int i;
1721 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1722 1515
1723 for (i = 0; i < num; i++) 1516 for (i = 0; i < p->object.vector.length; i++)
1724 { 1517 mark (vecvalue (p)[i]);
1725 /* Vector cells will be treated like ordinary cells */
1726 mark (p + 1 + i);
1727 }
1728 } 1518 }
1729 1519
1730 if (is_atom (p)) 1520 if (is_atom (p))
1731 goto E6; 1521 goto E6;
1732 1522
… …
1742 goto E2; 1532 goto E2;
1743 } 1533 }
1744 1534
1745E5: 1535E5:
1746 q = cdr (p); /* down cdr */ 1536 q = cdr (p); /* down cdr */
1747 printf ("mark+ %p\n", q, q->flag);//D
1748 1537
1749 if (q && !is_mark (q)) 1538 if (q && !is_mark (q))
1750 { 1539 {
1751 set_cdr (p, t); 1540 set_cdr (p, t);
1752 t = p; 1541 t = p;
1753 p = q; 1542 p = q;
1754 goto E2; 1543 goto E2;
1755 } 1544 }
1756 1545
1757E6: /* up. Undo the link switching from steps E4 and E5. */ 1546E6: /* up. Undo the link switching from steps E4 and E5. */
1758
1759 if (!t) 1547 if (!t)
1760 return; 1548 return;
1761 1549
1762 q = t; 1550 q = t;
1763 1551
… …
1831 if (is_mark (p)) 1619 if (is_mark (p))
1832 clrmark (p); 1620 clrmark (p);
1833 else 1621 else
1834 { 1622 {
1835 /* reclaim cell */ 1623 /* reclaim cell */
1836 if (typeflag (p) != 0) 1624 if (typeflag (p) != T_FREE)
1837 { 1625 {
1838 finalize_cell (SCHEME_A_ p); 1626 finalize_cell (SCHEME_A_ p);
1839 set_typeflag (p, 0); 1627 set_typeflag (p, T_FREE);
1840 set_car (p, NIL); 1628 set_car (p, NIL);
1841 } 1629 }
1842 1630
1843 ++SCHEME_V->fcells; 1631 ++SCHEME_V->fcells;
1844 set_cdr (p, SCHEME_V->free_cell); 1632 set_cdr (p, SCHEME_V->free_cell);
… …
1852} 1640}
1853 1641
1854static void 1642static void
1855finalize_cell (SCHEME_P_ pointer a) 1643finalize_cell (SCHEME_P_ pointer a)
1856{ 1644{
1645 /* TODO, fast bitmap check? */
1857 if (is_string (a)) 1646 if (is_string (a))
1858 free (strvalue (a)); 1647 free (strvalue (a));
1648 else if (is_vector (a))
1649 free (vecvalue (a));
1859#if USE_PORTS 1650#if USE_PORTS
1860 else if (is_port (a)) 1651 else if (is_port (a))
1861 { 1652 {
1862 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1653 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1863 port_close (SCHEME_A_ a, port_input | port_output); 1654 port_close (SCHEME_A_ a, port_input | port_output);
… …
2289 char *p = SCHEME_V->strbuff; 2080 char *p = SCHEME_V->strbuff;
2290 2081
2291 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2292 2083
2293 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2294 {
2295 *p = 0; 2085 *p = 0;
2296 }
2297 else 2086 else
2298 { 2087 {
2299 backchar (SCHEME_A_ p[-1]); 2088 backchar (SCHEME_A_ p[-1]);
2300 *--p = '\0'; 2089 *--p = '\0';
2301 } 2090 }
… …
2316 for (;;) 2105 for (;;)
2317 { 2106 {
2318 c = inchar (SCHEME_A); 2107 c = inchar (SCHEME_A);
2319 2108
2320 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1) 2109 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1)
2321 {
2322 return S_F; 2110 return S_F;
2323 }
2324 2111
2325 switch (state) 2112 switch (state)
2326 { 2113 {
2327 case st_ok: 2114 case st_ok:
2328 switch (c) 2115 switch (c)
… …
2396 c = toupper (c); 2183 c = toupper (c);
2397 2184
2398 if (c >= '0' && c <= 'F') 2185 if (c >= '0' && c <= 'F')
2399 { 2186 {
2400 if (c <= '9') 2187 if (c <= '9')
2401 {
2402 c1 = (c1 << 4) + c - '0'; 2188 c1 = (c1 << 4) + c - '0';
2403 }
2404 else 2189 else
2405 {
2406 c1 = (c1 << 4) + c - 'A' + 10; 2190 c1 = (c1 << 4) + c - 'A' + 10;
2407 }
2408 2191
2409 if (state == st_x1) 2192 if (state == st_x1)
2410 {
2411 state = st_x2; 2193 state = st_x2;
2412 }
2413 else 2194 else
2414 { 2195 {
2415 *p++ = c1; 2196 *p++ = c1;
2416 state = st_ok; 2197 state = st_ok;
2417 } 2198 }
2418 } 2199 }
2419 else 2200 else
2420 {
2421 return S_F; 2201 return S_F;
2422 }
2423 2202
2424 break; 2203 break;
2425 2204
2426 case st_oct1: 2205 case st_oct1:
2427 case st_oct2: 2206 case st_oct2:
… …
2458is_one_of (char *s, int c) 2237is_one_of (char *s, int c)
2459{ 2238{
2460 if (c == EOF) 2239 if (c == EOF)
2461 return 1; 2240 return 1;
2462 2241
2463 while (*s) 2242 return !!strchr (s, c);
2464 if (*s++ == c)
2465 return 1;
2466
2467 return 0;
2468} 2243}
2469 2244
2470/* skip white characters */ 2245/* skip white characters */
2471static INLINE int 2246static INLINE int
2472skipspace (SCHEME_P) 2247skipspace (SCHEME_P)
… …
2477 { 2252 {
2478 c = inchar (SCHEME_A); 2253 c = inchar (SCHEME_A);
2479#if SHOW_ERROR_LINE 2254#if SHOW_ERROR_LINE
2480 if (c == '\n') 2255 if (c == '\n')
2481 curr_line++; 2256 curr_line++;
2482
2483#endif 2257#endif
2484 } 2258 }
2485 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t');
2486 2260
2487 /* record it */ 2261 /* record it */
… …
2524 2298
2525 if (is_one_of (" \n\t", c)) 2299 if (is_one_of (" \n\t", c))
2526 return TOK_DOT; 2300 return TOK_DOT;
2527 else 2301 else
2528 { 2302 {
2303 //TODO: ungetc twice in a row is not supported in C
2529 backchar (SCHEME_A_ c); 2304 backchar (SCHEME_A_ c);
2530 backchar (SCHEME_A_ '.'); 2305 backchar (SCHEME_A_ '.');
2531 return TOK_ATOM; 2306 return TOK_ATOM;
2532 } 2307 }
2533 2308
… …
2647 int d = *s / 16; 2422 int d = *s / 16;
2648 2423
2649 putcharacter (SCHEME_A_ 'x'); 2424 putcharacter (SCHEME_A_ 'x');
2650 2425
2651 if (d < 10) 2426 if (d < 10)
2652 {
2653 putcharacter (SCHEME_A_ d + '0'); 2427 putcharacter (SCHEME_A_ d + '0');
2654 }
2655 else 2428 else
2656 {
2657 putcharacter (SCHEME_A_ d - 10 + 'A'); 2429 putcharacter (SCHEME_A_ d - 10 + 'A');
2658 }
2659 2430
2660 d = *s % 16; 2431 d = *s % 16;
2661 2432
2662 if (d < 10) 2433 if (d < 10)
2663 {
2664 putcharacter (SCHEME_A_ d + '0'); 2434 putcharacter (SCHEME_A_ d + '0');
2665 }
2666 else 2435 else
2667 {
2668 putcharacter (SCHEME_A_ d - 10 + 'A'); 2436 putcharacter (SCHEME_A_ d - 10 + 'A');
2669 }
2670 } 2437 }
2671 } 2438 }
2672 } 2439 }
2673 else 2440 else
2674 {
2675 putcharacter (SCHEME_A_ * s); 2441 putcharacter (SCHEME_A_ * s);
2676 }
2677 2442
2678 s++; 2443 s++;
2679 } 2444 }
2680 2445
2681 putcharacter (SCHEME_A_ '"'); 2446 putcharacter (SCHEME_A_ '"');
… …
2716 2481
2717 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2718 { 2483 {
2719 if (num_is_integer (l)) 2484 if (num_is_integer (l))
2720 xnum (p, ivalue_unchecked (l)); 2485 xnum (p, ivalue_unchecked (l));
2721#if USE_FLOAT 2486#if USE_REAL
2722 else 2487 else
2723 { 2488 {
2724 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2725 /* r5rs says there must be a '.' (unless 'e'?) */ 2490 /* r5rs says there must be a '.' (unless 'e'?) */
2726 f = strcspn (p, ".e"); 2491 f = strcspn (p, ".e");
… …
2898list_star (SCHEME_P_ pointer d) 2663list_star (SCHEME_P_ pointer d)
2899{ 2664{
2900 pointer p, q; 2665 pointer p, q;
2901 2666
2902 if (cdr (d) == NIL) 2667 if (cdr (d) == NIL)
2903 {
2904 return car (d); 2668 return car (d);
2905 }
2906 2669
2907 p = cons (car (d), cdr (d)); 2670 p = cons (car (d), cdr (d));
2908 q = p; 2671 q = p;
2909 2672
2910 while (cdr (cdr (p)) != NIL) 2673 while (cdr (cdr (p)) != NIL)
2911 { 2674 {
2912 d = cons (car (p), cdr (p)); 2675 d = cons (car (p), cdr (p));
2913 2676
2914 if (cdr (cdr (p)) != NIL) 2677 if (cdr (cdr (p)) != NIL)
2915 {
2916 p = cdr (d); 2678 p = cdr (d);
2917 }
2918 } 2679 }
2919 2680
2920 set_cdr (p, car (cdr (p))); 2681 set_cdr (p, car (cdr (p)));
2921 return q; 2682 return q;
2922} 2683}
… …
2936 2697
2937/* reverse list --- in-place */ 2698/* reverse list --- in-place */
2938static pointer 2699static pointer
2939reverse_in_place (SCHEME_P_ pointer term, pointer list) 2700reverse_in_place (SCHEME_P_ pointer term, pointer list)
2940{ 2701{
2941 pointer p = list, result = term, q; 2702 pointer result = term;
2703 pointer p = list;
2942 2704
2943 while (p != NIL) 2705 while (p != NIL)
2944 { 2706 {
2945 q = cdr (p); 2707 pointer q = cdr (p);
2946 set_cdr (p, result); 2708 set_cdr (p, result);
2947 result = p; 2709 result = p;
2948 p = q; 2710 p = q;
2949 } 2711 }
2950 2712
… …
2983 } 2745 }
2984 else if (is_number (a)) 2746 else if (is_number (a))
2985 { 2747 {
2986 if (is_number (b)) 2748 if (is_number (b))
2987 if (num_is_integer (a) == num_is_integer (b)) 2749 if (num_is_integer (a) == num_is_integer (b))
2988 return num_eq (nvalue (a), nvalue (b)); 2750 return num_cmp (nvalue (a), nvalue (b)) == 0;
2989 2751
2990 return 0; 2752 return 0;
2991 } 2753 }
2992 else if (is_character (a)) 2754 else if (is_character (a))
2993 { 2755 {
… …
3025#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST) 2787#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
3026 2788
3027static int 2789static int
3028hash_fn (const char *key, int table_size) 2790hash_fn (const char *key, int table_size)
3029{ 2791{
3030 unsigned int hashed = 0; 2792 const unsigned char *p = key;
3031 const char *c; 2793 uint32_t hash = 2166136261;
3032 int bits_per_int = sizeof (unsigned int) * 8;
3033 2794
3034 for (c = key; *c; c++) 2795 while (*p)
3035 { 2796 hash = (hash ^ *p++) * 16777619;
3036 /* letters have about 5 bits in them */
3037 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
3038 hashed ^= *c;
3039 }
3040 2797
3041 return hashed % table_size; 2798 return hash % table_size;
3042} 2799}
3043#endif 2800#endif
3044 2801
3045#ifndef USE_ALIST_ENV 2802#ifndef USE_ALIST_ENV
3046 2803
… …
3072{ 2829{
3073 pointer slot = immutable_cons (variable, value); 2830 pointer slot = immutable_cons (variable, value);
3074 2831
3075 if (is_vector (car (env))) 2832 if (is_vector (car (env)))
3076 { 2833 {
3077 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2834 int location = hash_fn (symname (variable), veclength (car (env)));
3078 2835
3079 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));
3080 } 2837 }
3081 else 2838 else
3082 set_car (env, immutable_cons (slot, car (env))); 2839 set_car (env, immutable_cons (slot, car (env)));
… …
3090 2847
3091 for (x = env; x != NIL; x = cdr (x)) 2848 for (x = env; x != NIL; x = cdr (x))
3092 { 2849 {
3093 if (is_vector (car (x))) 2850 if (is_vector (car (x)))
3094 { 2851 {
3095 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2852 location = hash_fn (symname (hdl), veclength (car (x)));
3096 y = vector_elem (car (x), location); 2853 y = vector_elem (car (x), location);
3097 } 2854 }
3098 else 2855 else
3099 y = car (x); 2856 y = car (x);
3100 2857
… …
3210#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
3211 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2968 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3212 2969
3213 if (x != NIL) 2970 if (x != NIL)
3214 { 2971 {
3215 if (a) 2972 pointer code = a
3216 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2973 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3217 else 2974 : NIL;
3218 SCHEME_V->code = NIL;
3219 2975
3220 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2976 code = cons (mk_string (SCHEME_A_ s), code);
3221 setimmutable (car (SCHEME_V->code)); 2977 setimmutable (car (code));
3222 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2978 SCHEME_V->code = cons (slot_value_in_env (x), code);
3223 SCHEME_V->op = OP_EVAL; 2979 SCHEME_V->op = OP_EVAL;
3224 2980
3225 return S_T; 2981 return S_T;
3226 } 2982 }
3227#endif 2983#endif
… …
3231 else 2987 else
3232 SCHEME_V->args = NIL; 2988 SCHEME_V->args = NIL;
3233 2989
3234 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3235 setimmutable (car (SCHEME_V->args)); 2991 setimmutable (car (SCHEME_V->args));
3236 SCHEME_V->op = (int)OP_ERR0; 2992 SCHEME_V->op = OP_ERR0;
3237 return S_T; 2993 return S_T;
3238} 2994}
3239 2995
3240#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3241#define Error_0(s) Error_1 (s, 0) 2997#define Error_0(s) Error_1 (s, 0)
3242 2998
3243/* Too small to turn into function */ 2999/* Too small to turn into function */
3244#define BEGIN do { 3000#define BEGIN do {
3245#define END } while (0) 3001#define END } while (0)
3246#define s_goto(a) BEGIN \ 3002#define s_goto(a) BEGIN \
3247 SCHEME_V->op = (int)(a); \ 3003 SCHEME_V->op = a; \
3248 return S_T; END 3004 return S_T; END
3249 3005
3250#define s_return(a) return xs_return(SCHEME_A_ a) 3006#define s_return(a) return xs_return (SCHEME_A_ a)
3251 3007
3252#ifndef USE_SCHEME_STACK 3008#ifndef USE_SCHEME_STACK
3253 3009
3254/* this structure holds all the interpreter's registers */ 3010/* this structure holds all the interpreter's registers */
3255struct dump_stack_frame 3011struct dump_stack_frame
… …
3274 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3275 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3276 } 3032 }
3277 3033
3278 next_frame = SCHEME_V->dump_base + nframes; 3034 next_frame = SCHEME_V->dump_base + nframes;
3035
3279 next_frame->op = op; 3036 next_frame->op = op;
3280 next_frame->args = args; 3037 next_frame->args = args;
3281 next_frame->envir = SCHEME_V->envir; 3038 next_frame->envir = SCHEME_V->envir;
3282 next_frame->code = code; 3039 next_frame->code = code;
3040
3283 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3284} 3042}
3285 3043
3286static pointer 3044static pointer
3287xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
… …
3292 SCHEME_V->value = a; 3050 SCHEME_V->value = a;
3293 3051
3294 if (nframes <= 0) 3052 if (nframes <= 0)
3295 return NIL; 3053 return NIL;
3296 3054
3297 nframes--;
3298 frame = SCHEME_V->dump_base + nframes; 3055 frame = &SCHEME_V->dump_base[--nframes];
3299 SCHEME_V->op = frame->op; 3056 SCHEME_V->op = frame->op;
3300 SCHEME_V->args = frame->args; 3057 SCHEME_V->args = frame->args;
3301 SCHEME_V->envir = frame->envir; 3058 SCHEME_V->envir = frame->envir;
3302 SCHEME_V->code = frame->code; 3059 SCHEME_V->code = frame->code;
3303 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3304 3061
3305 return S_T; 3062 return S_T;
3306} 3063}
3307 3064
3308static INLINE void 3065static INLINE void
3309dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3310{ 3067{
3311 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3312 SCHEME_V->dump = (pointer)0; 3069 SCHEME_V->dump = (pointer)+0;
3313} 3070}
3314 3071
3315static INLINE void 3072static INLINE void
3316dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3317{ 3074{
3318 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3319 SCHEME_V->dump_base = NULL; 3076 SCHEME_V->dump_base = 0;
3320 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3321} 3078}
3322 3079
3323static void 3080static void
3324dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3325{ 3082{
3326 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3327 SCHEME_V->dump_base = NULL; 3084 SCHEME_V->dump_base = 0;
3328 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3329 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3330} 3087}
3331 3088
3332static void 3089static void
… …
3374 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3375 3132
3376 while (cont != NIL) 3133 while (cont != NIL)
3377 { 3134 {
3378 frame->op = ivalue (car (cont)); cont = cdr (cont); 3135 frame->op = ivalue (car (cont)); cont = cdr (cont);
3379 frame->args = car (cont) ; cont = cdr (cont); 3136 frame->args = car (cont) ; cont = cdr (cont);
3380 frame->envir = car (cont) ; cont = cdr (cont); 3137 frame->envir = car (cont) ; cont = cdr (cont);
3381 frame->code = car (cont) ; cont = cdr (cont); 3138 frame->code = car (cont) ; cont = cdr (cont);
3382 3139
3383 ++frame; 3140 ++frame;
3384 ++i; 3141 ++i;
3385 } 3142 }
3386 3143
… …
3415 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
3416 3173
3417 if (dump == NIL) 3174 if (dump == NIL)
3418 return NIL; 3175 return NIL;
3419 3176
3420 SCHEME_V->op = ivalue (car (dump)); 3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3421 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3178 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3422 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3423 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3424 3181
3425 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3426 3183
3427 return S_T; 3184 return S_T;
3428} 3185}
… …
3460#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3461 3218
3462static pointer 3219static pointer
3463opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3220opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3464{ 3221{
3222 pointer args = SCHEME_V->args;
3465 pointer x, y; 3223 pointer x, y;
3466 3224
3467 switch (op) 3225 switch (op)
3468 { 3226 {
3469 case OP_LOAD: /* load */ 3227 case OP_LOAD: /* load */
3470 if (file_interactive (SCHEME_A)) 3228 if (file_interactive (SCHEME_A))
3471 { 3229 {
3472 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3473 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3474 } 3232 }
3475 3233
3476 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3234 if (!file_push (SCHEME_A_ strvalue (car (args))))
3477 Error_1 ("unable to open", car (SCHEME_V->args)); 3235 Error_1 ("unable to open", car (args));
3478 else 3236 else
3479 { 3237 {
3480 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3238 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3481 s_goto (OP_T0LVL); 3239 s_goto (OP_T0LVL);
3482 } 3240 }
… …
3517 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3275 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3518 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3276 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3519 s_goto (OP_READ_INTERNAL); 3277 s_goto (OP_READ_INTERNAL);
3520 3278
3521 case OP_T1LVL: /* top level */ 3279 case OP_T1LVL: /* top level */
3522 SCHEME_V->code = SCHEME_V->value; 3280 SCHEME_V->code = SCHEME_V->value;
3523 SCHEME_V->inport = SCHEME_V->save_inport; 3281 SCHEME_V->inport = SCHEME_V->save_inport;
3524 s_goto (OP_EVAL); 3282 s_goto (OP_EVAL);
3525 3283
3526 case OP_READ_INTERNAL: /* internal read */ 3284 case OP_READ_INTERNAL: /* internal read */
3527 SCHEME_V->tok = token (SCHEME_A); 3285 SCHEME_V->tok = token (SCHEME_A);
3528 3286
3529 if (SCHEME_V->tok == TOK_EOF) 3287 if (SCHEME_V->tok == TOK_EOF)
3530 {
3531 s_return (S_EOF); 3288 s_return (S_EOF);
3532 }
3533 3289
3534 s_goto (OP_RDSEXPR); 3290 s_goto (OP_RDSEXPR);
3535 3291
3536 case OP_GENSYM: 3292 case OP_GENSYM:
3537 s_return (gensym (SCHEME_A)); 3293 s_return (gensym (SCHEME_A));
… …
3541 /* OP_VALUEPRINT is always pushed, because when changing from 3297 /* OP_VALUEPRINT is always pushed, because when changing from
3542 non-interactive to interactive mode, it needs to be 3298 non-interactive to interactive mode, it needs to be
3543 already on the stack */ 3299 already on the stack */
3544#if USE_TRACING 3300#if USE_TRACING
3545 if (SCHEME_V->tracing) 3301 if (SCHEME_V->tracing)
3546 {
3547 putstr (SCHEME_A_ "\nGives: "); 3302 putstr (SCHEME_A_ "\nGives: ");
3548 }
3549#endif 3303#endif
3550 3304
3551 if (file_interactive (SCHEME_A)) 3305 if (file_interactive (SCHEME_A))
3552 { 3306 {
3553 SCHEME_V->print_flag = 1; 3307 SCHEME_V->print_flag = 1;
3554 SCHEME_V->args = SCHEME_V->value; 3308 SCHEME_V->args = SCHEME_V->value;
3555 s_goto (OP_P0LIST); 3309 s_goto (OP_P0LIST);
3556 } 3310 }
3557 else 3311 else
3558 {
3559 s_return (SCHEME_V->value); 3312 s_return (SCHEME_V->value);
3560 }
3561 3313
3562 case OP_EVAL: /* main part of evaluation */ 3314 case OP_EVAL: /* main part of evaluation */
3563#if USE_TRACING 3315#if USE_TRACING
3564 if (SCHEME_V->tracing) 3316 if (SCHEME_V->tracing)
3565 { 3317 {
3566 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3318 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3567 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3319 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3568 SCHEME_V->args = SCHEME_V->code; 3320 SCHEME_V->args = SCHEME_V->code;
3569 putstr (SCHEME_A_ "\nEval: "); 3321 putstr (SCHEME_A_ "\nEval: ");
3570 s_goto (OP_P0LIST); 3322 s_goto (OP_P0LIST);
3571 } 3323 }
3572 3324
3573 /* fall through */ 3325 /* fall through */
3326
3574 case OP_REAL_EVAL: 3327 case OP_REAL_EVAL:
3575#endif 3328#endif
3576 if (is_symbol (SCHEME_V->code)) /* symbol */ 3329 if (is_symbol (SCHEME_V->code)) /* symbol */
3577 { 3330 {
3578 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3331 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
… …
3582 else 3335 else
3583 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3336 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3584 } 3337 }
3585 else if (is_pair (SCHEME_V->code)) 3338 else if (is_pair (SCHEME_V->code))
3586 { 3339 {
3340 x = car (SCHEME_V->code);
3341
3587 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3342 if (is_syntax (x)) /* SYNTAX */
3588 { 3343 {
3589 SCHEME_V->code = cdr (SCHEME_V->code); 3344 SCHEME_V->code = cdr (SCHEME_V->code);
3590 s_goto (syntaxnum (x)); 3345 s_goto (syntaxnum (x));
3591 } 3346 }
3592 else /* first, eval top element and eval arguments */ 3347 else /* first, eval top element and eval arguments */
3593 { 3348 {
3594 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3349 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3595 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3350 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3596 SCHEME_V->code = car (SCHEME_V->code); 3351 SCHEME_V->code = x;
3597 s_goto (OP_EVAL); 3352 s_goto (OP_EVAL);
3598 } 3353 }
3599 } 3354 }
3600 else 3355 else
3601 s_return (SCHEME_V->code); 3356 s_return (SCHEME_V->code);
… …
3613 SCHEME_V->code = cdr (SCHEME_V->code); 3368 SCHEME_V->code = cdr (SCHEME_V->code);
3614 s_goto (OP_E1ARGS); 3369 s_goto (OP_E1ARGS);
3615 } 3370 }
3616 3371
3617 case OP_E1ARGS: /* eval arguments */ 3372 case OP_E1ARGS: /* eval arguments */
3618 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3373 args = cons (SCHEME_V->value, args);
3619 3374
3620 if (is_pair (SCHEME_V->code)) /* continue */ 3375 if (is_pair (SCHEME_V->code)) /* continue */
3621 { 3376 {
3622 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3377 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3623 SCHEME_V->code = car (SCHEME_V->code); 3378 SCHEME_V->code = car (SCHEME_V->code);
3624 SCHEME_V->args = NIL; 3379 SCHEME_V->args = NIL;
3625 s_goto (OP_EVAL); 3380 s_goto (OP_EVAL);
3626 } 3381 }
3627 else /* end */ 3382 else /* end */
3628 { 3383 {
3629 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3384 args = reverse_in_place (SCHEME_A_ NIL, args);
3630 SCHEME_V->code = car (SCHEME_V->args); 3385 SCHEME_V->code = car (args);
3631 SCHEME_V->args = cdr (SCHEME_V->args); 3386 SCHEME_V->args = cdr (args);
3632 s_goto (OP_APPLY); 3387 s_goto (OP_APPLY);
3633 } 3388 }
3634 3389
3635#if USE_TRACING 3390#if USE_TRACING
3636 3391
3637 case OP_TRACING: 3392 case OP_TRACING:
3638 { 3393 {
3639 int tr = SCHEME_V->tracing; 3394 int tr = SCHEME_V->tracing;
3640 3395
3641 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3396 SCHEME_V->tracing = ivalue (car (args));
3642 s_return (mk_integer (SCHEME_A_ tr)); 3397 s_return (mk_integer (SCHEME_A_ tr));
3643 } 3398 }
3644 3399
3645#endif 3400#endif
3646 3401
3647 case OP_APPLY: /* apply 'code' to 'args' */ 3402 case OP_APPLY: /* apply 'code' to 'args' */
3648#if USE_TRACING 3403#if USE_TRACING
3649 if (SCHEME_V->tracing) 3404 if (SCHEME_V->tracing)
3650 { 3405 {
3651 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3406 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3652 SCHEME_V->print_flag = 1; 3407 SCHEME_V->print_flag = 1;
3653 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3408 /* args=cons(SCHEME_V->code,args); */
3654 putstr (SCHEME_A_ "\nApply to: "); 3409 putstr (SCHEME_A_ "\nApply to: ");
3655 s_goto (OP_P0LIST); 3410 s_goto (OP_P0LIST);
3656 } 3411 }
3657 3412
3658 /* fall through */ 3413 /* fall through */
3414
3659 case OP_REAL_APPLY: 3415 case OP_REAL_APPLY:
3660#endif 3416#endif
3661 if (is_proc (SCHEME_V->code)) 3417 if (is_proc (SCHEME_V->code))
3662 { 3418 {
3663 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3664 } 3420 }
3665 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3666 { 3422 {
3667 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3668 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3669 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3670 3426
3671 s_return (x); 3427 s_return (x);
3672 } 3428 }
3673 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3674 { 3430 {
3675 /* Should not accept promise */ 3431 /* Should not accept promise */
3676 /* make environment */ 3432 /* make environment */
3677 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3678 3434
3679 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3435 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3680 { 3436 {
3681 if (y == NIL) 3437 if (y == NIL)
3682 {
3683 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3684 }
3685 else 3439 else
3686 {
3687 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
3688 }
3689 } 3441 }
3690 3442
3691 if (x == NIL) 3443 if (x == NIL)
3692 { 3444 {
3693
3694 /*-- 3445 /*--
3695 * if (y != NIL) { 3446 * if (y != NIL) {
3696 * Error_0("too many arguments"); 3447 * Error_0("too many arguments");
3697 * } 3448 * }
3698 */ 3449 */
3699 } 3450 }
3700 else if (is_symbol (x)) 3451 else if (is_symbol (x))
3701 new_slot_in_env (SCHEME_A_ x, y); 3452 new_slot_in_env (SCHEME_A_ x, y);
3702 else 3453 else
3703 {
3704 Error_1 ("syntax error in closure: not a symbol:", x); 3454 Error_1 ("syntax error in closure: not a symbol:", x);
3705 }
3706 3455
3707 SCHEME_V->code = cdr (closure_code (SCHEME_V->code)); 3456 SCHEME_V->code = cdr (closure_code (SCHEME_V->code));
3708 SCHEME_V->args = NIL; 3457 SCHEME_V->args = NIL;
3709 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3710 } 3459 }
3711 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3712 { 3461 {
3713 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3714 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3715 } 3464 }
3716 else 3465 else
3717 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3718 3467
3719 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3728 { 3477 {
3729 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3730 3479
3731 if (f != NIL) 3480 if (f != NIL)
3732 { 3481 {
3733 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3734 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3735 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3736 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3737 } 3486 }
3738 3487
… …
3749 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3750 3499
3751#endif 3500#endif
3752 3501
3753 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3754 x = car (SCHEME_V->args); 3503 x = car (args);
3755 3504
3756 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3757 x = cdr (x); 3506 x = cdr (x);
3758 3507
3759 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3760 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3761 else 3510 else
3762 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3763 3512
3764 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3765 3514
3766 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3767 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3780 x = car (SCHEME_V->code); 3529 x = car (SCHEME_V->code);
3781 SCHEME_V->code = cadr (SCHEME_V->code); 3530 SCHEME_V->code = cadr (SCHEME_V->code);
3782 } 3531 }
3783 3532
3784 if (!is_symbol (x)) 3533 if (!is_symbol (x))
3785 {
3786 Error_0 ("variable is not a symbol"); 3534 Error_0 ("variable is not a symbol");
3787 }
3788 3535
3789 s_save (SCHEME_A_ OP_DEF1, NIL, x); 3536 s_save (SCHEME_A_ OP_DEF1, NIL, x);
3790 s_goto (OP_EVAL); 3537 s_goto (OP_EVAL);
3791 3538
3792 case OP_DEF1: /* define */ 3539 case OP_DEF1: /* define */
3793 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3540 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
3794 3541
3795 if (x != NIL) 3542 if (x != NIL)
3796 {
3797 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3543 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
3798 }
3799 else 3544 else
3800 {
3801 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3545 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3802 }
3803 3546
3804 s_return (SCHEME_V->code); 3547 s_return (SCHEME_V->code);
3805 3548
3806 3549
3807 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3808 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3809 3552
3810 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3811 {
3812 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3813 }
3814 3555
3815 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3556 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3816 3557
3817 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3818 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3819 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3560 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3820 3561
… …
3829 { 3570 {
3830 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3571 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3831 s_return (SCHEME_V->value); 3572 s_return (SCHEME_V->value);
3832 } 3573 }
3833 else 3574 else
3834 {
3835 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3575 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3836 }
3837 3576
3838 3577
3839 case OP_BEGIN: /* begin */ 3578 case OP_BEGIN: /* begin */
3840 if (!is_pair (SCHEME_V->code)) 3579 if (!is_pair (SCHEME_V->code))
3841 {
3842 s_return (SCHEME_V->code); 3580 s_return (SCHEME_V->code);
3843 }
3844 3581
3845 if (cdr (SCHEME_V->code) != NIL) 3582 if (cdr (SCHEME_V->code) != NIL)
3846 {
3847 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code)); 3583 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code));
3848 }
3849 3584
3850 SCHEME_V->code = car (SCHEME_V->code); 3585 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3586 s_goto (OP_EVAL);
3852 3587
3853 case OP_IF0: /* if */ 3588 case OP_IF0: /* if */
… …
3869 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3870 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3605 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3871 s_goto (OP_LET1); 3606 s_goto (OP_LET1);
3872 3607
3873 case OP_LET1: /* let (calculate parameters) */ 3608 case OP_LET1: /* let (calculate parameters) */
3874 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3609 args = cons (SCHEME_V->value, args);
3875 3610
3876 if (is_pair (SCHEME_V->code)) /* continue */ 3611 if (is_pair (SCHEME_V->code)) /* continue */
3877 { 3612 {
3878 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3613 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3879 {
3880 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3614 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3881 }
3882 3615
3883 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3616 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3884 SCHEME_V->code = cadar (SCHEME_V->code); 3617 SCHEME_V->code = cadar (SCHEME_V->code);
3885 SCHEME_V->args = NIL; 3618 SCHEME_V->args = NIL;
3886 s_goto (OP_EVAL); 3619 s_goto (OP_EVAL);
3887 } 3620 }
3888 else /* end */ 3621 else /* end */
3889 { 3622 {
3890 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3623 args = reverse_in_place (SCHEME_A_ NIL, args);
3891 SCHEME_V->code = car (SCHEME_V->args); 3624 SCHEME_V->code = car (args);
3892 SCHEME_V->args = cdr (SCHEME_V->args); 3625 SCHEME_V->args = cdr (args);
3893 s_goto (OP_LET2); 3626 s_goto (OP_LET2);
3894 } 3627 }
3895 3628
3896 case OP_LET2: /* let */ 3629 case OP_LET2: /* let */
3897 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3630 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3898 3631
3899 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3632 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3900 y != NIL; x = cdr (x), y = cdr (y)) 3633 y != NIL; x = cdr (x), y = cdr (y))
3901 {
3902 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3634 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3903 }
3904 3635
3905 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3636 if (is_symbol (car (SCHEME_V->code))) /* named let */
3906 { 3637 {
3907 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3638 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3908 { 3639 {
3909 if (!is_pair (x)) 3640 if (!is_pair (x))
3910 Error_1 ("Bad syntax of binding in let :", x); 3641 Error_1 ("Bad syntax of binding in let :", x);
3911 3642
3912 if (!is_list (SCHEME_A_ car (x))) 3643 if (!is_list (SCHEME_A_ car (x)))
3913 Error_1 ("Bad syntax of binding in let :", car (x)); 3644 Error_1 ("Bad syntax of binding in let :", car (x));
3914 3645
3915 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3646 args = cons (caar (x), args);
3916 } 3647 }
3917 3648
3918 x =
3919 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3649 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3920 SCHEME_V->envir); 3650 SCHEME_V->envir);
3921 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3651 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3922 SCHEME_V->code = cddr (SCHEME_V->code); 3652 SCHEME_V->code = cddr (SCHEME_V->code);
3923 SCHEME_V->args = NIL;
3924 } 3653 }
3925 else 3654 else
3926 { 3655 {
3927 SCHEME_V->code = cdr (SCHEME_V->code); 3656 SCHEME_V->code = cdr (SCHEME_V->code);
3657 }
3658
3928 SCHEME_V->args = NIL; 3659 SCHEME_V->args = NIL;
3929 }
3930
3931 s_goto (OP_BEGIN); 3660 s_goto (OP_BEGIN);
3932 3661
3933 case OP_LET0AST: /* let* */ 3662 case OP_LET0AST: /* let* */
3934 if (car (SCHEME_V->code) == NIL) 3663 if (car (SCHEME_V->code) == NIL)
3935 { 3664 {
… …
3953 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3682 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3954 SCHEME_V->code = cdr (SCHEME_V->code); 3683 SCHEME_V->code = cdr (SCHEME_V->code);
3955 3684
3956 if (is_pair (SCHEME_V->code)) /* continue */ 3685 if (is_pair (SCHEME_V->code)) /* continue */
3957 { 3686 {
3958 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3687 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3959 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3960 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3961 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3962 } 3691 }
3963 else /* end */ 3692 else /* end */
3964 { 3693 {
3965 SCHEME_V->code = SCHEME_V->args; 3694 SCHEME_V->code = args;
3966 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3967 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3968 } 3697 }
3969 3698
3970 case OP_LET0REC: /* letrec */ 3699 case OP_LET0REC: /* letrec */
… …
3973 SCHEME_V->value = SCHEME_V->code; 3702 SCHEME_V->value = SCHEME_V->code;
3974 SCHEME_V->code = car (SCHEME_V->code); 3703 SCHEME_V->code = car (SCHEME_V->code);
3975 s_goto (OP_LET1REC); 3704 s_goto (OP_LET1REC);
3976 3705
3977 case OP_LET1REC: /* letrec (calculate parameters) */ 3706 case OP_LET1REC: /* letrec (calculate parameters) */
3978 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3707 args = cons (SCHEME_V->value, args);
3979 3708
3980 if (is_pair (SCHEME_V->code)) /* continue */ 3709 if (is_pair (SCHEME_V->code)) /* continue */
3981 { 3710 {
3982 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3711 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3983 {
3984 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3712 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3985 }
3986 3713
3987 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3714 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3988 SCHEME_V->code = cadar (SCHEME_V->code); 3715 SCHEME_V->code = cadar (SCHEME_V->code);
3989 SCHEME_V->args = NIL; 3716 SCHEME_V->args = NIL;
3990 s_goto (OP_EVAL); 3717 s_goto (OP_EVAL);
3991 } 3718 }
3992 else /* end */ 3719 else /* end */
3993 { 3720 {
3994 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3721 args = reverse_in_place (SCHEME_A_ NIL, args);
3995 SCHEME_V->code = car (SCHEME_V->args); 3722 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cdr (SCHEME_V->args); 3723 SCHEME_V->args = cdr (args);
3997 s_goto (OP_LET2REC); 3724 s_goto (OP_LET2REC);
3998 } 3725 }
3999 3726
4000 case OP_LET2REC: /* letrec */ 3727 case OP_LET2REC: /* letrec */
4001 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3728 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
4002 {
4003 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3729 new_slot_in_env (SCHEME_A_ caar (x), car (y));
4004 }
4005 3730
4006 SCHEME_V->code = cdr (SCHEME_V->code); 3731 SCHEME_V->code = cdr (SCHEME_V->code);
4007 SCHEME_V->args = NIL; 3732 SCHEME_V->args = NIL;
4008 s_goto (OP_BEGIN); 3733 s_goto (OP_BEGIN);
4009 3734
4010 case OP_COND0: /* cond */ 3735 case OP_COND0: /* cond */
4011 if (!is_pair (SCHEME_V->code)) 3736 if (!is_pair (SCHEME_V->code))
4012 {
4013 Error_0 ("syntax error in cond"); 3737 Error_0 ("syntax error in cond");
4014 }
4015 3738
4016 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3739 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4017 SCHEME_V->code = caar (SCHEME_V->code); 3740 SCHEME_V->code = caar (SCHEME_V->code);
4018 s_goto (OP_EVAL); 3741 s_goto (OP_EVAL);
4019 3742
4020 case OP_COND1: /* cond */ 3743 case OP_COND1: /* cond */
4021 if (is_true (SCHEME_V->value)) 3744 if (is_true (SCHEME_V->value))
4022 { 3745 {
4023 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL) 3746 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL)
4024 {
4025 s_return (SCHEME_V->value); 3747 s_return (SCHEME_V->value);
4026 }
4027 3748
4028 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO) 3749 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO)
4029 { 3750 {
4030 if (!is_pair (cdr (SCHEME_V->code))) 3751 if (!is_pair (cdr (SCHEME_V->code)))
4031 {
4032 Error_0 ("syntax error in cond"); 3752 Error_0 ("syntax error in cond");
4033 }
4034 3753
4035 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)); 3754 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL));
4036 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL)); 3755 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL));
4037 s_goto (OP_EVAL); 3756 s_goto (OP_EVAL);
4038 } 3757 }
… …
4040 s_goto (OP_BEGIN); 3759 s_goto (OP_BEGIN);
4041 } 3760 }
4042 else 3761 else
4043 { 3762 {
4044 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3763 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
4045 {
4046 s_return (NIL); 3764 s_return (NIL);
4047 }
4048 else 3765 else
4049 { 3766 {
4050 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3767 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4051 SCHEME_V->code = caar (SCHEME_V->code); 3768 SCHEME_V->code = caar (SCHEME_V->code);
4052 s_goto (OP_EVAL); 3769 s_goto (OP_EVAL);
… …
4058 set_typeflag (x, T_PROMISE); 3775 set_typeflag (x, T_PROMISE);
4059 s_return (x); 3776 s_return (x);
4060 3777
4061 case OP_AND0: /* and */ 3778 case OP_AND0: /* and */
4062 if (SCHEME_V->code == NIL) 3779 if (SCHEME_V->code == NIL)
4063 {
4064 s_return (S_T); 3780 s_return (S_T);
4065 }
4066 3781
4067 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3782 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4068 SCHEME_V->code = car (SCHEME_V->code); 3783 SCHEME_V->code = car (SCHEME_V->code);
4069 s_goto (OP_EVAL); 3784 s_goto (OP_EVAL);
4070 3785
4071 case OP_AND1: /* and */ 3786 case OP_AND1: /* and */
4072 if (is_false (SCHEME_V->value)) 3787 if (is_false (SCHEME_V->value))
4073 {
4074 s_return (SCHEME_V->value); 3788 s_return (SCHEME_V->value);
4075 }
4076 else if (SCHEME_V->code == NIL) 3789 else if (SCHEME_V->code == NIL)
4077 {
4078 s_return (SCHEME_V->value); 3790 s_return (SCHEME_V->value);
4079 }
4080 else 3791 else
4081 { 3792 {
4082 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3793 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4083 SCHEME_V->code = car (SCHEME_V->code); 3794 SCHEME_V->code = car (SCHEME_V->code);
4084 s_goto (OP_EVAL); 3795 s_goto (OP_EVAL);
4085 } 3796 }
4086 3797
4087 case OP_OR0: /* or */ 3798 case OP_OR0: /* or */
4088 if (SCHEME_V->code == NIL) 3799 if (SCHEME_V->code == NIL)
4089 {
4090 s_return (S_F); 3800 s_return (S_F);
4091 }
4092 3801
4093 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3802 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4094 SCHEME_V->code = car (SCHEME_V->code); 3803 SCHEME_V->code = car (SCHEME_V->code);
4095 s_goto (OP_EVAL); 3804 s_goto (OP_EVAL);
4096 3805
4097 case OP_OR1: /* or */ 3806 case OP_OR1: /* or */
4098 if (is_true (SCHEME_V->value)) 3807 if (is_true (SCHEME_V->value))
4099 {
4100 s_return (SCHEME_V->value); 3808 s_return (SCHEME_V->value);
4101 }
4102 else if (SCHEME_V->code == NIL) 3809 else if (SCHEME_V->code == NIL)
4103 {
4104 s_return (SCHEME_V->value); 3810 s_return (SCHEME_V->value);
4105 }
4106 else 3811 else
4107 { 3812 {
4108 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3813 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4109 SCHEME_V->code = car (SCHEME_V->code); 3814 SCHEME_V->code = car (SCHEME_V->code);
4110 s_goto (OP_EVAL); 3815 s_goto (OP_EVAL);
… …
4114 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4115 SCHEME_V->code = car (SCHEME_V->code); 3820 SCHEME_V->code = car (SCHEME_V->code);
4116 s_goto (OP_EVAL); 3821 s_goto (OP_EVAL);
4117 3822
4118 case OP_C1STREAM: /* cons-stream */ 3823 case OP_C1STREAM: /* cons-stream */
4119 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3824 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
4120 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3825 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4121 set_typeflag (x, T_PROMISE); 3826 set_typeflag (x, T_PROMISE);
4122 s_return (cons (SCHEME_V->args, x)); 3827 s_return (cons (args, x));
4123 3828
4124 case OP_MACRO0: /* macro */ 3829 case OP_MACRO0: /* macro */
4125 if (is_pair (car (SCHEME_V->code))) 3830 if (is_pair (car (SCHEME_V->code)))
4126 { 3831 {
4127 x = caar (SCHEME_V->code); 3832 x = caar (SCHEME_V->code);
… …
4132 x = car (SCHEME_V->code); 3837 x = car (SCHEME_V->code);
4133 SCHEME_V->code = cadr (SCHEME_V->code); 3838 SCHEME_V->code = cadr (SCHEME_V->code);
4134 } 3839 }
4135 3840
4136 if (!is_symbol (x)) 3841 if (!is_symbol (x))
4137 {
4138 Error_0 ("variable is not a symbol"); 3842 Error_0 ("variable is not a symbol");
4139 }
4140 3843
4141 s_save (SCHEME_A_ OP_MACRO1, NIL, x); 3844 s_save (SCHEME_A_ OP_MACRO1, NIL, x);
4142 s_goto (OP_EVAL); 3845 s_goto (OP_EVAL);
4143 3846
4144 case OP_MACRO1: /* macro */ 3847 case OP_MACRO1: /* macro */
4145 set_typeflag (SCHEME_V->value, T_MACRO); 3848 set_typeflag (SCHEME_V->value, T_MACRO);
4146 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3849 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
4147 3850
4148 if (x != NIL) 3851 if (x != NIL)
4149 {
4150 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3852 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
4151 }
4152 else 3853 else
4153 {
4154 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3854 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
4155 }
4156 3855
4157 s_return (SCHEME_V->code); 3856 s_return (SCHEME_V->code);
4158 3857
4159 case OP_CASE0: /* case */ 3858 case OP_CASE0: /* case */
4160 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code)); 3859 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code));
… …
4163 3862
4164 case OP_CASE1: /* case */ 3863 case OP_CASE1: /* case */
4165 for (x = SCHEME_V->code; x != NIL; x = cdr (x)) 3864 for (x = SCHEME_V->code; x != NIL; x = cdr (x))
4166 { 3865 {
4167 if (!is_pair (y = caar (x))) 3866 if (!is_pair (y = caar (x)))
4168 {
4169 break; 3867 break;
4170 }
4171 3868
4172 for (; y != NIL; y = cdr (y)) 3869 for (; y != NIL; y = cdr (y))
4173 {
4174 if (eqv (car (y), SCHEME_V->value)) 3870 if (eqv (car (y), SCHEME_V->value))
4175 {
4176 break; 3871 break;
4177 }
4178 }
4179 3872
4180 if (y != NIL) 3873 if (y != NIL)
4181 {
4182 break; 3874 break;
4183 }
4184 } 3875 }
4185 3876
4186 if (x != NIL) 3877 if (x != NIL)
4187 { 3878 {
4188 if (is_pair (caar (x))) 3879 if (is_pair (caar (x)))
… …
4196 SCHEME_V->code = caar (x); 3887 SCHEME_V->code = caar (x);
4197 s_goto (OP_EVAL); 3888 s_goto (OP_EVAL);
4198 } 3889 }
4199 } 3890 }
4200 else 3891 else
4201 {
4202 s_return (NIL); 3892 s_return (NIL);
4203 }
4204 3893
4205 case OP_CASE2: /* case */ 3894 case OP_CASE2: /* case */
4206 if (is_true (SCHEME_V->value)) 3895 if (is_true (SCHEME_V->value))
4207 {
4208 s_goto (OP_BEGIN); 3896 s_goto (OP_BEGIN);
4209 }
4210 else 3897 else
4211 {
4212 s_return (NIL); 3898 s_return (NIL);
4213 }
4214 3899
4215 case OP_PAPPLY: /* apply */ 3900 case OP_PAPPLY: /* apply */
4216 SCHEME_V->code = car (SCHEME_V->args); 3901 SCHEME_V->code = car (args);
4217 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3902 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4218 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3903 /*SCHEME_V->args = cadr(args); */
4219 s_goto (OP_APPLY); 3904 s_goto (OP_APPLY);
4220 3905
4221 case OP_PEVAL: /* eval */ 3906 case OP_PEVAL: /* eval */
4222 if (cdr (SCHEME_V->args) != NIL) 3907 if (cdr (args) != NIL)
4223 {
4224 SCHEME_V->envir = cadr (SCHEME_V->args); 3908 SCHEME_V->envir = cadr (args);
4225 }
4226 3909
4227 SCHEME_V->code = car (SCHEME_V->args); 3910 SCHEME_V->code = car (args);
4228 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
4229 3912
4230 case OP_CONTINUATION: /* call-with-current-continuation */ 3913 case OP_CONTINUATION: /* call-with-current-continuation */
4231 SCHEME_V->code = car (SCHEME_V->args); 3914 SCHEME_V->code = car (args);
4232 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4233 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
4234 } 3917 }
4235 3918
4236 return S_T; 3919 abort ();
4237} 3920}
4238 3921
4239static pointer 3922static pointer
4240opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3923opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4241{ 3924{
4242 pointer x; 3925 pointer args = SCHEME_V->args;
3926 pointer x = car (args);
4243 num v; 3927 num v;
4244 3928
4245#if USE_MATH 3929#if USE_MATH
4246 RVALUE dd; 3930 RVALUE dd;
4247#endif 3931#endif
4248 3932
4249 switch (op) 3933 switch (op)
4250 { 3934 {
4251#if USE_MATH 3935#if USE_MATH
4252
4253 case OP_INEX2EX: /* inexact->exact */ 3936 case OP_INEX2EX: /* inexact->exact */
4254 x = car (SCHEME_V->args);
4255
4256 if (num_is_integer (x)) 3937 if (num_is_integer (x))
4257 {
4258 s_return (x); 3938 s_return (x);
4259 }
4260 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3939 else if (modf (rvalue_unchecked (x), &dd) == 0)
4261 {
4262 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3940 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4263 }
4264 else 3941 else
4265 {
4266 Error_1 ("inexact->exact: not integral:", x); 3942 Error_1 ("inexact->exact: not integral:", x);
4267 }
4268 3943
4269 case OP_EXP:
4270 x = car (SCHEME_V->args);
4271 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4272
4273 case OP_LOG:
4274 x = car (SCHEME_V->args);
4275 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4276
4277 case OP_SIN:
4278 x = car (SCHEME_V->args);
4279 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4280
4281 case OP_COS:
4282 x = car (SCHEME_V->args);
4283 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4284
4285 case OP_TAN:
4286 x = car (SCHEME_V->args);
4287 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3948 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4288
4289 case OP_ASIN:
4290 x = car (SCHEME_V->args);
4291 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3949 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4292
4293 case OP_ACOS:
4294 x = car (SCHEME_V->args);
4295 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3950 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4296 3951
4297 case OP_ATAN: 3952 case OP_ATAN:
4298 x = car (SCHEME_V->args);
4299
4300 if (cdr (SCHEME_V->args) == NIL) 3953 if (cdr (args) == NIL)
4301 {
4302 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3954 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4303 }
4304 else 3955 else
4305 { 3956 {
4306 pointer y = cadr (SCHEME_V->args); 3957 pointer y = cadr (args);
4307
4308 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3958 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4309 } 3959 }
4310 3960
4311 case OP_SQRT: 3961 case OP_SQRT:
4312 x = car (SCHEME_V->args);
4313 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3962 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4314 3963
4315 case OP_EXPT: 3964 case OP_EXPT:
4316 { 3965 {
4317 RVALUE result; 3966 RVALUE result;
4318 int real_result = 1; 3967 int real_result = 1;
4319 pointer y = cadr (SCHEME_V->args); 3968 pointer y = cadr (args);
4320
4321 x = car (SCHEME_V->args);
4322 3969
4323 if (num_is_integer (x) && num_is_integer (y)) 3970 if (num_is_integer (x) && num_is_integer (y))
4324 real_result = 0; 3971 real_result = 0;
4325 3972
4326 /* This 'if' is an R5RS compatibility fix. */ 3973 /* This 'if' is an R5RS compatibility fix. */
4327 /* NOTE: Remove this 'if' fix for R6RS. */ 3974 /* NOTE: Remove this 'if' fix for R6RS. */
4328 if (rvalue (x) == 0 && rvalue (y) < 0) 3975 if (rvalue (x) == 0 && rvalue (y) < 0)
4329 {
4330 result = 0.0; 3976 result = 0;
4331 }
4332 else 3977 else
4333 {
4334 result = pow (rvalue (x), rvalue (y)); 3978 result = pow (rvalue (x), rvalue (y));
4335 }
4336 3979
4337 /* Before returning integer result make sure we can. */ 3980 /* Before returning integer result make sure we can. */
4338 /* If the test fails, result is too big for integer. */ 3981 /* If the test fails, result is too big for integer. */
4339 if (!real_result) 3982 if (!real_result)
4340 { 3983 {
4341 long result_as_long = (long) result; 3984 long result_as_long = result;
4342 3985
4343 if (result != (RVALUE) result_as_long) 3986 if (result != (RVALUE) result_as_long)
4344 real_result = 1; 3987 real_result = 1;
4345 } 3988 }
4346 3989
4347 if (real_result) 3990 if (real_result)
4348 {
4349 s_return (mk_real (SCHEME_A_ result)); 3991 s_return (mk_real (SCHEME_A_ result));
4350 }
4351 else 3992 else
4352 {
4353 s_return (mk_integer (SCHEME_A_ result)); 3993 s_return (mk_integer (SCHEME_A_ result));
4354 }
4355 } 3994 }
4356 3995
4357 case OP_FLOOR:
4358 x = car (SCHEME_V->args);
4359 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4360
4361 case OP_CEILING:
4362 x = car (SCHEME_V->args);
4363 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4364 3998
4365 case OP_TRUNCATE: 3999 case OP_TRUNCATE:
4366 { 4000 {
4367 RVALUE rvalue_of_x; 4001 RVALUE rvalue_of_x;
4368 4002
4369 x = car (SCHEME_V->args);
4370 rvalue_of_x = rvalue (x); 4003 rvalue_of_x = rvalue (x);
4371 4004
4372 if (rvalue_of_x > 0) 4005 if (rvalue_of_x > 0)
4373 {
4374 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4375 }
4376 else 4007 else
4377 {
4378 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4379 }
4380 } 4009 }
4381 4010
4382 case OP_ROUND: 4011 case OP_ROUND:
4383 x = car (SCHEME_V->args);
4384
4385 if (num_is_integer (x)) 4012 if (num_is_integer (x))
4386 s_return (x); 4013 s_return (x);
4387 4014
4388 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4389#endif 4016#endif
4390 4017
4391 case OP_ADD: /* + */ 4018 case OP_ADD: /* + */
4392 v = num_zero; 4019 v = num_zero;
4393 4020
4394 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4021 for (x = args; x != NIL; x = cdr (x))
4395 v = num_add (v, nvalue (car (x))); 4022 v = num_op ('+', v, nvalue (car (x)));
4396 4023
4397 s_return (mk_number (SCHEME_A_ v)); 4024 s_return (mk_number (SCHEME_A_ v));
4398 4025
4399 case OP_MUL: /* * */ 4026 case OP_MUL: /* * */
4400 v = num_one; 4027 v = num_one;
4401 4028
4402 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4029 for (x = args; x != NIL; x = cdr (x))
4403 v = num_mul (v, nvalue (car (x))); 4030 v = num_op ('+', v, nvalue (car (x)));
4404 4031
4405 s_return (mk_number (SCHEME_A_ v)); 4032 s_return (mk_number (SCHEME_A_ v));
4406 4033
4407 case OP_SUB: /* - */ 4034 case OP_SUB: /* - */
4408 if (cdr (SCHEME_V->args) == NIL) 4035 if (cdr (args) == NIL)
4409 { 4036 {
4410 x = SCHEME_V->args; 4037 x = args;
4411 v = num_zero; 4038 v = num_zero;
4412 } 4039 }
4413 else 4040 else
4414 { 4041 {
4415 x = cdr (SCHEME_V->args); 4042 x = cdr (args);
4416 v = nvalue (car (SCHEME_V->args)); 4043 v = nvalue (car (args));
4417 } 4044 }
4418 4045
4419 for (; x != NIL; x = cdr (x)) 4046 for (; x != NIL; x = cdr (x))
4420 v = num_sub (v, nvalue (car (x))); 4047 v = num_op ('+', v, nvalue (car (x)));
4421 4048
4422 s_return (mk_number (SCHEME_A_ v)); 4049 s_return (mk_number (SCHEME_A_ v));
4423 4050
4424 case OP_DIV: /* / */ 4051 case OP_DIV: /* / */
4425 if (cdr (SCHEME_V->args) == NIL) 4052 if (cdr (args) == NIL)
4426 { 4053 {
4427 x = SCHEME_V->args; 4054 x = args;
4428 v = num_one; 4055 v = num_one;
4429 } 4056 }
4430 else 4057 else
4431 { 4058 {
4432 x = cdr (SCHEME_V->args); 4059 x = cdr (args);
4433 v = nvalue (car (SCHEME_V->args)); 4060 v = nvalue (car (args));
4434 } 4061 }
4435 4062
4436 for (; x != NIL; x = cdr (x)) 4063 for (; x != NIL; x = cdr (x))
4437 { 4064 {
4438 if (!is_zero_rvalue (rvalue (car (x)))) 4065 if (!is_zero_rvalue (rvalue (car (x))))
… …
4442 } 4069 }
4443 4070
4444 s_return (mk_number (SCHEME_A_ v)); 4071 s_return (mk_number (SCHEME_A_ v));
4445 4072
4446 case OP_INTDIV: /* quotient */ 4073 case OP_INTDIV: /* quotient */
4447 if (cdr (SCHEME_V->args) == NIL) 4074 if (cdr (args) == NIL)
4448 { 4075 {
4449 x = SCHEME_V->args; 4076 x = args;
4450 v = num_one; 4077 v = num_one;
4451 } 4078 }
4452 else 4079 else
4453 { 4080 {
4454 x = cdr (SCHEME_V->args); 4081 x = cdr (args);
4455 v = nvalue (car (SCHEME_V->args)); 4082 v = nvalue (car (args));
4456 } 4083 }
4457 4084
4458 for (; x != NIL; x = cdr (x)) 4085 for (; x != NIL; x = cdr (x))
4459 { 4086 {
4460 if (ivalue (car (x)) != 0) 4087 if (ivalue (car (x)) != 0)
4461 v = num_intdiv (v, nvalue (car (x))); 4088 v = num_op ('/', v, nvalue (car (x)));
4462 else 4089 else
4463 Error_0 ("quotient: division by zero"); 4090 Error_0 ("quotient: division by zero");
4464 } 4091 }
4465 4092
4466 s_return (mk_number (SCHEME_A_ v)); 4093 s_return (mk_number (SCHEME_A_ v));
4467 4094
4468 case OP_REM: /* remainder */ 4095 case OP_REM: /* remainder */
4469 v = nvalue (car (SCHEME_V->args)); 4096 v = nvalue (x);
4470 4097
4471 if (ivalue (cadr (SCHEME_V->args)) != 0) 4098 if (ivalue (cadr (args)) != 0)
4472 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4099 v = num_rem (v, nvalue (cadr (args)));
4473 else 4100 else
4474 Error_0 ("remainder: division by zero"); 4101 Error_0 ("remainder: division by zero");
4475 4102
4476 s_return (mk_number (SCHEME_A_ v)); 4103 s_return (mk_number (SCHEME_A_ v));
4477 4104
4478 case OP_MOD: /* modulo */ 4105 case OP_MOD: /* modulo */
4479 v = nvalue (car (SCHEME_V->args)); 4106 v = nvalue (x);
4480 4107
4481 if (ivalue (cadr (SCHEME_V->args)) != 0) 4108 if (ivalue (cadr (args)) != 0)
4482 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4109 v = num_mod (v, nvalue (cadr (args)));
4483 else 4110 else
4484 Error_0 ("modulo: division by zero"); 4111 Error_0 ("modulo: division by zero");
4485 4112
4486 s_return (mk_number (SCHEME_A_ v)); 4113 s_return (mk_number (SCHEME_A_ v));
4487 4114
4488 case OP_CAR: /* car */ 4115 case OP_CAR: /* car */
4489 s_return (caar (SCHEME_V->args)); 4116 s_return (caar (args));
4490 4117
4491 case OP_CDR: /* cdr */ 4118 case OP_CDR: /* cdr */
4492 s_return (cdar (SCHEME_V->args)); 4119 s_return (cdar (args));
4493 4120
4494 case OP_CONS: /* cons */ 4121 case OP_CONS: /* cons */
4495 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4122 set_cdr (args, cadr (args));
4496 s_return (SCHEME_V->args); 4123 s_return (args);
4497 4124
4498 case OP_SETCAR: /* set-car! */ 4125 case OP_SETCAR: /* set-car! */
4499 if (!is_immutable (car (SCHEME_V->args))) 4126 if (!is_immutable (x))
4500 { 4127 {
4501 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4128 set_car (x, cadr (args));
4502 s_return (car (SCHEME_V->args)); 4129 s_return (car (args));
4503 } 4130 }
4504 else 4131 else
4505 Error_0 ("set-car!: unable to alter immutable pair"); 4132 Error_0 ("set-car!: unable to alter immutable pair");
4506 4133
4507 case OP_SETCDR: /* set-cdr! */ 4134 case OP_SETCDR: /* set-cdr! */
4508 if (!is_immutable (car (SCHEME_V->args))) 4135 if (!is_immutable (x))
4509 { 4136 {
4510 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4137 set_cdr (x, cadr (args));
4511 s_return (car (SCHEME_V->args)); 4138 s_return (car (args));
4512 } 4139 }
4513 else 4140 else
4514 Error_0 ("set-cdr!: unable to alter immutable pair"); 4141 Error_0 ("set-cdr!: unable to alter immutable pair");
4515 4142
4516 case OP_CHAR2INT: /* char->integer */ 4143 case OP_CHAR2INT: /* char->integer */
4517 {
4518 char c;
4519
4520 c = (char) ivalue (car (SCHEME_V->args));
4521 s_return (mk_integer (SCHEME_A_ (unsigned char) c)); 4144 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4522 }
4523 4145
4524 case OP_INT2CHAR: /* integer->char */ 4146 case OP_INT2CHAR: /* integer->char */
4525 {
4526 unsigned char c;
4527
4528 c = (unsigned char) ivalue (car (SCHEME_V->args));
4529 s_return (mk_character (SCHEME_A_ (char) c)); 4147 s_return (mk_character (SCHEME_A_ ivalue (x)));
4530 }
4531 4148
4532 case OP_CHARUPCASE: 4149 case OP_CHARUPCASE:
4533 { 4150 {
4534 unsigned char c; 4151 unsigned char c = ivalue (x);
4535
4536 c = (unsigned char) ivalue (car (SCHEME_V->args));
4537 c = toupper (c); 4152 c = toupper (c);
4538 s_return (mk_character (SCHEME_A_ (char) c)); 4153 s_return (mk_character (SCHEME_A_ c));
4539 } 4154 }
4540 4155
4541 case OP_CHARDNCASE: 4156 case OP_CHARDNCASE:
4542 { 4157 {
4543 unsigned char c; 4158 unsigned char c = ivalue (x);
4544
4545 c = (unsigned char) ivalue (car (SCHEME_V->args));
4546 c = tolower (c); 4159 c = tolower (c);
4547 s_return (mk_character (SCHEME_A_ (char) c)); 4160 s_return (mk_character (SCHEME_A_ c));
4548 } 4161 }
4549 4162
4550 case OP_STR2SYM: /* string->symbol */ 4163 case OP_STR2SYM: /* string->symbol */
4551 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4164 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4552 4165
4553 case OP_STR2ATOM: /* string->atom */ 4166 case OP_STR2ATOM: /* string->atom */
4554 { 4167 {
4555 char *s = strvalue (car (SCHEME_V->args)); 4168 char *s = strvalue (x);
4556 long pf = 0; 4169 long pf = 0;
4557 4170
4558 if (cdr (SCHEME_V->args) != NIL) 4171 if (cdr (args) != NIL)
4559 { 4172 {
4560 /* we know cadr(SCHEME_V->args) is a natural number */ 4173 /* we know cadr(args) is a natural number */
4561 /* see if it is 2, 8, 10, or 16, or error */ 4174 /* see if it is 2, 8, 10, or 16, or error */
4562 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4175 pf = ivalue_unchecked (cadr (args));
4563 4176
4564 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4177 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4565 { 4178 {
4566 /* base is OK */ 4179 /* base is OK */
4567 } 4180 }
4568 else 4181 else
4569 {
4570 pf = -1; 4182 pf = -1;
4571 }
4572 } 4183 }
4573 4184
4574 if (pf < 0) 4185 if (pf < 0)
4575 {
4576 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4186 Error_1 ("string->atom: bad base:", cadr (args));
4577 }
4578 else if (*s == '#') /* no use of base! */ 4187 else if (*s == '#') /* no use of base! */
4579 {
4580 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4188 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4581 }
4582 else 4189 else
4583 { 4190 {
4584 if (pf == 0 || pf == 10) 4191 if (pf == 0 || pf == 10)
4585 {
4586 s_return (mk_atom (SCHEME_A_ s)); 4192 s_return (mk_atom (SCHEME_A_ s));
4587 }
4588 else 4193 else
4589 { 4194 {
4590 char *ep; 4195 char *ep;
4591 long iv = strtol (s, &ep, (int) pf); 4196 long iv = strtol (s, &ep, (int) pf);
4592 4197
4593 if (*ep == 0) 4198 if (*ep == 0)
4594 {
4595 s_return (mk_integer (SCHEME_A_ iv)); 4199 s_return (mk_integer (SCHEME_A_ iv));
4596 }
4597 else 4200 else
4598 {
4599 s_return (S_F); 4201 s_return (S_F);
4600 }
4601 } 4202 }
4602 } 4203 }
4603 } 4204 }
4604 4205
4605 case OP_SYM2STR: /* symbol->string */ 4206 case OP_SYM2STR: /* symbol->string */
4606 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4207 x = mk_string (SCHEME_A_ symname (x));
4607 setimmutable (x); 4208 setimmutable (x);
4608 s_return (x); 4209 s_return (x);
4609 4210
4610 case OP_ATOM2STR: /* atom->string */ 4211 case OP_ATOM2STR: /* atom->string */
4611 { 4212 {
4612 long pf = 0; 4213 long pf = 0;
4613 4214
4614 x = car (SCHEME_V->args);
4615
4616 if (cdr (SCHEME_V->args) != NIL) 4215 if (cdr (args) != NIL)
4617 { 4216 {
4618 /* we know cadr(SCHEME_V->args) is a natural number */ 4217 /* we know cadr(args) is a natural number */
4619 /* see if it is 2, 8, 10, or 16, or error */ 4218 /* see if it is 2, 8, 10, or 16, or error */
4620 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4219 pf = ivalue_unchecked (cadr (args));
4621 4220
4622 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4221 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4623 { 4222 {
4624 /* base is OK */ 4223 /* base is OK */
4625 } 4224 }
4626 else 4225 else
4627 {
4628 pf = -1; 4226 pf = -1;
4629 }
4630 } 4227 }
4631 4228
4632 if (pf < 0) 4229 if (pf < 0)
4633 {
4634 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4230 Error_1 ("atom->string: bad base:", cadr (args));
4635 }
4636 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4231 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4637 { 4232 {
4638 char *p; 4233 char *p;
4639 int len; 4234 int len;
4640 4235
4641 atom2str (SCHEME_A_ x, (int) pf, &p, &len); 4236 atom2str (SCHEME_A_ x, pf, &p, &len);
4642 s_return (mk_counted_string (SCHEME_A_ p, len)); 4237 s_return (mk_counted_string (SCHEME_A_ p, len));
4643 } 4238 }
4644 else 4239 else
4645 {
4646 Error_1 ("atom->string: not an atom:", x); 4240 Error_1 ("atom->string: not an atom:", x);
4647 }
4648 } 4241 }
4649 4242
4650 case OP_MKSTRING: /* make-string */ 4243 case OP_MKSTRING: /* make-string */
4651 { 4244 {
4652 int fill = ' '; 4245 int fill = ' ';
4653 int len; 4246 int len;
4654 4247
4655 len = ivalue (car (SCHEME_V->args)); 4248 len = ivalue (x);
4656 4249
4657 if (cdr (SCHEME_V->args) != NIL) 4250 if (cdr (args) != NIL)
4658 {
4659 fill = charvalue (cadr (SCHEME_V->args)); 4251 fill = charvalue (cadr (args));
4660 }
4661 4252
4662 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4663 } 4254 }
4664 4255
4665 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4666 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4667 4258
4668 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4669 { 4260 {
4670 char *str; 4261 char *str;
4671 int index; 4262 int index;
4672 4263
4673 str = strvalue (car (SCHEME_V->args)); 4264 str = strvalue (x);
4674 4265
4675 index = ivalue (cadr (SCHEME_V->args)); 4266 index = ivalue (cadr (args));
4676 4267
4677 if (index >= strlength (car (SCHEME_V->args))) 4268 if (index >= strlength (x))
4678 {
4679 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4269 Error_1 ("string-ref: out of bounds:", cadr (args));
4680 }
4681 4270
4682 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4683 } 4272 }
4684 4273
4685 case OP_STRSET: /* string-set! */ 4274 case OP_STRSET: /* string-set! */
4686 { 4275 {
4687 char *str; 4276 char *str;
4688 int index; 4277 int index;
4689 int c; 4278 int c;
4690 4279
4691 if (is_immutable (car (SCHEME_V->args))) 4280 if (is_immutable (x))
4692 {
4693 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4281 Error_1 ("string-set!: unable to alter immutable string:", x);
4694 }
4695 4282
4696 str = strvalue (car (SCHEME_V->args)); 4283 str = strvalue (x);
4697 4284
4698 index = ivalue (cadr (SCHEME_V->args)); 4285 index = ivalue (cadr (args));
4699 4286
4700 if (index >= strlength (car (SCHEME_V->args))) 4287 if (index >= strlength (x))
4701 {
4702 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4288 Error_1 ("string-set!: out of bounds:", cadr (args));
4703 }
4704 4289
4705 c = charvalue (caddr (SCHEME_V->args)); 4290 c = charvalue (caddr (args));
4706 4291
4707 str[index] = (char) c; 4292 str[index] = c;
4708 s_return (car (SCHEME_V->args)); 4293 s_return (car (args));
4709 } 4294 }
4710 4295
4711 case OP_STRAPPEND: /* string-append */ 4296 case OP_STRAPPEND: /* string-append */
4712 { 4297 {
4713 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4298 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4714 int len = 0; 4299 int len = 0;
4715 pointer newstr; 4300 pointer newstr;
4716 char *pos; 4301 char *pos;
4717 4302
4718 /* compute needed length for new string */ 4303 /* compute needed length for new string */
4719 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4304 for (x = args; x != NIL; x = cdr (x))
4720 {
4721 len += strlength (car (x)); 4305 len += strlength (car (x));
4722 }
4723 4306
4724 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4307 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4725 4308
4726 /* store the contents of the argument strings into the new string */ 4309 /* store the contents of the argument strings into the new string */
4727 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4310 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4728 {
4729 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4311 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4730 }
4731 4312
4732 s_return (newstr); 4313 s_return (newstr);
4733 } 4314 }
4734 4315
4735 case OP_SUBSTR: /* substring */ 4316 case OP_SUBSTR: /* substring */
… …
4737 char *str; 4318 char *str;
4738 int index0; 4319 int index0;
4739 int index1; 4320 int index1;
4740 int len; 4321 int len;
4741 4322
4742 str = strvalue (car (SCHEME_V->args)); 4323 str = strvalue (x);
4743 4324
4744 index0 = ivalue (cadr (SCHEME_V->args)); 4325 index0 = ivalue (cadr (args));
4745 4326
4746 if (index0 > strlength (car (SCHEME_V->args))) 4327 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args));
4329
4330 if (cddr (args) != NIL)
4747 { 4331 {
4748 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args));
4749 }
4750
4751 if (cddr (SCHEME_V->args) != NIL)
4752 {
4753 index1 = ivalue (caddr (SCHEME_V->args)); 4332 index1 = ivalue (caddr (args));
4754 4333
4755 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4334 if (index1 > strlength (x) || index1 < index0)
4756 {
4757 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4335 Error_1 ("substring: end out of bounds:", caddr (args));
4758 }
4759 } 4336 }
4760 else 4337 else
4761 { 4338 index1 = strlength (x);
4762 index1 = strlength (car (SCHEME_V->args));
4763 }
4764 4339
4765 len = index1 - index0; 4340 len = index1 - index0;
4766 x = mk_empty_string (SCHEME_A_ len, ' '); 4341 x = mk_empty_string (SCHEME_A_ len, ' ');
4767 memcpy (strvalue (x), str + index0, len); 4342 memcpy (strvalue (x), str + index0, len);
4768 strvalue (x)[len] = 0; 4343 strvalue (x)[len] = 0;
… …
4772 4347
4773 case OP_VECTOR: /* vector */ 4348 case OP_VECTOR: /* vector */
4774 { 4349 {
4775 int i; 4350 int i;
4776 pointer vec; 4351 pointer vec;
4777 int len = list_length (SCHEME_A_ SCHEME_V->args); 4352 int len = list_length (SCHEME_A_ args);
4778 4353
4779 if (len < 0) 4354 if (len < 0)
4780 {
4781 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4355 Error_1 ("vector: not a proper list:", args);
4782 }
4783 4356
4784 vec = mk_vector (SCHEME_A_ len); 4357 vec = mk_vector (SCHEME_A_ len);
4785 4358
4786#if USE_ERROR_CHECKING 4359#if USE_ERROR_CHECKING
4787 if (SCHEME_V->no_memory) 4360 if (SCHEME_V->no_memory)
4788 s_return (S_SINK); 4361 s_return (S_SINK);
4789#endif 4362#endif
4790 4363
4791 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4792 set_vector_elem (vec, i, car (x)); 4365 set_vector_elem (vec, i, car (x));
4793 4366
4794 s_return (vec); 4367 s_return (vec);
4795 } 4368 }
4796 4369
… …
4798 { 4371 {
4799 pointer fill = NIL; 4372 pointer fill = NIL;
4800 int len; 4373 int len;
4801 pointer vec; 4374 pointer vec;
4802 4375
4803 len = ivalue (car (SCHEME_V->args)); 4376 len = ivalue (x);
4804 4377
4805 if (cdr (SCHEME_V->args) != NIL) 4378 if (cdr (args) != NIL)
4806 fill = cadr (SCHEME_V->args); 4379 fill = cadr (args);
4807 4380
4808 vec = mk_vector (SCHEME_A_ len); 4381 vec = mk_vector (SCHEME_A_ len);
4809 4382
4810#if USE_ERROR_CHECKING 4383#if USE_ERROR_CHECKING
4811 if (SCHEME_V->no_memory) 4384 if (SCHEME_V->no_memory)
… …
4817 4390
4818 s_return (vec); 4391 s_return (vec);
4819 } 4392 }
4820 4393
4821 case OP_VECLEN: /* vector-length */ 4394 case OP_VECLEN: /* vector-length */
4822 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4395 s_return (mk_integer (SCHEME_A_ veclength (x)));
4823 4396
4824 case OP_VECREF: /* vector-ref */ 4397 case OP_VECREF: /* vector-ref */
4825 { 4398 {
4826 int index; 4399 int index;
4827 4400
4828 index = ivalue (cadr (SCHEME_V->args)); 4401 index = ivalue (cadr (args));
4829 4402
4830 if (index >= ivalue (car (SCHEME_V->args))) 4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4831 {
4832 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4404 Error_1 ("vector-ref: out of bounds:", cadr (args));
4833 }
4834 4405
4835 s_return (vector_elem (car (SCHEME_V->args), index)); 4406 s_return (vector_elem (x, index));
4836 } 4407 }
4837 4408
4838 case OP_VECSET: /* vector-set! */ 4409 case OP_VECSET: /* vector-set! */
4839 { 4410 {
4840 int index; 4411 int index;
4841 4412
4842 if (is_immutable (car (SCHEME_V->args))) 4413 if (is_immutable (x))
4843 {
4844 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4414 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4845 }
4846 4415
4847 index = ivalue (cadr (SCHEME_V->args)); 4416 index = ivalue (cadr (args));
4848 4417
4849 if (index >= ivalue (car (SCHEME_V->args))) 4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4850 {
4851 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4419 Error_1 ("vector-set!: out of bounds:", cadr (args));
4852 }
4853 4420
4854 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4421 set_vector_elem (x, index, caddr (args));
4855 s_return (car (SCHEME_V->args)); 4422 s_return (x);
4856 } 4423 }
4857 } 4424 }
4858 4425
4859 return S_T; 4426 return S_T;
4860} 4427}
… …
4912 } 4479 }
4913 } 4480 }
4914} 4481}
4915 4482
4916static pointer 4483static pointer
4484opexe_r (SCHEME_P_ enum scheme_opcodes op)
4485{
4486 pointer x = SCHEME_V->args;
4487
4488 for (;;)
4489 {
4490 num v = nvalue (car (x));
4491 x = cdr (x);
4492
4493 if (x == NIL)
4494 break;
4495
4496 int r = num_cmp (v, nvalue (car (x)));
4497
4498 switch (op)
4499 {
4500 case OP_NUMEQ: r = r == 0; break;
4501 case OP_LESS: r = r < 0; break;
4502 case OP_GRE: r = r > 0; break;
4503 case OP_LEQ: r = r <= 0; break;
4504 case OP_GEQ: r = r >= 0; break;
4505 }
4506
4507 if (!r)
4508 s_return (S_F);
4509 }
4510
4511 s_return (S_T);
4512}
4513
4514static pointer
4917opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4515opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4918{ 4516{
4919 pointer x; 4517 pointer args = SCHEME_V->args;
4920 num v; 4518 pointer a = car (args);
4921 int (*comp_func) (num, num); 4519 pointer d = cdr (args);
4520 int r;
4922 4521
4923 switch (op) 4522 switch (op)
4924 { 4523 {
4925 case OP_NOT: /* not */ 4524 case OP_NOT: /* not */ r = is_false (a) ; break;
4926 s_retbool (is_false (car (SCHEME_V->args))); 4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4927 4534
4928 case OP_BOOLP: /* boolean? */
4929 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4930
4931 case OP_EOFOBJP: /* boolean? */
4932 s_retbool (car (SCHEME_V->args) == S_EOF);
4933
4934 case OP_NULLP: /* null? */
4935 s_retbool (car (SCHEME_V->args) == NIL);
4936
4937 case OP_NUMEQ: /* = */
4938 case OP_LESS: /* < */
4939 case OP_GRE: /* > */
4940 case OP_LEQ: /* <= */
4941 case OP_GEQ: /* >= */
4942 switch (op)
4943 {
4944 case OP_NUMEQ:
4945 comp_func = num_eq;
4946 break;
4947
4948 case OP_LESS:
4949 comp_func = num_lt;
4950 break;
4951
4952 case OP_GRE:
4953 comp_func = num_gt;
4954 break;
4955
4956 case OP_LEQ:
4957 comp_func = num_le;
4958 break;
4959
4960 case OP_GEQ:
4961 comp_func = num_ge;
4962 break;
4963 }
4964
4965 x = SCHEME_V->args;
4966 v = nvalue (car (x));
4967 x = cdr (x);
4968
4969 for (; x != NIL; x = cdr (x))
4970 {
4971 if (!comp_func (v, nvalue (car (x))))
4972 {
4973 s_retbool (0);
4974 }
4975
4976 v = nvalue (car (x));
4977 }
4978
4979 s_retbool (1);
4980
4981 case OP_SYMBOLP: /* symbol? */
4982 s_retbool (is_symbol (car (SCHEME_V->args)));
4983
4984 case OP_NUMBERP: /* number? */
4985 s_retbool (is_number (car (SCHEME_V->args)));
4986
4987 case OP_STRINGP: /* string? */
4988 s_retbool (is_string (car (SCHEME_V->args)));
4989
4990 case OP_INTEGERP: /* integer? */
4991 s_retbool (is_integer (car (SCHEME_V->args)));
4992
4993 case OP_REALP: /* real? */
4994 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4995
4996 case OP_CHARP: /* char? */
4997 s_retbool (is_character (car (SCHEME_V->args)));
4998#if USE_CHAR_CLASSIFIERS 4535#if USE_CHAR_CLASSIFIERS
4999
5000 case OP_CHARAP: /* char-alphabetic? */ 4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
5001 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
5002
5003 case OP_CHARNP: /* char-numeric? */
5004 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
5005
5006 case OP_CHARWP: /* char-whitespace? */ 4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
5007 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
5008
5009 case OP_CHARUP: /* char-upper-case? */ 4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
5010 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
5011
5012 case OP_CHARLP: /* char-lower-case? */ 4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
5013 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
5014#endif 4541#endif
4542
5015#if USE_PORTS 4543#if USE_PORTS
5016 4544 case OP_PORTP: /* port? */ r = is_port (a) ; break;
5017 case OP_PORTP: /* port? */
5018 s_retbool (is_port (car (SCHEME_V->args)));
5019
5020 case OP_INPORTP: /* input-port? */ 4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
5021 s_retbool (is_inport (car (SCHEME_V->args)));
5022
5023 case OP_OUTPORTP: /* output-port? */ 4546 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
5024 s_retbool (is_outport (car (SCHEME_V->args)));
5025#endif 4547#endif
5026 4548
5027 case OP_PROCP: /* procedure? */ 4549 case OP_PROCP: /* procedure? */
5028 4550
5029 /*-- 4551 /*--
5030 * continuation should be procedure by the example 4552 * continuation should be procedure by the example
5031 * (call-with-current-continuation procedure?) ==> #t 4553 * (call-with-current-continuation procedure?) ==> #t
5032 * in R^3 report sec. 6.9 4554 * in R^3 report sec. 6.9
5033 */ 4555 */
5034 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4556 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
5035 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4557 break;
5036 4558
5037 case OP_PAIRP: /* pair? */ 4559 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
5038 s_retbool (is_pair (car (SCHEME_V->args))); 4560 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
5039 4561 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
5040 case OP_LISTP: /* list? */ 4562 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
5041 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4563 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
5042 4564 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
5043 case OP_ENVP: /* environment? */
5044 s_retbool (is_environment (car (SCHEME_V->args)));
5045
5046 case OP_VECTORP: /* vector? */
5047 s_retbool (is_vector (car (SCHEME_V->args)));
5048
5049 case OP_EQ: /* eq? */
5050 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
5051
5052 case OP_EQV: /* eqv? */
5053 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
5054 } 4565 }
5055 4566
5056 return S_T; 4567 s_retbool (r);
5057} 4568}
5058 4569
5059static pointer 4570static pointer
5060opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4571opexe_4 (SCHEME_P_ enum scheme_opcodes op)
5061{ 4572{
4573 pointer args = SCHEME_V->args;
4574 pointer a = car (args);
5062 pointer x, y; 4575 pointer x, y;
5063 4576
5064 switch (op) 4577 switch (op)
5065 { 4578 {
5066 case OP_FORCE: /* force */ 4579 case OP_FORCE: /* force */
5067 SCHEME_V->code = car (SCHEME_V->args); 4580 SCHEME_V->code = a;
5068 4581
5069 if (is_promise (SCHEME_V->code)) 4582 if (is_promise (SCHEME_V->code))
5070 { 4583 {
5071 /* Should change type to closure here */ 4584 /* Should change type to closure here */
5072 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4585 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
5073 SCHEME_V->args = NIL; 4586 SCHEME_V->args = NIL;
5074 s_goto (OP_APPLY); 4587 s_goto (OP_APPLY);
5075 } 4588 }
5076 else 4589 else
5077 {
5078 s_return (SCHEME_V->code); 4590 s_return (SCHEME_V->code);
5079 }
5080 4591
5081 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4592 case OP_SAVE_FORCED: /* Save forced value replacing promise */
5082 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4593 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));
5083 s_return (SCHEME_V->value); 4594 s_return (SCHEME_V->value);
5084 4595
… …
5095 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4606 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5096 SCHEME_V->outport = cadr (SCHEME_V->args); 4607 SCHEME_V->outport = cadr (SCHEME_V->args);
5097 } 4608 }
5098 } 4609 }
5099 4610
5100 SCHEME_V->args = car (SCHEME_V->args); 4611 SCHEME_V->args = a;
5101 4612
5102 if (op == OP_WRITE) 4613 if (op == OP_WRITE)
5103 SCHEME_V->print_flag = 1; 4614 SCHEME_V->print_flag = 1;
5104 else 4615 else
5105 SCHEME_V->print_flag = 0; 4616 SCHEME_V->print_flag = 0;
5106 4617
5107 s_goto (OP_P0LIST); 4618 s_goto (OP_P0LIST);
5108 4619
5109 case OP_NEWLINE: /* newline */ 4620 case OP_NEWLINE: /* newline */
5110 if (is_pair (SCHEME_V->args)) 4621 if (is_pair (args))
5111 { 4622 {
5112 if (car (SCHEME_V->args) != SCHEME_V->outport) 4623 if (a != SCHEME_V->outport)
5113 { 4624 {
5114 x = cons (SCHEME_V->outport, NIL); 4625 x = cons (SCHEME_V->outport, NIL);
5115 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4626 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5116 SCHEME_V->outport = car (SCHEME_V->args); 4627 SCHEME_V->outport = a;
5117 } 4628 }
5118 } 4629 }
5119 4630
5120 putstr (SCHEME_A_ "\n"); 4631 putstr (SCHEME_A_ "\n");
5121 s_return (S_T); 4632 s_return (S_T);
5122#endif 4633#endif
5123 4634
5124 case OP_ERR0: /* error */ 4635 case OP_ERR0: /* error */
5125 SCHEME_V->retcode = -1; 4636 SCHEME_V->retcode = -1;
5126 4637
5127 if (!is_string (car (SCHEME_V->args))) 4638 if (!is_string (a))
5128 { 4639 {
5129 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4640 args = cons (mk_string (SCHEME_A_ " -- "), args);
5130 setimmutable (car (SCHEME_V->args)); 4641 setimmutable (car (args));
5131 } 4642 }
5132 4643
5133 putstr (SCHEME_A_ "Error: "); 4644 putstr (SCHEME_A_ "Error: ");
5134 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4645 putstr (SCHEME_A_ strvalue (car (args)));
5135 SCHEME_V->args = cdr (SCHEME_V->args); 4646 SCHEME_V->args = cdr (args);
5136 s_goto (OP_ERR1); 4647 s_goto (OP_ERR1);
5137 4648
5138 case OP_ERR1: /* error */ 4649 case OP_ERR1: /* error */
5139 putstr (SCHEME_A_ " "); 4650 putstr (SCHEME_A_ " ");
5140 4651
5141 if (SCHEME_V->args != NIL) 4652 if (args != NIL)
5142 { 4653 {
5143 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4654 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
5144 SCHEME_V->args = car (SCHEME_V->args); 4655 SCHEME_V->args = a;
5145 SCHEME_V->print_flag = 1; 4656 SCHEME_V->print_flag = 1;
5146 s_goto (OP_P0LIST); 4657 s_goto (OP_P0LIST);
5147 } 4658 }
5148 else 4659 else
5149 { 4660 {
5150 putstr (SCHEME_A_ "\n"); 4661 putstr (SCHEME_A_ "\n");
5151 4662
5152 if (SCHEME_V->interactive_repl) 4663 if (SCHEME_V->interactive_repl)
5153 {
5154 s_goto (OP_T0LVL); 4664 s_goto (OP_T0LVL);
5155 }
5156 else 4665 else
5157 {
5158 return NIL; 4666 return NIL;
5159 }
5160 } 4667 }
5161 4668
5162 case OP_REVERSE: /* reverse */ 4669 case OP_REVERSE: /* reverse */
5163 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4670 s_return (reverse (SCHEME_A_ a));
5164 4671
5165 case OP_LIST_STAR: /* list* */ 4672 case OP_LIST_STAR: /* list* */
5166 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4673 s_return (list_star (SCHEME_A_ SCHEME_V->args));
5167 4674
5168 case OP_APPEND: /* append */ 4675 case OP_APPEND: /* append */
5169 x = NIL; 4676 x = NIL;
5170 y = SCHEME_V->args; 4677 y = args;
5171 4678
5172 if (y == x) 4679 if (y == x)
5173 s_return (x); 4680 s_return (x);
5174 4681
5175 /* cdr() in the while condition is not a typo. If car() */ 4682 /* cdr() in the while condition is not a typo. If car() */
… …
5186 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4693 s_return (reverse_in_place (SCHEME_A_ car (y), x));
5187 4694
5188#if USE_PLIST 4695#if USE_PLIST
5189 4696
5190 case OP_PUT: /* put */ 4697 case OP_PUT: /* put */
5191 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
5192 {
5193 Error_0 ("illegal use of put"); 4699 Error_0 ("illegal use of put");
5194 }
5195 4700
5196 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))
5197 { 4702 {
5198 if (caar (x) == y) 4703 if (caar (x) == y)
5199 {
5200 break; 4704 break;
5201 }
5202 } 4705 }
5203 4706
5204 if (x != NIL) 4707 if (x != NIL)
5205 cdar (x) = caddr (SCHEME_V->args); 4708 cdar (x) = caddr (args);
5206 else 4709 else
5207 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4710 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5208 4711
5209 s_return (S_T); 4712 s_return (S_T);
5210 4713
5211 case OP_GET: /* get */ 4714 case OP_GET: /* get */
5212 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4715 if (!hasprop (a) || !hasprop (cadr (args)))
5213 Error_0 ("illegal use of get"); 4716 Error_0 ("illegal use of get");
5214 4717
5215 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4718 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5216 if (caar (x) == y) 4719 if (caar (x) == y)
5217 break; 4720 break;
5218 4721
5219 if (x != NIL) 4722 if (x != NIL)
5220 s_return (cdar (x)); 4723 s_return (cdar (x));
… …
5222 s_return (NIL); 4725 s_return (NIL);
5223 4726
5224#endif /* USE_PLIST */ 4727#endif /* USE_PLIST */
5225 4728
5226 case OP_QUIT: /* quit */ 4729 case OP_QUIT: /* quit */
5227 if (is_pair (SCHEME_V->args)) 4730 if (is_pair (args))
5228 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4731 SCHEME_V->retcode = ivalue (a);
5229 4732
5230 return NIL; 4733 return NIL;
5231 4734
5232 case OP_GC: /* gc */ 4735 case OP_GC: /* gc */
5233 gc (SCHEME_A_ NIL, NIL); 4736 gc (SCHEME_A_ NIL, NIL);
… …
5235 4738
5236 case OP_GCVERB: /* gc-verbose */ 4739 case OP_GCVERB: /* gc-verbose */
5237 { 4740 {
5238 int was = SCHEME_V->gc_verbose; 4741 int was = SCHEME_V->gc_verbose;
5239 4742
5240 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4743 SCHEME_V->gc_verbose = (a != S_F);
5241 s_retbool (was); 4744 s_retbool (was);
5242 } 4745 }
5243 4746
5244 case OP_NEWSEGMENT: /* new-segment */ 4747 case OP_NEWSEGMENT: /* new-segment */
5245 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4748 if (!is_pair (args) || !is_number (a))
5246 Error_0 ("new-segment: argument must be a number"); 4749 Error_0 ("new-segment: argument must be a number");
5247 4750
5248 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
5249 4752
5250 s_return (S_T); 4753 s_return (S_T);
5251 4754
5252 case OP_OBLIST: /* oblist */ 4755 case OP_OBLIST: /* oblist */
5253 s_return (oblist_all_symbols (SCHEME_A)); 4756 s_return (oblist_all_symbols (SCHEME_A));
… …
5280 case OP_OPEN_INOUTFILE: 4783 case OP_OPEN_INOUTFILE:
5281 prop = port_input | port_output; 4784 prop = port_input | port_output;
5282 break; 4785 break;
5283 } 4786 }
5284 4787
5285 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5286 4789
5287 if (p == NIL) 4790 if (p == NIL)
5288 {
5289 s_return (S_F); 4791 s_return (S_F);
5290 }
5291 4792
5292 s_return (p); 4793 s_return (p);
5293 } 4794 }
5294 4795
5295# if USE_STRING_PORTS 4796# if USE_STRING_PORTS
… …
5309 case OP_OPEN_INOUTSTRING: 4810 case OP_OPEN_INOUTSTRING:
5310 prop = port_input | port_output; 4811 prop = port_input | port_output;
5311 break; 4812 break;
5312 } 4813 }
5313 4814
5314 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4815 p = port_from_string (SCHEME_A_ strvalue (a),
5315 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4816 strvalue (a) + strlength (a), prop);
5316 4817
5317 if (p == NIL) 4818 if (p == NIL)
5318 {
5319 s_return (S_F); 4819 s_return (S_F);
5320 }
5321 4820
5322 s_return (p); 4821 s_return (p);
5323 } 4822 }
5324 4823
5325 case OP_OPEN_OUTSTRING: /* open-output-string */ 4824 case OP_OPEN_OUTSTRING: /* open-output-string */
5326 { 4825 {
5327 pointer p; 4826 pointer p;
5328 4827
5329 if (car (SCHEME_V->args) == NIL) 4828 if (a == NIL)
5330 { 4829 {
5331 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
5332 4831
5333 if (p == NIL) 4832 if (p == NIL)
5334 {
5335 s_return (S_F); 4833 s_return (S_F);
5336 }
5337 } 4834 }
5338 else 4835 else
5339 { 4836 {
5340 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4837 p = port_from_string (SCHEME_A_ strvalue (a),
5341 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4838 strvalue (a) + strlength (a), port_output);
5342 4839
5343 if (p == NIL) 4840 if (p == NIL)
5344 {
5345 s_return (S_F); 4841 s_return (S_F);
5346 }
5347 } 4842 }
5348 4843
5349 s_return (p); 4844 s_return (p);
5350 } 4845 }
5351 4846
5352 case OP_GET_OUTSTRING: /* get-output-string */ 4847 case OP_GET_OUTSTRING: /* get-output-string */
5353 { 4848 {
5354 port *p; 4849 port *p;
5355 4850
5356 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4851 if ((p = a->object.port)->kind & port_string)
5357 { 4852 {
5358 off_t size; 4853 off_t size;
5359 char *str; 4854 char *str;
5360 4855
5361 size = p->rep.string.curr - p->rep.string.start + 1; 4856 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5377 } 4872 }
5378 4873
5379# endif 4874# endif
5380 4875
5381 case OP_CLOSE_INPORT: /* close-input-port */ 4876 case OP_CLOSE_INPORT: /* close-input-port */
5382 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4877 port_close (SCHEME_A_ a, port_input);
5383 s_return (S_T); 4878 s_return (S_T);
5384 4879
5385 case OP_CLOSE_OUTPORT: /* close-output-port */ 4880 case OP_CLOSE_OUTPORT: /* close-output-port */
5386 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4881 port_close (SCHEME_A_ a, port_output);
5387 s_return (S_T); 4882 s_return (S_T);
5388#endif 4883#endif
5389 4884
5390 case OP_INT_ENV: /* interaction-environment */ 4885 case OP_INT_ENV: /* interaction-environment */
5391 s_return (SCHEME_V->global_env); 4886 s_return (SCHEME_V->global_env);
… …
5393 case OP_CURR_ENV: /* current-environment */ 4888 case OP_CURR_ENV: /* current-environment */
5394 s_return (SCHEME_V->envir); 4889 s_return (SCHEME_V->envir);
5395 4890
5396 } 4891 }
5397 4892
5398 return S_T; 4893 abort ();
5399} 4894}
5400 4895
5401static pointer 4896static pointer
5402opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4897opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5403{ 4898{
… …
5416 { 4911 {
5417 /* ========== reading part ========== */ 4912 /* ========== reading part ========== */
5418#if USE_PORTS 4913#if USE_PORTS
5419 case OP_READ: 4914 case OP_READ:
5420 if (!is_pair (SCHEME_V->args)) 4915 if (!is_pair (SCHEME_V->args))
5421 {
5422 s_goto (OP_READ_INTERNAL); 4916 s_goto (OP_READ_INTERNAL);
5423 }
5424 4917
5425 if (!is_inport (car (SCHEME_V->args))) 4918 if (!is_inport (car (SCHEME_V->args)))
5426 {
5427 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4919 Error_1 ("read: not an input port:", car (SCHEME_V->args));
5428 }
5429 4920
5430 if (car (SCHEME_V->args) == SCHEME_V->inport) 4921 if (car (SCHEME_V->args) == SCHEME_V->inport)
5431 {
5432 s_goto (OP_READ_INTERNAL); 4922 s_goto (OP_READ_INTERNAL);
5433 }
5434 4923
5435 x = SCHEME_V->inport; 4924 x = SCHEME_V->inport;
5436 SCHEME_V->inport = car (SCHEME_V->args); 4925 SCHEME_V->inport = car (SCHEME_V->args);
5437 x = cons (x, NIL); 4926 x = cons (x, NIL);
5438 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
… …
5469 { 4958 {
5470 pointer p = SCHEME_V->inport; 4959 pointer p = SCHEME_V->inport;
5471 int res; 4960 int res;
5472 4961
5473 if (is_pair (SCHEME_V->args)) 4962 if (is_pair (SCHEME_V->args))
5474 {
5475 p = car (SCHEME_V->args); 4963 p = car (SCHEME_V->args);
5476 }
5477 4964
5478 res = p->object.port->kind & port_string; 4965 res = p->object.port->kind & port_string;
5479 4966
5480 s_retbool (res); 4967 s_retbool (res);
5481 } 4968 }
… …
5496 s_return (S_EOF); 4983 s_return (S_EOF);
5497 /* NOTREACHED */ 4984 /* NOTREACHED */
5498 4985
5499 case TOK_VEC: 4986 case TOK_VEC:
5500 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 4987 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5501
5502 /* fall through */ 4988 /* fall through */
4989
5503 case TOK_LPAREN: 4990 case TOK_LPAREN:
5504 SCHEME_V->tok = token (SCHEME_A); 4991 SCHEME_V->tok = token (SCHEME_A);
5505 4992
5506 if (SCHEME_V->tok == TOK_RPAREN) 4993 if (SCHEME_V->tok == TOK_RPAREN)
5507 s_return (NIL); 4994 s_return (NIL);
… …
5527 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5014 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5528 SCHEME_V->tok = TOK_LPAREN; 5015 SCHEME_V->tok = TOK_LPAREN;
5529 s_goto (OP_RDSEXPR); 5016 s_goto (OP_RDSEXPR);
5530 } 5017 }
5531 else 5018 else
5532 {
5533 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5019 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5534 }
5535 5020
5536 s_goto (OP_RDSEXPR); 5021 s_goto (OP_RDSEXPR);
5537 5022
5538 case TOK_COMMA: 5023 case TOK_COMMA:
5539 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5024 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
… …
5581 } 5066 }
5582 5067
5583 break; 5068 break;
5584 5069
5585 case OP_RDLIST: 5070 case OP_RDLIST:
5586 {
5587 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args);
5588 SCHEME_V->tok = token (SCHEME_A); 5072 SCHEME_V->tok = token (SCHEME_A);
5589 5073
5590 if (SCHEME_V->tok == TOK_EOF) 5074 switch (SCHEME_V->tok)
5075 {
5076 case TOK_EOF:
5591 s_return (S_EOF); 5077 s_return (S_EOF);
5592 else if (SCHEME_V->tok == TOK_RPAREN) 5078
5079 case TOK_RPAREN:
5593 { 5080 {
5594 int c = inchar (SCHEME_A); 5081 int c = inchar (SCHEME_A);
5595 5082
5596 if (c != '\n') 5083 if (c != '\n')
5597 backchar (SCHEME_A_ c); 5084 backchar (SCHEME_A_ c);
5598
5599#if SHOW_ERROR_LINE 5085#if SHOW_ERROR_LINE
5600 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 5086 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
5601 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++; 5087 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++;
5602
5603#endif 5088#endif
5089
5604 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5090 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5605 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args)); 5091 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args));
5606 } 5092 }
5607 else if (SCHEME_V->tok == TOK_DOT) 5093
5608 { 5094 case TOK_DOT:
5609 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL); 5095 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL);
5610 SCHEME_V->tok = token (SCHEME_A); 5096 SCHEME_V->tok = token (SCHEME_A);
5611 s_goto (OP_RDSEXPR); 5097 s_goto (OP_RDSEXPR);
5612 } 5098
5613 else 5099 default:
5614 {
5615 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);; 5100 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);
5616 s_goto (OP_RDSEXPR); 5101 s_goto (OP_RDSEXPR);
5617 } 5102 }
5618 }
5619 5103
5620 case OP_RDDOT: 5104 case OP_RDDOT:
5621 if (token (SCHEME_A) != TOK_RPAREN) 5105 if (token (SCHEME_A) != TOK_RPAREN)
5622 Error_0 ("syntax error: illegal dot expression"); 5106 Error_0 ("syntax error: illegal dot expression");
5623 else 5107
5624 {
5625 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5626 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5109 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args));
5627 }
5628 5110
5629 case OP_RDQUOTE: 5111 case OP_RDQUOTE:
5630 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5631 5113
5632 case OP_RDQQUOTE: 5114 case OP_RDQQUOTE:
… …
5732 5214
5733 case OP_PVECFROM: 5215 case OP_PVECFROM:
5734 { 5216 {
5735 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5217 int i = ivalue_unchecked (cdr (SCHEME_V->args));
5736 pointer vec = car (SCHEME_V->args); 5218 pointer vec = car (SCHEME_V->args);
5737 int len = ivalue_unchecked (vec); 5219 int len = veclength (vec);
5738 5220
5739 if (i == len) 5221 if (i == len)
5740 { 5222 {
5741 putstr (SCHEME_A_ ")"); 5223 putstr (SCHEME_A_ ")");
5742 s_return (S_T); 5224 s_return (S_T);
… …
5755 s_goto (OP_P0LIST); 5237 s_goto (OP_P0LIST);
5756 } 5238 }
5757 } 5239 }
5758 } 5240 }
5759 5241
5760 return S_T; 5242 abort ();
5761} 5243}
5762 5244
5763static pointer 5245static pointer
5764opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5246opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5765{ 5247{
… …
5816 5298
5817 case OP_MACROP: /* macro? */ 5299 case OP_MACROP: /* macro? */
5818 s_retbool (is_macro (car (SCHEME_V->args))); 5300 s_retbool (is_macro (car (SCHEME_V->args)));
5819 } 5301 }
5820 5302
5821 return S_T; /* NOTREACHED */ 5303 abort ();
5822} 5304}
5823 5305
5824typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes);
5825 5307
5826typedef int (*test_predicate) (pointer); 5308typedef int (*test_predicate) (pointer);
… …
5898{ 5380{
5899 int n = procnum (x); 5381 int n = procnum (x);
5900 const char *name = dispatch_table[n].name; 5382 const char *name = dispatch_table[n].name;
5901 5383
5902 if (name == 0) 5384 if (name == 0)
5903 {
5904 name = "ILLEGAL!"; 5385 name = "ILLEGAL!";
5905 }
5906 5386
5907 return name; 5387 return name;
5908} 5388}
5909 5389
5910/* kernel of this interpreter */ 5390/* kernel of this interpreter */
… …
5915 5395
5916 for (;;) 5396 for (;;)
5917 { 5397 {
5918 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5398 op_code_info *pcd = dispatch_table + SCHEME_V->op;
5919 5399
5400#if USE_ERROR_CHECKING
5920 if (pcd->name != 0) /* if built-in function, check arguments */ 5401 if (pcd->name) /* if built-in function, check arguments */
5921 { 5402 {
5403 int ok = 1;
5922 char msg[STRBUFFSIZE]; 5404 char msg[STRBUFFSIZE];
5923 int ok = 1;
5924 int n = list_length (SCHEME_A_ SCHEME_V->args); 5405 int n = list_length (SCHEME_A_ SCHEME_V->args);
5925 5406
5926#if USE_ERROR_CHECKING
5927 /* Check number of arguments */ 5407 /* Check number of arguments */
5928 if (n < pcd->min_arity) 5408 if (ecb_expect_false (n < pcd->min_arity))
5929 { 5409 {
5930 ok = 0; 5410 ok = 0;
5931 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5932 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5933 } 5413 }
5934 5414 else if (ecb_expect_false (n > pcd->max_arity))
5935 if (ok && n > pcd->max_arity)
5936 { 5415 {
5937 ok = 0; 5416 ok = 0;
5938 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5939 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5940 } 5419 }
5941#endif
5942 5420
5943 if (ok) 5421 if (ecb_expect_false (ok))
5944 { 5422 {
5945 if (pcd->arg_tests_encoding != 0) 5423 if (pcd->arg_tests_encoding)
5946 { 5424 {
5947 int i = 0; 5425 int i = 0;
5948 int j; 5426 int j;
5949 const char *t = pcd->arg_tests_encoding; 5427 const char *t = pcd->arg_tests_encoding;
5950 pointer arglist = SCHEME_V->args; 5428 pointer arglist = SCHEME_V->args;
… …
5965 if (!tests[j].fct (arg)) 5443 if (!tests[j].fct (arg))
5966 break; 5444 break;
5967 } 5445 }
5968 5446
5969 if (t[1] != 0) /* last test is replicated as necessary */ 5447 if (t[1] != 0) /* last test is replicated as necessary */
5970 {
5971 t++; 5448 t++;
5972 }
5973 5449
5974 arglist = cdr (arglist); 5450 arglist = cdr (arglist);
5975 i++; 5451 i++;
5976 } 5452 }
5977 while (i < n); 5453 while (i < n);
5978 5454
5979#if USE_ERROR_CHECKING
5980 if (i < n) 5455 if (i < n)
5981 { 5456 {
5982 ok = 0; 5457 ok = 0;
5983 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5458 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind);
5984 } 5459 }
5985#endif
5986 } 5460 }
5987 } 5461 }
5988 5462
5989 if (!ok) 5463 if (!ok)
5990 { 5464 {
… …
5992 return; 5466 return;
5993 5467
5994 pcd = dispatch_table + SCHEME_V->op; 5468 pcd = dispatch_table + SCHEME_V->op;
5995 } 5469 }
5996 } 5470 }
5471#endif
5997 5472
5998 ok_to_freely_gc (SCHEME_A); 5473 ok_to_freely_gc (SCHEME_A);
5999 5474
6000 if (pcd->func (SCHEME_A_ (enum scheme_opcodes) SCHEME_V->op) == NIL) 5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL))
6001 return; 5476 return;
6002 5477
6003#if USE_ERROR_CHECKING 5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
6004 if (SCHEME_V->no_memory)
6005 { 5479 {
6006 xwrstr ("No memory!\n"); 5480 xwrstr ("No memory!\n");
6007 return; 5481 return;
6008 } 5482 }
6009#endif
6010 } 5483 }
6011} 5484}
6012 5485
6013/* ========== Initialization of internal keywords ========== */ 5486/* ========== Initialization of internal keywords ========== */
6014 5487
6015static void 5488static void
6016assign_syntax (SCHEME_P_ char *name) 5489assign_syntax (SCHEME_P_ const char *name)
6017{ 5490{
6018 pointer x = oblist_add_by_name (SCHEME_A_ name); 5491 pointer x = oblist_add_by_name (SCHEME_A_ name);
6019 set_typeflag (x, typeflag (x) | T_SYNTAX); 5492 set_typeflag (x, typeflag (x) | T_SYNTAX);
6020} 5493}
6021 5494
6022static void 5495static void
6023assign_proc (SCHEME_P_ enum scheme_opcodes op, char *name) 5496assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
6024{ 5497{
6025 pointer x = mk_symbol (SCHEME_A_ name); 5498 pointer x = mk_symbol (SCHEME_A_ name);
6026 pointer y = mk_proc (SCHEME_A_ op); 5499 pointer y = mk_proc (SCHEME_A_ op);
6027 new_slot_in_env (SCHEME_A_ x, y); 5500 new_slot_in_env (SCHEME_A_ x, y);
6028} 5501}
… …
6030static pointer 5503static pointer
6031mk_proc (SCHEME_P_ enum scheme_opcodes op) 5504mk_proc (SCHEME_P_ enum scheme_opcodes op)
6032{ 5505{
6033 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5506 pointer y = get_cell (SCHEME_A_ NIL, NIL);
6034 set_typeflag (y, (T_PROC | T_ATOM)); 5507 set_typeflag (y, (T_PROC | T_ATOM));
6035 ivalue_unchecked (y) = (long) op; 5508 ivalue_unchecked (y) = op;
6036 set_num_integer (y); 5509 set_num_integer (y);
6037 return y; 5510 return y;
6038} 5511}
6039 5512
6040/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5513/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
… …
6065 5538
6066 case 'd': 5539 case 'd':
6067 return OP_COND0; /* cond */ 5540 return OP_COND0; /* cond */
6068 5541
6069 case '*': 5542 case '*':
6070 return OP_LET0AST; /* let* */ 5543 return OP_LET0AST;/* let* */
6071 5544
6072 default: 5545 default:
6073 return OP_SET0; /* set! */ 5546 return OP_SET0; /* set! */
6074 } 5547 }
6075 5548
… …
6097 5570
6098 case 'f': 5571 case 'f':
6099 return OP_DEF0; /* define */ 5572 return OP_DEF0; /* define */
6100 5573
6101 default: 5574 default:
6102 return OP_LET0REC; /* letrec */ 5575 return OP_LET0REC;/* letrec */
6103 } 5576 }
6104 5577
6105 default: 5578 default:
6106 return OP_C0STREAM; /* cons-stream */ 5579 return OP_C0STREAM; /* cons-stream */
6107 } 5580 }
… …
6158 } 5631 }
6159 5632
6160 SCHEME_V->gc_verbose = 0; 5633 SCHEME_V->gc_verbose = 0;
6161 dump_stack_initialize (SCHEME_A); 5634 dump_stack_initialize (SCHEME_A);
6162 SCHEME_V->code = NIL; 5635 SCHEME_V->code = NIL;
5636 SCHEME_V->args = NIL;
5637 SCHEME_V->envir = NIL;
6163 SCHEME_V->tracing = 0; 5638 SCHEME_V->tracing = 0;
6164 5639
6165 /* init NIL */ 5640 /* init NIL */
6166 set_typeflag (NIL, T_ATOM | MARK); 5641 set_typeflag (NIL, T_ATOM | T_MARK);
6167 set_car (NIL, NIL); 5642 set_car (NIL, NIL);
6168 set_cdr (NIL, NIL); 5643 set_cdr (NIL, NIL);
6169 /* init T */ 5644 /* init T */
6170 set_typeflag (S_T, T_ATOM | MARK); 5645 set_typeflag (S_T, T_ATOM | T_MARK);
6171 set_car (S_T, S_T); 5646 set_car (S_T, S_T);
6172 set_cdr (S_T, S_T); 5647 set_cdr (S_T, S_T);
6173 /* init F */ 5648 /* init F */
6174 set_typeflag (S_F, T_ATOM | MARK); 5649 set_typeflag (S_F, T_ATOM | T_MARK);
6175 set_car (S_F, S_F); 5650 set_car (S_F, S_F);
6176 set_cdr (S_F, S_F); 5651 set_cdr (S_F, S_F);
5652 /* init EOF_OBJ */
5653 set_typeflag (S_EOF, T_ATOM | T_MARK);
5654 set_car (S_EOF, S_EOF);
5655 set_cdr (S_EOF, S_EOF);
6177 /* init sink */ 5656 /* init sink */
6178 set_typeflag (S_SINK, T_PAIR | MARK); 5657 set_typeflag (S_SINK, T_PAIR | T_MARK);
6179 set_car (S_SINK, NIL); 5658 set_car (S_SINK, NIL);
5659
6180 /* init c_nest */ 5660 /* init c_nest */
6181 SCHEME_V->c_nest = NIL; 5661 SCHEME_V->c_nest = NIL;
6182 5662
6183 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5663 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
6184 /* init global_env */ 5664 /* init global_env */
… …
6186 SCHEME_V->global_env = SCHEME_V->envir; 5666 SCHEME_V->global_env = SCHEME_V->envir;
6187 /* init else */ 5667 /* init else */
6188 x = mk_symbol (SCHEME_A_ "else"); 5668 x = mk_symbol (SCHEME_A_ "else");
6189 new_slot_in_env (SCHEME_A_ x, S_T); 5669 new_slot_in_env (SCHEME_A_ x, S_T);
6190 5670
6191 assign_syntax (SCHEME_A_ "lambda"); 5671 {
6192 assign_syntax (SCHEME_A_ "quote"); 5672 static const char *syntax_names[] = {
6193 assign_syntax (SCHEME_A_ "define"); 5673 "lambda", "quote", "define", "if", "begin", "set!",
6194 assign_syntax (SCHEME_A_ "if"); 5674 "let", "let*", "letrec", "cond", "delay", "and",
6195 assign_syntax (SCHEME_A_ "begin"); 5675 "or", "cons-stream", "macro", "case"
6196 assign_syntax (SCHEME_A_ "set!"); 5676 };
6197 assign_syntax (SCHEME_A_ "let"); 5677
6198 assign_syntax (SCHEME_A_ "let*"); 5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
6199 assign_syntax (SCHEME_A_ "letrec");
6200 assign_syntax (SCHEME_A_ "cond");
6201 assign_syntax (SCHEME_A_ "delay");
6202 assign_syntax (SCHEME_A_ "and"); 5679 assign_syntax (SCHEME_A_ syntax_names[i]);
6203 assign_syntax (SCHEME_A_ "or"); 5680 }
6204 assign_syntax (SCHEME_A_ "cons-stream");
6205 assign_syntax (SCHEME_A_ "macro");
6206 assign_syntax (SCHEME_A_ "case");
6207 5681
6208 for (i = 0; i < n; i++) 5682 for (i = 0; i < n; i++)
6209 {
6210 if (dispatch_table[i].name != 0) 5683 if (dispatch_table[i].name != 0)
6211 {
6212 assign_proc (SCHEME_A_ (enum scheme_opcodes) i, dispatch_table[i].name); 5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name);
6213 }
6214 }
6215 5685
6216 /* initialization of global pointers to special symbols */ 5686 /* initialization of global pointers to special symbols */
6217 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
6218 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
6219 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
6220 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5690 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
6221 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5691 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
6222 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5692 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
6223 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5693 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
6224 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5694 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
6225 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5695 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
6226 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5696 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
6227 5697
6228 return !SCHEME_V->no_memory; 5698 return !SCHEME_V->no_memory;
6229} 5699}
6230 5700
… …
6360{ 5830{
6361 dump_stack_reset (SCHEME_A); 5831 dump_stack_reset (SCHEME_A);
6362 SCHEME_V->envir = SCHEME_V->global_env; 5832 SCHEME_V->envir = SCHEME_V->global_env;
6363 SCHEME_V->file_i = 0; 5833 SCHEME_V->file_i = 0;
6364 SCHEME_V->load_stack[0].kind = port_input | port_string; 5834 SCHEME_V->load_stack[0].kind = port_input | port_string;
6365 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5835 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6366 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5836 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6367 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5837 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6368#if USE_PORTS 5838#if USE_PORTS
6369 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5839 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6370#endif 5840#endif
6371 SCHEME_V->retcode = 0; 5841 SCHEME_V->retcode = 0;
6372 SCHEME_V->interactive_repl = 0; 5842 SCHEME_V->interactive_repl = 0;
… …
6385 pointer x; 5855 pointer x;
6386 5856
6387 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5857 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
6388 5858
6389 if (x != NIL) 5859 if (x != NIL)
6390 {
6391 set_slot_in_env (SCHEME_A_ x, value); 5860 set_slot_in_env (SCHEME_A_ x, value);
6392 }
6393 else 5861 else
6394 {
6395 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5862 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6396 }
6397} 5863}
6398 5864
6399#if !STANDALONE 5865#if !STANDALONE
5866
6400void 5867void
6401scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5868scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6402{ 5869{
6403 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5870 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6404} 5871}
… …
6407scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5874scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6408{ 5875{
6409 int i; 5876 int i;
6410 5877
6411 for (i = 0; i < count; i++) 5878 for (i = 0; i < count; i++)
6412 {
6413 scheme_register_foreign_func (SCHEME_A_ list + i); 5879 scheme_register_foreign_func (SCHEME_A_ list + i);
6414 }
6415} 5880}
6416 5881
6417pointer 5882pointer
6418scheme_apply0 (SCHEME_P_ const char *procname) 5883scheme_apply0 (SCHEME_P_ const char *procname)
6419{ 5884{
… …
6476 SCHEME_V->interactive_repl = old_repl; 5941 SCHEME_V->interactive_repl = old_repl;
6477 restore_from_C_call (SCHEME_A); 5942 restore_from_C_call (SCHEME_A);
6478 return SCHEME_V->value; 5943 return SCHEME_V->value;
6479} 5944}
6480 5945
6481
6482#endif 5946#endif
6483 5947
6484/* ========== Main ========== */ 5948/* ========== Main ========== */
6485 5949
6486#if STANDALONE 5950#if STANDALONE
6487 5951
6488# if defined(__APPLE__) && !defined (OSX)
6489int
6490main ()
6491{
6492 extern MacTS_main (int argc, char **argv);
6493 char **argv;
6494 int argc = ccommand (&argv);
6495
6496 MacTS_main (argc, argv);
6497 return 0;
6498}
6499
6500int
6501MacTS_main (int argc, char **argv)
6502{
6503# else
6504int 5952int
6505main (int argc, char **argv) 5953main (int argc, char **argv)
6506{ 5954{
6507# endif
6508# if USE_MULTIPLICITY 5955# if USE_MULTIPLICITY
6509 scheme ssc; 5956 scheme ssc;
6510 scheme *const sc = &ssc; 5957 scheme *const SCHEME_V = &ssc;
6511# else 5958# else
6512# endif 5959# endif
6513 int fin; 5960 int fin;
6514 char *file_name = InitFile; 5961 char *file_name = InitFile;
6515 int retcode; 5962 int retcode;
6516 int isfile = 1; 5963 int isfile = 1;
6517
6518 if (argc == 1)
6519 xwrstr (banner);
6520 5964
6521 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5965 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6522 { 5966 {
6523 xwrstr ("Usage: tinyscheme -?\n"); 5967 xwrstr ("Usage: tinyscheme -?\n");
6524 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");
… …
6547 if (access (file_name, 0) != 0) 5991 if (access (file_name, 0) != 0)
6548 { 5992 {
6549 char *p = getenv ("TINYSCHEMEINIT"); 5993 char *p = getenv ("TINYSCHEMEINIT");
6550 5994
6551 if (p != 0) 5995 if (p != 0)
6552 {
6553 file_name = p; 5996 file_name = p;
6554 }
6555 } 5997 }
6556#endif 5998#endif
6557 5999
6558 do 6000 do
6559 { 6001 {

Diff Legend

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