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.59 by root, Tue Dec 1 07:13:25 2015 UTC vs.
Revision 1.66 by root, Mon Dec 7 18:10:57 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
… …
200 T_STRING, 211 T_STRING,
201 T_SYMBOL, 212 T_SYMBOL,
202 T_PROC, 213 T_PROC,
203 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
204 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
205 T_MACRO, 217 T_MACRO,
206 T_CONTINUATION, 218 T_CONTINUATION,
207 T_FOREIGN, 219 T_FOREIGN,
208 T_PORT, 220 T_PORT,
209 T_VECTOR, 221 T_VECTOR,
210 T_PROMISE, 222 T_PROMISE,
211 T_ENVIRONMENT, 223 T_ENVIRONMENT,
212 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
213 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
214}; 227};
215 228
216#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
217#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
218#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
219#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
220#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
221 234
222/* num, for generic arithmetic */ 235/* num, for generic arithmetic */
223struct num 236struct num
224{ 237{
225 IVALUE ivalue; 238 IVALUE ivalue;
… …
371 384
372static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
373static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
374static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
375 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
376INTERFACE void 391INTERFACE void
377set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
378{ 393{
379 CELL(p)->object.cons.car = CELL (q); 394 CELL(p)->object.cons.car = CELL (q);
380} 395}
… …
496 511
497#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
498#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
499#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
500 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
501#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
504 525
505INTERFACE int 526INTERFACE int
506is_immutable (pointer p) 527is_immutable (pointer p)
507{ 528{
508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
520 proper list: length 541 proper list: length
521 circular list: -1 542 circular list: -1
522 not even a pair: -2 543 not even a pair: -2
523 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
524*/ 545*/
525INTERFACE int 546ecb_hot INTERFACE int
526list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
527{ 548{
528 int i = 0; 549 int i = 0;
529 pointer slow, fast; 550 pointer slow, fast;
530 551
… …
569{ 590{
570 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
571} 592}
572 593
573#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
574ecb_inline int 596ecb_inline int
575Cisalpha (int c) 597Cisalpha (int c)
576{ 598{
577 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
578} 600}
… …
636 "gs", 658 "gs",
637 "rs", 659 "rs",
638 "us" 660 "us"
639}; 661};
640 662
641static int 663ecb_cold static int
642is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
643{ 665{
644 int i; 666 int i;
645 667
646 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
668static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
669ecb_inline int is_one_of (const char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
670static int alloc_cellseg (SCHEME_P); 692static int alloc_cellseg (SCHEME_P);
671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
672static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
673static int count_consecutive_cells (pointer x, int needed);
674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
675static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
677static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
678static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
679static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
680 701
702static pointer mk_port (SCHEME_P_ port *p);
703
681#if USE_PORTS 704#if USE_PORTS
682static pointer mk_port (SCHEME_P_ port *p);
683static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
684static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
685static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
686static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
687static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
688static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
689static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
690#endif 712#endif
713
691static void mark (pointer a); 714static void mark (pointer a);
692static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
693static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
694static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
695static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
696static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
697static pointer readstrexp (SCHEME_P_ char delim); 720static pointer readstrexp (SCHEME_P_ char delim);
698ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
699static int token (SCHEME_P); 722static int token (SCHEME_P);
700static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
702static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
883#endif 906#endif
884#endif 907#endif
885} 908}
886 909
887/* allocate new cell segment */ 910/* allocate new cell segment */
888static int 911ecb_cold static int
889alloc_cellseg (SCHEME_P) 912alloc_cellseg (SCHEME_P)
890{ 913{
891 struct cell *newp; 914 struct cell *newp;
892 struct cell *last; 915 struct cell *last;
893 struct cell *p; 916 struct cell *p;
… …
902 925
903 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
904 return k; 927 return k;
905 928
906 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
907 SCHEME_V->alloc_seg[i] = cp;
908 930
909 newp = (struct cell *)cp; 931 newp = (struct cell *)cp;
910 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
911 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
912 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
913 last = newp + segsize - 1; 935 last = newp + segsize - 1;
914 936
915 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
916 { 938 {
917 pointer cp = POINTER (p); 939 pointer cp = POINTER (p);
940 clrmark (cp);
918 set_typeflag (cp, T_PAIR); 941 set_typeflag (cp, T_PAIR);
919 set_car (cp, NIL); 942 set_car (cp, NIL);
920 set_cdr (cp, POINTER (p + 1)); 943 set_cdr (cp, POINTER (p + 1));
921 } 944 }
922 945
… …
935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
936 return S_SINK; 959 return S_SINK;
937 960
938 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
939 { 962 {
940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
941 964
942 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
943 966
944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
945 { 968 {
… …
964 } 987 }
965} 988}
966 989
967/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
968 Tehom */ 991 Tehom */
969static void 992ecb_hot static void
970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
971{ 994{
972 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
973 996
974 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
976 set_car (holder, recent); 999 set_car (holder, recent);
977 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
978 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
979} 1002}
980 1003
981static pointer 1004ecb_hot static pointer
982get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
983{ 1006{
984 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
985 1008
986 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1043#endif 1066#endif
1044 1067
1045/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1046 1069
1047/* get new cons cell */ 1070/* get new cons cell */
1048pointer 1071ecb_hot static pointer
1049xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1050{ 1073{
1051 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1052 1075
1053 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1054
1055 if (immutable)
1056 setimmutable (x);
1057 1077
1058 set_car (x, a); 1078 set_car (x, a);
1059 set_cdr (x, b); 1079 set_cdr (x, b);
1060 1080
1061 return x; 1081 return x;
1062} 1082}
1063 1083
1064static pointer 1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1065generate_symbol (SCHEME_P_ const char *name) 1096generate_symbol (SCHEME_P_ const char *name)
1066{ 1097{
1067 pointer x = mk_string (SCHEME_A_ name); 1098 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x); 1099 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM); 1100 set_typeflag (x, T_SYMBOL | T_ATOM);
… …
1075#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1076 1107
1077static int 1108static int
1078hash_fn (const char *key, int table_size) 1109hash_fn (const char *key, int table_size)
1079{ 1110{
1080 const unsigned char *p = key; 1111 const unsigned char *p = (unsigned char *)key;
1081 uint32_t hash = 2166136261; 1112 uint32_t hash = 2166136261U;
1082 1113
1083 while (*p) 1114 while (*p)
1084 hash = (hash ^ *p++) * 16777619; 1115 hash = (hash ^ *p++) * 16777619;
1085 1116
1086 return hash % table_size; 1117 return hash % table_size;
1087} 1118}
1088 1119
1089static pointer 1120ecb_cold static pointer
1090oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1091{ 1122{
1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1093} 1124}
1094 1125
1095/* returns the new symbol */ 1126/* returns the new symbol */
1096static pointer 1127ecb_cold static pointer
1097oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1098{ 1129{
1099 pointer x = generate_symbol (SCHEME_A_ name); 1130 pointer x = generate_symbol (SCHEME_A_ name);
1100 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1102 return x; 1133 return x;
1103} 1134}
1104 1135
1105ecb_inline pointer 1136ecb_cold static pointer
1106oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1107{ 1138{
1108 int location; 1139 int location;
1109 pointer x; 1140 pointer x;
1110 char *s; 1141 char *s;
… …
1121 } 1152 }
1122 1153
1123 return NIL; 1154 return NIL;
1124} 1155}
1125 1156
1126static pointer 1157ecb_cold static pointer
1127oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1128{ 1159{
1129 int i; 1160 int i;
1130 pointer x; 1161 pointer x;
1131 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
… …
1137 return ob_list; 1168 return ob_list;
1138} 1169}
1139 1170
1140#else 1171#else
1141 1172
1142static pointer 1173ecb_cold static pointer
1143oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1144{ 1175{
1145 return NIL; 1176 return NIL;
1146} 1177}
1147 1178
1148ecb_inline pointer 1179ecb_cold static pointer
1149oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1150{ 1181{
1151 pointer x; 1182 pointer x;
1152 char *s; 1183 char *s;
1153 1184
… …
1162 1193
1163 return NIL; 1194 return NIL;
1164} 1195}
1165 1196
1166/* returns the new symbol */ 1197/* returns the new symbol */
1167static pointer 1198ecb_cold static pointer
1168oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1169{ 1200{
1170 pointer x = generate_symbol (SCHEME_A_ name); 1201 pointer x = generate_symbol (SCHEME_A_ name);
1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1172 return x; 1203 return x;
1173} 1204}
1174 1205
1175static pointer 1206ecb_cold static pointer
1176oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1177{ 1208{
1178 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1179} 1210}
1180 1211
1181#endif 1212#endif
1182 1213
1183#if USE_PORTS
1184static pointer 1214ecb_cold static pointer
1185mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1186{ 1216{
1187 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1188 1218
1189 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1190 set_port (x, p); 1220 set_port (x, p);
1191 1221
1192 return x; 1222 return x;
1193} 1223}
1194#endif
1195 1224
1196pointer 1225ecb_cold pointer
1197mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1198{ 1227{
1199 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1200 1229
1201 set_typeflag (x, T_FOREIGN | T_ATOM); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
… …
1366 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1367 1396
1368 return x; 1397 return x;
1369} 1398}
1370 1399
1371INTERFACE pointer 1400ecb_cold INTERFACE pointer
1372gensym (SCHEME_P) 1401gensym (SCHEME_P)
1373{ 1402{
1374 pointer x; 1403 pointer x;
1375 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1376 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
… …
1383{ 1412{
1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x; 1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1385} 1414}
1386 1415
1387/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1388static pointer 1417ecb_cold static pointer
1389mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1390{ 1419{
1391 char c, *p; 1420 char c, *p;
1392 int has_dec_point = 0; 1421 int has_dec_point = 0;
1393 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1464 1493
1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1466} 1495}
1467 1496
1468/* make constant */ 1497/* make constant */
1469static pointer 1498ecb_cold static pointer
1470mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1471{ 1500{
1472 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1473 return S_T; 1502 return S_T;
1474 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
… …
1529 } 1558 }
1530} 1559}
1531 1560
1532/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1533 1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1581
1534/*-- 1582/*--
1535 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1536 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1537 * for marking. 1585 * for marking.
1538 * 1586 *
1539 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1540 * which is inherited form tinyscheme and could be fixed by having another 1588 * which is inherited form tinyscheme and could be fixed by having another
1541 * word of context in the vector 1589 * word of context in the vector
1542 */ 1590 */
1543static void 1591ecb_hot static void
1544mark (pointer a) 1592mark (pointer a)
1545{ 1593{
1546 pointer t, q, p; 1594 pointer t, q, p;
1547 1595
1548 t = 0; 1596 t = 0;
… …
1605 p = q; 1653 p = q;
1606 goto E6; 1654 goto E6;
1607 } 1655 }
1608} 1656}
1609 1657
1610/* garbage collection. parameter a, b is marked. */ 1658ecb_hot static void
1611static void 1659gc_free (SCHEME_P)
1612gc (SCHEME_P_ pointer a, pointer b)
1613{ 1660{
1614 int i; 1661 int i;
1615
1616 if (SCHEME_V->gc_verbose)
1617 putstr (SCHEME_A_ "gc...");
1618
1619 /* mark system globals */
1620 mark (SCHEME_V->oblist);
1621 mark (SCHEME_V->global_env);
1622
1623 /* mark current registers */
1624 mark (SCHEME_V->args);
1625 mark (SCHEME_V->envir);
1626 mark (SCHEME_V->code);
1627 dump_stack_mark (SCHEME_A);
1628 mark (SCHEME_V->value);
1629 mark (SCHEME_V->inport);
1630 mark (SCHEME_V->save_inport);
1631 mark (SCHEME_V->outport);
1632 mark (SCHEME_V->loadport);
1633
1634 /* Mark recent objects the interpreter doesn't know about yet. */
1635 mark (car (S_SINK));
1636 /* Mark any older stuff above nested C calls */
1637 mark (SCHEME_V->c_nest);
1638
1639#if USE_INTCACHE
1640 /* mark intcache */
1641 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1642 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1643 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1644#endif
1645
1646 /* mark variables a, b */
1647 mark (a);
1648 mark (b);
1649
1650 /* garbage collect */
1651 clrmark (NIL);
1652 SCHEME_V->fcells = 0;
1653 SCHEME_V->free_cell = NIL;
1654
1655 if (SCHEME_V->gc_verbose)
1656 putstr (SCHEME_A_ "freeing...");
1657
1658 uint32_t total = 0; 1662 uint32_t total = 0;
1659 1663
1660 /* Here we scan the cells to build the free-list. */ 1664 /* Here we scan the cells to build the free-list. */
1661 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1662 { 1666 {
… …
1691 { 1695 {
1692 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"); 1696 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");
1693 } 1697 }
1694} 1698}
1695 1699
1696static void 1700/* garbage collection. parameter a, b is marked. */
1697finalize_cell (SCHEME_P_ pointer a) 1701ecb_cold static void
1702gc (SCHEME_P_ pointer a, pointer b)
1698{ 1703{
1699 /* TODO, fast bitmap check? */ 1704 int i;
1700 if (is_string (a) || is_symbol (a))
1701 free (strvalue (a));
1702 else if (is_vector (a))
1703 free (vecvalue (a));
1704#if USE_PORTS
1705 else if (is_port (a))
1706 {
1707 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1708 port_close (SCHEME_A_ a, port_input | port_output);
1709 1705
1710 free (port (a)); 1706 if (SCHEME_V->gc_verbose)
1711 } 1707 putstr (SCHEME_A_ "gc...");
1708
1709 /* mark system globals */
1710 mark (SCHEME_V->oblist);
1711 mark (SCHEME_V->global_env);
1712
1713 /* mark current registers */
1714 mark (SCHEME_V->args);
1715 mark (SCHEME_V->envir);
1716 mark (SCHEME_V->code);
1717 dump_stack_mark (SCHEME_A);
1718 mark (SCHEME_V->value);
1719 mark (SCHEME_V->inport);
1720 mark (SCHEME_V->save_inport);
1721 mark (SCHEME_V->outport);
1722 mark (SCHEME_V->loadport);
1723
1724 /* Mark recent objects the interpreter doesn't know about yet. */
1725 mark (car (S_SINK));
1726 /* Mark any older stuff above nested C calls */
1727 mark (SCHEME_V->c_nest);
1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1712#endif 1734#endif
1735
1736 /* mark variables a, b */
1737 mark (a);
1738 mark (b);
1739
1740 /* garbage collect */
1741 clrmark (NIL);
1742 SCHEME_V->fcells = 0;
1743 SCHEME_V->free_cell = NIL;
1744
1745 if (SCHEME_V->gc_verbose)
1746 putstr (SCHEME_A_ "freeing...");
1747
1748 gc_free (SCHEME_A);
1713} 1749}
1714 1750
1715/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1716 1752
1717static int 1753ecb_cold static int
1718file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1719{ 1755{
1720#if USE_PORTS
1721 int fin; 1756 int fin;
1722 1757
1723 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1724 return 0; 1759 return 0;
1725 1760
… …
1742 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1743#endif 1778#endif
1744 } 1779 }
1745 1780
1746 return fin >= 0; 1781 return fin >= 0;
1747
1748#else
1749 return 1;
1750#endif
1751} 1782}
1752 1783
1753static void 1784ecb_cold static void
1754file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1755{ 1786{
1756 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1757 { 1788 {
1758 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
… …
1762 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i); 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1764 } 1795 }
1765} 1796}
1766 1797
1767static int 1798ecb_cold static int
1768file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1769{ 1800{
1770#if USE_PORTS 1801#if USE_PORTS
1771 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1772 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
… …
1775 return 0; 1806 return 0;
1776#endif 1807#endif
1777} 1808}
1778 1809
1779#if USE_PORTS 1810#if USE_PORTS
1780static port * 1811ecb_cold static port *
1781port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1782{ 1813{
1783 int fd; 1814 int fd;
1784 int flags; 1815 int flags;
1785 char *rw; 1816 char *rw;
… …
1808# endif 1839# endif
1809 1840
1810 return pt; 1841 return pt;
1811} 1842}
1812 1843
1813static pointer 1844ecb_cold static pointer
1814port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1815{ 1846{
1816 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1817 1848
1818 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1819 return NIL; 1850 return NIL;
1820 1851
1821 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1822} 1853}
1823 1854
1824static port * 1855ecb_cold static port *
1825port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1826{ 1857{
1827 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1828 1859
1829 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1834 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1835 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1836 return pt; 1867 return pt;
1837} 1868}
1838 1869
1839static pointer 1870ecb_cold static pointer
1840port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1841{ 1872{
1842 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1843 1874
1844 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1845 return NIL; 1876 return NIL;
1846 1877
1847 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1848} 1879}
1849 1880
1850static port * 1881ecb_cold static port *
1851port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1852{ 1883{
1853 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1854 1885
1855 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1861 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1862 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1863 return pt; 1894 return pt;
1864} 1895}
1865 1896
1866static pointer 1897ecb_cold static pointer
1867port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1868{ 1899{
1869 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1870 1901
1871 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1874 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1875} 1906}
1876 1907
1877# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1878 1909
1879static port * 1910ecb_cold static port *
1880port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1881{ 1912{
1882 char *start; 1913 char *start;
1883 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1884 1915
… …
1898 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1899 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1900 return pt; 1931 return pt;
1901} 1932}
1902 1933
1903static pointer 1934ecb_cold static pointer
1904port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1905{ 1936{
1906 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1907 1938
1908 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1909 return NIL; 1940 return NIL;
1910 1941
1911 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1912} 1943}
1913 1944
1914static void 1945ecb_cold static void
1915port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1916{ 1947{
1917 port *pt = port (p); 1948 port *pt = port (p);
1918 1949
1919 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
… …
1939 } 1970 }
1940} 1971}
1941#endif 1972#endif
1942 1973
1943/* get new character from input file */ 1974/* get new character from input file */
1944static int 1975ecb_cold static int
1945inchar (SCHEME_P) 1976inchar (SCHEME_P)
1946{ 1977{
1947 int c; 1978 int c;
1948 port *pt = port (SCHEME_V->inport); 1979 port *pt = port (SCHEME_V->inport);
1949 1980
… …
1963 } 1994 }
1964 1995
1965 return c; 1996 return c;
1966} 1997}
1967 1998
1968static int ungot = -1; 1999ecb_cold static int
1969
1970static int
1971basic_inchar (port *pt) 2000basic_inchar (port *pt)
1972{ 2001{
1973#if USE_PORTS
1974 if (pt->unget != -1) 2002 if (pt->unget != -1)
1975 { 2003 {
1976 int r = pt->unget; 2004 int r = pt->unget;
1977 pt->unget = -1; 2005 pt->unget = -1;
1978 return r; 2006 return r;
1979 } 2007 }
1980 2008
2009#if USE_PORTS
1981 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1982 { 2011 {
1983 char c; 2012 char c;
1984 2013
1985 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1993 return EOF; 2022 return EOF;
1994 else 2023 else
1995 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1996 } 2025 }
1997#else 2026#else
1998 if (ungot == -1)
1999 {
2000 char c; 2027 char c;
2001 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
2002 return EOF; 2030 return EOF;
2003 2031
2004 ungot = c;
2005 }
2006
2007 {
2008 int r = ungot;
2009 ungot = -1;
2010 return r; 2032 return c;
2011 }
2012#endif 2033#endif
2013} 2034}
2014 2035
2015/* back character to input buffer */ 2036/* back character to input buffer */
2016static void 2037ecb_cold static void
2017backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2018{ 2039{
2019#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2020 port *pt;
2021 2041
2022 if (c == EOF) 2042 if (c == EOF)
2023 return; 2043 return;
2024 2044
2025 pt = port (SCHEME_V->inport);
2026 pt->unget = c; 2045 pt->unget = c;
2027#else
2028 if (c == EOF)
2029 return;
2030
2031 ungot = c;
2032#endif
2033} 2046}
2034 2047
2035#if USE_PORTS 2048#if USE_PORTS
2036static int 2049ecb_cold static int
2037realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2038{ 2051{
2039 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2040 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2041 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2054 else 2067 else
2055 return 0; 2068 return 0;
2056} 2069}
2057#endif 2070#endif
2058 2071
2059INTERFACE void 2072ecb_cold static void
2060putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2061{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2062#if USE_PORTS 2077#if USE_PORTS
2063 port *pt = port (SCHEME_V->outport);
2064
2065 if (pt->kind & port_file)
2066 write (pt->rep.stdio.file, s, strlen (s));
2067 else
2068 for (; *s; s++)
2069 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2070 *pt->rep.string.curr++ = *s;
2071 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2072 *pt->rep.string.curr++ = *s;
2073
2074#else
2075 write (pt->rep.stdio.file, s, strlen (s));
2076#endif
2077}
2078
2079static void
2080putchars (SCHEME_P_ const char *s, int len)
2081{
2082#if USE_PORTS
2083 port *pt = port (SCHEME_V->outport);
2084
2085 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2086 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2087 else 2080 else
2088 { 2081 {
2089 for (; len; len--) 2082 for (; len; len--)
… …
2094 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2095 } 2088 }
2096 } 2089 }
2097 2090
2098#else 2091#else
2099 write (1, s, len); 2092 write (1, s, len); // output not initialised
2100#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2101} 2100}
2102 2101
2103INTERFACE void 2102INTERFACE void
2104putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2105{ 2104{
2106#if USE_PORTS
2107 port *pt = port (SCHEME_V->outport);
2108
2109 if (pt->kind & port_file)
2110 {
2111 char cc = c;
2112 write (pt->rep.stdio.file, &cc, 1);
2113 }
2114 else
2115 {
2116 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2117 *pt->rep.string.curr++ = c;
2118 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2119 *pt->rep.string.curr++ = c;
2120 }
2121
2122#else
2123 char cc = c; 2105 char cc = c;
2124 write (1, &c, 1); 2106
2125#endif 2107 putchars (SCHEME_A_ &cc, 1);
2126} 2108}
2127 2109
2128/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2129static char * 2111ecb_cold static char *
2130readstr_upto (SCHEME_P_ int skip, const char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2131{ 2113{
2132 char *p = SCHEME_V->strbuff + skip; 2114 char *p = SCHEME_V->strbuff + skip;
2133 2115
2134 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2143 2125
2144 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2145} 2127}
2146 2128
2147/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2148static pointer 2130ecb_cold static pointer
2149readstrexp (SCHEME_P_ char delim) 2131readstrexp (SCHEME_P_ char delim)
2150{ 2132{
2151 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2152 int c; 2134 int c;
2153 int c1 = 0; 2135 int c1 = 0;
… …
2191 case 'a': *p++ = '\a'; state = st_ok; break; 2173 case 'a': *p++ = '\a'; state = st_ok; break;
2192 case 'n': *p++ = '\n'; state = st_ok; break; 2174 case 'n': *p++ = '\n'; state = st_ok; break;
2193 case 'r': *p++ = '\r'; state = st_ok; break; 2175 case 'r': *p++ = '\r'; state = st_ok; break;
2194 case 't': *p++ = '\t'; state = st_ok; break; 2176 case 't': *p++ = '\t'; state = st_ok; break;
2195 2177
2196 //TODO: \whitespace eol whitespace 2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2197 2186
2198 //TODO: x should end in ;, not two-digit hex 2187 //TODO: x should end in ;, not two-digit hex
2199 case 'x': 2188 case 'x':
2200 case 'X': 2189 case 'X':
2201 state = st_x1; 2190 state = st_x1;
… …
2259 } 2248 }
2260 } 2249 }
2261} 2250}
2262 2251
2263/* check c is in chars */ 2252/* check c is in chars */
2264ecb_inline int 2253ecb_cold int
2265is_one_of (const char *s, int c) 2254is_one_of (const char *s, int c)
2266{ 2255{
2267 return c == EOF || !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2268} 2257}
2269 2258
2270/* skip white characters */ 2259/* skip white characters */
2271ecb_inline int 2260ecb_cold int
2272skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2273{ 2262{
2274 int c, curr_line = 0; 2263 int c, curr_line = 0;
2275 2264
2276 do 2265 do
… …
2296 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2297 return 1; 2286 return 1;
2298} 2287}
2299 2288
2300/* get token */ 2289/* get token */
2301static int 2290ecb_cold static int
2302token (SCHEME_P) 2291token (SCHEME_P)
2303{ 2292{
2304 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2305 2294
2306 if (c == EOF) 2295 if (c == EOF)
… …
2404} 2393}
2405 2394
2406/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2407#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2408 2397
2409static void 2398ecb_cold static void
2410printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2411{ 2400{
2412 int i; 2401 int i;
2413 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2414 2403
… …
2470 2459
2471 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2472} 2461}
2473 2462
2474/* print atoms */ 2463/* print atoms */
2475static void 2464ecb_cold static void
2476printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2477{ 2466{
2478 char *p; 2467 char *p;
2479 int len; 2468 int len;
2480 2469
2481 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2482 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2483} 2472}
2484 2473
2485/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2486static void 2475ecb_cold static void
2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2488{ 2477{
2489 char *p; 2478 char *p;
2490 2479
2491 if (l == NIL) 2480 if (l == NIL)
… …
2698 return car (d); 2687 return car (d);
2699 2688
2700 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2701 q = p; 2690 q = p;
2702 2691
2703 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2704 { 2693 {
2705 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2706 2695
2707 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2708 p = cdr (d); 2697 p = cdr (d);
2709 } 2698 }
2710 2699
2711 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2712 return q; 2701 return q;
2713} 2702}
2714 2703
2715/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2716static pointer 2705ecb_hot static pointer
2717reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2718{ 2707{
2719 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2720 pointer p = NIL; 2709 pointer p = NIL;
2721 2710
… …
2724 2713
2725 return p; 2714 return p;
2726} 2715}
2727 2716
2728/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2729static pointer 2718ecb_hot static pointer
2730reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2731{ 2720{
2732 pointer result = term; 2721 pointer result = term;
2733 pointer p = list; 2722 pointer p = list;
2734 2723
… …
2742 2731
2743 return result; 2732 return result;
2744} 2733}
2745 2734
2746/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2747static pointer 2736ecb_hot static pointer
2748revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2749{ 2738{
2750 pointer result = a; 2739 pointer result = a;
2751 pointer p = b; 2740 pointer p = b;
2752 2741
… …
2761 2750
2762 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2763} 2752}
2764 2753
2765/* equivalence of atoms */ 2754/* equivalence of atoms */
2766int 2755ecb_hot int
2767eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2768{ 2757{
2769 if (is_string (a)) 2758 if (is_string (a))
2770 { 2759 {
2771 if (is_string (b)) 2760 if (is_string (b))
… …
2865 } 2854 }
2866 else 2855 else
2867 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2868} 2857}
2869 2858
2870static pointer 2859ecb_hot static pointer
2871find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2872{ 2861{
2873 pointer x, y; 2862 pointer x, y;
2874 2863
2875 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
… …
2896 return NIL; 2885 return NIL;
2897} 2886}
2898 2887
2899#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2900 2889
2901ecb_inline void 2890static void
2902new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2903{ 2892{
2904 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2905 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2906} 2895}
2907 2896
2908ecb_inline void 2897static void
2909new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2898new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2910{ 2899{
2911 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2912} 2901}
2913 2902
2914static pointer 2903ecb_hot static pointer
2915find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2916{ 2905{
2917 pointer x, y; 2906 pointer x, y;
2918 2907
2919 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2933 return NIL; 2922 return NIL;
2934} 2923}
2935 2924
2936#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2937 2926
2938ecb_inline void 2927static void
2939new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2940{ 2929{
2941 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2942 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2931 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2943} 2932}
2944 2933
2945ecb_inline void 2934static void
2946set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2947{ 2936{
2948 set_cdr (slot, value); 2937 set_cdr (slot, value);
2949} 2938}
2950 2939
2951ecb_inline pointer 2940static pointer
2952slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2953{ 2942{
2954 return cdr (slot); 2943 return cdr (slot);
2955} 2944}
2956 2945
2957/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
2958 2947
2959static int 2948ecb_cold static int
2960xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
2961{ 2950{
2962#if USE_ERROR_HOOK
2963 pointer x;
2964 pointer hdl = SCHEME_V->ERROR_HOOK;
2965#endif
2966
2967#if USE_PRINTF 2951#if USE_PRINTF
2968#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
2969 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
2970 2954
2971 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
2986 } 2970 }
2987#endif 2971#endif
2988#endif 2972#endif
2989 2973
2990#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
2991 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2975 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2992 2976
2993 if (x != NIL) 2977 if (x != NIL)
2994 { 2978 {
2995 pointer code = a 2979 pointer code = a
2996 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3040 pointer code; 3024 pointer code;
3041}; 3025};
3042 3026
3043# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3044 3028
3045static void 3029ecb_hot static void
3046s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3047{ 3031{
3048 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3049 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3050 3034
… …
3063 next_frame->code = code; 3047 next_frame->code = code;
3064 3048
3065 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3066} 3050}
3067 3051
3068static int 3052static ecb_hot int
3069xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3070{ 3054{
3071 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3072 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3073 3057
… …
3084 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3085 3069
3086 return 0; 3070 return 0;
3087} 3071}
3088 3072
3089ecb_inline void 3073ecb_cold void
3090dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3091{ 3075{
3092 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3076 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3093 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3094} 3078}
3095 3079
3096ecb_inline void 3080ecb_cold void
3097dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3098{ 3082{
3099 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3100 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3101 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3102} 3086}
3103 3087
3104static void 3088ecb_cold static void
3105dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3106{ 3090{
3107 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3108 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3109 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3110 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3111} 3095}
3112 3096
3113static void 3097ecb_cold static void
3114dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3115{ 3099{
3116 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3117 int i; 3101 int i;
3118 3102
… …
3124 mark (frame->envir); 3108 mark (frame->envir);
3125 mark (frame->code); 3109 mark (frame->code);
3126 } 3110 }
3127} 3111}
3128 3112
3129static pointer 3113ecb_cold static pointer
3130ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3131{ 3115{
3132 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3133 int i; 3117 int i;
3134 3118
… …
3146 } 3130 }
3147 3131
3148 return cont; 3132 return cont;
3149} 3133}
3150 3134
3151static void 3135ecb_cold static void
3152ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3153{ 3137{
3154 int i = 0; 3138 int i = 0;
3155 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3156 3140
… …
3168 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3169} 3153}
3170 3154
3171#else 3155#else
3172 3156
3173ecb_inline void 3157ecb_cold void
3174dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3175{ 3159{
3176 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3177} 3161}
3178 3162
3179ecb_inline void 3163ecb_cold void
3180dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3181{ 3165{
3182 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3183} 3167}
3184 3168
3185static void 3169ecb_cold static void
3186dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3187{ 3171{
3188 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3189} 3173}
3190 3174
3191static int 3175ecb_hot static int
3192xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3193{ 3177{
3194 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3195 3179
3196 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3206 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3207 3191
3208 return 0; 3192 return 0;
3209} 3193}
3210 3194
3211static void 3195ecb_hot static void
3212s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3213{ 3197{
3214 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3215 cons (args, 3199 cons (args,
3216 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3217 cons (code, 3201 cons (code,
3218 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3219} 3203}
3220 3204
3221static void 3205ecb_cold static void
3222dump_stack_mark (SCHEME_P) 3206dump_stack_mark (SCHEME_P)
3223{ 3207{
3224 mark (SCHEME_V->dump); 3208 mark (SCHEME_V->dump);
3225} 3209}
3226 3210
3227static pointer 3211ecb_cold static pointer
3228ss_get_cont (SCHEME_P) 3212ss_get_cont (SCHEME_P)
3229{ 3213{
3230 return SCHEME_V->dump; 3214 return SCHEME_V->dump;
3231} 3215}
3232 3216
3233static void 3217ecb_cold static void
3234ss_set_cont (SCHEME_P_ pointer cont) 3218ss_set_cont (SCHEME_P_ pointer cont)
3235{ 3219{
3236 SCHEME_V->dump = cont; 3220 SCHEME_V->dump = cont;
3237} 3221}
3238 3222
3239#endif 3223#endif
3240 3224
3241#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3225#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3242 3226
3243#if EXPERIMENT 3227#if EXPERIMENT
3228
3244static int 3229static int
3245debug (SCHEME_P_ int indent, pointer x) 3230dtree (SCHEME_P_ int indent, pointer x)
3246{ 3231{
3247 int c; 3232 int c;
3248 3233
3249 if (is_syntax (x)) 3234 if (is_syntax (x))
3250 { 3235 {
… …
3268 printf ("%*sS<%s>\n", indent, "", symname (x)); 3253 printf ("%*sS<%s>\n", indent, "", symname (x));
3269 return 24+8; 3254 return 24+8;
3270 3255
3271 case T_CLOSURE: 3256 case T_CLOSURE:
3272 printf ("%*sS<%s>\n", indent, "", "closure"); 3257 printf ("%*sS<%s>\n", indent, "", "closure");
3273 debug (SCHEME_A_ indent + 3, cdr(x)); 3258 dtree (SCHEME_A_ indent + 3, cdr(x));
3274 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3259 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3275 3260
3276 case T_PAIR: 3261 case T_PAIR:
3277 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3262 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3278 c = debug (SCHEME_A_ indent + 3, car (x)); 3263 c = dtree (SCHEME_A_ indent + 3, car (x));
3279 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3264 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3280 return c + 1; 3265 return c + 1;
3281 3266
3282 case T_PORT: 3267 case T_PORT:
3283 printf ("%*sS<%s>\n", indent, "", "port"); 3268 printf ("%*sS<%s>\n", indent, "", "port");
3284 return 24+8; 3269 return 24+8;
… …
3287 printf ("%*sS<%s>\n", indent, "", "vector"); 3272 printf ("%*sS<%s>\n", indent, "", "vector");
3288 return 24+8; 3273 return 24+8;
3289 3274
3290 case T_ENVIRONMENT: 3275 case T_ENVIRONMENT:
3291 printf ("%*sS<%s>\n", indent, "", "environment"); 3276 printf ("%*sS<%s>\n", indent, "", "environment");
3292 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3277 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3293 3278
3294 default: 3279 default:
3295 printf ("unhandled type %d\n", type (x)); 3280 printf ("unhandled type %d\n", type (x));
3296 break; 3281 break;
3297 } 3282 }
3298} 3283}
3299#endif
3300 3284
3285#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3286
3287typedef void *stream[1];
3288
3289#define stream_init() { 0 }
3290#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3291#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3292#define stream_free(s) free (s[0])
3293
3294ecb_cold static void
3295stream_put (stream s, uint8_t byte)
3296{
3297 uint32_t *sp = *s;
3298 uint32_t size = sizeof (uint32_t) * 2;
3299 uint32_t offs = size;
3300
3301 if (ecb_expect_true (sp))
3302 {
3303 offs = sp[0];
3304 size = sp[1];
3305 }
3306
3307 if (ecb_expect_false (offs == size))
3308 {
3309 size *= 2;
3310 sp = realloc (sp, size);
3311 *s = sp;
3312 sp[1] = size;
3313
3314 }
3315
3316 ((uint8_t *)sp)[offs++] = byte;
3317 sp[0] = offs;
3318}
3319
3320ecb_cold static void
3321stream_put_v (stream s, uint32_t v)
3322{
3323 while (v > 0x7f)
3324 {
3325 stream_put (s, v | 0x80);
3326 v >>= 7;
3327 }
3328
3329 stream_put (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_tv (stream s, int bop, uint32_t v)
3334{
3335 printf ("put tv %d %d\n", bop, v);//D
3336 stream_put (s, bop);
3337 stream_put_v (s, v);
3338}
3339
3340ecb_cold static void
3341stream_put_stream (stream s, stream o)
3342{
3343 uint32_t i;
3344
3345 for (i = 0; i < stream_size (o); ++i)
3346 stream_put (s, stream_data (o)[i]);
3347
3348 stream_free (o);
3349}
3350
3351ecb_cold static uint32_t
3352cell_id (SCHEME_P_ pointer x)
3353{
3354 struct cell *p = CELL (x);
3355 int i;
3356
3357 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3358 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3359 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3360
3361 abort ();
3362}
3363
3364// calculates a (preferably small) integer that makes it possible to find
3365// the symbol again. if pointers were offsets into a memory area... until
3366// then, we return segment number in the low bits, and offset in the high
3367// bits.
3368// also, this function must never return 0.
3369ecb_cold static uint32_t
3370symbol_id (SCHEME_P_ pointer sym)
3371{
3372 return cell_id (SCHEME_A_ sym);
3373}
3374
3375enum byteop
3376{
3377 BOP_NIL,
3378 BOP_INTEGER,
3379 BOP_SYMBOL,
3380 BOP_DATUM,
3381 BOP_LIST_BEG,
3382 BOP_LIST_END,
3383 BOP_IF,
3384 BOP_AND,
3385 BOP_OR,
3386 BOP_CASE,
3387 BOP_COND,
3388 BOP_LET,
3389 BOP_LETAST,
3390 BOP_LETREC,
3391 BOP_DEFINE,
3392 BOP_MACRO,
3393 BOP_SET,
3394 BOP_BEGIN,
3395 BOP_LAMBDA,
3396 BOP_OP,
3397};
3398
3399ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3400
3401ecb_cold static void
3402compile_list (SCHEME_P_ stream s, pointer x)
3403{
3404 // TODO: improper list
3405
3406 for (; x != NIL; x = cdr (x))
3407 {
3408 stream t = stream_init ();
3409 compile_expr (SCHEME_A_ t, car (x));
3410 stream_put_v (s, stream_size (t));
3411 stream_put_stream (s, t);
3412 }
3413
3414 stream_put_v (s, 0);
3415}
3416
3417static void
3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3419{
3420 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3421
3422 stream_put (s, BOP_IF);
3423 compile_expr (SCHEME_A_ s, cond);
3424 stream_put_v (s, stream_size (sift));
3425 stream_put_stream (s, sift);
3426 compile_expr (SCHEME_A_ s, iff);
3427}
3428
3429typedef uint32_t stream_fixup;
3430
3431static stream_fixup
3432stream_put_fixup (stream s)
3433{
3434 stream_put (s, 0);
3435 stream_put (s, 0);
3436
3437 return stream_size (s);
3438}
3439
3440static void
3441stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3442{
3443 target -= fixup;
3444 assert (target < (1 << 14));
3445 stream_data (s)[fixup - 2] = target | 0x80;
3446 stream_data (s)[fixup - 1] = target >> 7;
3447}
3448
3449static void
3450compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3451{
3452 for (; cdr (x) != NIL; x = cdr (x))
3453 {
3454 stream t = stream_init ();
3455 compile_expr (SCHEME_A_ t, car (x));
3456 stream_put_v (s, stream_size (t));
3457 stream_put_stream (s, t);
3458 }
3459
3460 stream_put_v (s, 0);
3461}
3462
3463static void
3464compile_case (SCHEME_P_ stream s, pointer x)
3465{
3466 compile_expr (SCHEME_A_ s, caar (x));
3467
3468 for (;;)
3469 {
3470 x = cdr (x);
3471
3472 if (x == NIL)
3473 break;
3474
3475 compile_expr (SCHEME_A_ s, caar (x));
3476 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3477 stream_put_v (s, stream_size (t));
3478 stream_put_stream (s, t);
3479 }
3480
3481 stream_put_v (s, 0);
3482}
3483
3484static void
3485compile_cond (SCHEME_P_ stream s, pointer x)
3486{
3487 for ( ; x != NIL; x = cdr (x))
3488 {
3489 compile_expr (SCHEME_A_ s, caar (x));
3490 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3491 stream_put_v (s, stream_size (t));
3492 stream_put_stream (s, t);
3493 }
3494
3495 stream_put_v (s, 0);
3496}
3497
3301static int 3498static pointer
3499lookup (SCHEME_P_ pointer x)
3500{
3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3502
3503 if (x != NIL)
3504 x = slot_value_in_env (x);
3505
3506 return x;
3507}
3508
3509ecb_cold static void
3510compile_expr (SCHEME_P_ stream s, pointer x)
3511{
3512 if (x == NIL)
3513 {
3514 stream_put (s, BOP_NIL);
3515 return;
3516 }
3517
3518 if (is_pair (x))
3519 {
3520 pointer head = car (x);
3521
3522 if (is_syntax (head))
3523 {
3524 x = cdr (x);
3525
3526 switch (syntaxnum (head))
3527 {
3528 case OP_IF0: /* if */
3529 stream_put_v (s, BOP_IF);
3530 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3531 break;
3532
3533 case OP_OR0: /* or */
3534 stream_put_v (s, BOP_OR);
3535 compile_and_or (SCHEME_A_ s, 0, x);
3536 break;
3537
3538 case OP_AND0: /* and */
3539 stream_put_v (s, BOP_AND);
3540 compile_and_or (SCHEME_A_ s, 1, x);
3541 break;
3542
3543 case OP_CASE0: /* case */
3544 stream_put_v (s, BOP_CASE);
3545 compile_case (SCHEME_A_ s, x);
3546 break;
3547
3548 case OP_COND0: /* cond */
3549 stream_put_v (s, BOP_COND);
3550 compile_cond (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_LET0: /* let */
3554 case OP_LET0AST: /* let* */
3555 case OP_LET0REC: /* letrec */
3556 switch (syntaxnum (head))
3557 {
3558 case OP_LET0: stream_put (s, BOP_LET ); break;
3559 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3560 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3561 }
3562
3563 {
3564 pointer bindings = car (x);
3565 pointer body = cadr (x);
3566
3567 for (x = bindings; x != NIL; x = cdr (x))
3568 {
3569 pointer init = NIL;
3570 pointer var = car (x);
3571
3572 if (is_pair (var))
3573 {
3574 init = cdr (var);
3575 var = car (var);
3576 }
3577
3578 stream_put_v (s, symbol_id (SCHEME_A_ var));
3579 compile_expr (SCHEME_A_ s, init);
3580 }
3581
3582 stream_put_v (s, 0);
3583 compile_expr (SCHEME_A_ s, body);
3584 }
3585 break;
3586
3587 case OP_DEF0: /* define */
3588 case OP_MACRO0: /* macro */
3589 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3590 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3591 compile_expr (SCHEME_A_ s, cadr (x));
3592 break;
3593
3594 case OP_SET0: /* set! */
3595 stream_put (s, BOP_SET);
3596 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3597 compile_expr (SCHEME_A_ s, cadr (x));
3598 break;
3599
3600 case OP_BEGIN: /* begin */
3601 stream_put (s, BOP_BEGIN);
3602 compile_list (SCHEME_A_ s, x);
3603 return;
3604
3605 case OP_DELAY: /* delay */
3606 abort ();
3607 break;
3608
3609 case OP_QUOTE: /* quote */
3610 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3611 break;
3612
3613 case OP_LAMBDA: /* lambda */
3614 {
3615 pointer formals = car (x);
3616 pointer body = cadr (x);
3617
3618 stream_put (s, BOP_LAMBDA);
3619
3620 for (; is_pair (formals); formals = cdr (formals))
3621 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3622
3623 stream_put_v (s, 0);
3624 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3625
3626 compile_expr (SCHEME_A_ s, body);
3627 }
3628 break;
3629
3630 case OP_C0STREAM:/* cons-stream */
3631 abort ();
3632 break;
3633 }
3634
3635 return;
3636 }
3637
3638 pointer m = lookup (SCHEME_A_ head);
3639
3640 if (is_macro (m))
3641 {
3642 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3643 SCHEME_V->code = m;
3644 SCHEME_V->args = cons (x, NIL);
3645 Eval_Cycle (SCHEME_A_ OP_APPLY);
3646 x = SCHEME_V->value;
3647 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3648 return;
3649 }
3650
3651 stream_put (s, BOP_LIST_BEG);
3652
3653 for (; x != NIL; x = cdr (x))
3654 compile_expr (SCHEME_A_ s, car (x));
3655
3656 stream_put (s, BOP_LIST_END);
3657 return;
3658 }
3659
3660 switch (type (x))
3661 {
3662 case T_INTEGER:
3663 {
3664 IVALUE iv = ivalue_unchecked (x);
3665 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3666 stream_put_tv (s, BOP_INTEGER, iv);
3667 }
3668 return;
3669
3670 case T_SYMBOL:
3671 if (0)
3672 {
3673 // no can do without more analysis
3674 pointer m = lookup (SCHEME_A_ x);
3675
3676 if (is_proc (m))
3677 {
3678 printf ("compile proc %s %d\n", procname(m), procnum(m));
3679 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3680 }
3681 else
3682 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3683 }
3684
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 return;
3687
3688 default:
3689 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3690 break;
3691 }
3692}
3693
3694ecb_cold static int
3695compile_closure (SCHEME_P_ pointer p)
3696{
3697 stream s = stream_init ();
3698
3699 compile_list (SCHEME_A_ s, cdar (p));
3700
3701 FILE *xxd = popen ("xxd", "we");
3702 fwrite (stream_data (s), 1, stream_size (s), xxd);
3703 fclose (xxd);
3704
3705 return stream_size (s);
3706}
3707
3708#endif
3709
3710/* syntax, eval, core, ... */
3711ecb_hot static int
3302opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3303{ 3713{
3304 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3305 pointer x, y; 3715 pointer x, y;
3306 3716
3307 switch (op) 3717 switch (op)
3308 { 3718 {
3309#if EXPERIMENT //D 3719#if EXPERIMENT //D
3310 case OP_DEBUG: 3720 case OP_DEBUG:
3311 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3721 {
3722 uint32_t len = compile_closure (SCHEME_A_ car (args));
3723 printf ("len = %d\n", len);
3312 printf ("\n"); 3724 printf ("\n");
3313 s_return (S_T); 3725 s_return (S_T);
3726 }
3727
3728 case OP_DEBUG2:
3729 return -1;
3314#endif 3730#endif
3731
3315 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3316 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3317 { 3734 {
3318 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n"); 3735 putstr (SCHEME_A_ "Loading ");
3319 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3736 putstr (SCHEME_A_ strvalue (car (args)));
3737 putcharacter (SCHEME_A_ '\n');
3320 } 3738 }
3321 3739
3322 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3323 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3324 else 3742
3325 {
3326 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3327 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3328 }
3329 3745
3330 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3331 3747
3332 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3333 if (port (SCHEME_V->loadport)->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
… …
3349 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3350 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3351 { 3767 {
3352 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3353 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3354 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3355 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3356 } 3775 }
3357 3776
3358 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3359 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3394 { 3813 {
3395 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3396 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3397 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3398 } 3817 }
3399 else 3818
3400 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3401 3820
3402 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3403#if USE_TRACING 3822#if USE_TRACING
3404 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3405 { 3824 {
… …
3438 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3857 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3439 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3440 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3441 } 3860 }
3442 } 3861 }
3443 else 3862
3444 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3445 3864
3446 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3447 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3448 { 3867 {
3449 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3450 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3451 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3452 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3453 } 3872 }
3454 else 3873
3455 {
3456 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3457 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3458 }
3459 3876
3460 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3461 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3462 3879
3463 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3474 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3475 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3476 } 3893 }
3477 3894
3478#if USE_TRACING 3895#if USE_TRACING
3479
3480 case OP_TRACING: 3896 case OP_TRACING:
3481 { 3897 {
3482 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3483 3899
3484 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3485 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3486 } 3902 }
3487
3488#endif 3903#endif
3489 3904
3490 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3491#if USE_TRACING 3906#if USE_TRACING
3492 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3546 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3547 { 3962 {
3548 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3549 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3550 } 3965 }
3551 else 3966
3552 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3553 3968
3554 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3555 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3556 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3557 3972
… …
3621 else 4036 else
3622 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4037 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3623 4038
3624 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3625 4040
3626
3627 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3629 4043
3630 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3631 x = cadr (args); 4045 x = cadr (args);
… …
3649 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3650 } 4064 }
3651 else 4065 else
3652 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3653 4067
3654
3655 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3656 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3657 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3658 4071
3659 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3670 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3673 else 4086 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4087 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4088
3675 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3676 4090
3677 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3678 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3679 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3680 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4094 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3681 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3682 4096
3683 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3684 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3685 4100
3686 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3687 { 4102 {
3688 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4103 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3689 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4104 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3690 4105
3691 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3692 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3693 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3694 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3695 } 4110 }
3696 else /* end */ 4111
3697 { 4112 /* end */
3698 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3699 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3700 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3701 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3702 }
3703 4117
3704 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3705 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3706 4120
3707 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4121 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3711 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3712 { 4126 {
3713 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4127 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3714 { 4128 {
3715 if (!is_pair (x)) 4129 if (!is_pair (x))
3716 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3717 4131
3718 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3719 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3720 4134
3721 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3722 } 4136 }
3723 4137
3724 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4138 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3741 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3742 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3743 } 4157 }
3744 4158
3745 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4159 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3746 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4160 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3747 4161
3748 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4162 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3749 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3750 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3751 4165
… …
3762 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3763 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3764 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3765 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3766 } 4180 }
3767 else /* end */ 4181
4182 /* end */
3768 { 4183
3769 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3770 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3771 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3772 }
3773 4187
3774 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3775 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3776 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3777 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3778 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3779 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3780 4194
3781 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3782 args = cons (SCHEME_V->value, args);
3783
3784 if (is_pair (SCHEME_V->code)) /* continue */
3785 {
3786 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3787 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3788
3789 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3790 SCHEME_V->code = cadar (SCHEME_V->code);
3791 SCHEME_V->args = NIL;
3792 s_goto (OP_EVAL);
3793 }
3794 else /* end */
3795 {
3796 args = reverse_in_place (SCHEME_A_ NIL, args);
3797 SCHEME_V->code = car (args);
3798 SCHEME_V->args = cdr (args);
3799 s_goto (OP_LET2REC);
3800 }
3801 4196
3802 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3803 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4198 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3804 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3805 4200
… …
3835 } 4230 }
3836 else 4231 else
3837 { 4232 {
3838 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3839 s_return (NIL); 4234 s_return (NIL);
3840 else 4235
3841 {
3842 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3843 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3844 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3845 }
3846 } 4239 }
3847 4240
3848 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3849 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4242 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3850 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3861 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3862 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3863 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3864 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3865 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3866 else 4259
3867 {
3868 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3869 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3870 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3871 }
3872 4263
3873 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3874 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3875 s_return (S_F); 4266 s_return (S_F);
3876 4267
… …
3881 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3882 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3883 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3884 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3885 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3886 else 4277
3887 {
3888 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3889 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3890 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3891 }
3892 4281
3893 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3895 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3896 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3961 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3962 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3963 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3964 } 4353 }
3965 } 4354 }
3966 else 4355
3967 s_return (NIL); 4356 s_return (NIL);
3968 4357
3969 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3970 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3971 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3972 else 4361
3973 s_return (NIL); 4362 s_return (NIL);
3974 4363
3975 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3976 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3977 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3978 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
3992 } 4381 }
3993 4382
3994 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
3995} 4384}
3996 4385
3997static int 4386/* math, cxr */
4387ecb_hot static int
3998opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3999{ 4389{
4000 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
4001 pointer x = car (args); 4391 pointer x = car (args);
4002 num v; 4392 num v;
… …
4483 } 4873 }
4484 4874
4485 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4486} 4876}
4487 4877
4488static int 4878/* relational ops */
4879ecb_hot static int
4489opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4490{ 4881{
4491 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4492 4883
4493 for (;;) 4884 for (;;)
… …
4514 } 4905 }
4515 4906
4516 s_return (S_T); 4907 s_return (S_T);
4517} 4908}
4518 4909
4519static int 4910/* predicates */
4911ecb_hot static int
4520opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4521{ 4913{
4522 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4523 pointer a = car (args); 4915 pointer a = car (args);
4524 pointer d = cdr (args); 4916 pointer d = cdr (args);
… …
4571 } 4963 }
4572 4964
4573 s_retbool (r); 4965 s_retbool (r);
4574} 4966}
4575 4967
4576static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4577opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4578{ 4971{
4579 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4580 pointer a = car (args); 4973 pointer a = car (args);
4581 pointer x, y; 4974 pointer x, y;
… …
4624 else 5017 else
4625 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4626 5019
4627 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4628 5021
5022 //TODO: move to scheme
4629 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4630 if (is_pair (args)) 5024 if (is_pair (args))
4631 { 5025 {
4632 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4633 { 5027 {
… …
4635 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4636 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4637 } 5031 }
4638 } 5032 }
4639 5033
4640 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4641 s_return (S_T); 5035 s_return (S_T);
4642#endif 5036#endif
4643 5037
4644 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4645 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4654 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4655 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4656 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4657 5051
4658 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4659 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4660 5054
4661 if (args != NIL) 5055 if (args != NIL)
4662 { 5056 {
4663 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4664 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4665 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4666 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4667 } 5061 }
4668 else 5062 else
4669 { 5063 {
4670 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4671 5065
4672 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4673 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4674 else 5068 else
4675 return -1; 5069 return -1;
… …
4883 } 5277 }
4884 5278
4885 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4886} 5280}
4887 5281
4888static int 5282/* reading */
5283ecb_cold static int
4889opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4890{ 5285{
4891 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4892 pointer x; 5287 pointer x;
4893 5288
… …
4972 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
4973 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
4974 { 5369 {
4975 case TOK_EOF: 5370 case TOK_EOF:
4976 s_return (S_EOF); 5371 s_return (S_EOF);
4977 /* NOTREACHED */
4978 5372
4979 case TOK_VEC: 5373 case TOK_VEC:
4980 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4981 /* fall through */ 5375 /* fall through */
4982 5376
… …
4985 5379
4986 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
4987 s_return (NIL); 5381 s_return (NIL);
4988 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
4989 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
4990 else 5384
4991 {
4992 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4993 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4994 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
4995 }
4996 5388
4997 case TOK_QUOTE: 5389 case TOK_QUOTE:
4998 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4999 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
5000 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
5006 { 5398 {
5007 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5008 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
5009 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
5010 } 5402 }
5011 else 5403
5012 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5013
5014 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
5015 5406
5016 case TOK_COMMA: 5407 case TOK_COMMA:
5017 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5018 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
5029 case TOK_DOTATOM: 5420 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.'; 5421 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5422 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032 5423
5033 case TOK_STRATOM: 5424 case TOK_STRATOM:
5425 //TODO: haven't checked whether the garbage collector could interfere and free x
5426 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5034 x = readstrexp (SCHEME_A_ '|'); 5427 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5428 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5037 5429
5038 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
5039 x = readstrexp (SCHEME_A_ '"'); 5431 x = readstrexp (SCHEME_A_ '"');
5040 5432
… …
5048 { 5440 {
5049 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5441 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5050 5442
5051 if (f == NIL) 5443 if (f == NIL)
5052 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
5053 else 5445
5054 {
5055 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5056 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
5057 }
5058 } 5448 }
5059 5449
5060 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5451 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5062 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
5063 else 5453
5064 s_return (x); 5454 s_return (x);
5065 5455
5066 default: 5456 default:
5067 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
5068 } 5458 }
5069 5459
… …
5162 pointer b = cdr (args); 5552 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5165 5555
5166 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5167 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5168 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5174 else 5564 else
5175 { 5565 {
5176 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5179 } 5569 }
5180 5570
5181 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5183 5573
5184 case OP_P1LIST: 5574 case OP_P1LIST:
5185 if (is_pair (args)) 5575 if (is_pair (args))
5186 { 5576 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5188 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5189 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5190 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5191 } 5581 }
5192 else if (is_vector (args)) 5582 else if (is_vector (args))
5193 { 5583 {
… …
5201 { 5591 {
5202 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5204 } 5594 }
5205 5595
5206 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5207 s_return (S_T); 5597 s_return (S_T);
5208 } 5598 }
5209 5599
5210 case OP_PVECFROM: 5600 case OP_PVECFROM:
5211 { 5601 {
… …
5213 pointer vec = car (args); 5603 pointer vec = car (args);
5214 int len = veclength (vec); 5604 int len = veclength (vec);
5215 5605
5216 if (i == len) 5606 if (i == len)
5217 { 5607 {
5218 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5219 s_return (S_T); 5609 s_return (S_T);
5220 } 5610 }
5221 else 5611 else
5222 { 5612 {
5223 pointer elem = vector_get (vec, i); 5613 pointer elem = vector_get (vec, i);
… …
5225 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5227 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5228 5618
5229 if (i > 0) 5619 if (i > 0)
5230 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5231 5621
5232 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5233 } 5623 }
5234 } 5624 }
5235 } 5625 }
5236 5626
5237 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5238} 5628}
5239 5629
5240static int 5630/* list ops */
5631ecb_hot static int
5241opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5242{ 5633{
5243 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5244 pointer a = car (args); 5635 pointer a = car (args);
5245 pointer x, y; 5636 pointer x, y;
… …
5268 break; 5659 break;
5269 } 5660 }
5270 5661
5271 if (is_pair (y)) 5662 if (is_pair (y))
5272 s_return (car (y)); 5663 s_return (car (y));
5273 else 5664
5274 s_return (S_F); 5665 s_return (S_F);
5275
5276 5666
5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5278 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5279 5669
5280 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5281 s_return (S_F); 5671 s_return (S_F);
5282 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5284 else if (is_macro (SCHEME_V->args)) 5674
5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5286 else
5287 s_return (S_F); 5675 s_return (S_F);
5288 5676
5289 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5290 /* 5678 /*
5291 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5292 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
… …
5303 5691
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5692/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5306 5694
5307typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5308static int 5696
5697ecb_hot static int
5309tst_any (pointer p) 5698tst_any (pointer p)
5310{ 5699{
5311 return 1; 5700 return 1;
5312} 5701}
5313 5702
5314static int 5703ecb_hot static int
5315tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5316{ 5705{
5317 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318} 5707}
5319 5708
5320static int 5709ecb_hot static int
5321tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5322{ 5711{
5323 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5324} 5713}
5325 5714
… …
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h" 5758#include "opdefines.h"
5370#undef OP_DEF 5759#undef OP_DEF
5371; 5760;
5372 5761
5373static const char * 5762ecb_cold static const char *
5374opname (int idx) 5763opname (int idx)
5375{ 5764{
5376 const char *name = opnames; 5765 const char *name = opnames;
5377 5766
5378 /* should do this at compile time, but would require external program, right? */ 5767 /* should do this at compile time, but would require external program, right? */
… …
5380 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5381 5770
5382 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5383} 5772}
5384 5773
5385static const char * 5774ecb_cold static const char *
5386procname (pointer x) 5775procname (pointer x)
5387{ 5776{
5388 return opname (procnum (x)); 5777 return opname (procnum (x));
5389} 5778}
5390 5779
… …
5410#undef OP_DEF 5799#undef OP_DEF
5411 {0} 5800 {0}
5412}; 5801};
5413 5802
5414/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5415static void ecb_hot 5804ecb_hot static void
5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5417{ 5806{
5418 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5419 5808
5420 for (;;) 5809 for (;;)
… …
5511 } 5900 }
5512} 5901}
5513 5902
5514/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5515 5904
5516static void 5905ecb_cold static void
5517assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5518{ 5907{
5519 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5520 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5521} 5910}
5522 5911
5523static void 5912ecb_cold static void
5524assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5525{ 5914{
5526 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5527 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5528 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5536 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5537 return y; 5926 return y;
5538} 5927}
5539 5928
5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5929/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5541static int 5930ecb_hot static int
5542syntaxnum (pointer p) 5931syntaxnum (pointer p)
5543{ 5932{
5544 const char *s = strvalue (p); 5933 const char *s = strvalue (p);
5545 5934
5546 switch (strlength (p)) 5935 switch (strlength (p))
… …
5625 6014
5626ecb_cold int 6015ecb_cold int
5627scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5628{ 6017{
5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5630 pointer x;
5631 6019
5632 /* this memset is not strictly correct, as we assume (intcache) 6020 /* this memset is not strictly correct, as we assume (intcache)
5633 * that memset 0 will also set pointers to 0, but memset does 6021 * that memset 0 will also set pointers to 0, but memset does
5634 * of course not guarantee that. screw such systems. 6022 * of course not guarantee that. screw such systems.
5635 */ 6023 */
… …
5663#endif 6051#endif
5664 } 6052 }
5665 6053
5666 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5667 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5668 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5669 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5670 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5671 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5672 6061
5673 /* init NIL */ 6062 /* init NIL */
5674 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5675 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5676 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5677 /* init T */ 6066 /* init T */
5678 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5679 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5680 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5681 /* init F */ 6070 /* init F */
5682 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5683 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5684 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5685 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5686 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5687 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5688 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5689 /* init sink */ 6078 /* init sink */
5690 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5691 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5692 6081
5693 /* init c_nest */ 6082 /* init c_nest */
5694 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5695 6084
5696 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5697 /* init global_env */ 6086 /* init global_env */
5698 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5699 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5700 /* init else */ 6089 /* init else */
5701 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5702 new_slot_in_env (SCHEME_A_ x, S_T);
5703 6091
5704 { 6092 {
5705 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5706 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5707 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5731 6119
5732 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5733} 6121}
5734 6122
5735#if USE_PORTS 6123#if USE_PORTS
5736void 6124ecb_cold void
5737scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5738{ 6126{
5739 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5740} 6128}
5741 6129
5742void 6130ecb_cold void
5743scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6131scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5744{ 6132{
5745 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6133 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5746} 6134}
5747 6135
5748void 6136ecb_cold void
5749scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5750{ 6138{
5751 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5752} 6140}
5753 6141
5754void 6142ecb_cold void
5755scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6143scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5756{ 6144{
5757 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6145 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5758} 6146}
5759#endif 6147#endif
5760 6148
5761void 6149ecb_cold void
5762scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5763{ 6151{
5764 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5765} 6153}
5766 6154
… …
5798 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5799 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5800 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5801 6189
5802 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5803 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5804 6192
5805#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5806 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5807 {
5808 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5809 { 6196 {
5810 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5811 6198
5812 if (fname) 6199 if (fname)
5813 free (fname); 6200 free (fname);
5814 } 6201 }
5815 }
5816#endif 6202#endif
5817} 6203}
5818 6204
5819void 6205ecb_cold void
5820scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5821{ 6207{
5822 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5823} 6209}
5824 6210
5825void 6211ecb_cold void
5826scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5827{ 6213{
5828 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5829 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5830 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5831 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5832 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5833 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5834#if USE_PORTS
5835 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5836#endif
5837 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5838 6222
5839#if USE_PORTS
5840 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5841 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5842#endif
5843 6225
5844#if USE_PORTS 6226#if USE_PORTS
5845#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5846 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5847 6229
… …
5851#endif 6233#endif
5852 6234
5853 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5854 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5855 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5856 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5857 6240
5858 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5859 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5860} 6243}
5861 6244
5862void 6245ecb_cold void
5863scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5864{ 6247{
6248#if USE_PORTs
5865 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5866 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5867 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5868 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5869 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6253 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5870 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6254 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5871 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5872#if USE_PORTS
5873 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5874#endif
5875 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5876 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5877 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5878 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5879 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5880 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5881 6263
5882 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5883 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5884} 6269}
5885 6270
5886void 6271ecb_cold void
5887scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5888{ 6273{
5889 pointer x; 6274 pointer x;
5890 6275
5891 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5896 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5897} 6282}
5898 6283
5899#if !STANDALONE 6284#if !STANDALONE
5900 6285
5901void 6286ecb_cold void
5902scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5903{ 6288{
5904 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6289 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5905} 6290}
5906 6291
5907void 6292ecb_cold void
5908scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5909{ 6294{
5910 int i; 6295 int i;
5911 6296
5912 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5913 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5914} 6299}
5915 6300
5916pointer 6301ecb_cold pointer
5917scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5918{ 6303{
5919 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6304 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5920} 6305}
5921 6306
5922void 6307ecb_cold void
5923save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5924{ 6309{
5925 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5926 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5927 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5931 /* Truncate the dump stack so TS will return here when done, not 6316 /* Truncate the dump stack so TS will return here when done, not
5932 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5933 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5934} 6319}
5935 6320
5936void 6321ecb_cold void
5937restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5938{ 6323{
5939 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5940 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5941 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5942 /* Pop */ 6327 /* Pop */
5943 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5944} 6329}
5945 6330
5946/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5947pointer 6332ecb_cold pointer
5948scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5949{ 6334{
5950 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5951 6336
5952 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5959 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5960 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5961 return SCHEME_V->value; 6346 return SCHEME_V->value;
5962} 6347}
5963 6348
5964pointer 6349ecb_cold pointer
5965scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5966{ 6351{
5967 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5968 6353
5969 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
5981 6366
5982/* ========== Main ========== */ 6367/* ========== Main ========== */
5983 6368
5984#if STANDALONE 6369#if STANDALONE
5985 6370
5986int 6371ecb_cold int
5987main (int argc, char **argv) 6372main (int argc, char **argv)
5988{ 6373{
5989# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
5990 scheme ssc; 6375 scheme ssc;
5991 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
5993# endif 6378# endif
5994 int fin; 6379 int fin;
5995 char *file_name = InitFile; 6380 char *file_name = InitFile;
5996 int retcode; 6381 int retcode;
5997 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
5998 system ("ps v $PPID");//D 6384 system ("ps v $PPID");
6385#endif
5999 6386
6000 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6001 { 6388 {
6002 putstr (SCHEME_A_ "Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6003 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
… …
6032 } 6419 }
6033#endif 6420#endif
6034 6421
6035 do 6422 do
6036 { 6423 {
6037#if USE_PORTS
6038 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
6039 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
6040 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6426 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6041 { 6427 {
6042 pointer args = NIL; 6428 pointer args = NIL;
… …
6060 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6446 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6061 6447
6062 } 6448 }
6063 else 6449 else
6064 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
6065#endif
6066 6451
6067 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
6068 { 6453 {
6069 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n"); 6454 putstr (SCHEME_A_ "Could not open file ");
6455 putstr (SCHEME_A_ file_name);
6456 putcharacter (SCHEME_A_ '\n');
6070 } 6457 }
6071 else 6458 else
6072 { 6459 {
6073 if (isfile) 6460 if (isfile)
6074 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
6075 else 6462 else
6076 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
6077 6464
6078#if USE_PORTS
6079 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
6080 { 6466 {
6081 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
6082 { 6468 {
6083 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n"); 6469 putstr (SCHEME_A_ "Errors encountered reading ");
6470 putstr (SCHEME_A_ file_name);
6471 putcharacter (SCHEME_A_ '\n');
6084 } 6472 }
6085 6473
6086 if (isfile) 6474 if (isfile)
6087 close (fin); 6475 close (fin);
6088 } 6476 }
6089#endif
6090 } 6477 }
6091 6478
6092 file_name = *argv++; 6479 file_name = *argv++;
6093 } 6480 }
6094 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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