ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC vs.
Revision 1.59 by root, Tue Dec 1 07:13:25 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
		22
		23	#if 1
21	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	24	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22	#include "malloc.c"	25	#include "malloc.c"
		26	#endif
23		27
24	#define SCHEME_SOURCE	28	#define SCHEME_SOURCE
25	#include "scheme-private.h"	29	#include "scheme-private.h"
26	#ifndef WIN32	30	#ifndef WIN32
27	# include <unistd.h>	31	# include <unistd.h>
…		…
34		38
35	#include <sys/types.h>	39	#include <sys/types.h>
36	#include <sys/stat.h>	40	#include <sys/stat.h>
37	#include <fcntl.h>	41	#include <fcntl.h>
38		42
		43	#if !USE_ERROR_CHECKING
		44	# define NDEBUG
		45	#endif
		46
		47	#include <assert.h>
		48	#include <stdlib.h>
39	#include <string.h>	49	#include <string.h>
40	#include <stdlib.h>
41		50
42	#include <limits.h>	51	#include <limits.h>
43	#include <inttypes.h>	52	#include <inttypes.h>
44	#include <float.h>	53	#include <float.h>
45	//#include <ctype.h>	54	//#include <ctype.h>
		55
		56	#if '1' != '0' + 1 \
		57	|| '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 \
		59	|| 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
		60	|| 'f' != 'a' + 5
		61	# error "execution character set digits not consecutive"
		62	#endif
46		63
47	enum {	64	enum {
48	TOK_EOF,	65	TOK_EOF,
49	TOK_LPAREN,	66	TOK_LPAREN,
50	TOK_RPAREN,	67	TOK_RPAREN,
51	TOK_DOT,	68	TOK_DOT,
52	TOK_ATOM,	69	TOK_ATOM,
		70	TOK_DOTATOM, /* atom name starting with '.' */
		71	TOK_STRATOM, /* atom name enclosed in | */
53	TOK_QUOTE,	72	TOK_QUOTE,
54	TOK_DQUOTE,	73	TOK_DQUOTE,
55	TOK_BQUOTE,	74	TOK_BQUOTE,
56	TOK_COMMA,	75	TOK_COMMA,
57	TOK_ATMARK,	76	TOK_ATMARK,
…		…
59	TOK_SHARP_CONST,	78	TOK_SHARP_CONST,
60	TOK_VEC	79	TOK_VEC
61	};	80	};
62		81
63	#define BACKQUOTE '`'	82	#define BACKQUOTE '`'
64	#define DELIMITERS "()\";\f\t\v\n\r "	83	#define WHITESPACE " \t\r\n\v\f"
		84	#define DELIMITERS "()\";" WHITESPACE
65		85
66	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	86	#define NIL POINTER (&SCHEME_V->xNIL)
67	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	87	#define S_T POINTER (&SCHEME_V->xT)
68	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	88	#define S_F POINTER (&SCHEME_V->xF)
69	#define S_SINK (&SCHEME_V->xsink)	89	#define S_SINK POINTER (&SCHEME_V->xsink)
70	#define S_EOF (&SCHEME_V->xEOF_OBJ)	90	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71		91
72	#if !USE_MULTIPLICITY	92	#if !USE_MULTIPLICITY
73	static scheme sc;	93	static scheme sc;
74	#endif	94	#endif
75		95
…		…
83	}	103	}
84		104
85	char *p = s;	105	char *p = s;
86		106
87	do {	107	do {
88	*p++ = '0' + n % base;	108	*p++ = "0123456789abcdef"[n % base];
89	n /= base;	109	n /= base;
90	} while (n);	110	} while (n);
91		111
92	*p-- = 0;	112	*p-- = 0;
93		113
…		…
103	{	123	{
104	xbase (s, n, 10);	124	xbase (s, n, 10);
105	}	125	}
106		126
107	static void	127	static void
108	xwrstr (const char *s)	128	putnum (SCHEME_P_ long n)
109	{
110	write (1, s, strlen (s));
111	}
112
113	static void
114	xwrnum (long n)
115	{	129	{
116	char buf[64];	130	char buf[64];
117		131
118	xnum (buf, n);	132	xnum (buf, n);
119	xwrstr (buf);	133	putstr (SCHEME_A_ buf);
120	}	134	}
121		135
122	static char	136	static char
123	xtoupper (char c)	137	xtoupper (char c)
124	{	138	{
…		…
176		190
177	#ifndef InitFile	191	#ifndef InitFile
178	# define InitFile "init.scm"	192	# define InitFile "init.scm"
179	#endif	193	#endif
180		194
181	#ifndef FIRST_CELLSEGS
182	# define FIRST_CELLSEGS 3
183	#endif
184
185	enum scheme_types	195	enum scheme_types
186	{	196	{
187	T_INTEGER,	197	T_INTEGER,
		198	T_CHARACTER,
188	T_REAL,	199	T_REAL,
189	T_STRING,	200	T_STRING,
190	T_SYMBOL,	201	T_SYMBOL,
191	T_PROC,	202	T_PROC,
192	T_PAIR, /* also used for free cells */	203	T_PAIR, /* also used for free cells */
193	T_CLOSURE,	204	T_CLOSURE,
		205	T_MACRO,
194	T_CONTINUATION,	206	T_CONTINUATION,
195	T_FOREIGN,	207	T_FOREIGN,
196	T_CHARACTER,
197	T_PORT,	208	T_PORT,
198	T_VECTOR,	209	T_VECTOR,
199	T_MACRO,
200	T_PROMISE,	210	T_PROMISE,
201	T_ENVIRONMENT,	211	T_ENVIRONMENT,
202	/* one more... */	212	/* one more... */
203	T_NUM_SYSTEM_TYPES	213	T_NUM_SYSTEM_TYPES
204	};	214	};
…		…
240	static num num_op (enum num_op op, num a, num b);	250	static num num_op (enum num_op op, num a, num b);
241	static num num_intdiv (num a, num b);	251	static num num_intdiv (num a, num b);
242	static num num_rem (num a, num b);	252	static num num_rem (num a, num b);
243	static num num_mod (num a, num b);	253	static num num_mod (num a, num b);
244		254
245	#if USE_MATH
246	static double round_per_R5RS (double x);
247	#endif
248	static int is_zero_rvalue (RVALUE x);	255	static int is_zero_rvalue (RVALUE x);
249		256
250	static num num_zero;	257	static num num_zero;
251	static num num_one;	258	static num num_one;
252		259
		260	/* convert "pointer" to cell* / cell* to pointer */
		261	#define CELL(p) ((struct cell *)(p) + 0)
		262	#define POINTER(c) ((void *)((c) - 0))
		263
253	/* macros for cell operations */	264	/* macros for cell operations */
254	#define typeflag(p) ((p)->flag + 0)	265	#define typeflag(p) (CELL(p)->flag + 0)
255	#define set_typeflag(p,v) ((p)->flag = (v))	266	#define set_typeflag(p,v) (CELL(p)->flag = (v))
256	#define type(p) (typeflag (p) & T_MASKTYPE)	267	#define type(p) (typeflag (p) & T_MASKTYPE)
257		268
258	INTERFACE int	269	INTERFACE int
259	is_string (pointer p)	270	is_string (pointer p)
260	{	271	{
261	return type (p) == T_STRING;	272	return type (p) == T_STRING;
262	}	273	}
263		274
264	#define strvalue(p) ((p)->object.string.svalue)	275	#define strvalue(p) (CELL(p)->object.string.svalue)
265	#define strlength(p) ((p)->object.string.length)	276	#define strlength(p) (CELL(p)->object.string.length)
266		277
267	INTERFACE int	278	INTERFACE int
268	is_vector (pointer p)	279	is_vector (pointer p)
269	{	280	{
270	return type (p) == T_VECTOR;	281	return type (p) == T_VECTOR;
271	}	282	}
272		283
273	#define vecvalue(p) ((p)->object.vector.vvalue)	284	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
274	#define veclength(p) ((p)->object.vector.length)	285	#define veclength(p) (CELL(p)->object.vector.length)
275	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	286	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	287	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
277	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	288	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
278		289
279	INTERFACE int	290	INTERFACE int
…		…
305	string_value (pointer p)	316	string_value (pointer p)
306	{	317	{
307	return strvalue (p);	318	return strvalue (p);
308	}	319	}
309		320
310	#define ivalue_unchecked(p) (p)->object.ivalue	321	#define ivalue_unchecked(p) CELL(p)->object.ivalue
311	#define set_ivalue(p,v) (p)->object.ivalue = (v)	322	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
312		323
313	#if USE_REAL	324	#if USE_REAL
314	#define rvalue_unchecked(p) (p)->object.rvalue	325	#define rvalue_unchecked(p) CELL(p)->object.rvalue
315	#define set_rvalue(p,v) (p)->object.rvalue = (v)	326	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
316	#else	327	#else
317	#define rvalue_unchecked(p) (p)->object.ivalue	328	#define rvalue_unchecked(p) CELL(p)->object.ivalue
318	#define set_rvalue(p,v) (p)->object.ivalue = (v)	329	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
319	#endif	330	#endif
320		331
321	INTERFACE long	332	INTERFACE long
322	charvalue (pointer p)	333	charvalue (pointer p)
323	{	334	{
324	return ivalue_unchecked (p);	335	return ivalue_unchecked (p);
325	}	336	}
326		337
		338	#define port(p) CELL(p)->object.port
		339	#define set_port(p,v) port(p) = (v)
327	INTERFACE int	340	INTERFACE int
328	is_port (pointer p)	341	is_port (pointer p)
329	{	342	{
330	return type (p) == T_PORT;	343	return type (p) == T_PORT;
331	}	344	}
332		345
333	INTERFACE int	346	INTERFACE int
334	is_inport (pointer p)	347	is_inport (pointer p)
335	{	348	{
336	return is_port (p) && p->object.port->kind & port_input;	349	return is_port (p) && port (p)->kind & port_input;
337	}	350	}
338		351
339	INTERFACE int	352	INTERFACE int
340	is_outport (pointer p)	353	is_outport (pointer p)
341	{	354	{
342	return is_port (p) && p->object.port->kind & port_output;	355	return is_port (p) && port (p)->kind & port_output;
343	}	356	}
344		357
345	INTERFACE int	358	INTERFACE int
346	is_pair (pointer p)	359	is_pair (pointer p)
347	{	360	{
348	return type (p) == T_PAIR;	361	return type (p) == T_PAIR;
349	}	362	}
350		363
351	#define car(p) ((p)->object.cons.car + 0)	364	#define car(p) (POINTER (CELL(p)->object.cons.car))
352	#define cdr(p) ((p)->object.cons.cdr + 0)	365	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
353		366
354	static pointer caar (pointer p) { return car (car (p)); }	367	static pointer caar (pointer p) { return car (car (p)); }
355	static pointer cadr (pointer p) { return car (cdr (p)); }	368	static pointer cadr (pointer p) { return car (cdr (p)); }
356	static pointer cdar (pointer p) { return cdr (car (p)); }	369	static pointer cdar (pointer p) { return cdr (car (p)); }
357	static pointer cddr (pointer p) { return cdr (cdr (p)); }	370	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
361	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	374	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362		375
363	INTERFACE void	376	INTERFACE void
364	set_car (pointer p, pointer q)	377	set_car (pointer p, pointer q)
365	{	378	{
366	p->object.cons.car = q;	379	CELL(p)->object.cons.car = CELL (q);
367	}	380	}
368		381
369	INTERFACE void	382	INTERFACE void
370	set_cdr (pointer p, pointer q)	383	set_cdr (pointer p, pointer q)
371	{	384	{
372	p->object.cons.cdr = q;	385	CELL(p)->object.cons.cdr = CELL (q);
373	}	386	}
374		387
375	INTERFACE pointer	388	INTERFACE pointer
376	pair_car (pointer p)	389	pair_car (pointer p)
377	{	390	{
…		…
391	}	404	}
392		405
393	INTERFACE char *	406	INTERFACE char *
394	symname (pointer p)	407	symname (pointer p)
395	{	408	{
396	return strvalue (car (p));	409	return strvalue (p);
397	}	410	}
398		411
399	#if USE_PLIST	412	#if USE_PLIST
		413	#error plists are broken because symbols are no longer pairs
		414	#define symprop(p) cdr(p)
400	SCHEME_EXPORT int	415	SCHEME_EXPORT int
401	hasprop (pointer p)	416	hasprop (pointer p)
402	{	417	{
403	return typeflag (p) & T_SYMBOL;	418	return typeflag (p) & T_SYMBOL;
404	}	419	}
405
406	# define symprop(p) cdr(p)
407	#endif	420	#endif
408		421
409	INTERFACE int	422	INTERFACE int
410	is_syntax (pointer p)	423	is_syntax (pointer p)
411	{	424	{
…		…
425	}	438	}
426		439
427	INTERFACE char *	440	INTERFACE char *
428	syntaxname (pointer p)	441	syntaxname (pointer p)
429	{	442	{
430	return strvalue (car (p));	443	return strvalue (p);
431	}	444	}
432		445
433	#define procnum(p) ivalue_unchecked (p)	446	#define procnum(p) ivalue_unchecked (p)
434	static const char *procname (pointer x);	447	static const char *procname (pointer x);
435		448
…		…
651	#endif	664	#endif
652		665
653	static int file_push (SCHEME_P_ const char *fname);	666	static int file_push (SCHEME_P_ const char *fname);
654	static void file_pop (SCHEME_P);	667	static void file_pop (SCHEME_P);
655	static int file_interactive (SCHEME_P);	668	static int file_interactive (SCHEME_P);
656	ecb_inline int is_one_of (char *s, int c);	669	ecb_inline int is_one_of (const char *s, int c);
657	static int alloc_cellseg (SCHEME_P_ int n);	670	static int alloc_cellseg (SCHEME_P);
658	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	671	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659	static void finalize_cell (SCHEME_P_ pointer a);	672	static void finalize_cell (SCHEME_P_ pointer a);
660	static int count_consecutive_cells (pointer x, int needed);	673	static int count_consecutive_cells (pointer x, int needed);
661	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	674	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
662	static pointer mk_number (SCHEME_P_ const num n);	675	static pointer mk_number (SCHEME_P_ const num n);
…		…
678	static void mark (pointer a);	691	static void mark (pointer a);
679	static void gc (SCHEME_P_ pointer a, pointer b);	692	static void gc (SCHEME_P_ pointer a, pointer b);
680	static int basic_inchar (port *pt);	693	static int basic_inchar (port *pt);
681	static int inchar (SCHEME_P);	694	static int inchar (SCHEME_P);
682	static void backchar (SCHEME_P_ int c);	695	static void backchar (SCHEME_P_ int c);
683	static char *readstr_upto (SCHEME_P_ char *delim);	696	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684	static pointer readstrexp (SCHEME_P);	697	static pointer readstrexp (SCHEME_P_ char delim);
685	ecb_inline int skipspace (SCHEME_P);	698	ecb_inline int skipspace (SCHEME_P);
686	static int token (SCHEME_P);	699	static int token (SCHEME_P);
687	static void printslashstring (SCHEME_P_ char *s, int len);	700	static void printslashstring (SCHEME_P_ char *s, int len);
688	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	701	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689	static void printatom (SCHEME_P_ pointer l, int f);	702	static void printatom (SCHEME_P_ pointer l, int f);
…		…
856	}	869	}
857		870
858	return ret;	871	return ret;
859	}	872	}
860		873
861	#if USE_MATH
862
863	/* Round to nearest. Round to even if midway */
864	static double
865	round_per_R5RS (double x)
866	{
867	double fl = floor (x);
868	double ce = ceil (x);
869	double dfl = x - fl;
870	double dce = ce - x;
871
872	if (dfl > dce)
873	return ce;
874	else if (dfl < dce)
875	return fl;
876	else
877	{
878	if (fmod (fl, 2) == 0) /* I imagine this holds */
879	return fl;
880	else
881	return ce;
882	}
883	}
884	#endif
885
886	static int	874	static int
887	is_zero_rvalue (RVALUE x)	875	is_zero_rvalue (RVALUE x)
888	{	876	{
889	return x == 0;	877	return x == 0;
890	#if 0	878	#if 0
…		…
896	#endif	884	#endif
897	}	885	}
898		886
899	/* allocate new cell segment */	887	/* allocate new cell segment */
900	static int	888	static int
901	alloc_cellseg (SCHEME_P_ int n)	889	alloc_cellseg (SCHEME_P)
902	{	890	{
903	pointer newp;	891	struct cell *newp;
904	pointer last;	892	struct cell *last;
905	pointer p;	893	struct cell *p;
906	char *cp;	894	char *cp;
907	long i;	895	long i;
908	int k;	896	int k;
909		897
910	static int segsize = CELL_SEGSIZE >> 1;	898	static int segsize = CELL_SEGSIZE >> 1;
911	segsize <<= 1;	899	segsize <<= 1;
912		900
913	for (k = 0; k < n; k++)
914	{
915	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
916	return k;
917
918	cp = malloc (segsize * sizeof (struct cell));	901	cp = malloc (segsize * sizeof (struct cell));
919		902
920	if (!cp && USE_ERROR_CHECKING)	903	if (!cp && USE_ERROR_CHECKING)
921	return k;	904	return k;
922		905
923	i = ++SCHEME_V->last_cell_seg;	906	i = ++SCHEME_V->last_cell_seg;
924	SCHEME_V->alloc_seg[i] = cp;	907	SCHEME_V->alloc_seg[i] = cp;
925		908
926	newp = (pointer)cp;	909	newp = (struct cell *)cp;
927	SCHEME_V->cell_seg[i] = newp;	910	SCHEME_V->cell_seg[i] = newp;
928	SCHEME_V->cell_segsize[i] = segsize;	911	SCHEME_V->cell_segsize[i] = segsize;
929	SCHEME_V->fcells += segsize;	912	SCHEME_V->fcells += segsize;
930	last = newp + segsize - 1;	913	last = newp + segsize - 1;
931		914
932	for (p = newp; p <= last; p++)	915	for (p = newp; p <= last; p++)
933	{	916	{
		917	pointer cp = POINTER (p);
934	set_typeflag (p, T_PAIR);	918	set_typeflag (cp, T_PAIR);
935	set_car (p, NIL);	919	set_car (cp, NIL);
936	set_cdr (p, p + 1);	920	set_cdr (cp, POINTER (p + 1));
937	}	921	}
938		922
939	set_cdr (last, SCHEME_V->free_cell);	923	set_cdr (POINTER (last), SCHEME_V->free_cell);
940	SCHEME_V->free_cell = newp;	924	SCHEME_V->free_cell = POINTER (newp);
941	}
942		925
943	return n;	926	return 1;
944	}	927	}
945		928
946	/* get new cell. parameter a, b is marked by gc. */	929	/* get new cell. parameter a, b is marked by gc. */
947	ecb_inline pointer	930	ecb_inline pointer
948	get_cell_x (SCHEME_P_ pointer a, pointer b)	931	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
952	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	935	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953	return S_SINK;	936	return S_SINK;
954		937
955	if (SCHEME_V->free_cell == NIL)	938	if (SCHEME_V->free_cell == NIL)
956	{	939	{
957	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	940	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
958		941
959	gc (SCHEME_A_ a, b);	942	gc (SCHEME_A_ a, b);
960		943
961	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)	944	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
962	{	945	{
963	/* if only a few recovered, get more to avoid fruitless gc's */	946	/* if only a few recovered, get more to avoid fruitless gc's */
964	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	947	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
965	{	948	{
966	#if USE_ERROR_CHECKING	949	#if USE_ERROR_CHECKING
967	SCHEME_V->no_memory = 1;	950	SCHEME_V->no_memory = 1;
968	return S_SINK;	951	return S_SINK;
969	#endif	952	#endif
…		…
981	}	964	}
982	}	965	}
983		966
984	/* To retain recent allocs before interpreter knows about them -	967	/* To retain recent allocs before interpreter knows about them -
985	Tehom */	968	Tehom */
986
987	static void	969	static void
988	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	970	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
989	{	971	{
990	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	972	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
991		973
…		…
1013	}	995	}
1014		996
1015	static pointer	997	static pointer
1016	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	998	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017	{	999	{
1018	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1000	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019	pointer *e = malloc (len * sizeof (pointer));	1001	pointer *e = malloc (len * sizeof (pointer));
1020		1002
1021	if (!e && USE_ERROR_CHECKING)	1003	if (!e && USE_ERROR_CHECKING)
1022	return S_SINK;	1004	return S_SINK;
1023		1005
1024	/* Record it as a vector so that gc understands it. */	1006	/* Record it as a vector so that gc understands it. */
1025	set_typeflag (v, T_VECTOR | T_ATOM);	1007	set_typeflag (v, T_VECTOR | T_ATOM);
1026		1008
1027	v->object.vector.vvalue = e;	1009	CELL(v)->object.vector.vvalue = e;
1028	v->object.vector.length = len;	1010	CELL(v)->object.vector.length = len;
1029	fill_vector (v, 0, init);	1011	fill_vector (v, 0, init);
1030	push_recent_alloc (SCHEME_A_ v, NIL);	1012	push_recent_alloc (SCHEME_A_ v, NIL);
1031		1013
1032	return v;	1014	return v;
1033	}	1015	}
…		…
1042	static void	1024	static void
1043	check_cell_alloced (pointer p, int expect_alloced)	1025	check_cell_alloced (pointer p, int expect_alloced)
1044	{	1026	{
1045	/* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */	1027	/* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1046	if (typeflag (p) & !expect_alloced)	1028	if (typeflag (p) & !expect_alloced)
1047	xwrstr ("Cell is already allocated!\n");	1029	putstr (SCHEME_A_ "Cell is already allocated!\n");
1048		1030
1049	if (!(typeflag (p)) & expect_alloced)	1031	if (!(typeflag (p)) & expect_alloced)
1050	xwrstr ("Cell is not allocated!\n");	1032	putstr (SCHEME_A_ "Cell is not allocated!\n");
1051	}	1033	}
1052		1034
1053	static void	1035	static void
1054	check_range_alloced (pointer p, int n, int expect_alloced)	1036	check_range_alloced (pointer p, int n, int expect_alloced)
1055	{	1037	{
…		…
1077	set_cdr (x, b);	1059	set_cdr (x, b);
1078		1060
1079	return x;	1061	return x;
1080	}	1062	}
1081		1063
		1064	static pointer
		1065	generate_symbol (SCHEME_P_ const char *name)
		1066	{
		1067	pointer x = mk_string (SCHEME_A_ name);
		1068	setimmutable (x);
		1069	set_typeflag (x, T_SYMBOL | T_ATOM);
		1070	return x;
		1071	}
		1072
1082	/* ========== oblist implementation ========== */	1073	/* ========== oblist implementation ========== */
1083		1074
1084	#ifndef USE_OBJECT_LIST	1075	#ifndef USE_OBJECT_LIST
1085		1076
		1077	static int
1086	static int hash_fn (const char *key, int table_size);	1078	hash_fn (const char *key, int table_size)
		1079	{
		1080	const unsigned char *p = key;
		1081	uint32_t hash = 2166136261;
		1082
		1083	while (*p)
		1084	hash = (hash ^ *p++) * 16777619;
		1085
		1086	return hash % table_size;
		1087	}
1087		1088
1088	static pointer	1089	static pointer
1089	oblist_initial_value (SCHEME_P)	1090	oblist_initial_value (SCHEME_P)
1090	{	1091	{
1091	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1092	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1093		1094
1094	/* returns the new symbol */	1095	/* returns the new symbol */
1095	static pointer	1096	static pointer
1096	oblist_add_by_name (SCHEME_P_ const char *name)	1097	oblist_add_by_name (SCHEME_P_ const char *name)
1097	{	1098	{
1098	int location;	1099	pointer x = generate_symbol (SCHEME_A_ name);
1099
1100	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1101	set_typeflag (x, T_SYMBOL);
1102	setimmutable (car (x));
1103
1104	location = hash_fn (name, veclength (SCHEME_V->oblist));	1100	int location = hash_fn (name, veclength (SCHEME_V->oblist));
1105	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));	1101	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1106	return x;	1102	return x;
1107	}	1103	}
1108		1104
1109	ecb_inline pointer	1105	ecb_inline pointer
…		…
1169		1165
1170	/* returns the new symbol */	1166	/* returns the new symbol */
1171	static pointer	1167	static pointer
1172	oblist_add_by_name (SCHEME_P_ const char *name)	1168	oblist_add_by_name (SCHEME_P_ const char *name)
1173	{	1169	{
1174	pointer x;	1170	pointer x = generate_symbol (SCHEME_A_ name);
1175
1176	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1177	set_typeflag (x, T_SYMBOL);
1178	setimmutable (car (x));
1179	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1180	return x;	1172	return x;
1181	}	1173	}
1182		1174
1183	static pointer	1175	static pointer
…		…
1193	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1194	{	1186	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1188
1197	set_typeflag (x, T_PORT | T_ATOM);	1189	set_typeflag (x, T_PORT | T_ATOM);
1198	x->object.port = p;	1190	set_port (x, p);
1199		1191
1200	return x;	1192	return x;
1201	}	1193	}
1202	#endif	1194	#endif
1203		1195
1204	pointer	1196	pointer
1205	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1206	{	1198	{
1207	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208		1200
1209	set_typeflag (x, (T_FOREIGN | T_ATOM));	1201	set_typeflag (x, T_FOREIGN | T_ATOM);
1210	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1211		1203
1212	return x;	1204	return x;
1213	}	1205	}
1214		1206
1215	INTERFACE pointer	1207	INTERFACE pointer
1216	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1217	{	1209	{
1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219		1211
1220	set_typeflag (x, (T_CHARACTER | T_ATOM));	1212	set_typeflag (x, T_CHARACTER | T_ATOM);
1221	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1222		1214
1223	return x;	1215	return x;
1224	}	1216	}
1225		1217
1226	/* get number atom (integer) */	1218	/* get number atom (integer) */
1227	INTERFACE pointer	1219	INTERFACE pointer
1228	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1229	{	1221	{
		1222	pointer p = 0;
		1223	pointer *pp = &p;
		1224
		1225	#if USE_INTCACHE
		1226	if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
		1227	pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
		1228	#endif
		1229
		1230	if (!*pp)
		1231	{
1230	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1231		1233
1232	set_typeflag (x, (T_INTEGER | T_ATOM));	1234	set_typeflag (x, T_INTEGER | T_ATOM);
		1235	setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1233	set_ivalue (x, n);	1236	set_ivalue (x, n);
1234		1237
		1238	*pp = x;
		1239	}
		1240
1235	return x;	1241	return *pp;
1236	}	1242	}
1237		1243
1238	INTERFACE pointer	1244	INTERFACE pointer
1239	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1240	{	1246	{
1241	#if USE_REAL	1247	#if USE_REAL
1242	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1243		1249
1244	set_typeflag (x, (T_REAL | T_ATOM));	1250	set_typeflag (x, T_REAL | T_ATOM);
1245	set_rvalue (x, n);	1251	set_rvalue (x, n);
1246		1252
1247	return x;	1253	return x;
1248	#else	1254	#else
1249	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1273	SCHEME_V->no_memory = 1;	1279	SCHEME_V->no_memory = 1;
1274	return SCHEME_V->strbuff;	1280	return SCHEME_V->strbuff;
1275	}	1281	}
1276		1282
1277	if (str)	1283	if (str)
1278	{	1284	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1279	int l = strlen (str);
1280
1281	if (l > len_str)
1282	l = len_str;
1283
1284	memcpy (q, str, l);
1285	q[l] = 0;
1286	}
1287	else	1285	else
1288	{
1289	memset (q, fill, len_str);	1286	memset (q, fill, len_str);
		1287
1290	q[len_str] = 0;	1288	q[len_str] = 0;
1291	}
1292		1289
1293	return q;	1290	return q;
1294	}	1291	}
1295		1292
1296	INTERFACE pointer	1293	INTERFACE pointer
…		…
1310	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1307	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1311		1308
1312	set_typeflag (x, T_STRING | T_ATOM);	1309	set_typeflag (x, T_STRING | T_ATOM);
1313	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1310	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1314	strlength (x) = len;	1311	strlength (x) = len;
		1312
1315	return x;	1313	return x;
1316	}	1314	}
1317		1315
1318	INTERFACE pointer	1316	INTERFACE pointer
1319	mk_string (SCHEME_P_ const char *str)	1317	mk_string (SCHEME_P_ const char *str)
…		…
1332	{	1330	{
1333	int i;	1331	int i;
1334		1332
1335	for (i = start; i < veclength (vec); i++)	1333	for (i = start; i < veclength (vec); i++)
1336	vecvalue (vec)[i] = obj;	1334	vecvalue (vec)[i] = obj;
		1335	}
		1336
		1337	INTERFACE void
		1338	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1339	{
		1340	uint32_t oldsize = veclength (vec);
		1341	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1342	veclength (vec) = newsize;
		1343	fill_vector (vec, oldsize, fill);
1337	}	1344	}
1338		1345
1339	INTERFACE pointer	1346	INTERFACE pointer
1340	vector_get (pointer vec, uint32_t ielem)	1347	vector_get (pointer vec, uint32_t ielem)
1341	{	1348	{
…		…
1363		1370
1364	INTERFACE pointer	1371	INTERFACE pointer
1365	gensym (SCHEME_P)	1372	gensym (SCHEME_P)
1366	{	1373	{
1367	pointer x;	1374	pointer x;
1368
1369	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1370	{
1371	char name[40] = "gensym-";	1375	char name[40] = "gensym-";
1372	xnum (name + 7, SCHEME_V->gensym_cnt);	1376	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1373		1377
1374	/* first check oblist */	1378	return generate_symbol (SCHEME_A_ name);
1375	x = oblist_find_by_name (SCHEME_A_ name);	1379	}
1376		1380
1377	if (x == NIL)	1381	static int
1378	{	1382	is_gensym (SCHEME_P_ pointer x)
1379	x = oblist_add_by_name (SCHEME_A_ name);	1383	{
1380	return x;	1384	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1381	}
1382	}
1383
1384	return NIL;
1385	}	1385	}
1386		1386
1387	/* make symbol or number atom from string */	1387	/* make symbol or number atom from string */
1388	static pointer	1388	static pointer
1389	mk_atom (SCHEME_P_ char *q)	1389	mk_atom (SCHEME_P_ char *q)
…		…
1475	return S_F;	1475	return S_F;
1476	else if (*name == '\\') /* #\w (character) */	1476	else if (*name == '\\') /* #\w (character) */
1477	{	1477	{
1478	int c;	1478	int c;
1479		1479
		1480	// TODO: optimise
1480	if (stricmp (name + 1, "space") == 0)	1481	if (stricmp (name + 1, "space") == 0)
1481	c = ' ';	1482	c = ' ';
1482	else if (stricmp (name + 1, "newline") == 0)	1483	else if (stricmp (name + 1, "newline") == 0)
1483	c = '\n';	1484	c = '\n';
1484	else if (stricmp (name + 1, "return") == 0)	1485	else if (stricmp (name + 1, "return") == 0)
1485	c = '\r';	1486	c = '\r';
1486	else if (stricmp (name + 1, "tab") == 0)	1487	else if (stricmp (name + 1, "tab") == 0)
1487	c = '\t';	1488	c = '\t';
		1489	else if (stricmp (name + 1, "alarm") == 0)
		1490	c = 0x07;
		1491	else if (stricmp (name + 1, "backspace") == 0)
		1492	c = 0x08;
		1493	else if (stricmp (name + 1, "escape") == 0)
		1494	c = 0x1b;
		1495	else if (stricmp (name + 1, "delete") == 0)
		1496	c = 0x7f;
		1497	else if (stricmp (name + 1, "null") == 0)
		1498	c = 0;
1488	else if (name[1] == 'x' && name[2] != 0)	1499	else if (name[1] == 'x' && name[2] != 0)
1489	{	1500	{
1490	long c1 = strtol (name + 2, 0, 16);	1501	long c1 = strtol (name + 2, 0, 16);
1491		1502
1492	if (0 <= c1 && c1 <= UCHAR_MAX)	1503	if (0 <= c1 && c1 <= UCHAR_MAX)
…		…
1598		1609
1599	/* garbage collection. parameter a, b is marked. */	1610	/* garbage collection. parameter a, b is marked. */
1600	static void	1611	static void
1601	gc (SCHEME_P_ pointer a, pointer b)	1612	gc (SCHEME_P_ pointer a, pointer b)
1602	{	1613	{
1603	pointer p;
1604	int i;	1614	int i;
1605		1615
1606	if (SCHEME_V->gc_verbose)	1616	if (SCHEME_V->gc_verbose)
1607	putstr (SCHEME_A_ "gc...");	1617	putstr (SCHEME_A_ "gc...");
1608		1618
…		…
1624	/* Mark recent objects the interpreter doesn't know about yet. */	1634	/* Mark recent objects the interpreter doesn't know about yet. */
1625	mark (car (S_SINK));	1635	mark (car (S_SINK));
1626	/* Mark any older stuff above nested C calls */	1636	/* Mark any older stuff above nested C calls */
1627	mark (SCHEME_V->c_nest);	1637	mark (SCHEME_V->c_nest);
1628		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
1629	/* mark variables a, b */	1646	/* mark variables a, b */
1630	mark (a);	1647	mark (a);
1631	mark (b);	1648	mark (b);
1632		1649
1633	/* garbage collect */	1650	/* garbage collect */
1634	clrmark (NIL);	1651	clrmark (NIL);
1635	SCHEME_V->fcells = 0;	1652	SCHEME_V->fcells = 0;
1636	SCHEME_V->free_cell = NIL;	1653	SCHEME_V->free_cell = NIL;
1637		1654
1638	/* free-list is kept sorted by address so as to maintain consecutive	1655	if (SCHEME_V->gc_verbose)
1639	ranges, if possible, for use with vectors. Here we scan the cells	1656	putstr (SCHEME_A_ "freeing...");
1640	(which are also kept sorted by address) downwards to build the	1657
1641	free-list in sorted order.	1658	uint32_t total = 0;
1642	*/	1659
		1660	/* Here we scan the cells to build the free-list. */
1643	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1661	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1644	{	1662	{
1645	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1663	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1664	struct cell *p;
		1665	total += SCHEME_V->cell_segsize [i];
1646		1666
1647	while (--p >= SCHEME_V->cell_seg[i])	1667	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1648	{	1668	{
		1669	pointer c = POINTER (p);
		1670
1649	if (is_mark (p))	1671	if (is_mark (c))
1650	clrmark (p);	1672	clrmark (c);
1651	else	1673	else
1652	{	1674	{
1653	/* reclaim cell */	1675	/* reclaim cell */
1654	if (typeflag (p) != T_PAIR)	1676	if (typeflag (c) != T_PAIR)
1655	{	1677	{
1656	finalize_cell (SCHEME_A_ p);	1678	finalize_cell (SCHEME_A_ c);
1657	set_typeflag (p, T_PAIR);	1679	set_typeflag (c, T_PAIR);
1658	set_car (p, NIL);	1680	set_car (c, NIL);
1659	}	1681	}
1660		1682
1661	++SCHEME_V->fcells;	1683	++SCHEME_V->fcells;
1662	set_cdr (p, SCHEME_V->free_cell);	1684	set_cdr (c, SCHEME_V->free_cell);
1663	SCHEME_V->free_cell = p;	1685	SCHEME_V->free_cell = c;
1664	}	1686	}
1665	}	1687	}
1666	}	1688	}
1667		1689
1668	if (SCHEME_V->gc_verbose)	1690	if (SCHEME_V->gc_verbose)
1669	{	1691	{
1670	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	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");
1671	}	1693	}
1672	}	1694	}
1673		1695
1674	static void	1696	static void
1675	finalize_cell (SCHEME_P_ pointer a)	1697	finalize_cell (SCHEME_P_ pointer a)
1676	{	1698	{
1677	/* TODO, fast bitmap check? */	1699	/* TODO, fast bitmap check? */
1678	if (is_string (a))	1700	if (is_string (a) || is_symbol (a))
1679	free (strvalue (a));	1701	free (strvalue (a));
1680	else if (is_vector (a))	1702	else if (is_vector (a))
1681	free (vecvalue (a));	1703	free (vecvalue (a));
1682	#if USE_PORTS	1704	#if USE_PORTS
1683	else if (is_port (a))	1705	else if (is_port (a))
1684	{	1706	{
1685	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1707	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1686	port_close (SCHEME_A_ a, port_input | port_output);	1708	port_close (SCHEME_A_ a, port_input | port_output);
1687		1709
1688	free (a->object.port);	1710	free (port (a));
1689	}	1711	}
1690	#endif	1712	#endif
1691	}	1713	}
1692		1714
1693	/* ========== Routines for Reading ========== */	1715	/* ========== Routines for Reading ========== */
…		…
1709	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1731	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1710	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;	1732	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1711	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1733	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1712	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1734	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1713	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1735	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1714	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1736	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1715		1737
1716	#if SHOW_ERROR_LINE	1738	#if SHOW_ERROR_LINE
1717	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1739	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1718		1740
1719	if (fname)	1741	if (fname)
…		…
1736	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1758	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1737	#if USE_PORTS	1759	#if USE_PORTS
1738	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1760	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1739	#endif	1761	#endif
1740	SCHEME_V->file_i--;	1762	SCHEME_V->file_i--;
1741	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1763	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1742	}	1764	}
1743	}	1765	}
1744		1766
1745	static int	1767	static int
1746	file_interactive (SCHEME_P)	1768	file_interactive (SCHEME_P)
1747	{	1769	{
1748	#if USE_PORTS	1770	#if USE_PORTS
1749	return SCHEME_V->file_i == 0	1771	return SCHEME_V->file_i == 0
1750	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1772	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1751	&& (SCHEME_V->inport->object.port->kind & port_file);	1773	&& (port (SCHEME_V->inport)->kind & port_file);
1752	#else	1774	#else
1753	return 0;	1775	return 0;
1754	#endif	1776	#endif
1755	}	1777	}
1756		1778
…		…
1890	}	1912	}
1891		1913
1892	static void	1914	static void
1893	port_close (SCHEME_P_ pointer p, int flag)	1915	port_close (SCHEME_P_ pointer p, int flag)
1894	{	1916	{
1895	port *pt = p->object.port;	1917	port *pt = port (p);
1896		1918
1897	pt->kind &= ~flag;	1919	pt->kind &= ~flag;
1898		1920
1899	if ((pt->kind & (port_input | port_output)) == 0)	1921	if ((pt->kind & (port_input | port_output)) == 0)
1900	{	1922	{
…		…
1921	/* get new character from input file */	1943	/* get new character from input file */
1922	static int	1944	static int
1923	inchar (SCHEME_P)	1945	inchar (SCHEME_P)
1924	{	1946	{
1925	int c;	1947	int c;
1926	port *pt;	1948	port *pt = port (SCHEME_V->inport);
1927
1928	pt = SCHEME_V->inport->object.port;
1929		1949
1930	if (pt->kind & port_saw_EOF)	1950	if (pt->kind & port_saw_EOF)
1931	return EOF;	1951	return EOF;
1932		1952
1933	c = basic_inchar (pt);	1953	c = basic_inchar (pt);
…		…
2000	port *pt;	2020	port *pt;
2001		2021
2002	if (c == EOF)	2022	if (c == EOF)
2003	return;	2023	return;
2004		2024
2005	pt = SCHEME_V->inport->object.port;	2025	pt = port (SCHEME_V->inport);
2006	pt->unget = c;	2026	pt->unget = c;
2007	#else	2027	#else
2008	if (c == EOF)	2028	if (c == EOF)
2009	return;	2029	return;
2010		2030
…		…
2038		2058
2039	INTERFACE void	2059	INTERFACE void
2040	putstr (SCHEME_P_ const char *s)	2060	putstr (SCHEME_P_ const char *s)
2041	{	2061	{
2042	#if USE_PORTS	2062	#if USE_PORTS
2043	port *pt = SCHEME_V->outport->object.port;	2063	port *pt = port (SCHEME_V->outport);
2044		2064
2045	if (pt->kind & port_file)	2065	if (pt->kind & port_file)
2046	write (pt->rep.stdio.file, s, strlen (s));	2066	write (pt->rep.stdio.file, s, strlen (s));
2047	else	2067	else
2048	for (; *s; s++)	2068	for (; *s; s++)
…		…
2050	*pt->rep.string.curr++ = *s;	2070	*pt->rep.string.curr++ = *s;
2051	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2071	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2052	*pt->rep.string.curr++ = *s;	2072	*pt->rep.string.curr++ = *s;
2053		2073
2054	#else	2074	#else
2055	xwrstr (s);	2075	write (pt->rep.stdio.file, s, strlen (s));
2056	#endif	2076	#endif
2057	}	2077	}
2058		2078
2059	static void	2079	static void
2060	putchars (SCHEME_P_ const char *s, int len)	2080	putchars (SCHEME_P_ const char *s, int len)
2061	{	2081	{
2062	#if USE_PORTS	2082	#if USE_PORTS
2063	port *pt = SCHEME_V->outport->object.port;	2083	port *pt = port (SCHEME_V->outport);
2064		2084
2065	if (pt->kind & port_file)	2085	if (pt->kind & port_file)
2066	write (pt->rep.stdio.file, s, len);	2086	write (pt->rep.stdio.file, s, len);
2067	else	2087	else
2068	{	2088	{
…		…
2082		2102
2083	INTERFACE void	2103	INTERFACE void
2084	putcharacter (SCHEME_P_ int c)	2104	putcharacter (SCHEME_P_ int c)
2085	{	2105	{
2086	#if USE_PORTS	2106	#if USE_PORTS
2087	port *pt = SCHEME_V->outport->object.port;	2107	port *pt = port (SCHEME_V->outport);
2088		2108
2089	if (pt->kind & port_file)	2109	if (pt->kind & port_file)
2090	{	2110	{
2091	char cc = c;	2111	char cc = c;
2092	write (pt->rep.stdio.file, &cc, 1);	2112	write (pt->rep.stdio.file, &cc, 1);
…		…
2105	#endif	2125	#endif
2106	}	2126	}
2107		2127
2108	/* read characters up to delimiter, but cater to character constants */	2128	/* read characters up to delimiter, but cater to character constants */
2109	static char *	2129	static char *
2110	readstr_upto (SCHEME_P_ char *delim)	2130	readstr_upto (SCHEME_P_ int skip, const char *delim)
2111	{	2131	{
2112	char *p = SCHEME_V->strbuff;	2132	char *p = SCHEME_V->strbuff + skip;
2113		2133
2114	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2134	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2115		2135
2116	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2136	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2117	*p = 0;	2137	*p = 0;
…		…
2124	return SCHEME_V->strbuff;	2144	return SCHEME_V->strbuff;
2125	}	2145	}
2126		2146
2127	/* read string expression "xxx...xxx" */	2147	/* read string expression "xxx...xxx" */
2128	static pointer	2148	static pointer
2129	readstrexp (SCHEME_P)	2149	readstrexp (SCHEME_P_ char delim)
2130	{	2150	{
2131	char *p = SCHEME_V->strbuff;	2151	char *p = SCHEME_V->strbuff;
2132	int c;	2152	int c;
2133	int c1 = 0;	2153	int c1 = 0;
2134	enum
2135	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2154	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2136		2155
2137	for (;;)	2156	for (;;)
2138	{	2157	{
2139	c = inchar (SCHEME_A);	2158	c = inchar (SCHEME_A);
2140		2159
…		…
2142	return S_F;	2161	return S_F;
2143		2162
2144	switch (state)	2163	switch (state)
2145	{	2164	{
2146	case st_ok:	2165	case st_ok:
2147	switch (c)	2166	if (ecb_expect_false (c == delim))
2148	{
2149	case '\\':
2150	state = st_bsl;
2151	break;
2152
2153	case '"':
2154	*p = 0;
2155	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2167	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2156		2168
2157	default:	2169	if (ecb_expect_false (c == '\\'))
		2170	state = st_bsl;
		2171	else
2158	*p++ = c;	2172	*p++ = c;
2159	break;
2160	}
2161		2173
2162	break;	2174	break;
2163		2175
2164	case st_bsl:	2176	case st_bsl:
2165	switch (c)	2177	switch (c)
…		…
2174	case '7':	2186	case '7':
2175	state = st_oct1;	2187	state = st_oct1;
2176	c1 = c - '0';	2188	c1 = c - '0';
2177	break;	2189	break;
2178		2190
		2191	case 'a': *p++ = '\a'; state = st_ok; break;
		2192	case 'n': *p++ = '\n'; state = st_ok; break;
		2193	case 'r': *p++ = '\r'; state = st_ok; break;
		2194	case 't': *p++ = '\t'; state = st_ok; break;
		2195
		2196	//TODO: \whitespace eol whitespace
		2197
		2198	//TODO: x should end in ;, not two-digit hex
2179	case 'x':	2199	case 'x':
2180	case 'X':	2200	case 'X':
2181	state = st_x1;	2201	state = st_x1;
2182	c1 = 0;	2202	c1 = 0;
2183	break;	2203	break;
2184		2204
2185	case 'n':
2186	*p++ = '\n';
2187	state = st_ok;
2188	break;
2189
2190	case 't':
2191	*p++ = '\t';
2192	state = st_ok;
2193	break;
2194
2195	case 'r':
2196	*p++ = '\r';
2197	state = st_ok;
2198	break;
2199
2200	case '"':
2201	*p++ = '"';
2202	state = st_ok;
2203	break;
2204
2205	default:	2205	default:
2206	*p++ = c;	2206	*p++ = c;
2207	state = st_ok;	2207	state = st_ok;
2208	break;	2208	break;
2209	}	2209	}
2210		2210
2211	break;	2211	break;
2212		2212
2213	case st_x1:	2213	case st_x1:
2214	case st_x2:	2214	case st_x2:
2215	c = toupper (c);	2215	c = tolower (c);
2216		2216
2217	if (c >= '0' && c <= 'F')	2217	if (c >= '0' && c <= '9')
2218	{
2219	if (c <= '9')
2220	c1 = (c1 << 4) + c - '0';	2218	c1 = (c1 << 4) + c - '0';
2221	else	2219	else if (c >= 'a' && c <= 'f')
2222	c1 = (c1 << 4) + c - 'A' + 10;	2220	c1 = (c1 << 4) + c - 'a' + 10;
2223
2224	if (state == st_x1)
2225	state = st_x2;
2226	else
2227	{
2228	*p++ = c1;
2229	state = st_ok;
2230	}
2231	}
2232	else	2221	else
2233	return S_F;	2222	return S_F;
		2223
		2224	if (state == st_x1)
		2225	state = st_x2;
		2226	else
		2227	{
		2228	*p++ = c1;
		2229	state = st_ok;
		2230	}
2234		2231
2235	break;	2232	break;
2236		2233
2237	case st_oct1:	2234	case st_oct1:
2238	case st_oct2:	2235	case st_oct2:
…		…
2242	backchar (SCHEME_A_ c);	2239	backchar (SCHEME_A_ c);
2243	state = st_ok;	2240	state = st_ok;
2244	}	2241	}
2245	else	2242	else
2246	{	2243	{
2247	if (state == st_oct2 && c1 >= 32)	2244	if (state == st_oct2 && c1 >= ' ')
2248	return S_F;	2245	return S_F;
2249		2246
2250	c1 = (c1 << 3) + (c - '0');	2247	c1 = (c1 << 3) + (c - '0');
2251		2248
2252	if (state == st_oct1)	2249	if (state == st_oct1)
…		…
2257	state = st_ok;	2254	state = st_ok;
2258	}	2255	}
2259	}	2256	}
2260		2257
2261	break;	2258	break;
2262
2263	}	2259	}
2264	}	2260	}
2265	}	2261	}
2266		2262
2267	/* check c is in chars */	2263	/* check c is in chars */
2268	ecb_inline int	2264	ecb_inline int
2269	is_one_of (char *s, int c)	2265	is_one_of (const char *s, int c)
2270	{	2266	{
2271	if (c == EOF)
2272	return 1;
2273
2274	return !!strchr (s, c);	2267	return c == EOF || !!strchr (s, c);
2275	}	2268	}
2276		2269
2277	/* skip white characters */	2270	/* skip white characters */
2278	ecb_inline int	2271	ecb_inline int
2279	skipspace (SCHEME_P)	2272	skipspace (SCHEME_P)
…		…
2281	int c, curr_line = 0;	2274	int c, curr_line = 0;
2282		2275
2283	do	2276	do
2284	{	2277	{
2285	c = inchar (SCHEME_A);	2278	c = inchar (SCHEME_A);
		2279
2286	#if SHOW_ERROR_LINE	2280	#if SHOW_ERROR_LINE
2287	if (c == '\n')	2281	if (ecb_expect_false (c == '\n'))
2288	curr_line++;	2282	curr_line++;
2289	#endif	2283	#endif
		2284
		2285	if (ecb_expect_false (c == EOF))
		2286	return c;
2290	}	2287	}
2291	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2288	while (is_one_of (WHITESPACE, c));
2292		2289
2293	/* record it */	2290	/* record it */
2294	#if SHOW_ERROR_LINE	2291	#if SHOW_ERROR_LINE
2295	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2292	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2296	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2293	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2297	#endif	2294	#endif
2298		2295
2299	if (c != EOF)
2300	{
2301	backchar (SCHEME_A_ c);	2296	backchar (SCHEME_A_ c);
2302	return 1;	2297	return 1;
2303	}
2304	else
2305	return EOF;
2306	}	2298	}
2307		2299
2308	/* get token */	2300	/* get token */
2309	static int	2301	static int
2310	token (SCHEME_P)	2302	token (SCHEME_P)
…		…
2326	return TOK_RPAREN;	2318	return TOK_RPAREN;
2327		2319
2328	case '.':	2320	case '.':
2329	c = inchar (SCHEME_A);	2321	c = inchar (SCHEME_A);
2330		2322
2331	if (is_one_of (" \n\t", c))	2323	if (is_one_of (WHITESPACE, c))
2332	return TOK_DOT;	2324	return TOK_DOT;
2333	else	2325	else
2334	{	2326	{
2335	//TODO: ungetc twice in a row is not supported in C
2336	backchar (SCHEME_A_ c);	2327	backchar (SCHEME_A_ c);
2337	backchar (SCHEME_A_ '.');
2338	return TOK_ATOM;	2328	return TOK_DOTATOM;
2339	}	2329	}
		2330
		2331	case '|':
		2332	return TOK_STRATOM;
2340		2333
2341	case '\'':	2334	case '\'':
2342	return TOK_QUOTE;	2335	return TOK_QUOTE;
2343		2336
2344	case ';':	2337	case ';':
…		…
2476	}	2469	}
2477		2470
2478	putcharacter (SCHEME_A_ '"');	2471	putcharacter (SCHEME_A_ '"');
2479	}	2472	}
2480		2473
2481
2482	/* print atoms */	2474	/* print atoms */
2483	static void	2475	static void
2484	printatom (SCHEME_P_ pointer l, int f)	2476	printatom (SCHEME_P_ pointer l, int f)
2485	{	2477	{
2486	char *p;	2478	char *p;
2487	int len;	2479	int len;
2488		2480
2489	atom2str (SCHEME_A_ l, f, &p, &len);	2481	atom2str (SCHEME_A_ l, f, &p, &len);
2490	putchars (SCHEME_A_ p, len);	2482	putchars (SCHEME_A_ p, len);
2491	}	2483	}
2492
2493		2484
2494	/* Uses internal buffer unless string pointer is already available */	2485	/* Uses internal buffer unless string pointer is already available */
2495	static void	2486	static void
2496	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2487	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497	{	2488	{
…		…
2658	#endif	2649	#endif
2659	}	2650	}
2660	else if (is_continuation (l))	2651	else if (is_continuation (l))
2661	p = "#<CONTINUATION>";	2652	p = "#<CONTINUATION>";
2662	else	2653	else
		2654	{
		2655	#if USE_PRINTF
		2656	p = SCHEME_V->strbuff;
		2657	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2658	#else
2663	p = "#<ERROR>";	2659	p = "#<ERROR>";
		2660	#endif
		2661	}
2664		2662
2665	*pp = p;	2663	*pp = p;
2666	*plen = strlen (p);	2664	*plen = strlen (p);
2667	}	2665	}
2668		2666
…		…
2812	/* () is #t in R5RS */	2810	/* () is #t in R5RS */
2813	#define is_true(p) ((p) != S_F)	2811	#define is_true(p) ((p) != S_F)
2814	#define is_false(p) ((p) == S_F)	2812	#define is_false(p) ((p) == S_F)
2815		2813
2816	/* ========== Environment implementation ========== */	2814	/* ========== Environment implementation ========== */
2817
2818	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2819
2820	static int
2821	hash_fn (const char *key, int table_size)
2822	{
2823	const unsigned char *p = key;
2824	uint32_t hash = 2166136261;
2825
2826	while (*p)
2827	hash = (hash ^ *p++) * 16777619;
2828
2829	return hash % table_size;
2830	}
2831	#endif
2832		2815
2833	#ifndef USE_ALIST_ENV	2816	#ifndef USE_ALIST_ENV
2834		2817
2835	/*	2818	/*
2836	* In this implementation, each frame of the environment may be	2819	* In this implementation, each frame of the environment may be
…		…
2853		2836
2854	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2837	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2855	setenvironment (SCHEME_V->envir);	2838	setenvironment (SCHEME_V->envir);
2856	}	2839	}
2857		2840
		2841	static uint32_t
		2842	sym_hash (pointer sym, uint32_t size)
		2843	{
		2844	uintptr_t ptr = (uintptr_t)sym;
		2845
		2846	#if 0
		2847	/* table size is prime, so why mix */
		2848	ptr += ptr >> 32;
		2849	ptr += ptr >> 16;
		2850	ptr += ptr >> 8;
		2851	#endif
		2852
		2853	return ptr % size;
		2854	}
		2855
2858	ecb_inline void	2856	ecb_inline void
2859	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2857	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2860	{	2858	{
2861	pointer slot = immutable_cons (variable, value);	2859	pointer slot = immutable_cons (variable, value);
2862		2860
2863	if (is_vector (car (env)))	2861	if (is_vector (car (env)))
2864	{	2862	{
2865	int location = hash_fn (symname (variable), veclength (car (env)));	2863	int location = sym_hash (variable, veclength (car (env)));
2866
2867	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));	2864	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2868	}	2865	}
2869	else	2866	else
2870	set_car (env, immutable_cons (slot, car (env)));	2867	set_car (env, immutable_cons (slot, car (env)));
2871	}	2868	}
2872		2869
2873	static pointer	2870	static pointer
2874	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2871	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2875	{	2872	{
2876	pointer x, y;	2873	pointer x, y;
2877	int location;
2878		2874
2879	for (x = env; x != NIL; x = cdr (x))	2875	for (x = env; x != NIL; x = cdr (x))
2880	{	2876	{
2881	if (is_vector (car (x)))	2877	if (is_vector (car (x)))
2882	{	2878	{
2883	location = hash_fn (symname (hdl), veclength (car (x)));	2879	int location = sym_hash (hdl, veclength (car (x)));
2884	y = vector_get (car (x), location);	2880	y = vector_get (car (x), location);
2885	}	2881	}
2886	else	2882	else
2887	y = car (x);	2883	y = car (x);
2888		2884
…		…
2925	for (y = car (x); y != NIL; y = cdr (y))	2921	for (y = car (x); y != NIL; y = cdr (y))
2926	if (caar (y) == hdl)	2922	if (caar (y) == hdl)
2927	break;	2923	break;
2928		2924
2929	if (y != NIL)	2925	if (y != NIL)
		2926	return car (y);
2930	break;	2927	break;
2931		2928
2932	if (!all)	2929	if (!all)
2933	return NIL;	2930	break;
2934	}	2931	}
2935
2936	if (x != NIL)
2937	return car (y);
2938		2932
2939	return NIL;	2933	return NIL;
2940	}	2934	}
2941		2935
2942	#endif /* USE_ALIST_ENV else */	2936	#endif /* USE_ALIST_ENV else */
2943		2937
2944	ecb_inline void	2938	ecb_inline void
2945	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2939	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946	{	2940	{
		2941	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2942	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948	}	2943	}
2949		2944
2950	ecb_inline void	2945	ecb_inline void
2951	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2946	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3052	{	3047	{
3053	int nframes = (uintptr_t)SCHEME_V->dump;	3048	int nframes = (uintptr_t)SCHEME_V->dump;
3054	struct dump_stack_frame *next_frame;	3049	struct dump_stack_frame *next_frame;
3055		3050
3056	/* enough room for the next frame? */	3051	/* enough room for the next frame? */
3057	if (nframes >= SCHEME_V->dump_size)	3052	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058	{	3053	{
3059	SCHEME_V->dump_size += STACK_GROWTH;	3054	SCHEME_V->dump_size += STACK_GROWTH;
3060	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3055	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061	}	3056	}
3062		3057
…		…
3243		3238
3244	#endif	3239	#endif
3245		3240
3246	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3241	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247		3242
		3243	#if EXPERIMENT
		3244	static int
		3245	debug (SCHEME_P_ int indent, pointer x)
		3246	{
		3247	int c;
		3248
		3249	if (is_syntax (x))
		3250	{
		3251	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3252	return 8 + 8;
		3253	}
		3254
		3255	if (x == NIL)
		3256	{
		3257	printf ("%*sNIL\n", indent, "");
		3258	return 3;
		3259	}
		3260
		3261	switch (type (x))
		3262	{
		3263	case T_INTEGER:
		3264	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3265	return 32+8;
		3266
		3267	case T_SYMBOL:
		3268	printf ("%*sS<%s>\n", indent, "", symname (x));
		3269	return 24+8;
		3270
		3271	case T_CLOSURE:
		3272	printf ("%*sS<%s>\n", indent, "", "closure");
		3273	debug (SCHEME_A_ indent + 3, cdr(x));
		3274	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3275
		3276	case T_PAIR:
		3277	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3278	c = debug (SCHEME_A_ indent + 3, car (x));
		3279	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3280	return c + 1;
		3281
		3282	case T_PORT:
		3283	printf ("%*sS<%s>\n", indent, "", "port");
		3284	return 24+8;
		3285
		3286	case T_VECTOR:
		3287	printf ("%*sS<%s>\n", indent, "", "vector");
		3288	return 24+8;
		3289
		3290	case T_ENVIRONMENT:
		3291	printf ("%*sS<%s>\n", indent, "", "environment");
		3292	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3293
		3294	default:
		3295	printf ("unhandled type %d\n", type (x));
		3296	break;
		3297	}
		3298	}
		3299	#endif
		3300
3248	static int	3301	static int
3249	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3302	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250	{	3303	{
3251	pointer args = SCHEME_V->args;	3304	pointer args = SCHEME_V->args;
3252	pointer x, y;	3305	pointer x, y;
3253		3306
3254	switch (op)	3307	switch (op)
3255	{	3308	{
		3309	#if EXPERIMENT //D
		3310	case OP_DEBUG:
		3311	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3312	printf ("\n");
		3313	s_return (S_T);
		3314	#endif
3256	case OP_LOAD: /* load */	3315	case OP_LOAD: /* load */
3257	if (file_interactive (SCHEME_A))	3316	if (file_interactive (SCHEME_A))
3258	{	3317	{
3259	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3318	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3260	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3319	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3261	}	3320	}
3262		3321
3263	if (!file_push (SCHEME_A_ strvalue (car (args))))	3322	if (!file_push (SCHEME_A_ strvalue (car (args))))
3264	Error_1 ("unable to open", car (args));	3323	Error_1 ("unable to open", car (args));
3265	else	3324	else
…		…
3269	}	3328	}
3270		3329
3271	case OP_T0LVL: /* top level */	3330	case OP_T0LVL: /* top level */
3272		3331
3273	/* If we reached the end of file, this loop is done. */	3332	/* If we reached the end of file, this loop is done. */
3274	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3333	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3275	{	3334	{
3276	if (SCHEME_V->file_i == 0)	3335	if (SCHEME_V->file_i == 0)
3277	{	3336	{
3278	SCHEME_V->args = NIL;	3337	SCHEME_V->args = NIL;
3279	s_goto (OP_QUIT);	3338	s_goto (OP_QUIT);
…		…
3357	#endif	3416	#endif
3358	if (is_symbol (SCHEME_V->code)) /* symbol */	3417	if (is_symbol (SCHEME_V->code)) /* symbol */
3359	{	3418	{
3360	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3419	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3361		3420
3362	if (x != NIL)	3421	if (x == NIL)
3363	s_return (slot_value_in_env (x));
3364	else
3365	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3422	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3423
		3424	s_return (slot_value_in_env (x));
3366	}	3425	}
3367	else if (is_pair (SCHEME_V->code))	3426	else if (is_pair (SCHEME_V->code))
3368	{	3427	{
3369	x = car (SCHEME_V->code);	3428	x = car (SCHEME_V->code);
3370		3429
…		…
3383	}	3442	}
3384	else	3443	else
3385	s_return (SCHEME_V->code);	3444	s_return (SCHEME_V->code);
3386		3445
3387	case OP_E0ARGS: /* eval arguments */	3446	case OP_E0ARGS: /* eval arguments */
3388	if (is_macro (SCHEME_V->value)) /* macro expansion */	3447	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3389	{	3448	{
3390	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3449	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3391	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3450	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3392	SCHEME_V->code = SCHEME_V->value;	3451	SCHEME_V->code = SCHEME_V->value;
3393	s_goto (OP_APPLY);	3452	s_goto (OP_APPLY);
…		…
3447	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3506	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448	else if (is_foreign (SCHEME_V->code))	3507	else if (is_foreign (SCHEME_V->code))
3449	{	3508	{
3450	/* Keep nested calls from GC'ing the arglist */	3509	/* Keep nested calls from GC'ing the arglist */
3451	push_recent_alloc (SCHEME_A_ args, NIL);	3510	push_recent_alloc (SCHEME_A_ args, NIL);
3452	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3511	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3453		3512
3454	s_return (x);	3513	s_return (x);
3455	}	3514	}
3456	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */	3515	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3457	{	3516	{
…		…
3494		3553
3495	case OP_DOMACRO: /* do macro */	3554	case OP_DOMACRO: /* do macro */
3496	SCHEME_V->code = SCHEME_V->value;	3555	SCHEME_V->code = SCHEME_V->value;
3497	s_goto (OP_EVAL);	3556	s_goto (OP_EVAL);
3498		3557
3499	#if 1
3500
3501	case OP_LAMBDA: /* lambda */	3558	case OP_LAMBDA: /* lambda */
3502	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3559	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503	set SCHEME_V->value fall thru */	3560	set SCHEME_V->value fall thru */
3504	{	3561	{
3505	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3562	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3511	SCHEME_V->code = slot_value_in_env (f);	3568	SCHEME_V->code = slot_value_in_env (f);
3512	s_goto (OP_APPLY);	3569	s_goto (OP_APPLY);
3513	}	3570	}
3514		3571
3515	SCHEME_V->value = SCHEME_V->code;	3572	SCHEME_V->value = SCHEME_V->code;
3516	/* Fallthru */
3517	}	3573	}
		3574	/* Fallthru */
3518		3575
3519	case OP_LAMBDA1:	3576	case OP_LAMBDA1:
3520	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3577	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522	#else
3523
3524	case OP_LAMBDA: /* lambda */
3525	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527	#endif
3528		3578
3529	case OP_MKCLOSURE: /* make-closure */	3579	case OP_MKCLOSURE: /* make-closure */
3530	x = car (args);	3580	x = car (args);
3531		3581
3532	if (car (x) == SCHEME_V->LAMBDA)	3582	if (car (x) == SCHEME_V->LAMBDA)
…		…
3953		4003
3954	switch (op)	4004	switch (op)
3955	{	4005	{
3956	#if USE_MATH	4006	#if USE_MATH
3957	case OP_INEX2EX: /* inexact->exact */	4007	case OP_INEX2EX: /* inexact->exact */
3958	{
3959	if (is_integer (x))	4008	if (!is_integer (x))
3960	s_return (x);	4009	{
3961
3962	RVALUE r = rvalue_unchecked (x);	4010	RVALUE r = rvalue_unchecked (x);
3963		4011
3964	if (r == (RVALUE)(IVALUE)r)	4012	if (r == (RVALUE)(IVALUE)r)
3965	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4013	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3966	else	4014	else
3967	Error_1 ("inexact->exact: not integral:", x);	4015	Error_1 ("inexact->exact: not integral:", x);
3968	}	4016	}
3969		4017
		4018	s_return (x);
		4019
		4020	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
		4021	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
		4022	case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
		4023	case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
		4024
		4025	case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3970	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4026	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3971	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4027	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
		4028	/ (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3972	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4029	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3973	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4030	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3974	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));	4031	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3975	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));	4032	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3976	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));	4033	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3977		4034
3978	case OP_ATAN:	4035	case OP_ATAN:
		4036	s_return (mk_real (SCHEME_A_
3979	if (cdr (args) == NIL)	4037	cdr (args) == NIL
3980	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4038	? atan (rvalue (x))
3981	else	4039	: atan2 (rvalue (x), rvalue (cadr (args)))));
3982	{
3983	pointer y = cadr (args);
3984	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3985	}
3986
3987	case OP_SQRT:
3988	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989		4040
3990	case OP_EXPT:	4041	case OP_EXPT:
3991	{	4042	{
3992	RVALUE result;	4043	RVALUE result;
3993	int real_result = 1;	4044	int real_result = 1;
…		…
4016	if (real_result)	4067	if (real_result)
4017	s_return (mk_real (SCHEME_A_ result));	4068	s_return (mk_real (SCHEME_A_ result));
4018	else	4069	else
4019	s_return (mk_integer (SCHEME_A_ result));	4070	s_return (mk_integer (SCHEME_A_ result));
4020	}	4071	}
4021
4022	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4023	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4024
4025	case OP_TRUNCATE:
4026	{
4027	RVALUE n = rvalue (x);
4028	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4029	}
4030
4031	case OP_ROUND:
4032	if (is_integer (x))
4033	s_return (x);
4034
4035	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4036	#endif	4072	#endif
4037		4073
4038	case OP_ADD: /* + */	4074	case OP_ADD: /* + */
4039	v = num_zero;	4075	v = num_zero;
4040		4076
…		…
4128	else	4164	else
4129	Error_0 ("modulo: division by zero");	4165	Error_0 ("modulo: division by zero");
4130		4166
4131	s_return (mk_number (SCHEME_A_ v));	4167	s_return (mk_number (SCHEME_A_ v));
4132		4168
4133	case OP_CAR: /* car */	4169	/* the compiler will optimize this mess... */
4134	s_return (caar (args));	4170	case OP_CAR: op_car: s_return (car (x));
4135		4171	case OP_CDR: op_cdr: s_return (cdr (x));
4136	case OP_CDR: /* cdr */	4172	case OP_CAAR: op_caar: x = car (x); goto op_car;
4137	s_return (cdar (args));	4173	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4174	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4175	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4176	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4177	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4178	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4179	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4180	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4181	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4182	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4183	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4184	case OP_CAAAAR: x = car (x); goto op_caaar;
		4185	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4186	case OP_CAADAR: x = car (x); goto op_caadr;
		4187	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4188	case OP_CADAAR: x = car (x); goto op_cadar;
		4189	case OP_CADADR: x = cdr (x); goto op_cadar;
		4190	case OP_CADDAR: x = car (x); goto op_caddr;
		4191	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4192	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4193	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4194	case OP_CDADAR: x = car (x); goto op_cdadr;
		4195	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4196	case OP_CDDAAR: x = car (x); goto op_cddar;
		4197	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4198	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4199	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4138		4200
4139	case OP_CONS: /* cons */	4201	case OP_CONS: /* cons */
4140	set_cdr (args, cadr (args));	4202	set_cdr (args, cadr (args));
4141	s_return (args);	4203	s_return (args);
4142		4204
…		…
4316	memcpy (pos, strvalue (car (x)), strlength (car (x)));	4378	memcpy (pos, strvalue (car (x)), strlength (car (x)));
4317		4379
4318	s_return (newstr);	4380	s_return (newstr);
4319	}	4381	}
4320		4382
4321	case OP_SUBSTR: /* substring */	4383	case OP_STRING_COPY: /* substring/string-copy */
4322	{	4384	{
4323	char *str = strvalue (x);	4385	char *str = strvalue (x);
4324	int index0 = ivalue_unchecked (cadr (args));	4386	int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4325	int index1;	4387	int index1;
4326	int len;	4388	int len;
4327		4389
4328	if (index0 > strlength (x))	4390	if (index0 > strlength (x))
4329	Error_1 ("substring: start out of bounds:", cadr (args));	4391	Error_1 ("string->copy: start out of bounds:", cadr (args));
4330		4392
4331	if (cddr (args) != NIL)	4393	if (cddr (args) != NIL)
4332	{	4394	{
4333	index1 = ivalue_unchecked (caddr (args));	4395	index1 = ivalue_unchecked (caddr (args));
4334		4396
4335	if (index1 > strlength (x) || index1 < index0)	4397	if (index1 > strlength (x) || index1 < index0)
4336	Error_1 ("substring: end out of bounds:", caddr (args));	4398	Error_1 ("string->copy: end out of bounds:", caddr (args));
4337	}	4399	}
4338	else	4400	else
4339	index1 = strlength (x);	4401	index1 = strlength (x);
4340		4402
4341	len = index1 - index0;	4403	len = index1 - index0;
4342	x = mk_empty_string (SCHEME_A_ len, ' ');	4404	x = mk_counted_string (SCHEME_A_ str + index0, len);
4343	memcpy (strvalue (x), str + index0, len);
4344	strvalue (x)[len] = 0;
4345		4405
4346	s_return (x);	4406	s_return (x);
4347	}	4407	}
4348		4408
4349	case OP_VECTOR: /* vector */	4409	case OP_VECTOR: /* vector */
…		…
4390	s_return (vec);	4450	s_return (vec);
4391	}	4451	}
4392		4452
4393	case OP_VECLEN: /* vector-length */	4453	case OP_VECLEN: /* vector-length */
4394	s_return (mk_integer (SCHEME_A_ veclength (x)));	4454	s_return (mk_integer (SCHEME_A_ veclength (x)));
		4455
		4456	case OP_VECRESIZE:
		4457	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4458	s_return (x);
4395		4459
4396	case OP_VECREF: /* vector-ref */	4460	case OP_VECREF: /* vector-ref */
4397	{	4461	{
4398	int index = ivalue_unchecked (cadr (args));	4462	int index = ivalue_unchecked (cadr (args));
4399		4463
…		…
4460	pointer d = cdr (args);	4524	pointer d = cdr (args);
4461	int r;	4525	int r;
4462		4526
4463	switch (op)	4527	switch (op)
4464	{	4528	{
4465	case OP_NOT: /* not */ r = is_false (a) ; break;	4529	case OP_NOT: /* not */ r = is_false (a) ; break;
4466	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;	4530	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4531	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468	case OP_NULLP: /* null? */ r = a == NIL ; break;	4532	case OP_NULLP: /* null? */ r = a == NIL ; break;
4469	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4533	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4534	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4535	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4536	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4537	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4538	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4539	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475		4540
4476	#if USE_CHAR_CLASSIFIERS	4541	#if USE_CHAR_CLASSIFIERS
4477	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4542	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4543	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4544	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4529	}	4594	}
4530	else	4595	else
4531	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4532		4597
4533	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	*CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4535	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4536		4601
4537	#if USE_PORTS	4602	#if USE_PORTS
		4603
		4604	case OP_EOF_OBJECT: /* eof-object */
		4605	s_return (S_EOF);
4538		4606
4539	case OP_WRITE: /* write */	4607	case OP_WRITE: /* write */
4540	case OP_DISPLAY: /* display */	4608	case OP_DISPLAY: /* display */
4541	case OP_WRITE_CHAR: /* write-char */	4609	case OP_WRITE_CHAR: /* write-char */
4542	if (is_pair (cdr (SCHEME_V->args)))	4610	if (is_pair (cdr (SCHEME_V->args)))
…		…
4684	SCHEME_V->gc_verbose = (a != S_F);	4752	SCHEME_V->gc_verbose = (a != S_F);
4685	s_retbool (was);	4753	s_retbool (was);
4686	}	4754	}
4687		4755
4688	case OP_NEWSEGMENT: /* new-segment */	4756	case OP_NEWSEGMENT: /* new-segment */
		4757	#if 0
4689	if (!is_pair (args) || !is_number (a))	4758	if (!is_pair (args) || !is_number (a))
4690	Error_0 ("new-segment: argument must be a number");	4759	Error_0 ("new-segment: argument must be a number");
4691		4760	#endif
4692	alloc_cellseg (SCHEME_A_ ivalue (a));	4761	s_retbool (alloc_cellseg (SCHEME_A));
4693
4694	s_return (S_T);
4695		4762
4696	case OP_OBLIST: /* oblist */	4763	case OP_OBLIST: /* oblist */
4697	s_return (oblist_all_symbols (SCHEME_A));	4764	s_return (oblist_all_symbols (SCHEME_A));
4698		4765
4699	#if USE_PORTS	4766	#if USE_PORTS
…		…
4769	s_return (p == NIL ? S_F : p);	4836	s_return (p == NIL ? S_F : p);
4770	}	4837	}
4771		4838
4772	case OP_GET_OUTSTRING: /* get-output-string */	4839	case OP_GET_OUTSTRING: /* get-output-string */
4773	{	4840	{
4774	port *p;	4841	port *p = port (a);
4775		4842
4776	if ((p = a->object.port)->kind & port_string)	4843	if (p->kind & port_string)
4777	{	4844	{
4778	off_t size;	4845	off_t size;
4779	char *str;	4846	char *str;
4780		4847
4781	size = p->rep.string.curr - p->rep.string.start + 1;	4848	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4886	int res;	4953	int res;
4887		4954
4888	if (is_pair (args))	4955	if (is_pair (args))
4889	p = car (args);	4956	p = car (args);
4890		4957
4891	res = p->object.port->kind & port_string;	4958	res = port (p)->kind & port_string;
4892		4959
4893	s_retbool (res);	4960	s_retbool (res);
4894	}	4961	}
4895		4962
4896	case OP_SET_INPORT: /* set-input-port */	4963	case OP_SET_INPORT: /* set-input-port */
…		…
4955	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5022	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4956	SCHEME_V->tok = token (SCHEME_A);	5023	SCHEME_V->tok = token (SCHEME_A);
4957	s_goto (OP_RDSEXPR);	5024	s_goto (OP_RDSEXPR);
4958		5025
4959	case TOK_ATOM:	5026	case TOK_ATOM:
4960	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5027	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5028
		5029	case TOK_DOTATOM:
		5030	SCHEME_V->strbuff[0] = '.';
		5031	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5032
		5033	case TOK_STRATOM:
		5034	x = readstrexp (SCHEME_A_ '|');
		5035	//TODO: haven't checked whether the garbage collector could interfere
		5036	s_return (mk_atom (SCHEME_A_ strvalue (x)));
4961		5037
4962	case TOK_DQUOTE:	5038	case TOK_DQUOTE:
4963	x = readstrexp (SCHEME_A);	5039	x = readstrexp (SCHEME_A_ '"');
4964		5040
4965	if (x == S_F)	5041	if (x == S_F)
4966	Error_0 ("Error reading string");	5042	Error_0 ("Error reading string");
4967		5043
4968	setimmutable (x);	5044	setimmutable (x);
…		…
4980	s_goto (OP_EVAL);	5056	s_goto (OP_EVAL);
4981	}	5057	}
4982	}	5058	}
4983		5059
4984	case TOK_SHARP_CONST:	5060	case TOK_SHARP_CONST:
4985	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5061	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4986	Error_0 ("undefined sharp expression");	5062	Error_0 ("undefined sharp expression");
4987	else	5063	else
4988	s_return (x);	5064	s_return (x);
4989		5065
4990	default:	5066	default:
…		…
5212		5288
5213	case OP_CLOSUREP: /* closure? */	5289	case OP_CLOSUREP: /* closure? */
5214	/*	5290	/*
5215	* Note, macro object is also a closure.	5291	* Note, macro object is also a closure.
5216	* Therefore, (closure? <#MACRO>) ==> #t	5292	* Therefore, (closure? <#MACRO>) ==> #t
		5293	* (schmorp) well, obviously not, fix? TODO
5217	*/	5294	*/
5218	s_retbool (is_closure (a));	5295	s_retbool (is_closure (a));
5219		5296
5220	case OP_MACROP: /* macro? */	5297	case OP_MACROP: /* macro? */
5221	s_retbool (is_macro (a));	5298	s_retbool (is_macro (a));
…		…
5426	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))	5503	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5427	return;	5504	return;
5428		5505
5429	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5506	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5430	{	5507	{
5431	xwrstr ("No memory!\n");	5508	putstr (SCHEME_A_ "No memory!\n");
5432	return;	5509	return;
5433	}	5510	}
5434	}	5511	}
5435	}	5512	}
5436		5513
…		…
5462		5539
5463	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5540	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5464	static int	5541	static int
5465	syntaxnum (pointer p)	5542	syntaxnum (pointer p)
5466	{	5543	{
5467	const char *s = strvalue (car (p));	5544	const char *s = strvalue (p);
5468		5545
5469	switch (strlength (car (p)))	5546	switch (strlength (p))
5470	{	5547	{
5471	case 2:	5548	case 2:
5472	if (s[0] == 'i')	5549	if (s[0] == 'i')
5473	return OP_IF0; /* if */	5550	return OP_IF0; /* if */
5474	else	5551	else
…		…
5549	ecb_cold int	5626	ecb_cold int
5550	scheme_init (SCHEME_P)	5627	scheme_init (SCHEME_P)
5551	{	5628	{
5552	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5629	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5553	pointer x;	5630	pointer x;
		5631
		5632	/* this memset is not strictly correct, as we assume (intcache)
		5633	* that memset 0 will also set pointers to 0, but memset does
		5634	* of course not guarantee that. screw such systems.
		5635	*/
		5636	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5554		5637
5555	num_set_fixnum (num_zero, 1);	5638	num_set_fixnum (num_zero, 1);
5556	num_set_ivalue (num_zero, 0);	5639	num_set_ivalue (num_zero, 0);
5557	num_set_fixnum (num_one, 1);	5640	num_set_fixnum (num_one, 1);
5558	num_set_ivalue (num_one, 1);	5641	num_set_ivalue (num_one, 1);
…		…
5570	SCHEME_V->save_inport = NIL;	5653	SCHEME_V->save_inport = NIL;
5571	SCHEME_V->loadport = NIL;	5654	SCHEME_V->loadport = NIL;
5572	SCHEME_V->nesting = 0;	5655	SCHEME_V->nesting = 0;
5573	SCHEME_V->interactive_repl = 0;	5656	SCHEME_V->interactive_repl = 0;
5574		5657
5575	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5658	if (!alloc_cellseg (SCHEME_A))
5576	{	5659	{
5577	#if USE_ERROR_CHECKING	5660	#if USE_ERROR_CHECKING
5578	SCHEME_V->no_memory = 1;	5661	SCHEME_V->no_memory = 1;
5579	return 0;	5662	return 0;
5580	#endif	5663	#endif
…		…
5910	# endif	5993	# endif
5911	int fin;	5994	int fin;
5912	char *file_name = InitFile;	5995	char *file_name = InitFile;
5913	int retcode;	5996	int retcode;
5914	int isfile = 1;	5997	int isfile = 1;
		5998	system ("ps v $PPID");//D
5915		5999
5916	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6000	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5917	{	6001	{
5918	xwrstr ("Usage: tinyscheme -?\n");	6002	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5919	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6003	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5920	xwrstr ("followed by\n");	6004	putstr (SCHEME_A_ "followed by\n");
5921	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6005	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5922	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6006	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5923	xwrstr ("assuming that the executable is named tinyscheme.\n");	6007	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5924	xwrstr ("Use - as filename for stdin.\n");	6008	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5925	return 1;	6009	return 1;
5926	}	6010	}
5927		6011
5928	if (!scheme_init (SCHEME_A))	6012	if (!scheme_init (SCHEME_A))
5929	{	6013	{
5930	xwrstr ("Could not initialize!\n");	6014	putstr (SCHEME_A_ "Could not initialize!\n");
5931	return 2;	6015	return 2;
5932	}	6016	}
5933		6017
5934	# if USE_PORTS	6018	# if USE_PORTS
5935	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6019	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
5980	fin = open (file_name, O_RDONLY);	6064	fin = open (file_name, O_RDONLY);
5981	#endif	6065	#endif
5982		6066
5983	if (isfile && fin < 0)	6067	if (isfile && fin < 0)
5984	{	6068	{
5985	xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n");	6069	putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5986	}	6070	}
5987	else	6071	else
5988	{	6072	{
5989	if (isfile)	6073	if (isfile)
5990	scheme_load_named_file (SCHEME_A_ fin, file_name);	6074	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
5994	#if USE_PORTS	6078	#if USE_PORTS
5995	if (!isfile || fin != STDIN_FILENO)	6079	if (!isfile || fin != STDIN_FILENO)
5996	{	6080	{
5997	if (SCHEME_V->retcode != 0)	6081	if (SCHEME_V->retcode != 0)
5998	{	6082	{
5999	xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n");	6083	putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6000	}	6084	}
6001		6085
6002	if (isfile)	6086	if (isfile)
6003	close (fin);	6087	close (fin);
6004	}	6088	}

Diff Legend

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