[ViewVC] Diff of: cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC vs.
Revision 1.53 by root, Tue Dec 1 02:21:49 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>
…		…
74	TOK_SHARP_CONST,	78	TOK_SHARP_CONST,
75	TOK_VEC	79	TOK_VEC
76	};	80	};
77		81
78	#define BACKQUOTE '`'	82	#define BACKQUOTE '`'
79	#define DELIMITERS "()\";\f\t\v\n\r "	83	#define WHITESPACE " \t\r\n\v\f"
		84	#define DELIMITERS "()\";" WHITESPACE
80		85
81	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	86	#define NIL POINTER (&SCHEME_V->xNIL)
82	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	87	#define S_T POINTER (&SCHEME_V->xT)
83	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	88	#define S_F POINTER (&SCHEME_V->xF)
84	#define S_SINK (&SCHEME_V->xsink)	89	#define S_SINK POINTER (&SCHEME_V->xsink)
85	#define S_EOF (&SCHEME_V->xEOF_OBJ)	90	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86		91
87	#if !USE_MULTIPLICITY	92	#if !USE_MULTIPLICITY
88	static scheme sc;	93	static scheme sc;
89	#endif	94	#endif
90		95
…		…
98	}	103	}
99		104
100	char *p = s;	105	char *p = s;
101		106
102	do {	107	do {
103	*p++ = '0' + n % base;	108	*p++ = "0123456789abcdef"[n % base];
104	n /= base;	109	n /= base;
105	} while (n);	110	} while (n);
106		111
107	*p-- = 0;	112	*p-- = 0;
108		113
…		…
118	{	123	{
119	xbase (s, n, 10);	124	xbase (s, n, 10);
120	}	125	}
121		126
122	static void	127	static void
123	xwrstr (const char *s)	128	putnum (SCHEME_P_ long n)
124	{
125	write (1, s, strlen (s));
126	}
127
128	static void
129	xwrnum (long n)
130	{	129	{
131	char buf[64];	130	char buf[64];
132		131
133	xnum (buf, n);	132	xnum (buf, n);
134	xwrstr (buf);	133	putstr (SCHEME_A_ buf);
135	}	134	}
136		135
137	static char	136	static char
138	xtoupper (char c)	137	xtoupper (char c)
139	{	138	{
…		…
189	# define prompt "ts> "	188	# define prompt "ts> "
190	#endif	189	#endif
191		190
192	#ifndef InitFile	191	#ifndef InitFile
193	# define InitFile "init.scm"	192	# define InitFile "init.scm"
194	#endif
195
196	#ifndef FIRST_CELLSEGS
197	# define FIRST_CELLSEGS 3
198	#endif	193	#endif
199		194
200	enum scheme_types	195	enum scheme_types
201	{	196	{
202	T_INTEGER,	197	T_INTEGER,
…		…
263	static int is_zero_rvalue (RVALUE x);	258	static int is_zero_rvalue (RVALUE x);
264		259
265	static num num_zero;	260	static num num_zero;
266	static num num_one;	261	static num num_one;
267		262
		263	/* convert "pointer" to cell* / cell* to pointer */
		264	#define CELL(p) ((struct cell *)(p) + 0)
		265	#define POINTER(c) ((void *)((c) - 0))
		266
268	/* macros for cell operations */	267	/* macros for cell operations */
269	#define typeflag(p) ((p)->flag + 0)	268	#define typeflag(p) (CELL(p)->flag + 0)
270	#define set_typeflag(p,v) ((p)->flag = (v))	269	#define set_typeflag(p,v) (CELL(p)->flag = (v))
271	#define type(p) (typeflag (p) & T_MASKTYPE)	270	#define type(p) (typeflag (p) & T_MASKTYPE)
272		271
273	INTERFACE int	272	INTERFACE int
274	is_string (pointer p)	273	is_string (pointer p)
275	{	274	{
276	return type (p) == T_STRING;	275	return type (p) == T_STRING;
277	}	276	}
278		277
279	#define strvalue(p) ((p)->object.string.svalue)	278	#define strvalue(p) (CELL(p)->object.string.svalue)
280	#define strlength(p) ((p)->object.string.length)	279	#define strlength(p) (CELL(p)->object.string.length)
281		280
282	INTERFACE int	281	INTERFACE int
283	is_vector (pointer p)	282	is_vector (pointer p)
284	{	283	{
285	return type (p) == T_VECTOR;	284	return type (p) == T_VECTOR;
286	}	285	}
287		286
288	#define vecvalue(p) ((p)->object.vector.vvalue)	287	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289	#define veclength(p) ((p)->object.vector.length)	288	#define veclength(p) (CELL(p)->object.vector.length)
290	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	289	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	290	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	291	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293		292
294	INTERFACE int	293	INTERFACE int
…		…
320	string_value (pointer p)	319	string_value (pointer p)
321	{	320	{
322	return strvalue (p);	321	return strvalue (p);
323	}	322	}
324		323
325	#define ivalue_unchecked(p) (p)->object.ivalue	324	#define ivalue_unchecked(p) CELL(p)->object.ivalue
326	#define set_ivalue(p,v) (p)->object.ivalue = (v)	325	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327		326
328	#if USE_REAL	327	#if USE_REAL
329	#define rvalue_unchecked(p) (p)->object.rvalue	328	#define rvalue_unchecked(p) CELL(p)->object.rvalue
330	#define set_rvalue(p,v) (p)->object.rvalue = (v)	329	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331	#else	330	#else
332	#define rvalue_unchecked(p) (p)->object.ivalue	331	#define rvalue_unchecked(p) CELL(p)->object.ivalue
333	#define set_rvalue(p,v) (p)->object.ivalue = (v)	332	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334	#endif	333	#endif
335		334
336	INTERFACE long	335	INTERFACE long
337	charvalue (pointer p)	336	charvalue (pointer p)
338	{	337	{
339	return ivalue_unchecked (p);	338	return ivalue_unchecked (p);
340	}	339	}
341		340
		341	#define port(p) CELL(p)->object.port
		342	#define set_port(p,v) port(p) = (v)
342	INTERFACE int	343	INTERFACE int
343	is_port (pointer p)	344	is_port (pointer p)
344	{	345	{
345	return type (p) == T_PORT;	346	return type (p) == T_PORT;
346	}	347	}
347		348
348	INTERFACE int	349	INTERFACE int
349	is_inport (pointer p)	350	is_inport (pointer p)
350	{	351	{
351	return is_port (p) && p->object.port->kind & port_input;	352	return is_port (p) && port (p)->kind & port_input;
352	}	353	}
353		354
354	INTERFACE int	355	INTERFACE int
355	is_outport (pointer p)	356	is_outport (pointer p)
356	{	357	{
357	return is_port (p) && p->object.port->kind & port_output;	358	return is_port (p) && port (p)->kind & port_output;
358	}	359	}
359		360
360	INTERFACE int	361	INTERFACE int
361	is_pair (pointer p)	362	is_pair (pointer p)
362	{	363	{
363	return type (p) == T_PAIR;	364	return type (p) == T_PAIR;
364	}	365	}
365		366
366	#define car(p) ((p)->object.cons.car + 0)	367	#define car(p) (POINTER (CELL(p)->object.cons.car))
367	#define cdr(p) ((p)->object.cons.cdr + 0)	368	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368		369
369	static pointer caar (pointer p) { return car (car (p)); }	370	static pointer caar (pointer p) { return car (car (p)); }
370	static pointer cadr (pointer p) { return car (cdr (p)); }	371	static pointer cadr (pointer p) { return car (cdr (p)); }
371	static pointer cdar (pointer p) { return cdr (car (p)); }	372	static pointer cdar (pointer p) { return cdr (car (p)); }
372	static pointer cddr (pointer p) { return cdr (cdr (p)); }	373	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
376	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	377	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377		378
378	INTERFACE void	379	INTERFACE void
379	set_car (pointer p, pointer q)	380	set_car (pointer p, pointer q)
380	{	381	{
381	p->object.cons.car = q;	382	CELL(p)->object.cons.car = CELL (q);
382	}	383	}
383		384
384	INTERFACE void	385	INTERFACE void
385	set_cdr (pointer p, pointer q)	386	set_cdr (pointer p, pointer q)
386	{	387	{
387	p->object.cons.cdr = q;	388	CELL(p)->object.cons.cdr = CELL (q);
388	}	389	}
389		390
390	INTERFACE pointer	391	INTERFACE pointer
391	pair_car (pointer p)	392	pair_car (pointer p)
392	{	393	{
…		…
406	}	407	}
407		408
408	INTERFACE char *	409	INTERFACE char *
409	symname (pointer p)	410	symname (pointer p)
410	{	411	{
411	return strvalue (car (p));	412	return strvalue (p);
412	}	413	}
413		414
414	#if USE_PLIST	415	#if USE_PLIST
		416	#error plists are broken because symbols are no longer pairs
		417	#define symprop(p) cdr(p)
415	SCHEME_EXPORT int	418	SCHEME_EXPORT int
416	hasprop (pointer p)	419	hasprop (pointer p)
417	{	420	{
418	return typeflag (p) & T_SYMBOL;	421	return typeflag (p) & T_SYMBOL;
419	}	422	}
420
421	# define symprop(p) cdr(p)
422	#endif	423	#endif
423		424
424	INTERFACE int	425	INTERFACE int
425	is_syntax (pointer p)	426	is_syntax (pointer p)
426	{	427	{
…		…
440	}	441	}
441		442
442	INTERFACE char *	443	INTERFACE char *
443	syntaxname (pointer p)	444	syntaxname (pointer p)
444	{	445	{
445	return strvalue (car (p));	446	return strvalue (p);
446	}	447	}
447		448
448	#define procnum(p) ivalue_unchecked (p)	449	#define procnum(p) ivalue_unchecked (p)
449	static const char *procname (pointer x);	450	static const char *procname (pointer x);
450		451
…		…
667		668
668	static int file_push (SCHEME_P_ const char *fname);	669	static int file_push (SCHEME_P_ const char *fname);
669	static void file_pop (SCHEME_P);	670	static void file_pop (SCHEME_P);
670	static int file_interactive (SCHEME_P);	671	static int file_interactive (SCHEME_P);
671	ecb_inline int is_one_of (const char *s, int c);	672	ecb_inline int is_one_of (const char *s, int c);
672	static int alloc_cellseg (SCHEME_P_ int n);	673	static int alloc_cellseg (SCHEME_P);
673	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	674	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674	static void finalize_cell (SCHEME_P_ pointer a);	675	static void finalize_cell (SCHEME_P_ pointer a);
675	static int count_consecutive_cells (pointer x, int needed);	676	static int count_consecutive_cells (pointer x, int needed);
676	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	677	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677	static pointer mk_number (SCHEME_P_ const num n);	678	static pointer mk_number (SCHEME_P_ const num n);
…		…
911	#endif	912	#endif
912	}	913	}
913		914
914	/* allocate new cell segment */	915	/* allocate new cell segment */
915	static int	916	static int
916	alloc_cellseg (SCHEME_P_ int n)	917	alloc_cellseg (SCHEME_P)
917	{	918	{
918	pointer newp;	919	struct cell *newp;
919	pointer last;	920	struct cell *last;
920	pointer p;	921	struct cell *p;
921	char *cp;	922	char *cp;
922	long i;	923	long i;
923	int k;	924	int k;
924		925
925	static int segsize = CELL_SEGSIZE >> 1;	926	static int segsize = CELL_SEGSIZE >> 1;
926	segsize <<= 1;	927	segsize <<= 1;
927		928
928	for (k = 0; k < n; k++)
929	{
930	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931	return k;
932
933	cp = malloc (segsize * sizeof (struct cell));	929	cp = malloc (segsize * sizeof (struct cell));
934		930
935	if (!cp && USE_ERROR_CHECKING)	931	if (!cp && USE_ERROR_CHECKING)
936	return k;	932	return k;
937		933
938	i = ++SCHEME_V->last_cell_seg;	934	i = ++SCHEME_V->last_cell_seg;
939	SCHEME_V->alloc_seg[i] = cp;	935	SCHEME_V->alloc_seg[i] = cp;
940		936
941	newp = (pointer)cp;	937	newp = (struct cell *)cp;
942	SCHEME_V->cell_seg[i] = newp;	938	SCHEME_V->cell_seg[i] = newp;
943	SCHEME_V->cell_segsize[i] = segsize;	939	SCHEME_V->cell_segsize[i] = segsize;
944	SCHEME_V->fcells += segsize;	940	SCHEME_V->fcells += segsize;
945	last = newp + segsize - 1;	941	last = newp + segsize - 1;
946		942
947	for (p = newp; p <= last; p++)	943	for (p = newp; p <= last; p++)
948	{	944	{
		945	pointer cp = POINTER (p);
949	set_typeflag (p, T_PAIR);	946	set_typeflag (cp, T_PAIR);
950	set_car (p, NIL);	947	set_car (cp, NIL);
951	set_cdr (p, p + 1);	948	set_cdr (cp, POINTER (p + 1));
952	}	949	}
953		950
954	set_cdr (last, SCHEME_V->free_cell);	951	set_cdr (POINTER (last), SCHEME_V->free_cell);
955	SCHEME_V->free_cell = newp;	952	SCHEME_V->free_cell = POINTER (newp);
956	}
957		953
958	return n;	954	return 1;
959	}	955	}
960		956
961	/* get new cell. parameter a, b is marked by gc. */	957	/* get new cell. parameter a, b is marked by gc. */
962	ecb_inline pointer	958	ecb_inline pointer
963	get_cell_x (SCHEME_P_ pointer a, pointer b)	959	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
967	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	963	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968	return S_SINK;	964	return S_SINK;
969		965
970	if (SCHEME_V->free_cell == NIL)	966	if (SCHEME_V->free_cell == NIL)
971	{	967	{
972	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	968	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
973		969
974	gc (SCHEME_A_ a, b);	970	gc (SCHEME_A_ a, b);
975		971
976	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)	972	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)
977	{	973	{
978	/* if only a few recovered, get more to avoid fruitless gc's */	974	/* if only a few recovered, get more to avoid fruitless gc's */
979	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	975	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980	{	976	{
981	#if USE_ERROR_CHECKING	977	#if USE_ERROR_CHECKING
982	SCHEME_V->no_memory = 1;	978	SCHEME_V->no_memory = 1;
983	return S_SINK;	979	return S_SINK;
984	#endif	980	#endif
…		…
996	}	992	}
997	}	993	}
998		994
999	/* To retain recent allocs before interpreter knows about them -	995	/* To retain recent allocs before interpreter knows about them -
1000	Tehom */	996	Tehom */
1001
1002	static void	997	static void
1003	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	998	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004	{	999	{
1005	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	1000	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006		1001
…		…
1028	}	1023	}
1029		1024
1030	static pointer	1025	static pointer
1031	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	1026	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032	{	1027	{
1033	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1028	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034	pointer e = malloc (len sizeof (pointer));	1029	pointer e = malloc (len sizeof (pointer));
1035		1030
1036	if (!e && USE_ERROR_CHECKING)	1031	if (!e && USE_ERROR_CHECKING)
1037	return S_SINK;	1032	return S_SINK;
1038		1033
1039	/* Record it as a vector so that gc understands it. */	1034	/* Record it as a vector so that gc understands it. */
1040	set_typeflag (v, T_VECTOR \| T_ATOM);	1035	set_typeflag (v, T_VECTOR \| T_ATOM);
1041		1036
1042	v->object.vector.vvalue = e;	1037	CELL(v)->object.vector.vvalue = e;
1043	v->object.vector.length = len;	1038	CELL(v)->object.vector.length = len;
1044	fill_vector (v, 0, init);	1039	fill_vector (v, 0, init);
1045	push_recent_alloc (SCHEME_A_ v, NIL);	1040	push_recent_alloc (SCHEME_A_ v, NIL);
1046		1041
1047	return v;	1042	return v;
1048	}	1043	}
…		…
1057	static void	1052	static void
1058	check_cell_alloced (pointer p, int expect_alloced)	1053	check_cell_alloced (pointer p, int expect_alloced)
1059	{	1054	{
1060	/* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */	1055	/* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1061	if (typeflag (p) & !expect_alloced)	1056	if (typeflag (p) & !expect_alloced)
1062	xwrstr ("Cell is already allocated!\n");	1057	putstr (SCHEME_A_ "Cell is already allocated!\n");
1063		1058
1064	if (!(typeflag (p)) & expect_alloced)	1059	if (!(typeflag (p)) & expect_alloced)
1065	xwrstr ("Cell is not allocated!\n");	1060	putstr (SCHEME_A_ "Cell is not allocated!\n");
1066	}	1061	}
1067		1062
1068	static void	1063	static void
1069	check_range_alloced (pointer p, int n, int expect_alloced)	1064	check_range_alloced (pointer p, int n, int expect_alloced)
1070	{	1065	{
…		…
1092	set_cdr (x, b);	1087	set_cdr (x, b);
1093		1088
1094	return x;	1089	return x;
1095	}	1090	}
1096		1091
1097	/* ========== oblist implementation ========== */
1098
1099	static pointer	1092	static pointer
1100	generate_symbol (SCHEME_P_ const char *name)	1093	generate_symbol (SCHEME_P_ const char *name)
1101	{	1094	{
1102	pointer x = mk_string (SCHEME_A_ name);	1095	pointer x = mk_string (SCHEME_A_ name);
1103	setimmutable (x);	1096	setimmutable (x);
1104	x = immutable_cons (x, NIL);
1105	set_typeflag (x, T_SYMBOL);	1097	set_typeflag (x, T_SYMBOL \| T_ATOM);
1106	return x;	1098	return x;
1107	}	1099	}
		1100
		1101	/* ========== oblist implementation ========== */
1108		1102
1109	#ifndef USE_OBJECT_LIST	1103	#ifndef USE_OBJECT_LIST
1110		1104
1111	static int	1105	static int
1112	hash_fn (const char *key, int table_size)	1106	hash_fn (const char *key, int table_size)
…		…
1199		1193
1200	/* returns the new symbol */	1194	/* returns the new symbol */
1201	static pointer	1195	static pointer
1202	oblist_add_by_name (SCHEME_P_ const char *name)	1196	oblist_add_by_name (SCHEME_P_ const char *name)
1203	{	1197	{
1204	pointer x = mk_string (SCHEME_A_ name);	1198	pointer x = generate_symbol (SCHEME_A_ name);
1205	set_typeflag (x, T_SYMBOL);
1206	setimmutable (x);
1207	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1199	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208	return x;	1200	return x;
1209	}	1201	}
1210		1202
1211	static pointer	1203	static pointer
…		…
1221	mk_port (SCHEME_P_ port *p)	1213	mk_port (SCHEME_P_ port *p)
1222	{	1214	{
1223	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1215	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224		1216
1225	set_typeflag (x, T_PORT \| T_ATOM);	1217	set_typeflag (x, T_PORT \| T_ATOM);
1226	x->object.port = p;	1218	set_port (x, p);
1227		1219
1228	return x;	1220	return x;
1229	}	1221	}
1230	#endif	1222	#endif
1231		1223
1232	pointer	1224	pointer
1233	mk_foreign_func (SCHEME_P_ foreign_func f)	1225	mk_foreign_func (SCHEME_P_ foreign_func f)
1234	{	1226	{
1235	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1227	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236		1228
1237	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1229	set_typeflag (x, T_FOREIGN \| T_ATOM);
1238	x->object.ff = f;	1230	CELL(x)->object.ff = f;
1239		1231
1240	return x;	1232	return x;
1241	}	1233	}
1242		1234
1243	INTERFACE pointer	1235	INTERFACE pointer
1244	mk_character (SCHEME_P_ int c)	1236	mk_character (SCHEME_P_ int c)
1245	{	1237	{
1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1238	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247		1239
1248	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1240	set_typeflag (x, T_CHARACTER \| T_ATOM);
1249	set_ivalue (x, c & 0xff);	1241	set_ivalue (x, c & 0xff);
1250		1242
1251	return x;	1243	return x;
1252	}	1244	}
1253		1245
1254	/* get number atom (integer) */	1246	/* get number atom (integer) */
1255	INTERFACE pointer	1247	INTERFACE pointer
1256	mk_integer (SCHEME_P_ long n)	1248	mk_integer (SCHEME_P_ long n)
1257	{	1249	{
		1250	pointer p = 0;
		1251	pointer *pp = &p;
		1252
		1253	#if USE_INTCACHE
		1254	if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
		1255	pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
		1256	#endif
		1257
		1258	if (!*pp)
		1259	{
1258	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1260	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259		1261
1260	set_typeflag (x, (T_INTEGER \| T_ATOM));	1262	set_typeflag (x, T_INTEGER \| T_ATOM);
		1263	setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261	set_ivalue (x, n);	1264	set_ivalue (x, n);
1262		1265
		1266	*pp = x;
		1267	}
		1268
1263	return x;	1269	return *pp;
1264	}	1270	}
1265		1271
1266	INTERFACE pointer	1272	INTERFACE pointer
1267	mk_real (SCHEME_P_ RVALUE n)	1273	mk_real (SCHEME_P_ RVALUE n)
1268	{	1274	{
1269	#if USE_REAL	1275	#if USE_REAL
1270	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1276	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271		1277
1272	set_typeflag (x, (T_REAL \| T_ATOM));	1278	set_typeflag (x, T_REAL \| T_ATOM);
1273	set_rvalue (x, n);	1279	set_rvalue (x, n);
1274		1280
1275	return x;	1281	return x;
1276	#else	1282	#else
1277	return mk_integer (SCHEME_A_ n);	1283	return mk_integer (SCHEME_A_ n);
…		…
1393	INTERFACE pointer	1399	INTERFACE pointer
1394	gensym (SCHEME_P)	1400	gensym (SCHEME_P)
1395	{	1401	{
1396	pointer x;	1402	pointer x;
1397	char name[40] = "gensym-";	1403	char name[40] = "gensym-";
1398	xnum (name + 7, SCHEME_V->gensym_cnt);	1404	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399		1405
1400	return generate_symbol (SCHEME_A_ name);	1406	return generate_symbol (SCHEME_A_ name);
		1407	}
		1408
		1409	static int
		1410	is_gensym (SCHEME_P_ pointer x)
		1411	{
		1412	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1401	}	1413	}
1402		1414
1403	/* make symbol or number atom from string */	1415	/* make symbol or number atom from string */
1404	static pointer	1416	static pointer
1405	mk_atom (SCHEME_P_ char *q)	1417	mk_atom (SCHEME_P_ char *q)
…		…
1614		1626
1615	/* garbage collection. parameter a, b is marked. */	1627	/* garbage collection. parameter a, b is marked. */
1616	static void	1628	static void
1617	gc (SCHEME_P_ pointer a, pointer b)	1629	gc (SCHEME_P_ pointer a, pointer b)
1618	{	1630	{
1619	pointer p;
1620	int i;	1631	int i;
1621		1632
1622	if (SCHEME_V->gc_verbose)	1633	if (SCHEME_V->gc_verbose)
1623	putstr (SCHEME_A_ "gc...");	1634	putstr (SCHEME_A_ "gc...");
1624		1635
…		…
1640	/* Mark recent objects the interpreter doesn't know about yet. */	1651	/* Mark recent objects the interpreter doesn't know about yet. */
1641	mark (car (S_SINK));	1652	mark (car (S_SINK));
1642	/* Mark any older stuff above nested C calls */	1653	/* Mark any older stuff above nested C calls */
1643	mark (SCHEME_V->c_nest);	1654	mark (SCHEME_V->c_nest);
1644		1655
		1656	#if USE_INTCACHE
		1657	/* mark intcache */
		1658	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1659	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1660	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1661	#endif
		1662
1645	/* mark variables a, b */	1663	/* mark variables a, b */
1646	mark (a);	1664	mark (a);
1647	mark (b);	1665	mark (b);
1648		1666
1649	/* garbage collect */	1667	/* garbage collect */
1650	clrmark (NIL);	1668	clrmark (NIL);
1651	SCHEME_V->fcells = 0;	1669	SCHEME_V->fcells = 0;
1652	SCHEME_V->free_cell = NIL;	1670	SCHEME_V->free_cell = NIL;
1653		1671
1654	/* free-list is kept sorted by address so as to maintain consecutive	1672	if (SCHEME_V->gc_verbose)
1655	ranges, if possible, for use with vectors. Here we scan the cells	1673	putstr (SCHEME_A_ "freeing...");
1656	(which are also kept sorted by address) downwards to build the	1674
1657	free-list in sorted order.	1675	uint32_t total = 0;
1658	*/	1676
		1677	/* Here we scan the cells to build the free-list. */
1659	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1678	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660	{	1679	{
1661	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1680	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1681	struct cell *p;
		1682	total += SCHEME_V->cell_segsize [i];
1662		1683
1663	while (--p >= SCHEME_V->cell_seg[i])	1684	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664	{	1685	{
		1686	pointer c = POINTER (p);
		1687
1665	if (is_mark (p))	1688	if (is_mark (c))
1666	clrmark (p);	1689	clrmark (c);
1667	else	1690	else
1668	{	1691	{
1669	/* reclaim cell */	1692	/* reclaim cell */
1670	if (typeflag (p) != T_PAIR)	1693	if (typeflag (c) != T_PAIR)
1671	{	1694	{
1672	finalize_cell (SCHEME_A_ p);	1695	finalize_cell (SCHEME_A_ c);
1673	set_typeflag (p, T_PAIR);	1696	set_typeflag (c, T_PAIR);
1674	set_car (p, NIL);	1697	set_car (c, NIL);
1675	}	1698	}
1676		1699
1677	++SCHEME_V->fcells;	1700	++SCHEME_V->fcells;
1678	set_cdr (p, SCHEME_V->free_cell);	1701	set_cdr (c, SCHEME_V->free_cell);
1679	SCHEME_V->free_cell = p;	1702	SCHEME_V->free_cell = c;
1680	}	1703	}
1681	}	1704	}
1682	}	1705	}
1683		1706
1684	if (SCHEME_V->gc_verbose)	1707	if (SCHEME_V->gc_verbose)
1685	{	1708	{
1686	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1709	putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1687	}	1710	}
1688	}	1711	}
1689		1712
1690	static void	1713	static void
1691	finalize_cell (SCHEME_P_ pointer a)	1714	finalize_cell (SCHEME_P_ pointer a)
1692	{	1715	{
1693	/* TODO, fast bitmap check? */	1716	/* TODO, fast bitmap check? */
1694	if (is_string (a))	1717	if (is_string (a) \|\| is_symbol (a))
1695	free (strvalue (a));	1718	free (strvalue (a));
1696	else if (is_vector (a))	1719	else if (is_vector (a))
1697	free (vecvalue (a));	1720	free (vecvalue (a));
1698	#if USE_PORTS	1721	#if USE_PORTS
1699	else if (is_port (a))	1722	else if (is_port (a))
1700	{	1723	{
1701	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1724	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1702	port_close (SCHEME_A_ a, port_input \| port_output);	1725	port_close (SCHEME_A_ a, port_input \| port_output);
1703		1726
1704	free (a->object.port);	1727	free (port (a));
1705	}	1728	}
1706	#endif	1729	#endif
1707	}	1730	}
1708		1731
1709	/* ========== Routines for Reading ========== */	1732	/* ========== Routines for Reading ========== */
…		…
1725	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1748	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;	1749	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;
1727	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1750	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1751	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1752	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1753	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731		1754
1732	#if SHOW_ERROR_LINE	1755	#if SHOW_ERROR_LINE
1733	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1756	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734		1757
1735	if (fname)	1758	if (fname)
…		…
1752	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1775	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753	#if USE_PORTS	1776	#if USE_PORTS
1754	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1777	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755	#endif	1778	#endif
1756	SCHEME_V->file_i--;	1779	SCHEME_V->file_i--;
1757	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1780	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758	}	1781	}
1759	}	1782	}
1760		1783
1761	static int	1784	static int
1762	file_interactive (SCHEME_P)	1785	file_interactive (SCHEME_P)
1763	{	1786	{
1764	#if USE_PORTS	1787	#if USE_PORTS
1765	return SCHEME_V->file_i == 0	1788	return SCHEME_V->file_i == 0
1766	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1789	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767	&& (SCHEME_V->inport->object.port->kind & port_file);	1790	&& (port (SCHEME_V->inport)->kind & port_file);
1768	#else	1791	#else
1769	return 0;	1792	return 0;
1770	#endif	1793	#endif
1771	}	1794	}
1772		1795
…		…
1906	}	1929	}
1907		1930
1908	static void	1931	static void
1909	port_close (SCHEME_P_ pointer p, int flag)	1932	port_close (SCHEME_P_ pointer p, int flag)
1910	{	1933	{
1911	port *pt = p->object.port;	1934	port *pt = port (p);
1912		1935
1913	pt->kind &= ~flag;	1936	pt->kind &= ~flag;
1914		1937
1915	if ((pt->kind & (port_input \| port_output)) == 0)	1938	if ((pt->kind & (port_input \| port_output)) == 0)
1916	{	1939	{
…		…
1937	/* get new character from input file */	1960	/* get new character from input file */
1938	static int	1961	static int
1939	inchar (SCHEME_P)	1962	inchar (SCHEME_P)
1940	{	1963	{
1941	int c;	1964	int c;
1942	port *pt;	1965	port *pt = port (SCHEME_V->inport);
1943
1944	pt = SCHEME_V->inport->object.port;
1945		1966
1946	if (pt->kind & port_saw_EOF)	1967	if (pt->kind & port_saw_EOF)
1947	return EOF;	1968	return EOF;
1948		1969
1949	c = basic_inchar (pt);	1970	c = basic_inchar (pt);
…		…
2016	port *pt;	2037	port *pt;
2017		2038
2018	if (c == EOF)	2039	if (c == EOF)
2019	return;	2040	return;
2020		2041
2021	pt = SCHEME_V->inport->object.port;	2042	pt = port (SCHEME_V->inport);
2022	pt->unget = c;	2043	pt->unget = c;
2023	#else	2044	#else
2024	if (c == EOF)	2045	if (c == EOF)
2025	return;	2046	return;
2026		2047
…		…
2054		2075
2055	INTERFACE void	2076	INTERFACE void
2056	putstr (SCHEME_P_ const char *s)	2077	putstr (SCHEME_P_ const char *s)
2057	{	2078	{
2058	#if USE_PORTS	2079	#if USE_PORTS
2059	port *pt = SCHEME_V->outport->object.port;	2080	port *pt = port (SCHEME_V->outport);
2060		2081
2061	if (pt->kind & port_file)	2082	if (pt->kind & port_file)
2062	write (pt->rep.stdio.file, s, strlen (s));	2083	write (pt->rep.stdio.file, s, strlen (s));
2063	else	2084	else
2064	for (; *s; s++)	2085	for (; *s; s++)
…		…
2066	pt->rep.string.curr++ = s;	2087	pt->rep.string.curr++ = s;
2067	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2088	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068	pt->rep.string.curr++ = s;	2089	pt->rep.string.curr++ = s;
2069		2090
2070	#else	2091	#else
2071	xwrstr (s);	2092	write (pt->rep.stdio.file, s, strlen (s));
2072	#endif	2093	#endif
2073	}	2094	}
2074		2095
2075	static void	2096	static void
2076	putchars (SCHEME_P_ const char *s, int len)	2097	putchars (SCHEME_P_ const char *s, int len)
2077	{	2098	{
2078	#if USE_PORTS	2099	#if USE_PORTS
2079	port *pt = SCHEME_V->outport->object.port;	2100	port *pt = port (SCHEME_V->outport);
2080		2101
2081	if (pt->kind & port_file)	2102	if (pt->kind & port_file)
2082	write (pt->rep.stdio.file, s, len);	2103	write (pt->rep.stdio.file, s, len);
2083	else	2104	else
2084	{	2105	{
…		…
2098		2119
2099	INTERFACE void	2120	INTERFACE void
2100	putcharacter (SCHEME_P_ int c)	2121	putcharacter (SCHEME_P_ int c)
2101	{	2122	{
2102	#if USE_PORTS	2123	#if USE_PORTS
2103	port *pt = SCHEME_V->outport->object.port;	2124	port *pt = port (SCHEME_V->outport);
2104		2125
2105	if (pt->kind & port_file)	2126	if (pt->kind & port_file)
2106	{	2127	{
2107	char cc = c;	2128	char cc = c;
2108	write (pt->rep.stdio.file, &cc, 1);	2129	write (pt->rep.stdio.file, &cc, 1);
…		…
2265		2286
2266	/* check c is in chars */	2287	/* check c is in chars */
2267	ecb_inline int	2288	ecb_inline int
2268	is_one_of (const char *s, int c)	2289	is_one_of (const char *s, int c)
2269	{	2290	{
2270	if (c == EOF)
2271	return 1;
2272
2273	return !!strchr (s, c);	2291	return c == EOF \|\| !!strchr (s, c);
2274	}	2292	}
2275		2293
2276	/* skip white characters */	2294	/* skip white characters */
2277	ecb_inline int	2295	ecb_inline int
2278	skipspace (SCHEME_P)	2296	skipspace (SCHEME_P)
…		…
2280	int c, curr_line = 0;	2298	int c, curr_line = 0;
2281		2299
2282	do	2300	do
2283	{	2301	{
2284	c = inchar (SCHEME_A);	2302	c = inchar (SCHEME_A);
		2303
2285	#if SHOW_ERROR_LINE	2304	#if SHOW_ERROR_LINE
2286	if (c == '\n')	2305	if (ecb_expect_false (c == '\n'))
2287	curr_line++;	2306	curr_line++;
2288	#endif	2307	#endif
		2308
		2309	if (ecb_expect_false (c == EOF))
		2310	return c;
2289	}	2311	}
2290	while (c == ' ' \|\| c == '\n' \|\| c == '\r' \|\| c == '\t');	2312	while (is_one_of (WHITESPACE, c));
2291		2313
2292	/* record it */	2314	/* record it */
2293	#if SHOW_ERROR_LINE	2315	#if SHOW_ERROR_LINE
2294	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2316	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2295	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2317	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2296	#endif	2318	#endif
2297		2319
2298	if (c != EOF)
2299	{
2300	backchar (SCHEME_A_ c);	2320	backchar (SCHEME_A_ c);
2301	return 1;	2321	return 1;
2302	}
2303	else
2304	return EOF;
2305	}	2322	}
2306		2323
2307	/* get token */	2324	/* get token */
2308	static int	2325	static int
2309	token (SCHEME_P)	2326	token (SCHEME_P)
…		…
2325	return TOK_RPAREN;	2342	return TOK_RPAREN;
2326		2343
2327	case '.':	2344	case '.':
2328	c = inchar (SCHEME_A);	2345	c = inchar (SCHEME_A);
2329		2346
2330	if (is_one_of (" \n\t", c))	2347	if (is_one_of (WHITESPACE, c))
2331	return TOK_DOT;	2348	return TOK_DOT;
2332	else	2349	else
2333	{	2350	{
2334	backchar (SCHEME_A_ c);	2351	backchar (SCHEME_A_ c);
2335	return TOK_DOTATOM;	2352	return TOK_DOTATOM;
…		…
2476	}	2493	}
2477		2494
2478	putcharacter (SCHEME_A_ '"');	2495	putcharacter (SCHEME_A_ '"');
2479	}	2496	}
2480		2497
2481
2482	/* print atoms */	2498	/* print atoms */
2483	static void	2499	static void
2484	printatom (SCHEME_P_ pointer l, int f)	2500	printatom (SCHEME_P_ pointer l, int f)
2485	{	2501	{
2486	char *p;	2502	char *p;
2487	int len;	2503	int len;
2488		2504
2489	atom2str (SCHEME_A_ l, f, &p, &len);	2505	atom2str (SCHEME_A_ l, f, &p, &len);
2490	putchars (SCHEME_A_ p, len);	2506	putchars (SCHEME_A_ p, len);
2491	}	2507	}
2492
2493		2508
2494	/* Uses internal buffer unless string pointer is already available */	2509	/* Uses internal buffer unless string pointer is already available */
2495	static void	2510	static void
2496	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)	2511	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)
2497	{	2512	{
…		…
2658	#endif	2673	#endif
2659	}	2674	}
2660	else if (is_continuation (l))	2675	else if (is_continuation (l))
2661	p = "#<CONTINUATION>";	2676	p = "#<CONTINUATION>";
2662	else	2677	else
		2678	{
		2679	#if USE_PRINTF
		2680	p = SCHEME_V->strbuff;
		2681	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2682	#else
2663	p = "#<ERROR>";	2683	p = "#<ERROR>";
		2684	#endif
		2685	}
2664		2686
2665	*pp = p;	2687	*pp = p;
2666	*plen = strlen (p);	2688	*plen = strlen (p);
2667	}	2689	}
2668		2690
…		…
2938	#endif /* USE_ALIST_ENV else */	2960	#endif /* USE_ALIST_ENV else */
2939		2961
2940	ecb_inline void	2962	ecb_inline void
2941	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2963	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2942	{	2964	{
		2965	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2943	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2966	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2944	}	2967	}
2945		2968
2946	ecb_inline void	2969	ecb_inline void
2947	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2970	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3048	{	3071	{
3049	int nframes = (uintptr_t)SCHEME_V->dump;	3072	int nframes = (uintptr_t)SCHEME_V->dump;
3050	struct dump_stack_frame *next_frame;	3073	struct dump_stack_frame *next_frame;
3051		3074
3052	/* enough room for the next frame? */	3075	/* enough room for the next frame? */
3053	if (nframes >= SCHEME_V->dump_size)	3076	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3054	{	3077	{
3055	SCHEME_V->dump_size += STACK_GROWTH;	3078	SCHEME_V->dump_size += STACK_GROWTH;
3056	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3079	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3057	}	3080	}
3058		3081
…		…
3239		3262
3240	#endif	3263	#endif
3241		3264
3242	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3265	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3243		3266
		3267	#if EXPERIMENT
		3268	static int
		3269	debug (SCHEME_P_ int indent, pointer x)
		3270	{
		3271	int c;
		3272
		3273	if (is_syntax (x))
		3274	{
		3275	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3276	return 8 + 8;
		3277	}
		3278
		3279	if (x == NIL)
		3280	{
		3281	printf ("%*sNIL\n", indent, "");
		3282	return 3;
		3283	}
		3284
		3285	switch (type (x))
		3286	{
		3287	case T_INTEGER:
		3288	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3289	return 32+8;
		3290
		3291	case T_SYMBOL:
		3292	printf ("%*sS<%s>\n", indent, "", symname (x));
		3293	return 24+8;
		3294
		3295	case T_CLOSURE:
		3296	printf ("%*sS<%s>\n", indent, "", "closure");
		3297	debug (SCHEME_A_ indent + 3, cdr(x));
		3298	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3299
		3300	case T_PAIR:
		3301	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3302	c = debug (SCHEME_A_ indent + 3, car (x));
		3303	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3304	return c + 1;
		3305
		3306	case T_PORT:
		3307	printf ("%*sS<%s>\n", indent, "", "port");
		3308	return 24+8;
		3309
		3310	case T_VECTOR:
		3311	printf ("%*sS<%s>\n", indent, "", "vector");
		3312	return 24+8;
		3313
		3314	case T_ENVIRONMENT:
		3315	printf ("%*sS<%s>\n", indent, "", "environment");
		3316	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3317
		3318	default:
		3319	printf ("unhandled type %d\n", type (x));
		3320	break;
		3321	}
		3322	}
		3323	#endif
		3324
3244	static int	3325	static int
3245	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3326	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3246	{	3327	{
3247	pointer args = SCHEME_V->args;	3328	pointer args = SCHEME_V->args;
3248	pointer x, y;	3329	pointer x, y;
3249		3330
3250	switch (op)	3331	switch (op)
3251	{	3332	{
		3333	#if EXPERIMENT //D
		3334	case OP_DEBUG:
		3335	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3336	printf ("\n");
		3337	s_return (S_T);
		3338	#endif
3252	case OP_LOAD: /* load */	3339	case OP_LOAD: /* load */
3253	if (file_interactive (SCHEME_A))	3340	if (file_interactive (SCHEME_A))
3254	{	3341	{
3255	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3342	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3256	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3343	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3257	}	3344	}
3258		3345
3259	if (!file_push (SCHEME_A_ strvalue (car (args))))	3346	if (!file_push (SCHEME_A_ strvalue (car (args))))
3260	Error_1 ("unable to open", car (args));	3347	Error_1 ("unable to open", car (args));
3261	else	3348	else
…		…
3265	}	3352	}
3266		3353
3267	case OP_T0LVL: /* top level */	3354	case OP_T0LVL: /* top level */
3268		3355
3269	/* If we reached the end of file, this loop is done. */	3356	/* If we reached the end of file, this loop is done. */
3270	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3357	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3271	{	3358	{
3272	if (SCHEME_V->file_i == 0)	3359	if (SCHEME_V->file_i == 0)
3273	{	3360	{
3274	SCHEME_V->args = NIL;	3361	SCHEME_V->args = NIL;
3275	s_goto (OP_QUIT);	3362	s_goto (OP_QUIT);
…		…
3353	#endif	3440	#endif
3354	if (is_symbol (SCHEME_V->code)) /* symbol */	3441	if (is_symbol (SCHEME_V->code)) /* symbol */
3355	{	3442	{
3356	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3443	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3357		3444
3358	if (x != NIL)	3445	if (x == NIL)
3359	s_return (slot_value_in_env (x));
3360	else
3361	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3446	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3447
		3448	s_return (slot_value_in_env (x));
3362	}	3449	}
3363	else if (is_pair (SCHEME_V->code))	3450	else if (is_pair (SCHEME_V->code))
3364	{	3451	{
3365	x = car (SCHEME_V->code);	3452	x = car (SCHEME_V->code);
3366		3453
…		…
3379	}	3466	}
3380	else	3467	else
3381	s_return (SCHEME_V->code);	3468	s_return (SCHEME_V->code);
3382		3469
3383	case OP_E0ARGS: /* eval arguments */	3470	case OP_E0ARGS: /* eval arguments */
3384	if (is_macro (SCHEME_V->value)) /* macro expansion */	3471	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3385	{	3472	{
3386	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3473	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3387	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3474	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3388	SCHEME_V->code = SCHEME_V->value;	3475	SCHEME_V->code = SCHEME_V->value;
3389	s_goto (OP_APPLY);	3476	s_goto (OP_APPLY);
…		…
3443	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3530	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3444	else if (is_foreign (SCHEME_V->code))	3531	else if (is_foreign (SCHEME_V->code))
3445	{	3532	{
3446	/* Keep nested calls from GC'ing the arglist */	3533	/* Keep nested calls from GC'ing the arglist */
3447	push_recent_alloc (SCHEME_A_ args, NIL);	3534	push_recent_alloc (SCHEME_A_ args, NIL);
3448	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3535	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3449		3536
3450	s_return (x);	3537	s_return (x);
3451	}	3538	}
3452	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */	3539	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */
3453	{	3540	{
…		…
3490		3577
3491	case OP_DOMACRO: /* do macro */	3578	case OP_DOMACRO: /* do macro */
3492	SCHEME_V->code = SCHEME_V->value;	3579	SCHEME_V->code = SCHEME_V->value;
3493	s_goto (OP_EVAL);	3580	s_goto (OP_EVAL);
3494		3581
3495	#if 1
3496
3497	case OP_LAMBDA: /* lambda */	3582	case OP_LAMBDA: /* lambda */
3498	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3583	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3499	set SCHEME_V->value fall thru */	3584	set SCHEME_V->value fall thru */
3500	{	3585	{
3501	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3586	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3507	SCHEME_V->code = slot_value_in_env (f);	3592	SCHEME_V->code = slot_value_in_env (f);
3508	s_goto (OP_APPLY);	3593	s_goto (OP_APPLY);
3509	}	3594	}
3510		3595
3511	SCHEME_V->value = SCHEME_V->code;	3596	SCHEME_V->value = SCHEME_V->code;
3512	/* Fallthru */
3513	}	3597	}
		3598	/* Fallthru */
3514		3599
3515	case OP_LAMBDA1:	3600	case OP_LAMBDA1:
3516	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3601	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3517
3518	#else
3519
3520	case OP_LAMBDA: /* lambda */
3521	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3522
3523	#endif
3524		3602
3525	case OP_MKCLOSURE: /* make-closure */	3603	case OP_MKCLOSURE: /* make-closure */
3526	x = car (args);	3604	x = car (args);
3527		3605
3528	if (car (x) == SCHEME_V->LAMBDA)	3606	if (car (x) == SCHEME_V->LAMBDA)
…		…
4124	else	4202	else
4125	Error_0 ("modulo: division by zero");	4203	Error_0 ("modulo: division by zero");
4126		4204
4127	s_return (mk_number (SCHEME_A_ v));	4205	s_return (mk_number (SCHEME_A_ v));
4128		4206
4129	case OP_CAR: /* car */	4207	/* the compiler will optimize this mess... */
4130	s_return (caar (args));	4208	case OP_CAR: op_car: s_return (car (x));
4131		4209	case OP_CDR: op_cdr: s_return (cdr (x));
4132	case OP_CDR: /* cdr */	4210	case OP_CAAR: op_caar: x = car (x); goto op_car;
4133	s_return (cdar (args));	4211	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4212	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4213	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4214	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4215	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4216	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4217	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4218	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4219	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4220	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4221	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4222	case OP_CAAAAR: x = car (x); goto op_caaar;
		4223	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4224	case OP_CAADAR: x = car (x); goto op_caadr;
		4225	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4226	case OP_CADAAR: x = car (x); goto op_cadar;
		4227	case OP_CADADR: x = cdr (x); goto op_cadar;
		4228	case OP_CADDAR: x = car (x); goto op_caddr;
		4229	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4230	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4231	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4232	case OP_CDADAR: x = car (x); goto op_cdadr;
		4233	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4234	case OP_CDDAAR: x = car (x); goto op_cddar;
		4235	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4236	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4237	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4134		4238
4135	case OP_CONS: /* cons */	4239	case OP_CONS: /* cons */
4136	set_cdr (args, cadr (args));	4240	set_cdr (args, cadr (args));
4137	s_return (args);	4241	s_return (args);
4138		4242
…		…
4460	pointer d = cdr (args);	4564	pointer d = cdr (args);
4461	int r;	4565	int r;
4462		4566
4463	switch (op)	4567	switch (op)
4464	{	4568	{
4465	case OP_NOT: /* not */ r = is_false (a) ; break;	4569	case OP_NOT: /* not */ r = is_false (a) ; break;
4466	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T; break;	4570	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T ; break;
4467	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4571	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468	case OP_NULLP: /* null? */ r = a == NIL ; break;	4572	case OP_NULLP: /* null? */ r = a == NIL ; break;
4469	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4573	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4574	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4575	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4576	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4577	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */	4578	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */
4474	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4579	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475		4580
4476	#if USE_CHAR_CLASSIFIERS	4581	#if USE_CHAR_CLASSIFIERS
4477	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4582	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4583	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4584	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4529	}	4634	}
4530	else	4635	else
4531	s_return (SCHEME_V->code);	4636	s_return (SCHEME_V->code);
4532		4637
4533	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4638	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4639	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4535	s_return (SCHEME_V->value);	4640	s_return (SCHEME_V->value);
4536		4641
4537	#if USE_PORTS	4642	#if USE_PORTS
4538		4643
4539	case OP_WRITE: /* write */	4644	case OP_WRITE: /* write */
…		…
4684	SCHEME_V->gc_verbose = (a != S_F);	4789	SCHEME_V->gc_verbose = (a != S_F);
4685	s_retbool (was);	4790	s_retbool (was);
4686	}	4791	}
4687		4792
4688	case OP_NEWSEGMENT: /* new-segment */	4793	case OP_NEWSEGMENT: /* new-segment */
		4794	#if 0
4689	if (!is_pair (args) \|\| !is_number (a))	4795	if (!is_pair (args) \|\| !is_number (a))
4690	Error_0 ("new-segment: argument must be a number");	4796	Error_0 ("new-segment: argument must be a number");
4691		4797	#endif
4692	alloc_cellseg (SCHEME_A_ ivalue (a));	4798	s_retbool (alloc_cellseg (SCHEME_A));
4693
4694	s_return (S_T);
4695		4799
4696	case OP_OBLIST: /* oblist */	4800	case OP_OBLIST: /* oblist */
4697	s_return (oblist_all_symbols (SCHEME_A));	4801	s_return (oblist_all_symbols (SCHEME_A));
4698		4802
4699	#if USE_PORTS	4803	#if USE_PORTS
…		…
4769	s_return (p == NIL ? S_F : p);	4873	s_return (p == NIL ? S_F : p);
4770	}	4874	}
4771		4875
4772	case OP_GET_OUTSTRING: /* get-output-string */	4876	case OP_GET_OUTSTRING: /* get-output-string */
4773	{	4877	{
4774	port *p;	4878	port *p = port (a);
4775		4879
4776	if ((p = a->object.port)->kind & port_string)	4880	if (p->kind & port_string)
4777	{	4881	{
4778	off_t size;	4882	off_t size;
4779	char *str;	4883	char *str;
4780		4884
4781	size = p->rep.string.curr - p->rep.string.start + 1;	4885	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4886	int res;	4990	int res;
4887		4991
4888	if (is_pair (args))	4992	if (is_pair (args))
4889	p = car (args);	4993	p = car (args);
4890		4994
4891	res = p->object.port->kind & port_string;	4995	res = port (p)->kind & port_string;
4892		4996
4893	s_retbool (res);	4997	s_retbool (res);
4894	}	4998	}
4895		4999
4896	case OP_SET_INPORT: /* set-input-port */	5000	case OP_SET_INPORT: /* set-input-port */
…		…
5221		5325
5222	case OP_CLOSUREP: /* closure? */	5326	case OP_CLOSUREP: /* closure? */
5223	/*	5327	/*
5224	* Note, macro object is also a closure.	5328	* Note, macro object is also a closure.
5225	* Therefore, (closure? <#MACRO>) ==> #t	5329	* Therefore, (closure? <#MACRO>) ==> #t
		5330	* (schmorp) well, obviously not, fix? TODO
5226	*/	5331	*/
5227	s_retbool (is_closure (a));	5332	s_retbool (is_closure (a));
5228		5333
5229	case OP_MACROP: /* macro? */	5334	case OP_MACROP: /* macro? */
5230	s_retbool (is_macro (a));	5335	s_retbool (is_macro (a));
…		…
5435	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))	5540	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5436	return;	5541	return;
5437		5542
5438	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5543	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5439	{	5544	{
5440	xwrstr ("No memory!\n");	5545	putstr (SCHEME_A_ "No memory!\n");
5441	return;	5546	return;
5442	}	5547	}
5443	}	5548	}
5444	}	5549	}
5445		5550
…		…
5471		5576
5472	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5577	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5473	static int	5578	static int
5474	syntaxnum (pointer p)	5579	syntaxnum (pointer p)
5475	{	5580	{
5476	const char *s = strvalue (car (p));	5581	const char *s = strvalue (p);
5477		5582
5478	switch (strlength (car (p)))	5583	switch (strlength (p))
5479	{	5584	{
5480	case 2:	5585	case 2:
5481	if (s[0] == 'i')	5586	if (s[0] == 'i')
5482	return OP_IF0; /* if */	5587	return OP_IF0; /* if */
5483	else	5588	else
…		…
5558	ecb_cold int	5663	ecb_cold int
5559	scheme_init (SCHEME_P)	5664	scheme_init (SCHEME_P)
5560	{	5665	{
5561	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5666	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5562	pointer x;	5667	pointer x;
		5668
		5669	/* this memset is not strictly correct, as we assume (intcache)
		5670	* that memset 0 will also set pointers to 0, but memset does
		5671	* of course not guarantee that. screw such systems.
		5672	*/
		5673	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5563		5674
5564	num_set_fixnum (num_zero, 1);	5675	num_set_fixnum (num_zero, 1);
5565	num_set_ivalue (num_zero, 0);	5676	num_set_ivalue (num_zero, 0);
5566	num_set_fixnum (num_one, 1);	5677	num_set_fixnum (num_one, 1);
5567	num_set_ivalue (num_one, 1);	5678	num_set_ivalue (num_one, 1);
…		…
5579	SCHEME_V->save_inport = NIL;	5690	SCHEME_V->save_inport = NIL;
5580	SCHEME_V->loadport = NIL;	5691	SCHEME_V->loadport = NIL;
5581	SCHEME_V->nesting = 0;	5692	SCHEME_V->nesting = 0;
5582	SCHEME_V->interactive_repl = 0;	5693	SCHEME_V->interactive_repl = 0;
5583		5694
5584	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5695	if (!alloc_cellseg (SCHEME_A))
5585	{	5696	{
5586	#if USE_ERROR_CHECKING	5697	#if USE_ERROR_CHECKING
5587	SCHEME_V->no_memory = 1;	5698	SCHEME_V->no_memory = 1;
5588	return 0;	5699	return 0;
5589	#endif	5700	#endif
…		…
5919	# endif	6030	# endif
5920	int fin;	6031	int fin;
5921	char *file_name = InitFile;	6032	char *file_name = InitFile;
5922	int retcode;	6033	int retcode;
5923	int isfile = 1;	6034	int isfile = 1;
		6035	system ("ps v $PPID");//D
5924		6036
5925	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6037	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5926	{	6038	{
5927	xwrstr ("Usage: tinyscheme -?\n");	6039	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5928	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6040	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5929	xwrstr ("followed by\n");	6041	putstr (SCHEME_A_ "followed by\n");
5930	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6042	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5931	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6043	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5932	xwrstr ("assuming that the executable is named tinyscheme.\n");	6044	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5933	xwrstr ("Use - as filename for stdin.\n");	6045	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5934	return 1;	6046	return 1;
5935	}	6047	}
5936		6048
5937	if (!scheme_init (SCHEME_A))	6049	if (!scheme_init (SCHEME_A))
5938	{	6050	{
5939	xwrstr ("Could not initialize!\n");	6051	putstr (SCHEME_A_ "Could not initialize!\n");
5940	return 2;	6052	return 2;
5941	}	6053	}
5942		6054
5943	# if USE_PORTS	6055	# if USE_PORTS
5944	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6056	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
5989	fin = open (file_name, O_RDONLY);	6101	fin = open (file_name, O_RDONLY);
5990	#endif	6102	#endif
5991		6103
5992	if (isfile && fin < 0)	6104	if (isfile && fin < 0)
5993	{	6105	{
5994	xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n");	6106	putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5995	}	6107	}
5996	else	6108	else
5997	{	6109	{
5998	if (isfile)	6110	if (isfile)
5999	scheme_load_named_file (SCHEME_A_ fin, file_name);	6111	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6003	#if USE_PORTS	6115	#if USE_PORTS
6004	if (!isfile \|\| fin != STDIN_FILENO)	6116	if (!isfile \|\| fin != STDIN_FILENO)
6005	{	6117	{
6006	if (SCHEME_V->retcode != 0)	6118	if (SCHEME_V->retcode != 0)
6007	{	6119	{
6008	xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n");	6120	putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6009	}	6121	}
6010		6122
6011	if (isfile)	6123	if (isfile)
6012	close (fin);	6124	close (fin);
6013	}	6125	}

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC vs. Revision 1.53 by root, Tue Dec 1 02:21:49 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC vs.
Revision 1.53 by root, Tue Dec 1 02:21:49 2015 UTC