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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC vs.
Revision 1.51 by root, Tue Dec 1 01:54:27 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
21	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	23	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22	#include "malloc.c"	24	#include "malloc.c"
23		25
24	#define SCHEME_SOURCE	26	#define SCHEME_SOURCE
25	#include "scheme-private.h"	27	#include "scheme-private.h"
…		…
74	TOK_SHARP_CONST,	76	TOK_SHARP_CONST,
75	TOK_VEC	77	TOK_VEC
76	};	78	};
77		79
78	#define BACKQUOTE '`'	80	#define BACKQUOTE '`'
79	#define DELIMITERS "()\";\f\t\v\n\r "	81	#define WHITESPACE " \t\r\n\v\f"
		82	#define DELIMITERS "()\";" WHITESPACE
80		83
81	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	84	#define NIL POINTER (&SCHEME_V->xNIL)
82	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	85	#define S_T POINTER (&SCHEME_V->xT)
83	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	86	#define S_F POINTER (&SCHEME_V->xF)
84	#define S_SINK (&SCHEME_V->xsink)	87	#define S_SINK POINTER (&SCHEME_V->xsink)
85	#define S_EOF (&SCHEME_V->xEOF_OBJ)	88	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86		89
87	#if !USE_MULTIPLICITY	90	#if !USE_MULTIPLICITY
88	static scheme sc;	91	static scheme sc;
89	#endif	92	#endif
90		93
…		…
189	# define prompt "ts> "	192	# define prompt "ts> "
190	#endif	193	#endif
191		194
192	#ifndef InitFile	195	#ifndef InitFile
193	# define InitFile "init.scm"	196	# define InitFile "init.scm"
194	#endif
195
196	#ifndef FIRST_CELLSEGS
197	# define FIRST_CELLSEGS 3
198	#endif	197	#endif
199		198
200	enum scheme_types	199	enum scheme_types
201	{	200	{
202	T_INTEGER,	201	T_INTEGER,
…		…
263	static int is_zero_rvalue (RVALUE x);	262	static int is_zero_rvalue (RVALUE x);
264		263
265	static num num_zero;	264	static num num_zero;
266	static num num_one;	265	static num num_one;
267		266
		267	/* convert "pointer" to cell* / cell* to pointer */
		268	#define CELL(p) ((struct cell *)(p) + 0)
		269	#define POINTER(c) ((void *)((c) - 0))
		270
268	/* macros for cell operations */	271	/* macros for cell operations */
269	#define typeflag(p) ((p)->flag + 0)	272	#define typeflag(p) (CELL(p)->flag + 0)
270	#define set_typeflag(p,v) ((p)->flag = (v))	273	#define set_typeflag(p,v) (CELL(p)->flag = (v))
271	#define type(p) (typeflag (p) & T_MASKTYPE)	274	#define type(p) (typeflag (p) & T_MASKTYPE)
272		275
273	INTERFACE int	276	INTERFACE int
274	is_string (pointer p)	277	is_string (pointer p)
275	{	278	{
276	return type (p) == T_STRING;	279	return type (p) == T_STRING;
277	}	280	}
278		281
279	#define strvalue(p) ((p)->object.string.svalue)	282	#define strvalue(p) (CELL(p)->object.string.svalue)
280	#define strlength(p) ((p)->object.string.length)	283	#define strlength(p) (CELL(p)->object.string.length)
281		284
282	INTERFACE int	285	INTERFACE int
283	is_vector (pointer p)	286	is_vector (pointer p)
284	{	287	{
285	return type (p) == T_VECTOR;	288	return type (p) == T_VECTOR;
286	}	289	}
287		290
288	#define vecvalue(p) ((p)->object.vector.vvalue)	291	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289	#define veclength(p) ((p)->object.vector.length)	292	#define veclength(p) (CELL(p)->object.vector.length)
290	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	293	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	294	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	295	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293		296
294	INTERFACE int	297	INTERFACE int
…		…
320	string_value (pointer p)	323	string_value (pointer p)
321	{	324	{
322	return strvalue (p);	325	return strvalue (p);
323	}	326	}
324		327
325	#define ivalue_unchecked(p) (p)->object.ivalue	328	#define ivalue_unchecked(p) CELL(p)->object.ivalue
326	#define set_ivalue(p,v) (p)->object.ivalue = (v)	329	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327		330
328	#if USE_REAL	331	#if USE_REAL
329	#define rvalue_unchecked(p) (p)->object.rvalue	332	#define rvalue_unchecked(p) CELL(p)->object.rvalue
330	#define set_rvalue(p,v) (p)->object.rvalue = (v)	333	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331	#else	334	#else
332	#define rvalue_unchecked(p) (p)->object.ivalue	335	#define rvalue_unchecked(p) CELL(p)->object.ivalue
333	#define set_rvalue(p,v) (p)->object.ivalue = (v)	336	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334	#endif	337	#endif
335		338
336	INTERFACE long	339	INTERFACE long
337	charvalue (pointer p)	340	charvalue (pointer p)
338	{	341	{
339	return ivalue_unchecked (p);	342	return ivalue_unchecked (p);
340	}	343	}
341		344
		345	#define port(p) CELL(p)->object.port
		346	#define set_port(p,v) port(p) = (v)
342	INTERFACE int	347	INTERFACE int
343	is_port (pointer p)	348	is_port (pointer p)
344	{	349	{
345	return type (p) == T_PORT;	350	return type (p) == T_PORT;
346	}	351	}
347		352
348	INTERFACE int	353	INTERFACE int
349	is_inport (pointer p)	354	is_inport (pointer p)
350	{	355	{
351	return is_port (p) && p->object.port->kind & port_input;	356	return is_port (p) && port (p)->kind & port_input;
352	}	357	}
353		358
354	INTERFACE int	359	INTERFACE int
355	is_outport (pointer p)	360	is_outport (pointer p)
356	{	361	{
357	return is_port (p) && p->object.port->kind & port_output;	362	return is_port (p) && port (p)->kind & port_output;
358	}	363	}
359		364
360	INTERFACE int	365	INTERFACE int
361	is_pair (pointer p)	366	is_pair (pointer p)
362	{	367	{
363	return type (p) == T_PAIR;	368	return type (p) == T_PAIR;
364	}	369	}
365		370
366	#define car(p) ((p)->object.cons.car + 0)	371	#define car(p) (POINTER (CELL(p)->object.cons.car))
367	#define cdr(p) ((p)->object.cons.cdr + 0)	372	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368		373
369	static pointer caar (pointer p) { return car (car (p)); }	374	static pointer caar (pointer p) { return car (car (p)); }
370	static pointer cadr (pointer p) { return car (cdr (p)); }	375	static pointer cadr (pointer p) { return car (cdr (p)); }
371	static pointer cdar (pointer p) { return cdr (car (p)); }	376	static pointer cdar (pointer p) { return cdr (car (p)); }
372	static pointer cddr (pointer p) { return cdr (cdr (p)); }	377	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
376	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	381	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377		382
378	INTERFACE void	383	INTERFACE void
379	set_car (pointer p, pointer q)	384	set_car (pointer p, pointer q)
380	{	385	{
381	p->object.cons.car = q;	386	CELL(p)->object.cons.car = CELL (q);
382	}	387	}
383		388
384	INTERFACE void	389	INTERFACE void
385	set_cdr (pointer p, pointer q)	390	set_cdr (pointer p, pointer q)
386	{	391	{
387	p->object.cons.cdr = q;	392	CELL(p)->object.cons.cdr = CELL (q);
388	}	393	}
389		394
390	INTERFACE pointer	395	INTERFACE pointer
391	pair_car (pointer p)	396	pair_car (pointer p)
392	{	397	{
…		…
406	}	411	}
407		412
408	INTERFACE char *	413	INTERFACE char *
409	symname (pointer p)	414	symname (pointer p)
410	{	415	{
411	return strvalue (car (p));	416	return strvalue (p);
412	}	417	}
413		418
414	#if USE_PLIST	419	#if USE_PLIST
		420	#error plists are broken because symbols are no longer pairs
		421	#define symprop(p) cdr(p)
415	SCHEME_EXPORT int	422	SCHEME_EXPORT int
416	hasprop (pointer p)	423	hasprop (pointer p)
417	{	424	{
418	return typeflag (p) & T_SYMBOL;	425	return typeflag (p) & T_SYMBOL;
419	}	426	}
420
421	# define symprop(p) cdr(p)
422	#endif	427	#endif
423		428
424	INTERFACE int	429	INTERFACE int
425	is_syntax (pointer p)	430	is_syntax (pointer p)
426	{	431	{
…		…
440	}	445	}
441		446
442	INTERFACE char *	447	INTERFACE char *
443	syntaxname (pointer p)	448	syntaxname (pointer p)
444	{	449	{
445	return strvalue (car (p));	450	return strvalue (p);
446	}	451	}
447		452
448	#define procnum(p) ivalue_unchecked (p)	453	#define procnum(p) ivalue_unchecked (p)
449	static const char *procname (pointer x);	454	static const char *procname (pointer x);
450		455
…		…
667		672
668	static int file_push (SCHEME_P_ const char *fname);	673	static int file_push (SCHEME_P_ const char *fname);
669	static void file_pop (SCHEME_P);	674	static void file_pop (SCHEME_P);
670	static int file_interactive (SCHEME_P);	675	static int file_interactive (SCHEME_P);
671	ecb_inline int is_one_of (const char *s, int c);	676	ecb_inline int is_one_of (const char *s, int c);
672	static int alloc_cellseg (SCHEME_P_ int n);	677	static int alloc_cellseg (SCHEME_P);
673	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	678	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674	static void finalize_cell (SCHEME_P_ pointer a);	679	static void finalize_cell (SCHEME_P_ pointer a);
675	static int count_consecutive_cells (pointer x, int needed);	680	static int count_consecutive_cells (pointer x, int needed);
676	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	681	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677	static pointer mk_number (SCHEME_P_ const num n);	682	static pointer mk_number (SCHEME_P_ const num n);
…		…
911	#endif	916	#endif
912	}	917	}
913		918
914	/* allocate new cell segment */	919	/* allocate new cell segment */
915	static int	920	static int
916	alloc_cellseg (SCHEME_P_ int n)	921	alloc_cellseg (SCHEME_P)
917	{	922	{
918	pointer newp;	923	struct cell *newp;
919	pointer last;	924	struct cell *last;
920	pointer p;	925	struct cell *p;
921	char *cp;	926	char *cp;
922	long i;	927	long i;
923	int k;	928	int k;
924		929
925	static int segsize = CELL_SEGSIZE >> 1;	930	static int segsize = CELL_SEGSIZE >> 1;
926	segsize <<= 1;	931	segsize <<= 1;
927		932
928	for (k = 0; k < n; k++)
929	{
930	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931	return k;
932
933	cp = malloc (segsize * sizeof (struct cell));	933	cp = malloc (segsize * sizeof (struct cell));
934		934
935	if (!cp && USE_ERROR_CHECKING)	935	if (!cp && USE_ERROR_CHECKING)
936	return k;	936	return k;
937		937
938	i = ++SCHEME_V->last_cell_seg;	938	i = ++SCHEME_V->last_cell_seg;
939	SCHEME_V->alloc_seg[i] = cp;	939	SCHEME_V->alloc_seg[i] = cp;
940		940
941	newp = (pointer)cp;	941	newp = (struct cell *)cp;
942	SCHEME_V->cell_seg[i] = newp;	942	SCHEME_V->cell_seg[i] = newp;
943	SCHEME_V->cell_segsize[i] = segsize;	943	SCHEME_V->cell_segsize[i] = segsize;
944	SCHEME_V->fcells += segsize;	944	SCHEME_V->fcells += segsize;
945	last = newp + segsize - 1;	945	last = newp + segsize - 1;
946		946
947	for (p = newp; p <= last; p++)	947	for (p = newp; p <= last; p++)
948	{	948	{
		949	pointer cp = POINTER (p);
949	set_typeflag (p, T_PAIR);	950	set_typeflag (cp, T_PAIR);
950	set_car (p, NIL);	951	set_car (cp, NIL);
951	set_cdr (p, p + 1);	952	set_cdr (cp, POINTER (p + 1));
952	}	953	}
953		954
954	set_cdr (last, SCHEME_V->free_cell);	955	set_cdr (POINTER (last), SCHEME_V->free_cell);
955	SCHEME_V->free_cell = newp;	956	SCHEME_V->free_cell = POINTER (newp);
956	}
957		957
958	return n;	958	return 1;
959	}	959	}
960		960
961	/* get new cell. parameter a, b is marked by gc. */	961	/* get new cell. parameter a, b is marked by gc. */
962	ecb_inline pointer	962	ecb_inline pointer
963	get_cell_x (SCHEME_P_ pointer a, pointer b)	963	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
967	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	967	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968	return S_SINK;	968	return S_SINK;
969		969
970	if (SCHEME_V->free_cell == NIL)	970	if (SCHEME_V->free_cell == NIL)
971	{	971	{
972	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	972	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
973		973
974	gc (SCHEME_A_ a, b);	974	gc (SCHEME_A_ a, b);
975		975
976	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)	976	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)
977	{	977	{
978	/* if only a few recovered, get more to avoid fruitless gc's */	978	/* if only a few recovered, get more to avoid fruitless gc's */
979	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	979	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980	{	980	{
981	#if USE_ERROR_CHECKING	981	#if USE_ERROR_CHECKING
982	SCHEME_V->no_memory = 1;	982	SCHEME_V->no_memory = 1;
983	return S_SINK;	983	return S_SINK;
984	#endif	984	#endif
…		…
996	}	996	}
997	}	997	}
998		998
999	/* To retain recent allocs before interpreter knows about them -	999	/* To retain recent allocs before interpreter knows about them -
1000	Tehom */	1000	Tehom */
1001
1002	static void	1001	static void
1003	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	1002	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004	{	1003	{
1005	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	1004	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006		1005
…		…
1028	}	1027	}
1029		1028
1030	static pointer	1029	static pointer
1031	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	1030	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032	{	1031	{
1033	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1032	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034	pointer e = malloc (len sizeof (pointer));	1033	pointer e = malloc (len sizeof (pointer));
1035		1034
1036	if (!e && USE_ERROR_CHECKING)	1035	if (!e && USE_ERROR_CHECKING)
1037	return S_SINK;	1036	return S_SINK;
1038		1037
1039	/* Record it as a vector so that gc understands it. */	1038	/* Record it as a vector so that gc understands it. */
1040	set_typeflag (v, T_VECTOR \| T_ATOM);	1039	set_typeflag (v, T_VECTOR \| T_ATOM);
1041		1040
1042	v->object.vector.vvalue = e;	1041	CELL(v)->object.vector.vvalue = e;
1043	v->object.vector.length = len;	1042	CELL(v)->object.vector.length = len;
1044	fill_vector (v, 0, init);	1043	fill_vector (v, 0, init);
1045	push_recent_alloc (SCHEME_A_ v, NIL);	1044	push_recent_alloc (SCHEME_A_ v, NIL);
1046		1045
1047	return v;	1046	return v;
1048	}	1047	}
…		…
1092	set_cdr (x, b);	1091	set_cdr (x, b);
1093		1092
1094	return x;	1093	return x;
1095	}	1094	}
1096		1095
1097	/* ========== oblist implementation ========== */
1098
1099	static pointer	1096	static pointer
1100	generate_symbol (SCHEME_P_ const char *name)	1097	generate_symbol (SCHEME_P_ const char *name)
1101	{	1098	{
1102	pointer x = mk_string (SCHEME_A_ name);	1099	pointer x = mk_string (SCHEME_A_ name);
1103	setimmutable (x);	1100	setimmutable (x);
1104	x = immutable_cons (x, NIL);
1105	set_typeflag (x, T_SYMBOL);	1101	set_typeflag (x, T_SYMBOL \| T_ATOM);
1106	return x;	1102	return x;
1107	}	1103	}
		1104
		1105	/* ========== oblist implementation ========== */
1108		1106
1109	#ifndef USE_OBJECT_LIST	1107	#ifndef USE_OBJECT_LIST
1110		1108
1111	static int	1109	static int
1112	hash_fn (const char *key, int table_size)	1110	hash_fn (const char *key, int table_size)
…		…
1199		1197
1200	/* returns the new symbol */	1198	/* returns the new symbol */
1201	static pointer	1199	static pointer
1202	oblist_add_by_name (SCHEME_P_ const char *name)	1200	oblist_add_by_name (SCHEME_P_ const char *name)
1203	{	1201	{
1204	pointer x = mk_string (SCHEME_A_ name);	1202	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);	1203	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208	return x;	1204	return x;
1209	}	1205	}
1210		1206
1211	static pointer	1207	static pointer
…		…
1221	mk_port (SCHEME_P_ port *p)	1217	mk_port (SCHEME_P_ port *p)
1222	{	1218	{
1223	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1219	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224		1220
1225	set_typeflag (x, T_PORT \| T_ATOM);	1221	set_typeflag (x, T_PORT \| T_ATOM);
1226	x->object.port = p;	1222	set_port (x, p);
1227		1223
1228	return x;	1224	return x;
1229	}	1225	}
1230	#endif	1226	#endif
1231		1227
1232	pointer	1228	pointer
1233	mk_foreign_func (SCHEME_P_ foreign_func f)	1229	mk_foreign_func (SCHEME_P_ foreign_func f)
1234	{	1230	{
1235	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1231	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236		1232
1237	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1233	set_typeflag (x, T_FOREIGN \| T_ATOM);
1238	x->object.ff = f;	1234	CELL(x)->object.ff = f;
1239		1235
1240	return x;	1236	return x;
1241	}	1237	}
1242		1238
1243	INTERFACE pointer	1239	INTERFACE pointer
1244	mk_character (SCHEME_P_ int c)	1240	mk_character (SCHEME_P_ int c)
1245	{	1241	{
1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1242	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247		1243
1248	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1244	set_typeflag (x, T_CHARACTER \| T_ATOM);
1249	set_ivalue (x, c & 0xff);	1245	set_ivalue (x, c & 0xff);
1250		1246
1251	return x;	1247	return x;
1252	}	1248	}
1253		1249
1254	/* get number atom (integer) */	1250	/* get number atom (integer) */
1255	INTERFACE pointer	1251	INTERFACE pointer
1256	mk_integer (SCHEME_P_ long n)	1252	mk_integer (SCHEME_P_ long n)
1257	{	1253	{
		1254	pointer p = 0;
		1255	pointer *pp = &p;
		1256
		1257	#if USE_INTCACHE
		1258	if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
		1259	pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
		1260	#endif
		1261
		1262	if (!*pp)
		1263	{
1258	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1264	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259		1265
1260	set_typeflag (x, (T_INTEGER \| T_ATOM));	1266	set_typeflag (x, T_INTEGER \| T_ATOM);
		1267	setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261	set_ivalue (x, n);	1268	set_ivalue (x, n);
1262		1269
		1270	*pp = x;
		1271	}
		1272
1263	return x;	1273	return *pp;
1264	}	1274	}
1265		1275
1266	INTERFACE pointer	1276	INTERFACE pointer
1267	mk_real (SCHEME_P_ RVALUE n)	1277	mk_real (SCHEME_P_ RVALUE n)
1268	{	1278	{
1269	#if USE_REAL	1279	#if USE_REAL
1270	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1280	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271		1281
1272	set_typeflag (x, (T_REAL \| T_ATOM));	1282	set_typeflag (x, T_REAL \| T_ATOM);
1273	set_rvalue (x, n);	1283	set_rvalue (x, n);
1274		1284
1275	return x;	1285	return x;
1276	#else	1286	#else
1277	return mk_integer (SCHEME_A_ n);	1287	return mk_integer (SCHEME_A_ n);
…		…
1354		1364
1355	for (i = start; i < veclength (vec); i++)	1365	for (i = start; i < veclength (vec); i++)
1356	vecvalue (vec)[i] = obj;	1366	vecvalue (vec)[i] = obj;
1357	}	1367	}
1358		1368
		1369	INTERFACE void
		1370	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1371	{
		1372	uint32_t oldsize = veclength (vec);
		1373	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1374	veclength (vec) = newsize;
		1375	fill_vector (vec, oldsize, fill);
		1376	}
		1377
1359	INTERFACE pointer	1378	INTERFACE pointer
1360	vector_get (pointer vec, uint32_t ielem)	1379	vector_get (pointer vec, uint32_t ielem)
1361	{	1380	{
1362	return vecvalue(vec)[ielem];	1381	return vecvalue(vec)[ielem];
1363	}	1382	}
…		…
1384	INTERFACE pointer	1403	INTERFACE pointer
1385	gensym (SCHEME_P)	1404	gensym (SCHEME_P)
1386	{	1405	{
1387	pointer x;	1406	pointer x;
1388	char name[40] = "gensym-";	1407	char name[40] = "gensym-";
1389	xnum (name + 7, SCHEME_V->gensym_cnt);	1408	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1390		1409
1391	return generate_symbol (SCHEME_A_ name);	1410	return generate_symbol (SCHEME_A_ name);
		1411	}
		1412
		1413	static int
		1414	is_gensym (SCHEME_P_ pointer x)
		1415	{
		1416	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1392	}	1417	}
1393		1418
1394	/* make symbol or number atom from string */	1419	/* make symbol or number atom from string */
1395	static pointer	1420	static pointer
1396	mk_atom (SCHEME_P_ char *q)	1421	mk_atom (SCHEME_P_ char *q)
…		…
1605		1630
1606	/* garbage collection. parameter a, b is marked. */	1631	/* garbage collection. parameter a, b is marked. */
1607	static void	1632	static void
1608	gc (SCHEME_P_ pointer a, pointer b)	1633	gc (SCHEME_P_ pointer a, pointer b)
1609	{	1634	{
1610	pointer p;
1611	int i;	1635	int i;
1612		1636
1613	if (SCHEME_V->gc_verbose)	1637	if (SCHEME_V->gc_verbose)
1614	putstr (SCHEME_A_ "gc...");	1638	putstr (SCHEME_A_ "gc...");
1615		1639
…		…
1631	/* Mark recent objects the interpreter doesn't know about yet. */	1655	/* Mark recent objects the interpreter doesn't know about yet. */
1632	mark (car (S_SINK));	1656	mark (car (S_SINK));
1633	/* Mark any older stuff above nested C calls */	1657	/* Mark any older stuff above nested C calls */
1634	mark (SCHEME_V->c_nest);	1658	mark (SCHEME_V->c_nest);
1635		1659
		1660	#if USE_INTCACHE
		1661	/* mark intcache */
		1662	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1663	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1664	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1665	#endif
		1666
1636	/* mark variables a, b */	1667	/* mark variables a, b */
1637	mark (a);	1668	mark (a);
1638	mark (b);	1669	mark (b);
1639		1670
1640	/* garbage collect */	1671	/* garbage collect */
1641	clrmark (NIL);	1672	clrmark (NIL);
1642	SCHEME_V->fcells = 0;	1673	SCHEME_V->fcells = 0;
1643	SCHEME_V->free_cell = NIL;	1674	SCHEME_V->free_cell = NIL;
1644		1675
1645	/* free-list is kept sorted by address so as to maintain consecutive	1676	if (SCHEME_V->gc_verbose)
1646	ranges, if possible, for use with vectors. Here we scan the cells	1677	xwrstr ("freeing...");
1647	(which are also kept sorted by address) downwards to build the	1678
1648	free-list in sorted order.	1679	uint32_t total = 0;
1649	*/	1680
		1681	/* Here we scan the cells to build the free-list. */
1650	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1682	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1651	{	1683	{
1652	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1684	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1685	struct cell *p;
		1686	total += SCHEME_V->cell_segsize [i];
1653		1687
1654	while (--p >= SCHEME_V->cell_seg[i])	1688	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1655	{	1689	{
		1690	pointer c = POINTER (p);
		1691
1656	if (is_mark (p))	1692	if (is_mark (c))
1657	clrmark (p);	1693	clrmark (c);
1658	else	1694	else
1659	{	1695	{
1660	/* reclaim cell */	1696	/* reclaim cell */
1661	if (typeflag (p) != T_PAIR)	1697	if (typeflag (c) != T_PAIR)
1662	{	1698	{
1663	finalize_cell (SCHEME_A_ p);	1699	finalize_cell (SCHEME_A_ c);
1664	set_typeflag (p, T_PAIR);	1700	set_typeflag (c, T_PAIR);
1665	set_car (p, NIL);	1701	set_car (c, NIL);
1666	}	1702	}
1667		1703
1668	++SCHEME_V->fcells;	1704	++SCHEME_V->fcells;
1669	set_cdr (p, SCHEME_V->free_cell);	1705	set_cdr (c, SCHEME_V->free_cell);
1670	SCHEME_V->free_cell = p;	1706	SCHEME_V->free_cell = c;
1671	}	1707	}
1672	}	1708	}
1673	}	1709	}
1674		1710
1675	if (SCHEME_V->gc_verbose)	1711	if (SCHEME_V->gc_verbose)
1676	{	1712	{
1677	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1713	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1678	}	1714	}
1679	}	1715	}
1680		1716
1681	static void	1717	static void
1682	finalize_cell (SCHEME_P_ pointer a)	1718	finalize_cell (SCHEME_P_ pointer a)
1683	{	1719	{
1684	/* TODO, fast bitmap check? */	1720	/* TODO, fast bitmap check? */
1685	if (is_string (a))	1721	if (is_string (a) \|\| is_symbol (a))
1686	free (strvalue (a));	1722	free (strvalue (a));
1687	else if (is_vector (a))	1723	else if (is_vector (a))
1688	free (vecvalue (a));	1724	free (vecvalue (a));
1689	#if USE_PORTS	1725	#if USE_PORTS
1690	else if (is_port (a))	1726	else if (is_port (a))
1691	{	1727	{
1692	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1728	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1693	port_close (SCHEME_A_ a, port_input \| port_output);	1729	port_close (SCHEME_A_ a, port_input \| port_output);
1694		1730
1695	free (a->object.port);	1731	free (port (a));
1696	}	1732	}
1697	#endif	1733	#endif
1698	}	1734	}
1699		1735
1700	/* ========== Routines for Reading ========== */	1736	/* ========== Routines for Reading ========== */
…		…
1716	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1752	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1717	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;	1753	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;
1718	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1754	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1719	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1755	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1720	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1756	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1721	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1757	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1722		1758
1723	#if SHOW_ERROR_LINE	1759	#if SHOW_ERROR_LINE
1724	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1760	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1725		1761
1726	if (fname)	1762	if (fname)
…		…
1743	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1779	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1744	#if USE_PORTS	1780	#if USE_PORTS
1745	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1781	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1746	#endif	1782	#endif
1747	SCHEME_V->file_i--;	1783	SCHEME_V->file_i--;
1748	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1784	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1749	}	1785	}
1750	}	1786	}
1751		1787
1752	static int	1788	static int
1753	file_interactive (SCHEME_P)	1789	file_interactive (SCHEME_P)
1754	{	1790	{
1755	#if USE_PORTS	1791	#if USE_PORTS
1756	return SCHEME_V->file_i == 0	1792	return SCHEME_V->file_i == 0
1757	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1793	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1758	&& (SCHEME_V->inport->object.port->kind & port_file);	1794	&& (port (SCHEME_V->inport)->kind & port_file);
1759	#else	1795	#else
1760	return 0;	1796	return 0;
1761	#endif	1797	#endif
1762	}	1798	}
1763		1799
…		…
1897	}	1933	}
1898		1934
1899	static void	1935	static void
1900	port_close (SCHEME_P_ pointer p, int flag)	1936	port_close (SCHEME_P_ pointer p, int flag)
1901	{	1937	{
1902	port *pt = p->object.port;	1938	port *pt = port (p);
1903		1939
1904	pt->kind &= ~flag;	1940	pt->kind &= ~flag;
1905		1941
1906	if ((pt->kind & (port_input \| port_output)) == 0)	1942	if ((pt->kind & (port_input \| port_output)) == 0)
1907	{	1943	{
…		…
1928	/* get new character from input file */	1964	/* get new character from input file */
1929	static int	1965	static int
1930	inchar (SCHEME_P)	1966	inchar (SCHEME_P)
1931	{	1967	{
1932	int c;	1968	int c;
1933	port *pt;	1969	port *pt = port (SCHEME_V->inport);
1934
1935	pt = SCHEME_V->inport->object.port;
1936		1970
1937	if (pt->kind & port_saw_EOF)	1971	if (pt->kind & port_saw_EOF)
1938	return EOF;	1972	return EOF;
1939		1973
1940	c = basic_inchar (pt);	1974	c = basic_inchar (pt);
…		…
2007	port *pt;	2041	port *pt;
2008		2042
2009	if (c == EOF)	2043	if (c == EOF)
2010	return;	2044	return;
2011		2045
2012	pt = SCHEME_V->inport->object.port;	2046	pt = port (SCHEME_V->inport);
2013	pt->unget = c;	2047	pt->unget = c;
2014	#else	2048	#else
2015	if (c == EOF)	2049	if (c == EOF)
2016	return;	2050	return;
2017		2051
…		…
2045		2079
2046	INTERFACE void	2080	INTERFACE void
2047	putstr (SCHEME_P_ const char *s)	2081	putstr (SCHEME_P_ const char *s)
2048	{	2082	{
2049	#if USE_PORTS	2083	#if USE_PORTS
2050	port *pt = SCHEME_V->outport->object.port;	2084	port *pt = port (SCHEME_V->outport);
2051		2085
2052	if (pt->kind & port_file)	2086	if (pt->kind & port_file)
2053	write (pt->rep.stdio.file, s, strlen (s));	2087	write (pt->rep.stdio.file, s, strlen (s));
2054	else	2088	else
2055	for (; *s; s++)	2089	for (; *s; s++)
…		…
2065		2099
2066	static void	2100	static void
2067	putchars (SCHEME_P_ const char *s, int len)	2101	putchars (SCHEME_P_ const char *s, int len)
2068	{	2102	{
2069	#if USE_PORTS	2103	#if USE_PORTS
2070	port *pt = SCHEME_V->outport->object.port;	2104	port *pt = port (SCHEME_V->outport);
2071		2105
2072	if (pt->kind & port_file)	2106	if (pt->kind & port_file)
2073	write (pt->rep.stdio.file, s, len);	2107	write (pt->rep.stdio.file, s, len);
2074	else	2108	else
2075	{	2109	{
…		…
2089		2123
2090	INTERFACE void	2124	INTERFACE void
2091	putcharacter (SCHEME_P_ int c)	2125	putcharacter (SCHEME_P_ int c)
2092	{	2126	{
2093	#if USE_PORTS	2127	#if USE_PORTS
2094	port *pt = SCHEME_V->outport->object.port;	2128	port *pt = port (SCHEME_V->outport);
2095		2129
2096	if (pt->kind & port_file)	2130	if (pt->kind & port_file)
2097	{	2131	{
2098	char cc = c;	2132	char cc = c;
2099	write (pt->rep.stdio.file, &cc, 1);	2133	write (pt->rep.stdio.file, &cc, 1);
…		…
2256		2290
2257	/* check c is in chars */	2291	/* check c is in chars */
2258	ecb_inline int	2292	ecb_inline int
2259	is_one_of (const char *s, int c)	2293	is_one_of (const char *s, int c)
2260	{	2294	{
2261	if (c == EOF)
2262	return 1;
2263
2264	return !!strchr (s, c);	2295	return c == EOF \|\| !!strchr (s, c);
2265	}	2296	}
2266		2297
2267	/* skip white characters */	2298	/* skip white characters */
2268	ecb_inline int	2299	ecb_inline int
2269	skipspace (SCHEME_P)	2300	skipspace (SCHEME_P)
…		…
2271	int c, curr_line = 0;	2302	int c, curr_line = 0;
2272		2303
2273	do	2304	do
2274	{	2305	{
2275	c = inchar (SCHEME_A);	2306	c = inchar (SCHEME_A);
		2307
2276	#if SHOW_ERROR_LINE	2308	#if SHOW_ERROR_LINE
2277	if (c == '\n')	2309	if (ecb_expect_false (c == '\n'))
2278	curr_line++;	2310	curr_line++;
2279	#endif	2311	#endif
		2312
		2313	if (ecb_expect_false (c == EOF))
		2314	return c;
2280	}	2315	}
2281	while (c == ' ' \|\| c == '\n' \|\| c == '\r' \|\| c == '\t');	2316	while (is_one_of (WHITESPACE, c));
2282		2317
2283	/* record it */	2318	/* record it */
2284	#if SHOW_ERROR_LINE	2319	#if SHOW_ERROR_LINE
2285	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2320	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2286	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2321	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2287	#endif	2322	#endif
2288		2323
2289	if (c != EOF)
2290	{
2291	backchar (SCHEME_A_ c);	2324	backchar (SCHEME_A_ c);
2292	return 1;	2325	return 1;
2293	}
2294	else
2295	return EOF;
2296	}	2326	}
2297		2327
2298	/* get token */	2328	/* get token */
2299	static int	2329	static int
2300	token (SCHEME_P)	2330	token (SCHEME_P)
…		…
2316	return TOK_RPAREN;	2346	return TOK_RPAREN;
2317		2347
2318	case '.':	2348	case '.':
2319	c = inchar (SCHEME_A);	2349	c = inchar (SCHEME_A);
2320		2350
2321	if (is_one_of (" \n\t", c))	2351	if (is_one_of (WHITESPACE, c))
2322	return TOK_DOT;	2352	return TOK_DOT;
2323	else	2353	else
2324	{	2354	{
2325	backchar (SCHEME_A_ c);	2355	backchar (SCHEME_A_ c);
2326	return TOK_DOTATOM;	2356	return TOK_DOTATOM;
…		…
2467	}	2497	}
2468		2498
2469	putcharacter (SCHEME_A_ '"');	2499	putcharacter (SCHEME_A_ '"');
2470	}	2500	}
2471		2501
2472
2473	/* print atoms */	2502	/* print atoms */
2474	static void	2503	static void
2475	printatom (SCHEME_P_ pointer l, int f)	2504	printatom (SCHEME_P_ pointer l, int f)
2476	{	2505	{
2477	char *p;	2506	char *p;
2478	int len;	2507	int len;
2479		2508
2480	atom2str (SCHEME_A_ l, f, &p, &len);	2509	atom2str (SCHEME_A_ l, f, &p, &len);
2481	putchars (SCHEME_A_ p, len);	2510	putchars (SCHEME_A_ p, len);
2482	}	2511	}
2483
2484		2512
2485	/* Uses internal buffer unless string pointer is already available */	2513	/* Uses internal buffer unless string pointer is already available */
2486	static void	2514	static void
2487	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)	2515	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)
2488	{	2516	{
…		…
2649	#endif	2677	#endif
2650	}	2678	}
2651	else if (is_continuation (l))	2679	else if (is_continuation (l))
2652	p = "#<CONTINUATION>";	2680	p = "#<CONTINUATION>";
2653	else	2681	else
		2682	{
		2683	#if USE_PRINTF
		2684	p = SCHEME_V->strbuff;
		2685	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2686	#else
2654	p = "#<ERROR>";	2687	p = "#<ERROR>";
		2688	#endif
		2689	}
2655		2690
2656	*pp = p;	2691	*pp = p;
2657	*plen = strlen (p);	2692	*plen = strlen (p);
2658	}	2693	}
2659		2694
…		…
2929	#endif /* USE_ALIST_ENV else */	2964	#endif /* USE_ALIST_ENV else */
2930		2965
2931	ecb_inline void	2966	ecb_inline void
2932	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2967	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2933	{	2968	{
		2969	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2934	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2970	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2935	}	2971	}
2936		2972
2937	ecb_inline void	2973	ecb_inline void
2938	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2974	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3039	{	3075	{
3040	int nframes = (uintptr_t)SCHEME_V->dump;	3076	int nframes = (uintptr_t)SCHEME_V->dump;
3041	struct dump_stack_frame *next_frame;	3077	struct dump_stack_frame *next_frame;
3042		3078
3043	/* enough room for the next frame? */	3079	/* enough room for the next frame? */
3044	if (nframes >= SCHEME_V->dump_size)	3080	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3045	{	3081	{
3046	SCHEME_V->dump_size += STACK_GROWTH;	3082	SCHEME_V->dump_size += STACK_GROWTH;
3047	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3083	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3048	}	3084	}
3049		3085
…		…
3230		3266
3231	#endif	3267	#endif
3232		3268
3233	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3269	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3234		3270
		3271	#if EXPERIMENT
		3272	static int
		3273	debug (SCHEME_P_ int indent, pointer x)
		3274	{
		3275	int c;
		3276
		3277	if (is_syntax (x))
		3278	{
		3279	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3280	return 8 + 8;
		3281	}
		3282
		3283	if (x == NIL)
		3284	{
		3285	printf ("%*sNIL\n", indent, "");
		3286	return 3;
		3287	}
		3288
		3289	switch (type (x))
		3290	{
		3291	case T_INTEGER:
		3292	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3293	return 32+8;
		3294
		3295	case T_SYMBOL:
		3296	printf ("%*sS<%s>\n", indent, "", symname (x));
		3297	return 24+8;
		3298
		3299	case T_CLOSURE:
		3300	printf ("%*sS<%s>\n", indent, "", "closure");
		3301	debug (SCHEME_A_ indent + 3, cdr(x));
		3302	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3303
		3304	case T_PAIR:
		3305	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3306	c = debug (SCHEME_A_ indent + 3, car (x));
		3307	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3308	return c + 1;
		3309
		3310	case T_PORT:
		3311	printf ("%*sS<%s>\n", indent, "", "port");
		3312	return 24+8;
		3313
		3314	case T_VECTOR:
		3315	printf ("%*sS<%s>\n", indent, "", "vector");
		3316	return 24+8;
		3317
		3318	case T_ENVIRONMENT:
		3319	printf ("%*sS<%s>\n", indent, "", "environment");
		3320	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3321
		3322	default:
		3323	printf ("unhandled type %d\n", type (x));
		3324	break;
		3325	}
		3326	}
		3327	#endif
		3328
3235	static int	3329	static int
3236	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3330	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3237	{	3331	{
3238	pointer args = SCHEME_V->args;	3332	pointer args = SCHEME_V->args;
3239	pointer x, y;	3333	pointer x, y;
3240		3334
3241	switch (op)	3335	switch (op)
3242	{	3336	{
		3337	#if EXPERIMENT //D
		3338	case OP_DEBUG:
		3339	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3340	printf ("\n");
		3341	s_return (S_T);
		3342	#endif
3243	case OP_LOAD: /* load */	3343	case OP_LOAD: /* load */
3244	if (file_interactive (SCHEME_A))	3344	if (file_interactive (SCHEME_A))
3245	{	3345	{
3246	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3346	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3247	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3347	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3248	}	3348	}
3249		3349
3250	if (!file_push (SCHEME_A_ strvalue (car (args))))	3350	if (!file_push (SCHEME_A_ strvalue (car (args))))
3251	Error_1 ("unable to open", car (args));	3351	Error_1 ("unable to open", car (args));
3252	else	3352	else
…		…
3256	}	3356	}
3257		3357
3258	case OP_T0LVL: /* top level */	3358	case OP_T0LVL: /* top level */
3259		3359
3260	/* If we reached the end of file, this loop is done. */	3360	/* If we reached the end of file, this loop is done. */
3261	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3361	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3262	{	3362	{
3263	if (SCHEME_V->file_i == 0)	3363	if (SCHEME_V->file_i == 0)
3264	{	3364	{
3265	SCHEME_V->args = NIL;	3365	SCHEME_V->args = NIL;
3266	s_goto (OP_QUIT);	3366	s_goto (OP_QUIT);
…		…
3344	#endif	3444	#endif
3345	if (is_symbol (SCHEME_V->code)) /* symbol */	3445	if (is_symbol (SCHEME_V->code)) /* symbol */
3346	{	3446	{
3347	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3447	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3348		3448
3349	if (x != NIL)	3449	if (x == NIL)
3350	s_return (slot_value_in_env (x));
3351	else
3352	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3450	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3451
		3452	s_return (slot_value_in_env (x));
3353	}	3453	}
3354	else if (is_pair (SCHEME_V->code))	3454	else if (is_pair (SCHEME_V->code))
3355	{	3455	{
3356	x = car (SCHEME_V->code);	3456	x = car (SCHEME_V->code);
3357		3457
…		…
3370	}	3470	}
3371	else	3471	else
3372	s_return (SCHEME_V->code);	3472	s_return (SCHEME_V->code);
3373		3473
3374	case OP_E0ARGS: /* eval arguments */	3474	case OP_E0ARGS: /* eval arguments */
3375	if (is_macro (SCHEME_V->value)) /* macro expansion */	3475	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3376	{	3476	{
3377	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3477	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3378	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3478	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3379	SCHEME_V->code = SCHEME_V->value;	3479	SCHEME_V->code = SCHEME_V->value;
3380	s_goto (OP_APPLY);	3480	s_goto (OP_APPLY);
…		…
3434	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3534	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3435	else if (is_foreign (SCHEME_V->code))	3535	else if (is_foreign (SCHEME_V->code))
3436	{	3536	{
3437	/* Keep nested calls from GC'ing the arglist */	3537	/* Keep nested calls from GC'ing the arglist */
3438	push_recent_alloc (SCHEME_A_ args, NIL);	3538	push_recent_alloc (SCHEME_A_ args, NIL);
3439	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3539	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3440		3540
3441	s_return (x);	3541	s_return (x);
3442	}	3542	}
3443	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */	3543	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */
3444	{	3544	{
…		…
3481		3581
3482	case OP_DOMACRO: /* do macro */	3582	case OP_DOMACRO: /* do macro */
3483	SCHEME_V->code = SCHEME_V->value;	3583	SCHEME_V->code = SCHEME_V->value;
3484	s_goto (OP_EVAL);	3584	s_goto (OP_EVAL);
3485		3585
3486	#if 1
3487
3488	case OP_LAMBDA: /* lambda */	3586	case OP_LAMBDA: /* lambda */
3489	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3587	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3490	set SCHEME_V->value fall thru */	3588	set SCHEME_V->value fall thru */
3491	{	3589	{
3492	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3590	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3498	SCHEME_V->code = slot_value_in_env (f);	3596	SCHEME_V->code = slot_value_in_env (f);
3499	s_goto (OP_APPLY);	3597	s_goto (OP_APPLY);
3500	}	3598	}
3501		3599
3502	SCHEME_V->value = SCHEME_V->code;	3600	SCHEME_V->value = SCHEME_V->code;
3503	/* Fallthru */
3504	}	3601	}
		3602	/* Fallthru */
3505		3603
3506	case OP_LAMBDA1:	3604	case OP_LAMBDA1:
3507	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3605	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3508
3509	#else
3510
3511	case OP_LAMBDA: /* lambda */
3512	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3513
3514	#endif
3515		3606
3516	case OP_MKCLOSURE: /* make-closure */	3607	case OP_MKCLOSURE: /* make-closure */
3517	x = car (args);	3608	x = car (args);
3518		3609
3519	if (car (x) == SCHEME_V->LAMBDA)	3610	if (car (x) == SCHEME_V->LAMBDA)
…		…
4115	else	4206	else
4116	Error_0 ("modulo: division by zero");	4207	Error_0 ("modulo: division by zero");
4117		4208
4118	s_return (mk_number (SCHEME_A_ v));	4209	s_return (mk_number (SCHEME_A_ v));
4119		4210
4120	case OP_CAR: /* car */	4211	/* the compiler will optimize this mess... */
4121	s_return (caar (args));	4212	case OP_CAR: op_car: s_return (car (x));
4122		4213	case OP_CDR: op_cdr: s_return (cdr (x));
4123	case OP_CDR: /* cdr */	4214	case OP_CAAR: op_caar: x = car (x); goto op_car;
4124	s_return (cdar (args));	4215	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4216	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4217	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4218	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4219	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4220	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4221	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4222	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4223	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4224	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4225	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4226	case OP_CAAAAR: x = car (x); goto op_caaar;
		4227	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4228	case OP_CAADAR: x = car (x); goto op_caadr;
		4229	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4230	case OP_CADAAR: x = car (x); goto op_cadar;
		4231	case OP_CADADR: x = cdr (x); goto op_cadar;
		4232	case OP_CADDAR: x = car (x); goto op_caddr;
		4233	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4234	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4235	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4236	case OP_CDADAR: x = car (x); goto op_cdadr;
		4237	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4238	case OP_CDDAAR: x = car (x); goto op_cddar;
		4239	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4240	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4241	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4125		4242
4126	case OP_CONS: /* cons */	4243	case OP_CONS: /* cons */
4127	set_cdr (args, cadr (args));	4244	set_cdr (args, cadr (args));
4128	s_return (args);	4245	s_return (args);
4129		4246
…		…
4378	}	4495	}
4379		4496
4380	case OP_VECLEN: /* vector-length */	4497	case OP_VECLEN: /* vector-length */
4381	s_return (mk_integer (SCHEME_A_ veclength (x)));	4498	s_return (mk_integer (SCHEME_A_ veclength (x)));
4382		4499
		4500	case OP_VECRESIZE:
		4501	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4502	s_return (x);
		4503
4383	case OP_VECREF: /* vector-ref */	4504	case OP_VECREF: /* vector-ref */
4384	{	4505	{
4385	int index = ivalue_unchecked (cadr (args));	4506	int index = ivalue_unchecked (cadr (args));
4386		4507
4387	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4508	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
…		…
4447	pointer d = cdr (args);	4568	pointer d = cdr (args);
4448	int r;	4569	int r;
4449		4570
4450	switch (op)	4571	switch (op)
4451	{	4572	{
4452	case OP_NOT: /* not */ r = is_false (a) ; break;	4573	case OP_NOT: /* not */ r = is_false (a) ; break;
4453	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T; break;	4574	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T ; break;
4454	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4575	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455	case OP_NULLP: /* null? */ r = a == NIL ; break;	4576	case OP_NULLP: /* null? */ r = a == NIL ; break;
4456	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4577	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4578	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4457	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4579	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4580	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4581	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */	4582	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */
4461	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4583	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4462		4584
4463	#if USE_CHAR_CLASSIFIERS	4585	#if USE_CHAR_CLASSIFIERS
4464	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4586	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4465	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4587	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4466	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4588	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4516	}	4638	}
4517	else	4639	else
4518	s_return (SCHEME_V->code);	4640	s_return (SCHEME_V->code);
4519		4641
4520	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4642	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4521	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4643	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4522	s_return (SCHEME_V->value);	4644	s_return (SCHEME_V->value);
4523		4645
4524	#if USE_PORTS	4646	#if USE_PORTS
4525		4647
4526	case OP_WRITE: /* write */	4648	case OP_WRITE: /* write */
…		…
4671	SCHEME_V->gc_verbose = (a != S_F);	4793	SCHEME_V->gc_verbose = (a != S_F);
4672	s_retbool (was);	4794	s_retbool (was);
4673	}	4795	}
4674		4796
4675	case OP_NEWSEGMENT: /* new-segment */	4797	case OP_NEWSEGMENT: /* new-segment */
		4798	#if 0
4676	if (!is_pair (args) \|\| !is_number (a))	4799	if (!is_pair (args) \|\| !is_number (a))
4677	Error_0 ("new-segment: argument must be a number");	4800	Error_0 ("new-segment: argument must be a number");
4678		4801	#endif
4679	alloc_cellseg (SCHEME_A_ ivalue (a));	4802	s_retbool (alloc_cellseg (SCHEME_A));
4680
4681	s_return (S_T);
4682		4803
4683	case OP_OBLIST: /* oblist */	4804	case OP_OBLIST: /* oblist */
4684	s_return (oblist_all_symbols (SCHEME_A));	4805	s_return (oblist_all_symbols (SCHEME_A));
4685		4806
4686	#if USE_PORTS	4807	#if USE_PORTS
…		…
4756	s_return (p == NIL ? S_F : p);	4877	s_return (p == NIL ? S_F : p);
4757	}	4878	}
4758		4879
4759	case OP_GET_OUTSTRING: /* get-output-string */	4880	case OP_GET_OUTSTRING: /* get-output-string */
4760	{	4881	{
4761	port *p;	4882	port *p = port (a);
4762		4883
4763	if ((p = a->object.port)->kind & port_string)	4884	if (p->kind & port_string)
4764	{	4885	{
4765	off_t size;	4886	off_t size;
4766	char *str;	4887	char *str;
4767		4888
4768	size = p->rep.string.curr - p->rep.string.start + 1;	4889	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4873	int res;	4994	int res;
4874		4995
4875	if (is_pair (args))	4996	if (is_pair (args))
4876	p = car (args);	4997	p = car (args);
4877		4998
4878	res = p->object.port->kind & port_string;	4999	res = port (p)->kind & port_string;
4879		5000
4880	s_retbool (res);	5001	s_retbool (res);
4881	}	5002	}
4882		5003
4883	case OP_SET_INPORT: /* set-input-port */	5004	case OP_SET_INPORT: /* set-input-port */
…		…
4947	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));	5068	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948		5069
4949	case TOK_DOTATOM:	5070	case TOK_DOTATOM:
4950	SCHEME_V->strbuff[0] = '.';	5071	SCHEME_V->strbuff[0] = '.';
4951	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));	5072	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5073
		5074	case TOK_STRATOM:
		5075	x = readstrexp (SCHEME_A_ '\|');
		5076	//TODO: haven't checked whether the garbage collector could interfere
		5077	s_return (mk_atom (SCHEME_A_ strvalue (x)));
4952		5078
4953	case TOK_DQUOTE:	5079	case TOK_DQUOTE:
4954	x = readstrexp (SCHEME_A_ '"');	5080	x = readstrexp (SCHEME_A_ '"');
4955		5081
4956	if (x == S_F)	5082	if (x == S_F)
…		…
5203		5329
5204	case OP_CLOSUREP: /* closure? */	5330	case OP_CLOSUREP: /* closure? */
5205	/*	5331	/*
5206	* Note, macro object is also a closure.	5332	* Note, macro object is also a closure.
5207	* Therefore, (closure? <#MACRO>) ==> #t	5333	* Therefore, (closure? <#MACRO>) ==> #t
		5334	* (schmorp) well, obviously not, fix? TODO
5208	*/	5335	*/
5209	s_retbool (is_closure (a));	5336	s_retbool (is_closure (a));
5210		5337
5211	case OP_MACROP: /* macro? */	5338	case OP_MACROP: /* macro? */
5212	s_retbool (is_macro (a));	5339	s_retbool (is_macro (a));
…		…
5453		5580
5454	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5581	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5455	static int	5582	static int
5456	syntaxnum (pointer p)	5583	syntaxnum (pointer p)
5457	{	5584	{
5458	const char *s = strvalue (car (p));	5585	const char *s = strvalue (p);
5459		5586
5460	switch (strlength (car (p)))	5587	switch (strlength (p))
5461	{	5588	{
5462	case 2:	5589	case 2:
5463	if (s[0] == 'i')	5590	if (s[0] == 'i')
5464	return OP_IF0; /* if */	5591	return OP_IF0; /* if */
5465	else	5592	else
…		…
5540	ecb_cold int	5667	ecb_cold int
5541	scheme_init (SCHEME_P)	5668	scheme_init (SCHEME_P)
5542	{	5669	{
5543	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5670	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5544	pointer x;	5671	pointer x;
		5672
		5673	/* this memset is not strictly correct, as we assume (intcache)
		5674	* that memset 0 will also set pointers to 0, but memset does
		5675	* of course not guarantee that. screw such systems.
		5676	*/
		5677	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5545		5678
5546	num_set_fixnum (num_zero, 1);	5679	num_set_fixnum (num_zero, 1);
5547	num_set_ivalue (num_zero, 0);	5680	num_set_ivalue (num_zero, 0);
5548	num_set_fixnum (num_one, 1);	5681	num_set_fixnum (num_one, 1);
5549	num_set_ivalue (num_one, 1);	5682	num_set_ivalue (num_one, 1);
…		…
5561	SCHEME_V->save_inport = NIL;	5694	SCHEME_V->save_inport = NIL;
5562	SCHEME_V->loadport = NIL;	5695	SCHEME_V->loadport = NIL;
5563	SCHEME_V->nesting = 0;	5696	SCHEME_V->nesting = 0;
5564	SCHEME_V->interactive_repl = 0;	5697	SCHEME_V->interactive_repl = 0;
5565		5698
5566	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5699	if (!alloc_cellseg (SCHEME_A))
5567	{	5700	{
5568	#if USE_ERROR_CHECKING	5701	#if USE_ERROR_CHECKING
5569	SCHEME_V->no_memory = 1;	5702	SCHEME_V->no_memory = 1;
5570	return 0;	5703	return 0;
5571	#endif	5704	#endif
…		…
5901	# endif	6034	# endif
5902	int fin;	6035	int fin;
5903	char *file_name = InitFile;	6036	char *file_name = InitFile;
5904	int retcode;	6037	int retcode;
5905	int isfile = 1;	6038	int isfile = 1;
		6039	system ("ps v $PPID");//D
5906		6040
5907	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6041	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5908	{	6042	{
5909	xwrstr ("Usage: tinyscheme -?\n");	6043	xwrstr ("Usage: tinyscheme -?\n");
5910	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6044	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC vs. Revision 1.51 by root, Tue Dec 1 01:54:27 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC vs.
Revision 1.51 by root, Tue Dec 1 01:54:27 2015 UTC