ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC

…		…
34		34
35	#include <sys/types.h>	35	#include <sys/types.h>
36	#include <sys/stat.h>	36	#include <sys/stat.h>
37	#include <fcntl.h>	37	#include <fcntl.h>
38		38
		39	#if !USE_ERROR_CHECKING
		40	# define NDEBUG
		41	#endif
		42
		43	#include <assert.h>
		44	#include <stdlib.h>
39	#include <string.h>	45	#include <string.h>
40	#include <stdlib.h>
41		46
42	#include <limits.h>	47	#include <limits.h>
43	#include <inttypes.h>	48	#include <inttypes.h>
44	#include <float.h>	49	#include <float.h>
45	//#include <ctype.h>	50	//#include <ctype.h>
		51
		52	#if '1' != '0' + 1 \
		53	|| '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
		54	|| '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
		55	|| 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
		56	|| 'f' != 'a' + 5
		57	# error "execution character set digits not consecutive"
		58	#endif
46		59
47	enum {	60	enum {
48	TOK_EOF,	61	TOK_EOF,
49	TOK_LPAREN,	62	TOK_LPAREN,
50	TOK_RPAREN,	63	TOK_RPAREN,
51	TOK_DOT,	64	TOK_DOT,
52	TOK_ATOM,	65	TOK_ATOM,
		66	TOK_DOTATOM, /* atom name starting with '.' */
		67	TOK_STRATOM, /* atom name enclosed in | */
53	TOK_QUOTE,	68	TOK_QUOTE,
54	TOK_DQUOTE,	69	TOK_DQUOTE,
55	TOK_BQUOTE,	70	TOK_BQUOTE,
56	TOK_COMMA,	71	TOK_COMMA,
57	TOK_ATMARK,	72	TOK_ATMARK,
…		…
59	TOK_SHARP_CONST,	74	TOK_SHARP_CONST,
60	TOK_VEC	75	TOK_VEC
61	};	76	};
62		77
63	#define BACKQUOTE '`'	78	#define BACKQUOTE '`'
64	#define DELIMITERS "()\";\f\t\v\n\r "	79	#define WHITESPACE " \t\r\n\v\f"
		80	#define DELIMITERS "()\";" WHITESPACE
65		81
66	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	82	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
67	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	83	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
68	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	84	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
69	#define S_SINK (&SCHEME_V->xsink)	85	#define S_SINK (&SCHEME_V->xsink)
…		…
182	# define FIRST_CELLSEGS 3	198	# define FIRST_CELLSEGS 3
183	#endif	199	#endif
184		200
185	enum scheme_types	201	enum scheme_types
186	{	202	{
		203	T_INTEGER,
187	T_FREE,	204	T_REAL,
188	T_STRING,	205	T_STRING,
189	T_NUMBER,
190	T_SYMBOL,	206	T_SYMBOL,
191	T_PROC,	207	T_PROC,
192	T_PAIR,	208	T_PAIR, /* also used for free cells */
193	T_CLOSURE,	209	T_CLOSURE,
194	T_CONTINUATION,	210	T_CONTINUATION,
195	T_FOREIGN,	211	T_FOREIGN,
196	T_CHARACTER,	212	T_CHARACTER,
197	T_PORT,	213	T_PORT,
…		…
207	#define T_SYNTAX 0x0010	223	#define T_SYNTAX 0x0010
208	#define T_IMMUTABLE 0x0020	224	#define T_IMMUTABLE 0x0020
209	#define T_ATOM 0x0040 /* only for gc */	225	#define T_ATOM 0x0040 /* only for gc */
210	#define T_MARK 0x0080 /* only for gc */	226	#define T_MARK 0x0080 /* only for gc */
211		227
		228	/* num, for generic arithmetic */
		229	struct num
		230	{
		231	IVALUE ivalue;
		232	#if USE_REAL
		233	RVALUE rvalue;
		234	char is_fixnum;
		235	#endif
		236	};
		237
		238	#if USE_REAL
		239	# define num_is_fixnum(n) (n).is_fixnum
		240	# define num_set_fixnum(n,f) (n).is_fixnum = (f)
		241	# define num_ivalue(n) (n).ivalue
		242	# define num_rvalue(n) (n).rvalue
		243	# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
		244	# define num_set_rvalue(n,r) (n).rvalue = (r)
		245	#else
		246	# define num_is_fixnum(n) 1
		247	# define num_set_fixnum(n,f) 0
		248	# define num_ivalue(n) (n).ivalue
		249	# define num_rvalue(n) (n).ivalue
		250	# define num_set_ivalue(n,i) (n).ivalue = (i)
		251	# define num_set_rvalue(n,r) (n).ivalue = (r)
		252	#endif
		253
212	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };	254	enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213		255
214	static num num_op (enum num_op op, num a, num b);	256	static num num_op (enum num_op op, num a, num b);
215	static num num_intdiv (num a, num b);	257	static num num_intdiv (num a, num b);
216	static num num_rem (num a, num b);	258	static num num_rem (num a, num b);
…		…
236	}	278	}
237		279
238	#define strvalue(p) ((p)->object.string.svalue)	280	#define strvalue(p) ((p)->object.string.svalue)
239	#define strlength(p) ((p)->object.string.length)	281	#define strlength(p) ((p)->object.string.length)
240		282
241	INTERFACE int is_list (SCHEME_P_ pointer p);
242
243	INTERFACE int	283	INTERFACE int
244	is_vector (pointer p)	284	is_vector (pointer p)
245	{	285	{
246	return type (p) == T_VECTOR;	286	return type (p) == T_VECTOR;
247	}	287	}
248		288
249	#define vecvalue(p) ((p)->object.vector.vvalue)	289	#define vecvalue(p) ((p)->object.vector.vvalue)
250	#define veclength(p) ((p)->object.vector.length)	290	#define veclength(p) ((p)->object.vector.length)
251	INTERFACE void fill_vector (pointer vec, pointer obj);	291	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252	INTERFACE uint32_t vector_length (pointer vec);
253	INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);	292	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	293	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255		294
256	INTERFACE uint32_t	295	INTERFACE int
257	vector_length (pointer vec)	296	is_integer (pointer p)
258	{	297	{
259	return vec->object.vector.length;	298	return type (p) == T_INTEGER;
		299	}
		300
		301	/* not the same as in scheme, where integers are (correctly :) reals */
		302	INTERFACE int
		303	is_real (pointer p)
		304	{
		305	return type (p) == T_REAL;
260	}	306	}
261		307
262	INTERFACE int	308	INTERFACE int
263	is_number (pointer p)	309	is_number (pointer p)
264	{	310	{
265	return type (p) == T_NUMBER;	311	return is_integer (p) || is_real (p);
266	}
267
268	INTERFACE int
269	is_integer (pointer p)
270	{
271	return is_number (p) && num_is_fixnum (p->object.number);
272	}
273
274	INTERFACE int
275	is_real (pointer p)
276	{
277	return is_number (p) && !num_is_fixnum (p->object.number);
278	}	312	}
279		313
280	INTERFACE int	314	INTERFACE int
281	is_character (pointer p)	315	is_character (pointer p)
282	{	316	{
…		…
287	string_value (pointer p)	321	string_value (pointer p)
288	{	322	{
289	return strvalue (p);	323	return strvalue (p);
290	}	324	}
291		325
292	ecb_inline num
293	nvalue (pointer p)
294	{
295	return (p)->object.number;
296	}
297
298	static IVALUE
299	num_get_ivalue (const num n)
300	{
301	return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302	}
303
304	static RVALUE
305	num_get_rvalue (const num n)
306	{
307	return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308	}
309
310	INTERFACE IVALUE
311	ivalue (pointer p)
312	{
313	return num_get_ivalue (p->object.number);
314	}
315
316	INTERFACE RVALUE
317	rvalue (pointer p)
318	{
319	return num_get_rvalue (p->object.number);
320	}
321
322	#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)	326	#define ivalue_unchecked(p) (p)->object.ivalue
		327	#define set_ivalue(p,v) (p)->object.ivalue = (v)
		328
323	#if USE_REAL	329	#if USE_REAL
324	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	330	#define rvalue_unchecked(p) (p)->object.rvalue
325	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	331	#define set_rvalue(p,v) (p)->object.rvalue = (v)
326	# define set_num_real(p) (p)->object.number.is_fixnum=0;
327	#else	332	#else
328	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	333	#define rvalue_unchecked(p) (p)->object.ivalue
329	# define set_num_integer(p) 0	334	#define set_rvalue(p,v) (p)->object.ivalue = (v)
330	# define set_num_real(p) 0
331	#endif	335	#endif
332		336
333	INTERFACE long	337	INTERFACE long
334	charvalue (pointer p)	338	charvalue (pointer p)
335	{	339	{
…		…
403	}	407	}
404		408
405	INTERFACE char *	409	INTERFACE char *
406	symname (pointer p)	410	symname (pointer p)
407	{	411	{
408	return strvalue (car (p));	412	return strvalue (p);
409	}	413	}
410		414
411	#if USE_PLIST	415	#if USE_PLIST
412	SCHEME_EXPORT int	416	SCHEME_EXPORT int
413	hasprop (pointer p)	417	hasprop (pointer p)
…		…
437	}	441	}
438		442
439	INTERFACE char *	443	INTERFACE char *
440	syntaxname (pointer p)	444	syntaxname (pointer p)
441	{	445	{
442	return strvalue (car (p));	446	return strvalue (p);
443	}	447	}
444		448
445	#define procnum(p) ivalue (p)	449	#define procnum(p) ivalue_unchecked (p)
446	static const char *procname (pointer x);	450	static const char *procname (pointer x);
447		451
448	INTERFACE int	452	INTERFACE int
449	is_closure (pointer p)	453	is_closure (pointer p)
450	{	454	{
…		…
511	setimmutable (pointer p)	515	setimmutable (pointer p)
512	{	516	{
513	#if USE_ERROR_CHECKING	517	#if USE_ERROR_CHECKING
514	set_typeflag (p, typeflag (p) | T_IMMUTABLE);	518	set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515	#endif	519	#endif
		520	}
		521
		522	/* Result is:
		523	proper list: length
		524	circular list: -1
		525	not even a pair: -2
		526	dotted list: -2 minus length before dot
		527	*/
		528	INTERFACE int
		529	list_length (SCHEME_P_ pointer a)
		530	{
		531	int i = 0;
		532	pointer slow, fast;
		533
		534	slow = fast = a;
		535
		536	while (1)
		537	{
		538	if (fast == NIL)
		539	return i;
		540
		541	if (!is_pair (fast))
		542	return -2 - i;
		543
		544	fast = cdr (fast);
		545	++i;
		546
		547	if (fast == NIL)
		548	return i;
		549
		550	if (!is_pair (fast))
		551	return -2 - i;
		552
		553	++i;
		554	fast = cdr (fast);
		555
		556	/* Safe because we would have already returned if `fast'
		557	encountered a non-pair. */
		558	slow = cdr (slow);
		559
		560	if (fast == slow)
		561	{
		562	/* the fast pointer has looped back around and caught up
		563	with the slow pointer, hence the structure is circular,
		564	not of finite length, and therefore not a list */
		565	return -1;
		566	}
		567	}
		568	}
		569
		570	INTERFACE int
		571	is_list (SCHEME_P_ pointer a)
		572	{
		573	return list_length (SCHEME_A_ a) >= 0;
516	}	574	}
517		575
518	#if USE_CHAR_CLASSIFIERS	576	#if USE_CHAR_CLASSIFIERS
519	ecb_inline int	577	ecb_inline int
520	Cisalpha (int c)	578	Cisalpha (int c)
…		…
609	#endif	667	#endif
610		668
611	static int file_push (SCHEME_P_ const char *fname);	669	static int file_push (SCHEME_P_ const char *fname);
612	static void file_pop (SCHEME_P);	670	static void file_pop (SCHEME_P);
613	static int file_interactive (SCHEME_P);	671	static int file_interactive (SCHEME_P);
614	ecb_inline int is_one_of (char *s, int c);	672	ecb_inline int is_one_of (const char *s, int c);
615	static int alloc_cellseg (SCHEME_P_ int n);	673	static int alloc_cellseg (SCHEME_P_ int n);
616	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	674	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617	static void finalize_cell (SCHEME_P_ pointer a);	675	static void finalize_cell (SCHEME_P_ pointer a);
618	static int count_consecutive_cells (pointer x, int needed);	676	static int count_consecutive_cells (pointer x, int needed);
619	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	677	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
…		…
636	static void mark (pointer a);	694	static void mark (pointer a);
637	static void gc (SCHEME_P_ pointer a, pointer b);	695	static void gc (SCHEME_P_ pointer a, pointer b);
638	static int basic_inchar (port *pt);	696	static int basic_inchar (port *pt);
639	static int inchar (SCHEME_P);	697	static int inchar (SCHEME_P);
640	static void backchar (SCHEME_P_ int c);	698	static void backchar (SCHEME_P_ int c);
641	static char *readstr_upto (SCHEME_P_ char *delim);	699	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642	static pointer readstrexp (SCHEME_P);	700	static pointer readstrexp (SCHEME_P_ char delim);
643	ecb_inline int skipspace (SCHEME_P);	701	ecb_inline int skipspace (SCHEME_P);
644	static int token (SCHEME_P);	702	static int token (SCHEME_P);
645	static void printslashstring (SCHEME_P_ char *s, int len);	703	static void printslashstring (SCHEME_P_ char *s, int len);
646	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	704	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647	static void printatom (SCHEME_P_ pointer l, int f);	705	static void printatom (SCHEME_P_ pointer l, int f);
…		…
664	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	722	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665	static void assign_syntax (SCHEME_P_ const char *name);	723	static void assign_syntax (SCHEME_P_ const char *name);
666	static int syntaxnum (pointer p);	724	static int syntaxnum (pointer p);
667	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	725	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668		726
		727	static IVALUE
		728	ivalue (pointer x)
		729	{
		730	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		731	}
		732
		733	static RVALUE
		734	rvalue (pointer x)
		735	{
		736	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		737	}
		738
		739	INTERFACE num
		740	nvalue (pointer x)
		741	{
		742	num n;
		743
		744	num_set_fixnum (n, is_integer (x));
		745
		746	if (num_is_fixnum (n))
		747	num_set_ivalue (n, ivalue_unchecked (x));
		748	else
		749	num_set_rvalue (n, rvalue_unchecked (x));
		750
		751	return n;
		752	}
		753
669	static num	754	static num
670	num_op (enum num_op op, num a, num b)	755	num_op (enum num_op op, num a, num b)
671	{	756	{
672	num ret;	757	num ret;
673		758
674	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	759	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675		760
676	if (num_is_fixnum (ret))	761	if (num_is_fixnum (ret))
677	{	762	{
678	IVALUE av = num_get_ivalue (a);
679	IVALUE bv = num_get_ivalue (b);
680
681	switch (op)	763	switch (op)
682	{	764	{
683	case NUM_ADD: av += bv; break;	765	case NUM_ADD: a.ivalue += b.ivalue; break;
684	case NUM_SUB: av -= bv; break;	766	case NUM_SUB: a.ivalue -= b.ivalue; break;
685	case NUM_MUL: av *= bv; break;	767	case NUM_MUL: a.ivalue *= b.ivalue; break;
686	case NUM_INTDIV: av /= bv; break;	768	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687	}	769	}
688		770
689	num_set_ivalue (ret, av);	771	num_set_ivalue (ret, a.ivalue);
690	}	772	}
		773	#if USE_REAL
691	else	774	else
692	{	775	{
693	RVALUE av = num_get_rvalue (a);
694	RVALUE bv = num_get_rvalue (b);
695
696	switch (op)	776	switch (op)
697	{	777	{
698	case NUM_ADD: av += bv; break;	778	case NUM_ADD: a.rvalue += b.rvalue; break;
699	case NUM_SUB: av -= bv; break;	779	case NUM_SUB: a.rvalue -= b.rvalue; break;
700	case NUM_MUL: av *= bv; break;	780	case NUM_MUL: a.rvalue *= b.rvalue; break;
701	case NUM_INTDIV: av /= bv; break;	781	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702	}	782	}
703		783
704	num_set_rvalue (ret, av);	784	num_set_rvalue (ret, a.rvalue);
705	}	785	}
		786	#endif
706		787
707	return ret;	788	return ret;
708	}	789	}
709		790
710	static num	791	static num
711	num_div (num a, num b)	792	num_div (num a, num b)
712	{	793	{
713	num ret;	794	num ret;
714		795
715	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	796	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716		797
717	if (num_is_fixnum (ret))	798	if (num_is_fixnum (ret))
718	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	799	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719	else	800	else
720	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	801	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721		802
722	return ret;	803	return ret;
723	}	804	}
724		805
725	static num	806	static num
…		…
727	{	808	{
728	num ret;	809	num ret;
729	long e1, e2, res;	810	long e1, e2, res;
730		811
731	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	812	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732	e1 = num_get_ivalue (a);	813	e1 = num_ivalue (a);
733	e2 = num_get_ivalue (b);	814	e2 = num_ivalue (b);
734	res = e1 % e2;	815	res = e1 % e2;
735		816
736	/* remainder should have same sign as second operand */	817	/* remainder should have same sign as second operand */
737	if (res > 0)	818	if (res > 0)
738	{	819	{
…		…
754	{	835	{
755	num ret;	836	num ret;
756	long e1, e2, res;	837	long e1, e2, res;
757		838
758	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	839	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759	e1 = num_get_ivalue (a);	840	e1 = num_ivalue (a);
760	e2 = num_get_ivalue (b);	841	e2 = num_ivalue (b);
761	res = e1 % e2;	842	res = e1 % e2;
762		843
763	/* modulo should have same sign as second operand */	844	/* modulo should have same sign as second operand */
764	if (res * e2 < 0)	845	if (res * e2 < 0)
765	res += e2;	846	res += e2;
…		…
775	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	856	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776	int ret;	857	int ret;
777		858
778	if (is_fixnum)	859	if (is_fixnum)
779	{	860	{
780	IVALUE av = num_get_ivalue (a);	861	IVALUE av = num_ivalue (a);
781	IVALUE bv = num_get_ivalue (b);	862	IVALUE bv = num_ivalue (b);
782		863
783	ret = av == bv ? 0 : av < bv ? -1 : +1;	864	ret = av == bv ? 0 : av < bv ? -1 : +1;
784	}	865	}
785	else	866	else
786	{	867	{
787	RVALUE av = num_get_rvalue (a);	868	RVALUE av = num_rvalue (a);
788	RVALUE bv = num_get_rvalue (b);	869	RVALUE bv = num_rvalue (b);
789		870
790	ret = av == bv ? 0 : av < bv ? -1 : +1;	871	ret = av == bv ? 0 : av < bv ? -1 : +1;
791	}	872	}
792		873
793	return ret;	874	return ret;
…		…
856	return k;	937	return k;
857		938
858	i = ++SCHEME_V->last_cell_seg;	939	i = ++SCHEME_V->last_cell_seg;
859	SCHEME_V->alloc_seg[i] = cp;	940	SCHEME_V->alloc_seg[i] = cp;
860		941
861	/* insert new segment in address order */
862	newp = (pointer)cp;	942	newp = (pointer)cp;
863	SCHEME_V->cell_seg[i] = newp;	943	SCHEME_V->cell_seg[i] = newp;
864	SCHEME_V->cell_segsize[i] = segsize;	944	SCHEME_V->cell_segsize[i] = segsize;
865
866	//TODO: insert, not swap
867	while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868	{
869	p = SCHEME_V->cell_seg[i];
870	SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871	SCHEME_V->cell_seg[i - 1] = p;
872
873	k = SCHEME_V->cell_segsize[i];
874	SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875	SCHEME_V->cell_segsize[i - 1] = k;
876
877	--i;
878	}
879
880	SCHEME_V->fcells += segsize;	945	SCHEME_V->fcells += segsize;
881	last = newp + segsize - 1;	946	last = newp + segsize - 1;
882		947
883	for (p = newp; p <= last; p++)	948	for (p = newp; p <= last; p++)
884	{	949	{
885	set_typeflag (p, T_FREE);	950	set_typeflag (p, T_PAIR);
886	set_car (p, NIL);	951	set_car (p, NIL);
887	set_cdr (p, p + 1);	952	set_cdr (p, p + 1);
888	}	953	}
889		954
890	/* insert new cells in address order on free list */
891	if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892	{
893	set_cdr (last, SCHEME_V->free_cell);	955	set_cdr (last, SCHEME_V->free_cell);
894	SCHEME_V->free_cell = newp;	956	SCHEME_V->free_cell = newp;
895	}
896	else
897	{
898	p = SCHEME_V->free_cell;
899
900	while (cdr (p) != NIL && newp > cdr (p))
901	p = cdr (p);
902
903	set_cdr (last, cdr (p));
904	set_cdr (p, newp);
905	}
906	}	957	}
907		958
908	return n;	959	return n;
909	}	960	}
910		961
…		…
989	/* Record it as a vector so that gc understands it. */	1040	/* Record it as a vector so that gc understands it. */
990	set_typeflag (v, T_VECTOR | T_ATOM);	1041	set_typeflag (v, T_VECTOR | T_ATOM);
991		1042
992	v->object.vector.vvalue = e;	1043	v->object.vector.vvalue = e;
993	v->object.vector.length = len;	1044	v->object.vector.length = len;
994	fill_vector (v, init);	1045	fill_vector (v, 0, init);
995	push_recent_alloc (SCHEME_A_ v, NIL);	1046	push_recent_alloc (SCHEME_A_ v, NIL);
996		1047
997	return v;	1048	return v;
998	}	1049	}
999		1050
…		…
1044	return x;	1095	return x;
1045	}	1096	}
1046		1097
1047	/* ========== oblist implementation ========== */	1098	/* ========== oblist implementation ========== */
1048		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
1049	#ifndef USE_OBJECT_LIST	1109	#ifndef USE_OBJECT_LIST
1050		1110
		1111	static int
1051	static int hash_fn (const char *key, int table_size);	1112	hash_fn (const char *key, int table_size)
		1113	{
		1114	const unsigned char *p = key;
		1115	uint32_t hash = 2166136261;
		1116
		1117	while (*p)
		1118	hash = (hash ^ *p++) * 16777619;
		1119
		1120	return hash % table_size;
		1121	}
1052		1122
1053	static pointer	1123	static pointer
1054	oblist_initial_value (SCHEME_P)	1124	oblist_initial_value (SCHEME_P)
1055	{	1125	{
1056	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1126	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1058		1128
1059	/* returns the new symbol */	1129	/* returns the new symbol */
1060	static pointer	1130	static pointer
1061	oblist_add_by_name (SCHEME_P_ const char *name)	1131	oblist_add_by_name (SCHEME_P_ const char *name)
1062	{	1132	{
1063	int location;	1133	pointer x = generate_symbol (SCHEME_A_ name);
1064
1065	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066	set_typeflag (x, T_SYMBOL);
1067	setimmutable (car (x));
1068
1069	location = hash_fn (name, veclength (SCHEME_V->oblist));	1134	int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070	set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));	1135	vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071	return x;	1136	return x;
1072	}	1137	}
1073		1138
1074	ecb_inline pointer	1139	ecb_inline pointer
1075	oblist_find_by_name (SCHEME_P_ const char *name)	1140	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1078	pointer x;	1143	pointer x;
1079	char *s;	1144	char *s;
1080		1145
1081	location = hash_fn (name, veclength (SCHEME_V->oblist));	1146	location = hash_fn (name, veclength (SCHEME_V->oblist));
1082		1147
1083	for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))	1148	for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084	{	1149	{
1085	s = symname (car (x));	1150	s = symname (car (x));
1086		1151
1087	/* case-insensitive, per R5RS section 2 */	1152	/* case-insensitive, per R5RS section 2 */
1088	if (stricmp (name, s) == 0)	1153	if (stricmp (name, s) == 0)
…		…
1098	int i;	1163	int i;
1099	pointer x;	1164	pointer x;
1100	pointer ob_list = NIL;	1165	pointer ob_list = NIL;
1101		1166
1102	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1167	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103	for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))	1168	for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104	ob_list = cons (x, ob_list);	1169	ob_list = cons (x, ob_list);
1105		1170
1106	return ob_list;	1171	return ob_list;
1107	}	1172	}
1108		1173
…		…
1134		1199
1135	/* returns the new symbol */	1200	/* returns the new symbol */
1136	static pointer	1201	static pointer
1137	oblist_add_by_name (SCHEME_P_ const char *name)	1202	oblist_add_by_name (SCHEME_P_ const char *name)
1138	{	1203	{
1139	pointer x;	1204	pointer x = mk_string (SCHEME_A_ name);
1140
1141	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142	set_typeflag (x, T_SYMBOL);	1205	set_typeflag (x, T_SYMBOL);
1143	setimmutable (car (x));	1206	setimmutable (x);
1144	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1207	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145	return x;	1208	return x;
1146	}	1209	}
1147		1210
1148	static pointer	1211	static pointer
…		…
1181	mk_character (SCHEME_P_ int c)	1244	mk_character (SCHEME_P_ int c)
1182	{	1245	{
1183	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1246	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184		1247
1185	set_typeflag (x, (T_CHARACTER | T_ATOM));	1248	set_typeflag (x, (T_CHARACTER | T_ATOM));
1186	ivalue_unchecked (x) = c & 0xff;	1249	set_ivalue (x, c & 0xff);
1187	set_num_integer (x);	1250
1188	return x;	1251	return x;
1189	}	1252	}
1190		1253
1191	/* get number atom (integer) */	1254	/* get number atom (integer) */
1192	INTERFACE pointer	1255	INTERFACE pointer
1193	mk_integer (SCHEME_P_ long num)	1256	mk_integer (SCHEME_P_ long n)
1194	{	1257	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1258	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1259
1197	set_typeflag (x, (T_NUMBER | T_ATOM));	1260	set_typeflag (x, (T_INTEGER | T_ATOM));
1198	ivalue_unchecked (x) = num;	1261	set_ivalue (x, n);
1199	set_num_integer (x);	1262
1200	return x;	1263	return x;
1201	}	1264	}
1202		1265
1203	INTERFACE pointer	1266	INTERFACE pointer
1204	mk_real (SCHEME_P_ RVALUE n)	1267	mk_real (SCHEME_P_ RVALUE n)
1205	{	1268	{
		1269	#if USE_REAL
1206	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1270	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207		1271
1208	set_typeflag (x, (T_NUMBER | T_ATOM));	1272	set_typeflag (x, (T_REAL | T_ATOM));
1209	rvalue_unchecked (x) = n;	1273	set_rvalue (x, n);
1210	set_num_real (x);	1274
1211	return x;	1275	return x;
		1276	#else
		1277	return mk_integer (SCHEME_A_ n);
		1278	#endif
1212	}	1279	}
1213		1280
1214	static pointer	1281	static pointer
1215	mk_number (SCHEME_P_ const num n)	1282	mk_number (SCHEME_P_ const num n)
1216	{	1283	{
		1284	#if USE_REAL
1217	if (num_is_fixnum (n))	1285	return num_is_fixnum (n)
		1286	? mk_integer (SCHEME_A_ num_ivalue (n))
		1287	: mk_real (SCHEME_A_ num_rvalue (n));
		1288	#else
1218	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1289	return mk_integer (SCHEME_A_ num_ivalue (n));
1219	else	1290	#endif
1220	return mk_real (SCHEME_A_ num_get_rvalue (n));
1221	}	1291	}
1222		1292
1223	/* allocate name to string area */	1293	/* allocate name to string area */
1224	static char *	1294	static char *
1225	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1295	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1231	SCHEME_V->no_memory = 1;	1301	SCHEME_V->no_memory = 1;
1232	return SCHEME_V->strbuff;	1302	return SCHEME_V->strbuff;
1233	}	1303	}
1234		1304
1235	if (str)	1305	if (str)
1236	{	1306	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237	int l = strlen (str);
1238
1239	if (l > len_str)
1240	l = len_str;
1241
1242	memcpy (q, str, l);
1243	q[l] = 0;
1244	}
1245	else	1307	else
1246	{
1247	memset (q, fill, len_str);	1308	memset (q, fill, len_str);
		1309
1248	q[len_str] = 0;	1310	q[len_str] = 0;
1249	}
1250		1311
1251	return q;	1312	return q;
1252	}	1313	}
1253		1314
1254	INTERFACE pointer	1315	INTERFACE pointer
…		…
1268	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1329	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269		1330
1270	set_typeflag (x, T_STRING | T_ATOM);	1331	set_typeflag (x, T_STRING | T_ATOM);
1271	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1332	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272	strlength (x) = len;	1333	strlength (x) = len;
		1334
1273	return x;	1335	return x;
1274	}	1336	}
1275		1337
1276	INTERFACE pointer	1338	INTERFACE pointer
1277	mk_string (SCHEME_P_ const char *str)	1339	mk_string (SCHEME_P_ const char *str)
…		…
1284	{	1346	{
1285	return get_vector_object (SCHEME_A_ len, NIL);	1347	return get_vector_object (SCHEME_A_ len, NIL);
1286	}	1348	}
1287		1349
1288	INTERFACE void	1350	INTERFACE void
1289	fill_vector (pointer vec, pointer obj)	1351	fill_vector (pointer vec, uint32_t start, pointer obj)
1290	{	1352	{
1291	int i;	1353	int i;
1292		1354
1293	for (i = 0; i < vec->object.vector.length; i++)	1355	for (i = start; i < veclength (vec); i++)
1294	vecvalue (vec)[i] = obj;	1356	vecvalue (vec)[i] = obj;
1295	}	1357	}
1296		1358
		1359	INTERFACE void
		1360	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1361	{
		1362	uint32_t oldsize = veclength (vec);
		1363	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1364	veclength (vec) = newsize;
		1365	fill_vector (vec, oldsize, fill);
		1366	}
		1367
1297	INTERFACE pointer	1368	INTERFACE pointer
1298	vector_elem (pointer vec, uint32_t ielem)	1369	vector_get (pointer vec, uint32_t ielem)
1299	{	1370	{
1300	return vecvalue(vec)[ielem];	1371	return vecvalue(vec)[ielem];
1301	}	1372	}
1302		1373
1303	INTERFACE void	1374	INTERFACE void
1304	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1375	vector_set (pointer vec, uint32_t ielem, pointer a)
1305	{	1376	{
1306	vecvalue(vec)[ielem] = a;	1377	vecvalue(vec)[ielem] = a;
1307	}	1378	}
1308		1379
1309	/* get new symbol */	1380	/* get new symbol */
…		…
1321		1392
1322	INTERFACE pointer	1393	INTERFACE pointer
1323	gensym (SCHEME_P)	1394	gensym (SCHEME_P)
1324	{	1395	{
1325	pointer x;	1396	pointer x;
1326
1327	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328	{
1329	char name[40] = "gensym-";	1397	char name[40] = "gensym-";
1330	xnum (name + 7, SCHEME_V->gensym_cnt);	1398	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331		1399
1332	/* first check oblist */	1400	return generate_symbol (SCHEME_A_ name);
1333	x = oblist_find_by_name (SCHEME_A_ name);
1334
1335	if (x == NIL)
1336	{
1337	x = oblist_add_by_name (SCHEME_A_ name);
1338	return x;
1339	}
1340	}
1341
1342	return NIL;
1343	}	1401	}
1344		1402
1345	/* make symbol or number atom from string */	1403	/* make symbol or number atom from string */
1346	static pointer	1404	static pointer
1347	mk_atom (SCHEME_P_ char *q)	1405	mk_atom (SCHEME_P_ char *q)
…		…
1401	}	1459	}
1402	else if ((c == 'e') || (c == 'E'))	1460	else if ((c == 'e') || (c == 'E'))
1403	{	1461	{
1404	if (!has_fp_exp)	1462	if (!has_fp_exp)
1405	{	1463	{
1406	has_dec_point = 1; /* decimal point illegal	1464	has_dec_point = 1; /* decimal point illegal from now on */
1407	from now on */
1408	p++;	1465	p++;
1409		1466
1410	if ((*p == '-') || (*p == '+') || isdigit (*p))	1467	if ((*p == '-') || (*p == '+') || isdigit (*p))
1411	continue;	1468	continue;
1412	}	1469	}
…		…
1500		1557
1501	if (ecb_expect_false (is_vector (p)))	1558	if (ecb_expect_false (is_vector (p)))
1502	{	1559	{
1503	int i;	1560	int i;
1504		1561
1505	for (i = 0; i < p->object.vector.length; i++)	1562	for (i = 0; i < veclength (p); i++)
1506	mark (vecvalue (p)[i]);	1563	mark (vecvalue (p)[i]);
1507	}	1564	}
1508		1565
1509	if (is_atom (p))	1566	if (is_atom (p))
1510	goto E6;	1567	goto E6;
…		…
1608	if (is_mark (p))	1665	if (is_mark (p))
1609	clrmark (p);	1666	clrmark (p);
1610	else	1667	else
1611	{	1668	{
1612	/* reclaim cell */	1669	/* reclaim cell */
1613	if (typeflag (p) != T_FREE)	1670	if (typeflag (p) != T_PAIR)
1614	{	1671	{
1615	finalize_cell (SCHEME_A_ p);	1672	finalize_cell (SCHEME_A_ p);
1616	set_typeflag (p, T_FREE);	1673	set_typeflag (p, T_PAIR);
1617	set_car (p, NIL);	1674	set_car (p, NIL);
1618	}	1675	}
1619		1676
1620	++SCHEME_V->fcells;	1677	++SCHEME_V->fcells;
1621	set_cdr (p, SCHEME_V->free_cell);	1678	set_cdr (p, SCHEME_V->free_cell);
…		…
1623	}	1680	}
1624	}	1681	}
1625	}	1682	}
1626		1683
1627	if (SCHEME_V->gc_verbose)	1684	if (SCHEME_V->gc_verbose)
		1685	{
1628	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");	1686	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
		1687	}
1629	}	1688	}
1630		1689
1631	static void	1690	static void
1632	finalize_cell (SCHEME_P_ pointer a)	1691	finalize_cell (SCHEME_P_ pointer a)
1633	{	1692	{
1634	/* TODO, fast bitmap check? */	1693	/* TODO, fast bitmap check? */
1635	if (is_string (a))	1694	if (is_string (a) || is_symbol (a))
1636	free (strvalue (a));	1695	free (strvalue (a));
1637	else if (is_vector (a))	1696	else if (is_vector (a))
1638	free (vecvalue (a));	1697	free (vecvalue (a));
1639	#if USE_PORTS	1698	#if USE_PORTS
1640	else if (is_port (a))	1699	else if (is_port (a))
…		…
2062	#endif	2121	#endif
2063	}	2122	}
2064		2123
2065	/* read characters up to delimiter, but cater to character constants */	2124	/* read characters up to delimiter, but cater to character constants */
2066	static char *	2125	static char *
2067	readstr_upto (SCHEME_P_ char *delim)	2126	readstr_upto (SCHEME_P_ int skip, const char *delim)
2068	{	2127	{
2069	char *p = SCHEME_V->strbuff;	2128	char *p = SCHEME_V->strbuff + skip;
2070		2129
2071	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2130	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072		2131
2073	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2132	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074	*p = 0;	2133	*p = 0;
…		…
2081	return SCHEME_V->strbuff;	2140	return SCHEME_V->strbuff;
2082	}	2141	}
2083		2142
2084	/* read string expression "xxx...xxx" */	2143	/* read string expression "xxx...xxx" */
2085	static pointer	2144	static pointer
2086	readstrexp (SCHEME_P)	2145	readstrexp (SCHEME_P_ char delim)
2087	{	2146	{
2088	char *p = SCHEME_V->strbuff;	2147	char *p = SCHEME_V->strbuff;
2089	int c;	2148	int c;
2090	int c1 = 0;	2149	int c1 = 0;
2091	enum
2092	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2150	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093		2151
2094	for (;;)	2152	for (;;)
2095	{	2153	{
2096	c = inchar (SCHEME_A);	2154	c = inchar (SCHEME_A);
2097		2155
…		…
2099	return S_F;	2157	return S_F;
2100		2158
2101	switch (state)	2159	switch (state)
2102	{	2160	{
2103	case st_ok:	2161	case st_ok:
2104	switch (c)	2162	if (ecb_expect_false (c == delim))
2105	{
2106	case '\\':
2107	state = st_bsl;
2108	break;
2109
2110	case '"':
2111	*p = 0;
2112	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2163	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113		2164
2114	default:	2165	if (ecb_expect_false (c == '\\'))
		2166	state = st_bsl;
		2167	else
2115	*p++ = c;	2168	*p++ = c;
2116	break;
2117	}
2118		2169
2119	break;	2170	break;
2120		2171
2121	case st_bsl:	2172	case st_bsl:
2122	switch (c)	2173	switch (c)
…		…
2152	case 'r':	2203	case 'r':
2153	*p++ = '\r';	2204	*p++ = '\r';
2154	state = st_ok;	2205	state = st_ok;
2155	break;	2206	break;
2156		2207
2157	case '"':
2158	*p++ = '"';
2159	state = st_ok;
2160	break;
2161
2162	default:	2208	default:
2163	*p++ = c;	2209	*p++ = c;
2164	state = st_ok;	2210	state = st_ok;
2165	break;	2211	break;
2166	}	2212	}
2167		2213
2168	break;	2214	break;
2169		2215
2170	case st_x1:	2216	case st_x1:
2171	case st_x2:	2217	case st_x2:
2172	c = toupper (c);	2218	c = tolower (c);
2173		2219
2174	if (c >= '0' && c <= 'F')	2220	if (c >= '0' && c <= '9')
2175	{
2176	if (c <= '9')
2177	c1 = (c1 << 4) + c - '0';	2221	c1 = (c1 << 4) + c - '0';
2178	else	2222	else if (c >= 'a' && c <= 'f')
2179	c1 = (c1 << 4) + c - 'A' + 10;	2223	c1 = (c1 << 4) + c - 'a' + 10;
2180
2181	if (state == st_x1)
2182	state = st_x2;
2183	else
2184	{
2185	*p++ = c1;
2186	state = st_ok;
2187	}
2188	}
2189	else	2224	else
2190	return S_F;	2225	return S_F;
		2226
		2227	if (state == st_x1)
		2228	state = st_x2;
		2229	else
		2230	{
		2231	*p++ = c1;
		2232	state = st_ok;
		2233	}
2191		2234
2192	break;	2235	break;
2193		2236
2194	case st_oct1:	2237	case st_oct1:
2195	case st_oct2:	2238	case st_oct2:
…		…
2199	backchar (SCHEME_A_ c);	2242	backchar (SCHEME_A_ c);
2200	state = st_ok;	2243	state = st_ok;
2201	}	2244	}
2202	else	2245	else
2203	{	2246	{
2204	if (state == st_oct2 && c1 >= 32)	2247	if (state == st_oct2 && c1 >= ' ')
2205	return S_F;	2248	return S_F;
2206		2249
2207	c1 = (c1 << 3) + (c - '0');	2250	c1 = (c1 << 3) + (c - '0');
2208		2251
2209	if (state == st_oct1)	2252	if (state == st_oct1)
…		…
2214	state = st_ok;	2257	state = st_ok;
2215	}	2258	}
2216	}	2259	}
2217		2260
2218	break;	2261	break;
2219
2220	}	2262	}
2221	}	2263	}
2222	}	2264	}
2223		2265
2224	/* check c is in chars */	2266	/* check c is in chars */
2225	ecb_inline int	2267	ecb_inline int
2226	is_one_of (char *s, int c)	2268	is_one_of (const char *s, int c)
2227	{	2269	{
2228	if (c == EOF)
2229	return 1;
2230
2231	return !!strchr (s, c);	2270	return c == EOF || !!strchr (s, c);
2232	}	2271	}
2233		2272
2234	/* skip white characters */	2273	/* skip white characters */
2235	ecb_inline int	2274	ecb_inline int
2236	skipspace (SCHEME_P)	2275	skipspace (SCHEME_P)
…		…
2238	int c, curr_line = 0;	2277	int c, curr_line = 0;
2239		2278
2240	do	2279	do
2241	{	2280	{
2242	c = inchar (SCHEME_A);	2281	c = inchar (SCHEME_A);
		2282
2243	#if SHOW_ERROR_LINE	2283	#if SHOW_ERROR_LINE
2244	if (c == '\n')	2284	if (ecb_expect_false (c == '\n'))
2245	curr_line++;	2285	curr_line++;
2246	#endif	2286	#endif
		2287
		2288	if (ecb_expect_false (c == EOF))
		2289	return c;
2247	}	2290	}
2248	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2291	while (is_one_of (WHITESPACE, c));
2249		2292
2250	/* record it */	2293	/* record it */
2251	#if SHOW_ERROR_LINE	2294	#if SHOW_ERROR_LINE
2252	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2295	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2296	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254	#endif	2297	#endif
2255		2298
2256	if (c != EOF)
2257	{
2258	backchar (SCHEME_A_ c);	2299	backchar (SCHEME_A_ c);
2259	return 1;	2300	return 1;
2260	}
2261	else
2262	return EOF;
2263	}	2301	}
2264		2302
2265	/* get token */	2303	/* get token */
2266	static int	2304	static int
2267	token (SCHEME_P)	2305	token (SCHEME_P)
…		…
2283	return TOK_RPAREN;	2321	return TOK_RPAREN;
2284		2322
2285	case '.':	2323	case '.':
2286	c = inchar (SCHEME_A);	2324	c = inchar (SCHEME_A);
2287		2325
2288	if (is_one_of (" \n\t", c))	2326	if (is_one_of (WHITESPACE, c))
2289	return TOK_DOT;	2327	return TOK_DOT;
2290	else	2328	else
2291	{	2329	{
2292	//TODO: ungetc twice in a row is not supported in C
2293	backchar (SCHEME_A_ c);	2330	backchar (SCHEME_A_ c);
2294	backchar (SCHEME_A_ '.');
2295	return TOK_ATOM;	2331	return TOK_DOTATOM;
2296	}	2332	}
		2333
		2334	case '|':
		2335	return TOK_STRATOM;
2297		2336
2298	case '\'':	2337	case '\'':
2299	return TOK_QUOTE;	2338	return TOK_QUOTE;
2300		2339
2301	case ';':	2340	case ';':
…		…
2433	}	2472	}
2434		2473
2435	putcharacter (SCHEME_A_ '"');	2474	putcharacter (SCHEME_A_ '"');
2436	}	2475	}
2437		2476
2438
2439	/* print atoms */	2477	/* print atoms */
2440	static void	2478	static void
2441	printatom (SCHEME_P_ pointer l, int f)	2479	printatom (SCHEME_P_ pointer l, int f)
2442	{	2480	{
2443	char *p;	2481	char *p;
2444	int len;	2482	int len;
2445		2483
2446	atom2str (SCHEME_A_ l, f, &p, &len);	2484	atom2str (SCHEME_A_ l, f, &p, &len);
2447	putchars (SCHEME_A_ p, len);	2485	putchars (SCHEME_A_ p, len);
2448	}	2486	}
2449
2450		2487
2451	/* Uses internal buffer unless string pointer is already available */	2488	/* Uses internal buffer unless string pointer is already available */
2452	static void	2489	static void
2453	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2490	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454	{	2491	{
…		…
2615	#endif	2652	#endif
2616	}	2653	}
2617	else if (is_continuation (l))	2654	else if (is_continuation (l))
2618	p = "#<CONTINUATION>";	2655	p = "#<CONTINUATION>";
2619	else	2656	else
		2657	{
		2658	#if USE_PRINTF
		2659	p = SCHEME_V->strbuff;
		2660	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2661	#else
2620	p = "#<ERROR>";	2662	p = "#<ERROR>";
		2663	#endif
		2664	}
2621		2665
2622	*pp = p;	2666	*pp = p;
2623	*plen = strlen (p);	2667	*plen = strlen (p);
2624	}	2668	}
2625		2669
…		…
2769	/* () is #t in R5RS */	2813	/* () is #t in R5RS */
2770	#define is_true(p) ((p) != S_F)	2814	#define is_true(p) ((p) != S_F)
2771	#define is_false(p) ((p) == S_F)	2815	#define is_false(p) ((p) == S_F)
2772		2816
2773	/* ========== Environment implementation ========== */	2817	/* ========== Environment implementation ========== */
2774
2775	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777	static int
2778	hash_fn (const char *key, int table_size)
2779	{
2780	const unsigned char *p = key;
2781	uint32_t hash = 2166136261;
2782
2783	while (*p)
2784	hash = (hash ^ *p++) * 16777619;
2785
2786	return hash % table_size;
2787	}
2788	#endif
2789		2818
2790	#ifndef USE_ALIST_ENV	2819	#ifndef USE_ALIST_ENV
2791		2820
2792	/*	2821	/*
2793	* In this implementation, each frame of the environment may be	2822	* In this implementation, each frame of the environment may be
…		…
2810		2839
2811	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2840	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812	setenvironment (SCHEME_V->envir);	2841	setenvironment (SCHEME_V->envir);
2813	}	2842	}
2814		2843
		2844	static uint32_t
		2845	sym_hash (pointer sym, uint32_t size)
		2846	{
		2847	uintptr_t ptr = (uintptr_t)sym;
		2848
		2849	#if 0
		2850	/* table size is prime, so why mix */
		2851	ptr += ptr >> 32;
		2852	ptr += ptr >> 16;
		2853	ptr += ptr >> 8;
		2854	#endif
		2855
		2856	return ptr % size;
		2857	}
		2858
2815	ecb_inline void	2859	ecb_inline void
2816	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2860	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817	{	2861	{
2818	pointer slot = immutable_cons (variable, value);	2862	pointer slot = immutable_cons (variable, value);
2819		2863
2820	if (is_vector (car (env)))	2864	if (is_vector (car (env)))
2821	{	2865	{
2822	int location = hash_fn (symname (variable), veclength (car (env)));	2866	int location = sym_hash (variable, veclength (car (env)));
2823
2824	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2867	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825	}	2868	}
2826	else	2869	else
2827	set_car (env, immutable_cons (slot, car (env)));	2870	set_car (env, immutable_cons (slot, car (env)));
2828	}	2871	}
2829		2872
2830	static pointer	2873	static pointer
2831	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2874	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832	{	2875	{
2833	pointer x, y;	2876	pointer x, y;
2834	int location;
2835		2877
2836	for (x = env; x != NIL; x = cdr (x))	2878	for (x = env; x != NIL; x = cdr (x))
2837	{	2879	{
2838	if (is_vector (car (x)))	2880	if (is_vector (car (x)))
2839	{	2881	{
2840	location = hash_fn (symname (hdl), veclength (car (x)));	2882	int location = sym_hash (hdl, veclength (car (x)));
2841	y = vector_elem (car (x), location);	2883	y = vector_get (car (x), location);
2842	}	2884	}
2843	else	2885	else
2844	y = car (x);	2886	y = car (x);
2845		2887
2846	for (; y != NIL; y = cdr (y))	2888	for (; y != NIL; y = cdr (y))
2847	if (caar (y) == hdl)	2889	if (caar (y) == hdl)
2848	break;	2890	break;
2849		2891
2850	if (y != NIL)	2892	if (y != NIL)
		2893	return car (y);
		2894
		2895	if (!all)
2851	break;	2896	break;
2852
2853	if (!all)
2854	return NIL;
2855	}	2897	}
2856
2857	if (x != NIL)
2858	return car (y);
2859		2898
2860	return NIL;	2899	return NIL;
2861	}	2900	}
2862		2901
2863	#else /* USE_ALIST_ENV */	2902	#else /* USE_ALIST_ENV */
…		…
2885	for (y = car (x); y != NIL; y = cdr (y))	2924	for (y = car (x); y != NIL; y = cdr (y))
2886	if (caar (y) == hdl)	2925	if (caar (y) == hdl)
2887	break;	2926	break;
2888		2927
2889	if (y != NIL)	2928	if (y != NIL)
		2929	return car (y);
2890	break;	2930	break;
2891		2931
2892	if (!all)	2932	if (!all)
2893	return NIL;	2933	break;
2894	}	2934	}
2895
2896	if (x != NIL)
2897	return car (y);
2898		2935
2899	return NIL;	2936	return NIL;
2900	}	2937	}
2901		2938
2902	#endif /* USE_ALIST_ENV else */	2939	#endif /* USE_ALIST_ENV else */
2903		2940
2904	ecb_inline void	2941	ecb_inline void
2905	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2942	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906	{	2943	{
		2944	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2945	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908	}	2946	}
2909		2947
2910	ecb_inline void	2948	ecb_inline void
2911	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2949	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3119	int i = 0;	3157	int i = 0;
3120	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3158	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121		3159
3122	while (cont != NIL)	3160	while (cont != NIL)
3123	{	3161	{
3124	frame->op = ivalue (car (cont)); cont = cdr (cont);	3162	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125	frame->args = car (cont) ; cont = cdr (cont);	3163	frame->args = car (cont) ; cont = cdr (cont);
3126	frame->envir = car (cont) ; cont = cdr (cont);	3164	frame->envir = car (cont) ; cont = cdr (cont);
3127	frame->code = car (cont) ; cont = cdr (cont);	3165	frame->code = car (cont) ; cont = cdr (cont);
3128		3166
3129	++frame;	3167	++frame;
3130	++i;	3168	++i;
3131	}	3169	}
3132		3170
…		…
3161	SCHEME_V->value = a;	3199	SCHEME_V->value = a;
3162		3200
3163	if (dump == NIL)	3201	if (dump == NIL)
3164	return -1;	3202	return -1;
3165		3203
3166	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3204	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3205	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3206	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3207	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170		3208
3171	SCHEME_V->dump = dump;	3209	SCHEME_V->dump = dump;
3172		3210
3173	return 0;	3211	return 0;
3174	}	3212	}
…		…
3203		3241
3204	#endif	3242	#endif
3205		3243
3206	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3244	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3207		3245
		3246	#if 1
		3247	static int
		3248	debug (SCHEME_P_ int indent, pointer x)
		3249	{
		3250	int c;
		3251
		3252	if (is_syntax (x))
		3253	{
		3254	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3255	return 8 + 8;
		3256	}
		3257
		3258	if (x == NIL)
		3259	{
		3260	printf ("%*sNIL\n", indent, "");
		3261	return 3;
		3262	}
		3263
		3264	switch (type (x))
		3265	{
		3266	case T_INTEGER:
		3267	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3268	return 32+8;
		3269
		3270	case T_SYMBOL:
		3271	printf ("%*sS<%s>\n", indent, "", symname (x));
		3272	return 24+8;
		3273
		3274	case T_CLOSURE:
		3275	printf ("%*sS<%s>\n", indent, "", "closure");
		3276	debug (SCHEME_A_ indent + 3, cdr(x));
		3277	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3278
		3279	case T_PAIR:
		3280	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3281	c = debug (SCHEME_A_ indent + 3, car (x));
		3282	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3283	return c + 1;
		3284
		3285	case T_PORT:
		3286	printf ("%*sS<%s>\n", indent, "", "port");
		3287	return 24+8;
		3288
		3289	case T_VECTOR:
		3290	printf ("%*sS<%s>\n", indent, "", "vector");
		3291	return 24+8;
		3292
		3293	case T_ENVIRONMENT:
		3294	printf ("%*sS<%s>\n", indent, "", "environment");
		3295	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3296
		3297	default:
		3298	printf ("unhandled type %d\n", type (x));
		3299	break;
		3300	}
		3301	}
		3302	#endif
		3303
3208	static int	3304	static int
3209	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3305	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210	{	3306	{
3211	pointer args = SCHEME_V->args;	3307	pointer args = SCHEME_V->args;
3212	pointer x, y;	3308	pointer x, y;
3213		3309
3214	switch (op)	3310	switch (op)
3215	{	3311	{
		3312	#if 1 //D
		3313	case OP_DEBUG:
		3314	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3315	printf ("\n");
		3316	s_return (S_T);
		3317	#endif
3216	case OP_LOAD: /* load */	3318	case OP_LOAD: /* load */
3217	if (file_interactive (SCHEME_A))	3319	if (file_interactive (SCHEME_A))
3218	{	3320	{
3219	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3321	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3220	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3322	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
…		…
3343	}	3445	}
3344	else	3446	else
3345	s_return (SCHEME_V->code);	3447	s_return (SCHEME_V->code);
3346		3448
3347	case OP_E0ARGS: /* eval arguments */	3449	case OP_E0ARGS: /* eval arguments */
3348	if (is_macro (SCHEME_V->value)) /* macro expansion */	3450	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349	{	3451	{
3350	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3452	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3453	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352	SCHEME_V->code = SCHEME_V->value;	3454	SCHEME_V->code = SCHEME_V->value;
3353	s_goto (OP_APPLY);	3455	s_goto (OP_APPLY);
…		…
3380		3482
3381	case OP_TRACING:	3483	case OP_TRACING:
3382	{	3484	{
3383	int tr = SCHEME_V->tracing;	3485	int tr = SCHEME_V->tracing;
3384		3486
3385	SCHEME_V->tracing = ivalue (car (args));	3487	SCHEME_V->tracing = ivalue_unchecked (car (args));
3386	s_return (mk_integer (SCHEME_A_ tr));	3488	s_return (mk_integer (SCHEME_A_ tr));
3387	}	3489	}
3388		3490
3389	#endif	3491	#endif
3390		3492
…		…
3909	{	4011	{
3910	pointer args = SCHEME_V->args;	4012	pointer args = SCHEME_V->args;
3911	pointer x = car (args);	4013	pointer x = car (args);
3912	num v;	4014	num v;
3913		4015
3914	#if USE_MATH
3915	RVALUE dd;
3916	#endif
3917
3918	switch (op)	4016	switch (op)
3919	{	4017	{
3920	#if USE_MATH	4018	#if USE_MATH
3921	case OP_INEX2EX: /* inexact->exact */	4019	case OP_INEX2EX: /* inexact->exact */
		4020	{
3922	if (is_integer (x))	4021	if (is_integer (x))
3923	s_return (x);	4022	s_return (x);
3924	else if (modf (rvalue_unchecked (x), &dd) == 0)	4023
		4024	RVALUE r = rvalue_unchecked (x);
		4025
		4026	if (r == (RVALUE)(IVALUE)r)
3925	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4027	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3926	else	4028	else
3927	Error_1 ("inexact->exact: not integral:", x);	4029	Error_1 ("inexact->exact: not integral:", x);
		4030	}
3928		4031
3929	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4032	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4033	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3931	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4034	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4035	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3966	/* If the test fails, result is too big for integer. */	4069	/* If the test fails, result is too big for integer. */
3967	if (!real_result)	4070	if (!real_result)
3968	{	4071	{
3969	long result_as_long = result;	4072	long result_as_long = result;
3970		4073
3971	if (result != (RVALUE) result_as_long)	4074	if (result != result_as_long)
3972	real_result = 1;	4075	real_result = 1;
3973	}	4076	}
3974		4077
3975	if (real_result)	4078	if (real_result)
3976	s_return (mk_real (SCHEME_A_ result));	4079	s_return (mk_real (SCHEME_A_ result));
…		…
3981	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4084	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4085	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983		4086
3984	case OP_TRUNCATE:	4087	case OP_TRUNCATE:
3985	{	4088	{
3986	RVALUE rvalue_of_x;	4089	RVALUE n = rvalue (x);
3987
3988	rvalue_of_x = rvalue (x);
3989
3990	if (rvalue_of_x > 0)
3991	s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));	4090	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
3992	else
3993	s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994	}	4091	}
3995		4092
3996	case OP_ROUND:	4093	case OP_ROUND:
3997	if (num_is_integer (x))	4094	if (is_integer (x))
3998	s_return (x);	4095	s_return (x);
3999		4096
4000	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4097	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001	#endif	4098	#endif
4002		4099
…		…
4122	}	4219	}
4123	else	4220	else
4124	Error_0 ("set-cdr!: unable to alter immutable pair");	4221	Error_0 ("set-cdr!: unable to alter immutable pair");
4125		4222
4126	case OP_CHAR2INT: /* char->integer */	4223	case OP_CHAR2INT: /* char->integer */
4127	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4224	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128		4225
4129	case OP_INT2CHAR: /* integer->char */	4226	case OP_INT2CHAR: /* integer->char */
4130	s_return (mk_character (SCHEME_A_ ivalue (x)));	4227	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131		4228
4132	case OP_CHARUPCASE:	4229	case OP_CHARUPCASE:
4133	{	4230	{
4134	unsigned char c = ivalue (x);	4231	unsigned char c = ivalue_unchecked (x);
4135	c = toupper (c);	4232	c = toupper (c);
4136	s_return (mk_character (SCHEME_A_ c));	4233	s_return (mk_character (SCHEME_A_ c));
4137	}	4234	}
4138		4235
4139	case OP_CHARDNCASE:	4236	case OP_CHARDNCASE:
4140	{	4237	{
4141	unsigned char c = ivalue (x);	4238	unsigned char c = ivalue_unchecked (x);
4142	c = tolower (c);	4239	c = tolower (c);
4143	s_return (mk_character (SCHEME_A_ c));	4240	s_return (mk_character (SCHEME_A_ c));
4144	}	4241	}
4145		4242
4146	case OP_STR2SYM: /* string->symbol */	4243	case OP_STR2SYM: /* string->symbol */
…		…
4223	Error_1 ("atom->string: not an atom:", x);	4320	Error_1 ("atom->string: not an atom:", x);
4224	}	4321	}
4225		4322
4226	case OP_MKSTRING: /* make-string */	4323	case OP_MKSTRING: /* make-string */
4227	{	4324	{
4228	int fill = ' ';	4325	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229	int len;
4230
4231	len = ivalue (x);	4326	int len = ivalue_unchecked (x);
4232
4233	if (cdr (args) != NIL)
4234	fill = charvalue (cadr (args));
4235		4327
4236	s_return (mk_empty_string (SCHEME_A_ len, fill));	4328	s_return (mk_empty_string (SCHEME_A_ len, fill));
4237	}	4329	}
4238		4330
4239	case OP_STRLEN: /* string-length */	4331	case OP_STRLEN: /* string-length */
4240	s_return (mk_integer (SCHEME_A_ strlength (x)));	4332	s_return (mk_integer (SCHEME_A_ strlength (x)));
4241		4333
4242	case OP_STRREF: /* string-ref */	4334	case OP_STRREF: /* string-ref */
4243	{	4335	{
4244	char *str;
4245	int index;
4246
4247	str = strvalue (x);	4336	char *str = strvalue (x);
4248
4249	index = ivalue (cadr (args));	4337	int index = ivalue_unchecked (cadr (args));
4250		4338
4251	if (index >= strlength (x))	4339	if (index >= strlength (x))
4252	Error_1 ("string-ref: out of bounds:", cadr (args));	4340	Error_1 ("string-ref: out of bounds:", cadr (args));
4253		4341
4254	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4342	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255	}	4343	}
4256		4344
4257	case OP_STRSET: /* string-set! */	4345	case OP_STRSET: /* string-set! */
4258	{	4346	{
4259	char *str;	4347	char *str = strvalue (x);
4260	int index;	4348	int index = ivalue_unchecked (cadr (args));
4261	int c;	4349	int c;
4262		4350
4263	if (is_immutable (x))	4351	if (is_immutable (x))
4264	Error_1 ("string-set!: unable to alter immutable string:", x);	4352	Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266	str = strvalue (x);
4267
4268	index = ivalue (cadr (args));
4269		4353
4270	if (index >= strlength (x))	4354	if (index >= strlength (x))
4271	Error_1 ("string-set!: out of bounds:", cadr (args));	4355	Error_1 ("string-set!: out of bounds:", cadr (args));
4272		4356
4273	c = charvalue (caddr (args));	4357	c = charvalue (caddr (args));
…		…
4296	s_return (newstr);	4380	s_return (newstr);
4297	}	4381	}
4298		4382
4299	case OP_SUBSTR: /* substring */	4383	case OP_SUBSTR: /* substring */
4300	{	4384	{
4301	char *str;	4385	char *str = strvalue (x);
4302	int index0;	4386	int index0 = ivalue_unchecked (cadr (args));
4303	int index1;	4387	int index1;
4304	int len;	4388	int len;
4305		4389
4306	str = strvalue (x);
4307
4308	index0 = ivalue (cadr (args));
4309
4310	if (index0 > strlength (x))	4390	if (index0 > strlength (x))
4311	Error_1 ("substring: start out of bounds:", cadr (args));	4391	Error_1 ("substring: start out of bounds:", cadr (args));
4312		4392
4313	if (cddr (args) != NIL)	4393	if (cddr (args) != NIL)
4314	{	4394	{
4315	index1 = ivalue (caddr (args));	4395	index1 = ivalue_unchecked (caddr (args));
4316		4396
4317	if (index1 > strlength (x) || index1 < index0)	4397	if (index1 > strlength (x) || index1 < index0)
4318	Error_1 ("substring: end out of bounds:", caddr (args));	4398	Error_1 ("substring: end out of bounds:", caddr (args));
4319	}	4399	}
4320	else	4400	else
…		…
4343	if (SCHEME_V->no_memory)	4423	if (SCHEME_V->no_memory)
4344	s_return (S_SINK);	4424	s_return (S_SINK);
4345	#endif	4425	#endif
4346		4426
4347	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4427	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348	set_vector_elem (vec, i, car (x));	4428	vector_set (vec, i, car (x));
4349		4429
4350	s_return (vec);	4430	s_return (vec);
4351	}	4431	}
4352		4432
4353	case OP_MKVECTOR: /* make-vector */	4433	case OP_MKVECTOR: /* make-vector */
4354	{	4434	{
4355	pointer fill = NIL;	4435	pointer fill = NIL;
4356	int len;
4357	pointer vec;	4436	pointer vec;
4358
4359	len = ivalue (x);	4437	int len = ivalue_unchecked (x);
4360		4438
4361	if (cdr (args) != NIL)	4439	if (cdr (args) != NIL)
4362	fill = cadr (args);	4440	fill = cadr (args);
4363		4441
4364	vec = mk_vector (SCHEME_A_ len);	4442	vec = mk_vector (SCHEME_A_ len);
…		…
4367	if (SCHEME_V->no_memory)	4445	if (SCHEME_V->no_memory)
4368	s_return (S_SINK);	4446	s_return (S_SINK);
4369	#endif	4447	#endif
4370		4448
4371	if (fill != NIL)	4449	if (fill != NIL)
4372	fill_vector (vec, fill);	4450	fill_vector (vec, 0, fill);
4373		4451
4374	s_return (vec);	4452	s_return (vec);
4375	}	4453	}
4376		4454
4377	case OP_VECLEN: /* vector-length */	4455	case OP_VECLEN: /* vector-length */
4378	s_return (mk_integer (SCHEME_A_ veclength (x)));	4456	s_return (mk_integer (SCHEME_A_ veclength (x)));
4379		4457
		4458	case OP_VECRESIZE:
		4459	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4460	s_return (x);
		4461
4380	case OP_VECREF: /* vector-ref */	4462	case OP_VECREF: /* vector-ref */
4381	{	4463	{
4382	int index;
4383
4384	index = ivalue (cadr (args));	4464	int index = ivalue_unchecked (cadr (args));
4385		4465
4386	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4466	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387	Error_1 ("vector-ref: out of bounds:", cadr (args));	4467	Error_1 ("vector-ref: out of bounds:", cadr (args));
4388		4468
4389	s_return (vector_elem (x, index));	4469	s_return (vector_get (x, index));
4390	}	4470	}
4391		4471
4392	case OP_VECSET: /* vector-set! */	4472	case OP_VECSET: /* vector-set! */
4393	{	4473	{
4394	int index;	4474	int index = ivalue_unchecked (cadr (args));
4395		4475
4396	if (is_immutable (x))	4476	if (is_immutable (x))
4397	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4477	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398		4478
4399	index = ivalue (cadr (args));
4400
4401	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4479	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402	Error_1 ("vector-set!: out of bounds:", cadr (args));	4480	Error_1 ("vector-set!: out of bounds:", cadr (args));
4403		4481
4404	set_vector_elem (x, index, caddr (args));	4482	vector_set (x, index, caddr (args));
4405	s_return (x);	4483	s_return (x);
4406	}	4484	}
4407	}	4485	}
4408		4486
4409	if (USE_ERROR_CHECKING) abort ();	4487	if (USE_ERROR_CHECKING) abort ();
4410	}
4411
4412	INTERFACE int
4413	is_list (SCHEME_P_ pointer a)
4414	{
4415	return list_length (SCHEME_A_ a) >= 0;
4416	}
4417
4418	/* Result is:
4419	proper list: length
4420	circular list: -1
4421	not even a pair: -2
4422	dotted list: -2 minus length before dot
4423	*/
4424	INTERFACE int
4425	list_length (SCHEME_P_ pointer a)
4426	{
4427	int i = 0;
4428	pointer slow, fast;
4429
4430	slow = fast = a;
4431
4432	while (1)
4433	{
4434	if (fast == NIL)
4435	return i;
4436
4437	if (!is_pair (fast))
4438	return -2 - i;
4439
4440	fast = cdr (fast);
4441	++i;
4442
4443	if (fast == NIL)
4444	return i;
4445
4446	if (!is_pair (fast))
4447	return -2 - i;
4448
4449	++i;
4450	fast = cdr (fast);
4451
4452	/* Safe because we would have already returned if `fast'
4453	encountered a non-pair. */
4454	slow = cdr (slow);
4455
4456	if (fast == slow)
4457	{
4458	/* the fast pointer has looped back around and caught up
4459	with the slow pointer, hence the structure is circular,
4460	not of finite length, and therefore not a list */
4461	return -1;
4462	}
4463	}
4464	}	4488	}
4465		4489
4466	static int	4490	static int
4467	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4491	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468	{	4492	{
…		…
4514	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4538	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4539	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4540	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517		4541
4518	#if USE_CHAR_CLASSIFIERS	4542	#if USE_CHAR_CLASSIFIERS
4519	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4543	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4544	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4545	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4546	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4547	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524	#endif	4548	#endif
4525		4549
4526	#if USE_PORTS	4550	#if USE_PORTS
4527	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4551	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4552	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4729		4753
4730	case OP_NEWSEGMENT: /* new-segment */	4754	case OP_NEWSEGMENT: /* new-segment */
4731	if (!is_pair (args) || !is_number (a))	4755	if (!is_pair (args) || !is_number (a))
4732	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4733		4757
4734	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4758	alloc_cellseg (SCHEME_A_ ivalue (a));
4735		4759
4736	s_return (S_T);	4760	s_return (S_T);
4737		4761
4738	case OP_OBLIST: /* oblist */	4762	case OP_OBLIST: /* oblist */
4739	s_return (oblist_all_symbols (SCHEME_A));	4763	s_return (oblist_all_symbols (SCHEME_A));
…		…
4997	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5021	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998	SCHEME_V->tok = token (SCHEME_A);	5022	SCHEME_V->tok = token (SCHEME_A);
4999	s_goto (OP_RDSEXPR);	5023	s_goto (OP_RDSEXPR);
5000		5024
5001	case TOK_ATOM:	5025	case TOK_ATOM:
5002	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5026	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5027
		5028	case TOK_DOTATOM:
		5029	SCHEME_V->strbuff[0] = '.';
		5030	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5031
		5032	case TOK_STRATOM:
		5033	x = readstrexp (SCHEME_A_ '|');
		5034	//TODO: haven't checked whether the garbage collector could interfere
		5035	s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003		5036
5004	case TOK_DQUOTE:	5037	case TOK_DQUOTE:
5005	x = readstrexp (SCHEME_A);	5038	x = readstrexp (SCHEME_A_ '"');
5006		5039
5007	if (x == S_F)	5040	if (x == S_F)
5008	Error_0 ("Error reading string");	5041	Error_0 ("Error reading string");
5009		5042
5010	setimmutable (x);	5043	setimmutable (x);
…		…
5022	s_goto (OP_EVAL);	5055	s_goto (OP_EVAL);
5023	}	5056	}
5024	}	5057	}
5025		5058
5026	case TOK_SHARP_CONST:	5059	case TOK_SHARP_CONST:
5027	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5060	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028	Error_0 ("undefined sharp expression");	5061	Error_0 ("undefined sharp expression");
5029	else	5062	else
5030	s_return (x);	5063	s_return (x);
5031		5064
5032	default:	5065	default:
…		…
5184	putstr (SCHEME_A_ ")");	5217	putstr (SCHEME_A_ ")");
5185	s_return (S_T);	5218	s_return (S_T);
5186	}	5219	}
5187	else	5220	else
5188	{	5221	{
5189	pointer elem = vector_elem (vec, i);	5222	pointer elem = vector_get (vec, i);
5190		5223
5191	ivalue_unchecked (cdr (args)) = i + 1;	5224	ivalue_unchecked (cdr (args)) = i + 1;
5192	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5225	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193	SCHEME_V->args = elem;	5226	SCHEME_V->args = elem;
5194		5227
…		…
5254		5287
5255	case OP_CLOSUREP: /* closure? */	5288	case OP_CLOSUREP: /* closure? */
5256	/*	5289	/*
5257	* Note, macro object is also a closure.	5290	* Note, macro object is also a closure.
5258	* Therefore, (closure? <#MACRO>) ==> #t	5291	* Therefore, (closure? <#MACRO>) ==> #t
		5292	* (schmorp) well, obviously not, fix? TODO
5259	*/	5293	*/
5260	s_retbool (is_closure (a));	5294	s_retbool (is_closure (a));
5261		5295
5262	case OP_MACROP: /* macro? */	5296	case OP_MACROP: /* macro? */
5263	s_retbool (is_macro (a));	5297	s_retbool (is_macro (a));
…		…
5269	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5303	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);	5304	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271		5305
5272	typedef int (*test_predicate)(pointer);	5306	typedef int (*test_predicate)(pointer);
5273	static int	5307	static int
5274	is_any (pointer p)	5308	tst_any (pointer p)
5275	{	5309	{
5276	return 1;	5310	return 1;
5277	}	5311	}
5278		5312
5279	static int	5313	static int
5280	is_nonneg (pointer p)	5314	tst_inonneg (pointer p)
5281	{	5315	{
5282	return ivalue (p) >= 0 && is_integer (p);	5316	return is_integer (p) && ivalue_unchecked (p) >= 0;
5283	}	5317	}
5284		5318
5285	static int	5319	static int
5286	tst_is_list (pointer p)	5320	tst_is_list (SCHEME_P_ pointer p)
5287	{	5321	{
5288	return p == NIL || is_pair (p);	5322	return p == NIL || is_pair (p);
5289	}	5323	}
5290		5324
5291	/* Correspond carefully with following defines! */	5325	/* Correspond carefully with following defines! */
5292	static struct	5326	static struct
5293	{	5327	{
5294	test_predicate fct;	5328	test_predicate fct;
5295	const char *kind;	5329	const char *kind;
5296	} tests[] =	5330	} tests[] = {
5297	{
5298	{ is_any, 0 },	5331	{ tst_any , 0 },
5299	{ is_string, "string" },	5332	{ is_string , "string" },
5300	{ is_symbol, "symbol" },	5333	{ is_symbol , "symbol" },
5301	{ is_port, "port" },	5334	{ is_port , "port" },
5302	{ is_inport, "input port" },	5335	{ is_inport , "input port" },
5303	{ is_outport, "output port" },	5336	{ is_outport , "output port" },
5304	{ is_environment, "environment" },	5337	{ is_environment, "environment" },
5305	{ is_pair, "pair" },	5338	{ is_pair , "pair" },
5306	{ tst_is_list, "pair or '()" },	5339	{ 0 , "pair or '()" },
5307	{ is_character, "character" },	5340	{ is_character , "character" },
5308	{ is_vector, "vector" },	5341	{ is_vector , "vector" },
5309	{ is_number, "number" },	5342	{ is_number , "number" },
5310	{ is_integer, "integer" },	5343	{ is_integer , "integer" },
5311	{ is_nonneg, "non-negative integer" }	5344	{ tst_inonneg , "non-negative integer" }
5312	};	5345	};
5313		5346
5314	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5347	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315	#define TST_ANY "\001"	5348	#define TST_ANY "\001"
5316	#define TST_STRING "\002"	5349	#define TST_STRING "\002"
…		…
5357	typedef struct	5390	typedef struct
5358	{	5391	{
5359	uint8_t func;	5392	uint8_t func;
5360	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */	5393	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361	uint8_t builtin;	5394	uint8_t builtin;
		5395	#if USE_ERROR_CHECKING
5362	uint8_t min_arity;	5396	uint8_t min_arity;
5363	uint8_t max_arity;	5397	uint8_t max_arity;
5364	char arg_tests_encoding[3];	5398	char arg_tests_encoding[3];
		5399	#endif
5365	} op_code_info;	5400	} op_code_info;
5366		5401
5367	static const op_code_info dispatch_table[] = {	5402	static const op_code_info dispatch_table[] = {
		5403	#if USE_ERROR_CHECKING
5368	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5404	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5405	#else
		5406	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5407	#endif
5369	#include "opdefines.h"	5408	#include "opdefines.h"
5370	#undef OP_DEF	5409	#undef OP_DEF
5371	{0}	5410	{0}
5372	};	5411	};
5373		5412
…		…
5415	{	5454	{
5416	pointer arg = car (arglist);	5455	pointer arg = car (arglist);
5417		5456
5418	j = t[0];	5457	j = t[0];
5419		5458
		5459	/*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
		5460	if (j == TST_LIST[0])
		5461	{
		5462	if (!tst_is_list (SCHEME_A_ arg))
		5463	break;
		5464	}
		5465	else
		5466	{
5420	if (!tests[j - 1].fct (arg))	5467	if (!tests[j - 1].fct (arg))
5421	break;	5468	break;
		5469	}
5422		5470
5423	if (t[1]) /* last test is replicated as necessary */	5471	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424	t++;	5472	t++;
5425		5473
5426	arglist = cdr (arglist);	5474	arglist = cdr (arglist);
5427	i++;	5475	i++;
5428	}	5476	}
…		…
5483	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5531	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484	{	5532	{
5485	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5533	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486	set_typeflag (y, (T_PROC | T_ATOM));	5534	set_typeflag (y, (T_PROC | T_ATOM));
5487	ivalue_unchecked (y) = op;	5535	ivalue_unchecked (y) = op;
5488	set_num_integer (y);
5489	return y;	5536	return y;
5490	}	5537	}
5491		5538
5492	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5539	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493	static int	5540	static int
5494	syntaxnum (pointer p)	5541	syntaxnum (pointer p)
5495	{	5542	{
5496	const char *s = strvalue (car (p));	5543	const char *s = strvalue (p);
5497		5544
5498	switch (strlength (car (p)))	5545	switch (strlength (p))
5499	{	5546	{
5500	case 2:	5547	case 2:
5501	if (s[0] == 'i')	5548	if (s[0] == 'i')
5502	return OP_IF0; /* if */	5549	return OP_IF0; /* if */
5503	else	5550	else
…		…
5939	# endif	5986	# endif
5940	int fin;	5987	int fin;
5941	char *file_name = InitFile;	5988	char *file_name = InitFile;
5942	int retcode;	5989	int retcode;
5943	int isfile = 1;	5990	int isfile = 1;
		5991	system ("ps v $PPID");//D
5944		5992
5945	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5993	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946	{	5994	{
5947	xwrstr ("Usage: tinyscheme -?\n");	5995	xwrstr ("Usage: tinyscheme -?\n");
5948	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	5996	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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