ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.32 by root, Sat Nov 28 10:56:45 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 = mk_string (SCHEME_A_ name);	1170	pointer x = generate_symbol (SCHEME_A_ name);
1175	set_typeflag (x, T_SYMBOL);
1176	setimmutable (x);
1177	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1178	return x;	1172	return x;
1179	}	1173	}
1180		1174
1181	static pointer	1175	static pointer
…		…
1191	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1192	{	1186	{
1193	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1194		1188
1195	set_typeflag (x, T_PORT | T_ATOM);	1189	set_typeflag (x, T_PORT | T_ATOM);
1196	x->object.port = p;	1190	set_port (x, p);
1197		1191
1198	return x;	1192	return x;
1199	}	1193	}
1200	#endif	1194	#endif
1201		1195
1202	pointer	1196	pointer
1203	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1204	{	1198	{
1205	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1206		1200
1207	set_typeflag (x, (T_FOREIGN | T_ATOM));	1201	set_typeflag (x, T_FOREIGN | T_ATOM);
1208	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1209		1203
1210	return x;	1204	return x;
1211	}	1205	}
1212		1206
1213	INTERFACE pointer	1207	INTERFACE pointer
1214	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1215	{	1209	{
1216	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1217		1211
1218	set_typeflag (x, (T_CHARACTER | T_ATOM));	1212	set_typeflag (x, T_CHARACTER | T_ATOM);
1219	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1220		1214
1221	return x;	1215	return x;
1222	}	1216	}
1223		1217
1224	/* get number atom (integer) */	1218	/* get number atom (integer) */
1225	INTERFACE pointer	1219	INTERFACE pointer
1226	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1227	{	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	{
1228	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1229		1233
1230	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 */
1231	set_ivalue (x, n);	1236	set_ivalue (x, n);
1232		1237
		1238	*pp = x;
		1239	}
		1240
1233	return x;	1241	return *pp;
1234	}	1242	}
1235		1243
1236	INTERFACE pointer	1244	INTERFACE pointer
1237	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1238	{	1246	{
1239	#if USE_REAL	1247	#if USE_REAL
1240	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1241		1249
1242	set_typeflag (x, (T_REAL | T_ATOM));	1250	set_typeflag (x, T_REAL | T_ATOM);
1243	set_rvalue (x, n);	1251	set_rvalue (x, n);
1244		1252
1245	return x;	1253	return x;
1246	#else	1254	#else
1247	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1271	SCHEME_V->no_memory = 1;	1279	SCHEME_V->no_memory = 1;
1272	return SCHEME_V->strbuff;	1280	return SCHEME_V->strbuff;
1273	}	1281	}
1274		1282
1275	if (str)	1283	if (str)
1276	{	1284	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1277	int l = strlen (str);
1278
1279	if (l > len_str)
1280	l = len_str;
1281
1282	memcpy (q, str, l);
1283	q[l] = 0;
1284	}
1285	else	1285	else
1286	{
1287	memset (q, fill, len_str);	1286	memset (q, fill, len_str);
		1287
1288	q[len_str] = 0;	1288	q[len_str] = 0;
1289	}
1290		1289
1291	return q;	1290	return q;
1292	}	1291	}
1293		1292
1294	INTERFACE pointer	1293	INTERFACE pointer
…		…
1308	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1307	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1309		1308
1310	set_typeflag (x, T_STRING | T_ATOM);	1309	set_typeflag (x, T_STRING | T_ATOM);
1311	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1310	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1312	strlength (x) = len;	1311	strlength (x) = len;
		1312
1313	return x;	1313	return x;
1314	}	1314	}
1315		1315
1316	INTERFACE pointer	1316	INTERFACE pointer
1317	mk_string (SCHEME_P_ const char *str)	1317	mk_string (SCHEME_P_ const char *str)
…		…
1330	{	1330	{
1331	int i;	1331	int i;
1332		1332
1333	for (i = start; i < veclength (vec); i++)	1333	for (i = start; i < veclength (vec); i++)
1334	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);
1335	}	1344	}
1336		1345
1337	INTERFACE pointer	1346	INTERFACE pointer
1338	vector_get (pointer vec, uint32_t ielem)	1347	vector_get (pointer vec, uint32_t ielem)
1339	{	1348	{
…		…
1361		1370
1362	INTERFACE pointer	1371	INTERFACE pointer
1363	gensym (SCHEME_P)	1372	gensym (SCHEME_P)
1364	{	1373	{
1365	pointer x;	1374	pointer x;
1366
1367	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1368	{
1369	char name[40] = "gensym-";	1375	char name[40] = "gensym-";
1370	xnum (name + 7, SCHEME_V->gensym_cnt);	1376	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1371		1377
1372	/* first check oblist */	1378	return generate_symbol (SCHEME_A_ name);
1373	x = oblist_find_by_name (SCHEME_A_ name);	1379	}
1374		1380
1375	if (x == NIL)	1381	static int
1376	{	1382	is_gensym (SCHEME_P_ pointer x)
1377	x = oblist_add_by_name (SCHEME_A_ name);	1383	{
1378	return x;	1384	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1379	}
1380	}
1381
1382	return NIL;
1383	}	1385	}
1384		1386
1385	/* make symbol or number atom from string */	1387	/* make symbol or number atom from string */
1386	static pointer	1388	static pointer
1387	mk_atom (SCHEME_P_ char *q)	1389	mk_atom (SCHEME_P_ char *q)
…		…
1473	return S_F;	1475	return S_F;
1474	else if (*name == '\\') /* #\w (character) */	1476	else if (*name == '\\') /* #\w (character) */
1475	{	1477	{
1476	int c;	1478	int c;
1477		1479
		1480	// TODO: optimise
1478	if (stricmp (name + 1, "space") == 0)	1481	if (stricmp (name + 1, "space") == 0)
1479	c = ' ';	1482	c = ' ';
1480	else if (stricmp (name + 1, "newline") == 0)	1483	else if (stricmp (name + 1, "newline") == 0)
1481	c = '\n';	1484	c = '\n';
1482	else if (stricmp (name + 1, "return") == 0)	1485	else if (stricmp (name + 1, "return") == 0)
1483	c = '\r';	1486	c = '\r';
1484	else if (stricmp (name + 1, "tab") == 0)	1487	else if (stricmp (name + 1, "tab") == 0)
1485	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;
1486	else if (name[1] == 'x' && name[2] != 0)	1499	else if (name[1] == 'x' && name[2] != 0)
1487	{	1500	{
1488	long c1 = strtol (name + 2, 0, 16);	1501	long c1 = strtol (name + 2, 0, 16);
1489		1502
1490	if (0 <= c1 && c1 <= UCHAR_MAX)	1503	if (0 <= c1 && c1 <= UCHAR_MAX)
…		…
1596		1609
1597	/* garbage collection. parameter a, b is marked. */	1610	/* garbage collection. parameter a, b is marked. */
1598	static void	1611	static void
1599	gc (SCHEME_P_ pointer a, pointer b)	1612	gc (SCHEME_P_ pointer a, pointer b)
1600	{	1613	{
1601	pointer p;
1602	int i;	1614	int i;
1603		1615
1604	if (SCHEME_V->gc_verbose)	1616	if (SCHEME_V->gc_verbose)
1605	putstr (SCHEME_A_ "gc...");	1617	putstr (SCHEME_A_ "gc...");
1606		1618
…		…
1622	/* Mark recent objects the interpreter doesn't know about yet. */	1634	/* Mark recent objects the interpreter doesn't know about yet. */
1623	mark (car (S_SINK));	1635	mark (car (S_SINK));
1624	/* Mark any older stuff above nested C calls */	1636	/* Mark any older stuff above nested C calls */
1625	mark (SCHEME_V->c_nest);	1637	mark (SCHEME_V->c_nest);
1626		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
1627	/* mark variables a, b */	1646	/* mark variables a, b */
1628	mark (a);	1647	mark (a);
1629	mark (b);	1648	mark (b);
1630		1649
1631	/* garbage collect */	1650	/* garbage collect */
1632	clrmark (NIL);	1651	clrmark (NIL);
1633	SCHEME_V->fcells = 0;	1652	SCHEME_V->fcells = 0;
1634	SCHEME_V->free_cell = NIL;	1653	SCHEME_V->free_cell = NIL;
1635		1654
1636	/* free-list is kept sorted by address so as to maintain consecutive	1655	if (SCHEME_V->gc_verbose)
1637	ranges, if possible, for use with vectors. Here we scan the cells	1656	putstr (SCHEME_A_ "freeing...");
1638	(which are also kept sorted by address) downwards to build the	1657
1639	free-list in sorted order.	1658	uint32_t total = 0;
1640	*/	1659
		1660	/* Here we scan the cells to build the free-list. */
1641	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1661	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1642	{	1662	{
1643	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];
1644		1666
1645	while (--p >= SCHEME_V->cell_seg[i])	1667	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1646	{	1668	{
		1669	pointer c = POINTER (p);
		1670
1647	if (is_mark (p))	1671	if (is_mark (c))
1648	clrmark (p);	1672	clrmark (c);
1649	else	1673	else
1650	{	1674	{
1651	/* reclaim cell */	1675	/* reclaim cell */
1652	if (typeflag (p) != T_PAIR)	1676	if (typeflag (c) != T_PAIR)
1653	{	1677	{
1654	finalize_cell (SCHEME_A_ p);	1678	finalize_cell (SCHEME_A_ c);
1655	set_typeflag (p, T_PAIR);	1679	set_typeflag (c, T_PAIR);
1656	set_car (p, NIL);	1680	set_car (c, NIL);
1657	}	1681	}
1658		1682
1659	++SCHEME_V->fcells;	1683	++SCHEME_V->fcells;
1660	set_cdr (p, SCHEME_V->free_cell);	1684	set_cdr (c, SCHEME_V->free_cell);
1661	SCHEME_V->free_cell = p;	1685	SCHEME_V->free_cell = c;
1662	}	1686	}
1663	}	1687	}
1664	}	1688	}
1665		1689
1666	if (SCHEME_V->gc_verbose)	1690	if (SCHEME_V->gc_verbose)
1667	{	1691	{
1668	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");
1669	}	1693	}
1670	}	1694	}
1671		1695
1672	static void	1696	static void
1673	finalize_cell (SCHEME_P_ pointer a)	1697	finalize_cell (SCHEME_P_ pointer a)
1674	{	1698	{
1675	/* TODO, fast bitmap check? */	1699	/* TODO, fast bitmap check? */
1676	if (is_string (a))	1700	if (is_string (a) || is_symbol (a))
1677	free (strvalue (a));	1701	free (strvalue (a));
1678	else if (is_vector (a))	1702	else if (is_vector (a))
1679	free (vecvalue (a));	1703	free (vecvalue (a));
1680	#if USE_PORTS	1704	#if USE_PORTS
1681	else if (is_port (a))	1705	else if (is_port (a))
1682	{	1706	{
1683	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)
1684	port_close (SCHEME_A_ a, port_input | port_output);	1708	port_close (SCHEME_A_ a, port_input | port_output);
1685		1709
1686	free (a->object.port);	1710	free (port (a));
1687	}	1711	}
1688	#endif	1712	#endif
1689	}	1713	}
1690		1714
1691	/* ========== Routines for Reading ========== */	1715	/* ========== Routines for Reading ========== */
…		…
1707	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1731	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1708	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;
1709	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;
1710	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;
1711	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1735	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1712	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);
1713		1737
1714	#if SHOW_ERROR_LINE	1738	#if SHOW_ERROR_LINE
1715	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;
1716		1740
1717	if (fname)	1741	if (fname)
…		…
1734	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1758	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1735	#if USE_PORTS	1759	#if USE_PORTS
1736	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1760	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1737	#endif	1761	#endif
1738	SCHEME_V->file_i--;	1762	SCHEME_V->file_i--;
1739	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);
1740	}	1764	}
1741	}	1765	}
1742		1766
1743	static int	1767	static int
1744	file_interactive (SCHEME_P)	1768	file_interactive (SCHEME_P)
1745	{	1769	{
1746	#if USE_PORTS	1770	#if USE_PORTS
1747	return SCHEME_V->file_i == 0	1771	return SCHEME_V->file_i == 0
1748	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1772	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1749	&& (SCHEME_V->inport->object.port->kind & port_file);	1773	&& (port (SCHEME_V->inport)->kind & port_file);
1750	#else	1774	#else
1751	return 0;	1775	return 0;
1752	#endif	1776	#endif
1753	}	1777	}
1754		1778
…		…
1888	}	1912	}
1889		1913
1890	static void	1914	static void
1891	port_close (SCHEME_P_ pointer p, int flag)	1915	port_close (SCHEME_P_ pointer p, int flag)
1892	{	1916	{
1893	port *pt = p->object.port;	1917	port *pt = port (p);
1894		1918
1895	pt->kind &= ~flag;	1919	pt->kind &= ~flag;
1896		1920
1897	if ((pt->kind & (port_input | port_output)) == 0)	1921	if ((pt->kind & (port_input | port_output)) == 0)
1898	{	1922	{
…		…
1919	/* get new character from input file */	1943	/* get new character from input file */
1920	static int	1944	static int
1921	inchar (SCHEME_P)	1945	inchar (SCHEME_P)
1922	{	1946	{
1923	int c;	1947	int c;
1924	port *pt;	1948	port *pt = port (SCHEME_V->inport);
1925
1926	pt = SCHEME_V->inport->object.port;
1927		1949
1928	if (pt->kind & port_saw_EOF)	1950	if (pt->kind & port_saw_EOF)
1929	return EOF;	1951	return EOF;
1930		1952
1931	c = basic_inchar (pt);	1953	c = basic_inchar (pt);
…		…
1998	port *pt;	2020	port *pt;
1999		2021
2000	if (c == EOF)	2022	if (c == EOF)
2001	return;	2023	return;
2002		2024
2003	pt = SCHEME_V->inport->object.port;	2025	pt = port (SCHEME_V->inport);
2004	pt->unget = c;	2026	pt->unget = c;
2005	#else	2027	#else
2006	if (c == EOF)	2028	if (c == EOF)
2007	return;	2029	return;
2008		2030
…		…
2036		2058
2037	INTERFACE void	2059	INTERFACE void
2038	putstr (SCHEME_P_ const char *s)	2060	putstr (SCHEME_P_ const char *s)
2039	{	2061	{
2040	#if USE_PORTS	2062	#if USE_PORTS
2041	port *pt = SCHEME_V->outport->object.port;	2063	port *pt = port (SCHEME_V->outport);
2042		2064
2043	if (pt->kind & port_file)	2065	if (pt->kind & port_file)
2044	write (pt->rep.stdio.file, s, strlen (s));	2066	write (pt->rep.stdio.file, s, strlen (s));
2045	else	2067	else
2046	for (; *s; s++)	2068	for (; *s; s++)
…		…
2048	*pt->rep.string.curr++ = *s;	2070	*pt->rep.string.curr++ = *s;
2049	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))
2050	*pt->rep.string.curr++ = *s;	2072	*pt->rep.string.curr++ = *s;
2051		2073
2052	#else	2074	#else
2053	xwrstr (s);	2075	write (pt->rep.stdio.file, s, strlen (s));
2054	#endif	2076	#endif
2055	}	2077	}
2056		2078
2057	static void	2079	static void
2058	putchars (SCHEME_P_ const char *s, int len)	2080	putchars (SCHEME_P_ const char *s, int len)
2059	{	2081	{
2060	#if USE_PORTS	2082	#if USE_PORTS
2061	port *pt = SCHEME_V->outport->object.port;	2083	port *pt = port (SCHEME_V->outport);
2062		2084
2063	if (pt->kind & port_file)	2085	if (pt->kind & port_file)
2064	write (pt->rep.stdio.file, s, len);	2086	write (pt->rep.stdio.file, s, len);
2065	else	2087	else
2066	{	2088	{
…		…
2080		2102
2081	INTERFACE void	2103	INTERFACE void
2082	putcharacter (SCHEME_P_ int c)	2104	putcharacter (SCHEME_P_ int c)
2083	{	2105	{
2084	#if USE_PORTS	2106	#if USE_PORTS
2085	port *pt = SCHEME_V->outport->object.port;	2107	port *pt = port (SCHEME_V->outport);
2086		2108
2087	if (pt->kind & port_file)	2109	if (pt->kind & port_file)
2088	{	2110	{
2089	char cc = c;	2111	char cc = c;
2090	write (pt->rep.stdio.file, &cc, 1);	2112	write (pt->rep.stdio.file, &cc, 1);
…		…
2103	#endif	2125	#endif
2104	}	2126	}
2105		2127
2106	/* read characters up to delimiter, but cater to character constants */	2128	/* read characters up to delimiter, but cater to character constants */
2107	static char *	2129	static char *
2108	readstr_upto (SCHEME_P_ char *delim)	2130	readstr_upto (SCHEME_P_ int skip, const char *delim)
2109	{	2131	{
2110	char *p = SCHEME_V->strbuff;	2132	char *p = SCHEME_V->strbuff + skip;
2111		2133
2112	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))));
2113		2135
2114	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2136	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2115	*p = 0;	2137	*p = 0;
…		…
2122	return SCHEME_V->strbuff;	2144	return SCHEME_V->strbuff;
2123	}	2145	}
2124		2146
2125	/* read string expression "xxx...xxx" */	2147	/* read string expression "xxx...xxx" */
2126	static pointer	2148	static pointer
2127	readstrexp (SCHEME_P)	2149	readstrexp (SCHEME_P_ char delim)
2128	{	2150	{
2129	char *p = SCHEME_V->strbuff;	2151	char *p = SCHEME_V->strbuff;
2130	int c;	2152	int c;
2131	int c1 = 0;	2153	int c1 = 0;
2132	enum
2133	{ 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;
2134		2155
2135	for (;;)	2156	for (;;)
2136	{	2157	{
2137	c = inchar (SCHEME_A);	2158	c = inchar (SCHEME_A);
2138		2159
…		…
2140	return S_F;	2161	return S_F;
2141		2162
2142	switch (state)	2163	switch (state)
2143	{	2164	{
2144	case st_ok:	2165	case st_ok:
2145	switch (c)	2166	if (ecb_expect_false (c == delim))
2146	{
2147	case '\\':
2148	state = st_bsl;
2149	break;
2150
2151	case '"':
2152	*p = 0;
2153	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);
2154		2168
2155	default:	2169	if (ecb_expect_false (c == '\\'))
		2170	state = st_bsl;
		2171	else
2156	*p++ = c;	2172	*p++ = c;
2157	break;
2158	}
2159		2173
2160	break;	2174	break;
2161		2175
2162	case st_bsl:	2176	case st_bsl:
2163	switch (c)	2177	switch (c)
…		…
2172	case '7':	2186	case '7':
2173	state = st_oct1;	2187	state = st_oct1;
2174	c1 = c - '0';	2188	c1 = c - '0';
2175	break;	2189	break;
2176		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
2177	case 'x':	2199	case 'x':
2178	case 'X':	2200	case 'X':
2179	state = st_x1;	2201	state = st_x1;
2180	c1 = 0;	2202	c1 = 0;
2181	break;	2203	break;
2182		2204
2183	case 'n':
2184	*p++ = '\n';
2185	state = st_ok;
2186	break;
2187
2188	case 't':
2189	*p++ = '\t';
2190	state = st_ok;
2191	break;
2192
2193	case 'r':
2194	*p++ = '\r';
2195	state = st_ok;
2196	break;
2197
2198	case '"':
2199	*p++ = '"';
2200	state = st_ok;
2201	break;
2202
2203	default:	2205	default:
2204	*p++ = c;	2206	*p++ = c;
2205	state = st_ok;	2207	state = st_ok;
2206	break;	2208	break;
2207	}	2209	}
2208		2210
2209	break;	2211	break;
2210		2212
2211	case st_x1:	2213	case st_x1:
2212	case st_x2:	2214	case st_x2:
2213	c = toupper (c);	2215	c = tolower (c);
2214		2216
2215	if (c >= '0' && c <= 'F')	2217	if (c >= '0' && c <= '9')
2216	{
2217	if (c <= '9')
2218	c1 = (c1 << 4) + c - '0';	2218	c1 = (c1 << 4) + c - '0';
2219	else	2219	else if (c >= 'a' && c <= 'f')
2220	c1 = (c1 << 4) + c - 'A' + 10;	2220	c1 = (c1 << 4) + c - 'a' + 10;
2221
2222	if (state == st_x1)
2223	state = st_x2;
2224	else
2225	{
2226	*p++ = c1;
2227	state = st_ok;
2228	}
2229	}
2230	else	2221	else
2231	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	}
2232		2231
2233	break;	2232	break;
2234		2233
2235	case st_oct1:	2234	case st_oct1:
2236	case st_oct2:	2235	case st_oct2:
…		…
2240	backchar (SCHEME_A_ c);	2239	backchar (SCHEME_A_ c);
2241	state = st_ok;	2240	state = st_ok;
2242	}	2241	}
2243	else	2242	else
2244	{	2243	{
2245	if (state == st_oct2 && c1 >= 32)	2244	if (state == st_oct2 && c1 >= ' ')
2246	return S_F;	2245	return S_F;
2247		2246
2248	c1 = (c1 << 3) + (c - '0');	2247	c1 = (c1 << 3) + (c - '0');
2249		2248
2250	if (state == st_oct1)	2249	if (state == st_oct1)
…		…
2255	state = st_ok;	2254	state = st_ok;
2256	}	2255	}
2257	}	2256	}
2258		2257
2259	break;	2258	break;
2260
2261	}	2259	}
2262	}	2260	}
2263	}	2261	}
2264		2262
2265	/* check c is in chars */	2263	/* check c is in chars */
2266	ecb_inline int	2264	ecb_inline int
2267	is_one_of (char *s, int c)	2265	is_one_of (const char *s, int c)
2268	{	2266	{
2269	if (c == EOF)
2270	return 1;
2271
2272	return !!strchr (s, c);	2267	return c == EOF || !!strchr (s, c);
2273	}	2268	}
2274		2269
2275	/* skip white characters */	2270	/* skip white characters */
2276	ecb_inline int	2271	ecb_inline int
2277	skipspace (SCHEME_P)	2272	skipspace (SCHEME_P)
…		…
2279	int c, curr_line = 0;	2274	int c, curr_line = 0;
2280		2275
2281	do	2276	do
2282	{	2277	{
2283	c = inchar (SCHEME_A);	2278	c = inchar (SCHEME_A);
		2279
2284	#if SHOW_ERROR_LINE	2280	#if SHOW_ERROR_LINE
2285	if (c == '\n')	2281	if (ecb_expect_false (c == '\n'))
2286	curr_line++;	2282	curr_line++;
2287	#endif	2283	#endif
		2284
		2285	if (ecb_expect_false (c == EOF))
		2286	return c;
2288	}	2287	}
2289	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2288	while (is_one_of (WHITESPACE, c));
2290		2289
2291	/* record it */	2290	/* record it */
2292	#if SHOW_ERROR_LINE	2291	#if SHOW_ERROR_LINE
2293	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)
2294	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;
2295	#endif	2294	#endif
2296		2295
2297	if (c != EOF)
2298	{
2299	backchar (SCHEME_A_ c);	2296	backchar (SCHEME_A_ c);
2300	return 1;	2297	return 1;
2301	}
2302	else
2303	return EOF;
2304	}	2298	}
2305		2299
2306	/* get token */	2300	/* get token */
2307	static int	2301	static int
2308	token (SCHEME_P)	2302	token (SCHEME_P)
…		…
2324	return TOK_RPAREN;	2318	return TOK_RPAREN;
2325		2319
2326	case '.':	2320	case '.':
2327	c = inchar (SCHEME_A);	2321	c = inchar (SCHEME_A);
2328		2322
2329	if (is_one_of (" \n\t", c))	2323	if (is_one_of (WHITESPACE, c))
2330	return TOK_DOT;	2324	return TOK_DOT;
2331	else	2325	else
2332	{	2326	{
2333	//TODO: ungetc twice in a row is not supported in C
2334	backchar (SCHEME_A_ c);	2327	backchar (SCHEME_A_ c);
2335	backchar (SCHEME_A_ '.');
2336	return TOK_ATOM;	2328	return TOK_DOTATOM;
2337	}	2329	}
		2330
		2331	case '|':
		2332	return TOK_STRATOM;
2338		2333
2339	case '\'':	2334	case '\'':
2340	return TOK_QUOTE;	2335	return TOK_QUOTE;
2341		2336
2342	case ';':	2337	case ';':
…		…
2474	}	2469	}
2475		2470
2476	putcharacter (SCHEME_A_ '"');	2471	putcharacter (SCHEME_A_ '"');
2477	}	2472	}
2478		2473
2479
2480	/* print atoms */	2474	/* print atoms */
2481	static void	2475	static void
2482	printatom (SCHEME_P_ pointer l, int f)	2476	printatom (SCHEME_P_ pointer l, int f)
2483	{	2477	{
2484	char *p;	2478	char *p;
2485	int len;	2479	int len;
2486		2480
2487	atom2str (SCHEME_A_ l, f, &p, &len);	2481	atom2str (SCHEME_A_ l, f, &p, &len);
2488	putchars (SCHEME_A_ p, len);	2482	putchars (SCHEME_A_ p, len);
2489	}	2483	}
2490
2491		2484
2492	/* Uses internal buffer unless string pointer is already available */	2485	/* Uses internal buffer unless string pointer is already available */
2493	static void	2486	static void
2494	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2487	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2495	{	2488	{
…		…
2656	#endif	2649	#endif
2657	}	2650	}
2658	else if (is_continuation (l))	2651	else if (is_continuation (l))
2659	p = "#<CONTINUATION>";	2652	p = "#<CONTINUATION>";
2660	else	2653	else
		2654	{
		2655	#if USE_PRINTF
		2656	p = SCHEME_V->strbuff;
		2657	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2658	#else
2661	p = "#<ERROR>";	2659	p = "#<ERROR>";
		2660	#endif
		2661	}
2662		2662
2663	*pp = p;	2663	*pp = p;
2664	*plen = strlen (p);	2664	*plen = strlen (p);
2665	}	2665	}
2666		2666
…		…
2810	/* () is #t in R5RS */	2810	/* () is #t in R5RS */
2811	#define is_true(p) ((p) != S_F)	2811	#define is_true(p) ((p) != S_F)
2812	#define is_false(p) ((p) == S_F)	2812	#define is_false(p) ((p) == S_F)
2813		2813
2814	/* ========== Environment implementation ========== */	2814	/* ========== Environment implementation ========== */
2815
2816	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2817
2818	static int
2819	hash_fn (const char *key, int table_size)
2820	{
2821	const unsigned char *p = key;
2822	uint32_t hash = 2166136261;
2823
2824	while (*p)
2825	hash = (hash ^ *p++) * 16777619;
2826
2827	return hash % table_size;
2828	}
2829	#endif
2830		2815
2831	#ifndef USE_ALIST_ENV	2816	#ifndef USE_ALIST_ENV
2832		2817
2833	/*	2818	/*
2834	* In this implementation, each frame of the environment may be	2819	* In this implementation, each frame of the environment may be
…		…
2857	sym_hash (pointer sym, uint32_t size)	2842	sym_hash (pointer sym, uint32_t size)
2858	{	2843	{
2859	uintptr_t ptr = (uintptr_t)sym;	2844	uintptr_t ptr = (uintptr_t)sym;
2860		2845
2861	#if 0	2846	#if 0
2862	/* tqable size is prime, so why mix */	2847	/* table size is prime, so why mix */
2863	ptr += ptr >> 32;	2848	ptr += ptr >> 32;
2864	ptr += ptr >> 16;	2849	ptr += ptr >> 16;
2865	ptr += ptr >> 8;	2850	ptr += ptr >> 8;
2866	#endif	2851	#endif
2867		2852
…		…
2951	#endif /* USE_ALIST_ENV else */	2936	#endif /* USE_ALIST_ENV else */
2952		2937
2953	ecb_inline void	2938	ecb_inline void
2954	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2939	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2955	{	2940	{
		2941	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2956	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);
2957	}	2943	}
2958		2944
2959	ecb_inline void	2945	ecb_inline void
2960	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2946	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3061	{	3047	{
3062	int nframes = (uintptr_t)SCHEME_V->dump;	3048	int nframes = (uintptr_t)SCHEME_V->dump;
3063	struct dump_stack_frame *next_frame;	3049	struct dump_stack_frame *next_frame;
3064		3050
3065	/* enough room for the next frame? */	3051	/* enough room for the next frame? */
3066	if (nframes >= SCHEME_V->dump_size)	3052	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3067	{	3053	{
3068	SCHEME_V->dump_size += STACK_GROWTH;	3054	SCHEME_V->dump_size += STACK_GROWTH;
3069	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);
3070	}	3056	}
3071		3057
…		…
3252		3238
3253	#endif	3239	#endif
3254		3240
3255	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3241	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3256		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
3257	static int	3301	static int
3258	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3302	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3259	{	3303	{
3260	pointer args = SCHEME_V->args;	3304	pointer args = SCHEME_V->args;
3261	pointer x, y;	3305	pointer x, y;
3262		3306
3263	switch (op)	3307	switch (op)
3264	{	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
3265	case OP_LOAD: /* load */	3315	case OP_LOAD: /* load */
3266	if (file_interactive (SCHEME_A))	3316	if (file_interactive (SCHEME_A))
3267	{	3317	{
3268	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3318	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3269	//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)));
3270	}	3320	}
3271		3321
3272	if (!file_push (SCHEME_A_ strvalue (car (args))))	3322	if (!file_push (SCHEME_A_ strvalue (car (args))))
3273	Error_1 ("unable to open", car (args));	3323	Error_1 ("unable to open", car (args));
3274	else	3324	else
…		…
3278	}	3328	}
3279		3329
3280	case OP_T0LVL: /* top level */	3330	case OP_T0LVL: /* top level */
3281		3331
3282	/* If we reached the end of file, this loop is done. */	3332	/* If we reached the end of file, this loop is done. */
3283	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3333	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3284	{	3334	{
3285	if (SCHEME_V->file_i == 0)	3335	if (SCHEME_V->file_i == 0)
3286	{	3336	{
3287	SCHEME_V->args = NIL;	3337	SCHEME_V->args = NIL;
3288	s_goto (OP_QUIT);	3338	s_goto (OP_QUIT);
…		…
3366	#endif	3416	#endif
3367	if (is_symbol (SCHEME_V->code)) /* symbol */	3417	if (is_symbol (SCHEME_V->code)) /* symbol */
3368	{	3418	{
3369	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);
3370		3420
3371	if (x != NIL)	3421	if (x == NIL)
3372	s_return (slot_value_in_env (x));
3373	else
3374	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));
3375	}	3425	}
3376	else if (is_pair (SCHEME_V->code))	3426	else if (is_pair (SCHEME_V->code))
3377	{	3427	{
3378	x = car (SCHEME_V->code);	3428	x = car (SCHEME_V->code);
3379		3429
…		…
3392	}	3442	}
3393	else	3443	else
3394	s_return (SCHEME_V->code);	3444	s_return (SCHEME_V->code);
3395		3445
3396	case OP_E0ARGS: /* eval arguments */	3446	case OP_E0ARGS: /* eval arguments */
3397	if (is_macro (SCHEME_V->value)) /* macro expansion */	3447	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3398	{	3448	{
3399	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3449	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3400	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3450	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3401	SCHEME_V->code = SCHEME_V->value;	3451	SCHEME_V->code = SCHEME_V->value;
3402	s_goto (OP_APPLY);	3452	s_goto (OP_APPLY);
…		…
3456	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3506	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3457	else if (is_foreign (SCHEME_V->code))	3507	else if (is_foreign (SCHEME_V->code))
3458	{	3508	{
3459	/* Keep nested calls from GC'ing the arglist */	3509	/* Keep nested calls from GC'ing the arglist */
3460	push_recent_alloc (SCHEME_A_ args, NIL);	3510	push_recent_alloc (SCHEME_A_ args, NIL);
3461	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3511	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3462		3512
3463	s_return (x);	3513	s_return (x);
3464	}	3514	}
3465	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 */
3466	{	3516	{
…		…
3503		3553
3504	case OP_DOMACRO: /* do macro */	3554	case OP_DOMACRO: /* do macro */
3505	SCHEME_V->code = SCHEME_V->value;	3555	SCHEME_V->code = SCHEME_V->value;
3506	s_goto (OP_EVAL);	3556	s_goto (OP_EVAL);
3507		3557
3508	#if 1
3509
3510	case OP_LAMBDA: /* lambda */	3558	case OP_LAMBDA: /* lambda */
3511	/* 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
3512	set SCHEME_V->value fall thru */	3560	set SCHEME_V->value fall thru */
3513	{	3561	{
3514	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);
…		…
3520	SCHEME_V->code = slot_value_in_env (f);	3568	SCHEME_V->code = slot_value_in_env (f);
3521	s_goto (OP_APPLY);	3569	s_goto (OP_APPLY);
3522	}	3570	}
3523		3571
3524	SCHEME_V->value = SCHEME_V->code;	3572	SCHEME_V->value = SCHEME_V->code;
3525	/* Fallthru */
3526	}	3573	}
		3574	/* Fallthru */
3527		3575
3528	case OP_LAMBDA1:	3576	case OP_LAMBDA1:
3529	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));
3530
3531	#else
3532
3533	case OP_LAMBDA: /* lambda */
3534	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3535
3536	#endif
3537		3578
3538	case OP_MKCLOSURE: /* make-closure */	3579	case OP_MKCLOSURE: /* make-closure */
3539	x = car (args);	3580	x = car (args);
3540		3581
3541	if (car (x) == SCHEME_V->LAMBDA)	3582	if (car (x) == SCHEME_V->LAMBDA)
…		…
3962		4003
3963	switch (op)	4004	switch (op)
3964	{	4005	{
3965	#if USE_MATH	4006	#if USE_MATH
3966	case OP_INEX2EX: /* inexact->exact */	4007	case OP_INEX2EX: /* inexact->exact */
3967	{
3968	if (is_integer (x))	4008	if (!is_integer (x))
3969	s_return (x);	4009	{
3970
3971	RVALUE r = rvalue_unchecked (x);	4010	RVALUE r = rvalue_unchecked (x);
3972		4011
3973	if (r == (RVALUE)(IVALUE)r)	4012	if (r == (RVALUE)(IVALUE)r)
3974	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4013	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3975	else	4014	else
3976	Error_1 ("inexact->exact: not integral:", x);	4015	Error_1 ("inexact->exact: not integral:", x);
3977	}	4016	}
3978		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))));
3979	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))));
3980	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))))));
3981	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))));
3982	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))));
3983	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))));
3984	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))));
3985	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))));
3986		4034
3987	case OP_ATAN:	4035	case OP_ATAN:
		4036	s_return (mk_real (SCHEME_A_
3988	if (cdr (args) == NIL)	4037	cdr (args) == NIL
3989	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4038	? atan (rvalue (x))
3990	else	4039	: atan2 (rvalue (x), rvalue (cadr (args)))));
3991	{
3992	pointer y = cadr (args);
3993	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3994	}
3995
3996	case OP_SQRT:
3997	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3998		4040
3999	case OP_EXPT:	4041	case OP_EXPT:
4000	{	4042	{
4001	RVALUE result;	4043	RVALUE result;
4002	int real_result = 1;	4044	int real_result = 1;
…		…
4025	if (real_result)	4067	if (real_result)
4026	s_return (mk_real (SCHEME_A_ result));	4068	s_return (mk_real (SCHEME_A_ result));
4027	else	4069	else
4028	s_return (mk_integer (SCHEME_A_ result));	4070	s_return (mk_integer (SCHEME_A_ result));
4029	}	4071	}
4030
4031	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4032	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4033
4034	case OP_TRUNCATE:
4035	{
4036	RVALUE n = rvalue (x);
4037	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4038	}
4039
4040	case OP_ROUND:
4041	if (is_integer (x))
4042	s_return (x);
4043
4044	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4045	#endif	4072	#endif
4046		4073
4047	case OP_ADD: /* + */	4074	case OP_ADD: /* + */
4048	v = num_zero;	4075	v = num_zero;
4049		4076
…		…
4137	else	4164	else
4138	Error_0 ("modulo: division by zero");	4165	Error_0 ("modulo: division by zero");
4139		4166
4140	s_return (mk_number (SCHEME_A_ v));	4167	s_return (mk_number (SCHEME_A_ v));
4141		4168
4142	case OP_CAR: /* car */	4169	/* the compiler will optimize this mess... */
4143	s_return (caar (args));	4170	case OP_CAR: op_car: s_return (car (x));
4144		4171	case OP_CDR: op_cdr: s_return (cdr (x));
4145	case OP_CDR: /* cdr */	4172	case OP_CAAR: op_caar: x = car (x); goto op_car;
4146	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;
4147		4200
4148	case OP_CONS: /* cons */	4201	case OP_CONS: /* cons */
4149	set_cdr (args, cadr (args));	4202	set_cdr (args, cadr (args));
4150	s_return (args);	4203	s_return (args);
4151		4204
…		…
4325	memcpy (pos, strvalue (car (x)), strlength (car (x)));	4378	memcpy (pos, strvalue (car (x)), strlength (car (x)));
4326		4379
4327	s_return (newstr);	4380	s_return (newstr);
4328	}	4381	}
4329		4382
4330	case OP_SUBSTR: /* substring */	4383	case OP_STRING_COPY: /* substring/string-copy */
4331	{	4384	{
4332	char *str = strvalue (x);	4385	char *str = strvalue (x);
4333	int index0 = ivalue_unchecked (cadr (args));	4386	int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4334	int index1;	4387	int index1;
4335	int len;	4388	int len;
4336		4389
4337	if (index0 > strlength (x))	4390	if (index0 > strlength (x))
4338	Error_1 ("substring: start out of bounds:", cadr (args));	4391	Error_1 ("string->copy: start out of bounds:", cadr (args));
4339		4392
4340	if (cddr (args) != NIL)	4393	if (cddr (args) != NIL)
4341	{	4394	{
4342	index1 = ivalue_unchecked (caddr (args));	4395	index1 = ivalue_unchecked (caddr (args));
4343		4396
4344	if (index1 > strlength (x) || index1 < index0)	4397	if (index1 > strlength (x) || index1 < index0)
4345	Error_1 ("substring: end out of bounds:", caddr (args));	4398	Error_1 ("string->copy: end out of bounds:", caddr (args));
4346	}	4399	}
4347	else	4400	else
4348	index1 = strlength (x);	4401	index1 = strlength (x);
4349		4402
4350	len = index1 - index0;	4403	len = index1 - index0;
4351	x = mk_empty_string (SCHEME_A_ len, ' ');	4404	x = mk_counted_string (SCHEME_A_ str + index0, len);
4352	memcpy (strvalue (x), str + index0, len);
4353	strvalue (x)[len] = 0;
4354		4405
4355	s_return (x);	4406	s_return (x);
4356	}	4407	}
4357		4408
4358	case OP_VECTOR: /* vector */	4409	case OP_VECTOR: /* vector */
…		…
4399	s_return (vec);	4450	s_return (vec);
4400	}	4451	}
4401		4452
4402	case OP_VECLEN: /* vector-length */	4453	case OP_VECLEN: /* vector-length */
4403	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);
4404		4459
4405	case OP_VECREF: /* vector-ref */	4460	case OP_VECREF: /* vector-ref */
4406	{	4461	{
4407	int index = ivalue_unchecked (cadr (args));	4462	int index = ivalue_unchecked (cadr (args));
4408		4463
…		…
4469	pointer d = cdr (args);	4524	pointer d = cdr (args);
4470	int r;	4525	int r;
4471		4526
4472	switch (op)	4527	switch (op)
4473	{	4528	{
4474	case OP_NOT: /* not */ r = is_false (a) ; break;	4529	case OP_NOT: /* not */ r = is_false (a) ; break;
4475	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;
4476	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4531	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4477	case OP_NULLP: /* null? */ r = a == NIL ; break;	4532	case OP_NULLP: /* null? */ r = a == NIL ; break;
4478	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;
4479	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4535	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4480	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4536	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4481	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4537	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4482	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 */
4483	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4539	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4484		4540
4485	#if USE_CHAR_CLASSIFIERS	4541	#if USE_CHAR_CLASSIFIERS
4486	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4542	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4487	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4543	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4488	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4544	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4538	}	4594	}
4539	else	4595	else
4540	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4541		4597
4542	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4543	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	*CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4544	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4545		4601
4546	#if USE_PORTS	4602	#if USE_PORTS
		4603
		4604	case OP_EOF_OBJECT: /* eof-object */
		4605	s_return (S_EOF);
4547		4606
4548	case OP_WRITE: /* write */	4607	case OP_WRITE: /* write */
4549	case OP_DISPLAY: /* display */	4608	case OP_DISPLAY: /* display */
4550	case OP_WRITE_CHAR: /* write-char */	4609	case OP_WRITE_CHAR: /* write-char */
4551	if (is_pair (cdr (SCHEME_V->args)))	4610	if (is_pair (cdr (SCHEME_V->args)))
…		…
4693	SCHEME_V->gc_verbose = (a != S_F);	4752	SCHEME_V->gc_verbose = (a != S_F);
4694	s_retbool (was);	4753	s_retbool (was);
4695	}	4754	}
4696		4755
4697	case OP_NEWSEGMENT: /* new-segment */	4756	case OP_NEWSEGMENT: /* new-segment */
		4757	#if 0
4698	if (!is_pair (args) || !is_number (a))	4758	if (!is_pair (args) || !is_number (a))
4699	Error_0 ("new-segment: argument must be a number");	4759	Error_0 ("new-segment: argument must be a number");
4700		4760	#endif
4701	alloc_cellseg (SCHEME_A_ ivalue (a));	4761	s_retbool (alloc_cellseg (SCHEME_A));
4702
4703	s_return (S_T);
4704		4762
4705	case OP_OBLIST: /* oblist */	4763	case OP_OBLIST: /* oblist */
4706	s_return (oblist_all_symbols (SCHEME_A));	4764	s_return (oblist_all_symbols (SCHEME_A));
4707		4765
4708	#if USE_PORTS	4766	#if USE_PORTS
…		…
4778	s_return (p == NIL ? S_F : p);	4836	s_return (p == NIL ? S_F : p);
4779	}	4837	}
4780		4838
4781	case OP_GET_OUTSTRING: /* get-output-string */	4839	case OP_GET_OUTSTRING: /* get-output-string */
4782	{	4840	{
4783	port *p;	4841	port *p = port (a);
4784		4842
4785	if ((p = a->object.port)->kind & port_string)	4843	if (p->kind & port_string)
4786	{	4844	{
4787	off_t size;	4845	off_t size;
4788	char *str;	4846	char *str;
4789		4847
4790	size = p->rep.string.curr - p->rep.string.start + 1;	4848	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4895	int res;	4953	int res;
4896		4954
4897	if (is_pair (args))	4955	if (is_pair (args))
4898	p = car (args);	4956	p = car (args);
4899		4957
4900	res = p->object.port->kind & port_string;	4958	res = port (p)->kind & port_string;
4901		4959
4902	s_retbool (res);	4960	s_retbool (res);
4903	}	4961	}
4904		4962
4905	case OP_SET_INPORT: /* set-input-port */	4963	case OP_SET_INPORT: /* set-input-port */
…		…
4964	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5022	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4965	SCHEME_V->tok = token (SCHEME_A);	5023	SCHEME_V->tok = token (SCHEME_A);
4966	s_goto (OP_RDSEXPR);	5024	s_goto (OP_RDSEXPR);
4967		5025
4968	case TOK_ATOM:	5026	case TOK_ATOM:
4969	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)));
4970		5037
4971	case TOK_DQUOTE:	5038	case TOK_DQUOTE:
4972	x = readstrexp (SCHEME_A);	5039	x = readstrexp (SCHEME_A_ '"');
4973		5040
4974	if (x == S_F)	5041	if (x == S_F)
4975	Error_0 ("Error reading string");	5042	Error_0 ("Error reading string");
4976		5043
4977	setimmutable (x);	5044	setimmutable (x);
…		…
4989	s_goto (OP_EVAL);	5056	s_goto (OP_EVAL);
4990	}	5057	}
4991	}	5058	}
4992		5059
4993	case TOK_SHARP_CONST:	5060	case TOK_SHARP_CONST:
4994	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)
4995	Error_0 ("undefined sharp expression");	5062	Error_0 ("undefined sharp expression");
4996	else	5063	else
4997	s_return (x);	5064	s_return (x);
4998		5065
4999	default:	5066	default:
…		…
5221		5288
5222	case OP_CLOSUREP: /* closure? */	5289	case OP_CLOSUREP: /* closure? */
5223	/*	5290	/*
5224	* Note, macro object is also a closure.	5291	* Note, macro object is also a closure.
5225	* Therefore, (closure? <#MACRO>) ==> #t	5292	* Therefore, (closure? <#MACRO>) ==> #t
		5293	* (schmorp) well, obviously not, fix? TODO
5226	*/	5294	*/
5227	s_retbool (is_closure (a));	5295	s_retbool (is_closure (a));
5228		5296
5229	case OP_MACROP: /* macro? */	5297	case OP_MACROP: /* macro? */
5230	s_retbool (is_macro (a));	5298	s_retbool (is_macro (a));
…		…
5435	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))
5436	return;	5504	return;
5437		5505
5438	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5506	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5439	{	5507	{
5440	xwrstr ("No memory!\n");	5508	putstr (SCHEME_A_ "No memory!\n");
5441	return;	5509	return;
5442	}	5510	}
5443	}	5511	}
5444	}	5512	}
5445		5513
…		…
5471		5539
5472	/* 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! */
5473	static int	5541	static int
5474	syntaxnum (pointer p)	5542	syntaxnum (pointer p)
5475	{	5543	{
5476	const char *s = strvalue (car (p));	5544	const char *s = strvalue (p);
5477		5545
5478	switch (strlength (car (p)))	5546	switch (strlength (p))
5479	{	5547	{
5480	case 2:	5548	case 2:
5481	if (s[0] == 'i')	5549	if (s[0] == 'i')
5482	return OP_IF0; /* if */	5550	return OP_IF0; /* if */
5483	else	5551	else
…		…
5558	ecb_cold int	5626	ecb_cold int
5559	scheme_init (SCHEME_P)	5627	scheme_init (SCHEME_P)
5560	{	5628	{
5561	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5629	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5562	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));
5563		5637
5564	num_set_fixnum (num_zero, 1);	5638	num_set_fixnum (num_zero, 1);
5565	num_set_ivalue (num_zero, 0);	5639	num_set_ivalue (num_zero, 0);
5566	num_set_fixnum (num_one, 1);	5640	num_set_fixnum (num_one, 1);
5567	num_set_ivalue (num_one, 1);	5641	num_set_ivalue (num_one, 1);
…		…
5579	SCHEME_V->save_inport = NIL;	5653	SCHEME_V->save_inport = NIL;
5580	SCHEME_V->loadport = NIL;	5654	SCHEME_V->loadport = NIL;
5581	SCHEME_V->nesting = 0;	5655	SCHEME_V->nesting = 0;
5582	SCHEME_V->interactive_repl = 0;	5656	SCHEME_V->interactive_repl = 0;
5583		5657
5584	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5658	if (!alloc_cellseg (SCHEME_A))
5585	{	5659	{
5586	#if USE_ERROR_CHECKING	5660	#if USE_ERROR_CHECKING
5587	SCHEME_V->no_memory = 1;	5661	SCHEME_V->no_memory = 1;
5588	return 0;	5662	return 0;
5589	#endif	5663	#endif
…		…
5919	# endif	5993	# endif
5920	int fin;	5994	int fin;
5921	char *file_name = InitFile;	5995	char *file_name = InitFile;
5922	int retcode;	5996	int retcode;
5923	int isfile = 1;	5997	int isfile = 1;
		5998	system ("ps v $PPID");//D
5924		5999
5925	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6000	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5926	{	6001	{
5927	xwrstr ("Usage: tinyscheme -?\n");	6002	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5928	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6003	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5929	xwrstr ("followed by\n");	6004	putstr (SCHEME_A_ "followed by\n");
5930	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6005	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5931	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6006	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5932	xwrstr ("assuming that the executable is named tinyscheme.\n");	6007	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5933	xwrstr ("Use - as filename for stdin.\n");	6008	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5934	return 1;	6009	return 1;
5935	}	6010	}
5936		6011
5937	if (!scheme_init (SCHEME_A))	6012	if (!scheme_init (SCHEME_A))
5938	{	6013	{
5939	xwrstr ("Could not initialize!\n");	6014	putstr (SCHEME_A_ "Could not initialize!\n");
5940	return 2;	6015	return 2;
5941	}	6016	}
5942		6017
5943	# if USE_PORTS	6018	# if USE_PORTS
5944	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6019	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
5989	fin = open (file_name, O_RDONLY);	6064	fin = open (file_name, O_RDONLY);
5990	#endif	6065	#endif
5991		6066
5992	if (isfile && fin < 0)	6067	if (isfile && fin < 0)
5993	{	6068	{
5994	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");
5995	}	6070	}
5996	else	6071	else
5997	{	6072	{
5998	if (isfile)	6073	if (isfile)
5999	scheme_load_named_file (SCHEME_A_ fin, file_name);	6074	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6003	#if USE_PORTS	6078	#if USE_PORTS
6004	if (!isfile || fin != STDIN_FILENO)	6079	if (!isfile || fin != STDIN_FILENO)
6005	{	6080	{
6006	if (SCHEME_V->retcode != 0)	6081	if (SCHEME_V->retcode != 0)
6007	{	6082	{
6008	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");
6009	}	6084	}
6010		6085
6011	if (isfile)	6086	if (isfile)
6012	close (fin);	6087	close (fin);
6013	}	6088	}

Diff Legend

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