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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC

…		…
16	* (MINISCM) This is a revised and modified version by Akira KIDA.	16	* (MINISCM) This is a revised and modified version by Akira KIDA.
17	* (MINISCM) current version is 0.85k4 (15 May 1994)	17	* (MINISCM) current version is 0.85k4 (15 May 1994)
18	*	18	*
19	*/	19	*/
20		20
		21	#define EXPERIMENT 1
		22
		23	#if 1
21	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	24	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22	#include "malloc.c"	25	#include "malloc.c"
		26	#endif
23		27
24	#define SCHEME_SOURCE	28	#define SCHEME_SOURCE
25	#include "scheme-private.h"	29	#include "scheme-private.h"
26	#ifndef WIN32	30	#ifndef WIN32
27	# include <unistd.h>	31	# include <unistd.h>
…		…
77		81
78	#define BACKQUOTE '`'	82	#define BACKQUOTE '`'
79	#define WHITESPACE " \t\r\n\v\f"	83	#define WHITESPACE " \t\r\n\v\f"
80	#define DELIMITERS "()\";" WHITESPACE	84	#define DELIMITERS "()\";" WHITESPACE
81		85
82	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	86	#define NIL POINTER (&SCHEME_V->xNIL)
83	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	87	#define S_T POINTER (&SCHEME_V->xT)
84	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	88	#define S_F POINTER (&SCHEME_V->xF)
85	#define S_SINK (&SCHEME_V->xsink)	89	#define S_SINK POINTER (&SCHEME_V->xsink)
86	#define S_EOF (&SCHEME_V->xEOF_OBJ)	90	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
87		91
88	#if !USE_MULTIPLICITY	92	#if !USE_MULTIPLICITY
89	static scheme sc;	93	static scheme sc;
90	#endif	94	#endif
91		95
…		…
99	}	103	}
100		104
101	char *p = s;	105	char *p = s;
102		106
103	do {	107	do {
104	*p++ = '0' + n % base;	108	*p++ = "0123456789abcdef"[n % base];
105	n /= base;	109	n /= base;
106	} while (n);	110	} while (n);
107		111
108	*p-- = 0;	112	*p-- = 0;
109		113
…		…
119	{	123	{
120	xbase (s, n, 10);	124	xbase (s, n, 10);
121	}	125	}
122		126
123	static void	127	static void
124	xwrstr (const char *s)	128	putnum (SCHEME_P_ long n)
125	{
126	write (1, s, strlen (s));
127	}
128
129	static void
130	xwrnum (long n)
131	{	129	{
132	char buf[64];	130	char buf[64];
133		131
134	xnum (buf, n);	132	xnum (buf, n);
135	xwrstr (buf);	133	putstr (SCHEME_A_ buf);
136	}	134	}
137		135
138	static char	136	static char
139	xtoupper (char c)	137	xtoupper (char c)
140	{	138	{
…		…
190	# define prompt "ts> "	188	# define prompt "ts> "
191	#endif	189	#endif
192		190
193	#ifndef InitFile	191	#ifndef InitFile
194	# define InitFile "init.scm"	192	# define InitFile "init.scm"
195	#endif
196
197	#ifndef FIRST_CELLSEGS
198	# define FIRST_CELLSEGS 3
199	#endif	193	#endif
200		194
201	enum scheme_types	195	enum scheme_types
202	{	196	{
203	T_INTEGER,	197	T_INTEGER,
…		…
256	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);
257	static num num_intdiv (num a, num b);	251	static num num_intdiv (num a, num b);
258	static num num_rem (num a, num b);	252	static num num_rem (num a, num b);
259	static num num_mod (num a, num b);	253	static num num_mod (num a, num b);
260		254
261	#if USE_MATH
262	static double round_per_R5RS (double x);
263	#endif
264	static int is_zero_rvalue (RVALUE x);	255	static int is_zero_rvalue (RVALUE x);
265		256
266	static num num_zero;	257	static num num_zero;
267	static num num_one;	258	static num num_one;
268		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
269	/* macros for cell operations */	264	/* macros for cell operations */
270	#define typeflag(p) ((p)->flag + 0)	265	#define typeflag(p) (CELL(p)->flag + 0)
271	#define set_typeflag(p,v) ((p)->flag = (v))	266	#define set_typeflag(p,v) (CELL(p)->flag = (v))
272	#define type(p) (typeflag (p) & T_MASKTYPE)	267	#define type(p) (typeflag (p) & T_MASKTYPE)
273		268
274	INTERFACE int	269	INTERFACE int
275	is_string (pointer p)	270	is_string (pointer p)
276	{	271	{
277	return type (p) == T_STRING;	272	return type (p) == T_STRING;
278	}	273	}
279		274
280	#define strvalue(p) ((p)->object.string.svalue)	275	#define strvalue(p) (CELL(p)->object.string.svalue)
281	#define strlength(p) ((p)->object.string.length)	276	#define strlength(p) (CELL(p)->object.string.length)
282		277
283	INTERFACE int	278	INTERFACE int
284	is_vector (pointer p)	279	is_vector (pointer p)
285	{	280	{
286	return type (p) == T_VECTOR;	281	return type (p) == T_VECTOR;
287	}	282	}
288		283
289	#define vecvalue(p) ((p)->object.vector.vvalue)	284	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
290	#define veclength(p) ((p)->object.vector.length)	285	#define veclength(p) (CELL(p)->object.vector.length)
291	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	286	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
292	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	287	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
293	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	288	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
294		289
295	INTERFACE int	290	INTERFACE int
…		…
321	string_value (pointer p)	316	string_value (pointer p)
322	{	317	{
323	return strvalue (p);	318	return strvalue (p);
324	}	319	}
325		320
326	#define ivalue_unchecked(p) (p)->object.ivalue	321	#define ivalue_unchecked(p) CELL(p)->object.ivalue
327	#define set_ivalue(p,v) (p)->object.ivalue = (v)	322	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
328		323
329	#if USE_REAL	324	#if USE_REAL
330	#define rvalue_unchecked(p) (p)->object.rvalue	325	#define rvalue_unchecked(p) CELL(p)->object.rvalue
331	#define set_rvalue(p,v) (p)->object.rvalue = (v)	326	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
332	#else	327	#else
333	#define rvalue_unchecked(p) (p)->object.ivalue	328	#define rvalue_unchecked(p) CELL(p)->object.ivalue
334	#define set_rvalue(p,v) (p)->object.ivalue = (v)	329	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
335	#endif	330	#endif
336		331
337	INTERFACE long	332	INTERFACE long
338	charvalue (pointer p)	333	charvalue (pointer p)
339	{	334	{
340	return ivalue_unchecked (p);	335	return ivalue_unchecked (p);
341	}	336	}
342		337
		338	#define port(p) CELL(p)->object.port
		339	#define set_port(p,v) port(p) = (v)
343	INTERFACE int	340	INTERFACE int
344	is_port (pointer p)	341	is_port (pointer p)
345	{	342	{
346	return type (p) == T_PORT;	343	return type (p) == T_PORT;
347	}	344	}
348		345
349	INTERFACE int	346	INTERFACE int
350	is_inport (pointer p)	347	is_inport (pointer p)
351	{	348	{
352	return is_port (p) && p->object.port->kind & port_input;	349	return is_port (p) && port (p)->kind & port_input;
353	}	350	}
354		351
355	INTERFACE int	352	INTERFACE int
356	is_outport (pointer p)	353	is_outport (pointer p)
357	{	354	{
358	return is_port (p) && p->object.port->kind & port_output;	355	return is_port (p) && port (p)->kind & port_output;
359	}	356	}
360		357
361	INTERFACE int	358	INTERFACE int
362	is_pair (pointer p)	359	is_pair (pointer p)
363	{	360	{
364	return type (p) == T_PAIR;	361	return type (p) == T_PAIR;
365	}	362	}
366		363
367	#define car(p) ((p)->object.cons.car + 0)	364	#define car(p) (POINTER (CELL(p)->object.cons.car))
368	#define cdr(p) ((p)->object.cons.cdr + 0)	365	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
369		366
370	static pointer caar (pointer p) { return car (car (p)); }	367	static pointer caar (pointer p) { return car (car (p)); }
371	static pointer cadr (pointer p) { return car (cdr (p)); }	368	static pointer cadr (pointer p) { return car (cdr (p)); }
372	static pointer cdar (pointer p) { return cdr (car (p)); }	369	static pointer cdar (pointer p) { return cdr (car (p)); }
373	static pointer cddr (pointer p) { return cdr (cdr (p)); }	370	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
377	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	374	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378		375
379	INTERFACE void	376	INTERFACE void
380	set_car (pointer p, pointer q)	377	set_car (pointer p, pointer q)
381	{	378	{
382	p->object.cons.car = q;	379	CELL(p)->object.cons.car = CELL (q);
383	}	380	}
384		381
385	INTERFACE void	382	INTERFACE void
386	set_cdr (pointer p, pointer q)	383	set_cdr (pointer p, pointer q)
387	{	384	{
388	p->object.cons.cdr = q;	385	CELL(p)->object.cons.cdr = CELL (q);
389	}	386	}
390		387
391	INTERFACE pointer	388	INTERFACE pointer
392	pair_car (pointer p)	389	pair_car (pointer p)
393	{	390	{
…		…
411	{	408	{
412	return strvalue (p);	409	return strvalue (p);
413	}	410	}
414		411
415	#if USE_PLIST	412	#if USE_PLIST
		413	#error plists are broken because symbols are no longer pairs
		414	#define symprop(p) cdr(p)
416	SCHEME_EXPORT int	415	SCHEME_EXPORT int
417	hasprop (pointer p)	416	hasprop (pointer p)
418	{	417	{
419	return typeflag (p) & T_SYMBOL;	418	return typeflag (p) & T_SYMBOL;
420	}	419	}
421
422	# define symprop(p) cdr(p)
423	#endif	420	#endif
424		421
425	INTERFACE int	422	INTERFACE int
426	is_syntax (pointer p)	423	is_syntax (pointer p)
427	{	424	{
…		…
668		665
669	static int file_push (SCHEME_P_ const char *fname);	666	static int file_push (SCHEME_P_ const char *fname);
670	static void file_pop (SCHEME_P);	667	static void file_pop (SCHEME_P);
671	static int file_interactive (SCHEME_P);	668	static int file_interactive (SCHEME_P);
672	ecb_inline int is_one_of (const char *s, int c);	669	ecb_inline int is_one_of (const char *s, int c);
673	static int alloc_cellseg (SCHEME_P_ int n);	670	static int alloc_cellseg (SCHEME_P);
674	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	671	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675	static void finalize_cell (SCHEME_P_ pointer a);	672	static void finalize_cell (SCHEME_P_ pointer a);
676	static int count_consecutive_cells (pointer x, int needed);	673	static int count_consecutive_cells (pointer x, int needed);
677	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);
678	static pointer mk_number (SCHEME_P_ const num n);	675	static pointer mk_number (SCHEME_P_ const num n);
…		…
872	}	869	}
873		870
874	return ret;	871	return ret;
875	}	872	}
876		873
877	#if USE_MATH
878
879	/* Round to nearest. Round to even if midway */
880	static double
881	round_per_R5RS (double x)
882	{
883	double fl = floor (x);
884	double ce = ceil (x);
885	double dfl = x - fl;
886	double dce = ce - x;
887
888	if (dfl > dce)
889	return ce;
890	else if (dfl < dce)
891	return fl;
892	else
893	{
894	if (fmod (fl, 2) == 0) /* I imagine this holds */
895	return fl;
896	else
897	return ce;
898	}
899	}
900	#endif
901
902	static int	874	static int
903	is_zero_rvalue (RVALUE x)	875	is_zero_rvalue (RVALUE x)
904	{	876	{
905	return x == 0;	877	return x == 0;
906	#if 0	878	#if 0
…		…
912	#endif	884	#endif
913	}	885	}
914		886
915	/* allocate new cell segment */	887	/* allocate new cell segment */
916	static int	888	static int
917	alloc_cellseg (SCHEME_P_ int n)	889	alloc_cellseg (SCHEME_P)
918	{	890	{
919	pointer newp;	891	struct cell *newp;
920	pointer last;	892	struct cell *last;
921	pointer p;	893	struct cell *p;
922	char *cp;	894	char *cp;
923	long i;	895	long i;
924	int k;	896	int k;
925		897
926	static int segsize = CELL_SEGSIZE >> 1;	898	static int segsize = CELL_SEGSIZE >> 1;
927	segsize <<= 1;	899	segsize <<= 1;
928		900
929	for (k = 0; k < n; k++)
930	{
931	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
932	return k;
933
934	cp = malloc (segsize * sizeof (struct cell));	901	cp = malloc (segsize * sizeof (struct cell));
935		902
936	if (!cp && USE_ERROR_CHECKING)	903	if (!cp && USE_ERROR_CHECKING)
937	return k;	904	return k;
938		905
939	i = ++SCHEME_V->last_cell_seg;	906	i = ++SCHEME_V->last_cell_seg;
940	SCHEME_V->alloc_seg[i] = cp;	907	SCHEME_V->alloc_seg[i] = cp;
941		908
942	newp = (pointer)cp;	909	newp = (struct cell *)cp;
943	SCHEME_V->cell_seg[i] = newp;	910	SCHEME_V->cell_seg[i] = newp;
944	SCHEME_V->cell_segsize[i] = segsize;	911	SCHEME_V->cell_segsize[i] = segsize;
945	SCHEME_V->fcells += segsize;	912	SCHEME_V->fcells += segsize;
946	last = newp + segsize - 1;	913	last = newp + segsize - 1;
947		914
948	for (p = newp; p <= last; p++)	915	for (p = newp; p <= last; p++)
949	{	916	{
		917	pointer cp = POINTER (p);
950	set_typeflag (p, T_PAIR);	918	set_typeflag (cp, T_PAIR);
951	set_car (p, NIL);	919	set_car (cp, NIL);
952	set_cdr (p, p + 1);	920	set_cdr (cp, POINTER (p + 1));
953	}	921	}
954		922
955	set_cdr (last, SCHEME_V->free_cell);	923	set_cdr (POINTER (last), SCHEME_V->free_cell);
956	SCHEME_V->free_cell = newp;	924	SCHEME_V->free_cell = POINTER (newp);
957	}
958		925
959	return n;	926	return 1;
960	}	927	}
961		928
962	/* get new cell. parameter a, b is marked by gc. */	929	/* get new cell. parameter a, b is marked by gc. */
963	ecb_inline pointer	930	ecb_inline pointer
964	get_cell_x (SCHEME_P_ pointer a, pointer b)	931	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
968	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	935	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
969	return S_SINK;	936	return S_SINK;
970		937
971	if (SCHEME_V->free_cell == NIL)	938	if (SCHEME_V->free_cell == NIL)
972	{	939	{
973	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;
974		941
975	gc (SCHEME_A_ a, b);	942	gc (SCHEME_A_ a, b);
976		943
977	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)
978	{	945	{
979	/* 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 */
980	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	947	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
981	{	948	{
982	#if USE_ERROR_CHECKING	949	#if USE_ERROR_CHECKING
983	SCHEME_V->no_memory = 1;	950	SCHEME_V->no_memory = 1;
984	return S_SINK;	951	return S_SINK;
985	#endif	952	#endif
…		…
997	}	964	}
998	}	965	}
999		966
1000	/* To retain recent allocs before interpreter knows about them -	967	/* To retain recent allocs before interpreter knows about them -
1001	Tehom */	968	Tehom */
1002
1003	static void	969	static void
1004	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	970	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1005	{	971	{
1006	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	972	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1007		973
…		…
1029	}	995	}
1030		996
1031	static pointer	997	static pointer
1032	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	998	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1033	{	999	{
1034	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1000	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1035	pointer e = malloc (len sizeof (pointer));	1001	pointer e = malloc (len sizeof (pointer));
1036		1002
1037	if (!e && USE_ERROR_CHECKING)	1003	if (!e && USE_ERROR_CHECKING)
1038	return S_SINK;	1004	return S_SINK;
1039		1005
1040	/* Record it as a vector so that gc understands it. */	1006	/* Record it as a vector so that gc understands it. */
1041	set_typeflag (v, T_VECTOR \| T_ATOM);	1007	set_typeflag (v, T_VECTOR \| T_ATOM);
1042		1008
1043	v->object.vector.vvalue = e;	1009	CELL(v)->object.vector.vvalue = e;
1044	v->object.vector.length = len;	1010	CELL(v)->object.vector.length = len;
1045	fill_vector (v, 0, init);	1011	fill_vector (v, 0, init);
1046	push_recent_alloc (SCHEME_A_ v, NIL);	1012	push_recent_alloc (SCHEME_A_ v, NIL);
1047		1013
1048	return v;	1014	return v;
1049	}	1015	}
…		…
1058	static void	1024	static void
1059	check_cell_alloced (pointer p, int expect_alloced)	1025	check_cell_alloced (pointer p, int expect_alloced)
1060	{	1026	{
1061	/* 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. */
1062	if (typeflag (p) & !expect_alloced)	1028	if (typeflag (p) & !expect_alloced)
1063	xwrstr ("Cell is already allocated!\n");	1029	putstr (SCHEME_A_ "Cell is already allocated!\n");
1064		1030
1065	if (!(typeflag (p)) & expect_alloced)	1031	if (!(typeflag (p)) & expect_alloced)
1066	xwrstr ("Cell is not allocated!\n");	1032	putstr (SCHEME_A_ "Cell is not allocated!\n");
1067	}	1033	}
1068		1034
1069	static void	1035	static void
1070	check_range_alloced (pointer p, int n, int expect_alloced)	1036	check_range_alloced (pointer p, int n, int expect_alloced)
1071	{	1037	{
…		…
1092	set_car (x, a);	1058	set_car (x, a);
1093	set_cdr (x, b);	1059	set_cdr (x, b);
1094		1060
1095	return x;	1061	return x;
1096	}	1062	}
1097
1098	/* ========== oblist implementation ========== */
1099		1063
1100	static pointer	1064	static pointer
1101	generate_symbol (SCHEME_P_ const char *name)	1065	generate_symbol (SCHEME_P_ const char *name)
1102	{	1066	{
1103	pointer x = mk_string (SCHEME_A_ name);	1067	pointer x = mk_string (SCHEME_A_ name);
1104	setimmutable (x);	1068	setimmutable (x);
1105	set_typeflag (x, T_SYMBOL \| T_ATOM);	1069	set_typeflag (x, T_SYMBOL \| T_ATOM);
1106	return x;	1070	return x;
1107	}	1071	}
1108		1072
		1073	/* ========== oblist implementation ========== */
		1074
1109	#ifndef USE_OBJECT_LIST	1075	#ifndef USE_OBJECT_LIST
1110		1076
1111	static int	1077	static int
1112	hash_fn (const char *key, int table_size)	1078	hash_fn (const char *key, int table_size)
1113	{	1079	{
…		…
1199		1165
1200	/* returns the new symbol */	1166	/* returns the new symbol */
1201	static pointer	1167	static pointer
1202	oblist_add_by_name (SCHEME_P_ const char *name)	1168	oblist_add_by_name (SCHEME_P_ const char *name)
1203	{	1169	{
1204	pointer x = mk_string (SCHEME_A_ name);	1170	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);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208	return x;	1172	return x;
1209	}	1173	}
1210		1174
1211	static pointer	1175	static pointer
…		…
1221	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1222	{	1186	{
1223	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224		1188
1225	set_typeflag (x, T_PORT \| T_ATOM);	1189	set_typeflag (x, T_PORT \| T_ATOM);
1226	x->object.port = p;	1190	set_port (x, p);
1227		1191
1228	return x;	1192	return x;
1229	}	1193	}
1230	#endif	1194	#endif
1231		1195
1232	pointer	1196	pointer
1233	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1234	{	1198	{
1235	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236		1200
1237	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1201	set_typeflag (x, T_FOREIGN \| T_ATOM);
1238	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1239		1203
1240	return x;	1204	return x;
1241	}	1205	}
1242		1206
1243	INTERFACE pointer	1207	INTERFACE pointer
1244	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1245	{	1209	{
1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247		1211
1248	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1212	set_typeflag (x, T_CHARACTER \| T_ATOM);
1249	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1250		1214
1251	return x;	1215	return x;
1252	}	1216	}
1253		1217
1254	/* get number atom (integer) */	1218	/* get number atom (integer) */
1255	INTERFACE pointer	1219	INTERFACE pointer
1256	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1257	{	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	{
1258	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259		1233
1260	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 */
1261	set_ivalue (x, n);	1236	set_ivalue (x, n);
1262		1237
		1238	*pp = x;
		1239	}
		1240
1263	return x;	1241	return *pp;
1264	}	1242	}
1265		1243
1266	INTERFACE pointer	1244	INTERFACE pointer
1267	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1268	{	1246	{
1269	#if USE_REAL	1247	#if USE_REAL
1270	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271		1249
1272	set_typeflag (x, (T_REAL \| T_ATOM));	1250	set_typeflag (x, T_REAL \| T_ATOM);
1273	set_rvalue (x, n);	1251	set_rvalue (x, n);
1274		1252
1275	return x;	1253	return x;
1276	#else	1254	#else
1277	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1396	pointer x;	1374	pointer x;
1397	char name[40] = "gensym-";	1375	char name[40] = "gensym-";
1398	xnum (name + 7, ++SCHEME_V->gensym_cnt);	1376	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399		1377
1400	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;
1401	}	1385	}
1402		1386
1403	/* make symbol or number atom from string */	1387	/* make symbol or number atom from string */
1404	static pointer	1388	static pointer
1405	mk_atom (SCHEME_P_ char *q)	1389	mk_atom (SCHEME_P_ char *q)
…		…
1614		1598
1615	/* garbage collection. parameter a, b is marked. */	1599	/* garbage collection. parameter a, b is marked. */
1616	static void	1600	static void
1617	gc (SCHEME_P_ pointer a, pointer b)	1601	gc (SCHEME_P_ pointer a, pointer b)
1618	{	1602	{
1619	pointer p;
1620	int i;	1603	int i;
1621		1604
1622	if (SCHEME_V->gc_verbose)	1605	if (SCHEME_V->gc_verbose)
1623	putstr (SCHEME_A_ "gc...");	1606	putstr (SCHEME_A_ "gc...");
1624		1607
…		…
1640	/* Mark recent objects the interpreter doesn't know about yet. */	1623	/* Mark recent objects the interpreter doesn't know about yet. */
1641	mark (car (S_SINK));	1624	mark (car (S_SINK));
1642	/* Mark any older stuff above nested C calls */	1625	/* Mark any older stuff above nested C calls */
1643	mark (SCHEME_V->c_nest);	1626	mark (SCHEME_V->c_nest);
1644		1627
		1628	#if USE_INTCACHE
		1629	/* mark intcache */
		1630	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1631	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1632	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1633	#endif
		1634
1645	/* mark variables a, b */	1635	/* mark variables a, b */
1646	mark (a);	1636	mark (a);
1647	mark (b);	1637	mark (b);
1648		1638
1649	/* garbage collect */	1639	/* garbage collect */
1650	clrmark (NIL);	1640	clrmark (NIL);
1651	SCHEME_V->fcells = 0;	1641	SCHEME_V->fcells = 0;
1652	SCHEME_V->free_cell = NIL;	1642	SCHEME_V->free_cell = NIL;
1653		1643
1654	/* free-list is kept sorted by address so as to maintain consecutive	1644	if (SCHEME_V->gc_verbose)
1655	ranges, if possible, for use with vectors. Here we scan the cells	1645	putstr (SCHEME_A_ "freeing...");
1656	(which are also kept sorted by address) downwards to build the	1646
1657	free-list in sorted order.	1647	uint32_t total = 0;
1658	*/	1648
		1649	/* Here we scan the cells to build the free-list. */
1659	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1650	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660	{	1651	{
1661	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1652	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1653	struct cell *p;
		1654	total += SCHEME_V->cell_segsize [i];
1662		1655
1663	while (--p >= SCHEME_V->cell_seg[i])	1656	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664	{	1657	{
		1658	pointer c = POINTER (p);
		1659
1665	if (is_mark (p))	1660	if (is_mark (c))
1666	clrmark (p);	1661	clrmark (c);
1667	else	1662	else
1668	{	1663	{
1669	/* reclaim cell */	1664	/* reclaim cell */
1670	if (typeflag (p) != T_PAIR)	1665	if (typeflag (c) != T_PAIR)
1671	{	1666	{
1672	finalize_cell (SCHEME_A_ p);	1667	finalize_cell (SCHEME_A_ c);
1673	set_typeflag (p, T_PAIR);	1668	set_typeflag (c, T_PAIR);
1674	set_car (p, NIL);	1669	set_car (c, NIL);
1675	}	1670	}
1676		1671
1677	++SCHEME_V->fcells;	1672	++SCHEME_V->fcells;
1678	set_cdr (p, SCHEME_V->free_cell);	1673	set_cdr (c, SCHEME_V->free_cell);
1679	SCHEME_V->free_cell = p;	1674	SCHEME_V->free_cell = c;
1680	}	1675	}
1681	}	1676	}
1682	}	1677	}
1683		1678
1684	if (SCHEME_V->gc_verbose)	1679	if (SCHEME_V->gc_verbose)
1685	{	1680	{
1686	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1681	putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1687	}	1682	}
1688	}	1683	}
1689		1684
1690	static void	1685	static void
1691	finalize_cell (SCHEME_P_ pointer a)	1686	finalize_cell (SCHEME_P_ pointer a)
…		…
1696	else if (is_vector (a))	1691	else if (is_vector (a))
1697	free (vecvalue (a));	1692	free (vecvalue (a));
1698	#if USE_PORTS	1693	#if USE_PORTS
1699	else if (is_port (a))	1694	else if (is_port (a))
1700	{	1695	{
1701	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1696	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1702	port_close (SCHEME_A_ a, port_input \| port_output);	1697	port_close (SCHEME_A_ a, port_input \| port_output);
1703		1698
1704	free (a->object.port);	1699	free (port (a));
1705	}	1700	}
1706	#endif	1701	#endif
1707	}	1702	}
1708		1703
1709	/* ========== Routines for Reading ========== */	1704	/* ========== Routines for Reading ========== */
…		…
1725	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1720	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;	1721	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;
1727	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1722	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1723	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1724	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1725	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731		1726
1732	#if SHOW_ERROR_LINE	1727	#if SHOW_ERROR_LINE
1733	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1728	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734		1729
1735	if (fname)	1730	if (fname)
…		…
1752	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1747	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753	#if USE_PORTS	1748	#if USE_PORTS
1754	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1749	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755	#endif	1750	#endif
1756	SCHEME_V->file_i--;	1751	SCHEME_V->file_i--;
1757	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1752	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758	}	1753	}
1759	}	1754	}
1760		1755
1761	static int	1756	static int
1762	file_interactive (SCHEME_P)	1757	file_interactive (SCHEME_P)
1763	{	1758	{
1764	#if USE_PORTS	1759	#if USE_PORTS
1765	return SCHEME_V->file_i == 0	1760	return SCHEME_V->file_i == 0
1766	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1761	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767	&& (SCHEME_V->inport->object.port->kind & port_file);	1762	&& (port (SCHEME_V->inport)->kind & port_file);
1768	#else	1763	#else
1769	return 0;	1764	return 0;
1770	#endif	1765	#endif
1771	}	1766	}
1772		1767
…		…
1906	}	1901	}
1907		1902
1908	static void	1903	static void
1909	port_close (SCHEME_P_ pointer p, int flag)	1904	port_close (SCHEME_P_ pointer p, int flag)
1910	{	1905	{
1911	port *pt = p->object.port;	1906	port *pt = port (p);
1912		1907
1913	pt->kind &= ~flag;	1908	pt->kind &= ~flag;
1914		1909
1915	if ((pt->kind & (port_input \| port_output)) == 0)	1910	if ((pt->kind & (port_input \| port_output)) == 0)
1916	{	1911	{
…		…
1937	/* get new character from input file */	1932	/* get new character from input file */
1938	static int	1933	static int
1939	inchar (SCHEME_P)	1934	inchar (SCHEME_P)
1940	{	1935	{
1941	int c;	1936	int c;
1942	port *pt;	1937	port *pt = port (SCHEME_V->inport);
1943
1944	pt = SCHEME_V->inport->object.port;
1945		1938
1946	if (pt->kind & port_saw_EOF)	1939	if (pt->kind & port_saw_EOF)
1947	return EOF;	1940	return EOF;
1948		1941
1949	c = basic_inchar (pt);	1942	c = basic_inchar (pt);
…		…
2016	port *pt;	2009	port *pt;
2017		2010
2018	if (c == EOF)	2011	if (c == EOF)
2019	return;	2012	return;
2020		2013
2021	pt = SCHEME_V->inport->object.port;	2014	pt = port (SCHEME_V->inport);
2022	pt->unget = c;	2015	pt->unget = c;
2023	#else	2016	#else
2024	if (c == EOF)	2017	if (c == EOF)
2025	return;	2018	return;
2026		2019
…		…
2054		2047
2055	INTERFACE void	2048	INTERFACE void
2056	putstr (SCHEME_P_ const char *s)	2049	putstr (SCHEME_P_ const char *s)
2057	{	2050	{
2058	#if USE_PORTS	2051	#if USE_PORTS
2059	port *pt = SCHEME_V->outport->object.port;	2052	port *pt = port (SCHEME_V->outport);
2060		2053
2061	if (pt->kind & port_file)	2054	if (pt->kind & port_file)
2062	write (pt->rep.stdio.file, s, strlen (s));	2055	write (pt->rep.stdio.file, s, strlen (s));
2063	else	2056	else
2064	for (; *s; s++)	2057	for (; *s; s++)
…		…
2066	pt->rep.string.curr++ = s;	2059	pt->rep.string.curr++ = s;
2067	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2060	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068	pt->rep.string.curr++ = s;	2061	pt->rep.string.curr++ = s;
2069		2062
2070	#else	2063	#else
2071	xwrstr (s);	2064	write (pt->rep.stdio.file, s, strlen (s));
2072	#endif	2065	#endif
2073	}	2066	}
2074		2067
2075	static void	2068	static void
2076	putchars (SCHEME_P_ const char *s, int len)	2069	putchars (SCHEME_P_ const char *s, int len)
2077	{	2070	{
2078	#if USE_PORTS	2071	#if USE_PORTS
2079	port *pt = SCHEME_V->outport->object.port;	2072	port *pt = port (SCHEME_V->outport);
2080		2073
2081	if (pt->kind & port_file)	2074	if (pt->kind & port_file)
2082	write (pt->rep.stdio.file, s, len);	2075	write (pt->rep.stdio.file, s, len);
2083	else	2076	else
2084	{	2077	{
…		…
2098		2091
2099	INTERFACE void	2092	INTERFACE void
2100	putcharacter (SCHEME_P_ int c)	2093	putcharacter (SCHEME_P_ int c)
2101	{	2094	{
2102	#if USE_PORTS	2095	#if USE_PORTS
2103	port *pt = SCHEME_V->outport->object.port;	2096	port *pt = port (SCHEME_V->outport);
2104		2097
2105	if (pt->kind & port_file)	2098	if (pt->kind & port_file)
2106	{	2099	{
2107	char cc = c;	2100	char cc = c;
2108	write (pt->rep.stdio.file, &cc, 1);	2101	write (pt->rep.stdio.file, &cc, 1);
…		…
3050	{	3043	{
3051	int nframes = (uintptr_t)SCHEME_V->dump;	3044	int nframes = (uintptr_t)SCHEME_V->dump;
3052	struct dump_stack_frame *next_frame;	3045	struct dump_stack_frame *next_frame;
3053		3046
3054	/* enough room for the next frame? */	3047	/* enough room for the next frame? */
3055	if (nframes >= SCHEME_V->dump_size)	3048	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3056	{	3049	{
3057	SCHEME_V->dump_size += STACK_GROWTH;	3050	SCHEME_V->dump_size += STACK_GROWTH;
3058	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3051	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3059	}	3052	}
3060		3053
…		…
3241		3234
3242	#endif	3235	#endif
3243		3236
3244	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3237	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3245		3238
3246	#if 1	3239	#if EXPERIMENT
3247	static int	3240	static int
3248	debug (SCHEME_P_ int indent, pointer x)	3241	debug (SCHEME_P_ int indent, pointer x)
3249	{	3242	{
3250	int c;	3243	int c;
3251		3244
…		…
3307	pointer args = SCHEME_V->args;	3300	pointer args = SCHEME_V->args;
3308	pointer x, y;	3301	pointer x, y;
3309		3302
3310	switch (op)	3303	switch (op)
3311	{	3304	{
3312	#if 1 //D	3305	#if EXPERIMENT //D
3313	case OP_DEBUG:	3306	case OP_DEBUG:
3314	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);	3307	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3315	printf ("\n");	3308	printf ("\n");
3316	s_return (S_T);	3309	s_return (S_T);
3317	#endif	3310	#endif
3318	case OP_LOAD: /* load */	3311	case OP_LOAD: /* load */
3319	if (file_interactive (SCHEME_A))	3312	if (file_interactive (SCHEME_A))
3320	{	3313	{
3321	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3314	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3322	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3315	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3323	}	3316	}
3324		3317
3325	if (!file_push (SCHEME_A_ strvalue (car (args))))	3318	if (!file_push (SCHEME_A_ strvalue (car (args))))
3326	Error_1 ("unable to open", car (args));	3319	Error_1 ("unable to open", car (args));
3327	else	3320	else
…		…
3331	}	3324	}
3332		3325
3333	case OP_T0LVL: /* top level */	3326	case OP_T0LVL: /* top level */
3334		3327
3335	/* If we reached the end of file, this loop is done. */	3328	/* If we reached the end of file, this loop is done. */
3336	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3329	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3337	{	3330	{
3338	if (SCHEME_V->file_i == 0)	3331	if (SCHEME_V->file_i == 0)
3339	{	3332	{
3340	SCHEME_V->args = NIL;	3333	SCHEME_V->args = NIL;
3341	s_goto (OP_QUIT);	3334	s_goto (OP_QUIT);
…		…
3419	#endif	3412	#endif
3420	if (is_symbol (SCHEME_V->code)) /* symbol */	3413	if (is_symbol (SCHEME_V->code)) /* symbol */
3421	{	3414	{
3422	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3415	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3423		3416
3424	if (x != NIL)	3417	if (x == NIL)
3425	s_return (slot_value_in_env (x));
3426	else
3427	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3418	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3419
		3420	s_return (slot_value_in_env (x));
3428	}	3421	}
3429	else if (is_pair (SCHEME_V->code))	3422	else if (is_pair (SCHEME_V->code))
3430	{	3423	{
3431	x = car (SCHEME_V->code);	3424	x = car (SCHEME_V->code);
3432		3425
…		…
3509	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3502	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3510	else if (is_foreign (SCHEME_V->code))	3503	else if (is_foreign (SCHEME_V->code))
3511	{	3504	{
3512	/* Keep nested calls from GC'ing the arglist */	3505	/* Keep nested calls from GC'ing the arglist */
3513	push_recent_alloc (SCHEME_A_ args, NIL);	3506	push_recent_alloc (SCHEME_A_ args, NIL);
3514	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3507	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3515		3508
3516	s_return (x);	3509	s_return (x);
3517	}	3510	}
3518	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */	3511	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */
3519	{	3512	{
…		…
3556		3549
3557	case OP_DOMACRO: /* do macro */	3550	case OP_DOMACRO: /* do macro */
3558	SCHEME_V->code = SCHEME_V->value;	3551	SCHEME_V->code = SCHEME_V->value;
3559	s_goto (OP_EVAL);	3552	s_goto (OP_EVAL);
3560		3553
3561	#if 1
3562
3563	case OP_LAMBDA: /* lambda */	3554	case OP_LAMBDA: /* lambda */
3564	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3555	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3565	set SCHEME_V->value fall thru */	3556	set SCHEME_V->value fall thru */
3566	{	3557	{
3567	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3558	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3573	SCHEME_V->code = slot_value_in_env (f);	3564	SCHEME_V->code = slot_value_in_env (f);
3574	s_goto (OP_APPLY);	3565	s_goto (OP_APPLY);
3575	}	3566	}
3576		3567
3577	SCHEME_V->value = SCHEME_V->code;	3568	SCHEME_V->value = SCHEME_V->code;
3578	/* Fallthru */
3579	}	3569	}
		3570	/* Fallthru */
3580		3571
3581	case OP_LAMBDA1:	3572	case OP_LAMBDA1:
3582	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3573	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3583
3584	#else
3585
3586	case OP_LAMBDA: /* lambda */
3587	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3588
3589	#endif
3590		3574
3591	case OP_MKCLOSURE: /* make-closure */	3575	case OP_MKCLOSURE: /* make-closure */
3592	x = car (args);	3576	x = car (args);
3593		3577
3594	if (car (x) == SCHEME_V->LAMBDA)	3578	if (car (x) == SCHEME_V->LAMBDA)
…		…
4015		3999
4016	switch (op)	4000	switch (op)
4017	{	4001	{
4018	#if USE_MATH	4002	#if USE_MATH
4019	case OP_INEX2EX: /* inexact->exact */	4003	case OP_INEX2EX: /* inexact->exact */
4020	{
4021	if (is_integer (x))	4004	if (!is_integer (x))
4022	s_return (x);	4005	{
4023
4024	RVALUE r = rvalue_unchecked (x);	4006	RVALUE r = rvalue_unchecked (x);
4025		4007
4026	if (r == (RVALUE)(IVALUE)r)	4008	if (r == (RVALUE)(IVALUE)r)
4027	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4009	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4028	else	4010	else
4029	Error_1 ("inexact->exact: not integral:", x);	4011	Error_1 ("inexact->exact: not integral:", x);
4030	}	4012	}
		4013
		4014	s_return (x);
4031		4015
4032	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4016	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4033	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4017	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
		4018	/ (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4034	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4019	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4035	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4020	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4036	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));	4021	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4037	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));	4022	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4038	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));	4023	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4039		4024
4040	case OP_ATAN:	4025	case OP_ATAN:
		4026	s_return (mk_real (SCHEME_A_
4041	if (cdr (args) == NIL)	4027	cdr (args) == NIL
4042	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4028	? atan (rvalue (x))
4043	else	4029	: atan2 (rvalue (x), rvalue (cadr (args)))));
4044	{
4045	pointer y = cadr (args);
4046	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4047	}
4048		4030
4049	case OP_SQRT:	4031	case OP_SQRT:
4050	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));	4032	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4051		4033
4052	case OP_EXPT:	4034	case OP_EXPT:
…		…
4079	s_return (mk_real (SCHEME_A_ result));	4061	s_return (mk_real (SCHEME_A_ result));
4080	else	4062	else
4081	s_return (mk_integer (SCHEME_A_ result));	4063	s_return (mk_integer (SCHEME_A_ result));
4082	}	4064	}
4083		4065
4084	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4066	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4085	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4067	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4086
4087	case OP_TRUNCATE:
4088	{
4089	RVALUE n = rvalue (x);
4090	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4091	}
4092
4093	case OP_ROUND:
4094	if (is_integer (x))
4095	s_return (x);
4096
4097	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4068	case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
		4069	case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4098	#endif	4070	#endif
4099		4071
4100	case OP_ADD: /* + */	4072	case OP_ADD: /* + */
4101	v = num_zero;	4073	v = num_zero;
4102		4074
…		…
4190	else	4162	else
4191	Error_0 ("modulo: division by zero");	4163	Error_0 ("modulo: division by zero");
4192		4164
4193	s_return (mk_number (SCHEME_A_ v));	4165	s_return (mk_number (SCHEME_A_ v));
4194		4166
4195	case OP_CAR: /* car */	4167	/* the compiler will optimize this mess... */
4196	s_return (caar (args));	4168	case OP_CAR: op_car: s_return (car (x));
4197		4169	case OP_CDR: op_cdr: s_return (cdr (x));
4198	case OP_CDR: /* cdr */	4170	case OP_CAAR: op_caar: x = car (x); goto op_car;
4199	s_return (cdar (args));	4171	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4172	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4173	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4174	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4175	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4176	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4177	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4178	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4179	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4180	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4181	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4182	case OP_CAAAAR: x = car (x); goto op_caaar;
		4183	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4184	case OP_CAADAR: x = car (x); goto op_caadr;
		4185	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4186	case OP_CADAAR: x = car (x); goto op_cadar;
		4187	case OP_CADADR: x = cdr (x); goto op_cadar;
		4188	case OP_CADDAR: x = car (x); goto op_caddr;
		4189	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4190	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4191	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4192	case OP_CDADAR: x = car (x); goto op_cdadr;
		4193	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4194	case OP_CDDAAR: x = car (x); goto op_cddar;
		4195	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4196	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4197	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4200		4198
4201	case OP_CONS: /* cons */	4199	case OP_CONS: /* cons */
4202	set_cdr (args, cadr (args));	4200	set_cdr (args, cadr (args));
4203	s_return (args);	4201	s_return (args);
4204		4202
…		…
4526	pointer d = cdr (args);	4524	pointer d = cdr (args);
4527	int r;	4525	int r;
4528		4526
4529	switch (op)	4527	switch (op)
4530	{	4528	{
4531	case OP_NOT: /* not */ r = is_false (a) ; break;	4529	case OP_NOT: /* not */ r = is_false (a) ; break;
4532	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;
4533	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4531	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534	case OP_NULLP: /* null? */ r = a == NIL ; break;	4532	case OP_NULLP: /* null? */ r = a == NIL ; break;
4535	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;
4536	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4535	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4537	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4536	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4538	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4537	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4539	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 */
4540	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4539	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4541		4540
4542	#if USE_CHAR_CLASSIFIERS	4541	#if USE_CHAR_CLASSIFIERS
4543	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4542	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4544	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4543	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4545	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4544	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4595	}	4594	}
4596	else	4595	else
4597	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4598		4597
4599	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4600	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4601	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4602		4601
4603	#if USE_PORTS	4602	#if USE_PORTS
4604		4603
4605	case OP_WRITE: /* write */	4604	case OP_WRITE: /* write */
…		…
4750	SCHEME_V->gc_verbose = (a != S_F);	4749	SCHEME_V->gc_verbose = (a != S_F);
4751	s_retbool (was);	4750	s_retbool (was);
4752	}	4751	}
4753		4752
4754	case OP_NEWSEGMENT: /* new-segment */	4753	case OP_NEWSEGMENT: /* new-segment */
		4754	#if 0
4755	if (!is_pair (args) \|\| !is_number (a))	4755	if (!is_pair (args) \|\| !is_number (a))
4756	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4757		4757	#endif
4758	alloc_cellseg (SCHEME_A_ ivalue (a));	4758	s_retbool (alloc_cellseg (SCHEME_A));
4759
4760	s_return (S_T);
4761		4759
4762	case OP_OBLIST: /* oblist */	4760	case OP_OBLIST: /* oblist */
4763	s_return (oblist_all_symbols (SCHEME_A));	4761	s_return (oblist_all_symbols (SCHEME_A));
4764		4762
4765	#if USE_PORTS	4763	#if USE_PORTS
…		…
4835	s_return (p == NIL ? S_F : p);	4833	s_return (p == NIL ? S_F : p);
4836	}	4834	}
4837		4835
4838	case OP_GET_OUTSTRING: /* get-output-string */	4836	case OP_GET_OUTSTRING: /* get-output-string */
4839	{	4837	{
4840	port *p;	4838	port *p = port (a);
4841		4839
4842	if ((p = a->object.port)->kind & port_string)	4840	if (p->kind & port_string)
4843	{	4841	{
4844	off_t size;	4842	off_t size;
4845	char *str;	4843	char *str;
4846		4844
4847	size = p->rep.string.curr - p->rep.string.start + 1;	4845	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4952	int res;	4950	int res;
4953		4951
4954	if (is_pair (args))	4952	if (is_pair (args))
4955	p = car (args);	4953	p = car (args);
4956		4954
4957	res = p->object.port->kind & port_string;	4955	res = port (p)->kind & port_string;
4958		4956
4959	s_retbool (res);	4957	s_retbool (res);
4960	}	4958	}
4961		4959
4962	case OP_SET_INPORT: /* set-input-port */	4960	case OP_SET_INPORT: /* set-input-port */
…		…
5502	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))
5503	return;	5501	return;
5504		5502
5505	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5503	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5506	{	5504	{
5507	xwrstr ("No memory!\n");	5505	putstr (SCHEME_A_ "No memory!\n");
5508	return;	5506	return;
5509	}	5507	}
5510	}	5508	}
5511	}	5509	}
5512		5510
…		…
5625	ecb_cold int	5623	ecb_cold int
5626	scheme_init (SCHEME_P)	5624	scheme_init (SCHEME_P)
5627	{	5625	{
5628	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5626	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5629	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));
5630		5634
5631	num_set_fixnum (num_zero, 1);	5635	num_set_fixnum (num_zero, 1);
5632	num_set_ivalue (num_zero, 0);	5636	num_set_ivalue (num_zero, 0);
5633	num_set_fixnum (num_one, 1);	5637	num_set_fixnum (num_one, 1);
5634	num_set_ivalue (num_one, 1);	5638	num_set_ivalue (num_one, 1);
…		…
5646	SCHEME_V->save_inport = NIL;	5650	SCHEME_V->save_inport = NIL;
5647	SCHEME_V->loadport = NIL;	5651	SCHEME_V->loadport = NIL;
5648	SCHEME_V->nesting = 0;	5652	SCHEME_V->nesting = 0;
5649	SCHEME_V->interactive_repl = 0;	5653	SCHEME_V->interactive_repl = 0;
5650		5654
5651	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5655	if (!alloc_cellseg (SCHEME_A))
5652	{	5656	{
5653	#if USE_ERROR_CHECKING	5657	#if USE_ERROR_CHECKING
5654	SCHEME_V->no_memory = 1;	5658	SCHEME_V->no_memory = 1;
5655	return 0;	5659	return 0;
5656	#endif	5660	#endif
…		…
5990	int isfile = 1;	5994	int isfile = 1;
5991	system ("ps v $PPID");//D	5995	system ("ps v $PPID");//D
5992		5996
5993	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5997	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5994	{	5998	{
5995	xwrstr ("Usage: tinyscheme -?\n");	5999	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5996	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6000	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5997	xwrstr ("followed by\n");	6001	putstr (SCHEME_A_ "followed by\n");
5998	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6002	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5999	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6003	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6000	xwrstr ("assuming that the executable is named tinyscheme.\n");	6004	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6001	xwrstr ("Use - as filename for stdin.\n");	6005	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6002	return 1;	6006	return 1;
6003	}	6007	}
6004		6008
6005	if (!scheme_init (SCHEME_A))	6009	if (!scheme_init (SCHEME_A))
6006	{	6010	{
6007	xwrstr ("Could not initialize!\n");	6011	putstr (SCHEME_A_ "Could not initialize!\n");
6008	return 2;	6012	return 2;
6009	}	6013	}
6010		6014
6011	# if USE_PORTS	6015	# if USE_PORTS
6012	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6016	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
6057	fin = open (file_name, O_RDONLY);	6061	fin = open (file_name, O_RDONLY);
6058	#endif	6062	#endif
6059		6063
6060	if (isfile && fin < 0)	6064	if (isfile && fin < 0)
6061	{	6065	{
6062	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");
6063	}	6067	}
6064	else	6068	else
6065	{	6069	{
6066	if (isfile)	6070	if (isfile)
6067	scheme_load_named_file (SCHEME_A_ fin, file_name);	6071	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6071	#if USE_PORTS	6075	#if USE_PORTS
6072	if (!isfile \|\| fin != STDIN_FILENO)	6076	if (!isfile \|\| fin != STDIN_FILENO)
6073	{	6077	{
6074	if (SCHEME_V->retcode != 0)	6078	if (SCHEME_V->retcode != 0)
6075	{	6079	{
6076	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");
6077	}	6081	}
6078		6082
6079	if (isfile)	6083	if (isfile)
6080	close (fin);	6084	close (fin);
6081	}	6085	}

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC vs. Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC