ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.31 by root, Sat Nov 28 10:54:41 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 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	{
…		…
174	# define prompt "ts> "	188	# define prompt "ts> "
175	#endif	189	#endif
176		190
177	#ifndef InitFile	191	#ifndef InitFile
178	# define InitFile "init.scm"	192	# define InitFile "init.scm"
179	#endif
180
181	#ifndef FIRST_CELLSEGS
182	# define FIRST_CELLSEGS 3
183	#endif	193	#endif
184		194
185	enum scheme_types	195	enum scheme_types
186	{	196	{
187	T_INTEGER,	197	T_INTEGER,
…		…
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)
…		…
1596		1598
1597	/* garbage collection. parameter a, b is marked. */	1599	/* garbage collection. parameter a, b is marked. */
1598	static void	1600	static void
1599	gc (SCHEME_P_ pointer a, pointer b)	1601	gc (SCHEME_P_ pointer a, pointer b)
1600	{	1602	{
1601	pointer p;
1602	int i;	1603	int i;
1603		1604
1604	if (SCHEME_V->gc_verbose)	1605	if (SCHEME_V->gc_verbose)
1605	putstr (SCHEME_A_ "gc...");	1606	putstr (SCHEME_A_ "gc...");
1606		1607
…		…
1622	/* Mark recent objects the interpreter doesn't know about yet. */	1623	/* Mark recent objects the interpreter doesn't know about yet. */
1623	mark (car (S_SINK));	1624	mark (car (S_SINK));
1624	/* Mark any older stuff above nested C calls */	1625	/* Mark any older stuff above nested C calls */
1625	mark (SCHEME_V->c_nest);	1626	mark (SCHEME_V->c_nest);
1626		1627
		1628	#if USE_INTCACHE
		1629	/* mark intcache */
		1630	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1631	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1632	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1633	#endif
		1634
1627	/* mark variables a, b */	1635	/* mark variables a, b */
1628	mark (a);	1636	mark (a);
1629	mark (b);	1637	mark (b);
1630		1638
1631	/* garbage collect */	1639	/* garbage collect */
1632	clrmark (NIL);	1640	clrmark (NIL);
1633	SCHEME_V->fcells = 0;	1641	SCHEME_V->fcells = 0;
1634	SCHEME_V->free_cell = NIL;	1642	SCHEME_V->free_cell = NIL;
1635		1643
1636	/* free-list is kept sorted by address so as to maintain consecutive	1644	if (SCHEME_V->gc_verbose)
1637	ranges, if possible, for use with vectors. Here we scan the cells	1645	putstr (SCHEME_A_ "freeing...");
1638	(which are also kept sorted by address) downwards to build the	1646
1639	free-list in sorted order.	1647	uint32_t total = 0;
1640	*/	1648
		1649	/* Here we scan the cells to build the free-list. */
1641	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1650	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1642	{	1651	{
1643	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1652	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1653	struct cell *p;
		1654	total += SCHEME_V->cell_segsize [i];
1644		1655
1645	while (--p >= SCHEME_V->cell_seg[i])	1656	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1646	{	1657	{
		1658	pointer c = POINTER (p);
		1659
1647	if (is_mark (p))	1660	if (is_mark (c))
1648	clrmark (p);	1661	clrmark (c);
1649	else	1662	else
1650	{	1663	{
1651	/* reclaim cell */	1664	/* reclaim cell */
1652	if (typeflag (p) != T_PAIR)	1665	if (typeflag (c) != T_PAIR)
1653	{	1666	{
1654	finalize_cell (SCHEME_A_ p);	1667	finalize_cell (SCHEME_A_ c);
1655	set_typeflag (p, T_PAIR);	1668	set_typeflag (c, T_PAIR);
1656	set_car (p, NIL);	1669	set_car (c, NIL);
1657	}	1670	}
1658		1671
1659	++SCHEME_V->fcells;	1672	++SCHEME_V->fcells;
1660	set_cdr (p, SCHEME_V->free_cell);	1673	set_cdr (c, SCHEME_V->free_cell);
1661	SCHEME_V->free_cell = p;	1674	SCHEME_V->free_cell = c;
1662	}	1675	}
1663	}	1676	}
1664	}	1677	}
1665		1678
1666	if (SCHEME_V->gc_verbose)	1679	if (SCHEME_V->gc_verbose)
1667	{	1680	{
1668	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1681	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	}	1682	}
1670	}	1683	}
1671		1684
1672	static void	1685	static void
1673	finalize_cell (SCHEME_P_ pointer a)	1686	finalize_cell (SCHEME_P_ pointer a)
1674	{	1687	{
1675	/* TODO, fast bitmap check? */	1688	/* TODO, fast bitmap check? */
1676	if (is_string (a))	1689	if (is_string (a) || is_symbol (a))
1677	free (strvalue (a));	1690	free (strvalue (a));
1678	else if (is_vector (a))	1691	else if (is_vector (a))
1679	free (vecvalue (a));	1692	free (vecvalue (a));
1680	#if USE_PORTS	1693	#if USE_PORTS
1681	else if (is_port (a))	1694	else if (is_port (a))
1682	{	1695	{
1683	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1696	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1684	port_close (SCHEME_A_ a, port_input | port_output);	1697	port_close (SCHEME_A_ a, port_input | port_output);
1685		1698
1686	free (a->object.port);	1699	free (port (a));
1687	}	1700	}
1688	#endif	1701	#endif
1689	}	1702	}
1690		1703
1691	/* ========== Routines for Reading ========== */	1704	/* ========== Routines for Reading ========== */
…		…
1707	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1720	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1708	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;	1721	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;	1722	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;	1723	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1711	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1724	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1712	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1725	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1713		1726
1714	#if SHOW_ERROR_LINE	1727	#if SHOW_ERROR_LINE
1715	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1728	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1716		1729
1717	if (fname)	1730	if (fname)
…		…
1734	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1747	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1735	#if USE_PORTS	1748	#if USE_PORTS
1736	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1749	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1737	#endif	1750	#endif
1738	SCHEME_V->file_i--;	1751	SCHEME_V->file_i--;
1739	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1752	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1740	}	1753	}
1741	}	1754	}
1742		1755
1743	static int	1756	static int
1744	file_interactive (SCHEME_P)	1757	file_interactive (SCHEME_P)
1745	{	1758	{
1746	#if USE_PORTS	1759	#if USE_PORTS
1747	return SCHEME_V->file_i == 0	1760	return SCHEME_V->file_i == 0
1748	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1761	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1749	&& (SCHEME_V->inport->object.port->kind & port_file);	1762	&& (port (SCHEME_V->inport)->kind & port_file);
1750	#else	1763	#else
1751	return 0;	1764	return 0;
1752	#endif	1765	#endif
1753	}	1766	}
1754		1767
…		…
1888	}	1901	}
1889		1902
1890	static void	1903	static void
1891	port_close (SCHEME_P_ pointer p, int flag)	1904	port_close (SCHEME_P_ pointer p, int flag)
1892	{	1905	{
1893	port *pt = p->object.port;	1906	port *pt = port (p);
1894		1907
1895	pt->kind &= ~flag;	1908	pt->kind &= ~flag;
1896		1909
1897	if ((pt->kind & (port_input | port_output)) == 0)	1910	if ((pt->kind & (port_input | port_output)) == 0)
1898	{	1911	{
…		…
1919	/* get new character from input file */	1932	/* get new character from input file */
1920	static int	1933	static int
1921	inchar (SCHEME_P)	1934	inchar (SCHEME_P)
1922	{	1935	{
1923	int c;	1936	int c;
1924	port *pt;	1937	port *pt = port (SCHEME_V->inport);
1925
1926	pt = SCHEME_V->inport->object.port;
1927		1938
1928	if (pt->kind & port_saw_EOF)	1939	if (pt->kind & port_saw_EOF)
1929	return EOF;	1940	return EOF;
1930		1941
1931	c = basic_inchar (pt);	1942	c = basic_inchar (pt);
…		…
1998	port *pt;	2009	port *pt;
1999		2010
2000	if (c == EOF)	2011	if (c == EOF)
2001	return;	2012	return;
2002		2013
2003	pt = SCHEME_V->inport->object.port;	2014	pt = port (SCHEME_V->inport);
2004	pt->unget = c;	2015	pt->unget = c;
2005	#else	2016	#else
2006	if (c == EOF)	2017	if (c == EOF)
2007	return;	2018	return;
2008		2019
…		…
2036		2047
2037	INTERFACE void	2048	INTERFACE void
2038	putstr (SCHEME_P_ const char *s)	2049	putstr (SCHEME_P_ const char *s)
2039	{	2050	{
2040	#if USE_PORTS	2051	#if USE_PORTS
2041	port *pt = SCHEME_V->outport->object.port;	2052	port *pt = port (SCHEME_V->outport);
2042		2053
2043	if (pt->kind & port_file)	2054	if (pt->kind & port_file)
2044	write (pt->rep.stdio.file, s, strlen (s));	2055	write (pt->rep.stdio.file, s, strlen (s));
2045	else	2056	else
2046	for (; *s; s++)	2057	for (; *s; s++)
…		…
2048	*pt->rep.string.curr++ = *s;	2059	*pt->rep.string.curr++ = *s;
2049	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2060	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2050	*pt->rep.string.curr++ = *s;	2061	*pt->rep.string.curr++ = *s;
2051		2062
2052	#else	2063	#else
2053	xwrstr (s);	2064	write (pt->rep.stdio.file, s, strlen (s));
2054	#endif	2065	#endif
2055	}	2066	}
2056		2067
2057	static void	2068	static void
2058	putchars (SCHEME_P_ const char *s, int len)	2069	putchars (SCHEME_P_ const char *s, int len)
2059	{	2070	{
2060	#if USE_PORTS	2071	#if USE_PORTS
2061	port *pt = SCHEME_V->outport->object.port;	2072	port *pt = port (SCHEME_V->outport);
2062		2073
2063	if (pt->kind & port_file)	2074	if (pt->kind & port_file)
2064	write (pt->rep.stdio.file, s, len);	2075	write (pt->rep.stdio.file, s, len);
2065	else	2076	else
2066	{	2077	{
…		…
2080		2091
2081	INTERFACE void	2092	INTERFACE void
2082	putcharacter (SCHEME_P_ int c)	2093	putcharacter (SCHEME_P_ int c)
2083	{	2094	{
2084	#if USE_PORTS	2095	#if USE_PORTS
2085	port *pt = SCHEME_V->outport->object.port;	2096	port *pt = port (SCHEME_V->outport);
2086		2097
2087	if (pt->kind & port_file)	2098	if (pt->kind & port_file)
2088	{	2099	{
2089	char cc = c;	2100	char cc = c;
2090	write (pt->rep.stdio.file, &cc, 1);	2101	write (pt->rep.stdio.file, &cc, 1);
…		…
2103	#endif	2114	#endif
2104	}	2115	}
2105		2116
2106	/* read characters up to delimiter, but cater to character constants */	2117	/* read characters up to delimiter, but cater to character constants */
2107	static char *	2118	static char *
2108	readstr_upto (SCHEME_P_ char *delim)	2119	readstr_upto (SCHEME_P_ int skip, const char *delim)
2109	{	2120	{
2110	char *p = SCHEME_V->strbuff;	2121	char *p = SCHEME_V->strbuff + skip;
2111		2122
2112	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2123	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2113		2124
2114	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2125	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2115	*p = 0;	2126	*p = 0;
…		…
2122	return SCHEME_V->strbuff;	2133	return SCHEME_V->strbuff;
2123	}	2134	}
2124		2135
2125	/* read string expression "xxx...xxx" */	2136	/* read string expression "xxx...xxx" */
2126	static pointer	2137	static pointer
2127	readstrexp (SCHEME_P)	2138	readstrexp (SCHEME_P_ char delim)
2128	{	2139	{
2129	char *p = SCHEME_V->strbuff;	2140	char *p = SCHEME_V->strbuff;
2130	int c;	2141	int c;
2131	int c1 = 0;	2142	int c1 = 0;
2132	enum
2133	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2143	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2134		2144
2135	for (;;)	2145	for (;;)
2136	{	2146	{
2137	c = inchar (SCHEME_A);	2147	c = inchar (SCHEME_A);
2138		2148
…		…
2140	return S_F;	2150	return S_F;
2141		2151
2142	switch (state)	2152	switch (state)
2143	{	2153	{
2144	case st_ok:	2154	case st_ok:
2145	switch (c)	2155	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);	2156	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2154		2157
2155	default:	2158	if (ecb_expect_false (c == '\\'))
		2159	state = st_bsl;
		2160	else
2156	*p++ = c;	2161	*p++ = c;
2157	break;
2158	}
2159		2162
2160	break;	2163	break;
2161		2164
2162	case st_bsl:	2165	case st_bsl:
2163	switch (c)	2166	switch (c)
…		…
2193	case 'r':	2196	case 'r':
2194	*p++ = '\r';	2197	*p++ = '\r';
2195	state = st_ok;	2198	state = st_ok;
2196	break;	2199	break;
2197		2200
2198	case '"':
2199	*p++ = '"';
2200	state = st_ok;
2201	break;
2202
2203	default:	2201	default:
2204	*p++ = c;	2202	*p++ = c;
2205	state = st_ok;	2203	state = st_ok;
2206	break;	2204	break;
2207	}	2205	}
2208		2206
2209	break;	2207	break;
2210		2208
2211	case st_x1:	2209	case st_x1:
2212	case st_x2:	2210	case st_x2:
2213	c = toupper (c);	2211	c = tolower (c);
2214		2212
2215	if (c >= '0' && c <= 'F')	2213	if (c >= '0' && c <= '9')
2216	{
2217	if (c <= '9')
2218	c1 = (c1 << 4) + c - '0';	2214	c1 = (c1 << 4) + c - '0';
2219	else	2215	else if (c >= 'a' && c <= 'f')
2220	c1 = (c1 << 4) + c - 'A' + 10;	2216	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	2217	else
2231	return S_F;	2218	return S_F;
		2219
		2220	if (state == st_x1)
		2221	state = st_x2;
		2222	else
		2223	{
		2224	*p++ = c1;
		2225	state = st_ok;
		2226	}
2232		2227
2233	break;	2228	break;
2234		2229
2235	case st_oct1:	2230	case st_oct1:
2236	case st_oct2:	2231	case st_oct2:
…		…
2240	backchar (SCHEME_A_ c);	2235	backchar (SCHEME_A_ c);
2241	state = st_ok;	2236	state = st_ok;
2242	}	2237	}
2243	else	2238	else
2244	{	2239	{
2245	if (state == st_oct2 && c1 >= 32)	2240	if (state == st_oct2 && c1 >= ' ')
2246	return S_F;	2241	return S_F;
2247		2242
2248	c1 = (c1 << 3) + (c - '0');	2243	c1 = (c1 << 3) + (c - '0');
2249		2244
2250	if (state == st_oct1)	2245	if (state == st_oct1)
…		…
2255	state = st_ok;	2250	state = st_ok;
2256	}	2251	}
2257	}	2252	}
2258		2253
2259	break;	2254	break;
2260
2261	}	2255	}
2262	}	2256	}
2263	}	2257	}
2264		2258
2265	/* check c is in chars */	2259	/* check c is in chars */
2266	ecb_inline int	2260	ecb_inline int
2267	is_one_of (char *s, int c)	2261	is_one_of (const char *s, int c)
2268	{	2262	{
2269	if (c == EOF)
2270	return 1;
2271
2272	return !!strchr (s, c);	2263	return c == EOF || !!strchr (s, c);
2273	}	2264	}
2274		2265
2275	/* skip white characters */	2266	/* skip white characters */
2276	ecb_inline int	2267	ecb_inline int
2277	skipspace (SCHEME_P)	2268	skipspace (SCHEME_P)
…		…
2279	int c, curr_line = 0;	2270	int c, curr_line = 0;
2280		2271
2281	do	2272	do
2282	{	2273	{
2283	c = inchar (SCHEME_A);	2274	c = inchar (SCHEME_A);
		2275
2284	#if SHOW_ERROR_LINE	2276	#if SHOW_ERROR_LINE
2285	if (c == '\n')	2277	if (ecb_expect_false (c == '\n'))
2286	curr_line++;	2278	curr_line++;
2287	#endif	2279	#endif
		2280
		2281	if (ecb_expect_false (c == EOF))
		2282	return c;
2288	}	2283	}
2289	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2284	while (is_one_of (WHITESPACE, c));
2290		2285
2291	/* record it */	2286	/* record it */
2292	#if SHOW_ERROR_LINE	2287	#if SHOW_ERROR_LINE
2293	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2288	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;	2289	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2295	#endif	2290	#endif
2296		2291
2297	if (c != EOF)
2298	{
2299	backchar (SCHEME_A_ c);	2292	backchar (SCHEME_A_ c);
2300	return 1;	2293	return 1;
2301	}
2302	else
2303	return EOF;
2304	}	2294	}
2305		2295
2306	/* get token */	2296	/* get token */
2307	static int	2297	static int
2308	token (SCHEME_P)	2298	token (SCHEME_P)
…		…
2324	return TOK_RPAREN;	2314	return TOK_RPAREN;
2325		2315
2326	case '.':	2316	case '.':
2327	c = inchar (SCHEME_A);	2317	c = inchar (SCHEME_A);
2328		2318
2329	if (is_one_of (" \n\t", c))	2319	if (is_one_of (WHITESPACE, c))
2330	return TOK_DOT;	2320	return TOK_DOT;
2331	else	2321	else
2332	{	2322	{
2333	//TODO: ungetc twice in a row is not supported in C
2334	backchar (SCHEME_A_ c);	2323	backchar (SCHEME_A_ c);
2335	backchar (SCHEME_A_ '.');
2336	return TOK_ATOM;	2324	return TOK_DOTATOM;
2337	}	2325	}
		2326
		2327	case '|':
		2328	return TOK_STRATOM;
2338		2329
2339	case '\'':	2330	case '\'':
2340	return TOK_QUOTE;	2331	return TOK_QUOTE;
2341		2332
2342	case ';':	2333	case ';':
…		…
2474	}	2465	}
2475		2466
2476	putcharacter (SCHEME_A_ '"');	2467	putcharacter (SCHEME_A_ '"');
2477	}	2468	}
2478		2469
2479
2480	/* print atoms */	2470	/* print atoms */
2481	static void	2471	static void
2482	printatom (SCHEME_P_ pointer l, int f)	2472	printatom (SCHEME_P_ pointer l, int f)
2483	{	2473	{
2484	char *p;	2474	char *p;
2485	int len;	2475	int len;
2486		2476
2487	atom2str (SCHEME_A_ l, f, &p, &len);	2477	atom2str (SCHEME_A_ l, f, &p, &len);
2488	putchars (SCHEME_A_ p, len);	2478	putchars (SCHEME_A_ p, len);
2489	}	2479	}
2490
2491		2480
2492	/* Uses internal buffer unless string pointer is already available */	2481	/* Uses internal buffer unless string pointer is already available */
2493	static void	2482	static void
2494	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2483	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2495	{	2484	{
…		…
2656	#endif	2645	#endif
2657	}	2646	}
2658	else if (is_continuation (l))	2647	else if (is_continuation (l))
2659	p = "#<CONTINUATION>";	2648	p = "#<CONTINUATION>";
2660	else	2649	else
		2650	{
		2651	#if USE_PRINTF
		2652	p = SCHEME_V->strbuff;
		2653	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2654	#else
2661	p = "#<ERROR>";	2655	p = "#<ERROR>";
		2656	#endif
		2657	}
2662		2658
2663	*pp = p;	2659	*pp = p;
2664	*plen = strlen (p);	2660	*plen = strlen (p);
2665	}	2661	}
2666		2662
…		…
2810	/* () is #t in R5RS */	2806	/* () is #t in R5RS */
2811	#define is_true(p) ((p) != S_F)	2807	#define is_true(p) ((p) != S_F)
2812	#define is_false(p) ((p) == S_F)	2808	#define is_false(p) ((p) == S_F)
2813		2809
2814	/* ========== Environment implementation ========== */	2810	/* ========== 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		2811
2831	#ifndef USE_ALIST_ENV	2812	#ifndef USE_ALIST_ENV
2832		2813
2833	/*	2814	/*
2834	* In this implementation, each frame of the environment may be	2815	* In this implementation, each frame of the environment may be
…		…
2857	sym_hash (pointer sym, uint32_t size)	2838	sym_hash (pointer sym, uint32_t size)
2858	{	2839	{
2859	uintptr_t ptr = (uintptr_t)sym;	2840	uintptr_t ptr = (uintptr_t)sym;
2860		2841
2861	#if 0	2842	#if 0
2862	/* tqable size is prime, so why mix */	2843	/* table size is prime, so why mix */
2863	ptr += ptr >> 32;	2844	ptr += ptr >> 32;
2864	ptr += ptr >> 16;	2845	ptr += ptr >> 16;
2865	ptr += ptr >> 8;	2846	ptr += ptr >> 8;
2866	#endif	2847	#endif
2867		2848
…		…
2936	for (y = car (x); y != NIL; y = cdr (y))	2917	for (y = car (x); y != NIL; y = cdr (y))
2937	if (caar (y) == hdl)	2918	if (caar (y) == hdl)
2938	break;	2919	break;
2939		2920
2940	if (y != NIL)	2921	if (y != NIL)
		2922	return car (y);
2941	break;	2923	break;
2942		2924
2943	if (!all)	2925	if (!all)
2944	return NIL;	2926	break;
2945	}	2927	}
2946
2947	if (x != NIL)
2948	return car (y);
2949		2928
2950	return NIL;	2929	return NIL;
2951	}	2930	}
2952		2931
2953	#endif /* USE_ALIST_ENV else */	2932	#endif /* USE_ALIST_ENV else */
2954		2933
2955	ecb_inline void	2934	ecb_inline void
2956	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2935	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2957	{	2936	{
		2937	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2958	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2938	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2959	}	2939	}
2960		2940
2961	ecb_inline void	2941	ecb_inline void
2962	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2942	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3063	{	3043	{
3064	int nframes = (uintptr_t)SCHEME_V->dump;	3044	int nframes = (uintptr_t)SCHEME_V->dump;
3065	struct dump_stack_frame *next_frame;	3045	struct dump_stack_frame *next_frame;
3066		3046
3067	/* enough room for the next frame? */	3047	/* enough room for the next frame? */
3068	if (nframes >= SCHEME_V->dump_size)	3048	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3069	{	3049	{
3070	SCHEME_V->dump_size += STACK_GROWTH;	3050	SCHEME_V->dump_size += STACK_GROWTH;
3071	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3051	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3072	}	3052	}
3073		3053
…		…
3254		3234
3255	#endif	3235	#endif
3256		3236
3257	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3237	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3258		3238
		3239	#if EXPERIMENT
		3240	static int
		3241	debug (SCHEME_P_ int indent, pointer x)
		3242	{
		3243	int c;
		3244
		3245	if (is_syntax (x))
		3246	{
		3247	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3248	return 8 + 8;
		3249	}
		3250
		3251	if (x == NIL)
		3252	{
		3253	printf ("%*sNIL\n", indent, "");
		3254	return 3;
		3255	}
		3256
		3257	switch (type (x))
		3258	{
		3259	case T_INTEGER:
		3260	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3261	return 32+8;
		3262
		3263	case T_SYMBOL:
		3264	printf ("%*sS<%s>\n", indent, "", symname (x));
		3265	return 24+8;
		3266
		3267	case T_CLOSURE:
		3268	printf ("%*sS<%s>\n", indent, "", "closure");
		3269	debug (SCHEME_A_ indent + 3, cdr(x));
		3270	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3271
		3272	case T_PAIR:
		3273	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3274	c = debug (SCHEME_A_ indent + 3, car (x));
		3275	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3276	return c + 1;
		3277
		3278	case T_PORT:
		3279	printf ("%*sS<%s>\n", indent, "", "port");
		3280	return 24+8;
		3281
		3282	case T_VECTOR:
		3283	printf ("%*sS<%s>\n", indent, "", "vector");
		3284	return 24+8;
		3285
		3286	case T_ENVIRONMENT:
		3287	printf ("%*sS<%s>\n", indent, "", "environment");
		3288	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3289
		3290	default:
		3291	printf ("unhandled type %d\n", type (x));
		3292	break;
		3293	}
		3294	}
		3295	#endif
		3296
3259	static int	3297	static int
3260	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3298	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3261	{	3299	{
3262	pointer args = SCHEME_V->args;	3300	pointer args = SCHEME_V->args;
3263	pointer x, y;	3301	pointer x, y;
3264		3302
3265	switch (op)	3303	switch (op)
3266	{	3304	{
		3305	#if EXPERIMENT //D
		3306	case OP_DEBUG:
		3307	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3308	printf ("\n");
		3309	s_return (S_T);
		3310	#endif
3267	case OP_LOAD: /* load */	3311	case OP_LOAD: /* load */
3268	if (file_interactive (SCHEME_A))	3312	if (file_interactive (SCHEME_A))
3269	{	3313	{
3270	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3314	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3271	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3315	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3272	}	3316	}
3273		3317
3274	if (!file_push (SCHEME_A_ strvalue (car (args))))	3318	if (!file_push (SCHEME_A_ strvalue (car (args))))
3275	Error_1 ("unable to open", car (args));	3319	Error_1 ("unable to open", car (args));
3276	else	3320	else
…		…
3280	}	3324	}
3281		3325
3282	case OP_T0LVL: /* top level */	3326	case OP_T0LVL: /* top level */
3283		3327
3284	/* If we reached the end of file, this loop is done. */	3328	/* If we reached the end of file, this loop is done. */
3285	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3329	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3286	{	3330	{
3287	if (SCHEME_V->file_i == 0)	3331	if (SCHEME_V->file_i == 0)
3288	{	3332	{
3289	SCHEME_V->args = NIL;	3333	SCHEME_V->args = NIL;
3290	s_goto (OP_QUIT);	3334	s_goto (OP_QUIT);
…		…
3368	#endif	3412	#endif
3369	if (is_symbol (SCHEME_V->code)) /* symbol */	3413	if (is_symbol (SCHEME_V->code)) /* symbol */
3370	{	3414	{
3371	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3415	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3372		3416
3373	if (x != NIL)	3417	if (x == NIL)
3374	s_return (slot_value_in_env (x));
3375	else
3376	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3418	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3419
		3420	s_return (slot_value_in_env (x));
3377	}	3421	}
3378	else if (is_pair (SCHEME_V->code))	3422	else if (is_pair (SCHEME_V->code))
3379	{	3423	{
3380	x = car (SCHEME_V->code);	3424	x = car (SCHEME_V->code);
3381		3425
…		…
3394	}	3438	}
3395	else	3439	else
3396	s_return (SCHEME_V->code);	3440	s_return (SCHEME_V->code);
3397		3441
3398	case OP_E0ARGS: /* eval arguments */	3442	case OP_E0ARGS: /* eval arguments */
3399	if (is_macro (SCHEME_V->value)) /* macro expansion */	3443	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3400	{	3444	{
3401	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3445	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3402	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3446	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3403	SCHEME_V->code = SCHEME_V->value;	3447	SCHEME_V->code = SCHEME_V->value;
3404	s_goto (OP_APPLY);	3448	s_goto (OP_APPLY);
…		…
3458	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3502	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3459	else if (is_foreign (SCHEME_V->code))	3503	else if (is_foreign (SCHEME_V->code))
3460	{	3504	{
3461	/* Keep nested calls from GC'ing the arglist */	3505	/* Keep nested calls from GC'ing the arglist */
3462	push_recent_alloc (SCHEME_A_ args, NIL);	3506	push_recent_alloc (SCHEME_A_ args, NIL);
3463	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3507	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3464		3508
3465	s_return (x);	3509	s_return (x);
3466	}	3510	}
3467	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */	3511	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3468	{	3512	{
…		…
3505		3549
3506	case OP_DOMACRO: /* do macro */	3550	case OP_DOMACRO: /* do macro */
3507	SCHEME_V->code = SCHEME_V->value;	3551	SCHEME_V->code = SCHEME_V->value;
3508	s_goto (OP_EVAL);	3552	s_goto (OP_EVAL);
3509		3553
3510	#if 1
3511
3512	case OP_LAMBDA: /* lambda */	3554	case OP_LAMBDA: /* lambda */
3513	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3555	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3514	set SCHEME_V->value fall thru */	3556	set SCHEME_V->value fall thru */
3515	{	3557	{
3516	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3558	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3522	SCHEME_V->code = slot_value_in_env (f);	3564	SCHEME_V->code = slot_value_in_env (f);
3523	s_goto (OP_APPLY);	3565	s_goto (OP_APPLY);
3524	}	3566	}
3525		3567
3526	SCHEME_V->value = SCHEME_V->code;	3568	SCHEME_V->value = SCHEME_V->code;
3527	/* Fallthru */
3528	}	3569	}
		3570	/* Fallthru */
3529		3571
3530	case OP_LAMBDA1:	3572	case OP_LAMBDA1:
3531	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3573	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3532
3533	#else
3534
3535	case OP_LAMBDA: /* lambda */
3536	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3537
3538	#endif
3539		3574
3540	case OP_MKCLOSURE: /* make-closure */	3575	case OP_MKCLOSURE: /* make-closure */
3541	x = car (args);	3576	x = car (args);
3542		3577
3543	if (car (x) == SCHEME_V->LAMBDA)	3578	if (car (x) == SCHEME_V->LAMBDA)
…		…
3964		3999
3965	switch (op)	4000	switch (op)
3966	{	4001	{
3967	#if USE_MATH	4002	#if USE_MATH
3968	case OP_INEX2EX: /* inexact->exact */	4003	case OP_INEX2EX: /* inexact->exact */
3969	{
3970	if (is_integer (x))	4004	if (!is_integer (x))
3971	s_return (x);	4005	{
3972
3973	RVALUE r = rvalue_unchecked (x);	4006	RVALUE r = rvalue_unchecked (x);
3974		4007
3975	if (r == (RVALUE)(IVALUE)r)	4008	if (r == (RVALUE)(IVALUE)r)
3976	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4009	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3977	else	4010	else
3978	Error_1 ("inexact->exact: not integral:", x);	4011	Error_1 ("inexact->exact: not integral:", x);
3979	}	4012	}
		4013
		4014	s_return (x);
3980		4015
3981	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4016	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3982	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4017	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
		4018	/ (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3983	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4019	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3984	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4020	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3985	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));	4021	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3986	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));	4022	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3987	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));	4023	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3988		4024
3989	case OP_ATAN:	4025	case OP_ATAN:
		4026	s_return (mk_real (SCHEME_A_
3990	if (cdr (args) == NIL)	4027	cdr (args) == NIL
3991	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4028	? atan (rvalue (x))
3992	else	4029	: atan2 (rvalue (x), rvalue (cadr (args)))));
3993	{
3994	pointer y = cadr (args);
3995	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3996	}
3997		4030
3998	case OP_SQRT:	4031	case OP_SQRT:
3999	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));	4032	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4000		4033
4001	case OP_EXPT:	4034	case OP_EXPT:
…		…
4028	s_return (mk_real (SCHEME_A_ result));	4061	s_return (mk_real (SCHEME_A_ result));
4029	else	4062	else
4030	s_return (mk_integer (SCHEME_A_ result));	4063	s_return (mk_integer (SCHEME_A_ result));
4031	}	4064	}
4032		4065
4033	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4066	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4034	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4067	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4035
4036	case OP_TRUNCATE:
4037	{
4038	RVALUE n = rvalue (x);
4039	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4040	}
4041
4042	case OP_ROUND:
4043	if (is_integer (x))
4044	s_return (x);
4045
4046	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4068	case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
		4069	case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4047	#endif	4070	#endif
4048		4071
4049	case OP_ADD: /* + */	4072	case OP_ADD: /* + */
4050	v = num_zero;	4073	v = num_zero;
4051		4074
…		…
4139	else	4162	else
4140	Error_0 ("modulo: division by zero");	4163	Error_0 ("modulo: division by zero");
4141		4164
4142	s_return (mk_number (SCHEME_A_ v));	4165	s_return (mk_number (SCHEME_A_ v));
4143		4166
4144	case OP_CAR: /* car */	4167	/* the compiler will optimize this mess... */
4145	s_return (caar (args));	4168	case OP_CAR: op_car: s_return (car (x));
4146		4169	case OP_CDR: op_cdr: s_return (cdr (x));
4147	case OP_CDR: /* cdr */	4170	case OP_CAAR: op_caar: x = car (x); goto op_car;
4148	s_return (cdar (args));	4171	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4172	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4173	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4174	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4175	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4176	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4177	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4178	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4179	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4180	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4181	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4182	case OP_CAAAAR: x = car (x); goto op_caaar;
		4183	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4184	case OP_CAADAR: x = car (x); goto op_caadr;
		4185	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4186	case OP_CADAAR: x = car (x); goto op_cadar;
		4187	case OP_CADADR: x = cdr (x); goto op_cadar;
		4188	case OP_CADDAR: x = car (x); goto op_caddr;
		4189	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4190	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4191	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4192	case OP_CDADAR: x = car (x); goto op_cdadr;
		4193	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4194	case OP_CDDAAR: x = car (x); goto op_cddar;
		4195	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4196	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4197	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4149		4198
4150	case OP_CONS: /* cons */	4199	case OP_CONS: /* cons */
4151	set_cdr (args, cadr (args));	4200	set_cdr (args, cadr (args));
4152	s_return (args);	4201	s_return (args);
4153		4202
…		…
4402	}	4451	}
4403		4452
4404	case OP_VECLEN: /* vector-length */	4453	case OP_VECLEN: /* vector-length */
4405	s_return (mk_integer (SCHEME_A_ veclength (x)));	4454	s_return (mk_integer (SCHEME_A_ veclength (x)));
4406		4455
		4456	case OP_VECRESIZE:
		4457	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4458	s_return (x);
		4459
4407	case OP_VECREF: /* vector-ref */	4460	case OP_VECREF: /* vector-ref */
4408	{	4461	{
4409	int index = ivalue_unchecked (cadr (args));	4462	int index = ivalue_unchecked (cadr (args));
4410		4463
4411	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4464	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
…		…
4471	pointer d = cdr (args);	4524	pointer d = cdr (args);
4472	int r;	4525	int r;
4473		4526
4474	switch (op)	4527	switch (op)
4475	{	4528	{
4476	case OP_NOT: /* not */ r = is_false (a) ; break;	4529	case OP_NOT: /* not */ r = is_false (a) ; break;
4477	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;
4478	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4531	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4479	case OP_NULLP: /* null? */ r = a == NIL ; break;	4532	case OP_NULLP: /* null? */ r = a == NIL ; break;
4480	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;
4481	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4535	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4482	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4536	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4483	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4537	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4484	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 */
4485	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4539	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4486		4540
4487	#if USE_CHAR_CLASSIFIERS	4541	#if USE_CHAR_CLASSIFIERS
4488	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4542	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4489	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4543	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4490	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4544	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4540	}	4594	}
4541	else	4595	else
4542	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4543		4597
4544	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4545	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	*CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4546	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4547		4601
4548	#if USE_PORTS	4602	#if USE_PORTS
4549		4603
4550	case OP_WRITE: /* write */	4604	case OP_WRITE: /* write */
…		…
4695	SCHEME_V->gc_verbose = (a != S_F);	4749	SCHEME_V->gc_verbose = (a != S_F);
4696	s_retbool (was);	4750	s_retbool (was);
4697	}	4751	}
4698		4752
4699	case OP_NEWSEGMENT: /* new-segment */	4753	case OP_NEWSEGMENT: /* new-segment */
		4754	#if 0
4700	if (!is_pair (args) || !is_number (a))	4755	if (!is_pair (args) || !is_number (a))
4701	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4702		4757	#endif
4703	alloc_cellseg (SCHEME_A_ ivalue (a));	4758	s_retbool (alloc_cellseg (SCHEME_A));
4704
4705	s_return (S_T);
4706		4759
4707	case OP_OBLIST: /* oblist */	4760	case OP_OBLIST: /* oblist */
4708	s_return (oblist_all_symbols (SCHEME_A));	4761	s_return (oblist_all_symbols (SCHEME_A));
4709		4762
4710	#if USE_PORTS	4763	#if USE_PORTS
…		…
4780	s_return (p == NIL ? S_F : p);	4833	s_return (p == NIL ? S_F : p);
4781	}	4834	}
4782		4835
4783	case OP_GET_OUTSTRING: /* get-output-string */	4836	case OP_GET_OUTSTRING: /* get-output-string */
4784	{	4837	{
4785	port *p;	4838	port *p = port (a);
4786		4839
4787	if ((p = a->object.port)->kind & port_string)	4840	if (p->kind & port_string)
4788	{	4841	{
4789	off_t size;	4842	off_t size;
4790	char *str;	4843	char *str;
4791		4844
4792	size = p->rep.string.curr - p->rep.string.start + 1;	4845	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4897	int res;	4950	int res;
4898		4951
4899	if (is_pair (args))	4952	if (is_pair (args))
4900	p = car (args);	4953	p = car (args);
4901		4954
4902	res = p->object.port->kind & port_string;	4955	res = port (p)->kind & port_string;
4903		4956
4904	s_retbool (res);	4957	s_retbool (res);
4905	}	4958	}
4906		4959
4907	case OP_SET_INPORT: /* set-input-port */	4960	case OP_SET_INPORT: /* set-input-port */
…		…
4966	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5019	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4967	SCHEME_V->tok = token (SCHEME_A);	5020	SCHEME_V->tok = token (SCHEME_A);
4968	s_goto (OP_RDSEXPR);	5021	s_goto (OP_RDSEXPR);
4969		5022
4970	case TOK_ATOM:	5023	case TOK_ATOM:
4971	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5024	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5025
		5026	case TOK_DOTATOM:
		5027	SCHEME_V->strbuff[0] = '.';
		5028	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5029
		5030	case TOK_STRATOM:
		5031	x = readstrexp (SCHEME_A_ '|');
		5032	//TODO: haven't checked whether the garbage collector could interfere
		5033	s_return (mk_atom (SCHEME_A_ strvalue (x)));
4972		5034
4973	case TOK_DQUOTE:	5035	case TOK_DQUOTE:
4974	x = readstrexp (SCHEME_A);	5036	x = readstrexp (SCHEME_A_ '"');
4975		5037
4976	if (x == S_F)	5038	if (x == S_F)
4977	Error_0 ("Error reading string");	5039	Error_0 ("Error reading string");
4978		5040
4979	setimmutable (x);	5041	setimmutable (x);
…		…
4991	s_goto (OP_EVAL);	5053	s_goto (OP_EVAL);
4992	}	5054	}
4993	}	5055	}
4994		5056
4995	case TOK_SHARP_CONST:	5057	case TOK_SHARP_CONST:
4996	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5058	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4997	Error_0 ("undefined sharp expression");	5059	Error_0 ("undefined sharp expression");
4998	else	5060	else
4999	s_return (x);	5061	s_return (x);
5000		5062
5001	default:	5063	default:
…		…
5223		5285
5224	case OP_CLOSUREP: /* closure? */	5286	case OP_CLOSUREP: /* closure? */
5225	/*	5287	/*
5226	* Note, macro object is also a closure.	5288	* Note, macro object is also a closure.
5227	* Therefore, (closure? <#MACRO>) ==> #t	5289	* Therefore, (closure? <#MACRO>) ==> #t
		5290	* (schmorp) well, obviously not, fix? TODO
5228	*/	5291	*/
5229	s_retbool (is_closure (a));	5292	s_retbool (is_closure (a));
5230		5293
5231	case OP_MACROP: /* macro? */	5294	case OP_MACROP: /* macro? */
5232	s_retbool (is_macro (a));	5295	s_retbool (is_macro (a));
…		…
5437	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))	5500	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5438	return;	5501	return;
5439		5502
5440	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5503	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5441	{	5504	{
5442	xwrstr ("No memory!\n");	5505	putstr (SCHEME_A_ "No memory!\n");
5443	return;	5506	return;
5444	}	5507	}
5445	}	5508	}
5446	}	5509	}
5447		5510
…		…
5473		5536
5474	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5537	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5475	static int	5538	static int
5476	syntaxnum (pointer p)	5539	syntaxnum (pointer p)
5477	{	5540	{
5478	const char *s = strvalue (car (p));	5541	const char *s = strvalue (p);
5479		5542
5480	switch (strlength (car (p)))	5543	switch (strlength (p))
5481	{	5544	{
5482	case 2:	5545	case 2:
5483	if (s[0] == 'i')	5546	if (s[0] == 'i')
5484	return OP_IF0; /* if */	5547	return OP_IF0; /* if */
5485	else	5548	else
…		…
5560	ecb_cold int	5623	ecb_cold int
5561	scheme_init (SCHEME_P)	5624	scheme_init (SCHEME_P)
5562	{	5625	{
5563	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5626	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5564	pointer x;	5627	pointer x;
		5628
		5629	/* this memset is not strictly correct, as we assume (intcache)
		5630	* that memset 0 will also set pointers to 0, but memset does
		5631	* of course not guarantee that. screw such systems.
		5632	*/
		5633	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5565		5634
5566	num_set_fixnum (num_zero, 1);	5635	num_set_fixnum (num_zero, 1);
5567	num_set_ivalue (num_zero, 0);	5636	num_set_ivalue (num_zero, 0);
5568	num_set_fixnum (num_one, 1);	5637	num_set_fixnum (num_one, 1);
5569	num_set_ivalue (num_one, 1);	5638	num_set_ivalue (num_one, 1);
…		…
5581	SCHEME_V->save_inport = NIL;	5650	SCHEME_V->save_inport = NIL;
5582	SCHEME_V->loadport = NIL;	5651	SCHEME_V->loadport = NIL;
5583	SCHEME_V->nesting = 0;	5652	SCHEME_V->nesting = 0;
5584	SCHEME_V->interactive_repl = 0;	5653	SCHEME_V->interactive_repl = 0;
5585		5654
5586	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5655	if (!alloc_cellseg (SCHEME_A))
5587	{	5656	{
5588	#if USE_ERROR_CHECKING	5657	#if USE_ERROR_CHECKING
5589	SCHEME_V->no_memory = 1;	5658	SCHEME_V->no_memory = 1;
5590	return 0;	5659	return 0;
5591	#endif	5660	#endif
…		…
5921	# endif	5990	# endif
5922	int fin;	5991	int fin;
5923	char *file_name = InitFile;	5992	char *file_name = InitFile;
5924	int retcode;	5993	int retcode;
5925	int isfile = 1;	5994	int isfile = 1;
		5995	system ("ps v $PPID");//D
5926		5996
5927	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5997	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5928	{	5998	{
5929	xwrstr ("Usage: tinyscheme -?\n");	5999	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5930	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6000	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5931	xwrstr ("followed by\n");	6001	putstr (SCHEME_A_ "followed by\n");
5932	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6002	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5933	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6003	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5934	xwrstr ("assuming that the executable is named tinyscheme.\n");	6004	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5935	xwrstr ("Use - as filename for stdin.\n");	6005	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5936	return 1;	6006	return 1;
5937	}	6007	}
5938		6008
5939	if (!scheme_init (SCHEME_A))	6009	if (!scheme_init (SCHEME_A))
5940	{	6010	{
5941	xwrstr ("Could not initialize!\n");	6011	putstr (SCHEME_A_ "Could not initialize!\n");
5942	return 2;	6012	return 2;
5943	}	6013	}
5944		6014
5945	# if USE_PORTS	6015	# if USE_PORTS
5946	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6016	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
5991	fin = open (file_name, O_RDONLY);	6061	fin = open (file_name, O_RDONLY);
5992	#endif	6062	#endif
5993		6063
5994	if (isfile && fin < 0)	6064	if (isfile && fin < 0)
5995	{	6065	{
5996	xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n");	6066	putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5997	}	6067	}
5998	else	6068	else
5999	{	6069	{
6000	if (isfile)	6070	if (isfile)
6001	scheme_load_named_file (SCHEME_A_ fin, file_name);	6071	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6005	#if USE_PORTS	6075	#if USE_PORTS
6006	if (!isfile || fin != STDIN_FILENO)	6076	if (!isfile || fin != STDIN_FILENO)
6007	{	6077	{
6008	if (SCHEME_V->retcode != 0)	6078	if (SCHEME_V->retcode != 0)
6009	{	6079	{
6010	xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n");	6080	putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6011	}	6081	}
6012		6082
6013	if (isfile)	6083	if (isfile)
6014	close (fin);	6084	close (fin);
6015	}	6085	}

Diff Legend

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