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.53 by root, Tue Dec 1 02:21:49 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1 21#define _POSIX_C_SOURCE 200201
22 22#define _XOPEN_SOURCE 600
23#if 1 23#define _GNU_SOURCE 1 /* for malloc mremap */
24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
25#include "malloc.c"
26#endif
27 24
28#define SCHEME_SOURCE 25#define SCHEME_SOURCE
29#include "scheme-private.h" 26#include "scheme-private.h"
30#ifndef WIN32 27#ifndef WIN32
31# include <unistd.h> 28# include <unistd.h>
32#endif 29#endif
33#if USE_MATH 30#if USE_MATH
34# include <math.h> 31# include <math.h>
35#endif 32#endif
36 33
34#define ECB_NO_THREADS 1
37#include "ecb.h" 35#include "ecb.h"
38 36
39#include <sys/types.h> 37#include <sys/types.h>
40#include <sys/stat.h> 38#include <sys/stat.h>
41#include <fcntl.h> 39#include <fcntl.h>
… …
49#include <string.h> 47#include <string.h>
50 48
51#include <limits.h> 49#include <limits.h>
52#include <inttypes.h> 50#include <inttypes.h>
53#include <float.h> 51#include <float.h>
54//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
55 60
56#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
91 96
92#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
93static scheme sc; 98static scheme sc;
94#endif 99#endif
95 100
96static void 101ecb_cold static void
97xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
98{ 103{
99 if (n < 0) 104 if (n < 0)
100 { 105 {
101 *s++ = '-'; 106 *s++ = '-';
… …
116 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
117 --p; ++s; 122 --p; ++s;
118 } 123 }
119} 124}
120 125
121static void 126ecb_cold static void
122xnum (char *s, long n) 127xnum (char *s, long n)
123{ 128{
124 xbase (s, n, 10); 129 xbase (s, n, 10);
125} 130}
126 131
127static void 132ecb_cold static void
128putnum (SCHEME_P_ long n) 133putnum (SCHEME_P_ long n)
129{ 134{
130 char buf[64]; 135 char buf[64];
131 136
132 xnum (buf, n); 137 xnum (buf, n);
133 putstr (SCHEME_A_ buf); 138 putstr (SCHEME_A_ buf);
134} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
135 144
136static char 145static char
137xtoupper (char c) 146xtoupper (char c)
138{ 147{
139 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
159 168
160#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
161#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
162#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
163 172
173#endif
174
164#if USE_IGNORECASE 175#if USE_IGNORECASE
165static const char * 176ecb_cold static const char *
166xstrlwr (char *s) 177xstrlwr (char *s)
167{ 178{
168 const char *p = s; 179 const char *p = s;
169 180
170 while (*s) 181 while (*s)
… …
183# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
184# define strlwr(s) (s) 195# define strlwr(s) (s)
185#endif 196#endif
186 197
187#ifndef prompt 198#ifndef prompt
188# define prompt "ts> " 199# define prompt "ms> "
189#endif 200#endif
190 201
191#ifndef InitFile 202#ifndef InitFile
192# define InitFile "init.scm" 203# define InitFile "init.scm"
193#endif 204#endif
194 205
195enum scheme_types 206enum scheme_types
196{ 207{
197 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
198 T_REAL, 210 T_REAL,
199 T_STRING, 211 T_STRING,
200 T_SYMBOL, 212 T_SYMBOL,
201 T_PROC, 213 T_PROC,
202 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
203 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
204 T_CONTINUATION, 218 T_CONTINUATION,
205 T_FOREIGN, 219 T_FOREIGN,
206 T_CHARACTER,
207 T_PORT, 220 T_PORT,
208 T_VECTOR, 221 T_VECTOR,
209 T_MACRO,
210 T_PROMISE, 222 T_PROMISE,
211 T_ENVIRONMENT, 223 T_ENVIRONMENT,
212 /* one more... */ 224
213 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
214}; 226};
215 227
216#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
217#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
250static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
251static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
252static num num_rem (num a, num b); 264static num num_rem (num a, num b);
253static num num_mod (num a, num b); 265static num num_mod (num a, num b);
254 266
255#if USE_MATH
256static double round_per_R5RS (double x);
257#endif
258static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
259 268
260static num num_zero; 269static num num_zero;
261static num num_one; 270static num num_one;
262 271
… …
374 383
375static pointer cadar (pointer p) { return car (cdr (car (p))); } 384static pointer cadar (pointer p) { return car (cdr (car (p))); }
376static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 385static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
377static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378 387
388static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
389
379INTERFACE void 390INTERFACE void
380set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
381{ 392{
382 CELL(p)->object.cons.car = CELL (q); 393 CELL(p)->object.cons.car = CELL (q);
383} 394}
… …
523 proper list: length 534 proper list: length
524 circular list: -1 535 circular list: -1
525 not even a pair: -2 536 not even a pair: -2
526 dotted list: -2 minus length before dot 537 dotted list: -2 minus length before dot
527*/ 538*/
528INTERFACE int 539ecb_hot INTERFACE int
529list_length (SCHEME_P_ pointer a) 540list_length (SCHEME_P_ pointer a)
530{ 541{
531 int i = 0; 542 int i = 0;
532 pointer slow, fast; 543 pointer slow, fast;
533 544
… …
572{ 583{
573 return list_length (SCHEME_A_ a) >= 0; 584 return list_length (SCHEME_A_ a) >= 0;
574} 585}
575 586
576#if USE_CHAR_CLASSIFIERS 587#if USE_CHAR_CLASSIFIERS
588
577ecb_inline int 589ecb_inline int
578Cisalpha (int c) 590Cisalpha (int c)
579{ 591{
580 return isascii (c) && isalpha (c); 592 return isascii (c) && isalpha (c);
581} 593}
… …
639 "gs", 651 "gs",
640 "rs", 652 "rs",
641 "us" 653 "us"
642}; 654};
643 655
644static int 656ecb_cold static int
645is_ascii_name (const char *name, int *pc) 657is_ascii_name (const char *name, int *pc)
646{ 658{
647 int i; 659 int i;
648 660
649 for (i = 0; i < 32; i++) 661 for (i = 0; i < 32; i++)
… …
671static int file_interactive (SCHEME_P); 683static int file_interactive (SCHEME_P);
672ecb_inline int is_one_of (const char *s, int c); 684ecb_inline int is_one_of (const char *s, int c);
673static int alloc_cellseg (SCHEME_P); 685static int alloc_cellseg (SCHEME_P);
674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 686ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675static void finalize_cell (SCHEME_P_ pointer a); 687static void finalize_cell (SCHEME_P_ pointer a);
676static int count_consecutive_cells (pointer x, int needed);
677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 688static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static pointer mk_number (SCHEME_P_ const num n); 689static pointer mk_number (SCHEME_P_ const num n);
679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 690static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
680static pointer mk_vector (SCHEME_P_ uint32_t len); 691static pointer mk_vector (SCHEME_P_ uint32_t len);
681static pointer mk_atom (SCHEME_P_ char *q); 692static pointer mk_atom (SCHEME_P_ char *q);
682static pointer mk_sharp_const (SCHEME_P_ char *name); 693static pointer mk_sharp_const (SCHEME_P_ char *name);
683 694
695static pointer mk_port (SCHEME_P_ port *p);
696
684#if USE_PORTS 697#if USE_PORTS
685static pointer mk_port (SCHEME_P_ port *p);
686static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 698static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
687static pointer port_from_file (SCHEME_P_ int, int prop); 699static pointer port_from_file (SCHEME_P_ int, int prop);
688static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 700static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
689static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 701static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
690static port *port_rep_from_file (SCHEME_P_ int, int prop); 702static port *port_rep_from_file (SCHEME_P_ int, int prop);
691static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 703static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
692static void port_close (SCHEME_P_ pointer p, int flag); 704static void port_close (SCHEME_P_ pointer p, int flag);
693#endif 705#endif
706
694static void mark (pointer a); 707static void mark (pointer a);
695static void gc (SCHEME_P_ pointer a, pointer b); 708static void gc (SCHEME_P_ pointer a, pointer b);
696static int basic_inchar (port *pt); 709static int basic_inchar (port *pt);
697static int inchar (SCHEME_P); 710static int inchar (SCHEME_P);
698static void backchar (SCHEME_P_ int c); 711static void backchar (SCHEME_P_ int c);
699static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 712static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
700static pointer readstrexp (SCHEME_P_ char delim); 713static pointer readstrexp (SCHEME_P_ char delim);
701ecb_inline int skipspace (SCHEME_P); 714static int skipspace (SCHEME_P);
702static int token (SCHEME_P); 715static int token (SCHEME_P);
703static void printslashstring (SCHEME_P_ char *s, int len); 716static void printslashstring (SCHEME_P_ char *s, int len);
704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 717static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
705static void printatom (SCHEME_P_ pointer l, int f); 718static void printatom (SCHEME_P_ pointer l, int f);
706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 719static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
872 } 885 }
873 886
874 return ret; 887 return ret;
875} 888}
876 889
877#if USE_MATH
878
879/* Round to nearest. Round to even if midway */
880static double
881round_per_R5RS (double x)
882{
883 double fl = floor (x);
884 double ce = ceil (x);
885 double dfl = x - fl;
886 double dce = ce - x;
887
888 if (dfl > dce)
889 return ce;
890 else if (dfl < dce)
891 return fl;
892 else
893 {
894 if (fmod (fl, 2) == 0) /* I imagine this holds */
895 return fl;
896 else
897 return ce;
898 }
899}
900#endif
901
902static int 890static int
903is_zero_rvalue (RVALUE x) 891is_zero_rvalue (RVALUE x)
904{ 892{
905 return x == 0; 893 return x == 0;
906#if 0 894#if 0
… …
911#endif 899#endif
912#endif 900#endif
913} 901}
914 902
915/* allocate new cell segment */ 903/* allocate new cell segment */
916static int 904ecb_cold static int
917alloc_cellseg (SCHEME_P) 905alloc_cellseg (SCHEME_P)
918{ 906{
919 struct cell *newp; 907 struct cell *newp;
920 struct cell *last; 908 struct cell *last;
921 struct cell *p; 909 struct cell *p;
… …
930 918
931 if (!cp && USE_ERROR_CHECKING) 919 if (!cp && USE_ERROR_CHECKING)
932 return k; 920 return k;
933 921
934 i = ++SCHEME_V->last_cell_seg; 922 i = ++SCHEME_V->last_cell_seg;
935 SCHEME_V->alloc_seg[i] = cp;
936 923
937 newp = (struct cell *)cp; 924 newp = (struct cell *)cp;
938 SCHEME_V->cell_seg[i] = newp; 925 SCHEME_V->cell_seg[i] = newp;
939 SCHEME_V->cell_segsize[i] = segsize; 926 SCHEME_V->cell_segsize[i] = segsize;
940 SCHEME_V->fcells += segsize; 927 SCHEME_V->fcells += segsize;
… …
963 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 950 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
964 return S_SINK; 951 return S_SINK;
965 952
966 if (SCHEME_V->free_cell == NIL) 953 if (SCHEME_V->free_cell == NIL)
967 { 954 {
968 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1; 955 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
969 956
970 gc (SCHEME_A_ a, b); 957 gc (SCHEME_A_ a, b);
971 958
972 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 959 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
973 { 960 {
… …
992 } 979 }
993} 980}
994 981
995/* To retain recent allocs before interpreter knows about them - 982/* To retain recent allocs before interpreter knows about them -
996 Tehom */ 983 Tehom */
997static void 984ecb_hot static void
998push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 985push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
999{ 986{
1000 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 987 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1001 988
1002 set_typeflag (holder, T_PAIR); 989 set_typeflag (holder, T_PAIR);
… …
1004 set_car (holder, recent); 991 set_car (holder, recent);
1005 set_cdr (holder, car (S_SINK)); 992 set_cdr (holder, car (S_SINK));
1006 set_car (S_SINK, holder); 993 set_car (S_SINK, holder);
1007} 994}
1008 995
1009static pointer 996ecb_hot static pointer
1010get_cell (SCHEME_P_ pointer a, pointer b) 997get_cell (SCHEME_P_ pointer a, pointer b)
1011{ 998{
1012 pointer cell = get_cell_x (SCHEME_A_ a, b); 999 pointer cell = get_cell_x (SCHEME_A_ a, b);
1013 1000
1014 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1001 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1071#endif 1058#endif
1072 1059
1073/* Medium level cell allocation */ 1060/* Medium level cell allocation */
1074 1061
1075/* get new cons cell */ 1062/* get new cons cell */
1076pointer 1063ecb_hot static pointer
1077xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1064xcons (SCHEME_P_ pointer a, pointer b)
1078{ 1065{
1079 pointer x = get_cell (SCHEME_A_ a, b); 1066 pointer x = get_cell (SCHEME_A_ a, b);
1080 1067
1081 set_typeflag (x, T_PAIR); 1068 set_typeflag (x, T_PAIR);
1082
1083 if (immutable)
1084 setimmutable (x);
1085 1069
1086 set_car (x, a); 1070 set_car (x, a);
1087 set_cdr (x, b); 1071 set_cdr (x, b);
1088 1072
1089 return x; 1073 return x;
1090} 1074}
1091 1075
1092static pointer 1076ecb_hot static pointer
1077ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1078{
1079 pointer x = xcons (SCHEME_A_ a, b);
1080 setimmutable (x);
1081 return x;
1082}
1083
1084#define cons(a,b) xcons (SCHEME_A_ a, b)
1085#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1086
1087ecb_cold static pointer
1093generate_symbol (SCHEME_P_ const char *name) 1088generate_symbol (SCHEME_P_ const char *name)
1094{ 1089{
1095 pointer x = mk_string (SCHEME_A_ name); 1090 pointer x = mk_string (SCHEME_A_ name);
1096 setimmutable (x); 1091 setimmutable (x);
1097 set_typeflag (x, T_SYMBOL | T_ATOM); 1092 set_typeflag (x, T_SYMBOL | T_ATOM);
… …
1103#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1104 1099
1105static int 1100static int
1106hash_fn (const char *key, int table_size) 1101hash_fn (const char *key, int table_size)
1107{ 1102{
1108 const unsigned char *p = key; 1103 const unsigned char *p = (unsigned char *)key;
1109 uint32_t hash = 2166136261; 1104 uint32_t hash = 2166136261U;
1110 1105
1111 while (*p) 1106 while (*p)
1112 hash = (hash ^ *p++) * 16777619; 1107 hash = (hash ^ *p++) * 16777619;
1113 1108
1114 return hash % table_size; 1109 return hash % table_size;
1115} 1110}
1116 1111
1117static pointer 1112ecb_cold static pointer
1118oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1119{ 1114{
1120 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1121} 1116}
1122 1117
1123/* returns the new symbol */ 1118/* returns the new symbol */
1124static pointer 1119ecb_cold static pointer
1125oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1126{ 1121{
1127 pointer x = generate_symbol (SCHEME_A_ name); 1122 pointer x = generate_symbol (SCHEME_A_ name);
1128 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1129 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1124 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1130 return x; 1125 return x;
1131} 1126}
1132 1127
1133ecb_inline pointer 1128ecb_cold static pointer
1134oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1135{ 1130{
1136 int location; 1131 int location;
1137 pointer x; 1132 pointer x;
1138 char *s; 1133 char *s;
… …
1149 } 1144 }
1150 1145
1151 return NIL; 1146 return NIL;
1152} 1147}
1153 1148
1154static pointer 1149ecb_cold static pointer
1155oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1156{ 1151{
1157 int i; 1152 int i;
1158 pointer x; 1153 pointer x;
1159 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
… …
1165 return ob_list; 1160 return ob_list;
1166} 1161}
1167 1162
1168#else 1163#else
1169 1164
1170static pointer 1165ecb_cold static pointer
1171oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1172{ 1167{
1173 return NIL; 1168 return NIL;
1174} 1169}
1175 1170
1176ecb_inline pointer 1171ecb_cold static pointer
1177oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1178{ 1173{
1179 pointer x; 1174 pointer x;
1180 char *s; 1175 char *s;
1181 1176
… …
1190 1185
1191 return NIL; 1186 return NIL;
1192} 1187}
1193 1188
1194/* returns the new symbol */ 1189/* returns the new symbol */
1195static pointer 1190ecb_cold static pointer
1196oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1197{ 1192{
1198 pointer x = generate_symbol (SCHEME_A_ name); 1193 pointer x = generate_symbol (SCHEME_A_ name);
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1195 return x;
1201} 1196}
1202 1197
1203static pointer 1198ecb_cold static pointer
1204oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1205{ 1200{
1206 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1207} 1202}
1208 1203
1209#endif 1204#endif
1210 1205
1211#if USE_PORTS
1212static pointer 1206ecb_cold static pointer
1213mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1214{ 1208{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1210
1217 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1218 set_port (x, p); 1212 set_port (x, p);
1219 1213
1220 return x; 1214 return x;
1221} 1215}
1222#endif
1223 1216
1224pointer 1217ecb_cold pointer
1225mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1226{ 1219{
1227 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1228 1221
1229 set_typeflag (x, T_FOREIGN | T_ATOM); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
… …
1394 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1395 1388
1396 return x; 1389 return x;
1397} 1390}
1398 1391
1399INTERFACE pointer 1392ecb_cold INTERFACE pointer
1400gensym (SCHEME_P) 1393gensym (SCHEME_P)
1401{ 1394{
1402 pointer x; 1395 pointer x;
1403 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1404 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
… …
1411{ 1404{
1412 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x; 1405 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1413} 1406}
1414 1407
1415/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1416static pointer 1409ecb_cold static pointer
1417mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1418{ 1411{
1419 char c, *p; 1412 char c, *p;
1420 int has_dec_point = 0; 1413 int has_dec_point = 0;
1421 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1492 1485
1493 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1494} 1487}
1495 1488
1496/* make constant */ 1489/* make constant */
1497static pointer 1490ecb_cold static pointer
1498mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1499{ 1492{
1500 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1501 return S_T; 1494 return S_T;
1502 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1503 return S_F; 1496 return S_F;
1504 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1505 { 1498 {
1506 int c; 1499 int c;
1507 1500
1501 // TODO: optimise
1508 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1509 c = ' '; 1503 c = ' ';
1510 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1511 c = '\n'; 1505 c = '\n';
1512 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1513 c = '\r'; 1507 c = '\r';
1514 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1515 c = '\t'; 1509 c = '\t';
1510 else if (stricmp (name + 1, "alarm") == 0)
1511 c = 0x07;
1512 else if (stricmp (name + 1, "backspace") == 0)
1513 c = 0x08;
1514 else if (stricmp (name + 1, "escape") == 0)
1515 c = 0x1b;
1516 else if (stricmp (name + 1, "delete") == 0)
1517 c = 0x7f;
1518 else if (stricmp (name + 1, "null") == 0)
1519 c = 0;
1516 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1517 { 1521 {
1518 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1519 1523
1520 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1545 return NIL; 1549 return NIL;
1546 } 1550 }
1547} 1551}
1548 1552
1549/* ========== garbage collector ========== */ 1553/* ========== garbage collector ========== */
1554
1555static void
1556finalize_cell (SCHEME_P_ pointer a)
1557{
1558 /* TODO, fast bitmap check? */
1559 if (is_string (a) || is_symbol (a))
1560 free (strvalue (a));
1561 else if (is_vector (a))
1562 free (vecvalue (a));
1563#if USE_PORTS
1564 else if (is_port (a))
1565 {
1566 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1567 port_close (SCHEME_A_ a, port_input | port_output);
1568
1569 free (port (a));
1570 }
1571#endif
1572}
1550 1573
1551/*-- 1574/*--
1552 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1575 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1553 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1554 * for marking. 1577 * for marking.
1555 * 1578 *
1556 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1557 * which is inherited form tinyscheme and could be fixed by having another 1580 * which is inherited form tinyscheme and could be fixed by having another
1558 * word of context in the vector 1581 * word of context in the vector
1559 */ 1582 */
1560static void 1583ecb_hot static void
1561mark (pointer a) 1584mark (pointer a)
1562{ 1585{
1563 pointer t, q, p; 1586 pointer t, q, p;
1564 1587
1565 t = 0; 1588 t = 0;
… …
1622 p = q; 1645 p = q;
1623 goto E6; 1646 goto E6;
1624 } 1647 }
1625} 1648}
1626 1649
1627/* garbage collection. parameter a, b is marked. */ 1650ecb_hot static void
1628static void 1651gc_free (SCHEME_P)
1629gc (SCHEME_P_ pointer a, pointer b)
1630{ 1652{
1631 int i; 1653 int i;
1632
1633 if (SCHEME_V->gc_verbose)
1634 putstr (SCHEME_A_ "gc...");
1635
1636 /* mark system globals */
1637 mark (SCHEME_V->oblist);
1638 mark (SCHEME_V->global_env);
1639
1640 /* mark current registers */
1641 mark (SCHEME_V->args);
1642 mark (SCHEME_V->envir);
1643 mark (SCHEME_V->code);
1644 dump_stack_mark (SCHEME_A);
1645 mark (SCHEME_V->value);
1646 mark (SCHEME_V->inport);
1647 mark (SCHEME_V->save_inport);
1648 mark (SCHEME_V->outport);
1649 mark (SCHEME_V->loadport);
1650
1651 /* Mark recent objects the interpreter doesn't know about yet. */
1652 mark (car (S_SINK));
1653 /* Mark any older stuff above nested C calls */
1654 mark (SCHEME_V->c_nest);
1655
1656#if USE_INTCACHE
1657 /* mark intcache */
1658 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1659 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1660 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1661#endif
1662
1663 /* mark variables a, b */
1664 mark (a);
1665 mark (b);
1666
1667 /* garbage collect */
1668 clrmark (NIL);
1669 SCHEME_V->fcells = 0;
1670 SCHEME_V->free_cell = NIL;
1671
1672 if (SCHEME_V->gc_verbose)
1673 putstr (SCHEME_A_ "freeing...");
1674
1675 uint32_t total = 0; 1654 uint32_t total = 0;
1676 1655
1677 /* Here we scan the cells to build the free-list. */ 1656 /* Here we scan the cells to build the free-list. */
1678 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1657 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1679 { 1658 {
… …
1708 { 1687 {
1709 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n"); 1688 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1710 } 1689 }
1711} 1690}
1712 1691
1713static void 1692/* garbage collection. parameter a, b is marked. */
1714finalize_cell (SCHEME_P_ pointer a) 1693ecb_cold static void
1694gc (SCHEME_P_ pointer a, pointer b)
1715{ 1695{
1716 /* TODO, fast bitmap check? */ 1696 int i;
1717 if (is_string (a) || is_symbol (a))
1718 free (strvalue (a));
1719 else if (is_vector (a))
1720 free (vecvalue (a));
1721#if USE_PORTS
1722 else if (is_port (a))
1723 {
1724 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1725 port_close (SCHEME_A_ a, port_input | port_output);
1726 1697
1727 free (port (a)); 1698 if (SCHEME_V->gc_verbose)
1728 } 1699 putstr (SCHEME_A_ "gc...");
1700
1701 /* mark system globals */
1702 mark (SCHEME_V->oblist);
1703 mark (SCHEME_V->global_env);
1704
1705 /* mark current registers */
1706 mark (SCHEME_V->args);
1707 mark (SCHEME_V->envir);
1708 mark (SCHEME_V->code);
1709 dump_stack_mark (SCHEME_A);
1710 mark (SCHEME_V->value);
1711 mark (SCHEME_V->inport);
1712 mark (SCHEME_V->save_inport);
1713 mark (SCHEME_V->outport);
1714 mark (SCHEME_V->loadport);
1715
1716 /* Mark recent objects the interpreter doesn't know about yet. */
1717 mark (car (S_SINK));
1718 /* Mark any older stuff above nested C calls */
1719 mark (SCHEME_V->c_nest);
1720
1721#if USE_INTCACHE
1722 /* mark intcache */
1723 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1724 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1725 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1729#endif 1726#endif
1727
1728 /* mark variables a, b */
1729 mark (a);
1730 mark (b);
1731
1732 /* garbage collect */
1733 clrmark (NIL);
1734 SCHEME_V->fcells = 0;
1735 SCHEME_V->free_cell = NIL;
1736
1737 if (SCHEME_V->gc_verbose)
1738 putstr (SCHEME_A_ "freeing...");
1739
1740 gc_free (SCHEME_A);
1730} 1741}
1731 1742
1732/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1733 1744
1734static int 1745ecb_cold static int
1735file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1736{ 1747{
1737#if USE_PORTS
1738 int fin; 1748 int fin;
1739 1749
1740 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1741 return 0; 1751 return 0;
1742 1752
… …
1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1760#endif 1770#endif
1761 } 1771 }
1762 1772
1763 return fin >= 0; 1773 return fin >= 0;
1764
1765#else
1766 return 1;
1767#endif
1768} 1774}
1769 1775
1770static void 1776ecb_cold static void
1771file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1772{ 1778{
1773 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1774 { 1780 {
1775 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
… …
1779 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1780 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i); 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1781 } 1787 }
1782} 1788}
1783 1789
1784static int 1790ecb_cold static int
1785file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1786{ 1792{
1787#if USE_PORTS 1793#if USE_PORTS
1788 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1789 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
… …
1792 return 0; 1798 return 0;
1793#endif 1799#endif
1794} 1800}
1795 1801
1796#if USE_PORTS 1802#if USE_PORTS
1797static port * 1803ecb_cold static port *
1798port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1799{ 1805{
1800 int fd; 1806 int fd;
1801 int flags; 1807 int flags;
1802 char *rw; 1808 char *rw;
… …
1825# endif 1831# endif
1826 1832
1827 return pt; 1833 return pt;
1828} 1834}
1829 1835
1830static pointer 1836ecb_cold static pointer
1831port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1832{ 1838{
1833 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1834 1840
1835 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1836 return NIL; 1842 return NIL;
1837 1843
1838 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1839} 1845}
1840 1846
1841static port * 1847ecb_cold static port *
1842port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1843{ 1849{
1844 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1845 1851
1846 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1851 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1852 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1853 return pt; 1859 return pt;
1854} 1860}
1855 1861
1856static pointer 1862ecb_cold static pointer
1857port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1858{ 1864{
1859 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1860 1866
1861 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1862 return NIL; 1868 return NIL;
1863 1869
1864 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1865} 1871}
1866 1872
1867static port * 1873ecb_cold static port *
1868port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1869{ 1875{
1870 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1871 1877
1872 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1878 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1879 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1880 return pt; 1886 return pt;
1881} 1887}
1882 1888
1883static pointer 1889ecb_cold static pointer
1884port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1885{ 1891{
1886 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1887 1893
1888 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1891 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1892} 1898}
1893 1899
1894# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1895 1901
1896static port * 1902ecb_cold static port *
1897port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1898{ 1904{
1899 char *start; 1905 char *start;
1900 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1901 1907
… …
1915 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1916 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1917 return pt; 1923 return pt;
1918} 1924}
1919 1925
1920static pointer 1926ecb_cold static pointer
1921port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1922{ 1928{
1923 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1924 1930
1925 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1926 return NIL; 1932 return NIL;
1927 1933
1928 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1929} 1935}
1930 1936
1931static void 1937ecb_cold static void
1932port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1933{ 1939{
1934 port *pt = port (p); 1940 port *pt = port (p);
1935 1941
1936 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
… …
1956 } 1962 }
1957} 1963}
1958#endif 1964#endif
1959 1965
1960/* get new character from input file */ 1966/* get new character from input file */
1961static int 1967ecb_cold static int
1962inchar (SCHEME_P) 1968inchar (SCHEME_P)
1963{ 1969{
1964 int c; 1970 int c;
1965 port *pt = port (SCHEME_V->inport); 1971 port *pt = port (SCHEME_V->inport);
1966 1972
… …
1980 } 1986 }
1981 1987
1982 return c; 1988 return c;
1983} 1989}
1984 1990
1985static int ungot = -1; 1991ecb_cold static int
1986
1987static int
1988basic_inchar (port *pt) 1992basic_inchar (port *pt)
1989{ 1993{
1990#if USE_PORTS
1991 if (pt->unget != -1) 1994 if (pt->unget != -1)
1992 { 1995 {
1993 int r = pt->unget; 1996 int r = pt->unget;
1994 pt->unget = -1; 1997 pt->unget = -1;
1995 return r; 1998 return r;
1996 } 1999 }
1997 2000
2001#if USE_PORTS
1998 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
1999 { 2003 {
2000 char c; 2004 char c;
2001 2005
2002 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
2010 return EOF; 2014 return EOF;
2011 else 2015 else
2012 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
2013 } 2017 }
2014#else 2018#else
2015 if (ungot == -1)
2016 {
2017 char c; 2019 char c;
2018 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
2019 return EOF; 2022 return EOF;
2020 2023
2021 ungot = c;
2022 }
2023
2024 {
2025 int r = ungot;
2026 ungot = -1;
2027 return r; 2024 return c;
2028 }
2029#endif 2025#endif
2030} 2026}
2031 2027
2032/* back character to input buffer */ 2028/* back character to input buffer */
2033static void 2029ecb_cold static void
2034backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2035{ 2031{
2036#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2037 port *pt;
2038 2033
2039 if (c == EOF) 2034 if (c == EOF)
2040 return; 2035 return;
2041 2036
2042 pt = port (SCHEME_V->inport);
2043 pt->unget = c; 2037 pt->unget = c;
2044#else
2045 if (c == EOF)
2046 return;
2047
2048 ungot = c;
2049#endif
2050} 2038}
2051 2039
2052#if USE_PORTS 2040#if USE_PORTS
2053static int 2041ecb_cold static int
2054realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2055{ 2043{
2056 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2057 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2045 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2058 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2071 else 2059 else
2072 return 0; 2060 return 0;
2073} 2061}
2074#endif 2062#endif
2075 2063
2076INTERFACE void 2064ecb_cold static void
2077putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2078{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2079#if USE_PORTS 2069#if USE_PORTS
2080 port *pt = port (SCHEME_V->outport);
2081
2082 if (pt->kind & port_file)
2083 write (pt->rep.stdio.file, s, strlen (s));
2084 else
2085 for (; *s; s++)
2086 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2087 *pt->rep.string.curr++ = *s;
2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2089 *pt->rep.string.curr++ = *s;
2090
2091#else
2092 write (pt->rep.stdio.file, s, strlen (s));
2093#endif
2094}
2095
2096static void
2097putchars (SCHEME_P_ const char *s, int len)
2098{
2099#if USE_PORTS
2100 port *pt = port (SCHEME_V->outport);
2101
2102 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2103 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2104 else 2072 else
2105 { 2073 {
2106 for (; len; len--) 2074 for (; len; len--)
… …
2111 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2112 } 2080 }
2113 } 2081 }
2114 2082
2115#else 2083#else
2116 write (1, s, len); 2084 write (1, s, len); // output not initialised
2117#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2118} 2092}
2119 2093
2120INTERFACE void 2094INTERFACE void
2121putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2122{ 2096{
2123#if USE_PORTS
2124 port *pt = port (SCHEME_V->outport);
2125
2126 if (pt->kind & port_file)
2127 {
2128 char cc = c;
2129 write (pt->rep.stdio.file, &cc, 1);
2130 }
2131 else
2132 {
2133 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2134 *pt->rep.string.curr++ = c;
2135 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2136 *pt->rep.string.curr++ = c;
2137 }
2138
2139#else
2140 char cc = c; 2097 char cc = c;
2141 write (1, &c, 1); 2098
2142#endif 2099 putchars (SCHEME_A_ &cc, 1);
2143} 2100}
2144 2101
2145/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2146static char * 2103ecb_cold static char *
2147readstr_upto (SCHEME_P_ int skip, const char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2148{ 2105{
2149 char *p = SCHEME_V->strbuff + skip; 2106 char *p = SCHEME_V->strbuff + skip;
2150 2107
2151 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2108 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2160 2117
2161 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2162} 2119}
2163 2120
2164/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2165static pointer 2122ecb_cold static pointer
2166readstrexp (SCHEME_P_ char delim) 2123readstrexp (SCHEME_P_ char delim)
2167{ 2124{
2168 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2169 int c; 2126 int c;
2170 int c1 = 0; 2127 int c1 = 0;
… …
2203 case '7': 2160 case '7':
2204 state = st_oct1; 2161 state = st_oct1;
2205 c1 = c - '0'; 2162 c1 = c - '0';
2206 break; 2163 break;
2207 2164
2165 case 'a': *p++ = '\a'; state = st_ok; break;
2166 case 'n': *p++ = '\n'; state = st_ok; break;
2167 case 'r': *p++ = '\r'; state = st_ok; break;
2168 case 't': *p++ = '\t'; state = st_ok; break;
2169
2170 // this overshoots the minimum requirements of r7rs
2171 case ' ':
2172 case '\t':
2173 case '\r':
2174 case '\n':
2175 skipspace (SCHEME_A);
2176 state = st_ok;
2177 break;
2178
2179 //TODO: x should end in ;, not two-digit hex
2208 case 'x': 2180 case 'x':
2209 case 'X': 2181 case 'X':
2210 state = st_x1; 2182 state = st_x1;
2211 c1 = 0; 2183 c1 = 0;
2212 break;
2213
2214 case 'n':
2215 *p++ = '\n';
2216 state = st_ok;
2217 break;
2218
2219 case 't':
2220 *p++ = '\t';
2221 state = st_ok;
2222 break;
2223
2224 case 'r':
2225 *p++ = '\r';
2226 state = st_ok;
2227 break; 2184 break;
2228 2185
2229 default: 2186 default:
2230 *p++ = c; 2187 *p++ = c;
2231 state = st_ok; 2188 state = st_ok;
… …
2283 } 2240 }
2284 } 2241 }
2285} 2242}
2286 2243
2287/* check c is in chars */ 2244/* check c is in chars */
2288ecb_inline int 2245ecb_cold int
2289is_one_of (const char *s, int c) 2246is_one_of (const char *s, int c)
2290{ 2247{
2291 return c == EOF || !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2292} 2249}
2293 2250
2294/* skip white characters */ 2251/* skip white characters */
2295ecb_inline int 2252ecb_cold int
2296skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2297{ 2254{
2298 int c, curr_line = 0; 2255 int c, curr_line = 0;
2299 2256
2300 do 2257 do
… …
2320 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2321 return 1; 2278 return 1;
2322} 2279}
2323 2280
2324/* get token */ 2281/* get token */
2325static int 2282ecb_cold static int
2326token (SCHEME_P) 2283token (SCHEME_P)
2327{ 2284{
2328 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2329 2286
2330 if (c == EOF) 2287 if (c == EOF)
… …
2428} 2385}
2429 2386
2430/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2431#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2432 2389
2433static void 2390ecb_cold static void
2434printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2435{ 2392{
2436 int i; 2393 int i;
2437 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2438 2395
… …
2494 2451
2495 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2496} 2453}
2497 2454
2498/* print atoms */ 2455/* print atoms */
2499static void 2456ecb_cold static void
2500printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2501{ 2458{
2502 char *p; 2459 char *p;
2503 int len; 2460 int len;
2504 2461
2505 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2506 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2507} 2464}
2508 2465
2509/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2510static void 2467ecb_cold static void
2511atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2512{ 2469{
2513 char *p; 2470 char *p;
2514 2471
2515 if (l == NIL) 2472 if (l == NIL)
… …
2722 return car (d); 2679 return car (d);
2723 2680
2724 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2725 q = p; 2682 q = p;
2726 2683
2727 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2728 { 2685 {
2729 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2730 2687
2731 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2732 p = cdr (d); 2689 p = cdr (d);
2733 } 2690 }
2734 2691
2735 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2736 return q; 2693 return q;
2737} 2694}
2738 2695
2739/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2740static pointer 2697ecb_hot static pointer
2741reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2742{ 2699{
2743 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2744 pointer p = NIL; 2701 pointer p = NIL;
2745 2702
… …
2748 2705
2749 return p; 2706 return p;
2750} 2707}
2751 2708
2752/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2753static pointer 2710ecb_hot static pointer
2754reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2755{ 2712{
2756 pointer result = term; 2713 pointer result = term;
2757 pointer p = list; 2714 pointer p = list;
2758 2715
… …
2766 2723
2767 return result; 2724 return result;
2768} 2725}
2769 2726
2770/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2771static pointer 2728ecb_hot static pointer
2772revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2773{ 2730{
2774 pointer result = a; 2731 pointer result = a;
2775 pointer p = b; 2732 pointer p = b;
2776 2733
… …
2785 2742
2786 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2787} 2744}
2788 2745
2789/* equivalence of atoms */ 2746/* equivalence of atoms */
2790int 2747ecb_hot int
2791eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2792{ 2749{
2793 if (is_string (a)) 2750 if (is_string (a))
2794 { 2751 {
2795 if (is_string (b)) 2752 if (is_string (b))
… …
2889 } 2846 }
2890 else 2847 else
2891 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2892} 2849}
2893 2850
2894static pointer 2851ecb_hot static pointer
2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2896{ 2853{
2897 pointer x, y; 2854 pointer x, y;
2898 2855
2899 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
… …
2920 return NIL; 2877 return NIL;
2921} 2878}
2922 2879
2923#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2924 2881
2925ecb_inline void 2882static void
2926new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2927{ 2884{
2928 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2929 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2930} 2887}
2931 2888
2932ecb_inline void 2889static void
2933new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2890new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2934{ 2891{
2935 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2936} 2893}
2937 2894
2938static pointer 2895ecb_hot static pointer
2939find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2940{ 2897{
2941 pointer x, y; 2898 pointer x, y;
2942 2899
2943 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2957 return NIL; 2914 return NIL;
2958} 2915}
2959 2916
2960#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2961 2918
2962ecb_inline void 2919static void
2963new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2964{ 2921{
2965 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2966 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2923 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2967} 2924}
2968 2925
2969ecb_inline void 2926static void
2970set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2971{ 2928{
2972 set_cdr (slot, value); 2929 set_cdr (slot, value);
2973} 2930}
2974 2931
2975ecb_inline pointer 2932static pointer
2976slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2977{ 2934{
2978 return cdr (slot); 2935 return cdr (slot);
2979} 2936}
2980 2937
2981/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
2982 2939
2983static int 2940ecb_cold static int
2984xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
2985{ 2942{
2986#if USE_ERROR_HOOK
2987 pointer x;
2988 pointer hdl = SCHEME_V->ERROR_HOOK;
2989#endif
2990
2991#if USE_PRINTF 2943#if USE_PRINTF
2992#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
2993 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
2994 2946
2995 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
3010 } 2962 }
3011#endif 2963#endif
3012#endif 2964#endif
3013 2965
3014#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
3015 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2967 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
3016 2968
3017 if (x != NIL) 2969 if (x != NIL)
3018 { 2970 {
3019 pointer code = a 2971 pointer code = a
3020 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3064 pointer code; 3016 pointer code;
3065}; 3017};
3066 3018
3067# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3068 3020
3069static void 3021ecb_hot static void
3070s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3071{ 3023{
3072 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3073 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3074 3026
… …
3087 next_frame->code = code; 3039 next_frame->code = code;
3088 3040
3089 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3090} 3042}
3091 3043
3092static int 3044static ecb_hot int
3093xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3094{ 3046{
3095 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3096 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3097 3049
… …
3108 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3109 3061
3110 return 0; 3062 return 0;
3111} 3063}
3112 3064
3113ecb_inline void 3065ecb_cold void
3114dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3115{ 3067{
3116 /* 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 */
3117 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3118} 3070}
3119 3071
3120ecb_inline void 3072ecb_cold void
3121dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3122{ 3074{
3123 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3124 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3125 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3126} 3078}
3127 3079
3128static void 3080ecb_cold static void
3129dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3130{ 3082{
3131 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3132 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3133 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3134 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3135} 3087}
3136 3088
3137static void 3089ecb_cold static void
3138dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3139{ 3091{
3140 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3141 int i; 3093 int i;
3142 3094
… …
3148 mark (frame->envir); 3100 mark (frame->envir);
3149 mark (frame->code); 3101 mark (frame->code);
3150 } 3102 }
3151} 3103}
3152 3104
3153static pointer 3105ecb_cold static pointer
3154ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3155{ 3107{
3156 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3157 int i; 3109 int i;
3158 3110
… …
3170 } 3122 }
3171 3123
3172 return cont; 3124 return cont;
3173} 3125}
3174 3126
3175static void 3127ecb_cold static void
3176ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3177{ 3129{
3178 int i = 0; 3130 int i = 0;
3179 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3180 3132
… …
3192 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3193} 3145}
3194 3146
3195#else 3147#else
3196 3148
3197ecb_inline void 3149ecb_cold void
3198dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3199{ 3151{
3200 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3201} 3153}
3202 3154
3203ecb_inline void 3155ecb_cold void
3204dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3205{ 3157{
3206 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3207} 3159}
3208 3160
3209static void 3161ecb_cold static void
3210dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3211{ 3163{
3212 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3213} 3165}
3214 3166
3215static int 3167ecb_hot static int
3216xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3217{ 3169{
3218 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3219 3171
3220 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3230 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3231 3183
3232 return 0; 3184 return 0;
3233} 3185}
3234 3186
3235static void 3187ecb_hot static void
3236s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3237{ 3189{
3238 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3239 cons (args, 3191 cons (args,
3240 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3241 cons (code, 3193 cons (code,
3242 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3243} 3195}
3244 3196
3245static void 3197ecb_cold static void
3246dump_stack_mark (SCHEME_P) 3198dump_stack_mark (SCHEME_P)
3247{ 3199{
3248 mark (SCHEME_V->dump); 3200 mark (SCHEME_V->dump);
3249} 3201}
3250 3202
3251static pointer 3203ecb_cold static pointer
3252ss_get_cont (SCHEME_P) 3204ss_get_cont (SCHEME_P)
3253{ 3205{
3254 return SCHEME_V->dump; 3206 return SCHEME_V->dump;
3255} 3207}
3256 3208
3257static void 3209ecb_cold static void
3258ss_set_cont (SCHEME_P_ pointer cont) 3210ss_set_cont (SCHEME_P_ pointer cont)
3259{ 3211{
3260 SCHEME_V->dump = cont; 3212 SCHEME_V->dump = cont;
3261} 3213}
3262 3214
3263#endif 3215#endif
3264 3216
3265#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3266 3218
3267#if EXPERIMENT 3219#if EXPERIMENT
3220
3268static int 3221static int
3269debug (SCHEME_P_ int indent, pointer x) 3222dtree (SCHEME_P_ int indent, pointer x)
3270{ 3223{
3271 int c; 3224 int c;
3272 3225
3273 if (is_syntax (x)) 3226 if (is_syntax (x))
3274 { 3227 {
… …
3292 printf ("%*sS<%s>\n", indent, "", symname (x)); 3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3293 return 24+8; 3246 return 24+8;
3294 3247
3295 case T_CLOSURE: 3248 case T_CLOSURE:
3296 printf ("%*sS<%s>\n", indent, "", "closure"); 3249 printf ("%*sS<%s>\n", indent, "", "closure");
3297 debug (SCHEME_A_ indent + 3, cdr(x)); 3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3298 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3299 3252
3300 case T_PAIR: 3253 case T_PAIR:
3301 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3302 c = debug (SCHEME_A_ indent + 3, car (x)); 3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3303 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3304 return c + 1; 3257 return c + 1;
3305 3258
3306 case T_PORT: 3259 case T_PORT:
3307 printf ("%*sS<%s>\n", indent, "", "port"); 3260 printf ("%*sS<%s>\n", indent, "", "port");
3308 return 24+8; 3261 return 24+8;
… …
3311 printf ("%*sS<%s>\n", indent, "", "vector"); 3264 printf ("%*sS<%s>\n", indent, "", "vector");
3312 return 24+8; 3265 return 24+8;
3313 3266
3314 case T_ENVIRONMENT: 3267 case T_ENVIRONMENT:
3315 printf ("%*sS<%s>\n", indent, "", "environment"); 3268 printf ("%*sS<%s>\n", indent, "", "environment");
3316 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3317 3270
3318 default: 3271 default:
3319 printf ("unhandled type %d\n", type (x)); 3272 printf ("unhandled type %d\n", type (x));
3320 break; 3273 break;
3321 } 3274 }
3322} 3275}
3323#endif
3324 3276
3277#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3278
3279typedef void *stream[1];
3280
3281#define stream_init() { 0 }
3282#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3283#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3284#define stream_free(s) free (s[0])
3285
3286ecb_cold static void
3287stream_put (stream s, uint8_t byte)
3288{
3289 uint32_t *sp = *s;
3290 uint32_t size = sizeof (uint32_t) * 2;
3291 uint32_t offs = size;
3292
3293 if (ecb_expect_true (sp))
3294 {
3295 offs = sp[0];
3296 size = sp[1];
3297 }
3298
3299 if (ecb_expect_false (offs == size))
3300 {
3301 size *= 2;
3302 sp = realloc (sp, size);
3303 *s = sp;
3304 sp[1] = size;
3305
3306 }
3307
3308 ((uint8_t *)sp)[offs++] = byte;
3309 sp[0] = offs;
3310}
3311
3312ecb_cold static void
3313stream_put_v (stream s, uint32_t v)
3314{
3315 while (v > 0x7f)
3316 {
3317 stream_put (s, v | 0x80);
3318 v >>= 7;
3319 }
3320
3321 stream_put (s, v);
3322}
3323
3324ecb_cold static void
3325stream_put_tv (stream s, int bop, uint32_t v)
3326{
3327 printf ("put tv %d %d\n", bop, v);//D
3328 stream_put (s, bop);
3329 stream_put_v (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_stream (stream s, stream o)
3334{
3335 uint32_t i;
3336
3337 for (i = 0; i < stream_size (o); ++i)
3338 stream_put (s, stream_data (o)[i]);
3339
3340 stream_free (o);
3341}
3342
3343// calculates a (preferably small) integer that makes it possible to find
3344// the symbol again. if pointers were offsets into a memory area... until
3345// then, we return segment number in the low bits, and offset in the high
3346// bits.
3347// also, this function must never return 0.
3348ecb_cold static uint32_t
3349symbol_id (SCHEME_P_ pointer sym)
3350{
3351 struct cell *p = CELL (sym);
3352 int i;
3353
3354 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3355 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3356 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3357
3358 abort ();
3359}
3360
3361ecb_cold static uint32_t
3362cell_id (SCHEME_P_ pointer p)
3363{
3364 return symbol_id (SCHEME_A_ p);
3365}
3366
3367enum byteop
3368{
3369 BOP_NIL,
3370 BOP_SYNTAX,
3371 BOP_INTEGER,
3372 BOP_SYMBOL,
3373 BOP_LIST_BEG,
3374 BOP_LIST_END,
3375 BOP_BIFT, // branch if true
3376 BOP_BIFF, // branch if false
3377 BOP_BIFNE, // branch if not eqv?
3378 BOP_BRA, // "short" branch
3379 BOP_JMP, // "long" jump
3380 BOP_DATUM,
3381 BOP_LET,
3382 BOP_LETAST,
3383 BOP_LETREC,
3384 BOP_DEFINE,
3385 BOP_MACRO,
3386 BOP_SET,
3387 BOP_BEGIN,
3388 BOP_LAMBDA,
3389};
3390
3391ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3392
3393ecb_cold static void
3394compile_list (SCHEME_P_ stream s, pointer x)
3395{
3396 for (; x != NIL; x = cdr (x))
3397 compile_expr (SCHEME_A_ s, car (x));
3398}
3399
3325static int 3400static void
3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3402{
3403 //TODO: borked
3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3405
3406 stream_put (s, BOP_BIFF);
3407 compile_expr (SCHEME_A_ s, cond);
3408 stream_put_v (s, stream_size (sift));
3409 stream_put_stream (s, sift);
3410
3411 if (iff != NIL)
3412 {
3413 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3414 stream_put_tv (s, BOP_BRA, stream_size (siff));
3415 stream_put_stream (s, siff);
3416 }
3417}
3418
3419typedef uint32_t stream_fixup;
3420
3421static stream_fixup
3422stream_put_fixup (stream s)
3423{
3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3428}
3429
3430static void
3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3432{
3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3437}
3438
3439static void
3440compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3441{
3442 if (cdr (x) == NIL)
3443 compile_expr (SCHEME_A_ s, car (x));
3444 else
3445 {
3446 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3447 compile_expr (SCHEME_A_ s, car (x));
3448 stream_fixup end = stream_put_fixup (s);
3449
3450 compile_and_or (SCHEME_A_ s, and, cdr (x));
3451 stream_fix_fixup (s, end, stream_size (s));
3452 }
3453}
3454
3455ecb_cold static void
3456compile_expr (SCHEME_P_ stream s, pointer x)
3457{
3458 if (x == NIL)
3459 {
3460 stream_put (s, BOP_NIL);
3461 return;
3462 }
3463
3464 if (is_pair (x))
3465 {
3466 pointer head = car (x);
3467
3468 if (is_syntax (head))
3469 {
3470 x = cdr (x);
3471
3472 switch (syntaxnum (head))
3473 {
3474 case OP_IF0: /* if */
3475 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3476 break;
3477
3478 case OP_OR0: /* or */
3479 compile_and_or (SCHEME_A_ s, 0, x);
3480 break;
3481
3482 case OP_AND0: /* and */
3483 compile_and_or (SCHEME_A_ s, 1, x);
3484 break;
3485
3486 case OP_CASE0: /* case */
3487 abort ();
3488 break;
3489
3490 case OP_COND0: /* cond */
3491 abort ();
3492 break;
3493
3494 case OP_LET0: /* let */
3495 case OP_LET0AST: /* let* */
3496 case OP_LET0REC: /* letrec */
3497 switch (syntaxnum (head))
3498 {
3499 case OP_LET0: stream_put (s, BOP_LET ); break;
3500 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3501 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3502 }
3503
3504 {
3505 pointer bindings = car (x);
3506 pointer body = cadr (x);
3507
3508 for (x = bindings; x != NIL; x = cdr (x))
3509 {
3510 pointer init = NIL;
3511 pointer var = car (x);
3512
3513 if (is_pair (var))
3514 {
3515 init = cdr (var);
3516 var = car (var);
3517 }
3518
3519 stream_put_v (s, symbol_id (SCHEME_A_ var));
3520 compile_expr (SCHEME_A_ s, init);
3521 }
3522
3523 stream_put_v (s, 0);
3524 compile_expr (SCHEME_A_ s, body);
3525 }
3526 break;
3527
3528 case OP_DEF0: /* define */
3529 case OP_MACRO0: /* macro */
3530 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3531 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3532 compile_expr (SCHEME_A_ s, cadr (x));
3533 break;
3534
3535 case OP_SET0: /* set! */
3536 stream_put (s, BOP_SET);
3537 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3538 compile_expr (SCHEME_A_ s, cadr (x));
3539 break;
3540
3541 case OP_BEGIN: /* begin */
3542 stream_put (s, BOP_BEGIN);
3543 compile_list (SCHEME_A_ s, x);
3544 return;
3545
3546 case OP_DELAY: /* delay */
3547 abort ();
3548 break;
3549
3550 case OP_QUOTE: /* quote */
3551 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3552 break;
3553
3554 case OP_LAMBDA: /* lambda */
3555 {
3556 pointer formals = car (x);
3557 pointer body = cadr (x);
3558
3559 stream_put (s, BOP_LAMBDA);
3560
3561 for (; is_pair (formals); formals = cdr (formals))
3562 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3563
3564 stream_put_v (s, 0);
3565 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3566
3567 compile_expr (SCHEME_A_ s, body);
3568 }
3569 break;
3570
3571 case OP_C0STREAM:/* cons-stream */
3572 abort ();
3573 break;
3574 }
3575
3576 return;
3577 }
3578
3579 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3580
3581 if (m != NIL)
3582 {
3583 m = slot_value_in_env (m);
3584
3585 if (is_macro (m))
3586 {
3587 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3588 SCHEME_V->code = m;
3589 SCHEME_V->args = cons (x, NIL);
3590 Eval_Cycle (SCHEME_A_ OP_APPLY);
3591 x = SCHEME_V->value;
3592 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3593 return;
3594 }
3595 }
3596 }
3597
3598 switch (type (x))
3599 {
3600 case T_INTEGER:
3601 {
3602 IVALUE iv = ivalue_unchecked (x);
3603 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3604 stream_put_tv (s, BOP_INTEGER, iv);
3605 }
3606 return;
3607
3608 case T_SYMBOL:
3609 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3610 return;
3611
3612 case T_PAIR:
3613 stream_put (s, BOP_LIST_BEG);
3614
3615 for (; x != NIL; x = cdr (x))
3616 compile_expr (SCHEME_A_ s, car (x));
3617
3618 stream_put (s, BOP_LIST_END);
3619 return;
3620
3621 default:
3622 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3623 break;
3624 }
3625}
3626
3627ecb_cold static int
3628compile_closure (SCHEME_P_ pointer p)
3629{
3630 stream s = stream_init ();
3631
3632 compile_list (SCHEME_A_ s, cdar (p));
3633
3634 FILE *xxd = popen ("xxd", "we");
3635 fwrite (stream_data (s), 1, stream_size (s), xxd);
3636 fclose (xxd);
3637
3638 return stream_size (s);
3639}
3640
3641#endif
3642
3643/* syntax, eval, core, ... */
3644ecb_hot static int
3326opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3327{ 3646{
3328 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3329 pointer x, y; 3648 pointer x, y;
3330 3649
3331 switch (op) 3650 switch (op)
3332 { 3651 {
3333#if EXPERIMENT //D 3652#if EXPERIMENT //D
3334 case OP_DEBUG: 3653 case OP_DEBUG:
3335 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3336 printf ("\n"); 3657 printf ("\n");
3337 s_return (S_T); 3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3338#endif 3663#endif
3664
3339 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3340 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3341 { 3667 {
3342 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n"); 3668 putstr (SCHEME_A_ "Loading ");
3343 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3669 putstr (SCHEME_A_ strvalue (car (args)));
3670 putcharacter (SCHEME_A_ '\n');
3344 } 3671 }
3345 3672
3346 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3347 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3348 else 3675
3349 {
3350 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3351 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3352 }
3353 3678
3354 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3355 3680
3356 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3357 if (port (SCHEME_V->loadport)->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
… …
3373 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3374 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3375 { 3700 {
3376 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3377 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3378 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3379 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3380 } 3708 }
3381 3709
3382 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3383 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3418 { 3746 {
3419 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3420 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3421 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3422 } 3750 }
3423 else 3751
3424 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3425 3753
3426 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3427#if USE_TRACING 3755#if USE_TRACING
3428 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3429 { 3757 {
… …
3462 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3790 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3463 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3464 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3465 } 3793 }
3466 } 3794 }
3467 else 3795
3468 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3469 3797
3470 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3471 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3472 { 3800 {
3473 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3474 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3475 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3476 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3477 } 3805 }
3478 else 3806
3479 {
3480 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3481 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3482 }
3483 3809
3484 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3485 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3486 3812
3487 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3498 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3499 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3500 } 3826 }
3501 3827
3502#if USE_TRACING 3828#if USE_TRACING
3503
3504 case OP_TRACING: 3829 case OP_TRACING:
3505 { 3830 {
3506 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3507 3832
3508 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3509 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3510 } 3835 }
3511
3512#endif 3836#endif
3513 3837
3514 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3515#if USE_TRACING 3839#if USE_TRACING
3516 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3570 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3571 { 3895 {
3572 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3573 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3574 } 3898 }
3575 else 3899
3576 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3577 3901
3578 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3579 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3580 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3581 3905
… …
3645 else 3969 else
3646 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3970 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3647 3971
3648 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3649 3973
3650
3651 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3652 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3653 3976
3654 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3655 x = cadr (args); 3978 x = cadr (args);
… …
3673 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3674 } 3997 }
3675 else 3998 else
3676 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3677 4000
3678
3679 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3680 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3681 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3682 4004
3683 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3694 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3695 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3696 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3697 else 4019 else
3698 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4020 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4021
3699 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3700 4023
3701 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3702 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3703 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3704 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4027 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3705 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3706 4029
3707 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3708 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3709 4033
3710 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3711 { 4035 {
3712 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4036 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3713 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4037 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3714 4038
3715 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3716 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3717 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3718 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3719 } 4043 }
3720 else /* end */ 4044
3721 { 4045 /* end */
3722 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3723 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3724 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3725 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3726 }
3727 4050
3728 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3729 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3730 4053
3731 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4054 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3735 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3736 { 4059 {
3737 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4060 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3738 { 4061 {
3739 if (!is_pair (x)) 4062 if (!is_pair (x))
3740 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3741 4064
3742 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3743 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3744 4067
3745 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3746 } 4069 }
3747 4070
3748 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4071 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3765 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3766 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3767 } 4090 }
3768 4091
3769 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4092 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3770 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4093 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3771 4094
3772 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4095 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3773 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3774 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3775 4098
… …
3786 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3787 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3788 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3789 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3790 } 4113 }
3791 else /* end */ 4114
4115 /* end */
3792 { 4116
3793 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3794 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3795 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3796 }
3797 4120
3798 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3799 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3800 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3801 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3802 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3803 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3804 4127
3805 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3806 args = cons (SCHEME_V->value, args);
3807
3808 if (is_pair (SCHEME_V->code)) /* continue */
3809 {
3810 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3811 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3812
3813 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3814 SCHEME_V->code = cadar (SCHEME_V->code);
3815 SCHEME_V->args = NIL;
3816 s_goto (OP_EVAL);
3817 }
3818 else /* end */
3819 {
3820 args = reverse_in_place (SCHEME_A_ NIL, args);
3821 SCHEME_V->code = car (args);
3822 SCHEME_V->args = cdr (args);
3823 s_goto (OP_LET2REC);
3824 }
3825 4129
3826 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3827 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4131 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3828 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3829 4133
… …
3859 } 4163 }
3860 else 4164 else
3861 { 4165 {
3862 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3863 s_return (NIL); 4167 s_return (NIL);
3864 else 4168
3865 {
3866 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3867 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3868 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3869 }
3870 } 4172 }
3871 4173
3872 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3873 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4175 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3874 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3885 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3886 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3887 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3888 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3889 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3890 else 4192
3891 {
3892 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3893 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3894 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3895 }
3896 4196
3897 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3898 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3899 s_return (S_F); 4199 s_return (S_F);
3900 4200
… …
3905 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3906 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3907 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3908 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3909 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3910 else 4210
3911 {
3912 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3913 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3914 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3915 }
3916 4214
3917 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3918 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3919 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3920 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3985 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3986 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3987 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3988 } 4286 }
3989 } 4287 }
3990 else 4288
3991 s_return (NIL); 4289 s_return (NIL);
3992 4290
3993 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
3994 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
3995 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
3996 else 4294
3997 s_return (NIL); 4295 s_return (NIL);
3998 4296
3999 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
4000 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
4001 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4002 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
4016 } 4314 }
4017 4315
4018 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
4019} 4317}
4020 4318
4021static int 4319/* math, cxr */
4320ecb_hot static int
4022opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4023{ 4322{
4024 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
4025 pointer x = car (args); 4324 pointer x = car (args);
4026 num v; 4325 num v;
4027 4326
4028 switch (op) 4327 switch (op)
4029 { 4328 {
4030#if USE_MATH 4329#if USE_MATH
4031 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
4032 {
4033 if (is_integer (x)) 4331 if (!is_integer (x))
4034 s_return (x); 4332 {
4035
4036 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
4037 4334
4038 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
4039 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4040 else 4337 else
4041 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
4042 } 4339 }
4043 4340
4341 s_return (x);
4342
4343 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4344 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4345 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4346 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4347
4348 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4044 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4349 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4045 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4350 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4351 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4046 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4352 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4047 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4353 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4048 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4354 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4049 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4355 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4356 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4051 4357
4052 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
4053 if (cdr (args) == NIL) 4360 cdr (args) == NIL
4054 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
4055 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
4056 {
4057 pointer y = cadr (args);
4058 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4059 }
4060
4061 case OP_SQRT:
4062 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4063 4363
4064 case OP_EXPT: 4364 case OP_EXPT:
4065 { 4365 {
4066 RVALUE result; 4366 RVALUE result;
4067 int real_result = 1; 4367 int real_result = 1;
… …
4090 if (real_result) 4390 if (real_result)
4091 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4092 else 4392 else
4093 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4094 } 4394 }
4095
4096 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4097 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4098
4099 case OP_TRUNCATE:
4100 {
4101 RVALUE n = rvalue (x);
4102 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4103 }
4104
4105 case OP_ROUND:
4106 if (is_integer (x))
4107 s_return (x);
4108
4109 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4110#endif 4395#endif
4111 4396
4112 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4113 v = num_zero; 4398 v = num_zero;
4114 4399
… …
4416 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4417 4702
4418 s_return (newstr); 4703 s_return (newstr);
4419 } 4704 }
4420 4705
4421 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4422 { 4707 {
4423 char *str = strvalue (x); 4708 char *str = strvalue (x);
4424 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4425 int index1; 4710 int index1;
4426 int len; 4711 int len;
4427 4712
4428 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4429 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4430 4715
4431 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4432 { 4717 {
4433 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4434 4719
4435 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4436 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4437 } 4722 }
4438 else 4723 else
4439 index1 = strlength (x); 4724 index1 = strlength (x);
4440 4725
4441 len = index1 - index0; 4726 len = index1 - index0;
4442 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4443 memcpy (strvalue (x), str + index0, len);
4444 strvalue (x)[len] = 0;
4445 4728
4446 s_return (x); 4729 s_return (x);
4447 } 4730 }
4448 4731
4449 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4523 } 4806 }
4524 4807
4525 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4526} 4809}
4527 4810
4528static int 4811/* relational ops */
4812ecb_hot static int
4529opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4530{ 4814{
4531 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4532 4816
4533 for (;;) 4817 for (;;)
… …
4554 } 4838 }
4555 4839
4556 s_return (S_T); 4840 s_return (S_T);
4557} 4841}
4558 4842
4559static int 4843/* predicates */
4844ecb_hot static int
4560opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4561{ 4846{
4562 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4563 pointer a = car (args); 4848 pointer a = car (args);
4564 pointer d = cdr (args); 4849 pointer d = cdr (args);
… …
4611 } 4896 }
4612 4897
4613 s_retbool (r); 4898 s_retbool (r);
4614} 4899}
4615 4900
4616static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4617opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4618{ 4904{
4619 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4620 pointer a = car (args); 4906 pointer a = car (args);
4621 pointer x, y; 4907 pointer x, y;
… …
4638 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4639 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4640 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4641 4927
4642#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4643 4932
4644 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4645 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4646 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4647 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4661 else 4950 else
4662 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4663 4952
4664 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4665 4954
4955 //TODO: move to scheme
4666 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4667 if (is_pair (args)) 4957 if (is_pair (args))
4668 { 4958 {
4669 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4670 { 4960 {
… …
4672 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4673 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4674 } 4964 }
4675 } 4965 }
4676 4966
4677 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4678 s_return (S_T); 4968 s_return (S_T);
4679#endif 4969#endif
4680 4970
4681 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4682 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4691 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4692 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4693 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4694 4984
4695 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4696 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4697 4987
4698 if (args != NIL) 4988 if (args != NIL)
4699 { 4989 {
4700 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4701 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4702 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4703 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4704 } 4994 }
4705 else 4995 else
4706 { 4996 {
4707 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4708 4998
4709 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4710 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4711 else 5001 else
4712 return -1; 5002 return -1;
… …
4920 } 5210 }
4921 5211
4922 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4923} 5213}
4924 5214
4925static int 5215/* reading */
5216ecb_cold static int
4926opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4927{ 5218{
4928 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4929 pointer x; 5220 pointer x;
4930 5221
… …
5009 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
5010 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
5011 { 5302 {
5012 case TOK_EOF: 5303 case TOK_EOF:
5013 s_return (S_EOF); 5304 s_return (S_EOF);
5014 /* NOTREACHED */
5015 5305
5016 case TOK_VEC: 5306 case TOK_VEC:
5017 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5018 /* fall through */ 5308 /* fall through */
5019 5309
… …
5022 5312
5023 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
5024 s_return (NIL); 5314 s_return (NIL);
5025 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
5026 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
5027 else 5317
5028 {
5029 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
5030 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
5031 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
5032 }
5033 5321
5034 case TOK_QUOTE: 5322 case TOK_QUOTE:
5035 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
5036 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
5037 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
5043 { 5331 {
5044 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5045 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
5046 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
5047 } 5335 }
5048 else 5336
5049 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5050
5051 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
5052 5339
5053 case TOK_COMMA: 5340 case TOK_COMMA:
5054 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5055 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
5066 case TOK_DOTATOM: 5353 case TOK_DOTATOM:
5067 SCHEME_V->strbuff[0] = '.'; 5354 SCHEME_V->strbuff[0] = '.';
5068 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5355 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5069 5356
5070 case TOK_STRATOM: 5357 case TOK_STRATOM:
5358 //TODO: haven't checked whether the garbage collector could interfere and free x
5359 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5071 x = readstrexp (SCHEME_A_ '|'); 5360 x = readstrexp (SCHEME_A_ '|');
5072 //TODO: haven't checked whether the garbage collector could interfere
5073 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5074 5362
5075 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
5076 x = readstrexp (SCHEME_A_ '"'); 5364 x = readstrexp (SCHEME_A_ '"');
5077 5365
… …
5085 { 5373 {
5086 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5374 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5087 5375
5088 if (f == NIL) 5376 if (f == NIL)
5089 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
5090 else 5378
5091 {
5092 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5093 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
5094 }
5095 } 5381 }
5096 5382
5097 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
5098 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5384 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5099 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
5100 else 5386
5101 s_return (x); 5387 s_return (x);
5102 5388
5103 default: 5389 default:
5104 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5105 } 5391 }
5106 5392
… …
5199 pointer b = cdr (args); 5485 pointer b = cdr (args);
5200 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5201 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5202 5488
5203 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5204 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5205 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5206 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5207 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5208 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5209 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5210 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5211 else 5497 else
5212 { 5498 {
5213 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5214 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5215 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5216 } 5502 }
5217 5503
5218 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5220 5506
5221 case OP_P1LIST: 5507 case OP_P1LIST:
5222 if (is_pair (args)) 5508 if (is_pair (args))
5223 { 5509 {
5224 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5225 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5226 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5227 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5228 } 5514 }
5229 else if (is_vector (args)) 5515 else if (is_vector (args))
5230 { 5516 {
… …
5238 { 5524 {
5239 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5240 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5241 } 5527 }
5242 5528
5243 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5244 s_return (S_T); 5530 s_return (S_T);
5245 } 5531 }
5246 5532
5247 case OP_PVECFROM: 5533 case OP_PVECFROM:
5248 { 5534 {
… …
5250 pointer vec = car (args); 5536 pointer vec = car (args);
5251 int len = veclength (vec); 5537 int len = veclength (vec);
5252 5538
5253 if (i == len) 5539 if (i == len)
5254 { 5540 {
5255 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5256 s_return (S_T); 5542 s_return (S_T);
5257 } 5543 }
5258 else 5544 else
5259 { 5545 {
5260 pointer elem = vector_get (vec, i); 5546 pointer elem = vector_get (vec, i);
… …
5262 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5263 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5264 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5265 5551
5266 if (i > 0) 5552 if (i > 0)
5267 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5268 5554
5269 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5270 } 5556 }
5271 } 5557 }
5272 } 5558 }
5273 5559
5274 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5275} 5561}
5276 5562
5277static int 5563/* list ops */
5564ecb_hot static int
5278opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5279{ 5566{
5280 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5281 pointer a = car (args); 5568 pointer a = car (args);
5282 pointer x, y; 5569 pointer x, y;
… …
5305 break; 5592 break;
5306 } 5593 }
5307 5594
5308 if (is_pair (y)) 5595 if (is_pair (y))
5309 s_return (car (y)); 5596 s_return (car (y));
5310 else 5597
5311 s_return (S_F); 5598 s_return (S_F);
5312
5313 5599
5314 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5315 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5316 5602
5317 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5318 s_return (S_F); 5604 s_return (S_F);
5319 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5320 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5321 else if (is_macro (SCHEME_V->args)) 5607
5322 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5323 else
5324 s_return (S_F); 5608 s_return (S_F);
5325 5609
5326 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5327 /* 5611 /*
5328 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5329 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
… …
5340 5624
5341/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5625/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5342typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5343 5627
5344typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5345static int 5629
5630ecb_hot static int
5346tst_any (pointer p) 5631tst_any (pointer p)
5347{ 5632{
5348 return 1; 5633 return 1;
5349} 5634}
5350 5635
5351static int 5636ecb_hot static int
5352tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5353{ 5638{
5354 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5355} 5640}
5356 5641
5357static int 5642ecb_hot static int
5358tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5359{ 5644{
5360 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5361} 5646}
5362 5647
… …
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5406#include "opdefines.h" 5691#include "opdefines.h"
5407#undef OP_DEF 5692#undef OP_DEF
5408; 5693;
5409 5694
5410static const char * 5695ecb_cold static const char *
5411opname (int idx) 5696opname (int idx)
5412{ 5697{
5413 const char *name = opnames; 5698 const char *name = opnames;
5414 5699
5415 /* should do this at compile time, but would require external program, right? */ 5700 /* should do this at compile time, but would require external program, right? */
… …
5417 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5418 5703
5419 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5420} 5705}
5421 5706
5422static const char * 5707ecb_cold static const char *
5423procname (pointer x) 5708procname (pointer x)
5424{ 5709{
5425 return opname (procnum (x)); 5710 return opname (procnum (x));
5426} 5711}
5427 5712
… …
5447#undef OP_DEF 5732#undef OP_DEF
5448 {0} 5733 {0}
5449}; 5734};
5450 5735
5451/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5452static void ecb_hot 5737ecb_hot static void
5453Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5454{ 5739{
5455 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5456 5741
5457 for (;;) 5742 for (;;)
… …
5548 } 5833 }
5549} 5834}
5550 5835
5551/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5552 5837
5553static void 5838ecb_cold static void
5554assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5555{ 5840{
5556 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5557 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5558} 5843}
5559 5844
5560static void 5845ecb_cold static void
5561assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5562{ 5847{
5563 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5564 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5565 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5573 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5574 return y; 5859 return y;
5575} 5860}
5576 5861
5577/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5862/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5578static int 5863ecb_hot static int
5579syntaxnum (pointer p) 5864syntaxnum (pointer p)
5580{ 5865{
5581 const char *s = strvalue (p); 5866 const char *s = strvalue (p);
5582 5867
5583 switch (strlength (p)) 5868 switch (strlength (p))
… …
5700#endif 5985#endif
5701 } 5986 }
5702 5987
5703 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5704 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5705 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5706 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5707 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5708 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5709 5995
5710 /* init NIL */ 5996 /* init NIL */
5711 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5712 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5768 6054
5769 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5770} 6056}
5771 6057
5772#if USE_PORTS 6058#if USE_PORTS
5773void 6059ecb_cold void
5774scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5775{ 6061{
5776 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5777} 6063}
5778 6064
5779void 6065ecb_cold void
5780scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6066scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5781{ 6067{
5782 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6068 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5783} 6069}
5784 6070
5785void 6071ecb_cold void
5786scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5787{ 6073{
5788 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5789} 6075}
5790 6076
5791void 6077ecb_cold void
5792scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6078scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5793{ 6079{
5794 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6080 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5795} 6081}
5796#endif 6082#endif
5797 6083
5798void 6084ecb_cold void
5799scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5800{ 6086{
5801 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5802} 6088}
5803 6089
… …
5835 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5836 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5837 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5838 6124
5839 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5840 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5841 6127
5842#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5843 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5844 {
5845 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5846 { 6131 {
5847 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5848 6133
5849 if (fname) 6134 if (fname)
5850 free (fname); 6135 free (fname);
5851 } 6136 }
5852 }
5853#endif 6137#endif
5854} 6138}
5855 6139
5856void 6140ecb_cold void
5857scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5858{ 6142{
5859 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5860} 6144}
5861 6145
5862void 6146ecb_cold void
5863scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5864{ 6148{
5865 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5866 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5867 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5868 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5869 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5870 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5871#if USE_PORTS
5872 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5873#endif
5874 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5875 6157
5876#if USE_PORTS
5877 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5878 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5879#endif
5880 6160
5881#if USE_PORTS 6161#if USE_PORTS
5882#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5883 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5884 6164
… …
5888#endif 6168#endif
5889 6169
5890 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5891 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5892 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5893 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5894 6175
5895 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5896 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5897} 6178}
5898 6179
5899void 6180ecb_cold void
5900scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5901{ 6182{
6183#if USE_PORTs
5902 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5903 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5904 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5905 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5906 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6188 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5907 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6189 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5908 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5909#if USE_PORTS
5910 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5911#endif
5912 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5913 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5914 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5915 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5916 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5917 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5918 6198
5919 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5920 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5921} 6204}
5922 6205
5923void 6206ecb_cold void
5924scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5925{ 6208{
5926 pointer x; 6209 pointer x;
5927 6210
5928 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5933 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5934} 6217}
5935 6218
5936#if !STANDALONE 6219#if !STANDALONE
5937 6220
5938void 6221ecb_cold void
5939scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5940{ 6223{
5941 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6224 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5942} 6225}
5943 6226
5944void 6227ecb_cold void
5945scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5946{ 6229{
5947 int i; 6230 int i;
5948 6231
5949 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5950 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5951} 6234}
5952 6235
5953pointer 6236ecb_cold pointer
5954scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5955{ 6238{
5956 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6239 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5957} 6240}
5958 6241
5959void 6242ecb_cold void
5960save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5961{ 6244{
5962 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5963 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5964 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5968 /* Truncate the dump stack so TS will return here when done, not 6251 /* Truncate the dump stack so TS will return here when done, not
5969 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5970 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5971} 6254}
5972 6255
5973void 6256ecb_cold void
5974restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5975{ 6258{
5976 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5977 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5978 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5979 /* Pop */ 6262 /* Pop */
5980 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5981} 6264}
5982 6265
5983/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5984pointer 6267ecb_cold pointer
5985scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5986{ 6269{
5987 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5988 6271
5989 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
5996 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
5997 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
5998 return SCHEME_V->value; 6281 return SCHEME_V->value;
5999} 6282}
6000 6283
6001pointer 6284ecb_cold pointer
6002scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
6003{ 6286{
6004 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
6005 6288
6006 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
6018 6301
6019/* ========== Main ========== */ 6302/* ========== Main ========== */
6020 6303
6021#if STANDALONE 6304#if STANDALONE
6022 6305
6023int 6306ecb_cold int
6024main (int argc, char **argv) 6307main (int argc, char **argv)
6025{ 6308{
6026# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
6027 scheme ssc; 6310 scheme ssc;
6028 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
6030# endif 6313# endif
6031 int fin; 6314 int fin;
6032 char *file_name = InitFile; 6315 char *file_name = InitFile;
6033 int retcode; 6316 int retcode;
6034 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
6035 system ("ps v $PPID");//D 6319 system ("ps v $PPID");
6320#endif
6036 6321
6037 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6038 { 6323 {
6039 putstr (SCHEME_A_ "Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6040 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
… …
6069 } 6354 }
6070#endif 6355#endif
6071 6356
6072 do 6357 do
6073 { 6358 {
6074#if USE_PORTS
6075 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
6076 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
6077 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6361 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6078 { 6362 {
6079 pointer args = NIL; 6363 pointer args = NIL;
… …
6097 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6381 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6098 6382
6099 } 6383 }
6100 else 6384 else
6101 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
6102#endif
6103 6386
6104 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
6105 { 6388 {
6106 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n"); 6389 putstr (SCHEME_A_ "Could not open file ");
6390 putstr (SCHEME_A_ file_name);
6391 putcharacter (SCHEME_A_ '\n');
6107 } 6392 }
6108 else 6393 else
6109 { 6394 {
6110 if (isfile) 6395 if (isfile)
6111 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6112 else 6397 else
6113 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6114 6399
6115#if USE_PORTS
6116 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6117 { 6401 {
6118 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6119 { 6403 {
6120 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n"); 6404 putstr (SCHEME_A_ "Errors encountered reading ");
6405 putstr (SCHEME_A_ file_name);
6406 putcharacter (SCHEME_A_ '\n');
6121 } 6407 }
6122 6408
6123 if (isfile) 6409 if (isfile)
6124 close (fin); 6410 close (fin);
6125 } 6411 }
6126#endif
6127 } 6412 }
6128 6413
6129 file_name = *argv++; 6414 file_name = *argv++;
6130 } 6415 }
6131 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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