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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.38 by root, Sun Nov 29 13:47:15 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57: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,
…		…
255	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);
256	static num num_intdiv (num a, num b);	251	static num num_intdiv (num a, num b);
257	static num num_rem (num a, num b);	252	static num num_rem (num a, num b);
258	static num num_mod (num a, num b);	253	static num num_mod (num a, num b);
259		254
260	#if USE_MATH
261	static double round_per_R5RS (double x);
262	#endif
263	static int is_zero_rvalue (RVALUE x);	255	static int is_zero_rvalue (RVALUE x);
264		256
265	static num num_zero;	257	static num num_zero;
266	static num num_one;	258	static num num_one;
267		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
268	/* macros for cell operations */	264	/* macros for cell operations */
269	#define typeflag(p) ((p)->flag + 0)	265	#define typeflag(p) (CELL(p)->flag + 0)
270	#define set_typeflag(p,v) ((p)->flag = (v))	266	#define set_typeflag(p,v) (CELL(p)->flag = (v))
271	#define type(p) (typeflag (p) & T_MASKTYPE)	267	#define type(p) (typeflag (p) & T_MASKTYPE)
272		268
273	INTERFACE int	269	INTERFACE int
274	is_string (pointer p)	270	is_string (pointer p)
275	{	271	{
276	return type (p) == T_STRING;	272	return type (p) == T_STRING;
277	}	273	}
278		274
279	#define strvalue(p) ((p)->object.string.svalue)	275	#define strvalue(p) (CELL(p)->object.string.svalue)
280	#define strlength(p) ((p)->object.string.length)	276	#define strlength(p) (CELL(p)->object.string.length)
281		277
282	INTERFACE int	278	INTERFACE int
283	is_vector (pointer p)	279	is_vector (pointer p)
284	{	280	{
285	return type (p) == T_VECTOR;	281	return type (p) == T_VECTOR;
286	}	282	}
287		283
288	#define vecvalue(p) ((p)->object.vector.vvalue)	284	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289	#define veclength(p) ((p)->object.vector.length)	285	#define veclength(p) (CELL(p)->object.vector.length)
290	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	286	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	287	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	288	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293		289
294	INTERFACE int	290	INTERFACE int
…		…
320	string_value (pointer p)	316	string_value (pointer p)
321	{	317	{
322	return strvalue (p);	318	return strvalue (p);
323	}	319	}
324		320
325	#define ivalue_unchecked(p) (p)->object.ivalue	321	#define ivalue_unchecked(p) CELL(p)->object.ivalue
326	#define set_ivalue(p,v) (p)->object.ivalue = (v)	322	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327		323
328	#if USE_REAL	324	#if USE_REAL
329	#define rvalue_unchecked(p) (p)->object.rvalue	325	#define rvalue_unchecked(p) CELL(p)->object.rvalue
330	#define set_rvalue(p,v) (p)->object.rvalue = (v)	326	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331	#else	327	#else
332	#define rvalue_unchecked(p) (p)->object.ivalue	328	#define rvalue_unchecked(p) CELL(p)->object.ivalue
333	#define set_rvalue(p,v) (p)->object.ivalue = (v)	329	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334	#endif	330	#endif
335		331
336	INTERFACE long	332	INTERFACE long
337	charvalue (pointer p)	333	charvalue (pointer p)
338	{	334	{
339	return ivalue_unchecked (p);	335	return ivalue_unchecked (p);
340	}	336	}
341		337
		338	#define port(p) CELL(p)->object.port
		339	#define set_port(p,v) port(p) = (v)
342	INTERFACE int	340	INTERFACE int
343	is_port (pointer p)	341	is_port (pointer p)
344	{	342	{
345	return type (p) == T_PORT;	343	return type (p) == T_PORT;
346	}	344	}
347		345
348	INTERFACE int	346	INTERFACE int
349	is_inport (pointer p)	347	is_inport (pointer p)
350	{	348	{
351	return is_port (p) && p->object.port->kind & port_input;	349	return is_port (p) && port (p)->kind & port_input;
352	}	350	}
353		351
354	INTERFACE int	352	INTERFACE int
355	is_outport (pointer p)	353	is_outport (pointer p)
356	{	354	{
357	return is_port (p) && p->object.port->kind & port_output;	355	return is_port (p) && port (p)->kind & port_output;
358	}	356	}
359		357
360	INTERFACE int	358	INTERFACE int
361	is_pair (pointer p)	359	is_pair (pointer p)
362	{	360	{
363	return type (p) == T_PAIR;	361	return type (p) == T_PAIR;
364	}	362	}
365		363
366	#define car(p) ((p)->object.cons.car + 0)	364	#define car(p) (POINTER (CELL(p)->object.cons.car))
367	#define cdr(p) ((p)->object.cons.cdr + 0)	365	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368		366
369	static pointer caar (pointer p) { return car (car (p)); }	367	static pointer caar (pointer p) { return car (car (p)); }
370	static pointer cadr (pointer p) { return car (cdr (p)); }	368	static pointer cadr (pointer p) { return car (cdr (p)); }
371	static pointer cdar (pointer p) { return cdr (car (p)); }	369	static pointer cdar (pointer p) { return cdr (car (p)); }
372	static pointer cddr (pointer p) { return cdr (cdr (p)); }	370	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
376	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	374	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377		375
378	INTERFACE void	376	INTERFACE void
379	set_car (pointer p, pointer q)	377	set_car (pointer p, pointer q)
380	{	378	{
381	p->object.cons.car = q;	379	CELL(p)->object.cons.car = CELL (q);
382	}	380	}
383		381
384	INTERFACE void	382	INTERFACE void
385	set_cdr (pointer p, pointer q)	383	set_cdr (pointer p, pointer q)
386	{	384	{
387	p->object.cons.cdr = q;	385	CELL(p)->object.cons.cdr = CELL (q);
388	}	386	}
389		387
390	INTERFACE pointer	388	INTERFACE pointer
391	pair_car (pointer p)	389	pair_car (pointer p)
392	{	390	{
…		…
410	{	408	{
411	return strvalue (p);	409	return strvalue (p);
412	}	410	}
413		411
414	#if USE_PLIST	412	#if USE_PLIST
		413	#error plists are broken because symbols are no longer pairs
		414	#define symprop(p) cdr(p)
415	SCHEME_EXPORT int	415	SCHEME_EXPORT int
416	hasprop (pointer p)	416	hasprop (pointer p)
417	{	417	{
418	return typeflag (p) & T_SYMBOL;	418	return typeflag (p) & T_SYMBOL;
419	}	419	}
420
421	# define symprop(p) cdr(p)
422	#endif	420	#endif
423		421
424	INTERFACE int	422	INTERFACE int
425	is_syntax (pointer p)	423	is_syntax (pointer p)
426	{	424	{
…		…
667		665
668	static int file_push (SCHEME_P_ const char *fname);	666	static int file_push (SCHEME_P_ const char *fname);
669	static void file_pop (SCHEME_P);	667	static void file_pop (SCHEME_P);
670	static int file_interactive (SCHEME_P);	668	static int file_interactive (SCHEME_P);
671	ecb_inline int is_one_of (const char *s, int c);	669	ecb_inline int is_one_of (const char *s, int c);
672	static int alloc_cellseg (SCHEME_P_ int n);	670	static int alloc_cellseg (SCHEME_P);
673	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	671	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674	static void finalize_cell (SCHEME_P_ pointer a);	672	static void finalize_cell (SCHEME_P_ pointer a);
675	static int count_consecutive_cells (pointer x, int needed);	673	static int count_consecutive_cells (pointer x, int needed);
676	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);
677	static pointer mk_number (SCHEME_P_ const num n);	675	static pointer mk_number (SCHEME_P_ const num n);
…		…
871	}	869	}
872		870
873	return ret;	871	return ret;
874	}	872	}
875		873
876	#if USE_MATH
877
878	/* Round to nearest. Round to even if midway */
879	static double
880	round_per_R5RS (double x)
881	{
882	double fl = floor (x);
883	double ce = ceil (x);
884	double dfl = x - fl;
885	double dce = ce - x;
886
887	if (dfl > dce)
888	return ce;
889	else if (dfl < dce)
890	return fl;
891	else
892	{
893	if (fmod (fl, 2) == 0) /* I imagine this holds */
894	return fl;
895	else
896	return ce;
897	}
898	}
899	#endif
900
901	static int	874	static int
902	is_zero_rvalue (RVALUE x)	875	is_zero_rvalue (RVALUE x)
903	{	876	{
904	return x == 0;	877	return x == 0;
905	#if 0	878	#if 0
…		…
911	#endif	884	#endif
912	}	885	}
913		886
914	/* allocate new cell segment */	887	/* allocate new cell segment */
915	static int	888	static int
916	alloc_cellseg (SCHEME_P_ int n)	889	alloc_cellseg (SCHEME_P)
917	{	890	{
918	pointer newp;	891	struct cell *newp;
919	pointer last;	892	struct cell *last;
920	pointer p;	893	struct cell *p;
921	char *cp;	894	char *cp;
922	long i;	895	long i;
923	int k;	896	int k;
924		897
925	static int segsize = CELL_SEGSIZE >> 1;	898	static int segsize = CELL_SEGSIZE >> 1;
926	segsize <<= 1;	899	segsize <<= 1;
927		900
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));	901	cp = malloc (segsize * sizeof (struct cell));
934		902
935	if (!cp && USE_ERROR_CHECKING)	903	if (!cp && USE_ERROR_CHECKING)
936	return k;	904	return k;
937		905
938	i = ++SCHEME_V->last_cell_seg;	906	i = ++SCHEME_V->last_cell_seg;
939	SCHEME_V->alloc_seg[i] = cp;	907	SCHEME_V->alloc_seg[i] = cp;
940		908
941	newp = (pointer)cp;	909	newp = (struct cell *)cp;
942	SCHEME_V->cell_seg[i] = newp;	910	SCHEME_V->cell_seg[i] = newp;
943	SCHEME_V->cell_segsize[i] = segsize;	911	SCHEME_V->cell_segsize[i] = segsize;
944	SCHEME_V->fcells += segsize;	912	SCHEME_V->fcells += segsize;
945	last = newp + segsize - 1;	913	last = newp + segsize - 1;
946		914
947	for (p = newp; p <= last; p++)	915	for (p = newp; p <= last; p++)
948	{	916	{
		917	pointer cp = POINTER (p);
949	set_typeflag (p, T_PAIR);	918	set_typeflag (cp, T_PAIR);
950	set_car (p, NIL);	919	set_car (cp, NIL);
951	set_cdr (p, p + 1);	920	set_cdr (cp, POINTER (p + 1));
952	}	921	}
953		922
954	set_cdr (last, SCHEME_V->free_cell);	923	set_cdr (POINTER (last), SCHEME_V->free_cell);
955	SCHEME_V->free_cell = newp;	924	SCHEME_V->free_cell = POINTER (newp);
956	}
957		925
958	return n;	926	return 1;
959	}	927	}
960		928
961	/* get new cell. parameter a, b is marked by gc. */	929	/* get new cell. parameter a, b is marked by gc. */
962	ecb_inline pointer	930	ecb_inline pointer
963	get_cell_x (SCHEME_P_ pointer a, pointer b)	931	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
967	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	935	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968	return S_SINK;	936	return S_SINK;
969		937
970	if (SCHEME_V->free_cell == NIL)	938	if (SCHEME_V->free_cell == NIL)
971	{	939	{
972	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;
973		941
974	gc (SCHEME_A_ a, b);	942	gc (SCHEME_A_ a, b);
975		943
976	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)
977	{	945	{
978	/* 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 */
979	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	947	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980	{	948	{
981	#if USE_ERROR_CHECKING	949	#if USE_ERROR_CHECKING
982	SCHEME_V->no_memory = 1;	950	SCHEME_V->no_memory = 1;
983	return S_SINK;	951	return S_SINK;
984	#endif	952	#endif
…		…
996	}	964	}
997	}	965	}
998		966
999	/* To retain recent allocs before interpreter knows about them -	967	/* To retain recent allocs before interpreter knows about them -
1000	Tehom */	968	Tehom */
1001
1002	static void	969	static void
1003	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	970	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004	{	971	{
1005	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	972	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006		973
…		…
1028	}	995	}
1029		996
1030	static pointer	997	static pointer
1031	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	998	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032	{	999	{
1033	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1000	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034	pointer e = malloc (len sizeof (pointer));	1001	pointer e = malloc (len sizeof (pointer));
1035		1002
1036	if (!e && USE_ERROR_CHECKING)	1003	if (!e && USE_ERROR_CHECKING)
1037	return S_SINK;	1004	return S_SINK;
1038		1005
1039	/* Record it as a vector so that gc understands it. */	1006	/* Record it as a vector so that gc understands it. */
1040	set_typeflag (v, T_VECTOR \| T_ATOM);	1007	set_typeflag (v, T_VECTOR \| T_ATOM);
1041		1008
1042	v->object.vector.vvalue = e;	1009	CELL(v)->object.vector.vvalue = e;
1043	v->object.vector.length = len;	1010	CELL(v)->object.vector.length = len;
1044	fill_vector (v, 0, init);	1011	fill_vector (v, 0, init);
1045	push_recent_alloc (SCHEME_A_ v, NIL);	1012	push_recent_alloc (SCHEME_A_ v, NIL);
1046		1013
1047	return v;	1014	return v;
1048	}	1015	}
…		…
1057	static void	1024	static void
1058	check_cell_alloced (pointer p, int expect_alloced)	1025	check_cell_alloced (pointer p, int expect_alloced)
1059	{	1026	{
1060	/* 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. */
1061	if (typeflag (p) & !expect_alloced)	1028	if (typeflag (p) & !expect_alloced)
1062	xwrstr ("Cell is already allocated!\n");	1029	putstr (SCHEME_A_ "Cell is already allocated!\n");
1063		1030
1064	if (!(typeflag (p)) & expect_alloced)	1031	if (!(typeflag (p)) & expect_alloced)
1065	xwrstr ("Cell is not allocated!\n");	1032	putstr (SCHEME_A_ "Cell is not allocated!\n");
1066	}	1033	}
1067		1034
1068	static void	1035	static void
1069	check_range_alloced (pointer p, int n, int expect_alloced)	1036	check_range_alloced (pointer p, int n, int expect_alloced)
1070	{	1037	{
…		…
1091	set_car (x, a);	1058	set_car (x, a);
1092	set_cdr (x, b);	1059	set_cdr (x, b);
1093		1060
1094	return x;	1061	return x;
1095	}	1062	}
1096
1097	/* ========== oblist implementation ========== */
1098		1063
1099	static pointer	1064	static pointer
1100	generate_symbol (SCHEME_P_ const char *name)	1065	generate_symbol (SCHEME_P_ const char *name)
1101	{	1066	{
1102	pointer x = mk_string (SCHEME_A_ name);	1067	pointer x = mk_string (SCHEME_A_ name);
1103	setimmutable (x);	1068	setimmutable (x);
1104	set_typeflag (x, T_SYMBOL \| T_ATOM);	1069	set_typeflag (x, T_SYMBOL \| T_ATOM);
1105	return x;	1070	return x;
1106	}	1071	}
1107		1072
		1073	/* ========== oblist implementation ========== */
		1074
1108	#ifndef USE_OBJECT_LIST	1075	#ifndef USE_OBJECT_LIST
1109		1076
1110	static int	1077	static int
1111	hash_fn (const char *key, int table_size)	1078	hash_fn (const char *key, int table_size)
1112	{	1079	{
…		…
1198		1165
1199	/* returns the new symbol */	1166	/* returns the new symbol */
1200	static pointer	1167	static pointer
1201	oblist_add_by_name (SCHEME_P_ const char *name)	1168	oblist_add_by_name (SCHEME_P_ const char *name)
1202	{	1169	{
1203	pointer x = mk_string (SCHEME_A_ name);	1170	pointer x = generate_symbol (SCHEME_A_ name);
1204	set_typeflag (x, T_SYMBOL);
1205	setimmutable (x);
1206	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207	return x;	1172	return x;
1208	}	1173	}
1209		1174
1210	static pointer	1175	static pointer
…		…
1220	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1221	{	1186	{
1222	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223		1188
1224	set_typeflag (x, T_PORT \| T_ATOM);	1189	set_typeflag (x, T_PORT \| T_ATOM);
1225	x->object.port = p;	1190	set_port (x, p);
1226		1191
1227	return x;	1192	return x;
1228	}	1193	}
1229	#endif	1194	#endif
1230		1195
1231	pointer	1196	pointer
1232	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1233	{	1198	{
1234	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235		1200
1236	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1201	set_typeflag (x, T_FOREIGN \| T_ATOM);
1237	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1238		1203
1239	return x;	1204	return x;
1240	}	1205	}
1241		1206
1242	INTERFACE pointer	1207	INTERFACE pointer
1243	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1244	{	1209	{
1245	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246		1211
1247	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1212	set_typeflag (x, T_CHARACTER \| T_ATOM);
1248	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1249		1214
1250	return x;	1215	return x;
1251	}	1216	}
1252		1217
1253	/* get number atom (integer) */	1218	/* get number atom (integer) */
1254	INTERFACE pointer	1219	INTERFACE pointer
1255	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1256	{	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	{
1257	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258		1233
1259	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 */
1260	set_ivalue (x, n);	1236	set_ivalue (x, n);
1261		1237
		1238	*pp = x;
		1239	}
		1240
1262	return x;	1241	return *pp;
1263	}	1242	}
1264		1243
1265	INTERFACE pointer	1244	INTERFACE pointer
1266	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1267	{	1246	{
1268	#if USE_REAL	1247	#if USE_REAL
1269	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270		1249
1271	set_typeflag (x, (T_REAL \| T_ATOM));	1250	set_typeflag (x, T_REAL \| T_ATOM);
1272	set_rvalue (x, n);	1251	set_rvalue (x, n);
1273		1252
1274	return x;	1253	return x;
1275	#else	1254	#else
1276	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1392	INTERFACE pointer	1371	INTERFACE pointer
1393	gensym (SCHEME_P)	1372	gensym (SCHEME_P)
1394	{	1373	{
1395	pointer x;	1374	pointer x;
1396	char name[40] = "gensym-";	1375	char name[40] = "gensym-";
1397	xnum (name + 7, SCHEME_V->gensym_cnt);	1376	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1398		1377
1399	return generate_symbol (SCHEME_A_ name);	1378	return generate_symbol (SCHEME_A_ name);
		1379	}
		1380
		1381	static int
		1382	is_gensym (SCHEME_P_ pointer x)
		1383	{
		1384	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1400	}	1385	}
1401		1386
1402	/* make symbol or number atom from string */	1387	/* make symbol or number atom from string */
1403	static pointer	1388	static pointer
1404	mk_atom (SCHEME_P_ char *q)	1389	mk_atom (SCHEME_P_ char *q)
…		…
1490	return S_F;	1475	return S_F;
1491	else if (name == '\\') / #\w (character) */	1476	else if (name == '\\') / #\w (character) */
1492	{	1477	{
1493	int c;	1478	int c;
1494		1479
		1480	// TODO: optimise
1495	if (stricmp (name + 1, "space") == 0)	1481	if (stricmp (name + 1, "space") == 0)
1496	c = ' ';	1482	c = ' ';
1497	else if (stricmp (name + 1, "newline") == 0)	1483	else if (stricmp (name + 1, "newline") == 0)
1498	c = '\n';	1484	c = '\n';
1499	else if (stricmp (name + 1, "return") == 0)	1485	else if (stricmp (name + 1, "return") == 0)
1500	c = '\r';	1486	c = '\r';
1501	else if (stricmp (name + 1, "tab") == 0)	1487	else if (stricmp (name + 1, "tab") == 0)
1502	c = '\t';	1488	c = '\t';
		1489	else if (stricmp (name + 1, "alarm") == 0)
		1490	c = 0x07;
		1491	else if (stricmp (name + 1, "backspace") == 0)
		1492	c = 0x08;
		1493	else if (stricmp (name + 1, "escape") == 0)
		1494	c = 0x1b;
		1495	else if (stricmp (name + 1, "delete") == 0)
		1496	c = 0x7f;
		1497	else if (stricmp (name + 1, "null") == 0)
		1498	c = 0;
1503	else if (name[1] == 'x' && name[2] != 0)	1499	else if (name[1] == 'x' && name[2] != 0)
1504	{	1500	{
1505	long c1 = strtol (name + 2, 0, 16);	1501	long c1 = strtol (name + 2, 0, 16);
1506		1502
1507	if (0 <= c1 && c1 <= UCHAR_MAX)	1503	if (0 <= c1 && c1 <= UCHAR_MAX)
…		…
1613		1609
1614	/* garbage collection. parameter a, b is marked. */	1610	/* garbage collection. parameter a, b is marked. */
1615	static void	1611	static void
1616	gc (SCHEME_P_ pointer a, pointer b)	1612	gc (SCHEME_P_ pointer a, pointer b)
1617	{	1613	{
1618	pointer p;
1619	int i;	1614	int i;
1620		1615
1621	if (SCHEME_V->gc_verbose)	1616	if (SCHEME_V->gc_verbose)
1622	putstr (SCHEME_A_ "gc...");	1617	putstr (SCHEME_A_ "gc...");
1623		1618
…		…
1639	/* Mark recent objects the interpreter doesn't know about yet. */	1634	/* Mark recent objects the interpreter doesn't know about yet. */
1640	mark (car (S_SINK));	1635	mark (car (S_SINK));
1641	/* Mark any older stuff above nested C calls */	1636	/* Mark any older stuff above nested C calls */
1642	mark (SCHEME_V->c_nest);	1637	mark (SCHEME_V->c_nest);
1643		1638
		1639	#if USE_INTCACHE
		1640	/* mark intcache */
		1641	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1642	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1643	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1644	#endif
		1645
1644	/* mark variables a, b */	1646	/* mark variables a, b */
1645	mark (a);	1647	mark (a);
1646	mark (b);	1648	mark (b);
1647		1649
1648	/* garbage collect */	1650	/* garbage collect */
1649	clrmark (NIL);	1651	clrmark (NIL);
1650	SCHEME_V->fcells = 0;	1652	SCHEME_V->fcells = 0;
1651	SCHEME_V->free_cell = NIL;	1653	SCHEME_V->free_cell = NIL;
1652		1654
1653	/* free-list is kept sorted by address so as to maintain consecutive	1655	if (SCHEME_V->gc_verbose)
1654	ranges, if possible, for use with vectors. Here we scan the cells	1656	putstr (SCHEME_A_ "freeing...");
1655	(which are also kept sorted by address) downwards to build the	1657
1656	free-list in sorted order.	1658	uint32_t total = 0;
1657	*/	1659
		1660	/* Here we scan the cells to build the free-list. */
1658	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1661	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1659	{	1662	{
1660	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1663	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1664	struct cell *p;
		1665	total += SCHEME_V->cell_segsize [i];
1661		1666
1662	while (--p >= SCHEME_V->cell_seg[i])	1667	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1663	{	1668	{
		1669	pointer c = POINTER (p);
		1670
1664	if (is_mark (p))	1671	if (is_mark (c))
1665	clrmark (p);	1672	clrmark (c);
1666	else	1673	else
1667	{	1674	{
1668	/* reclaim cell */	1675	/* reclaim cell */
1669	if (typeflag (p) != T_PAIR)	1676	if (typeflag (c) != T_PAIR)
1670	{	1677	{
1671	finalize_cell (SCHEME_A_ p);	1678	finalize_cell (SCHEME_A_ c);
1672	set_typeflag (p, T_PAIR);	1679	set_typeflag (c, T_PAIR);
1673	set_car (p, NIL);	1680	set_car (c, NIL);
1674	}	1681	}
1675		1682
1676	++SCHEME_V->fcells;	1683	++SCHEME_V->fcells;
1677	set_cdr (p, SCHEME_V->free_cell);	1684	set_cdr (c, SCHEME_V->free_cell);
1678	SCHEME_V->free_cell = p;	1685	SCHEME_V->free_cell = c;
1679	}	1686	}
1680	}	1687	}
1681	}	1688	}
1682		1689
1683	if (SCHEME_V->gc_verbose)	1690	if (SCHEME_V->gc_verbose)
1684	{	1691	{
1685	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1692	putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1686	}	1693	}
1687	}	1694	}
1688		1695
1689	static void	1696	static void
1690	finalize_cell (SCHEME_P_ pointer a)	1697	finalize_cell (SCHEME_P_ pointer a)
1691	{	1698	{
1692	/* TODO, fast bitmap check? */	1699	/* TODO, fast bitmap check? */
1693	if (is_string (a))	1700	if (is_string (a) \|\| is_symbol (a))
1694	free (strvalue (a));	1701	free (strvalue (a));
1695	else if (is_vector (a))	1702	else if (is_vector (a))
1696	free (vecvalue (a));	1703	free (vecvalue (a));
1697	#if USE_PORTS	1704	#if USE_PORTS
1698	else if (is_port (a))	1705	else if (is_port (a))
1699	{	1706	{
1700	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1707	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1701	port_close (SCHEME_A_ a, port_input \| port_output);	1708	port_close (SCHEME_A_ a, port_input \| port_output);
1702		1709
1703	free (a->object.port);	1710	free (port (a));
1704	}	1711	}
1705	#endif	1712	#endif
1706	}	1713	}
1707		1714
1708	/* ========== Routines for Reading ========== */	1715	/* ========== Routines for Reading ========== */
…		…
1724	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1731	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1725	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;	1732	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;
1726	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1733	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1727	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1734	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1728	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1735	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1729	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1736	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1730		1737
1731	#if SHOW_ERROR_LINE	1738	#if SHOW_ERROR_LINE
1732	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1739	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1733		1740
1734	if (fname)	1741	if (fname)
…		…
1751	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1758	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1752	#if USE_PORTS	1759	#if USE_PORTS
1753	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1760	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1754	#endif	1761	#endif
1755	SCHEME_V->file_i--;	1762	SCHEME_V->file_i--;
1756	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1763	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1757	}	1764	}
1758	}	1765	}
1759		1766
1760	static int	1767	static int
1761	file_interactive (SCHEME_P)	1768	file_interactive (SCHEME_P)
1762	{	1769	{
1763	#if USE_PORTS	1770	#if USE_PORTS
1764	return SCHEME_V->file_i == 0	1771	return SCHEME_V->file_i == 0
1765	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1772	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1766	&& (SCHEME_V->inport->object.port->kind & port_file);	1773	&& (port (SCHEME_V->inport)->kind & port_file);
1767	#else	1774	#else
1768	return 0;	1775	return 0;
1769	#endif	1776	#endif
1770	}	1777	}
1771		1778
…		…
1905	}	1912	}
1906		1913
1907	static void	1914	static void
1908	port_close (SCHEME_P_ pointer p, int flag)	1915	port_close (SCHEME_P_ pointer p, int flag)
1909	{	1916	{
1910	port *pt = p->object.port;	1917	port *pt = port (p);
1911		1918
1912	pt->kind &= ~flag;	1919	pt->kind &= ~flag;
1913		1920
1914	if ((pt->kind & (port_input \| port_output)) == 0)	1921	if ((pt->kind & (port_input \| port_output)) == 0)
1915	{	1922	{
…		…
1936	/* get new character from input file */	1943	/* get new character from input file */
1937	static int	1944	static int
1938	inchar (SCHEME_P)	1945	inchar (SCHEME_P)
1939	{	1946	{
1940	int c;	1947	int c;
1941	port *pt;	1948	port *pt = port (SCHEME_V->inport);
1942
1943	pt = SCHEME_V->inport->object.port;
1944		1949
1945	if (pt->kind & port_saw_EOF)	1950	if (pt->kind & port_saw_EOF)
1946	return EOF;	1951	return EOF;
1947		1952
1948	c = basic_inchar (pt);	1953	c = basic_inchar (pt);
…		…
2015	port *pt;	2020	port *pt;
2016		2021
2017	if (c == EOF)	2022	if (c == EOF)
2018	return;	2023	return;
2019		2024
2020	pt = SCHEME_V->inport->object.port;	2025	pt = port (SCHEME_V->inport);
2021	pt->unget = c;	2026	pt->unget = c;
2022	#else	2027	#else
2023	if (c == EOF)	2028	if (c == EOF)
2024	return;	2029	return;
2025		2030
…		…
2053		2058
2054	INTERFACE void	2059	INTERFACE void
2055	putstr (SCHEME_P_ const char *s)	2060	putstr (SCHEME_P_ const char *s)
2056	{	2061	{
2057	#if USE_PORTS	2062	#if USE_PORTS
2058	port *pt = SCHEME_V->outport->object.port;	2063	port *pt = port (SCHEME_V->outport);
2059		2064
2060	if (pt->kind & port_file)	2065	if (pt->kind & port_file)
2061	write (pt->rep.stdio.file, s, strlen (s));	2066	write (pt->rep.stdio.file, s, strlen (s));
2062	else	2067	else
2063	for (; *s; s++)	2068	for (; *s; s++)
…		…
2065	pt->rep.string.curr++ = s;	2070	pt->rep.string.curr++ = s;
2066	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2071	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2067	pt->rep.string.curr++ = s;	2072	pt->rep.string.curr++ = s;
2068		2073
2069	#else	2074	#else
2070	xwrstr (s);	2075	write (pt->rep.stdio.file, s, strlen (s));
2071	#endif	2076	#endif
2072	}	2077	}
2073		2078
2074	static void	2079	static void
2075	putchars (SCHEME_P_ const char *s, int len)	2080	putchars (SCHEME_P_ const char *s, int len)
2076	{	2081	{
2077	#if USE_PORTS	2082	#if USE_PORTS
2078	port *pt = SCHEME_V->outport->object.port;	2083	port *pt = port (SCHEME_V->outport);
2079		2084
2080	if (pt->kind & port_file)	2085	if (pt->kind & port_file)
2081	write (pt->rep.stdio.file, s, len);	2086	write (pt->rep.stdio.file, s, len);
2082	else	2087	else
2083	{	2088	{
…		…
2097		2102
2098	INTERFACE void	2103	INTERFACE void
2099	putcharacter (SCHEME_P_ int c)	2104	putcharacter (SCHEME_P_ int c)
2100	{	2105	{
2101	#if USE_PORTS	2106	#if USE_PORTS
2102	port *pt = SCHEME_V->outport->object.port;	2107	port *pt = port (SCHEME_V->outport);
2103		2108
2104	if (pt->kind & port_file)	2109	if (pt->kind & port_file)
2105	{	2110	{
2106	char cc = c;	2111	char cc = c;
2107	write (pt->rep.stdio.file, &cc, 1);	2112	write (pt->rep.stdio.file, &cc, 1);
…		…
2181	case '7':	2186	case '7':
2182	state = st_oct1;	2187	state = st_oct1;
2183	c1 = c - '0';	2188	c1 = c - '0';
2184	break;	2189	break;
2185		2190
		2191	case 'a': *p++ = '\a'; state = st_ok; break;
		2192	case 'n': *p++ = '\n'; state = st_ok; break;
		2193	case 'r': *p++ = '\r'; state = st_ok; break;
		2194	case 't': *p++ = '\t'; state = st_ok; break;
		2195
		2196	//TODO: \whitespace eol whitespace
		2197
		2198	//TODO: x should end in ;, not two-digit hex
2186	case 'x':	2199	case 'x':
2187	case 'X':	2200	case 'X':
2188	state = st_x1;	2201	state = st_x1;
2189	c1 = 0;	2202	c1 = 0;
2190	break;
2191
2192	case 'n':
2193	*p++ = '\n';
2194	state = st_ok;
2195	break;
2196
2197	case 't':
2198	*p++ = '\t';
2199	state = st_ok;
2200	break;
2201
2202	case 'r':
2203	*p++ = '\r';
2204	state = st_ok;
2205	break;	2203	break;
2206		2204
2207	default:	2205	default:
2208	*p++ = c;	2206	*p++ = c;
2209	state = st_ok;	2207	state = st_ok;
…		…
2264		2262
2265	/* check c is in chars */	2263	/* check c is in chars */
2266	ecb_inline int	2264	ecb_inline int
2267	is_one_of (const char *s, int c)	2265	is_one_of (const char *s, int c)
2268	{	2266	{
2269	if (c == EOF)
2270	return 1;
2271
2272	return !!strchr (s, c);	2267	return c == EOF \|\| !!strchr (s, c);
2273	}	2268	}
2274		2269
2275	/* skip white characters */	2270	/* skip white characters */
2276	ecb_inline int	2271	ecb_inline int
2277	skipspace (SCHEME_P)	2272	skipspace (SCHEME_P)
…		…
2279	int c, curr_line = 0;	2274	int c, curr_line = 0;
2280		2275
2281	do	2276	do
2282	{	2277	{
2283	c = inchar (SCHEME_A);	2278	c = inchar (SCHEME_A);
		2279
2284	#if SHOW_ERROR_LINE	2280	#if SHOW_ERROR_LINE
2285	if (c == '\n')	2281	if (ecb_expect_false (c == '\n'))
2286	curr_line++;	2282	curr_line++;
2287	#endif	2283	#endif
		2284
		2285	if (ecb_expect_false (c == EOF))
		2286	return c;
2288	}	2287	}
2289	while (c == ' ' \|\| c == '\n' \|\| c == '\r' \|\| c == '\t');	2288	while (is_one_of (WHITESPACE, c));
2290		2289
2291	/* record it */	2290	/* record it */
2292	#if SHOW_ERROR_LINE	2291	#if SHOW_ERROR_LINE
2293	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2292	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2294	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2293	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2295	#endif	2294	#endif
2296		2295
2297	if (c != EOF)
2298	{
2299	backchar (SCHEME_A_ c);	2296	backchar (SCHEME_A_ c);
2300	return 1;	2297	return 1;
2301	}
2302	else
2303	return EOF;
2304	}	2298	}
2305		2299
2306	/* get token */	2300	/* get token */
2307	static int	2301	static int
2308	token (SCHEME_P)	2302	token (SCHEME_P)
…		…
2324	return TOK_RPAREN;	2318	return TOK_RPAREN;
2325		2319
2326	case '.':	2320	case '.':
2327	c = inchar (SCHEME_A);	2321	c = inchar (SCHEME_A);
2328		2322
2329	if (is_one_of (" \n\t", c))	2323	if (is_one_of (WHITESPACE, c))
2330	return TOK_DOT;	2324	return TOK_DOT;
2331	else	2325	else
2332	{	2326	{
2333	backchar (SCHEME_A_ c);	2327	backchar (SCHEME_A_ c);
2334	return TOK_DOTATOM;	2328	return TOK_DOTATOM;
…		…
2942	#endif /* USE_ALIST_ENV else */	2936	#endif /* USE_ALIST_ENV else */
2943		2937
2944	ecb_inline void	2938	ecb_inline void
2945	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2939	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946	{	2940	{
		2941	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2942	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948	}	2943	}
2949		2944
2950	ecb_inline void	2945	ecb_inline void
2951	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2946	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3052	{	3047	{
3053	int nframes = (uintptr_t)SCHEME_V->dump;	3048	int nframes = (uintptr_t)SCHEME_V->dump;
3054	struct dump_stack_frame *next_frame;	3049	struct dump_stack_frame *next_frame;
3055		3050
3056	/* enough room for the next frame? */	3051	/* enough room for the next frame? */
3057	if (nframes >= SCHEME_V->dump_size)	3052	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058	{	3053	{
3059	SCHEME_V->dump_size += STACK_GROWTH;	3054	SCHEME_V->dump_size += STACK_GROWTH;
3060	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3055	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061	}	3056	}
3062		3057
…		…
3243		3238
3244	#endif	3239	#endif
3245		3240
3246	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3241	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247		3242
		3243	#if EXPERIMENT
		3244	static int
		3245	debug (SCHEME_P_ int indent, pointer x)
		3246	{
		3247	int c;
		3248
		3249	if (is_syntax (x))
		3250	{
		3251	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3252	return 8 + 8;
		3253	}
		3254
		3255	if (x == NIL)
		3256	{
		3257	printf ("%*sNIL\n", indent, "");
		3258	return 3;
		3259	}
		3260
		3261	switch (type (x))
		3262	{
		3263	case T_INTEGER:
		3264	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3265	return 32+8;
		3266
		3267	case T_SYMBOL:
		3268	printf ("%*sS<%s>\n", indent, "", symname (x));
		3269	return 24+8;
		3270
		3271	case T_CLOSURE:
		3272	printf ("%*sS<%s>\n", indent, "", "closure");
		3273	debug (SCHEME_A_ indent + 3, cdr(x));
		3274	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3275
		3276	case T_PAIR:
		3277	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3278	c = debug (SCHEME_A_ indent + 3, car (x));
		3279	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3280	return c + 1;
		3281
		3282	case T_PORT:
		3283	printf ("%*sS<%s>\n", indent, "", "port");
		3284	return 24+8;
		3285
		3286	case T_VECTOR:
		3287	printf ("%*sS<%s>\n", indent, "", "vector");
		3288	return 24+8;
		3289
		3290	case T_ENVIRONMENT:
		3291	printf ("%*sS<%s>\n", indent, "", "environment");
		3292	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3293
		3294	default:
		3295	printf ("unhandled type %d\n", type (x));
		3296	break;
		3297	}
		3298	}
		3299	#endif
		3300
3248	static int	3301	static int
3249	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3302	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250	{	3303	{
3251	pointer args = SCHEME_V->args;	3304	pointer args = SCHEME_V->args;
3252	pointer x, y;	3305	pointer x, y;
3253		3306
3254	switch (op)	3307	switch (op)
3255	{	3308	{
		3309	#if EXPERIMENT //D
		3310	case OP_DEBUG:
		3311	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3312	printf ("\n");
		3313	s_return (S_T);
		3314	#endif
3256	case OP_LOAD: /* load */	3315	case OP_LOAD: /* load */
3257	if (file_interactive (SCHEME_A))	3316	if (file_interactive (SCHEME_A))
3258	{	3317	{
3259	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3318	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3260	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3319	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3261	}	3320	}
3262		3321
3263	if (!file_push (SCHEME_A_ strvalue (car (args))))	3322	if (!file_push (SCHEME_A_ strvalue (car (args))))
3264	Error_1 ("unable to open", car (args));	3323	Error_1 ("unable to open", car (args));
3265	else	3324	else
…		…
3269	}	3328	}
3270		3329
3271	case OP_T0LVL: /* top level */	3330	case OP_T0LVL: /* top level */
3272		3331
3273	/* If we reached the end of file, this loop is done. */	3332	/* If we reached the end of file, this loop is done. */
3274	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3333	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3275	{	3334	{
3276	if (SCHEME_V->file_i == 0)	3335	if (SCHEME_V->file_i == 0)
3277	{	3336	{
3278	SCHEME_V->args = NIL;	3337	SCHEME_V->args = NIL;
3279	s_goto (OP_QUIT);	3338	s_goto (OP_QUIT);
…		…
3357	#endif	3416	#endif
3358	if (is_symbol (SCHEME_V->code)) /* symbol */	3417	if (is_symbol (SCHEME_V->code)) /* symbol */
3359	{	3418	{
3360	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3419	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3361		3420
3362	if (x != NIL)	3421	if (x == NIL)
3363	s_return (slot_value_in_env (x));
3364	else
3365	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3422	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3423
		3424	s_return (slot_value_in_env (x));
3366	}	3425	}
3367	else if (is_pair (SCHEME_V->code))	3426	else if (is_pair (SCHEME_V->code))
3368	{	3427	{
3369	x = car (SCHEME_V->code);	3428	x = car (SCHEME_V->code);
3370		3429
…		…
3447	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3506	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448	else if (is_foreign (SCHEME_V->code))	3507	else if (is_foreign (SCHEME_V->code))
3449	{	3508	{
3450	/* Keep nested calls from GC'ing the arglist */	3509	/* Keep nested calls from GC'ing the arglist */
3451	push_recent_alloc (SCHEME_A_ args, NIL);	3510	push_recent_alloc (SCHEME_A_ args, NIL);
3452	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3511	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3453		3512
3454	s_return (x);	3513	s_return (x);
3455	}	3514	}
3456	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */	3515	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */
3457	{	3516	{
…		…
3494		3553
3495	case OP_DOMACRO: /* do macro */	3554	case OP_DOMACRO: /* do macro */
3496	SCHEME_V->code = SCHEME_V->value;	3555	SCHEME_V->code = SCHEME_V->value;
3497	s_goto (OP_EVAL);	3556	s_goto (OP_EVAL);
3498		3557
3499	#if 1
3500
3501	case OP_LAMBDA: /* lambda */	3558	case OP_LAMBDA: /* lambda */
3502	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3559	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503	set SCHEME_V->value fall thru */	3560	set SCHEME_V->value fall thru */
3504	{	3561	{
3505	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3562	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3511	SCHEME_V->code = slot_value_in_env (f);	3568	SCHEME_V->code = slot_value_in_env (f);
3512	s_goto (OP_APPLY);	3569	s_goto (OP_APPLY);
3513	}	3570	}
3514		3571
3515	SCHEME_V->value = SCHEME_V->code;	3572	SCHEME_V->value = SCHEME_V->code;
3516	/* Fallthru */
3517	}	3573	}
		3574	/* Fallthru */
3518		3575
3519	case OP_LAMBDA1:	3576	case OP_LAMBDA1:
3520	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3577	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522	#else
3523
3524	case OP_LAMBDA: /* lambda */
3525	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527	#endif
3528		3578
3529	case OP_MKCLOSURE: /* make-closure */	3579	case OP_MKCLOSURE: /* make-closure */
3530	x = car (args);	3580	x = car (args);
3531		3581
3532	if (car (x) == SCHEME_V->LAMBDA)	3582	if (car (x) == SCHEME_V->LAMBDA)
…		…
3654	case OP_LET2: /* let */	3704	case OP_LET2: /* let */
3655	new_frame_in_env (SCHEME_A_ SCHEME_V->envir);	3705	new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3656		3706
3657	for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;	3707	for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3658	y != NIL; x = cdr (x), y = cdr (y))	3708	y != NIL; x = cdr (x), y = cdr (y))
3659	{ if (is_pair(caar(x))){debug(SCHEME_A_ 0, SCHEME_V->code);};//D
3660	pointer z = caar (x);
3661	if(is_pair(z)) z = car(z);//D
3662	new_slot_in_env (SCHEME_A_ z, car (y));
3663	}
3664	//new_slot_in_env (SCHEME_A_ caar (x), car (y));	3709	new_slot_in_env (SCHEME_A_ caar (x), car (y));
3665		3710
3666	if (is_symbol (car (SCHEME_V->code))) /* named let */	3711	if (is_symbol (car (SCHEME_V->code))) /* named let */
3667	{	3712	{
3668	for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))	3713	for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3669	{	3714	{
…		…
3958		4003
3959	switch (op)	4004	switch (op)
3960	{	4005	{
3961	#if USE_MATH	4006	#if USE_MATH
3962	case OP_INEX2EX: /* inexact->exact */	4007	case OP_INEX2EX: /* inexact->exact */
3963	{
3964	if (is_integer (x))	4008	if (!is_integer (x))
3965	s_return (x);	4009	{
3966
3967	RVALUE r = rvalue_unchecked (x);	4010	RVALUE r = rvalue_unchecked (x);
3968		4011
3969	if (r == (RVALUE)(IVALUE)r)	4012	if (r == (RVALUE)(IVALUE)r)
3970	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4013	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3971	else	4014	else
3972	Error_1 ("inexact->exact: not integral:", x);	4015	Error_1 ("inexact->exact: not integral:", x);
3973	}	4016	}
3974		4017
		4018	s_return (x);
		4019
		4020	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
		4021	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
		4022	case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
		4023	case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
		4024
		4025	case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3975	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4026	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3976	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4027	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
		4028	/ (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3977	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4029	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3978	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4030	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3979	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));	4031	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3980	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));	4032	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3981	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));	4033	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3982		4034
3983	case OP_ATAN:	4035	case OP_ATAN:
		4036	s_return (mk_real (SCHEME_A_
3984	if (cdr (args) == NIL)	4037	cdr (args) == NIL
3985	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4038	? atan (rvalue (x))
3986	else	4039	: atan2 (rvalue (x), rvalue (cadr (args)))));
3987	{
3988	pointer y = cadr (args);
3989	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3990	}
3991
3992	case OP_SQRT:
3993	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3994		4040
3995	case OP_EXPT:	4041	case OP_EXPT:
3996	{	4042	{
3997	RVALUE result;	4043	RVALUE result;
3998	int real_result = 1;	4044	int real_result = 1;
…		…
4021	if (real_result)	4067	if (real_result)
4022	s_return (mk_real (SCHEME_A_ result));	4068	s_return (mk_real (SCHEME_A_ result));
4023	else	4069	else
4024	s_return (mk_integer (SCHEME_A_ result));	4070	s_return (mk_integer (SCHEME_A_ result));
4025	}	4071	}
4026
4027	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4028	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4029
4030	case OP_TRUNCATE:
4031	{
4032	RVALUE n = rvalue (x);
4033	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4034	}
4035
4036	case OP_ROUND:
4037	if (is_integer (x))
4038	s_return (x);
4039
4040	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4041	#endif	4072	#endif
4042		4073
4043	case OP_ADD: /* + */	4074	case OP_ADD: /* + */
4044	v = num_zero;	4075	v = num_zero;
4045		4076
…		…
4133	else	4164	else
4134	Error_0 ("modulo: division by zero");	4165	Error_0 ("modulo: division by zero");
4135		4166
4136	s_return (mk_number (SCHEME_A_ v));	4167	s_return (mk_number (SCHEME_A_ v));
4137		4168
4138	case OP_CAR: /* car */	4169	/* the compiler will optimize this mess... */
4139	s_return (caar (args));	4170	case OP_CAR: op_car: s_return (car (x));
4140		4171	case OP_CDR: op_cdr: s_return (cdr (x));
4141	case OP_CDR: /* cdr */	4172	case OP_CAAR: op_caar: x = car (x); goto op_car;
4142	s_return (cdar (args));	4173	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4174	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4175	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4176	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4177	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4178	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4179	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4180	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4181	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4182	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4183	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4184	case OP_CAAAAR: x = car (x); goto op_caaar;
		4185	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4186	case OP_CAADAR: x = car (x); goto op_caadr;
		4187	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4188	case OP_CADAAR: x = car (x); goto op_cadar;
		4189	case OP_CADADR: x = cdr (x); goto op_cadar;
		4190	case OP_CADDAR: x = car (x); goto op_caddr;
		4191	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4192	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4193	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4194	case OP_CDADAR: x = car (x); goto op_cdadr;
		4195	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4196	case OP_CDDAAR: x = car (x); goto op_cddar;
		4197	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4198	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4199	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4143		4200
4144	case OP_CONS: /* cons */	4201	case OP_CONS: /* cons */
4145	set_cdr (args, cadr (args));	4202	set_cdr (args, cadr (args));
4146	s_return (args);	4203	s_return (args);
4147		4204
…		…
4321	memcpy (pos, strvalue (car (x)), strlength (car (x)));	4378	memcpy (pos, strvalue (car (x)), strlength (car (x)));
4322		4379
4323	s_return (newstr);	4380	s_return (newstr);
4324	}	4381	}
4325		4382
4326	case OP_SUBSTR: /* substring */	4383	case OP_STRING_COPY: /* substring/string-copy */
4327	{	4384	{
4328	char *str = strvalue (x);	4385	char *str = strvalue (x);
4329	int index0 = ivalue_unchecked (cadr (args));	4386	int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4330	int index1;	4387	int index1;
4331	int len;	4388	int len;
4332		4389
4333	if (index0 > strlength (x))	4390	if (index0 > strlength (x))
4334	Error_1 ("substring: start out of bounds:", cadr (args));	4391	Error_1 ("string->copy: start out of bounds:", cadr (args));
4335		4392
4336	if (cddr (args) != NIL)	4393	if (cddr (args) != NIL)
4337	{	4394	{
4338	index1 = ivalue_unchecked (caddr (args));	4395	index1 = ivalue_unchecked (caddr (args));
4339		4396
4340	if (index1 > strlength (x) \|\| index1 < index0)	4397	if (index1 > strlength (x) \|\| index1 < index0)
4341	Error_1 ("substring: end out of bounds:", caddr (args));	4398	Error_1 ("string->copy: end out of bounds:", caddr (args));
4342	}	4399	}
4343	else	4400	else
4344	index1 = strlength (x);	4401	index1 = strlength (x);
4345		4402
4346	len = index1 - index0;	4403	len = index1 - index0;
4347	x = mk_empty_string (SCHEME_A_ len, ' ');	4404	x = mk_counted_string (SCHEME_A_ str + index0, len);
4348	memcpy (strvalue (x), str + index0, len);
4349	strvalue (x)[len] = 0;
4350		4405
4351	s_return (x);	4406	s_return (x);
4352	}	4407	}
4353		4408
4354	case OP_VECTOR: /* vector */	4409	case OP_VECTOR: /* vector */
…		…
4469	pointer d = cdr (args);	4524	pointer d = cdr (args);
4470	int r;	4525	int r;
4471		4526
4472	switch (op)	4527	switch (op)
4473	{	4528	{
4474	case OP_NOT: /* not */ r = is_false (a) ; break;	4529	case OP_NOT: /* not */ r = is_false (a) ; break;
4475	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T; break;	4530	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T ; break;
4476	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4531	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4477	case OP_NULLP: /* null? */ r = a == NIL ; break;	4532	case OP_NULLP: /* null? */ r = a == NIL ; break;
4478	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4533	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4534	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4479	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4535	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4480	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4536	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4481	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4537	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4482	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */	4538	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */
4483	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4539	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4484		4540
4485	#if USE_CHAR_CLASSIFIERS	4541	#if USE_CHAR_CLASSIFIERS
4486	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4542	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4487	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4543	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4488	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4544	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4538	}	4594	}
4539	else	4595	else
4540	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4541		4597
4542	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4543	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4544	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4545		4601
4546	#if USE_PORTS	4602	#if USE_PORTS
4547		4603
4548	case OP_WRITE: /* write */	4604	case OP_WRITE: /* write */
…		…
4693	SCHEME_V->gc_verbose = (a != S_F);	4749	SCHEME_V->gc_verbose = (a != S_F);
4694	s_retbool (was);	4750	s_retbool (was);
4695	}	4751	}
4696		4752
4697	case OP_NEWSEGMENT: /* new-segment */	4753	case OP_NEWSEGMENT: /* new-segment */
		4754	#if 0
4698	if (!is_pair (args) \|\| !is_number (a))	4755	if (!is_pair (args) \|\| !is_number (a))
4699	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4700		4757	#endif
4701	alloc_cellseg (SCHEME_A_ ivalue (a));	4758	s_retbool (alloc_cellseg (SCHEME_A));
4702
4703	s_return (S_T);
4704		4759
4705	case OP_OBLIST: /* oblist */	4760	case OP_OBLIST: /* oblist */
4706	s_return (oblist_all_symbols (SCHEME_A));	4761	s_return (oblist_all_symbols (SCHEME_A));
4707		4762
4708	#if USE_PORTS	4763	#if USE_PORTS
…		…
4778	s_return (p == NIL ? S_F : p);	4833	s_return (p == NIL ? S_F : p);
4779	}	4834	}
4780		4835
4781	case OP_GET_OUTSTRING: /* get-output-string */	4836	case OP_GET_OUTSTRING: /* get-output-string */
4782	{	4837	{
4783	port *p;	4838	port *p = port (a);
4784		4839
4785	if ((p = a->object.port)->kind & port_string)	4840	if (p->kind & port_string)
4786	{	4841	{
4787	off_t size;	4842	off_t size;
4788	char *str;	4843	char *str;
4789		4844
4790	size = p->rep.string.curr - p->rep.string.start + 1;	4845	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4895	int res;	4950	int res;
4896		4951
4897	if (is_pair (args))	4952	if (is_pair (args))
4898	p = car (args);	4953	p = car (args);
4899		4954
4900	res = p->object.port->kind & port_string;	4955	res = port (p)->kind & port_string;
4901		4956
4902	s_retbool (res);	4957	s_retbool (res);
4903	}	4958	}
4904		4959
4905	case OP_SET_INPORT: /* set-input-port */	4960	case OP_SET_INPORT: /* set-input-port */
…		…
5445	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))
5446	return;	5501	return;
5447		5502
5448	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5503	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5449	{	5504	{
5450	xwrstr ("No memory!\n");	5505	putstr (SCHEME_A_ "No memory!\n");
5451	return;	5506	return;
5452	}	5507	}
5453	}	5508	}
5454	}	5509	}
5455		5510
…		…
5568	ecb_cold int	5623	ecb_cold int
5569	scheme_init (SCHEME_P)	5624	scheme_init (SCHEME_P)
5570	{	5625	{
5571	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5626	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5572	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));
5573		5634
5574	num_set_fixnum (num_zero, 1);	5635	num_set_fixnum (num_zero, 1);
5575	num_set_ivalue (num_zero, 0);	5636	num_set_ivalue (num_zero, 0);
5576	num_set_fixnum (num_one, 1);	5637	num_set_fixnum (num_one, 1);
5577	num_set_ivalue (num_one, 1);	5638	num_set_ivalue (num_one, 1);
…		…
5589	SCHEME_V->save_inport = NIL;	5650	SCHEME_V->save_inport = NIL;
5590	SCHEME_V->loadport = NIL;	5651	SCHEME_V->loadport = NIL;
5591	SCHEME_V->nesting = 0;	5652	SCHEME_V->nesting = 0;
5592	SCHEME_V->interactive_repl = 0;	5653	SCHEME_V->interactive_repl = 0;
5593		5654
5594	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5655	if (!alloc_cellseg (SCHEME_A))
5595	{	5656	{
5596	#if USE_ERROR_CHECKING	5657	#if USE_ERROR_CHECKING
5597	SCHEME_V->no_memory = 1;	5658	SCHEME_V->no_memory = 1;
5598	return 0;	5659	return 0;
5599	#endif	5660	#endif
…		…
5933	int isfile = 1;	5994	int isfile = 1;
5934	system ("ps v $PPID");//D	5995	system ("ps v $PPID");//D
5935		5996
5936	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5997	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5937	{	5998	{
5938	xwrstr ("Usage: tinyscheme -?\n");	5999	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5939	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6000	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5940	xwrstr ("followed by\n");	6001	putstr (SCHEME_A_ "followed by\n");
5941	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6002	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5942	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6003	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5943	xwrstr ("assuming that the executable is named tinyscheme.\n");	6004	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5944	xwrstr ("Use - as filename for stdin.\n");	6005	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5945	return 1;	6006	return 1;
5946	}	6007	}
5947		6008
5948	if (!scheme_init (SCHEME_A))	6009	if (!scheme_init (SCHEME_A))
5949	{	6010	{
5950	xwrstr ("Could not initialize!\n");	6011	putstr (SCHEME_A_ "Could not initialize!\n");
5951	return 2;	6012	return 2;
5952	}	6013	}
5953		6014
5954	# if USE_PORTS	6015	# if USE_PORTS
5955	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6016	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
6000	fin = open (file_name, O_RDONLY);	6061	fin = open (file_name, O_RDONLY);
6001	#endif	6062	#endif
6002		6063
6003	if (isfile && fin < 0)	6064	if (isfile && fin < 0)
6004	{	6065	{
6005	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");
6006	}	6067	}
6007	else	6068	else
6008	{	6069	{
6009	if (isfile)	6070	if (isfile)
6010	scheme_load_named_file (SCHEME_A_ fin, file_name);	6071	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6014	#if USE_PORTS	6075	#if USE_PORTS
6015	if (!isfile \|\| fin != STDIN_FILENO)	6076	if (!isfile \|\| fin != STDIN_FILENO)
6016	{	6077	{
6017	if (SCHEME_V->retcode != 0)	6078	if (SCHEME_V->retcode != 0)
6018	{	6079	{
6019	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");
6020	}	6081	}
6021		6082
6022	if (isfile)	6083	if (isfile)
6023	close (fin);	6084	close (fin);
6024	}	6085	}

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.38 by root, Sun Nov 29 13:47:15 2015 UTC vs. Revision 1.57 by root, Tue Dec 1 04:57:49 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.38 by root, Sun Nov 29 13:47:15 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57:49 2015 UTC