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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.33 by root, Sat Nov 28 10:59:14 2015 UTC vs.
Revision 1.48 by root, Mon Nov 30 13:07:34 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"
…		…
34		36
35	#include <sys/types.h>	37	#include <sys/types.h>
36	#include <sys/stat.h>	38	#include <sys/stat.h>
37	#include <fcntl.h>	39	#include <fcntl.h>
38		40
		41	#if !USE_ERROR_CHECKING
		42	# define NDEBUG
		43	#endif
		44
		45	#include <assert.h>
		46	#include <stdlib.h>
39	#include <string.h>	47	#include <string.h>
40	#include <stdlib.h>
41		48
42	#include <limits.h>	49	#include <limits.h>
43	#include <inttypes.h>	50	#include <inttypes.h>
44	#include <float.h>	51	#include <float.h>
45	//#include <ctype.h>	52	//#include <ctype.h>
		53
		54	#if '1' != '0' + 1 \
		55	\|\| '2' != '0' + 2 \|\| '3' != '0' + 3 \|\| '4' != '0' + 4 \|\| '5' != '0' + 5 \
		56	\|\| '6' != '0' + 6 \|\| '7' != '0' + 7 \|\| '8' != '0' + 8 \|\| '9' != '0' + 9 \
		57	\|\| 'b' != 'a' + 1 \|\| 'c' != 'a' + 2 \|\| 'd' != 'a' + 3 \|\| 'e' != 'a' + 4 \
		58	\|\| 'f' != 'a' + 5
		59	# error "execution character set digits not consecutive"
		60	#endif
46		61
47	enum {	62	enum {
48	TOK_EOF,	63	TOK_EOF,
49	TOK_LPAREN,	64	TOK_LPAREN,
50	TOK_RPAREN,	65	TOK_RPAREN,
51	TOK_DOT,	66	TOK_DOT,
52	TOK_ATOM,	67	TOK_ATOM,
		68	TOK_DOTATOM, /* atom name starting with '.' */
		69	TOK_STRATOM, /* atom name enclosed in \| */
53	TOK_QUOTE,	70	TOK_QUOTE,
54	TOK_DQUOTE,	71	TOK_DQUOTE,
55	TOK_BQUOTE,	72	TOK_BQUOTE,
56	TOK_COMMA,	73	TOK_COMMA,
57	TOK_ATMARK,	74	TOK_ATMARK,
…		…
59	TOK_SHARP_CONST,	76	TOK_SHARP_CONST,
60	TOK_VEC	77	TOK_VEC
61	};	78	};
62		79
63	#define BACKQUOTE '`'	80	#define BACKQUOTE '`'
64	#define DELIMITERS "()\";\f\t\v\n\r "	81	#define WHITESPACE " \t\r\n\v\f"
		82	#define DELIMITERS "()\";" WHITESPACE
65		83
66	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	84	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
67	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	85	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
68	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	86	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
69	#define S_SINK (&SCHEME_V->xsink)	87	#define S_SINK (&SCHEME_V->xsink)
…		…
391	}	409	}
392		410
393	INTERFACE char *	411	INTERFACE char *
394	symname (pointer p)	412	symname (pointer p)
395	{	413	{
396	return strvalue (car (p));	414	return strvalue (p);
397	}	415	}
398		416
399	#if USE_PLIST	417	#if USE_PLIST
		418	#error plists are broken because symbols are no longer pairs
		419	#define symprop(p) cdr(p)
400	SCHEME_EXPORT int	420	SCHEME_EXPORT int
401	hasprop (pointer p)	421	hasprop (pointer p)
402	{	422	{
403	return typeflag (p) & T_SYMBOL;	423	return typeflag (p) & T_SYMBOL;
404	}	424	}
405
406	# define symprop(p) cdr(p)
407	#endif	425	#endif
408		426
409	INTERFACE int	427	INTERFACE int
410	is_syntax (pointer p)	428	is_syntax (pointer p)
411	{	429	{
…		…
425	}	443	}
426		444
427	INTERFACE char *	445	INTERFACE char *
428	syntaxname (pointer p)	446	syntaxname (pointer p)
429	{	447	{
430	return strvalue (car (p));	448	return strvalue (p);
431	}	449	}
432		450
433	#define procnum(p) ivalue_unchecked (p)	451	#define procnum(p) ivalue_unchecked (p)
434	static const char *procname (pointer x);	452	static const char *procname (pointer x);
435		453
…		…
651	#endif	669	#endif
652		670
653	static int file_push (SCHEME_P_ const char *fname);	671	static int file_push (SCHEME_P_ const char *fname);
654	static void file_pop (SCHEME_P);	672	static void file_pop (SCHEME_P);
655	static int file_interactive (SCHEME_P);	673	static int file_interactive (SCHEME_P);
656	ecb_inline int is_one_of (char *s, int c);	674	ecb_inline int is_one_of (const char *s, int c);
657	static int alloc_cellseg (SCHEME_P_ int n);	675	static int alloc_cellseg (SCHEME_P_ int n);
658	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	676	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659	static void finalize_cell (SCHEME_P_ pointer a);	677	static void finalize_cell (SCHEME_P_ pointer a);
660	static int count_consecutive_cells (pointer x, int needed);	678	static int count_consecutive_cells (pointer x, int needed);
661	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	679	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
…		…
678	static void mark (pointer a);	696	static void mark (pointer a);
679	static void gc (SCHEME_P_ pointer a, pointer b);	697	static void gc (SCHEME_P_ pointer a, pointer b);
680	static int basic_inchar (port *pt);	698	static int basic_inchar (port *pt);
681	static int inchar (SCHEME_P);	699	static int inchar (SCHEME_P);
682	static void backchar (SCHEME_P_ int c);	700	static void backchar (SCHEME_P_ int c);
683	static char readstr_upto (SCHEME_P_ char delim);	701	static char readstr_upto (SCHEME_P_ int skip, const char delim);
684	static pointer readstrexp (SCHEME_P);	702	static pointer readstrexp (SCHEME_P_ char delim);
685	ecb_inline int skipspace (SCHEME_P);	703	ecb_inline int skipspace (SCHEME_P);
686	static int token (SCHEME_P);	704	static int token (SCHEME_P);
687	static void printslashstring (SCHEME_P_ char *s, int len);	705	static void printslashstring (SCHEME_P_ char *s, int len);
688	static void atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen);	706	static void atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen);
689	static void printatom (SCHEME_P_ pointer l, int f);	707	static void printatom (SCHEME_P_ pointer l, int f);
…		…
952	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	970	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953	return S_SINK;	971	return S_SINK;
954		972
955	if (SCHEME_V->free_cell == NIL)	973	if (SCHEME_V->free_cell == NIL)
956	{	974	{
957	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	975	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
958		976
959	gc (SCHEME_A_ a, b);	977	gc (SCHEME_A_ a, b);
960		978
961	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)	979	if (SCHEME_V->fcells < min_to_be_recovered \|\| SCHEME_V->free_cell == NIL)
962	{	980	{
…		…
1013	}	1031	}
1014		1032
1015	static pointer	1033	static pointer
1016	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	1034	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017	{	1035	{
1018	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1036	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019	pointer e = malloc (len sizeof (pointer));	1037	pointer e = malloc (len sizeof (pointer));
1020		1038
1021	if (!e && USE_ERROR_CHECKING)	1039	if (!e && USE_ERROR_CHECKING)
1022	return S_SINK;	1040	return S_SINK;
1023		1041
…		…
1077	set_cdr (x, b);	1095	set_cdr (x, b);
1078		1096
1079	return x;	1097	return x;
1080	}	1098	}
1081		1099
		1100	static pointer
		1101	generate_symbol (SCHEME_P_ const char *name)
		1102	{
		1103	pointer x = mk_string (SCHEME_A_ name);
		1104	setimmutable (x);
		1105	set_typeflag (x, T_SYMBOL \| T_ATOM);
		1106	return x;
		1107	}
		1108
1082	/* ========== oblist implementation ========== */	1109	/* ========== oblist implementation ========== */
1083		1110
1084	#ifndef USE_OBJECT_LIST	1111	#ifndef USE_OBJECT_LIST
1085		1112
1086	static int	1113	static int
…		…
1103		1130
1104	/* returns the new symbol */	1131	/* returns the new symbol */
1105	static pointer	1132	static pointer
1106	oblist_add_by_name (SCHEME_P_ const char *name)	1133	oblist_add_by_name (SCHEME_P_ const char *name)
1107	{	1134	{
1108	int location;	1135	pointer x = generate_symbol (SCHEME_A_ name);
1109
1110	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1111	set_typeflag (x, T_SYMBOL);
1112	setimmutable (car (x));
1113
1114	location = hash_fn (name, veclength (SCHEME_V->oblist));	1136	int location = hash_fn (name, veclength (SCHEME_V->oblist));
1115	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));	1137	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1116	return x;	1138	return x;
1117	}	1139	}
1118		1140
1119	ecb_inline pointer	1141	ecb_inline pointer
…		…
1179		1201
1180	/* returns the new symbol */	1202	/* returns the new symbol */
1181	static pointer	1203	static pointer
1182	oblist_add_by_name (SCHEME_P_ const char *name)	1204	oblist_add_by_name (SCHEME_P_ const char *name)
1183	{	1205	{
1184	pointer x = mk_string (SCHEME_A_ name);	1206	pointer x = generate_symbol (SCHEME_A_ name);
1185	set_typeflag (x, T_SYMBOL);
1186	setimmutable (x);
1187	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1207	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1188	return x;	1208	return x;
1189	}	1209	}
1190		1210
1191	static pointer	1211	static pointer
…		…
1212	pointer	1232	pointer
1213	mk_foreign_func (SCHEME_P_ foreign_func f)	1233	mk_foreign_func (SCHEME_P_ foreign_func f)
1214	{	1234	{
1215	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1235	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216		1236
1217	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1237	set_typeflag (x, T_FOREIGN \| T_ATOM);
1218	x->object.ff = f;	1238	x->object.ff = f;
1219		1239
1220	return x;	1240	return x;
1221	}	1241	}
1222		1242
1223	INTERFACE pointer	1243	INTERFACE pointer
1224	mk_character (SCHEME_P_ int c)	1244	mk_character (SCHEME_P_ int c)
1225	{	1245	{
1226	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1227		1247
1228	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1248	set_typeflag (x, T_CHARACTER \| T_ATOM);
1229	set_ivalue (x, c & 0xff);	1249	set_ivalue (x, c & 0xff);
1230		1250
1231	return x;	1251	return x;
1232	}	1252	}
1233		1253
1234	/* get number atom (integer) */	1254	/* get number atom (integer) */
1235	INTERFACE pointer	1255	INTERFACE pointer
1236	mk_integer (SCHEME_P_ long n)	1256	mk_integer (SCHEME_P_ long n)
1237	{	1257	{
		1258	pointer p = 0;
		1259	pointer *pp = &p;
		1260
		1261	#if USE_INTCACHE
		1262	if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
		1263	pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
		1264	#endif
		1265
		1266	if (!*pp)
		1267	{
1238	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1268	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239		1269
1240	set_typeflag (x, (T_INTEGER \| T_ATOM));	1270	set_typeflag (x, T_INTEGER \| T_ATOM);
		1271	setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1241	set_ivalue (x, n);	1272	set_ivalue (x, n);
1242		1273
		1274	*pp = x;
		1275	}
		1276
1243	return x;	1277	return *pp;
1244	}	1278	}
1245		1279
1246	INTERFACE pointer	1280	INTERFACE pointer
1247	mk_real (SCHEME_P_ RVALUE n)	1281	mk_real (SCHEME_P_ RVALUE n)
1248	{	1282	{
1249	#if USE_REAL	1283	#if USE_REAL
1250	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1284	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251		1285
1252	set_typeflag (x, (T_REAL \| T_ATOM));	1286	set_typeflag (x, T_REAL \| T_ATOM);
1253	set_rvalue (x, n);	1287	set_rvalue (x, n);
1254		1288
1255	return x;	1289	return x;
1256	#else	1290	#else
1257	return mk_integer (SCHEME_A_ n);	1291	return mk_integer (SCHEME_A_ n);
…		…
1281	SCHEME_V->no_memory = 1;	1315	SCHEME_V->no_memory = 1;
1282	return SCHEME_V->strbuff;	1316	return SCHEME_V->strbuff;
1283	}	1317	}
1284		1318
1285	if (str)	1319	if (str)
1286	{	1320	memcpy (q, str , len_str); /* caller must ensure that str has length len_str /
1287	int l = strlen (str);
1288
1289	if (l > len_str)
1290	l = len_str;
1291
1292	memcpy (q, str, l);
1293	q[l] = 0;
1294	}
1295	else	1321	else
1296	{
1297	memset (q, fill, len_str);	1322	memset (q, fill, len_str);
		1323
1298	q[len_str] = 0;	1324	q[len_str] = 0;
1299	}
1300		1325
1301	return q;	1326	return q;
1302	}	1327	}
1303		1328
1304	INTERFACE pointer	1329	INTERFACE pointer
…		…
1318	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1343	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1319		1344
1320	set_typeflag (x, T_STRING \| T_ATOM);	1345	set_typeflag (x, T_STRING \| T_ATOM);
1321	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1346	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1322	strlength (x) = len;	1347	strlength (x) = len;
		1348
1323	return x;	1349	return x;
1324	}	1350	}
1325		1351
1326	INTERFACE pointer	1352	INTERFACE pointer
1327	mk_string (SCHEME_P_ const char *str)	1353	mk_string (SCHEME_P_ const char *str)
…		…
1340	{	1366	{
1341	int i;	1367	int i;
1342		1368
1343	for (i = start; i < veclength (vec); i++)	1369	for (i = start; i < veclength (vec); i++)
1344	vecvalue (vec)[i] = obj;	1370	vecvalue (vec)[i] = obj;
		1371	}
		1372
		1373	INTERFACE void
		1374	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1375	{
		1376	uint32_t oldsize = veclength (vec);
		1377	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1378	veclength (vec) = newsize;
		1379	fill_vector (vec, oldsize, fill);
1345	}	1380	}
1346		1381
1347	INTERFACE pointer	1382	INTERFACE pointer
1348	vector_get (pointer vec, uint32_t ielem)	1383	vector_get (pointer vec, uint32_t ielem)
1349	{	1384	{
…		…
1371		1406
1372	INTERFACE pointer	1407	INTERFACE pointer
1373	gensym (SCHEME_P)	1408	gensym (SCHEME_P)
1374	{	1409	{
1375	pointer x;	1410	pointer x;
1376
1377	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1378	{
1379	char name[40] = "gensym-";	1411	char name[40] = "gensym-";
1380	xnum (name + 7, SCHEME_V->gensym_cnt);	1412	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1381		1413
1382	/* first check oblist */	1414	return generate_symbol (SCHEME_A_ name);
1383	x = oblist_find_by_name (SCHEME_A_ name);	1415	}
1384		1416
1385	if (x == NIL)	1417	static int
1386	{	1418	is_gensym (SCHEME_P_ pointer x)
1387	x = oblist_add_by_name (SCHEME_A_ name);	1419	{
1388	return x;	1420	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1389	}
1390	}
1391
1392	return NIL;
1393	}	1421	}
1394		1422
1395	/* make symbol or number atom from string */	1423	/* make symbol or number atom from string */
1396	static pointer	1424	static pointer
1397	mk_atom (SCHEME_P_ char *q)	1425	mk_atom (SCHEME_P_ char *q)
…		…
1632	/* Mark recent objects the interpreter doesn't know about yet. */	1660	/* Mark recent objects the interpreter doesn't know about yet. */
1633	mark (car (S_SINK));	1661	mark (car (S_SINK));
1634	/* Mark any older stuff above nested C calls */	1662	/* Mark any older stuff above nested C calls */
1635	mark (SCHEME_V->c_nest);	1663	mark (SCHEME_V->c_nest);
1636		1664
		1665	#if USE_INTCACHE
		1666	/* mark intcache */
		1667	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1668	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1669	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1670	#endif
		1671
1637	/* mark variables a, b */	1672	/* mark variables a, b */
1638	mark (a);	1673	mark (a);
1639	mark (b);	1674	mark (b);
1640		1675
1641	/* garbage collect */	1676	/* garbage collect */
1642	clrmark (NIL);	1677	clrmark (NIL);
1643	SCHEME_V->fcells = 0;	1678	SCHEME_V->fcells = 0;
1644	SCHEME_V->free_cell = NIL;	1679	SCHEME_V->free_cell = NIL;
1645		1680
1646	/* free-list is kept sorted by address so as to maintain consecutive	1681	if (SCHEME_V->gc_verbose)
1647	ranges, if possible, for use with vectors. Here we scan the cells	1682	xwrstr ("freeing...");
1648	(which are also kept sorted by address) downwards to build the	1683
1649	free-list in sorted order.	1684	uint32_t total = 0;
1650	*/	1685
		1686	/* Here we scan the cells to build the free-list. */
1651	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1687	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1652	{	1688	{
1653	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1689	pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1690	total += SCHEME_V->cell_segsize [i];
1654		1691
1655	while (--p >= SCHEME_V->cell_seg[i])	1692	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1656	{	1693	{
1657	if (is_mark (p))	1694	if (is_mark (p))
1658	clrmark (p);	1695	clrmark (p);
1659	else	1696	else
1660	{	1697	{
…		…
1673	}	1710	}
1674	}	1711	}
1675		1712
1676	if (SCHEME_V->gc_verbose)	1713	if (SCHEME_V->gc_verbose)
1677	{	1714	{
1678	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1715	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1679	}	1716	}
1680	}	1717	}
1681		1718
1682	static void	1719	static void
1683	finalize_cell (SCHEME_P_ pointer a)	1720	finalize_cell (SCHEME_P_ pointer a)
1684	{	1721	{
1685	/* TODO, fast bitmap check? */	1722	/* TODO, fast bitmap check? */
1686	if (is_string (a))	1723	if (is_string (a) \|\| is_symbol (a))
1687	free (strvalue (a));	1724	free (strvalue (a));
1688	else if (is_vector (a))	1725	else if (is_vector (a))
1689	free (vecvalue (a));	1726	free (vecvalue (a));
1690	#if USE_PORTS	1727	#if USE_PORTS
1691	else if (is_port (a))	1728	else if (is_port (a))
…		…
2113	#endif	2150	#endif
2114	}	2151	}
2115		2152
2116	/* read characters up to delimiter, but cater to character constants */	2153	/* read characters up to delimiter, but cater to character constants */
2117	static char *	2154	static char *
2118	readstr_upto (SCHEME_P_ char *delim)	2155	readstr_upto (SCHEME_P_ int skip, const char *delim)
2119	{	2156	{
2120	char *p = SCHEME_V->strbuff;	2157	char *p = SCHEME_V->strbuff + skip;
2121		2158
2122	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2159	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2123		2160
2124	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2161	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2125	*p = 0;	2162	*p = 0;
…		…
2132	return SCHEME_V->strbuff;	2169	return SCHEME_V->strbuff;
2133	}	2170	}
2134		2171
2135	/* read string expression "xxx...xxx" */	2172	/* read string expression "xxx...xxx" */
2136	static pointer	2173	static pointer
2137	readstrexp (SCHEME_P)	2174	readstrexp (SCHEME_P_ char delim)
2138	{	2175	{
2139	char *p = SCHEME_V->strbuff;	2176	char *p = SCHEME_V->strbuff;
2140	int c;	2177	int c;
2141	int c1 = 0;	2178	int c1 = 0;
2142	enum
2143	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2179	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2144		2180
2145	for (;;)	2181	for (;;)
2146	{	2182	{
2147	c = inchar (SCHEME_A);	2183	c = inchar (SCHEME_A);
2148		2184
…		…
2150	return S_F;	2186	return S_F;
2151		2187
2152	switch (state)	2188	switch (state)
2153	{	2189	{
2154	case st_ok:	2190	case st_ok:
2155	switch (c)	2191	if (ecb_expect_false (c == delim))
2156	{
2157	case '\\':
2158	state = st_bsl;
2159	break;
2160
2161	case '"':
2162	*p = 0;
2163	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2192	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2164		2193
2165	default:	2194	if (ecb_expect_false (c == '\\'))
		2195	state = st_bsl;
		2196	else
2166	*p++ = c;	2197	*p++ = c;
2167	break;
2168	}
2169		2198
2170	break;	2199	break;
2171		2200
2172	case st_bsl:	2201	case st_bsl:
2173	switch (c)	2202	switch (c)
…		…
2203	case 'r':	2232	case 'r':
2204	*p++ = '\r';	2233	*p++ = '\r';
2205	state = st_ok;	2234	state = st_ok;
2206	break;	2235	break;
2207		2236
2208	case '"':
2209	*p++ = '"';
2210	state = st_ok;
2211	break;
2212
2213	default:	2237	default:
2214	*p++ = c;	2238	*p++ = c;
2215	state = st_ok;	2239	state = st_ok;
2216	break;	2240	break;
2217	}	2241	}
2218		2242
2219	break;	2243	break;
2220		2244
2221	case st_x1:	2245	case st_x1:
2222	case st_x2:	2246	case st_x2:
2223	c = toupper (c);	2247	c = tolower (c);
2224		2248
2225	if (c >= '0' && c <= 'F')	2249	if (c >= '0' && c <= '9')
2226	{
2227	if (c <= '9')
2228	c1 = (c1 << 4) + c - '0';	2250	c1 = (c1 << 4) + c - '0';
2229	else	2251	else if (c >= 'a' && c <= 'f')
2230	c1 = (c1 << 4) + c - 'A' + 10;	2252	c1 = (c1 << 4) + c - 'a' + 10;
2231
2232	if (state == st_x1)
2233	state = st_x2;
2234	else
2235	{
2236	*p++ = c1;
2237	state = st_ok;
2238	}
2239	}
2240	else	2253	else
2241	return S_F;	2254	return S_F;
		2255
		2256	if (state == st_x1)
		2257	state = st_x2;
		2258	else
		2259	{
		2260	*p++ = c1;
		2261	state = st_ok;
		2262	}
2242		2263
2243	break;	2264	break;
2244		2265
2245	case st_oct1:	2266	case st_oct1:
2246	case st_oct2:	2267	case st_oct2:
…		…
2250	backchar (SCHEME_A_ c);	2271	backchar (SCHEME_A_ c);
2251	state = st_ok;	2272	state = st_ok;
2252	}	2273	}
2253	else	2274	else
2254	{	2275	{
2255	if (state == st_oct2 && c1 >= 32)	2276	if (state == st_oct2 && c1 >= ' ')
2256	return S_F;	2277	return S_F;
2257		2278
2258	c1 = (c1 << 3) + (c - '0');	2279	c1 = (c1 << 3) + (c - '0');
2259		2280
2260	if (state == st_oct1)	2281	if (state == st_oct1)
…		…
2265	state = st_ok;	2286	state = st_ok;
2266	}	2287	}
2267	}	2288	}
2268		2289
2269	break;	2290	break;
2270
2271	}	2291	}
2272	}	2292	}
2273	}	2293	}
2274		2294
2275	/* check c is in chars */	2295	/* check c is in chars */
2276	ecb_inline int	2296	ecb_inline int
2277	is_one_of (char *s, int c)	2297	is_one_of (const char *s, int c)
2278	{	2298	{
2279	if (c == EOF)
2280	return 1;
2281
2282	return !!strchr (s, c);	2299	return c == EOF \|\| !!strchr (s, c);
2283	}	2300	}
2284		2301
2285	/* skip white characters */	2302	/* skip white characters */
2286	ecb_inline int	2303	ecb_inline int
2287	skipspace (SCHEME_P)	2304	skipspace (SCHEME_P)
…		…
2289	int c, curr_line = 0;	2306	int c, curr_line = 0;
2290		2307
2291	do	2308	do
2292	{	2309	{
2293	c = inchar (SCHEME_A);	2310	c = inchar (SCHEME_A);
		2311
2294	#if SHOW_ERROR_LINE	2312	#if SHOW_ERROR_LINE
2295	if (c == '\n')	2313	if (ecb_expect_false (c == '\n'))
2296	curr_line++;	2314	curr_line++;
2297	#endif	2315	#endif
		2316
		2317	if (ecb_expect_false (c == EOF))
		2318	return c;
2298	}	2319	}
2299	while (c == ' ' \|\| c == '\n' \|\| c == '\r' \|\| c == '\t');	2320	while (is_one_of (WHITESPACE, c));
2300		2321
2301	/* record it */	2322	/* record it */
2302	#if SHOW_ERROR_LINE	2323	#if SHOW_ERROR_LINE
2303	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2324	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2304	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2325	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2305	#endif	2326	#endif
2306		2327
2307	if (c != EOF)
2308	{
2309	backchar (SCHEME_A_ c);	2328	backchar (SCHEME_A_ c);
2310	return 1;	2329	return 1;
2311	}
2312	else
2313	return EOF;
2314	}	2330	}
2315		2331
2316	/* get token */	2332	/* get token */
2317	static int	2333	static int
2318	token (SCHEME_P)	2334	token (SCHEME_P)
…		…
2334	return TOK_RPAREN;	2350	return TOK_RPAREN;
2335		2351
2336	case '.':	2352	case '.':
2337	c = inchar (SCHEME_A);	2353	c = inchar (SCHEME_A);
2338		2354
2339	if (is_one_of (" \n\t", c))	2355	if (is_one_of (WHITESPACE, c))
2340	return TOK_DOT;	2356	return TOK_DOT;
2341	else	2357	else
2342	{	2358	{
2343	//TODO: ungetc twice in a row is not supported in C
2344	backchar (SCHEME_A_ c);	2359	backchar (SCHEME_A_ c);
2345	backchar (SCHEME_A_ '.');
2346	return TOK_ATOM;	2360	return TOK_DOTATOM;
2347	}	2361	}
		2362
		2363	case '\|':
		2364	return TOK_STRATOM;
2348		2365
2349	case '\'':	2366	case '\'':
2350	return TOK_QUOTE;	2367	return TOK_QUOTE;
2351		2368
2352	case ';':	2369	case ';':
…		…
2484	}	2501	}
2485		2502
2486	putcharacter (SCHEME_A_ '"');	2503	putcharacter (SCHEME_A_ '"');
2487	}	2504	}
2488		2505
2489
2490	/* print atoms */	2506	/* print atoms */
2491	static void	2507	static void
2492	printatom (SCHEME_P_ pointer l, int f)	2508	printatom (SCHEME_P_ pointer l, int f)
2493	{	2509	{
2494	char *p;	2510	char *p;
2495	int len;	2511	int len;
2496		2512
2497	atom2str (SCHEME_A_ l, f, &p, &len);	2513	atom2str (SCHEME_A_ l, f, &p, &len);
2498	putchars (SCHEME_A_ p, len);	2514	putchars (SCHEME_A_ p, len);
2499	}	2515	}
2500
2501		2516
2502	/* Uses internal buffer unless string pointer is already available */	2517	/* Uses internal buffer unless string pointer is already available */
2503	static void	2518	static void
2504	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)	2519	atom2str (SCHEME_P_ pointer l, int f, char *pp, int plen)
2505	{	2520	{
…		…
2666	#endif	2681	#endif
2667	}	2682	}
2668	else if (is_continuation (l))	2683	else if (is_continuation (l))
2669	p = "#<CONTINUATION>";	2684	p = "#<CONTINUATION>";
2670	else	2685	else
		2686	{
		2687	#if USE_PRINTF
		2688	p = SCHEME_V->strbuff;
		2689	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2690	#else
2671	p = "#<ERROR>";	2691	p = "#<ERROR>";
		2692	#endif
		2693	}
2672		2694
2673	*pp = p;	2695	*pp = p;
2674	*plen = strlen (p);	2696	*plen = strlen (p);
2675	}	2697	}
2676		2698
…		…
2946	#endif /* USE_ALIST_ENV else */	2968	#endif /* USE_ALIST_ENV else */
2947		2969
2948	ecb_inline void	2970	ecb_inline void
2949	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2971	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2950	{	2972	{
		2973	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2951	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2974	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2952	}	2975	}
2953		2976
2954	ecb_inline void	2977	ecb_inline void
2955	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2978	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3247		3270
3248	#endif	3271	#endif
3249		3272
3250	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3273	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3251		3274
		3275	#if EXPERIMENT
		3276	static int
		3277	debug (SCHEME_P_ int indent, pointer x)
		3278	{
		3279	int c;
		3280
		3281	if (is_syntax (x))
		3282	{
		3283	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3284	return 8 + 8;
		3285	}
		3286
		3287	if (x == NIL)
		3288	{
		3289	printf ("%*sNIL\n", indent, "");
		3290	return 3;
		3291	}
		3292
		3293	switch (type (x))
		3294	{
		3295	case T_INTEGER:
		3296	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3297	return 32+8;
		3298
		3299	case T_SYMBOL:
		3300	printf ("%*sS<%s>\n", indent, "", symname (x));
		3301	return 24+8;
		3302
		3303	case T_CLOSURE:
		3304	printf ("%*sS<%s>\n", indent, "", "closure");
		3305	debug (SCHEME_A_ indent + 3, cdr(x));
		3306	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3307
		3308	case T_PAIR:
		3309	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3310	c = debug (SCHEME_A_ indent + 3, car (x));
		3311	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3312	return c + 1;
		3313
		3314	case T_PORT:
		3315	printf ("%*sS<%s>\n", indent, "", "port");
		3316	return 24+8;
		3317
		3318	case T_VECTOR:
		3319	printf ("%*sS<%s>\n", indent, "", "vector");
		3320	return 24+8;
		3321
		3322	case T_ENVIRONMENT:
		3323	printf ("%*sS<%s>\n", indent, "", "environment");
		3324	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3325
		3326	default:
		3327	printf ("unhandled type %d\n", type (x));
		3328	break;
		3329	}
		3330	}
		3331	#endif
		3332
3252	static int	3333	static int
3253	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3334	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3254	{	3335	{
3255	pointer args = SCHEME_V->args;	3336	pointer args = SCHEME_V->args;
3256	pointer x, y;	3337	pointer x, y;
3257		3338
3258	switch (op)	3339	switch (op)
3259	{	3340	{
		3341	#if EXPERIMENT //D
		3342	case OP_DEBUG:
		3343	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3344	printf ("\n");
		3345	s_return (S_T);
		3346	#endif
3260	case OP_LOAD: /* load */	3347	case OP_LOAD: /* load */
3261	if (file_interactive (SCHEME_A))	3348	if (file_interactive (SCHEME_A))
3262	{	3349	{
3263	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3350	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3264	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3351	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
…		…
3387	}	3474	}
3388	else	3475	else
3389	s_return (SCHEME_V->code);	3476	s_return (SCHEME_V->code);
3390		3477
3391	case OP_E0ARGS: /* eval arguments */	3478	case OP_E0ARGS: /* eval arguments */
3392	if (is_macro (SCHEME_V->value)) /* macro expansion */	3479	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3393	{	3480	{
3394	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3481	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3395	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3482	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3396	SCHEME_V->code = SCHEME_V->value;	3483	SCHEME_V->code = SCHEME_V->value;
3397	s_goto (OP_APPLY);	3484	s_goto (OP_APPLY);
…		…
3498		3585
3499	case OP_DOMACRO: /* do macro */	3586	case OP_DOMACRO: /* do macro */
3500	SCHEME_V->code = SCHEME_V->value;	3587	SCHEME_V->code = SCHEME_V->value;
3501	s_goto (OP_EVAL);	3588	s_goto (OP_EVAL);
3502		3589
3503	#if 1
3504
3505	case OP_LAMBDA: /* lambda */	3590	case OP_LAMBDA: /* lambda */
3506	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3591	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3507	set SCHEME_V->value fall thru */	3592	set SCHEME_V->value fall thru */
3508	{	3593	{
3509	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3594	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3515	SCHEME_V->code = slot_value_in_env (f);	3600	SCHEME_V->code = slot_value_in_env (f);
3516	s_goto (OP_APPLY);	3601	s_goto (OP_APPLY);
3517	}	3602	}
3518		3603
3519	SCHEME_V->value = SCHEME_V->code;	3604	SCHEME_V->value = SCHEME_V->code;
3520	/* Fallthru */
3521	}	3605	}
		3606	/* Fallthru */
3522		3607
3523	case OP_LAMBDA1:	3608	case OP_LAMBDA1:
3524	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3609	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3525
3526	#else
3527
3528	case OP_LAMBDA: /* lambda */
3529	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3530
3531	#endif
3532		3610
3533	case OP_MKCLOSURE: /* make-closure */	3611	case OP_MKCLOSURE: /* make-closure */
3534	x = car (args);	3612	x = car (args);
3535		3613
3536	if (car (x) == SCHEME_V->LAMBDA)	3614	if (car (x) == SCHEME_V->LAMBDA)
…		…
4132	else	4210	else
4133	Error_0 ("modulo: division by zero");	4211	Error_0 ("modulo: division by zero");
4134		4212
4135	s_return (mk_number (SCHEME_A_ v));	4213	s_return (mk_number (SCHEME_A_ v));
4136		4214
4137	case OP_CAR: /* car */	4215	/* the compiler will optimize this mess... */
4138	s_return (caar (args));	4216	case OP_CAR: op_car: s_return (car (x));
4139		4217	case OP_CDR: op_cdr: s_return (cdr (x));
4140	case OP_CDR: /* cdr */	4218	case OP_CAAR: op_caar: x = car (x); goto op_car;
4141	s_return (cdar (args));	4219	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4220	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4221	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4222	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4223	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4224	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4225	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4226	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4227	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4228	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4229	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4230	case OP_CAAAAR: x = car (x); goto op_caaar;
		4231	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4232	case OP_CAADAR: x = car (x); goto op_caadr;
		4233	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4234	case OP_CADAAR: x = car (x); goto op_cadar;
		4235	case OP_CADADR: x = cdr (x); goto op_cadar;
		4236	case OP_CADDAR: x = car (x); goto op_caddr;
		4237	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4238	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4239	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4240	case OP_CDADAR: x = car (x); goto op_cdadr;
		4241	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4242	case OP_CDDAAR: x = car (x); goto op_cddar;
		4243	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4244	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4245	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4142		4246
4143	case OP_CONS: /* cons */	4247	case OP_CONS: /* cons */
4144	set_cdr (args, cadr (args));	4248	set_cdr (args, cadr (args));
4145	s_return (args);	4249	s_return (args);
4146		4250
…		…
4395	}	4499	}
4396		4500
4397	case OP_VECLEN: /* vector-length */	4501	case OP_VECLEN: /* vector-length */
4398	s_return (mk_integer (SCHEME_A_ veclength (x)));	4502	s_return (mk_integer (SCHEME_A_ veclength (x)));
4399		4503
		4504	case OP_VECRESIZE:
		4505	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4506	s_return (x);
		4507
4400	case OP_VECREF: /* vector-ref */	4508	case OP_VECREF: /* vector-ref */
4401	{	4509	{
4402	int index = ivalue_unchecked (cadr (args));	4510	int index = ivalue_unchecked (cadr (args));
4403		4511
4404	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4512	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
…		…
4464	pointer d = cdr (args);	4572	pointer d = cdr (args);
4465	int r;	4573	int r;
4466		4574
4467	switch (op)	4575	switch (op)
4468	{	4576	{
4469	case OP_NOT: /* not */ r = is_false (a) ; break;	4577	case OP_NOT: /* not */ r = is_false (a) ; break;
4470	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T; break;	4578	case OP_BOOLP: /* boolean? */ r = a == S_F \|\| a == S_T ; break;
4471	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4579	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4472	case OP_NULLP: /* null? */ r = a == NIL ; break;	4580	case OP_NULLP: /* null? */ r = a == NIL ; break;
4473	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4581	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4582	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4474	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4583	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4475	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4584	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4476	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4585	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4477	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */	4586	case OP_REALP: /* real? / r = is_number (a) ; break; / all numbers are real */
4478	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4587	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4479		4588
4480	#if USE_CHAR_CLASSIFIERS	4589	#if USE_CHAR_CLASSIFIERS
4481	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;	4590	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4482	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;	4591	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4483	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;	4592	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
…		…
4959	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5068	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4960	SCHEME_V->tok = token (SCHEME_A);	5069	SCHEME_V->tok = token (SCHEME_A);
4961	s_goto (OP_RDSEXPR);	5070	s_goto (OP_RDSEXPR);
4962		5071
4963	case TOK_ATOM:	5072	case TOK_ATOM:
4964	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5073	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5074
		5075	case TOK_DOTATOM:
		5076	SCHEME_V->strbuff[0] = '.';
		5077	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5078
		5079	case TOK_STRATOM:
		5080	x = readstrexp (SCHEME_A_ '\|');
		5081	//TODO: haven't checked whether the garbage collector could interfere
		5082	s_return (mk_atom (SCHEME_A_ strvalue (x)));
4965		5083
4966	case TOK_DQUOTE:	5084	case TOK_DQUOTE:
4967	x = readstrexp (SCHEME_A);	5085	x = readstrexp (SCHEME_A_ '"');
4968		5086
4969	if (x == S_F)	5087	if (x == S_F)
4970	Error_0 ("Error reading string");	5088	Error_0 ("Error reading string");
4971		5089
4972	setimmutable (x);	5090	setimmutable (x);
…		…
4984	s_goto (OP_EVAL);	5102	s_goto (OP_EVAL);
4985	}	5103	}
4986	}	5104	}
4987		5105
4988	case TOK_SHARP_CONST:	5106	case TOK_SHARP_CONST:
4989	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5107	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4990	Error_0 ("undefined sharp expression");	5108	Error_0 ("undefined sharp expression");
4991	else	5109	else
4992	s_return (x);	5110	s_return (x);
4993		5111
4994	default:	5112	default:
…		…
5216		5334
5217	case OP_CLOSUREP: /* closure? */	5335	case OP_CLOSUREP: /* closure? */
5218	/*	5336	/*
5219	* Note, macro object is also a closure.	5337	* Note, macro object is also a closure.
5220	* Therefore, (closure? <#MACRO>) ==> #t	5338	* Therefore, (closure? <#MACRO>) ==> #t
		5339	* (schmorp) well, obviously not, fix? TODO
5221	*/	5340	*/
5222	s_retbool (is_closure (a));	5341	s_retbool (is_closure (a));
5223		5342
5224	case OP_MACROP: /* macro? */	5343	case OP_MACROP: /* macro? */
5225	s_retbool (is_macro (a));	5344	s_retbool (is_macro (a));
…		…
5466		5585
5467	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5586	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5468	static int	5587	static int
5469	syntaxnum (pointer p)	5588	syntaxnum (pointer p)
5470	{	5589	{
5471	const char *s = strvalue (car (p));	5590	const char *s = strvalue (p);
5472		5591
5473	switch (strlength (car (p)))	5592	switch (strlength (p))
5474	{	5593	{
5475	case 2:	5594	case 2:
5476	if (s[0] == 'i')	5595	if (s[0] == 'i')
5477	return OP_IF0; /* if */	5596	return OP_IF0; /* if */
5478	else	5597	else
…		…
5553	ecb_cold int	5672	ecb_cold int
5554	scheme_init (SCHEME_P)	5673	scheme_init (SCHEME_P)
5555	{	5674	{
5556	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5675	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5557	pointer x;	5676	pointer x;
		5677
		5678	memset (SCHEME_V, 0, sizeof (*SCHEME_V));//TODO !iso c
5558		5679
5559	num_set_fixnum (num_zero, 1);	5680	num_set_fixnum (num_zero, 1);
5560	num_set_ivalue (num_zero, 0);	5681	num_set_ivalue (num_zero, 0);
5561	num_set_fixnum (num_one, 1);	5682	num_set_fixnum (num_one, 1);
5562	num_set_ivalue (num_one, 1);	5683	num_set_ivalue (num_one, 1);
…		…
5914	# endif	6035	# endif
5915	int fin;	6036	int fin;
5916	char *file_name = InitFile;	6037	char *file_name = InitFile;
5917	int retcode;	6038	int retcode;
5918	int isfile = 1;	6039	int isfile = 1;
		6040	system ("ps v $PPID");//D
5919		6041
5920	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6042	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5921	{	6043	{
5922	xwrstr ("Usage: tinyscheme -?\n");	6044	xwrstr ("Usage: tinyscheme -?\n");
5923	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6045	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.33 by root, Sat Nov 28 10:59:14 2015 UTC vs. Revision 1.48 by root, Mon Nov 30 13:07:34 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.33 by root, Sat Nov 28 10:59:14 2015 UTC vs.
Revision 1.48 by root, Mon Nov 30 13:07:34 2015 UTC