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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.43 by root, Mon Nov 30 06:40:57 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57:49 2015 UTC

…		…
18	*	18	*
19	*/	19	*/
20		20
21	#define EXPERIMENT 1	21	#define EXPERIMENT 1
22		22
		23	#if 1
23	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	24	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
24	#include "malloc.c"	25	#include "malloc.c"
		26	#endif
25		27
26	#define SCHEME_SOURCE	28	#define SCHEME_SOURCE
27	#include "scheme-private.h"	29	#include "scheme-private.h"
28	#ifndef WIN32	30	#ifndef WIN32
29	# include <unistd.h>	31	# include <unistd.h>
…		…
79		81
80	#define BACKQUOTE '`'	82	#define BACKQUOTE '`'
81	#define WHITESPACE " \t\r\n\v\f"	83	#define WHITESPACE " \t\r\n\v\f"
82	#define DELIMITERS "()\";" WHITESPACE	84	#define DELIMITERS "()\";" WHITESPACE
83		85
84	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	86	#define NIL POINTER (&SCHEME_V->xNIL)
85	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	87	#define S_T POINTER (&SCHEME_V->xT)
86	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	88	#define S_F POINTER (&SCHEME_V->xF)
87	#define S_SINK (&SCHEME_V->xsink)	89	#define S_SINK POINTER (&SCHEME_V->xsink)
88	#define S_EOF (&SCHEME_V->xEOF_OBJ)	90	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
89		91
90	#if !USE_MULTIPLICITY	92	#if !USE_MULTIPLICITY
91	static scheme sc;	93	static scheme sc;
92	#endif	94	#endif
93		95
…		…
101	}	103	}
102		104
103	char *p = s;	105	char *p = s;
104		106
105	do {	107	do {
106	*p++ = '0' + n % base;	108	*p++ = "0123456789abcdef"[n % base];
107	n /= base;	109	n /= base;
108	} while (n);	110	} while (n);
109		111
110	*p-- = 0;	112	*p-- = 0;
111		113
…		…
121	{	123	{
122	xbase (s, n, 10);	124	xbase (s, n, 10);
123	}	125	}
124		126
125	static void	127	static void
126	xwrstr (const char *s)	128	putnum (SCHEME_P_ long n)
127	{
128	write (1, s, strlen (s));
129	}
130
131	static void
132	xwrnum (long n)
133	{	129	{
134	char buf[64];	130	char buf[64];
135		131
136	xnum (buf, n);	132	xnum (buf, n);
137	xwrstr (buf);	133	putstr (SCHEME_A_ buf);
138	}	134	}
139		135
140	static char	136	static char
141	xtoupper (char c)	137	xtoupper (char c)
142	{	138	{
…		…
192	# define prompt "ts> "	188	# define prompt "ts> "
193	#endif	189	#endif
194		190
195	#ifndef InitFile	191	#ifndef InitFile
196	# define InitFile "init.scm"	192	# define InitFile "init.scm"
197	#endif
198
199	#ifndef FIRST_CELLSEGS
200	# define FIRST_CELLSEGS 3
201	#endif	193	#endif
202		194
203	enum scheme_types	195	enum scheme_types
204	{	196	{
205	T_INTEGER,	197	T_INTEGER,
…		…
258	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);
259	static num num_intdiv (num a, num b);	251	static num num_intdiv (num a, num b);
260	static num num_rem (num a, num b);	252	static num num_rem (num a, num b);
261	static num num_mod (num a, num b);	253	static num num_mod (num a, num b);
262		254
263	#if USE_MATH
264	static double round_per_R5RS (double x);
265	#endif
266	static int is_zero_rvalue (RVALUE x);	255	static int is_zero_rvalue (RVALUE x);
267		256
268	static num num_zero;	257	static num num_zero;
269	static num num_one;	258	static num num_one;
270		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
271	/* macros for cell operations */	264	/* macros for cell operations */
272	#define typeflag(p) ((p)->flag + 0)	265	#define typeflag(p) (CELL(p)->flag + 0)
273	#define set_typeflag(p,v) ((p)->flag = (v))	266	#define set_typeflag(p,v) (CELL(p)->flag = (v))
274	#define type(p) (typeflag (p) & T_MASKTYPE)	267	#define type(p) (typeflag (p) & T_MASKTYPE)
275		268
276	INTERFACE int	269	INTERFACE int
277	is_string (pointer p)	270	is_string (pointer p)
278	{	271	{
279	return type (p) == T_STRING;	272	return type (p) == T_STRING;
280	}	273	}
281		274
282	#define strvalue(p) ((p)->object.string.svalue)	275	#define strvalue(p) (CELL(p)->object.string.svalue)
283	#define strlength(p) ((p)->object.string.length)	276	#define strlength(p) (CELL(p)->object.string.length)
284		277
285	INTERFACE int	278	INTERFACE int
286	is_vector (pointer p)	279	is_vector (pointer p)
287	{	280	{
288	return type (p) == T_VECTOR;	281	return type (p) == T_VECTOR;
289	}	282	}
290		283
291	#define vecvalue(p) ((p)->object.vector.vvalue)	284	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
292	#define veclength(p) ((p)->object.vector.length)	285	#define veclength(p) (CELL(p)->object.vector.length)
293	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	286	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
294	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	287	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
295	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	288	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
296		289
297	INTERFACE int	290	INTERFACE int
…		…
323	string_value (pointer p)	316	string_value (pointer p)
324	{	317	{
325	return strvalue (p);	318	return strvalue (p);
326	}	319	}
327		320
328	#define ivalue_unchecked(p) (p)->object.ivalue	321	#define ivalue_unchecked(p) CELL(p)->object.ivalue
329	#define set_ivalue(p,v) (p)->object.ivalue = (v)	322	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
330		323
331	#if USE_REAL	324	#if USE_REAL
332	#define rvalue_unchecked(p) (p)->object.rvalue	325	#define rvalue_unchecked(p) CELL(p)->object.rvalue
333	#define set_rvalue(p,v) (p)->object.rvalue = (v)	326	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
334	#else	327	#else
335	#define rvalue_unchecked(p) (p)->object.ivalue	328	#define rvalue_unchecked(p) CELL(p)->object.ivalue
336	#define set_rvalue(p,v) (p)->object.ivalue = (v)	329	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
337	#endif	330	#endif
338		331
339	INTERFACE long	332	INTERFACE long
340	charvalue (pointer p)	333	charvalue (pointer p)
341	{	334	{
342	return ivalue_unchecked (p);	335	return ivalue_unchecked (p);
343	}	336	}
344		337
		338	#define port(p) CELL(p)->object.port
		339	#define set_port(p,v) port(p) = (v)
345	INTERFACE int	340	INTERFACE int
346	is_port (pointer p)	341	is_port (pointer p)
347	{	342	{
348	return type (p) == T_PORT;	343	return type (p) == T_PORT;
349	}	344	}
350		345
351	INTERFACE int	346	INTERFACE int
352	is_inport (pointer p)	347	is_inport (pointer p)
353	{	348	{
354	return is_port (p) && p->object.port->kind & port_input;	349	return is_port (p) && port (p)->kind & port_input;
355	}	350	}
356		351
357	INTERFACE int	352	INTERFACE int
358	is_outport (pointer p)	353	is_outport (pointer p)
359	{	354	{
360	return is_port (p) && p->object.port->kind & port_output;	355	return is_port (p) && port (p)->kind & port_output;
361	}	356	}
362		357
363	INTERFACE int	358	INTERFACE int
364	is_pair (pointer p)	359	is_pair (pointer p)
365	{	360	{
366	return type (p) == T_PAIR;	361	return type (p) == T_PAIR;
367	}	362	}
368		363
369	#define car(p) ((p)->object.cons.car + 0)	364	#define car(p) (POINTER (CELL(p)->object.cons.car))
370	#define cdr(p) ((p)->object.cons.cdr + 0)	365	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
371		366
372	static pointer caar (pointer p) { return car (car (p)); }	367	static pointer caar (pointer p) { return car (car (p)); }
373	static pointer cadr (pointer p) { return car (cdr (p)); }	368	static pointer cadr (pointer p) { return car (cdr (p)); }
374	static pointer cdar (pointer p) { return cdr (car (p)); }	369	static pointer cdar (pointer p) { return cdr (car (p)); }
375	static pointer cddr (pointer p) { return cdr (cdr (p)); }	370	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
379	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	374	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
380		375
381	INTERFACE void	376	INTERFACE void
382	set_car (pointer p, pointer q)	377	set_car (pointer p, pointer q)
383	{	378	{
384	p->object.cons.car = q;	379	CELL(p)->object.cons.car = CELL (q);
385	}	380	}
386		381
387	INTERFACE void	382	INTERFACE void
388	set_cdr (pointer p, pointer q)	383	set_cdr (pointer p, pointer q)
389	{	384	{
390	p->object.cons.cdr = q;	385	CELL(p)->object.cons.cdr = CELL (q);
391	}	386	}
392		387
393	INTERFACE pointer	388	INTERFACE pointer
394	pair_car (pointer p)	389	pair_car (pointer p)
395	{	390	{
…		…
413	{	408	{
414	return strvalue (p);	409	return strvalue (p);
415	}	410	}
416		411
417	#if USE_PLIST	412	#if USE_PLIST
		413	#error plists are broken because symbols are no longer pairs
418	#define symprop(p) cdr(p)	414	#define symprop(p) cdr(p)
419	SCHEME_EXPORT int	415	SCHEME_EXPORT int
420	hasprop (pointer p)	416	hasprop (pointer p)
421	{	417	{
422	return typeflag (p) & T_SYMBOL;	418	return typeflag (p) & T_SYMBOL;
…		…
669		665
670	static int file_push (SCHEME_P_ const char *fname);	666	static int file_push (SCHEME_P_ const char *fname);
671	static void file_pop (SCHEME_P);	667	static void file_pop (SCHEME_P);
672	static int file_interactive (SCHEME_P);	668	static int file_interactive (SCHEME_P);
673	ecb_inline int is_one_of (const char *s, int c);	669	ecb_inline int is_one_of (const char *s, int c);
674	static int alloc_cellseg (SCHEME_P_ int n);	670	static int alloc_cellseg (SCHEME_P);
675	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	671	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
676	static void finalize_cell (SCHEME_P_ pointer a);	672	static void finalize_cell (SCHEME_P_ pointer a);
677	static int count_consecutive_cells (pointer x, int needed);	673	static int count_consecutive_cells (pointer x, int needed);
678	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);
679	static pointer mk_number (SCHEME_P_ const num n);	675	static pointer mk_number (SCHEME_P_ const num n);
…		…
873	}	869	}
874		870
875	return ret;	871	return ret;
876	}	872	}
877		873
878	#if USE_MATH
879
880	/* Round to nearest. Round to even if midway */
881	static double
882	round_per_R5RS (double x)
883	{
884	double fl = floor (x);
885	double ce = ceil (x);
886	double dfl = x - fl;
887	double dce = ce - x;
888
889	if (dfl > dce)
890	return ce;
891	else if (dfl < dce)
892	return fl;
893	else
894	{
895	if (fmod (fl, 2) == 0) /* I imagine this holds */
896	return fl;
897	else
898	return ce;
899	}
900	}
901	#endif
902
903	static int	874	static int
904	is_zero_rvalue (RVALUE x)	875	is_zero_rvalue (RVALUE x)
905	{	876	{
906	return x == 0;	877	return x == 0;
907	#if 0	878	#if 0
…		…
913	#endif	884	#endif
914	}	885	}
915		886
916	/* allocate new cell segment */	887	/* allocate new cell segment */
917	static int	888	static int
918	alloc_cellseg (SCHEME_P_ int n)	889	alloc_cellseg (SCHEME_P)
919	{	890	{
920	pointer newp;	891	struct cell *newp;
921	pointer last;	892	struct cell *last;
922	pointer p;	893	struct cell *p;
923	char *cp;	894	char *cp;
924	long i;	895	long i;
925	int k;	896	int k;
926		897
927	static int segsize = CELL_SEGSIZE >> 1;	898	static int segsize = CELL_SEGSIZE >> 1;
928	segsize <<= 1;	899	segsize <<= 1;
929		900
930	for (k = 0; k < n; k++)
931	{
932	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
933	return k;
934
935	cp = malloc (segsize * sizeof (struct cell));	901	cp = malloc (segsize * sizeof (struct cell));
936		902
937	if (!cp && USE_ERROR_CHECKING)	903	if (!cp && USE_ERROR_CHECKING)
938	return k;	904	return k;
939		905
940	i = ++SCHEME_V->last_cell_seg;	906	i = ++SCHEME_V->last_cell_seg;
941	SCHEME_V->alloc_seg[i] = cp;	907	SCHEME_V->alloc_seg[i] = cp;
942		908
943	newp = (pointer)cp;	909	newp = (struct cell *)cp;
944	SCHEME_V->cell_seg[i] = newp;	910	SCHEME_V->cell_seg[i] = newp;
945	SCHEME_V->cell_segsize[i] = segsize;	911	SCHEME_V->cell_segsize[i] = segsize;
946	SCHEME_V->fcells += segsize;	912	SCHEME_V->fcells += segsize;
947	last = newp + segsize - 1;	913	last = newp + segsize - 1;
948		914
949	for (p = newp; p <= last; p++)	915	for (p = newp; p <= last; p++)
950	{	916	{
		917	pointer cp = POINTER (p);
951	set_typeflag (p, T_PAIR);	918	set_typeflag (cp, T_PAIR);
952	set_car (p, NIL);	919	set_car (cp, NIL);
953	set_cdr (p, p + 1);	920	set_cdr (cp, POINTER (p + 1));
954	}	921	}
955		922
956	set_cdr (last, SCHEME_V->free_cell);	923	set_cdr (POINTER (last), SCHEME_V->free_cell);
957	SCHEME_V->free_cell = newp;	924	SCHEME_V->free_cell = POINTER (newp);
958	}
959		925
960	return n;	926	return 1;
961	}	927	}
962		928
963	/* get new cell. parameter a, b is marked by gc. */	929	/* get new cell. parameter a, b is marked by gc. */
964	ecb_inline pointer	930	ecb_inline pointer
965	get_cell_x (SCHEME_P_ pointer a, pointer b)	931	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
969	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	935	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
970	return S_SINK;	936	return S_SINK;
971		937
972	if (SCHEME_V->free_cell == NIL)	938	if (SCHEME_V->free_cell == NIL)
973	{	939	{
974	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;
975		941
976	gc (SCHEME_A_ a, b);	942	gc (SCHEME_A_ a, b);
977		943
978	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)
979	{	945	{
980	/* 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 */
981	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	947	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
982	{	948	{
983	#if USE_ERROR_CHECKING	949	#if USE_ERROR_CHECKING
984	SCHEME_V->no_memory = 1;	950	SCHEME_V->no_memory = 1;
985	return S_SINK;	951	return S_SINK;
986	#endif	952	#endif
…		…
998	}	964	}
999	}	965	}
1000		966
1001	/* To retain recent allocs before interpreter knows about them -	967	/* To retain recent allocs before interpreter knows about them -
1002	Tehom */	968	Tehom */
1003
1004	static void	969	static void
1005	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	970	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1006	{	971	{
1007	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	972	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1008		973
…		…
1030	}	995	}
1031		996
1032	static pointer	997	static pointer
1033	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	998	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1034	{	999	{
1035	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1000	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1036	pointer e = malloc (len sizeof (pointer));	1001	pointer e = malloc (len sizeof (pointer));
1037		1002
1038	if (!e && USE_ERROR_CHECKING)	1003	if (!e && USE_ERROR_CHECKING)
1039	return S_SINK;	1004	return S_SINK;
1040		1005
1041	/* Record it as a vector so that gc understands it. */	1006	/* Record it as a vector so that gc understands it. */
1042	set_typeflag (v, T_VECTOR \| T_ATOM);	1007	set_typeflag (v, T_VECTOR \| T_ATOM);
1043		1008
1044	v->object.vector.vvalue = e;	1009	CELL(v)->object.vector.vvalue = e;
1045	v->object.vector.length = len;	1010	CELL(v)->object.vector.length = len;
1046	fill_vector (v, 0, init);	1011	fill_vector (v, 0, init);
1047	push_recent_alloc (SCHEME_A_ v, NIL);	1012	push_recent_alloc (SCHEME_A_ v, NIL);
1048		1013
1049	return v;	1014	return v;
1050	}	1015	}
…		…
1059	static void	1024	static void
1060	check_cell_alloced (pointer p, int expect_alloced)	1025	check_cell_alloced (pointer p, int expect_alloced)
1061	{	1026	{
1062	/* 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. */
1063	if (typeflag (p) & !expect_alloced)	1028	if (typeflag (p) & !expect_alloced)
1064	xwrstr ("Cell is already allocated!\n");	1029	putstr (SCHEME_A_ "Cell is already allocated!\n");
1065		1030
1066	if (!(typeflag (p)) & expect_alloced)	1031	if (!(typeflag (p)) & expect_alloced)
1067	xwrstr ("Cell is not allocated!\n");	1032	putstr (SCHEME_A_ "Cell is not allocated!\n");
1068	}	1033	}
1069		1034
1070	static void	1035	static void
1071	check_range_alloced (pointer p, int n, int expect_alloced)	1036	check_range_alloced (pointer p, int n, int expect_alloced)
1072	{	1037	{
…		…
1200		1165
1201	/* returns the new symbol */	1166	/* returns the new symbol */
1202	static pointer	1167	static pointer
1203	oblist_add_by_name (SCHEME_P_ const char *name)	1168	oblist_add_by_name (SCHEME_P_ const char *name)
1204	{	1169	{
1205	pointer x = mk_string (SCHEME_A_ name);	1170	pointer x = generate_symbol (SCHEME_A_ name);
1206	set_typeflag (x, T_SYMBOL);
1207	setimmutable (x);
1208	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1209	return x;	1172	return x;
1210	}	1173	}
1211		1174
1212	static pointer	1175	static pointer
…		…
1222	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1223	{	1186	{
1224	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1225		1188
1226	set_typeflag (x, T_PORT \| T_ATOM);	1189	set_typeflag (x, T_PORT \| T_ATOM);
1227	x->object.port = p;	1190	set_port (x, p);
1228		1191
1229	return x;	1192	return x;
1230	}	1193	}
1231	#endif	1194	#endif
1232		1195
1233	pointer	1196	pointer
1234	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1235	{	1198	{
1236	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1237		1200
1238	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1201	set_typeflag (x, T_FOREIGN \| T_ATOM);
1239	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1240		1203
1241	return x;	1204	return x;
1242	}	1205	}
1243		1206
1244	INTERFACE pointer	1207	INTERFACE pointer
1245	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1246	{	1209	{
1247	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1248		1211
1249	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1212	set_typeflag (x, T_CHARACTER \| T_ATOM);
1250	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1251		1214
1252	return x;	1215	return x;
1253	}	1216	}
1254		1217
1255	/* get number atom (integer) */	1218	/* get number atom (integer) */
1256	INTERFACE pointer	1219	INTERFACE pointer
1257	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1258	{	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	{
1259	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1260		1233
1261	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 */
1262	set_ivalue (x, n);	1236	set_ivalue (x, n);
1263		1237
		1238	*pp = x;
		1239	}
		1240
1264	return x;	1241	return *pp;
1265	}	1242	}
1266		1243
1267	INTERFACE pointer	1244	INTERFACE pointer
1268	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1269	{	1246	{
1270	#if USE_REAL	1247	#if USE_REAL
1271	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1272		1249
1273	set_typeflag (x, (T_REAL \| T_ATOM));	1250	set_typeflag (x, T_REAL \| T_ATOM);
1274	set_rvalue (x, n);	1251	set_rvalue (x, n);
1275		1252
1276	return x;	1253	return x;
1277	#else	1254	#else
1278	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1498	return S_F;	1475	return S_F;
1499	else if (name == '\\') / #\w (character) */	1476	else if (name == '\\') / #\w (character) */
1500	{	1477	{
1501	int c;	1478	int c;
1502		1479
		1480	// TODO: optimise
1503	if (stricmp (name + 1, "space") == 0)	1481	if (stricmp (name + 1, "space") == 0)
1504	c = ' ';	1482	c = ' ';
1505	else if (stricmp (name + 1, "newline") == 0)	1483	else if (stricmp (name + 1, "newline") == 0)
1506	c = '\n';	1484	c = '\n';
1507	else if (stricmp (name + 1, "return") == 0)	1485	else if (stricmp (name + 1, "return") == 0)
1508	c = '\r';	1486	c = '\r';
1509	else if (stricmp (name + 1, "tab") == 0)	1487	else if (stricmp (name + 1, "tab") == 0)
1510	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;
1511	else if (name[1] == 'x' && name[2] != 0)	1499	else if (name[1] == 'x' && name[2] != 0)
1512	{	1500	{
1513	long c1 = strtol (name + 2, 0, 16);	1501	long c1 = strtol (name + 2, 0, 16);
1514		1502
1515	if (0 <= c1 && c1 <= UCHAR_MAX)	1503	if (0 <= c1 && c1 <= UCHAR_MAX)
…		…
1621		1609
1622	/* garbage collection. parameter a, b is marked. */	1610	/* garbage collection. parameter a, b is marked. */
1623	static void	1611	static void
1624	gc (SCHEME_P_ pointer a, pointer b)	1612	gc (SCHEME_P_ pointer a, pointer b)
1625	{	1613	{
1626	pointer p;
1627	int i;	1614	int i;
1628		1615
1629	if (SCHEME_V->gc_verbose)	1616	if (SCHEME_V->gc_verbose)
1630	putstr (SCHEME_A_ "gc...");	1617	putstr (SCHEME_A_ "gc...");
1631		1618
…		…
1647	/* Mark recent objects the interpreter doesn't know about yet. */	1634	/* Mark recent objects the interpreter doesn't know about yet. */
1648	mark (car (S_SINK));	1635	mark (car (S_SINK));
1649	/* Mark any older stuff above nested C calls */	1636	/* Mark any older stuff above nested C calls */
1650	mark (SCHEME_V->c_nest);	1637	mark (SCHEME_V->c_nest);
1651		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
1652	/* mark variables a, b */	1646	/* mark variables a, b */
1653	mark (a);	1647	mark (a);
1654	mark (b);	1648	mark (b);
1655		1649
1656	/* garbage collect */	1650	/* garbage collect */
1657	clrmark (NIL);	1651	clrmark (NIL);
1658	SCHEME_V->fcells = 0;	1652	SCHEME_V->fcells = 0;
1659	SCHEME_V->free_cell = NIL;	1653	SCHEME_V->free_cell = NIL;
1660		1654
1661	/* free-list is kept sorted by address so as to maintain consecutive	1655	if (SCHEME_V->gc_verbose)
1662	ranges, if possible, for use with vectors. Here we scan the cells	1656	putstr (SCHEME_A_ "freeing...");
1663	(which are also kept sorted by address) downwards to build the	1657
1664	free-list in sorted order.	1658	uint32_t total = 0;
1665	*/	1659
		1660	/* Here we scan the cells to build the free-list. */
1666	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1661	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1667	{	1662	{
1668	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];
1669		1666
1670	while (--p >= SCHEME_V->cell_seg[i])	1667	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1671	{	1668	{
		1669	pointer c = POINTER (p);
		1670
1672	if (is_mark (p))	1671	if (is_mark (c))
1673	clrmark (p);	1672	clrmark (c);
1674	else	1673	else
1675	{	1674	{
1676	/* reclaim cell */	1675	/* reclaim cell */
1677	if (typeflag (p) != T_PAIR)	1676	if (typeflag (c) != T_PAIR)
1678	{	1677	{
1679	finalize_cell (SCHEME_A_ p);	1678	finalize_cell (SCHEME_A_ c);
1680	set_typeflag (p, T_PAIR);	1679	set_typeflag (c, T_PAIR);
1681	set_car (p, NIL);	1680	set_car (c, NIL);
1682	}	1681	}
1683		1682
1684	++SCHEME_V->fcells;	1683	++SCHEME_V->fcells;
1685	set_cdr (p, SCHEME_V->free_cell);	1684	set_cdr (c, SCHEME_V->free_cell);
1686	SCHEME_V->free_cell = p;	1685	SCHEME_V->free_cell = c;
1687	}	1686	}
1688	}	1687	}
1689	}	1688	}
1690		1689
1691	if (SCHEME_V->gc_verbose)	1690	if (SCHEME_V->gc_verbose)
1692	{	1691	{
1693	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");
1694	}	1693	}
1695	}	1694	}
1696		1695
1697	static void	1696	static void
1698	finalize_cell (SCHEME_P_ pointer a)	1697	finalize_cell (SCHEME_P_ pointer a)
…		…
1703	else if (is_vector (a))	1702	else if (is_vector (a))
1704	free (vecvalue (a));	1703	free (vecvalue (a));
1705	#if USE_PORTS	1704	#if USE_PORTS
1706	else if (is_port (a))	1705	else if (is_port (a))
1707	{	1706	{
1708	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)
1709	port_close (SCHEME_A_ a, port_input \| port_output);	1708	port_close (SCHEME_A_ a, port_input \| port_output);
1710		1709
1711	free (a->object.port);	1710	free (port (a));
1712	}	1711	}
1713	#endif	1712	#endif
1714	}	1713	}
1715		1714
1716	/* ========== Routines for Reading ========== */	1715	/* ========== Routines for Reading ========== */
…		…
1732	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1731	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1733	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;
1734	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;
1735	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;
1736	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1735	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1737	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);
1738		1737
1739	#if SHOW_ERROR_LINE	1738	#if SHOW_ERROR_LINE
1740	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;
1741		1740
1742	if (fname)	1741	if (fname)
…		…
1759	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1758	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1760	#if USE_PORTS	1759	#if USE_PORTS
1761	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1760	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1762	#endif	1761	#endif
1763	SCHEME_V->file_i--;	1762	SCHEME_V->file_i--;
1764	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);
1765	}	1764	}
1766	}	1765	}
1767		1766
1768	static int	1767	static int
1769	file_interactive (SCHEME_P)	1768	file_interactive (SCHEME_P)
1770	{	1769	{
1771	#if USE_PORTS	1770	#if USE_PORTS
1772	return SCHEME_V->file_i == 0	1771	return SCHEME_V->file_i == 0
1773	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1772	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1774	&& (SCHEME_V->inport->object.port->kind & port_file);	1773	&& (port (SCHEME_V->inport)->kind & port_file);
1775	#else	1774	#else
1776	return 0;	1775	return 0;
1777	#endif	1776	#endif
1778	}	1777	}
1779		1778
…		…
1913	}	1912	}
1914		1913
1915	static void	1914	static void
1916	port_close (SCHEME_P_ pointer p, int flag)	1915	port_close (SCHEME_P_ pointer p, int flag)
1917	{	1916	{
1918	port *pt = p->object.port;	1917	port *pt = port (p);
1919		1918
1920	pt->kind &= ~flag;	1919	pt->kind &= ~flag;
1921		1920
1922	if ((pt->kind & (port_input \| port_output)) == 0)	1921	if ((pt->kind & (port_input \| port_output)) == 0)
1923	{	1922	{
…		…
1944	/* get new character from input file */	1943	/* get new character from input file */
1945	static int	1944	static int
1946	inchar (SCHEME_P)	1945	inchar (SCHEME_P)
1947	{	1946	{
1948	int c;	1947	int c;
1949	port *pt;	1948	port *pt = port (SCHEME_V->inport);
1950
1951	pt = SCHEME_V->inport->object.port;
1952		1949
1953	if (pt->kind & port_saw_EOF)	1950	if (pt->kind & port_saw_EOF)
1954	return EOF;	1951	return EOF;
1955		1952
1956	c = basic_inchar (pt);	1953	c = basic_inchar (pt);
…		…
2023	port *pt;	2020	port *pt;
2024		2021
2025	if (c == EOF)	2022	if (c == EOF)
2026	return;	2023	return;
2027		2024
2028	pt = SCHEME_V->inport->object.port;	2025	pt = port (SCHEME_V->inport);
2029	pt->unget = c;	2026	pt->unget = c;
2030	#else	2027	#else
2031	if (c == EOF)	2028	if (c == EOF)
2032	return;	2029	return;
2033		2030
…		…
2061		2058
2062	INTERFACE void	2059	INTERFACE void
2063	putstr (SCHEME_P_ const char *s)	2060	putstr (SCHEME_P_ const char *s)
2064	{	2061	{
2065	#if USE_PORTS	2062	#if USE_PORTS
2066	port *pt = SCHEME_V->outport->object.port;	2063	port *pt = port (SCHEME_V->outport);
2067		2064
2068	if (pt->kind & port_file)	2065	if (pt->kind & port_file)
2069	write (pt->rep.stdio.file, s, strlen (s));	2066	write (pt->rep.stdio.file, s, strlen (s));
2070	else	2067	else
2071	for (; *s; s++)	2068	for (; *s; s++)
…		…
2073	pt->rep.string.curr++ = s;	2070	pt->rep.string.curr++ = s;
2074	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))
2075	pt->rep.string.curr++ = s;	2072	pt->rep.string.curr++ = s;
2076		2073
2077	#else	2074	#else
2078	xwrstr (s);	2075	write (pt->rep.stdio.file, s, strlen (s));
2079	#endif	2076	#endif
2080	}	2077	}
2081		2078
2082	static void	2079	static void
2083	putchars (SCHEME_P_ const char *s, int len)	2080	putchars (SCHEME_P_ const char *s, int len)
2084	{	2081	{
2085	#if USE_PORTS	2082	#if USE_PORTS
2086	port *pt = SCHEME_V->outport->object.port;	2083	port *pt = port (SCHEME_V->outport);
2087		2084
2088	if (pt->kind & port_file)	2085	if (pt->kind & port_file)
2089	write (pt->rep.stdio.file, s, len);	2086	write (pt->rep.stdio.file, s, len);
2090	else	2087	else
2091	{	2088	{
…		…
2105		2102
2106	INTERFACE void	2103	INTERFACE void
2107	putcharacter (SCHEME_P_ int c)	2104	putcharacter (SCHEME_P_ int c)
2108	{	2105	{
2109	#if USE_PORTS	2106	#if USE_PORTS
2110	port *pt = SCHEME_V->outport->object.port;	2107	port *pt = port (SCHEME_V->outport);
2111		2108
2112	if (pt->kind & port_file)	2109	if (pt->kind & port_file)
2113	{	2110	{
2114	char cc = c;	2111	char cc = c;
2115	write (pt->rep.stdio.file, &cc, 1);	2112	write (pt->rep.stdio.file, &cc, 1);
…		…
2189	case '7':	2186	case '7':
2190	state = st_oct1;	2187	state = st_oct1;
2191	c1 = c - '0';	2188	c1 = c - '0';
2192	break;	2189	break;
2193		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
2194	case 'x':	2199	case 'x':
2195	case 'X':	2200	case 'X':
2196	state = st_x1;	2201	state = st_x1;
2197	c1 = 0;	2202	c1 = 0;
2198	break;
2199
2200	case 'n':
2201	*p++ = '\n';
2202	state = st_ok;
2203	break;
2204
2205	case 't':
2206	*p++ = '\t';
2207	state = st_ok;
2208	break;
2209
2210	case 'r':
2211	*p++ = '\r';
2212	state = st_ok;
2213	break;	2203	break;
2214		2204
2215	default:	2205	default:
2216	*p++ = c;	2206	*p++ = c;
2217	state = st_ok;	2207	state = st_ok;
…		…
3057	{	3047	{
3058	int nframes = (uintptr_t)SCHEME_V->dump;	3048	int nframes = (uintptr_t)SCHEME_V->dump;
3059	struct dump_stack_frame *next_frame;	3049	struct dump_stack_frame *next_frame;
3060		3050
3061	/* enough room for the next frame? */	3051	/* enough room for the next frame? */
3062	if (nframes >= SCHEME_V->dump_size)	3052	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3063	{	3053	{
3064	SCHEME_V->dump_size += STACK_GROWTH;	3054	SCHEME_V->dump_size += STACK_GROWTH;
3065	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);
3066	}	3056	}
3067		3057
…		…
3323	s_return (S_T);	3313	s_return (S_T);
3324	#endif	3314	#endif
3325	case OP_LOAD: /* load */	3315	case OP_LOAD: /* load */
3326	if (file_interactive (SCHEME_A))	3316	if (file_interactive (SCHEME_A))
3327	{	3317	{
3328	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3318	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3329	//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)));
3330	}	3320	}
3331		3321
3332	if (!file_push (SCHEME_A_ strvalue (car (args))))	3322	if (!file_push (SCHEME_A_ strvalue (car (args))))
3333	Error_1 ("unable to open", car (args));	3323	Error_1 ("unable to open", car (args));
3334	else	3324	else
…		…
3338	}	3328	}
3339		3329
3340	case OP_T0LVL: /* top level */	3330	case OP_T0LVL: /* top level */
3341		3331
3342	/* If we reached the end of file, this loop is done. */	3332	/* If we reached the end of file, this loop is done. */
3343	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3333	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3344	{	3334	{
3345	if (SCHEME_V->file_i == 0)	3335	if (SCHEME_V->file_i == 0)
3346	{	3336	{
3347	SCHEME_V->args = NIL;	3337	SCHEME_V->args = NIL;
3348	s_goto (OP_QUIT);	3338	s_goto (OP_QUIT);
…		…
3426	#endif	3416	#endif
3427	if (is_symbol (SCHEME_V->code)) /* symbol */	3417	if (is_symbol (SCHEME_V->code)) /* symbol */
3428	{	3418	{
3429	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);
3430		3420
3431	if (x != NIL)	3421	if (x == NIL)
3432	s_return (slot_value_in_env (x));
3433	else
3434	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));
3435	}	3425	}
3436	else if (is_pair (SCHEME_V->code))	3426	else if (is_pair (SCHEME_V->code))
3437	{	3427	{
3438	x = car (SCHEME_V->code);	3428	x = car (SCHEME_V->code);
3439		3429
…		…
3516	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3506	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3517	else if (is_foreign (SCHEME_V->code))	3507	else if (is_foreign (SCHEME_V->code))
3518	{	3508	{
3519	/* Keep nested calls from GC'ing the arglist */	3509	/* Keep nested calls from GC'ing the arglist */
3520	push_recent_alloc (SCHEME_A_ args, NIL);	3510	push_recent_alloc (SCHEME_A_ args, NIL);
3521	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3511	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3522		3512
3523	s_return (x);	3513	s_return (x);
3524	}	3514	}
3525	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 */
3526	{	3516	{
…		…
3563		3553
3564	case OP_DOMACRO: /* do macro */	3554	case OP_DOMACRO: /* do macro */
3565	SCHEME_V->code = SCHEME_V->value;	3555	SCHEME_V->code = SCHEME_V->value;
3566	s_goto (OP_EVAL);	3556	s_goto (OP_EVAL);
3567		3557
3568	#if 1
3569
3570	case OP_LAMBDA: /* lambda */	3558	case OP_LAMBDA: /* lambda */
3571	/* 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
3572	set SCHEME_V->value fall thru */	3560	set SCHEME_V->value fall thru */
3573	{	3561	{
3574	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);
…		…
3580	SCHEME_V->code = slot_value_in_env (f);	3568	SCHEME_V->code = slot_value_in_env (f);
3581	s_goto (OP_APPLY);	3569	s_goto (OP_APPLY);
3582	}	3570	}
3583		3571
3584	SCHEME_V->value = SCHEME_V->code;	3572	SCHEME_V->value = SCHEME_V->code;
3585	/* Fallthru */
3586	}	3573	}
		3574	/* Fallthru */
3587		3575
3588	case OP_LAMBDA1:	3576	case OP_LAMBDA1:
3589	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));
3590
3591	#else
3592
3593	case OP_LAMBDA: /* lambda */
3594	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3595
3596	#endif
3597		3578
3598	case OP_MKCLOSURE: /* make-closure */	3579	case OP_MKCLOSURE: /* make-closure */
3599	x = car (args);	3580	x = car (args);
3600		3581
3601	if (car (x) == SCHEME_V->LAMBDA)	3582	if (car (x) == SCHEME_V->LAMBDA)
…		…
4022		4003
4023	switch (op)	4004	switch (op)
4024	{	4005	{
4025	#if USE_MATH	4006	#if USE_MATH
4026	case OP_INEX2EX: /* inexact->exact */	4007	case OP_INEX2EX: /* inexact->exact */
4027	{
4028	if (is_integer (x))	4008	if (!is_integer (x))
4029	s_return (x);	4009	{
4030
4031	RVALUE r = rvalue_unchecked (x);	4010	RVALUE r = rvalue_unchecked (x);
4032		4011
4033	if (r == (RVALUE)(IVALUE)r)	4012	if (r == (RVALUE)(IVALUE)r)
4034	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4013	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4035	else	4014	else
4036	Error_1 ("inexact->exact: not integral:", x);	4015	Error_1 ("inexact->exact: not integral:", x);
4037	}	4016	}
4038		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))));
4039	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))));
4040	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))))));
4041	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))));
4042	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))));
4043	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))));
4044	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))));
4045	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))));
4046		4034
4047	case OP_ATAN:	4035	case OP_ATAN:
		4036	s_return (mk_real (SCHEME_A_
4048	if (cdr (args) == NIL)	4037	cdr (args) == NIL
4049	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4038	? atan (rvalue (x))
4050	else	4039	: atan2 (rvalue (x), rvalue (cadr (args)))));
4051	{
4052	pointer y = cadr (args);
4053	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4054	}
4055
4056	case OP_SQRT:
4057	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4058		4040
4059	case OP_EXPT:	4041	case OP_EXPT:
4060	{	4042	{
4061	RVALUE result;	4043	RVALUE result;
4062	int real_result = 1;	4044	int real_result = 1;
…		…
4085	if (real_result)	4067	if (real_result)
4086	s_return (mk_real (SCHEME_A_ result));	4068	s_return (mk_real (SCHEME_A_ result));
4087	else	4069	else
4088	s_return (mk_integer (SCHEME_A_ result));	4070	s_return (mk_integer (SCHEME_A_ result));
4089	}	4071	}
4090
4091	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4092	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4093
4094	case OP_TRUNCATE:
4095	{
4096	RVALUE n = rvalue (x);
4097	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4098	}
4099
4100	case OP_ROUND:
4101	if (is_integer (x))
4102	s_return (x);
4103
4104	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4105	#endif	4072	#endif
4106		4073
4107	case OP_ADD: /* + */	4074	case OP_ADD: /* + */
4108	v = num_zero;	4075	v = num_zero;
4109		4076
…		…
4197	else	4164	else
4198	Error_0 ("modulo: division by zero");	4165	Error_0 ("modulo: division by zero");
4199		4166
4200	s_return (mk_number (SCHEME_A_ v));	4167	s_return (mk_number (SCHEME_A_ v));
4201		4168
4202	case OP_CAR: /* car */	4169	/* the compiler will optimize this mess... */
4203	s_return (caar (args));	4170	case OP_CAR: op_car: s_return (car (x));
4204		4171	case OP_CDR: op_cdr: s_return (cdr (x));
4205	case OP_CDR: /* cdr */	4172	case OP_CAAR: op_caar: x = car (x); goto op_car;
4206	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;
4207		4200
4208	case OP_CONS: /* cons */	4201	case OP_CONS: /* cons */
4209	set_cdr (args, cadr (args));	4202	set_cdr (args, cadr (args));
4210	s_return (args);	4203	s_return (args);
4211		4204
…		…
4385	memcpy (pos, strvalue (car (x)), strlength (car (x)));	4378	memcpy (pos, strvalue (car (x)), strlength (car (x)));
4386		4379
4387	s_return (newstr);	4380	s_return (newstr);
4388	}	4381	}
4389		4382
4390	case OP_SUBSTR: /* substring */	4383	case OP_STRING_COPY: /* substring/string-copy */
4391	{	4384	{
4392	char *str = strvalue (x);	4385	char *str = strvalue (x);
4393	int index0 = ivalue_unchecked (cadr (args));	4386	int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4394	int index1;	4387	int index1;
4395	int len;	4388	int len;
4396		4389
4397	if (index0 > strlength (x))	4390	if (index0 > strlength (x))
4398	Error_1 ("substring: start out of bounds:", cadr (args));	4391	Error_1 ("string->copy: start out of bounds:", cadr (args));
4399		4392
4400	if (cddr (args) != NIL)	4393	if (cddr (args) != NIL)
4401	{	4394	{
4402	index1 = ivalue_unchecked (caddr (args));	4395	index1 = ivalue_unchecked (caddr (args));
4403		4396
4404	if (index1 > strlength (x) \|\| index1 < index0)	4397	if (index1 > strlength (x) \|\| index1 < index0)
4405	Error_1 ("substring: end out of bounds:", caddr (args));	4398	Error_1 ("string->copy: end out of bounds:", caddr (args));
4406	}	4399	}
4407	else	4400	else
4408	index1 = strlength (x);	4401	index1 = strlength (x);
4409		4402
4410	len = index1 - index0;	4403	len = index1 - index0;
4411	x = mk_empty_string (SCHEME_A_ len, ' ');	4404	x = mk_counted_string (SCHEME_A_ str + index0, len);
4412	memcpy (strvalue (x), str + index0, len);
4413	strvalue (x)[len] = 0;
4414		4405
4415	s_return (x);	4406	s_return (x);
4416	}	4407	}
4417		4408
4418	case OP_VECTOR: /* vector */	4409	case OP_VECTOR: /* vector */
…		…
4603	}	4594	}
4604	else	4595	else
4605	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4606		4597
4607	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4608	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4609	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4610		4601
4611	#if USE_PORTS	4602	#if USE_PORTS
4612		4603
4613	case OP_WRITE: /* write */	4604	case OP_WRITE: /* write */
…		…
4758	SCHEME_V->gc_verbose = (a != S_F);	4749	SCHEME_V->gc_verbose = (a != S_F);
4759	s_retbool (was);	4750	s_retbool (was);
4760	}	4751	}
4761		4752
4762	case OP_NEWSEGMENT: /* new-segment */	4753	case OP_NEWSEGMENT: /* new-segment */
		4754	#if 0
4763	if (!is_pair (args) \|\| !is_number (a))	4755	if (!is_pair (args) \|\| !is_number (a))
4764	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4765		4757	#endif
4766	alloc_cellseg (SCHEME_A_ ivalue (a));	4758	s_retbool (alloc_cellseg (SCHEME_A));
4767
4768	s_return (S_T);
4769		4759
4770	case OP_OBLIST: /* oblist */	4760	case OP_OBLIST: /* oblist */
4771	s_return (oblist_all_symbols (SCHEME_A));	4761	s_return (oblist_all_symbols (SCHEME_A));
4772		4762
4773	#if USE_PORTS	4763	#if USE_PORTS
…		…
4843	s_return (p == NIL ? S_F : p);	4833	s_return (p == NIL ? S_F : p);
4844	}	4834	}
4845		4835
4846	case OP_GET_OUTSTRING: /* get-output-string */	4836	case OP_GET_OUTSTRING: /* get-output-string */
4847	{	4837	{
4848	port *p;	4838	port *p = port (a);
4849		4839
4850	if ((p = a->object.port)->kind & port_string)	4840	if (p->kind & port_string)
4851	{	4841	{
4852	off_t size;	4842	off_t size;
4853	char *str;	4843	char *str;
4854		4844
4855	size = p->rep.string.curr - p->rep.string.start + 1;	4845	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4960	int res;	4950	int res;
4961		4951
4962	if (is_pair (args))	4952	if (is_pair (args))
4963	p = car (args);	4953	p = car (args);
4964		4954
4965	res = p->object.port->kind & port_string;	4955	res = port (p)->kind & port_string;
4966		4956
4967	s_retbool (res);	4957	s_retbool (res);
4968	}	4958	}
4969		4959
4970	case OP_SET_INPORT: /* set-input-port */	4960	case OP_SET_INPORT: /* set-input-port */
…		…
5510	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))
5511	return;	5501	return;
5512		5502
5513	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5503	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5514	{	5504	{
5515	xwrstr ("No memory!\n");	5505	putstr (SCHEME_A_ "No memory!\n");
5516	return;	5506	return;
5517	}	5507	}
5518	}	5508	}
5519	}	5509	}
5520		5510
…		…
5633	ecb_cold int	5623	ecb_cold int
5634	scheme_init (SCHEME_P)	5624	scheme_init (SCHEME_P)
5635	{	5625	{
5636	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5626	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5637	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));
5638		5634
5639	num_set_fixnum (num_zero, 1);	5635	num_set_fixnum (num_zero, 1);
5640	num_set_ivalue (num_zero, 0);	5636	num_set_ivalue (num_zero, 0);
5641	num_set_fixnum (num_one, 1);	5637	num_set_fixnum (num_one, 1);
5642	num_set_ivalue (num_one, 1);	5638	num_set_ivalue (num_one, 1);
…		…
5654	SCHEME_V->save_inport = NIL;	5650	SCHEME_V->save_inport = NIL;
5655	SCHEME_V->loadport = NIL;	5651	SCHEME_V->loadport = NIL;
5656	SCHEME_V->nesting = 0;	5652	SCHEME_V->nesting = 0;
5657	SCHEME_V->interactive_repl = 0;	5653	SCHEME_V->interactive_repl = 0;
5658		5654
5659	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5655	if (!alloc_cellseg (SCHEME_A))
5660	{	5656	{
5661	#if USE_ERROR_CHECKING	5657	#if USE_ERROR_CHECKING
5662	SCHEME_V->no_memory = 1;	5658	SCHEME_V->no_memory = 1;
5663	return 0;	5659	return 0;
5664	#endif	5660	#endif
…		…
5998	int isfile = 1;	5994	int isfile = 1;
5999	system ("ps v $PPID");//D	5995	system ("ps v $PPID");//D
6000		5996
6001	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5997	if (argc == 2 && strcmp (argv[1], "-?") == 0)
6002	{	5998	{
6003	xwrstr ("Usage: tinyscheme -?\n");	5999	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6004	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6000	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6005	xwrstr ("followed by\n");	6001	putstr (SCHEME_A_ "followed by\n");
6006	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6002	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6007	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6003	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6008	xwrstr ("assuming that the executable is named tinyscheme.\n");	6004	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6009	xwrstr ("Use - as filename for stdin.\n");	6005	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6010	return 1;	6006	return 1;
6011	}	6007	}
6012		6008
6013	if (!scheme_init (SCHEME_A))	6009	if (!scheme_init (SCHEME_A))
6014	{	6010	{
6015	xwrstr ("Could not initialize!\n");	6011	putstr (SCHEME_A_ "Could not initialize!\n");
6016	return 2;	6012	return 2;
6017	}	6013	}
6018		6014
6019	# if USE_PORTS	6015	# if USE_PORTS
6020	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6016	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
6065	fin = open (file_name, O_RDONLY);	6061	fin = open (file_name, O_RDONLY);
6066	#endif	6062	#endif
6067		6063
6068	if (isfile && fin < 0)	6064	if (isfile && fin < 0)
6069	{	6065	{
6070	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");
6071	}	6067	}
6072	else	6068	else
6073	{	6069	{
6074	if (isfile)	6070	if (isfile)
6075	scheme_load_named_file (SCHEME_A_ fin, file_name);	6071	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6079	#if USE_PORTS	6075	#if USE_PORTS
6080	if (!isfile \|\| fin != STDIN_FILENO)	6076	if (!isfile \|\| fin != STDIN_FILENO)
6081	{	6077	{
6082	if (SCHEME_V->retcode != 0)	6078	if (SCHEME_V->retcode != 0)
6083	{	6079	{
6084	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");
6085	}	6081	}
6086		6082
6087	if (isfile)	6083	if (isfile)
6088	close (fin);	6084	close (fin);
6089	}	6085	}

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.43 by root, Mon Nov 30 06:40:57 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.43 by root, Mon Nov 30 06:40:57 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57:49 2015 UTC