ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/microscheme/scheme.c

Comparing microscheme/scheme.c (file contents):
Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC vs.
Revision 1.52 by root, Tue Dec 1 01:56:22 2015 UTC

…		…
16	* (MINISCM) This is a revised and modified version by Akira KIDA.	16	* (MINISCM) This is a revised and modified version by Akira KIDA.
17	* (MINISCM) current version is 0.85k4 (15 May 1994)	17	* (MINISCM) current version is 0.85k4 (15 May 1994)
18	*	18	*
19	*/	19	*/
20		20
		21	#define EXPERIMENT 1
		22
		23	#if 1
21	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */	24	#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22	#include "malloc.c"	25	#include "malloc.c"
		26	#endif
23		27
24	#define SCHEME_SOURCE	28	#define SCHEME_SOURCE
25	#include "scheme-private.h"	29	#include "scheme-private.h"
26	#ifndef WIN32	30	#ifndef WIN32
27	# include <unistd.h>	31	# include <unistd.h>
…		…
34		38
35	#include <sys/types.h>	39	#include <sys/types.h>
36	#include <sys/stat.h>	40	#include <sys/stat.h>
37	#include <fcntl.h>	41	#include <fcntl.h>
38		42
		43	#if !USE_ERROR_CHECKING
		44	# define NDEBUG
		45	#endif
		46
		47	#include <assert.h>
		48	#include <stdlib.h>
39	#include <string.h>	49	#include <string.h>
40	#include <stdlib.h>
41		50
42	#include <limits.h>	51	#include <limits.h>
43	#include <inttypes.h>	52	#include <inttypes.h>
44	#include <float.h>	53	#include <float.h>
45	//#include <ctype.h>	54	//#include <ctype.h>
		55
		56	#if '1' != '0' + 1 \
		57	|| '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
		58	|| '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
		59	|| 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
		60	|| 'f' != 'a' + 5
		61	# error "execution character set digits not consecutive"
		62	#endif
46		63
47	enum {	64	enum {
48	TOK_EOF,	65	TOK_EOF,
49	TOK_LPAREN,	66	TOK_LPAREN,
50	TOK_RPAREN,	67	TOK_RPAREN,
51	TOK_DOT,	68	TOK_DOT,
52	TOK_ATOM,	69	TOK_ATOM,
		70	TOK_DOTATOM, /* atom name starting with '.' */
		71	TOK_STRATOM, /* atom name enclosed in | */
53	TOK_QUOTE,	72	TOK_QUOTE,
54	TOK_DQUOTE,	73	TOK_DQUOTE,
55	TOK_BQUOTE,	74	TOK_BQUOTE,
56	TOK_COMMA,	75	TOK_COMMA,
57	TOK_ATMARK,	76	TOK_ATMARK,
…		…
59	TOK_SHARP_CONST,	78	TOK_SHARP_CONST,
60	TOK_VEC	79	TOK_VEC
61	};	80	};
62		81
63	#define BACKQUOTE '`'	82	#define BACKQUOTE '`'
64	#define DELIMITERS "()\";\f\t\v\n\r "	83	#define WHITESPACE " \t\r\n\v\f"
		84	#define DELIMITERS "()\";" WHITESPACE
65		85
66	#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?	86	#define NIL POINTER (&SCHEME_V->xNIL)
67	#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?	87	#define S_T POINTER (&SCHEME_V->xT)
68	#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?	88	#define S_F POINTER (&SCHEME_V->xF)
69	#define S_SINK (&SCHEME_V->xsink)	89	#define S_SINK POINTER (&SCHEME_V->xsink)
70	#define S_EOF (&SCHEME_V->xEOF_OBJ)	90	#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71		91
72	#if !USE_MULTIPLICITY	92	#if !USE_MULTIPLICITY
73	static scheme sc;	93	static scheme sc;
74	#endif	94	#endif
75		95
…		…
176		196
177	#ifndef InitFile	197	#ifndef InitFile
178	# define InitFile "init.scm"	198	# define InitFile "init.scm"
179	#endif	199	#endif
180		200
181	#ifndef FIRST_CELLSEGS
182	# define FIRST_CELLSEGS 3
183	#endif
184
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);
…		…
219	#if USE_MATH	261	#if USE_MATH
220	static double round_per_R5RS (double x);	262	static double round_per_R5RS (double x);
221	#endif	263	#endif
222	static int is_zero_rvalue (RVALUE x);	264	static int is_zero_rvalue (RVALUE x);
223		265
224	ecb_inline int
225	num_is_integer (pointer p)
226	{
227	return num_is_fixnum (p->object.number);
228	}
229
230	static num num_zero;	266	static num num_zero;
231	static num num_one;	267	static num num_one;
232		268
		269	/* convert "pointer" to cell* / cell* to pointer */
		270	#define CELL(p) ((struct cell *)(p) + 0)
		271	#define POINTER(c) ((void *)((c) - 0))
		272
233	/* macros for cell operations */	273	/* macros for cell operations */
234	#define typeflag(p) ((p)->flag + 0)	274	#define typeflag(p) (CELL(p)->flag + 0)
235	#define set_typeflag(p,v) ((p)->flag = (v))	275	#define set_typeflag(p,v) (CELL(p)->flag = (v))
236	#define type(p) (typeflag (p) & T_MASKTYPE)	276	#define type(p) (typeflag (p) & T_MASKTYPE)
237		277
238	INTERFACE int	278	INTERFACE int
239	is_string (pointer p)	279	is_string (pointer p)
240	{	280	{
241	return type (p) == T_STRING;	281	return type (p) == T_STRING;
242	}	282	}
243		283
244	#define strvalue(p) ((p)->object.string.svalue)	284	#define strvalue(p) (CELL(p)->object.string.svalue)
245	#define strlength(p) ((p)->object.string.length)	285	#define strlength(p) (CELL(p)->object.string.length)
246
247	INTERFACE int is_list (SCHEME_P_ pointer p);
248		286
249	INTERFACE int	287	INTERFACE int
250	is_vector (pointer p)	288	is_vector (pointer p)
251	{	289	{
252	return type (p) == T_VECTOR;	290	return type (p) == T_VECTOR;
253	}	291	}
254		292
255	#define vecvalue(p) ((p)->object.vector.vvalue)	293	#define vecvalue(p) (CELL(p)->object.vector.vvalue)
256	#define veclength(p) ((p)->object.vector.length)	294	#define veclength(p) (CELL(p)->object.vector.length)
257	INTERFACE void fill_vector (pointer vec, pointer obj);	295	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258	INTERFACE uint32_t vector_length (pointer vec);
259	INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);	296	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260	INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);	297	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261		298
262	INTERFACE uint32_t	299	INTERFACE int
263	vector_length (pointer vec)	300	is_integer (pointer p)
264	{	301	{
265	return vec->object.vector.length;	302	return type (p) == T_INTEGER;
		303	}
		304
		305	/* not the same as in scheme, where integers are (correctly :) reals */
		306	INTERFACE int
		307	is_real (pointer p)
		308	{
		309	return type (p) == T_REAL;
266	}	310	}
267		311
268	INTERFACE int	312	INTERFACE int
269	is_number (pointer p)	313	is_number (pointer p)
270	{	314	{
271	return type (p) == T_NUMBER;	315	return is_integer (p) || is_real (p);
272	}
273
274	INTERFACE int
275	is_integer (pointer p)
276	{
277	if (!is_number (p))
278	return 0;
279
280	if (num_is_integer (p) || ivalue (p) == rvalue (p))
281	return 1;
282
283	return 0;
284	}
285
286	INTERFACE int
287	is_real (pointer p)
288	{
289	return is_number (p) && !num_is_fixnum (p->object.number);
290	}	316	}
291		317
292	INTERFACE int	318	INTERFACE int
293	is_character (pointer p)	319	is_character (pointer p)
294	{	320	{
…		…
299	string_value (pointer p)	325	string_value (pointer p)
300	{	326	{
301	return strvalue (p);	327	return strvalue (p);
302	}	328	}
303		329
304	ecb_inline num
305	nvalue (pointer p)
306	{
307	return (p)->object.number;
308	}
309
310	static IVALUE
311	num_get_ivalue (const num n)
312	{
313	return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314	}
315
316	static RVALUE
317	num_get_rvalue (const num n)
318	{
319	return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320	}
321
322	INTERFACE IVALUE
323	ivalue (pointer p)
324	{
325	return num_get_ivalue (p->object.number);
326	}
327
328	INTERFACE RVALUE
329	rvalue (pointer p)
330	{
331	return num_get_rvalue (p->object.number);
332	}
333
334	#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)	330	#define ivalue_unchecked(p) CELL(p)->object.ivalue
		331	#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
		332
335	#if USE_REAL	333	#if USE_REAL
336	# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)	334	#define rvalue_unchecked(p) CELL(p)->object.rvalue
337	# define set_num_integer(p) (p)->object.number.is_fixnum=1;	335	#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
338	# define set_num_real(p) (p)->object.number.is_fixnum=0;
339	#else	336	#else
340	# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)	337	#define rvalue_unchecked(p) CELL(p)->object.ivalue
341	# define set_num_integer(p) 0	338	#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
342	# define set_num_real(p) 0
343	#endif	339	#endif
344		340
345	INTERFACE long	341	INTERFACE long
346	charvalue (pointer p)	342	charvalue (pointer p)
347	{	343	{
348	return ivalue_unchecked (p);	344	return ivalue_unchecked (p);
349	}	345	}
350		346
		347	#define port(p) CELL(p)->object.port
		348	#define set_port(p,v) port(p) = (v)
351	INTERFACE int	349	INTERFACE int
352	is_port (pointer p)	350	is_port (pointer p)
353	{	351	{
354	return type (p) == T_PORT;	352	return type (p) == T_PORT;
355	}	353	}
356		354
357	INTERFACE int	355	INTERFACE int
358	is_inport (pointer p)	356	is_inport (pointer p)
359	{	357	{
360	return is_port (p) && p->object.port->kind & port_input;	358	return is_port (p) && port (p)->kind & port_input;
361	}	359	}
362		360
363	INTERFACE int	361	INTERFACE int
364	is_outport (pointer p)	362	is_outport (pointer p)
365	{	363	{
366	return is_port (p) && p->object.port->kind & port_output;	364	return is_port (p) && port (p)->kind & port_output;
367	}	365	}
368		366
369	INTERFACE int	367	INTERFACE int
370	is_pair (pointer p)	368	is_pair (pointer p)
371	{	369	{
372	return type (p) == T_PAIR;	370	return type (p) == T_PAIR;
373	}	371	}
374		372
375	#define car(p) ((p)->object.cons.car + 0)	373	#define car(p) (POINTER (CELL(p)->object.cons.car))
376	#define cdr(p) ((p)->object.cons.cdr + 0)	374	#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
377		375
378	static pointer caar (pointer p) { return car (car (p)); }	376	static pointer caar (pointer p) { return car (car (p)); }
379	static pointer cadr (pointer p) { return car (cdr (p)); }	377	static pointer cadr (pointer p) { return car (cdr (p)); }
380	static pointer cdar (pointer p) { return cdr (car (p)); }	378	static pointer cdar (pointer p) { return cdr (car (p)); }
381	static pointer cddr (pointer p) { return cdr (cdr (p)); }	379	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
385	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	383	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
386		384
387	INTERFACE void	385	INTERFACE void
388	set_car (pointer p, pointer q)	386	set_car (pointer p, pointer q)
389	{	387	{
390	p->object.cons.car = q;	388	CELL(p)->object.cons.car = CELL (q);
391	}	389	}
392		390
393	INTERFACE void	391	INTERFACE void
394	set_cdr (pointer p, pointer q)	392	set_cdr (pointer p, pointer q)
395	{	393	{
396	p->object.cons.cdr = q;	394	CELL(p)->object.cons.cdr = CELL (q);
397	}	395	}
398		396
399	INTERFACE pointer	397	INTERFACE pointer
400	pair_car (pointer p)	398	pair_car (pointer p)
401	{	399	{
…		…
415	}	413	}
416		414
417	INTERFACE char *	415	INTERFACE char *
418	symname (pointer p)	416	symname (pointer p)
419	{	417	{
420	return strvalue (car (p));	418	return strvalue (p);
421	}	419	}
422		420
423	#if USE_PLIST	421	#if USE_PLIST
		422	#error plists are broken because symbols are no longer pairs
		423	#define symprop(p) cdr(p)
424	SCHEME_EXPORT int	424	SCHEME_EXPORT int
425	hasprop (pointer p)	425	hasprop (pointer p)
426	{	426	{
427	return typeflag (p) & T_SYMBOL;	427	return typeflag (p) & T_SYMBOL;
428	}	428	}
429
430	# define symprop(p) cdr(p)
431	#endif	429	#endif
432		430
433	INTERFACE int	431	INTERFACE int
434	is_syntax (pointer p)	432	is_syntax (pointer p)
435	{	433	{
…		…
449	}	447	}
450		448
451	INTERFACE char *	449	INTERFACE char *
452	syntaxname (pointer p)	450	syntaxname (pointer p)
453	{	451	{
454	return strvalue (car (p));	452	return strvalue (p);
455	}	453	}
456		454
457	#define procnum(p) ivalue (p)	455	#define procnum(p) ivalue_unchecked (p)
458	static const char *procname (pointer x);	456	static const char *procname (pointer x);
459		457
460	INTERFACE int	458	INTERFACE int
461	is_closure (pointer p)	459	is_closure (pointer p)
462	{	460	{
…		…
523	setimmutable (pointer p)	521	setimmutable (pointer p)
524	{	522	{
525	#if USE_ERROR_CHECKING	523	#if USE_ERROR_CHECKING
526	set_typeflag (p, typeflag (p) | T_IMMUTABLE);	524	set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527	#endif	525	#endif
		526	}
		527
		528	/* Result is:
		529	proper list: length
		530	circular list: -1
		531	not even a pair: -2
		532	dotted list: -2 minus length before dot
		533	*/
		534	INTERFACE int
		535	list_length (SCHEME_P_ pointer a)
		536	{
		537	int i = 0;
		538	pointer slow, fast;
		539
		540	slow = fast = a;
		541
		542	while (1)
		543	{
		544	if (fast == NIL)
		545	return i;
		546
		547	if (!is_pair (fast))
		548	return -2 - i;
		549
		550	fast = cdr (fast);
		551	++i;
		552
		553	if (fast == NIL)
		554	return i;
		555
		556	if (!is_pair (fast))
		557	return -2 - i;
		558
		559	++i;
		560	fast = cdr (fast);
		561
		562	/* Safe because we would have already returned if `fast'
		563	encountered a non-pair. */
		564	slow = cdr (slow);
		565
		566	if (fast == slow)
		567	{
		568	/* the fast pointer has looped back around and caught up
		569	with the slow pointer, hence the structure is circular,
		570	not of finite length, and therefore not a list */
		571	return -1;
		572	}
		573	}
		574	}
		575
		576	INTERFACE int
		577	is_list (SCHEME_P_ pointer a)
		578	{
		579	return list_length (SCHEME_A_ a) >= 0;
528	}	580	}
529		581
530	#if USE_CHAR_CLASSIFIERS	582	#if USE_CHAR_CLASSIFIERS
531	ecb_inline int	583	ecb_inline int
532	Cisalpha (int c)	584	Cisalpha (int c)
…		…
621	#endif	673	#endif
622		674
623	static int file_push (SCHEME_P_ const char *fname);	675	static int file_push (SCHEME_P_ const char *fname);
624	static void file_pop (SCHEME_P);	676	static void file_pop (SCHEME_P);
625	static int file_interactive (SCHEME_P);	677	static int file_interactive (SCHEME_P);
626	ecb_inline int is_one_of (char *s, int c);	678	ecb_inline int is_one_of (const char *s, int c);
627	static int alloc_cellseg (SCHEME_P_ int n);	679	static int alloc_cellseg (SCHEME_P);
628	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	680	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629	static void finalize_cell (SCHEME_P_ pointer a);	681	static void finalize_cell (SCHEME_P_ pointer a);
630	static int count_consecutive_cells (pointer x, int needed);	682	static int count_consecutive_cells (pointer x, int needed);
631	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	683	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
632	static pointer mk_number (SCHEME_P_ const num n);	684	static pointer mk_number (SCHEME_P_ const num n);
…		…
648	static void mark (pointer a);	700	static void mark (pointer a);
649	static void gc (SCHEME_P_ pointer a, pointer b);	701	static void gc (SCHEME_P_ pointer a, pointer b);
650	static int basic_inchar (port *pt);	702	static int basic_inchar (port *pt);
651	static int inchar (SCHEME_P);	703	static int inchar (SCHEME_P);
652	static void backchar (SCHEME_P_ int c);	704	static void backchar (SCHEME_P_ int c);
653	static char *readstr_upto (SCHEME_P_ char *delim);	705	static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654	static pointer readstrexp (SCHEME_P);	706	static pointer readstrexp (SCHEME_P_ char delim);
655	ecb_inline int skipspace (SCHEME_P);	707	ecb_inline int skipspace (SCHEME_P);
656	static int token (SCHEME_P);	708	static int token (SCHEME_P);
657	static void printslashstring (SCHEME_P_ char *s, int len);	709	static void printslashstring (SCHEME_P_ char *s, int len);
658	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);	710	static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
659	static void printatom (SCHEME_P_ pointer l, int f);	711	static void printatom (SCHEME_P_ pointer l, int f);
…		…
676	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);	728	static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677	static void assign_syntax (SCHEME_P_ const char *name);	729	static void assign_syntax (SCHEME_P_ const char *name);
678	static int syntaxnum (pointer p);	730	static int syntaxnum (pointer p);
679	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);	731	static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680		732
		733	static IVALUE
		734	ivalue (pointer x)
		735	{
		736	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		737	}
		738
		739	static RVALUE
		740	rvalue (pointer x)
		741	{
		742	return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
		743	}
		744
		745	INTERFACE num
		746	nvalue (pointer x)
		747	{
		748	num n;
		749
		750	num_set_fixnum (n, is_integer (x));
		751
		752	if (num_is_fixnum (n))
		753	num_set_ivalue (n, ivalue_unchecked (x));
		754	else
		755	num_set_rvalue (n, rvalue_unchecked (x));
		756
		757	return n;
		758	}
		759
681	static num	760	static num
682	num_op (enum num_op op, num a, num b)	761	num_op (enum num_op op, num a, num b)
683	{	762	{
684	num ret;	763	num ret;
685		764
686	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	765	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687		766
688	if (num_is_fixnum (ret))	767	if (num_is_fixnum (ret))
689	{	768	{
690	IVALUE av = num_get_ivalue (a);
691	IVALUE bv = num_get_ivalue (b);
692
693	switch (op)	769	switch (op)
694	{	770	{
695	case NUM_ADD: av += bv; break;	771	case NUM_ADD: a.ivalue += b.ivalue; break;
696	case NUM_SUB: av -= bv; break;	772	case NUM_SUB: a.ivalue -= b.ivalue; break;
697	case NUM_MUL: av *= bv; break;	773	case NUM_MUL: a.ivalue *= b.ivalue; break;
698	case NUM_INTDIV: av /= bv; break;	774	case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699	}	775	}
700		776
701	num_set_ivalue (ret, av);	777	num_set_ivalue (ret, a.ivalue);
702	}	778	}
		779	#if USE_REAL
703	else	780	else
704	{	781	{
705	RVALUE av = num_get_rvalue (a);
706	RVALUE bv = num_get_rvalue (b);
707
708	switch (op)	782	switch (op)
709	{	783	{
710	case NUM_ADD: av += bv; break;	784	case NUM_ADD: a.rvalue += b.rvalue; break;
711	case NUM_SUB: av -= bv; break;	785	case NUM_SUB: a.rvalue -= b.rvalue; break;
712	case NUM_MUL: av *= bv; break;	786	case NUM_MUL: a.rvalue *= b.rvalue; break;
713	case NUM_INTDIV: av /= bv; break;	787	case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714	}	788	}
715		789
716	num_set_rvalue (ret, av);	790	num_set_rvalue (ret, a.rvalue);
717	}	791	}
		792	#endif
718		793
719	return ret;	794	return ret;
720	}	795	}
721		796
722	static num	797	static num
723	num_div (num a, num b)	798	num_div (num a, num b)
724	{	799	{
725	num ret;	800	num ret;
726		801
727	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);	802	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728		803
729	if (num_is_fixnum (ret))	804	if (num_is_fixnum (ret))
730	num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));	805	num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731	else	806	else
732	num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));	807	num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733		808
734	return ret;	809	return ret;
735	}	810	}
736		811
737	static num	812	static num
…		…
739	{	814	{
740	num ret;	815	num ret;
741	long e1, e2, res;	816	long e1, e2, res;
742		817
743	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	818	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744	e1 = num_get_ivalue (a);	819	e1 = num_ivalue (a);
745	e2 = num_get_ivalue (b);	820	e2 = num_ivalue (b);
746	res = e1 % e2;	821	res = e1 % e2;
747		822
748	/* remainder should have same sign as second operand */	823	/* remainder should have same sign as second operand */
749	if (res > 0)	824	if (res > 0)
750	{	825	{
…		…
766	{	841	{
767	num ret;	842	num ret;
768	long e1, e2, res;	843	long e1, e2, res;
769		844
770	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));	845	num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771	e1 = num_get_ivalue (a);	846	e1 = num_ivalue (a);
772	e2 = num_get_ivalue (b);	847	e2 = num_ivalue (b);
773	res = e1 % e2;	848	res = e1 % e2;
774		849
775	/* modulo should have same sign as second operand */	850	/* modulo should have same sign as second operand */
776	if (res * e2 < 0)	851	if (res * e2 < 0)
777	res += e2;	852	res += e2;
…		…
787	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);	862	int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788	int ret;	863	int ret;
789		864
790	if (is_fixnum)	865	if (is_fixnum)
791	{	866	{
792	IVALUE av = num_get_ivalue (a);	867	IVALUE av = num_ivalue (a);
793	IVALUE bv = num_get_ivalue (b);	868	IVALUE bv = num_ivalue (b);
794		869
795	ret = av == bv ? 0 : av < bv ? -1 : +1;	870	ret = av == bv ? 0 : av < bv ? -1 : +1;
796	}	871	}
797	else	872	else
798	{	873	{
799	RVALUE av = num_get_rvalue (a);	874	RVALUE av = num_rvalue (a);
800	RVALUE bv = num_get_rvalue (b);	875	RVALUE bv = num_rvalue (b);
801		876
802	ret = av == bv ? 0 : av < bv ? -1 : +1;	877	ret = av == bv ? 0 : av < bv ? -1 : +1;
803	}	878	}
804		879
805	return ret;	880	return ret;
…		…
843	#endif	918	#endif
844	}	919	}
845		920
846	/* allocate new cell segment */	921	/* allocate new cell segment */
847	static int	922	static int
848	alloc_cellseg (SCHEME_P_ int n)	923	alloc_cellseg (SCHEME_P)
849	{	924	{
850	pointer newp;	925	struct cell *newp;
851	pointer last;	926	struct cell *last;
852	pointer p;	927	struct cell *p;
853	char *cp;	928	char *cp;
854	long i;	929	long i;
855	int k;	930	int k;
856		931
857	static int segsize = CELL_SEGSIZE >> 1;	932	static int segsize = CELL_SEGSIZE >> 1;
858	segsize <<= 1;	933	segsize <<= 1;
859		934
860	for (k = 0; k < n; k++)
861	{
862	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
863	return k;
864
865	cp = malloc (segsize * sizeof (struct cell));	935	cp = malloc (segsize * sizeof (struct cell));
866		936
867	if (!cp && USE_ERROR_CHECKING)	937	if (!cp && USE_ERROR_CHECKING)
868	return k;	938	return k;
869		939
870	i = ++SCHEME_V->last_cell_seg;	940	i = ++SCHEME_V->last_cell_seg;
871	SCHEME_V->alloc_seg[i] = cp;	941	SCHEME_V->alloc_seg[i] = cp;
872		942
873	/* insert new segment in address order */	943	newp = (struct cell *)cp;
874	newp = (pointer)cp;
875	SCHEME_V->cell_seg[i] = newp;	944	SCHEME_V->cell_seg[i] = newp;
876	SCHEME_V->cell_segsize[i] = segsize;	945	SCHEME_V->cell_segsize[i] = segsize;
877
878	//TODO: insert, not swap
879	while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880	{
881	p = SCHEME_V->cell_seg[i];
882	SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883	SCHEME_V->cell_seg[i - 1] = p;
884
885	k = SCHEME_V->cell_segsize[i];
886	SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887	SCHEME_V->cell_segsize[i - 1] = k;
888
889	--i;
890	}
891
892	SCHEME_V->fcells += segsize;	946	SCHEME_V->fcells += segsize;
893	last = newp + segsize - 1;	947	last = newp + segsize - 1;
894		948
895	for (p = newp; p <= last; p++)	949	for (p = newp; p <= last; p++)
896	{	950	{
		951	pointer cp = POINTER (p);
897	set_typeflag (p, T_FREE);	952	set_typeflag (cp, T_PAIR);
898	set_car (p, NIL);	953	set_car (cp, NIL);
899	set_cdr (p, p + 1);	954	set_cdr (cp, POINTER (p + 1));
900	}	955	}
901		956
902	/* insert new cells in address order on free list */
903	if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
904	{
905	set_cdr (last, SCHEME_V->free_cell);	957	set_cdr (POINTER (last), SCHEME_V->free_cell);
906	SCHEME_V->free_cell = newp;	958	SCHEME_V->free_cell = POINTER (newp);
907	}
908	else
909	{
910	p = SCHEME_V->free_cell;
911		959
912	while (cdr (p) != NIL && newp > cdr (p))
913	p = cdr (p);
914
915	set_cdr (last, cdr (p));
916	set_cdr (p, newp);
917	}
918	}
919
920	return n;	960	return 1;
921	}	961	}
922		962
923	/* get new cell. parameter a, b is marked by gc. */	963	/* get new cell. parameter a, b is marked by gc. */
924	ecb_inline pointer	964	ecb_inline pointer
925	get_cell_x (SCHEME_P_ pointer a, pointer b)	965	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
929	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	969	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
930	return S_SINK;	970	return S_SINK;
931		971
932	if (SCHEME_V->free_cell == NIL)	972	if (SCHEME_V->free_cell == NIL)
933	{	973	{
934	const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8;	974	const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
935		975
936	gc (SCHEME_A_ a, b);	976	gc (SCHEME_A_ a, b);
937		977
938	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)	978	if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
939	{	979	{
940	/* if only a few recovered, get more to avoid fruitless gc's */	980	/* if only a few recovered, get more to avoid fruitless gc's */
941	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	981	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
942	{	982	{
943	#if USE_ERROR_CHECKING	983	#if USE_ERROR_CHECKING
944	SCHEME_V->no_memory = 1;	984	SCHEME_V->no_memory = 1;
945	return S_SINK;	985	return S_SINK;
946	#endif	986	#endif
…		…
958	}	998	}
959	}	999	}
960		1000
961	/* To retain recent allocs before interpreter knows about them -	1001	/* To retain recent allocs before interpreter knows about them -
962	Tehom */	1002	Tehom */
963
964	static void	1003	static void
965	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	1004	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
966	{	1005	{
967	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	1006	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
968		1007
…		…
990	}	1029	}
991		1030
992	static pointer	1031	static pointer
993	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	1032	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
994	{	1033	{
995	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1034	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
996	pointer *e = malloc (len * sizeof (pointer));	1035	pointer *e = malloc (len * sizeof (pointer));
997		1036
998	if (!e && USE_ERROR_CHECKING)	1037	if (!e && USE_ERROR_CHECKING)
999	return S_SINK;	1038	return S_SINK;
1000		1039
1001	/* Record it as a vector so that gc understands it. */	1040	/* Record it as a vector so that gc understands it. */
1002	set_typeflag (v, T_VECTOR | T_ATOM);	1041	set_typeflag (v, T_VECTOR | T_ATOM);
1003		1042
1004	v->object.vector.vvalue = e;	1043	CELL(v)->object.vector.vvalue = e;
1005	v->object.vector.length = len;	1044	CELL(v)->object.vector.length = len;
1006	fill_vector (v, init);	1045	fill_vector (v, 0, init);
1007	push_recent_alloc (SCHEME_A_ v, NIL);	1046	push_recent_alloc (SCHEME_A_ v, NIL);
1008		1047
1009	return v;	1048	return v;
1010	}	1049	}
1011		1050
…		…
1054	set_cdr (x, b);	1093	set_cdr (x, b);
1055		1094
1056	return x;	1095	return x;
1057	}	1096	}
1058		1097
		1098	static pointer
		1099	generate_symbol (SCHEME_P_ const char *name)
		1100	{
		1101	pointer x = mk_string (SCHEME_A_ name);
		1102	setimmutable (x);
		1103	set_typeflag (x, T_SYMBOL | T_ATOM);
		1104	return x;
		1105	}
		1106
1059	/* ========== oblist implementation ========== */	1107	/* ========== oblist implementation ========== */
1060		1108
1061	#ifndef USE_OBJECT_LIST	1109	#ifndef USE_OBJECT_LIST
1062		1110
		1111	static int
1063	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	}
1064		1122
1065	static pointer	1123	static pointer
1066	oblist_initial_value (SCHEME_P)	1124	oblist_initial_value (SCHEME_P)
1067	{	1125	{
1068	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */	1126	return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
…		…
1070		1128
1071	/* returns the new symbol */	1129	/* returns the new symbol */
1072	static pointer	1130	static pointer
1073	oblist_add_by_name (SCHEME_P_ const char *name)	1131	oblist_add_by_name (SCHEME_P_ const char *name)
1074	{	1132	{
1075	int location;	1133	pointer x = generate_symbol (SCHEME_A_ name);
1076
1077	pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078	set_typeflag (x, T_SYMBOL);
1079	setimmutable (car (x));
1080
1081	location = hash_fn (name, veclength (SCHEME_V->oblist));	1134	int location = hash_fn (name, veclength (SCHEME_V->oblist));
1082	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)));
1083	return x;	1136	return x;
1084	}	1137	}
1085		1138
1086	ecb_inline pointer	1139	ecb_inline pointer
1087	oblist_find_by_name (SCHEME_P_ const char *name)	1140	oblist_find_by_name (SCHEME_P_ const char *name)
…		…
1090	pointer x;	1143	pointer x;
1091	char *s;	1144	char *s;
1092		1145
1093	location = hash_fn (name, veclength (SCHEME_V->oblist));	1146	location = hash_fn (name, veclength (SCHEME_V->oblist));
1094		1147
1095	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))
1096	{	1149	{
1097	s = symname (car (x));	1150	s = symname (car (x));
1098		1151
1099	/* case-insensitive, per R5RS section 2 */	1152	/* case-insensitive, per R5RS section 2 */
1100	if (stricmp (name, s) == 0)	1153	if (stricmp (name, s) == 0)
…		…
1110	int i;	1163	int i;
1111	pointer x;	1164	pointer x;
1112	pointer ob_list = NIL;	1165	pointer ob_list = NIL;
1113		1166
1114	for (i = 0; i < veclength (SCHEME_V->oblist); i++)	1167	for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115	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))
1116	ob_list = cons (x, ob_list);	1169	ob_list = cons (x, ob_list);
1117		1170
1118	return ob_list;	1171	return ob_list;
1119	}	1172	}
1120		1173
…		…
1146		1199
1147	/* returns the new symbol */	1200	/* returns the new symbol */
1148	static pointer	1201	static pointer
1149	oblist_add_by_name (SCHEME_P_ const char *name)	1202	oblist_add_by_name (SCHEME_P_ const char *name)
1150	{	1203	{
1151	pointer x;	1204	pointer x = generate_symbol (SCHEME_A_ name);
1152
1153	x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154	set_typeflag (x, T_SYMBOL);
1155	setimmutable (car (x));
1156	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1205	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157	return x;	1206	return x;
1158	}	1207	}
1159		1208
1160	static pointer	1209	static pointer
…		…
1170	mk_port (SCHEME_P_ port *p)	1219	mk_port (SCHEME_P_ port *p)
1171	{	1220	{
1172	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1221	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173		1222
1174	set_typeflag (x, T_PORT | T_ATOM);	1223	set_typeflag (x, T_PORT | T_ATOM);
1175	x->object.port = p;	1224	set_port (x, p);
1176		1225
1177	return x;	1226	return x;
1178	}	1227	}
1179	#endif	1228	#endif
1180		1229
1181	pointer	1230	pointer
1182	mk_foreign_func (SCHEME_P_ foreign_func f)	1231	mk_foreign_func (SCHEME_P_ foreign_func f)
1183	{	1232	{
1184	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1233	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1185		1234
1186	set_typeflag (x, (T_FOREIGN | T_ATOM));	1235	set_typeflag (x, T_FOREIGN | T_ATOM);
1187	x->object.ff = f;	1236	CELL(x)->object.ff = f;
1188		1237
1189	return x;	1238	return x;
1190	}	1239	}
1191		1240
1192	INTERFACE pointer	1241	INTERFACE pointer
1193	mk_character (SCHEME_P_ int c)	1242	mk_character (SCHEME_P_ int c)
1194	{	1243	{
1195	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1244	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196		1245
1197	set_typeflag (x, (T_CHARACTER | T_ATOM));	1246	set_typeflag (x, T_CHARACTER | T_ATOM);
1198	ivalue_unchecked (x) = c & 0xff;	1247	set_ivalue (x, c & 0xff);
1199	set_num_integer (x);	1248
1200	return x;	1249	return x;
1201	}	1250	}
1202		1251
1203	/* get number atom (integer) */	1252	/* get number atom (integer) */
1204	INTERFACE pointer	1253	INTERFACE pointer
1205	mk_integer (SCHEME_P_ long num)	1254	mk_integer (SCHEME_P_ long n)
1206	{	1255	{
		1256	pointer p = 0;
		1257	pointer *pp = &p;
		1258
		1259	#if USE_INTCACHE
		1260	if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
		1261	pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
		1262	#endif
		1263
		1264	if (!*pp)
		1265	{
1207	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1266	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208		1267
1209	set_typeflag (x, (T_NUMBER | T_ATOM));	1268	set_typeflag (x, T_INTEGER | T_ATOM);
1210	ivalue_unchecked (x) = num;	1269	setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1211	set_num_integer (x);	1270	set_ivalue (x, n);
		1271
		1272	*pp = x;
		1273	}
		1274
1212	return x;	1275	return *pp;
1213	}	1276	}
1214		1277
1215	INTERFACE pointer	1278	INTERFACE pointer
1216	mk_real (SCHEME_P_ RVALUE n)	1279	mk_real (SCHEME_P_ RVALUE n)
1217	{	1280	{
		1281	#if USE_REAL
1218	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1282	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219		1283
1220	set_typeflag (x, (T_NUMBER | T_ATOM));	1284	set_typeflag (x, T_REAL | T_ATOM);
1221	rvalue_unchecked (x) = n;	1285	set_rvalue (x, n);
1222	set_num_real (x);	1286
1223	return x;	1287	return x;
		1288	#else
		1289	return mk_integer (SCHEME_A_ n);
		1290	#endif
1224	}	1291	}
1225		1292
1226	static pointer	1293	static pointer
1227	mk_number (SCHEME_P_ const num n)	1294	mk_number (SCHEME_P_ const num n)
1228	{	1295	{
		1296	#if USE_REAL
1229	if (num_is_fixnum (n))	1297	return num_is_fixnum (n)
		1298	? mk_integer (SCHEME_A_ num_ivalue (n))
		1299	: mk_real (SCHEME_A_ num_rvalue (n));
		1300	#else
1230	return mk_integer (SCHEME_A_ num_get_ivalue (n));	1301	return mk_integer (SCHEME_A_ num_ivalue (n));
1231	else	1302	#endif
1232	return mk_real (SCHEME_A_ num_get_rvalue (n));
1233	}	1303	}
1234		1304
1235	/* allocate name to string area */	1305	/* allocate name to string area */
1236	static char *	1306	static char *
1237	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)	1307	store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
…		…
1243	SCHEME_V->no_memory = 1;	1313	SCHEME_V->no_memory = 1;
1244	return SCHEME_V->strbuff;	1314	return SCHEME_V->strbuff;
1245	}	1315	}
1246		1316
1247	if (str)	1317	if (str)
1248	{	1318	memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249	int l = strlen (str);
1250
1251	if (l > len_str)
1252	l = len_str;
1253
1254	memcpy (q, str, l);
1255	q[l] = 0;
1256	}
1257	else	1319	else
1258	{
1259	memset (q, fill, len_str);	1320	memset (q, fill, len_str);
		1321
1260	q[len_str] = 0;	1322	q[len_str] = 0;
1261	}
1262		1323
1263	return q;	1324	return q;
1264	}	1325	}
1265		1326
1266	INTERFACE pointer	1327	INTERFACE pointer
…		…
1280	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1341	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281		1342
1282	set_typeflag (x, T_STRING | T_ATOM);	1343	set_typeflag (x, T_STRING | T_ATOM);
1283	strvalue (x) = store_string (SCHEME_A_ len, str, 0);	1344	strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284	strlength (x) = len;	1345	strlength (x) = len;
		1346
1285	return x;	1347	return x;
1286	}	1348	}
1287		1349
1288	INTERFACE pointer	1350	INTERFACE pointer
1289	mk_string (SCHEME_P_ const char *str)	1351	mk_string (SCHEME_P_ const char *str)
…		…
1296	{	1358	{
1297	return get_vector_object (SCHEME_A_ len, NIL);	1359	return get_vector_object (SCHEME_A_ len, NIL);
1298	}	1360	}
1299		1361
1300	INTERFACE void	1362	INTERFACE void
1301	fill_vector (pointer vec, pointer obj)	1363	fill_vector (pointer vec, uint32_t start, pointer obj)
1302	{	1364	{
1303	int i;	1365	int i;
1304		1366
1305	for (i = 0; i < vec->object.vector.length; i++)	1367	for (i = start; i < veclength (vec); i++)
1306	vecvalue (vec)[i] = obj;	1368	vecvalue (vec)[i] = obj;
1307	}	1369	}
1308		1370
		1371	INTERFACE void
		1372	vector_resize (pointer vec, uint32_t newsize, pointer fill)
		1373	{
		1374	uint32_t oldsize = veclength (vec);
		1375	vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
		1376	veclength (vec) = newsize;
		1377	fill_vector (vec, oldsize, fill);
		1378	}
		1379
1309	INTERFACE pointer	1380	INTERFACE pointer
1310	vector_elem (pointer vec, uint32_t ielem)	1381	vector_get (pointer vec, uint32_t ielem)
1311	{	1382	{
1312	return vecvalue(vec)[ielem];	1383	return vecvalue(vec)[ielem];
1313	}	1384	}
1314		1385
1315	INTERFACE void	1386	INTERFACE void
1316	set_vector_elem (pointer vec, uint32_t ielem, pointer a)	1387	vector_set (pointer vec, uint32_t ielem, pointer a)
1317	{	1388	{
1318	vecvalue(vec)[ielem] = a;	1389	vecvalue(vec)[ielem] = a;
1319	}	1390	}
1320		1391
1321	/* get new symbol */	1392	/* get new symbol */
…		…
1333		1404
1334	INTERFACE pointer	1405	INTERFACE pointer
1335	gensym (SCHEME_P)	1406	gensym (SCHEME_P)
1336	{	1407	{
1337	pointer x;	1408	pointer x;
1338
1339	for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340	{
1341	char name[40] = "gensym-";	1409	char name[40] = "gensym-";
1342	xnum (name + 7, SCHEME_V->gensym_cnt);	1410	xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343		1411
1344	/* first check oblist */	1412	return generate_symbol (SCHEME_A_ name);
1345	x = oblist_find_by_name (SCHEME_A_ name);	1413	}
1346		1414
1347	if (x == NIL)	1415	static int
1348	{	1416	is_gensym (SCHEME_P_ pointer x)
1349	x = oblist_add_by_name (SCHEME_A_ name);	1417	{
1350	return x;	1418	return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351	}
1352	}
1353
1354	return NIL;
1355	}	1419	}
1356		1420
1357	/* make symbol or number atom from string */	1421	/* make symbol or number atom from string */
1358	static pointer	1422	static pointer
1359	mk_atom (SCHEME_P_ char *q)	1423	mk_atom (SCHEME_P_ char *q)
…		…
1413	}	1477	}
1414	else if ((c == 'e') || (c == 'E'))	1478	else if ((c == 'e') || (c == 'E'))
1415	{	1479	{
1416	if (!has_fp_exp)	1480	if (!has_fp_exp)
1417	{	1481	{
1418	has_dec_point = 1; /* decimal point illegal	1482	has_dec_point = 1; /* decimal point illegal from now on */
1419	from now on */
1420	p++;	1483	p++;
1421		1484
1422	if ((*p == '-') || (*p == '+') || isdigit (*p))	1485	if ((*p == '-') || (*p == '+') || isdigit (*p))
1423	continue;	1486	continue;
1424	}	1487	}
…		…
1512		1575
1513	if (ecb_expect_false (is_vector (p)))	1576	if (ecb_expect_false (is_vector (p)))
1514	{	1577	{
1515	int i;	1578	int i;
1516		1579
1517	for (i = 0; i < p->object.vector.length; i++)	1580	for (i = 0; i < veclength (p); i++)
1518	mark (vecvalue (p)[i]);	1581	mark (vecvalue (p)[i]);
1519	}	1582	}
1520		1583
1521	if (is_atom (p))	1584	if (is_atom (p))
1522	goto E6;	1585	goto E6;
…		…
1569		1632
1570	/* garbage collection. parameter a, b is marked. */	1633	/* garbage collection. parameter a, b is marked. */
1571	static void	1634	static void
1572	gc (SCHEME_P_ pointer a, pointer b)	1635	gc (SCHEME_P_ pointer a, pointer b)
1573	{	1636	{
1574	pointer p;
1575	int i;	1637	int i;
1576		1638
1577	if (SCHEME_V->gc_verbose)	1639	if (SCHEME_V->gc_verbose)
1578	putstr (SCHEME_A_ "gc...");	1640	putstr (SCHEME_A_ "gc...");
1579		1641
…		…
1595	/* Mark recent objects the interpreter doesn't know about yet. */	1657	/* Mark recent objects the interpreter doesn't know about yet. */
1596	mark (car (S_SINK));	1658	mark (car (S_SINK));
1597	/* Mark any older stuff above nested C calls */	1659	/* Mark any older stuff above nested C calls */
1598	mark (SCHEME_V->c_nest);	1660	mark (SCHEME_V->c_nest);
1599		1661
		1662	#if USE_INTCACHE
		1663	/* mark intcache */
		1664	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1665	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1666	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1667	#endif
		1668
1600	/* mark variables a, b */	1669	/* mark variables a, b */
1601	mark (a);	1670	mark (a);
1602	mark (b);	1671	mark (b);
1603		1672
1604	/* garbage collect */	1673	/* garbage collect */
1605	clrmark (NIL);	1674	clrmark (NIL);
1606	SCHEME_V->fcells = 0;	1675	SCHEME_V->fcells = 0;
1607	SCHEME_V->free_cell = NIL;	1676	SCHEME_V->free_cell = NIL;
1608		1677
1609	/* free-list is kept sorted by address so as to maintain consecutive	1678	if (SCHEME_V->gc_verbose)
1610	ranges, if possible, for use with vectors. Here we scan the cells	1679	xwrstr ("freeing...");
1611	(which are also kept sorted by address) downwards to build the	1680
1612	free-list in sorted order.	1681	uint32_t total = 0;
1613	*/	1682
		1683	/* Here we scan the cells to build the free-list. */
1614	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1684	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615	{	1685	{
1616	p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1686	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1687	struct cell *p;
		1688	total += SCHEME_V->cell_segsize [i];
1617		1689
1618	while (--p >= SCHEME_V->cell_seg[i])	1690	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1619	{	1691	{
		1692	pointer c = POINTER (p);
		1693
1620	if (is_mark (p))	1694	if (is_mark (c))
1621	clrmark (p);	1695	clrmark (c);
1622	else	1696	else
1623	{	1697	{
1624	/* reclaim cell */	1698	/* reclaim cell */
1625	if (typeflag (p) != T_FREE)	1699	if (typeflag (c) != T_PAIR)
1626	{	1700	{
1627	finalize_cell (SCHEME_A_ p);	1701	finalize_cell (SCHEME_A_ c);
1628	set_typeflag (p, T_FREE);	1702	set_typeflag (c, T_PAIR);
1629	set_car (p, NIL);	1703	set_car (c, NIL);
1630	}	1704	}
1631		1705
1632	++SCHEME_V->fcells;	1706	++SCHEME_V->fcells;
1633	set_cdr (p, SCHEME_V->free_cell);	1707	set_cdr (c, SCHEME_V->free_cell);
1634	SCHEME_V->free_cell = p;	1708	SCHEME_V->free_cell = c;
1635	}	1709	}
1636	}	1710	}
1637	}	1711	}
1638		1712
1639	if (SCHEME_V->gc_verbose)	1713	if (SCHEME_V->gc_verbose)
		1714	{
1640	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");
		1716	}
1641	}	1717	}
1642		1718
1643	static void	1719	static void
1644	finalize_cell (SCHEME_P_ pointer a)	1720	finalize_cell (SCHEME_P_ pointer a)
1645	{	1721	{
1646	/* TODO, fast bitmap check? */	1722	/* TODO, fast bitmap check? */
1647	if (is_string (a))	1723	if (is_string (a) || is_symbol (a))
1648	free (strvalue (a));	1724	free (strvalue (a));
1649	else if (is_vector (a))	1725	else if (is_vector (a))
1650	free (vecvalue (a));	1726	free (vecvalue (a));
1651	#if USE_PORTS	1727	#if USE_PORTS
1652	else if (is_port (a))	1728	else if (is_port (a))
1653	{	1729	{
1654	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1730	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1655	port_close (SCHEME_A_ a, port_input | port_output);	1731	port_close (SCHEME_A_ a, port_input | port_output);
1656		1732
1657	free (a->object.port);	1733	free (port (a));
1658	}	1734	}
1659	#endif	1735	#endif
1660	}	1736	}
1661		1737
1662	/* ========== Routines for Reading ========== */	1738	/* ========== Routines for Reading ========== */
…		…
1678	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1754	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1679	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;	1755	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1680	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1756	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1681	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1757	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1682	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1758	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1683	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1759	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1684		1760
1685	#if SHOW_ERROR_LINE	1761	#if SHOW_ERROR_LINE
1686	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1762	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1687		1763
1688	if (fname)	1764	if (fname)
…		…
1705	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1781	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1706	#if USE_PORTS	1782	#if USE_PORTS
1707	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1783	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1708	#endif	1784	#endif
1709	SCHEME_V->file_i--;	1785	SCHEME_V->file_i--;
1710	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1786	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1711	}	1787	}
1712	}	1788	}
1713		1789
1714	static int	1790	static int
1715	file_interactive (SCHEME_P)	1791	file_interactive (SCHEME_P)
1716	{	1792	{
1717	#if USE_PORTS	1793	#if USE_PORTS
1718	return SCHEME_V->file_i == 0	1794	return SCHEME_V->file_i == 0
1719	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1795	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1720	&& (SCHEME_V->inport->object.port->kind & port_file);	1796	&& (port (SCHEME_V->inport)->kind & port_file);
1721	#else	1797	#else
1722	return 0;	1798	return 0;
1723	#endif	1799	#endif
1724	}	1800	}
1725		1801
…		…
1859	}	1935	}
1860		1936
1861	static void	1937	static void
1862	port_close (SCHEME_P_ pointer p, int flag)	1938	port_close (SCHEME_P_ pointer p, int flag)
1863	{	1939	{
1864	port *pt = p->object.port;	1940	port *pt = port (p);
1865		1941
1866	pt->kind &= ~flag;	1942	pt->kind &= ~flag;
1867		1943
1868	if ((pt->kind & (port_input | port_output)) == 0)	1944	if ((pt->kind & (port_input | port_output)) == 0)
1869	{	1945	{
…		…
1890	/* get new character from input file */	1966	/* get new character from input file */
1891	static int	1967	static int
1892	inchar (SCHEME_P)	1968	inchar (SCHEME_P)
1893	{	1969	{
1894	int c;	1970	int c;
1895	port *pt;	1971	port *pt = port (SCHEME_V->inport);
1896
1897	pt = SCHEME_V->inport->object.port;
1898		1972
1899	if (pt->kind & port_saw_EOF)	1973	if (pt->kind & port_saw_EOF)
1900	return EOF;	1974	return EOF;
1901		1975
1902	c = basic_inchar (pt);	1976	c = basic_inchar (pt);
…		…
1969	port *pt;	2043	port *pt;
1970		2044
1971	if (c == EOF)	2045	if (c == EOF)
1972	return;	2046	return;
1973		2047
1974	pt = SCHEME_V->inport->object.port;	2048	pt = port (SCHEME_V->inport);
1975	pt->unget = c;	2049	pt->unget = c;
1976	#else	2050	#else
1977	if (c == EOF)	2051	if (c == EOF)
1978	return;	2052	return;
1979		2053
…		…
2007		2081
2008	INTERFACE void	2082	INTERFACE void
2009	putstr (SCHEME_P_ const char *s)	2083	putstr (SCHEME_P_ const char *s)
2010	{	2084	{
2011	#if USE_PORTS	2085	#if USE_PORTS
2012	port *pt = SCHEME_V->outport->object.port;	2086	port *pt = port (SCHEME_V->outport);
2013		2087
2014	if (pt->kind & port_file)	2088	if (pt->kind & port_file)
2015	write (pt->rep.stdio.file, s, strlen (s));	2089	write (pt->rep.stdio.file, s, strlen (s));
2016	else	2090	else
2017	for (; *s; s++)	2091	for (; *s; s++)
…		…
2027		2101
2028	static void	2102	static void
2029	putchars (SCHEME_P_ const char *s, int len)	2103	putchars (SCHEME_P_ const char *s, int len)
2030	{	2104	{
2031	#if USE_PORTS	2105	#if USE_PORTS
2032	port *pt = SCHEME_V->outport->object.port;	2106	port *pt = port (SCHEME_V->outport);
2033		2107
2034	if (pt->kind & port_file)	2108	if (pt->kind & port_file)
2035	write (pt->rep.stdio.file, s, len);	2109	write (pt->rep.stdio.file, s, len);
2036	else	2110	else
2037	{	2111	{
…		…
2051		2125
2052	INTERFACE void	2126	INTERFACE void
2053	putcharacter (SCHEME_P_ int c)	2127	putcharacter (SCHEME_P_ int c)
2054	{	2128	{
2055	#if USE_PORTS	2129	#if USE_PORTS
2056	port *pt = SCHEME_V->outport->object.port;	2130	port *pt = port (SCHEME_V->outport);
2057		2131
2058	if (pt->kind & port_file)	2132	if (pt->kind & port_file)
2059	{	2133	{
2060	char cc = c;	2134	char cc = c;
2061	write (pt->rep.stdio.file, &cc, 1);	2135	write (pt->rep.stdio.file, &cc, 1);
…		…
2074	#endif	2148	#endif
2075	}	2149	}
2076		2150
2077	/* read characters up to delimiter, but cater to character constants */	2151	/* read characters up to delimiter, but cater to character constants */
2078	static char *	2152	static char *
2079	readstr_upto (SCHEME_P_ char *delim)	2153	readstr_upto (SCHEME_P_ int skip, const char *delim)
2080	{	2154	{
2081	char *p = SCHEME_V->strbuff;	2155	char *p = SCHEME_V->strbuff + skip;
2082		2156
2083	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));	2157	while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2084		2158
2085	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')	2159	if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086	*p = 0;	2160	*p = 0;
…		…
2093	return SCHEME_V->strbuff;	2167	return SCHEME_V->strbuff;
2094	}	2168	}
2095		2169
2096	/* read string expression "xxx...xxx" */	2170	/* read string expression "xxx...xxx" */
2097	static pointer	2171	static pointer
2098	readstrexp (SCHEME_P)	2172	readstrexp (SCHEME_P_ char delim)
2099	{	2173	{
2100	char *p = SCHEME_V->strbuff;	2174	char *p = SCHEME_V->strbuff;
2101	int c;	2175	int c;
2102	int c1 = 0;	2176	int c1 = 0;
2103	enum
2104	{ st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;	2177	enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105		2178
2106	for (;;)	2179	for (;;)
2107	{	2180	{
2108	c = inchar (SCHEME_A);	2181	c = inchar (SCHEME_A);
2109		2182
…		…
2111	return S_F;	2184	return S_F;
2112		2185
2113	switch (state)	2186	switch (state)
2114	{	2187	{
2115	case st_ok:	2188	case st_ok:
2116	switch (c)	2189	if (ecb_expect_false (c == delim))
2117	{
2118	case '\\':
2119	state = st_bsl;
2120	break;
2121
2122	case '"':
2123	*p = 0;
2124	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);	2190	return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125		2191
2126	default:	2192	if (ecb_expect_false (c == '\\'))
		2193	state = st_bsl;
		2194	else
2127	*p++ = c;	2195	*p++ = c;
2128	break;
2129	}
2130		2196
2131	break;	2197	break;
2132		2198
2133	case st_bsl:	2199	case st_bsl:
2134	switch (c)	2200	switch (c)
…		…
2164	case 'r':	2230	case 'r':
2165	*p++ = '\r';	2231	*p++ = '\r';
2166	state = st_ok;	2232	state = st_ok;
2167	break;	2233	break;
2168		2234
2169	case '"':
2170	*p++ = '"';
2171	state = st_ok;
2172	break;
2173
2174	default:	2235	default:
2175	*p++ = c;	2236	*p++ = c;
2176	state = st_ok;	2237	state = st_ok;
2177	break;	2238	break;
2178	}	2239	}
2179		2240
2180	break;	2241	break;
2181		2242
2182	case st_x1:	2243	case st_x1:
2183	case st_x2:	2244	case st_x2:
2184	c = toupper (c);	2245	c = tolower (c);
2185		2246
2186	if (c >= '0' && c <= 'F')	2247	if (c >= '0' && c <= '9')
2187	{
2188	if (c <= '9')
2189	c1 = (c1 << 4) + c - '0';	2248	c1 = (c1 << 4) + c - '0';
2190	else	2249	else if (c >= 'a' && c <= 'f')
2191	c1 = (c1 << 4) + c - 'A' + 10;	2250	c1 = (c1 << 4) + c - 'a' + 10;
2192
2193	if (state == st_x1)
2194	state = st_x2;
2195	else
2196	{
2197	*p++ = c1;
2198	state = st_ok;
2199	}
2200	}
2201	else	2251	else
2202	return S_F;	2252	return S_F;
		2253
		2254	if (state == st_x1)
		2255	state = st_x2;
		2256	else
		2257	{
		2258	*p++ = c1;
		2259	state = st_ok;
		2260	}
2203		2261
2204	break;	2262	break;
2205		2263
2206	case st_oct1:	2264	case st_oct1:
2207	case st_oct2:	2265	case st_oct2:
…		…
2211	backchar (SCHEME_A_ c);	2269	backchar (SCHEME_A_ c);
2212	state = st_ok;	2270	state = st_ok;
2213	}	2271	}
2214	else	2272	else
2215	{	2273	{
2216	if (state == st_oct2 && c1 >= 32)	2274	if (state == st_oct2 && c1 >= ' ')
2217	return S_F;	2275	return S_F;
2218		2276
2219	c1 = (c1 << 3) + (c - '0');	2277	c1 = (c1 << 3) + (c - '0');
2220		2278
2221	if (state == st_oct1)	2279	if (state == st_oct1)
…		…
2226	state = st_ok;	2284	state = st_ok;
2227	}	2285	}
2228	}	2286	}
2229		2287
2230	break;	2288	break;
2231
2232	}	2289	}
2233	}	2290	}
2234	}	2291	}
2235		2292
2236	/* check c is in chars */	2293	/* check c is in chars */
2237	ecb_inline int	2294	ecb_inline int
2238	is_one_of (char *s, int c)	2295	is_one_of (const char *s, int c)
2239	{	2296	{
2240	if (c == EOF)
2241	return 1;
2242
2243	return !!strchr (s, c);	2297	return c == EOF || !!strchr (s, c);
2244	}	2298	}
2245		2299
2246	/* skip white characters */	2300	/* skip white characters */
2247	ecb_inline int	2301	ecb_inline int
2248	skipspace (SCHEME_P)	2302	skipspace (SCHEME_P)
…		…
2250	int c, curr_line = 0;	2304	int c, curr_line = 0;
2251		2305
2252	do	2306	do
2253	{	2307	{
2254	c = inchar (SCHEME_A);	2308	c = inchar (SCHEME_A);
		2309
2255	#if SHOW_ERROR_LINE	2310	#if SHOW_ERROR_LINE
2256	if (c == '\n')	2311	if (ecb_expect_false (c == '\n'))
2257	curr_line++;	2312	curr_line++;
2258	#endif	2313	#endif
		2314
		2315	if (ecb_expect_false (c == EOF))
		2316	return c;
2259	}	2317	}
2260	while (c == ' ' || c == '\n' || c == '\r' || c == '\t');	2318	while (is_one_of (WHITESPACE, c));
2261		2319
2262	/* record it */	2320	/* record it */
2263	#if SHOW_ERROR_LINE	2321	#if SHOW_ERROR_LINE
2264	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)	2322	if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2265	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;	2323	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2266	#endif	2324	#endif
2267		2325
2268	if (c != EOF)
2269	{
2270	backchar (SCHEME_A_ c);	2326	backchar (SCHEME_A_ c);
2271	return 1;	2327	return 1;
2272	}
2273	else
2274	return EOF;
2275	}	2328	}
2276		2329
2277	/* get token */	2330	/* get token */
2278	static int	2331	static int
2279	token (SCHEME_P)	2332	token (SCHEME_P)
…		…
2295	return TOK_RPAREN;	2348	return TOK_RPAREN;
2296		2349
2297	case '.':	2350	case '.':
2298	c = inchar (SCHEME_A);	2351	c = inchar (SCHEME_A);
2299		2352
2300	if (is_one_of (" \n\t", c))	2353	if (is_one_of (WHITESPACE, c))
2301	return TOK_DOT;	2354	return TOK_DOT;
2302	else	2355	else
2303	{	2356	{
2304	//TODO: ungetc twice in a row is not supported in C
2305	backchar (SCHEME_A_ c);	2357	backchar (SCHEME_A_ c);
2306	backchar (SCHEME_A_ '.');
2307	return TOK_ATOM;	2358	return TOK_DOTATOM;
2308	}	2359	}
		2360
		2361	case '|':
		2362	return TOK_STRATOM;
2309		2363
2310	case '\'':	2364	case '\'':
2311	return TOK_QUOTE;	2365	return TOK_QUOTE;
2312		2366
2313	case ';':	2367	case ';':
…		…
2445	}	2499	}
2446		2500
2447	putcharacter (SCHEME_A_ '"');	2501	putcharacter (SCHEME_A_ '"');
2448	}	2502	}
2449		2503
2450
2451	/* print atoms */	2504	/* print atoms */
2452	static void	2505	static void
2453	printatom (SCHEME_P_ pointer l, int f)	2506	printatom (SCHEME_P_ pointer l, int f)
2454	{	2507	{
2455	char *p;	2508	char *p;
2456	int len;	2509	int len;
2457		2510
2458	atom2str (SCHEME_A_ l, f, &p, &len);	2511	atom2str (SCHEME_A_ l, f, &p, &len);
2459	putchars (SCHEME_A_ p, len);	2512	putchars (SCHEME_A_ p, len);
2460	}	2513	}
2461
2462		2514
2463	/* Uses internal buffer unless string pointer is already available */	2515	/* Uses internal buffer unless string pointer is already available */
2464	static void	2516	static void
2465	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)	2517	atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466	{	2518	{
…		…
2480	{	2532	{
2481	p = SCHEME_V->strbuff;	2533	p = SCHEME_V->strbuff;
2482		2534
2483	if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */	2535	if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2484	{	2536	{
2485	if (num_is_integer (l))	2537	if (is_integer (l))
2486	xnum (p, ivalue_unchecked (l));	2538	xnum (p, ivalue_unchecked (l));
2487	#if USE_REAL	2539	#if USE_REAL
2488	else	2540	else
2489	{	2541	{
2490	snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));	2542	snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
…		…
2627	#endif	2679	#endif
2628	}	2680	}
2629	else if (is_continuation (l))	2681	else if (is_continuation (l))
2630	p = "#<CONTINUATION>";	2682	p = "#<CONTINUATION>";
2631	else	2683	else
		2684	{
		2685	#if USE_PRINTF
		2686	p = SCHEME_V->strbuff;
		2687	snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
		2688	#else
2632	p = "#<ERROR>";	2689	p = "#<ERROR>";
		2690	#endif
		2691	}
2633		2692
2634	*pp = p;	2693	*pp = p;
2635	*plen = strlen (p);	2694	*plen = strlen (p);
2636	}	2695	}
2637		2696
…		…
2745	return 0;	2804	return 0;
2746	}	2805	}
2747	else if (is_number (a))	2806	else if (is_number (a))
2748	{	2807	{
2749	if (is_number (b))	2808	if (is_number (b))
2750	if (num_is_integer (a) == num_is_integer (b))
2751	return num_cmp (nvalue (a), nvalue (b)) == 0;	2809	return num_cmp (nvalue (a), nvalue (b)) == 0;
2752		2810
2753	return 0;	2811	return 0;
2754	}	2812	}
2755	else if (is_character (a))	2813	else if (is_character (a))
2756	{	2814	{
…		…
2782	/* () is #t in R5RS */	2840	/* () is #t in R5RS */
2783	#define is_true(p) ((p) != S_F)	2841	#define is_true(p) ((p) != S_F)
2784	#define is_false(p) ((p) == S_F)	2842	#define is_false(p) ((p) == S_F)
2785		2843
2786	/* ========== Environment implementation ========== */	2844	/* ========== Environment implementation ========== */
2787
2788	#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790	static int
2791	hash_fn (const char *key, int table_size)
2792	{
2793	const unsigned char *p = key;
2794	uint32_t hash = 2166136261;
2795
2796	while (*p)
2797	hash = (hash ^ *p++) * 16777619;
2798
2799	return hash % table_size;
2800	}
2801	#endif
2802		2845
2803	#ifndef USE_ALIST_ENV	2846	#ifndef USE_ALIST_ENV
2804		2847
2805	/*	2848	/*
2806	* In this implementation, each frame of the environment may be	2849	* In this implementation, each frame of the environment may be
…		…
2823		2866
2824	SCHEME_V->envir = immutable_cons (new_frame, old_env);	2867	SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825	setenvironment (SCHEME_V->envir);	2868	setenvironment (SCHEME_V->envir);
2826	}	2869	}
2827		2870
		2871	static uint32_t
		2872	sym_hash (pointer sym, uint32_t size)
		2873	{
		2874	uintptr_t ptr = (uintptr_t)sym;
		2875
		2876	#if 0
		2877	/* table size is prime, so why mix */
		2878	ptr += ptr >> 32;
		2879	ptr += ptr >> 16;
		2880	ptr += ptr >> 8;
		2881	#endif
		2882
		2883	return ptr % size;
		2884	}
		2885
2828	ecb_inline void	2886	ecb_inline void
2829	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)	2887	new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830	{	2888	{
2831	pointer slot = immutable_cons (variable, value);	2889	pointer slot = immutable_cons (variable, value);
2832		2890
2833	if (is_vector (car (env)))	2891	if (is_vector (car (env)))
2834	{	2892	{
2835	int location = hash_fn (symname (variable), veclength (car (env)));	2893	int location = sym_hash (variable, veclength (car (env)));
2836
2837	set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));	2894	vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838	}	2895	}
2839	else	2896	else
2840	set_car (env, immutable_cons (slot, car (env)));	2897	set_car (env, immutable_cons (slot, car (env)));
2841	}	2898	}
2842		2899
2843	static pointer	2900	static pointer
2844	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)	2901	find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845	{	2902	{
2846	pointer x, y;	2903	pointer x, y;
2847	int location;
2848		2904
2849	for (x = env; x != NIL; x = cdr (x))	2905	for (x = env; x != NIL; x = cdr (x))
2850	{	2906	{
2851	if (is_vector (car (x)))	2907	if (is_vector (car (x)))
2852	{	2908	{
2853	location = hash_fn (symname (hdl), veclength (car (x)));	2909	int location = sym_hash (hdl, veclength (car (x)));
2854	y = vector_elem (car (x), location);	2910	y = vector_get (car (x), location);
2855	}	2911	}
2856	else	2912	else
2857	y = car (x);	2913	y = car (x);
2858		2914
2859	for (; y != NIL; y = cdr (y))	2915	for (; y != NIL; y = cdr (y))
2860	if (caar (y) == hdl)	2916	if (caar (y) == hdl)
2861	break;	2917	break;
2862		2918
2863	if (y != NIL)	2919	if (y != NIL)
		2920	return car (y);
		2921
		2922	if (!all)
2864	break;	2923	break;
2865
2866	if (!all)
2867	return NIL;
2868	}	2924	}
2869
2870	if (x != NIL)
2871	return car (y);
2872		2925
2873	return NIL;	2926	return NIL;
2874	}	2927	}
2875		2928
2876	#else /* USE_ALIST_ENV */	2929	#else /* USE_ALIST_ENV */
…		…
2898	for (y = car (x); y != NIL; y = cdr (y))	2951	for (y = car (x); y != NIL; y = cdr (y))
2899	if (caar (y) == hdl)	2952	if (caar (y) == hdl)
2900	break;	2953	break;
2901		2954
2902	if (y != NIL)	2955	if (y != NIL)
		2956	return car (y);
2903	break;	2957	break;
2904		2958
2905	if (!all)	2959	if (!all)
2906	return NIL;	2960	break;
2907	}	2961	}
2908
2909	if (x != NIL)
2910	return car (y);
2911		2962
2912	return NIL;	2963	return NIL;
2913	}	2964	}
2914		2965
2915	#endif /* USE_ALIST_ENV else */	2966	#endif /* USE_ALIST_ENV else */
2916		2967
2917	ecb_inline void	2968	ecb_inline void
2918	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)	2969	new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919	{	2970	{
		2971	assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);	2972	new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2921	}	2973	}
2922		2974
2923	ecb_inline void	2975	ecb_inline void
2924	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)	2976	set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
…		…
3025	{	3077	{
3026	int nframes = (uintptr_t)SCHEME_V->dump;	3078	int nframes = (uintptr_t)SCHEME_V->dump;
3027	struct dump_stack_frame *next_frame;	3079	struct dump_stack_frame *next_frame;
3028		3080
3029	/* enough room for the next frame? */	3081	/* enough room for the next frame? */
3030	if (nframes >= SCHEME_V->dump_size)	3082	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3031	{	3083	{
3032	SCHEME_V->dump_size += STACK_GROWTH;	3084	SCHEME_V->dump_size += STACK_GROWTH;
3033	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3085	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3034	}	3086	}
3035		3087
…		…
3132	int i = 0;	3184	int i = 0;
3133	struct dump_stack_frame *frame = SCHEME_V->dump_base;	3185	struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134		3186
3135	while (cont != NIL)	3187	while (cont != NIL)
3136	{	3188	{
3137	frame->op = ivalue (car (cont)); cont = cdr (cont);	3189	frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138	frame->args = car (cont) ; cont = cdr (cont);	3190	frame->args = car (cont) ; cont = cdr (cont);
3139	frame->envir = car (cont) ; cont = cdr (cont);	3191	frame->envir = car (cont) ; cont = cdr (cont);
3140	frame->code = car (cont) ; cont = cdr (cont);	3192	frame->code = car (cont) ; cont = cdr (cont);
3141		3193
3142	++frame;	3194	++frame;
3143	++i;	3195	++i;
3144	}	3196	}
3145		3197
…		…
3174	SCHEME_V->value = a;	3226	SCHEME_V->value = a;
3175		3227
3176	if (dump == NIL)	3228	if (dump == NIL)
3177	return -1;	3229	return -1;
3178		3230
3179	SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);	3231	SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180	SCHEME_V->args = car (dump) ; dump = cdr (dump);	3232	SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181	SCHEME_V->envir = car (dump) ; dump = cdr (dump);	3233	SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182	SCHEME_V->code = car (dump) ; dump = cdr (dump);	3234	SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183		3235
3184	SCHEME_V->dump = dump;	3236	SCHEME_V->dump = dump;
3185		3237
3186	return 0;	3238	return 0;
3187	}	3239	}
…		…
3216		3268
3217	#endif	3269	#endif
3218		3270
3219	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)	3271	#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3220		3272
		3273	#if EXPERIMENT
		3274	static int
		3275	debug (SCHEME_P_ int indent, pointer x)
		3276	{
		3277	int c;
		3278
		3279	if (is_syntax (x))
		3280	{
		3281	printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
		3282	return 8 + 8;
		3283	}
		3284
		3285	if (x == NIL)
		3286	{
		3287	printf ("%*sNIL\n", indent, "");
		3288	return 3;
		3289	}
		3290
		3291	switch (type (x))
		3292	{
		3293	case T_INTEGER:
		3294	printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
		3295	return 32+8;
		3296
		3297	case T_SYMBOL:
		3298	printf ("%*sS<%s>\n", indent, "", symname (x));
		3299	return 24+8;
		3300
		3301	case T_CLOSURE:
		3302	printf ("%*sS<%s>\n", indent, "", "closure");
		3303	debug (SCHEME_A_ indent + 3, cdr(x));
		3304	return 32 + debug (SCHEME_A_ indent + 3, car (x));
		3305
		3306	case T_PAIR:
		3307	printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
		3308	c = debug (SCHEME_A_ indent + 3, car (x));
		3309	c += debug (SCHEME_A_ indent + 3, cdr (x));
		3310	return c + 1;
		3311
		3312	case T_PORT:
		3313	printf ("%*sS<%s>\n", indent, "", "port");
		3314	return 24+8;
		3315
		3316	case T_VECTOR:
		3317	printf ("%*sS<%s>\n", indent, "", "vector");
		3318	return 24+8;
		3319
		3320	case T_ENVIRONMENT:
		3321	printf ("%*sS<%s>\n", indent, "", "environment");
		3322	return 0 + debug (SCHEME_A_ indent + 3, car (x));
		3323
		3324	default:
		3325	printf ("unhandled type %d\n", type (x));
		3326	break;
		3327	}
		3328	}
		3329	#endif
		3330
3221	static int	3331	static int
3222	opexe_0 (SCHEME_P_ enum scheme_opcodes op)	3332	opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223	{	3333	{
3224	pointer args = SCHEME_V->args;	3334	pointer args = SCHEME_V->args;
3225	pointer x, y;	3335	pointer x, y;
3226		3336
3227	switch (op)	3337	switch (op)
3228	{	3338	{
		3339	#if EXPERIMENT //D
		3340	case OP_DEBUG:
		3341	printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
		3342	printf ("\n");
		3343	s_return (S_T);
		3344	#endif
3229	case OP_LOAD: /* load */	3345	case OP_LOAD: /* load */
3230	if (file_interactive (SCHEME_A))	3346	if (file_interactive (SCHEME_A))
3231	{	3347	{
3232	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3348	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3233	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3349	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3234	}	3350	}
3235		3351
3236	if (!file_push (SCHEME_A_ strvalue (car (args))))	3352	if (!file_push (SCHEME_A_ strvalue (car (args))))
3237	Error_1 ("unable to open", car (args));	3353	Error_1 ("unable to open", car (args));
3238	else	3354	else
…		…
3242	}	3358	}
3243		3359
3244	case OP_T0LVL: /* top level */	3360	case OP_T0LVL: /* top level */
3245		3361
3246	/* If we reached the end of file, this loop is done. */	3362	/* If we reached the end of file, this loop is done. */
3247	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3363	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3248	{	3364	{
3249	if (SCHEME_V->file_i == 0)	3365	if (SCHEME_V->file_i == 0)
3250	{	3366	{
3251	SCHEME_V->args = NIL;	3367	SCHEME_V->args = NIL;
3252	s_goto (OP_QUIT);	3368	s_goto (OP_QUIT);
…		…
3330	#endif	3446	#endif
3331	if (is_symbol (SCHEME_V->code)) /* symbol */	3447	if (is_symbol (SCHEME_V->code)) /* symbol */
3332	{	3448	{
3333	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3449	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3334		3450
3335	if (x != NIL)	3451	if (x == NIL)
3336	s_return (slot_value_in_env (x));
3337	else
3338	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3452	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3453
		3454	s_return (slot_value_in_env (x));
3339	}	3455	}
3340	else if (is_pair (SCHEME_V->code))	3456	else if (is_pair (SCHEME_V->code))
3341	{	3457	{
3342	x = car (SCHEME_V->code);	3458	x = car (SCHEME_V->code);
3343		3459
…		…
3356	}	3472	}
3357	else	3473	else
3358	s_return (SCHEME_V->code);	3474	s_return (SCHEME_V->code);
3359		3475
3360	case OP_E0ARGS: /* eval arguments */	3476	case OP_E0ARGS: /* eval arguments */
3361	if (is_macro (SCHEME_V->value)) /* macro expansion */	3477	if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362	{	3478	{
3363	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);	3479	s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364	SCHEME_V->args = cons (SCHEME_V->code, NIL);	3480	SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365	SCHEME_V->code = SCHEME_V->value;	3481	SCHEME_V->code = SCHEME_V->value;
3366	s_goto (OP_APPLY);	3482	s_goto (OP_APPLY);
…		…
3393		3509
3394	case OP_TRACING:	3510	case OP_TRACING:
3395	{	3511	{
3396	int tr = SCHEME_V->tracing;	3512	int tr = SCHEME_V->tracing;
3397		3513
3398	SCHEME_V->tracing = ivalue (car (args));	3514	SCHEME_V->tracing = ivalue_unchecked (car (args));
3399	s_return (mk_integer (SCHEME_A_ tr));	3515	s_return (mk_integer (SCHEME_A_ tr));
3400	}	3516	}
3401		3517
3402	#endif	3518	#endif
3403		3519
…		…
3420	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3536	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3421	else if (is_foreign (SCHEME_V->code))	3537	else if (is_foreign (SCHEME_V->code))
3422	{	3538	{
3423	/* Keep nested calls from GC'ing the arglist */	3539	/* Keep nested calls from GC'ing the arglist */
3424	push_recent_alloc (SCHEME_A_ args, NIL);	3540	push_recent_alloc (SCHEME_A_ args, NIL);
3425	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3541	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426		3542
3427	s_return (x);	3543	s_return (x);
3428	}	3544	}
3429	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */	3545	else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3430	{	3546	{
…		…
3467		3583
3468	case OP_DOMACRO: /* do macro */	3584	case OP_DOMACRO: /* do macro */
3469	SCHEME_V->code = SCHEME_V->value;	3585	SCHEME_V->code = SCHEME_V->value;
3470	s_goto (OP_EVAL);	3586	s_goto (OP_EVAL);
3471		3587
3472	#if 1
3473
3474	case OP_LAMBDA: /* lambda */	3588	case OP_LAMBDA: /* lambda */
3475	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3589	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3476	set SCHEME_V->value fall thru */	3590	set SCHEME_V->value fall thru */
3477	{	3591	{
3478	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3592	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3484	SCHEME_V->code = slot_value_in_env (f);	3598	SCHEME_V->code = slot_value_in_env (f);
3485	s_goto (OP_APPLY);	3599	s_goto (OP_APPLY);
3486	}	3600	}
3487		3601
3488	SCHEME_V->value = SCHEME_V->code;	3602	SCHEME_V->value = SCHEME_V->code;
3489	/* Fallthru */
3490	}	3603	}
		3604	/* Fallthru */
3491		3605
3492	case OP_LAMBDA1:	3606	case OP_LAMBDA1:
3493	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3607	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3494
3495	#else
3496
3497	case OP_LAMBDA: /* lambda */
3498	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3499
3500	#endif
3501		3608
3502	case OP_MKCLOSURE: /* make-closure */	3609	case OP_MKCLOSURE: /* make-closure */
3503	x = car (args);	3610	x = car (args);
3504		3611
3505	if (car (x) == SCHEME_V->LAMBDA)	3612	if (car (x) == SCHEME_V->LAMBDA)
…		…
3922	{	4029	{
3923	pointer args = SCHEME_V->args;	4030	pointer args = SCHEME_V->args;
3924	pointer x = car (args);	4031	pointer x = car (args);
3925	num v;	4032	num v;
3926		4033
3927	#if USE_MATH
3928	RVALUE dd;
3929	#endif
3930
3931	switch (op)	4034	switch (op)
3932	{	4035	{
3933	#if USE_MATH	4036	#if USE_MATH
3934	case OP_INEX2EX: /* inexact->exact */	4037	case OP_INEX2EX: /* inexact->exact */
		4038	{
3935	if (num_is_integer (x))	4039	if (is_integer (x))
3936	s_return (x);	4040	s_return (x);
3937	else if (modf (rvalue_unchecked (x), &dd) == 0)	4041
		4042	RVALUE r = rvalue_unchecked (x);
		4043
		4044	if (r == (RVALUE)(IVALUE)r)
3938	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4045	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3939	else	4046	else
3940	Error_1 ("inexact->exact: not integral:", x);	4047	Error_1 ("inexact->exact: not integral:", x);
		4048	}
3941		4049
3942	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4050	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3943	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4051	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3944	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4052	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3945	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4053	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
…		…
3963	{	4071	{
3964	RVALUE result;	4072	RVALUE result;
3965	int real_result = 1;	4073	int real_result = 1;
3966	pointer y = cadr (args);	4074	pointer y = cadr (args);
3967		4075
3968	if (num_is_integer (x) && num_is_integer (y))	4076	if (is_integer (x) && is_integer (y))
3969	real_result = 0;	4077	real_result = 0;
3970		4078
3971	/* This 'if' is an R5RS compatibility fix. */	4079	/* This 'if' is an R5RS compatibility fix. */
3972	/* NOTE: Remove this 'if' fix for R6RS. */	4080	/* NOTE: Remove this 'if' fix for R6RS. */
3973	if (rvalue (x) == 0 && rvalue (y) < 0)	4081	if (rvalue (x) == 0 && rvalue (y) < 0)
…		…
3979	/* If the test fails, result is too big for integer. */	4087	/* If the test fails, result is too big for integer. */
3980	if (!real_result)	4088	if (!real_result)
3981	{	4089	{
3982	long result_as_long = result;	4090	long result_as_long = result;
3983		4091
3984	if (result != (RVALUE) result_as_long)	4092	if (result != result_as_long)
3985	real_result = 1;	4093	real_result = 1;
3986	}	4094	}
3987		4095
3988	if (real_result)	4096	if (real_result)
3989	s_return (mk_real (SCHEME_A_ result));	4097	s_return (mk_real (SCHEME_A_ result));
…		…
3994	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4102	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3995	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4103	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996		4104
3997	case OP_TRUNCATE:	4105	case OP_TRUNCATE:
3998	{	4106	{
3999	RVALUE rvalue_of_x;	4107	RVALUE n = rvalue (x);
4000
4001	rvalue_of_x = rvalue (x);
4002
4003	if (rvalue_of_x > 0)
4004	s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));	4108	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4005	else
4006	s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007	}	4109	}
4008		4110
4009	case OP_ROUND:	4111	case OP_ROUND:
4010	if (num_is_integer (x))	4112	if (is_integer (x))
4011	s_return (x);	4113	s_return (x);
4012		4114
4013	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4115	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014	#endif	4116	#endif
4015		4117
…		…
4106	else	4208	else
4107	Error_0 ("modulo: division by zero");	4209	Error_0 ("modulo: division by zero");
4108		4210
4109	s_return (mk_number (SCHEME_A_ v));	4211	s_return (mk_number (SCHEME_A_ v));
4110		4212
4111	case OP_CAR: /* car */	4213	/* the compiler will optimize this mess... */
4112	s_return (caar (args));	4214	case OP_CAR: op_car: s_return (car (x));
4113		4215	case OP_CDR: op_cdr: s_return (cdr (x));
4114	case OP_CDR: /* cdr */	4216	case OP_CAAR: op_caar: x = car (x); goto op_car;
4115	s_return (cdar (args));	4217	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4218	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4219	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4220	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4221	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4222	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4223	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4224	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4225	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4226	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4227	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4228	case OP_CAAAAR: x = car (x); goto op_caaar;
		4229	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4230	case OP_CAADAR: x = car (x); goto op_caadr;
		4231	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4232	case OP_CADAAR: x = car (x); goto op_cadar;
		4233	case OP_CADADR: x = cdr (x); goto op_cadar;
		4234	case OP_CADDAR: x = car (x); goto op_caddr;
		4235	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4236	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4237	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4238	case OP_CDADAR: x = car (x); goto op_cdadr;
		4239	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4240	case OP_CDDAAR: x = car (x); goto op_cddar;
		4241	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4242	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4243	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4116		4244
4117	case OP_CONS: /* cons */	4245	case OP_CONS: /* cons */
4118	set_cdr (args, cadr (args));	4246	set_cdr (args, cadr (args));
4119	s_return (args);	4247	s_return (args);
4120		4248
…		…
4135	}	4263	}
4136	else	4264	else
4137	Error_0 ("set-cdr!: unable to alter immutable pair");	4265	Error_0 ("set-cdr!: unable to alter immutable pair");
4138		4266
4139	case OP_CHAR2INT: /* char->integer */	4267	case OP_CHAR2INT: /* char->integer */
4140	s_return (mk_integer (SCHEME_A_ ivalue (x)));	4268	s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141		4269
4142	case OP_INT2CHAR: /* integer->char */	4270	case OP_INT2CHAR: /* integer->char */
4143	s_return (mk_character (SCHEME_A_ ivalue (x)));	4271	s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144		4272
4145	case OP_CHARUPCASE:	4273	case OP_CHARUPCASE:
4146	{	4274	{
4147	unsigned char c = ivalue (x);	4275	unsigned char c = ivalue_unchecked (x);
4148	c = toupper (c);	4276	c = toupper (c);
4149	s_return (mk_character (SCHEME_A_ c));	4277	s_return (mk_character (SCHEME_A_ c));
4150	}	4278	}
4151		4279
4152	case OP_CHARDNCASE:	4280	case OP_CHARDNCASE:
4153	{	4281	{
4154	unsigned char c = ivalue (x);	4282	unsigned char c = ivalue_unchecked (x);
4155	c = tolower (c);	4283	c = tolower (c);
4156	s_return (mk_character (SCHEME_A_ c));	4284	s_return (mk_character (SCHEME_A_ c));
4157	}	4285	}
4158		4286
4159	case OP_STR2SYM: /* string->symbol */	4287	case OP_STR2SYM: /* string->symbol */
…		…
4236	Error_1 ("atom->string: not an atom:", x);	4364	Error_1 ("atom->string: not an atom:", x);
4237	}	4365	}
4238		4366
4239	case OP_MKSTRING: /* make-string */	4367	case OP_MKSTRING: /* make-string */
4240	{	4368	{
4241	int fill = ' ';	4369	int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242	int len;
4243
4244	len = ivalue (x);	4370	int len = ivalue_unchecked (x);
4245
4246	if (cdr (args) != NIL)
4247	fill = charvalue (cadr (args));
4248		4371
4249	s_return (mk_empty_string (SCHEME_A_ len, fill));	4372	s_return (mk_empty_string (SCHEME_A_ len, fill));
4250	}	4373	}
4251		4374
4252	case OP_STRLEN: /* string-length */	4375	case OP_STRLEN: /* string-length */
4253	s_return (mk_integer (SCHEME_A_ strlength (x)));	4376	s_return (mk_integer (SCHEME_A_ strlength (x)));
4254		4377
4255	case OP_STRREF: /* string-ref */	4378	case OP_STRREF: /* string-ref */
4256	{	4379	{
4257	char *str;
4258	int index;
4259
4260	str = strvalue (x);	4380	char *str = strvalue (x);
4261
4262	index = ivalue (cadr (args));	4381	int index = ivalue_unchecked (cadr (args));
4263		4382
4264	if (index >= strlength (x))	4383	if (index >= strlength (x))
4265	Error_1 ("string-ref: out of bounds:", cadr (args));	4384	Error_1 ("string-ref: out of bounds:", cadr (args));
4266		4385
4267	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));	4386	s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268	}	4387	}
4269		4388
4270	case OP_STRSET: /* string-set! */	4389	case OP_STRSET: /* string-set! */
4271	{	4390	{
4272	char *str;	4391	char *str = strvalue (x);
4273	int index;	4392	int index = ivalue_unchecked (cadr (args));
4274	int c;	4393	int c;
4275		4394
4276	if (is_immutable (x))	4395	if (is_immutable (x))
4277	Error_1 ("string-set!: unable to alter immutable string:", x);	4396	Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279	str = strvalue (x);
4280
4281	index = ivalue (cadr (args));
4282		4397
4283	if (index >= strlength (x))	4398	if (index >= strlength (x))
4284	Error_1 ("string-set!: out of bounds:", cadr (args));	4399	Error_1 ("string-set!: out of bounds:", cadr (args));
4285		4400
4286	c = charvalue (caddr (args));	4401	c = charvalue (caddr (args));
…		…
4309	s_return (newstr);	4424	s_return (newstr);
4310	}	4425	}
4311		4426
4312	case OP_SUBSTR: /* substring */	4427	case OP_SUBSTR: /* substring */
4313	{	4428	{
4314	char *str;	4429	char *str = strvalue (x);
4315	int index0;	4430	int index0 = ivalue_unchecked (cadr (args));
4316	int index1;	4431	int index1;
4317	int len;	4432	int len;
4318		4433
4319	str = strvalue (x);
4320
4321	index0 = ivalue (cadr (args));
4322
4323	if (index0 > strlength (x))	4434	if (index0 > strlength (x))
4324	Error_1 ("substring: start out of bounds:", cadr (args));	4435	Error_1 ("substring: start out of bounds:", cadr (args));
4325		4436
4326	if (cddr (args) != NIL)	4437	if (cddr (args) != NIL)
4327	{	4438	{
4328	index1 = ivalue (caddr (args));	4439	index1 = ivalue_unchecked (caddr (args));
4329		4440
4330	if (index1 > strlength (x) || index1 < index0)	4441	if (index1 > strlength (x) || index1 < index0)
4331	Error_1 ("substring: end out of bounds:", caddr (args));	4442	Error_1 ("substring: end out of bounds:", caddr (args));
4332	}	4443	}
4333	else	4444	else
…		…
4356	if (SCHEME_V->no_memory)	4467	if (SCHEME_V->no_memory)
4357	s_return (S_SINK);	4468	s_return (S_SINK);
4358	#endif	4469	#endif
4359		4470
4360	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)	4471	for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361	set_vector_elem (vec, i, car (x));	4472	vector_set (vec, i, car (x));
4362		4473
4363	s_return (vec);	4474	s_return (vec);
4364	}	4475	}
4365		4476
4366	case OP_MKVECTOR: /* make-vector */	4477	case OP_MKVECTOR: /* make-vector */
4367	{	4478	{
4368	pointer fill = NIL;	4479	pointer fill = NIL;
4369	int len;
4370	pointer vec;	4480	pointer vec;
4371
4372	len = ivalue (x);	4481	int len = ivalue_unchecked (x);
4373		4482
4374	if (cdr (args) != NIL)	4483	if (cdr (args) != NIL)
4375	fill = cadr (args);	4484	fill = cadr (args);
4376		4485
4377	vec = mk_vector (SCHEME_A_ len);	4486	vec = mk_vector (SCHEME_A_ len);
…		…
4380	if (SCHEME_V->no_memory)	4489	if (SCHEME_V->no_memory)
4381	s_return (S_SINK);	4490	s_return (S_SINK);
4382	#endif	4491	#endif
4383		4492
4384	if (fill != NIL)	4493	if (fill != NIL)
4385	fill_vector (vec, fill);	4494	fill_vector (vec, 0, fill);
4386		4495
4387	s_return (vec);	4496	s_return (vec);
4388	}	4497	}
4389		4498
4390	case OP_VECLEN: /* vector-length */	4499	case OP_VECLEN: /* vector-length */
4391	s_return (mk_integer (SCHEME_A_ veclength (x)));	4500	s_return (mk_integer (SCHEME_A_ veclength (x)));
4392		4501
		4502	case OP_VECRESIZE:
		4503	vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
		4504	s_return (x);
		4505
4393	case OP_VECREF: /* vector-ref */	4506	case OP_VECREF: /* vector-ref */
4394	{	4507	{
4395	int index;
4396
4397	index = ivalue (cadr (args));	4508	int index = ivalue_unchecked (cadr (args));
4398		4509
4399	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4510	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400	Error_1 ("vector-ref: out of bounds:", cadr (args));	4511	Error_1 ("vector-ref: out of bounds:", cadr (args));
4401		4512
4402	s_return (vector_elem (x, index));	4513	s_return (vector_get (x, index));
4403	}	4514	}
4404		4515
4405	case OP_VECSET: /* vector-set! */	4516	case OP_VECSET: /* vector-set! */
4406	{	4517	{
4407	int index;	4518	int index = ivalue_unchecked (cadr (args));
4408		4519
4409	if (is_immutable (x))	4520	if (is_immutable (x))
4410	Error_1 ("vector-set!: unable to alter immutable vector:", x);	4521	Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411		4522
4412	index = ivalue (cadr (args));
4413
4414	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)	4523	if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415	Error_1 ("vector-set!: out of bounds:", cadr (args));	4524	Error_1 ("vector-set!: out of bounds:", cadr (args));
4416		4525
4417	set_vector_elem (x, index, caddr (args));	4526	vector_set (x, index, caddr (args));
4418	s_return (x);	4527	s_return (x);
4419	}	4528	}
4420	}	4529	}
4421		4530
4422	if (USE_ERROR_CHECKING) abort ();	4531	if (USE_ERROR_CHECKING) abort ();
4423	}
4424
4425	INTERFACE int
4426	is_list (SCHEME_P_ pointer a)
4427	{
4428	return list_length (SCHEME_A_ a) >= 0;
4429	}
4430
4431	/* Result is:
4432	proper list: length
4433	circular list: -1
4434	not even a pair: -2
4435	dotted list: -2 minus length before dot
4436	*/
4437	INTERFACE int
4438	list_length (SCHEME_P_ pointer a)
4439	{
4440	int i = 0;
4441	pointer slow, fast;
4442
4443	slow = fast = a;
4444
4445	while (1)
4446	{
4447	if (fast == NIL)
4448	return i;
4449
4450	if (!is_pair (fast))
4451	return -2 - i;
4452
4453	fast = cdr (fast);
4454	++i;
4455
4456	if (fast == NIL)
4457	return i;
4458
4459	if (!is_pair (fast))
4460	return -2 - i;
4461
4462	++i;
4463	fast = cdr (fast);
4464
4465	/* Safe because we would have already returned if `fast'
4466	encountered a non-pair. */
4467	slow = cdr (slow);
4468
4469	if (fast == slow)
4470	{
4471	/* the fast pointer has looped back around and caught up
4472	with the slow pointer, hence the structure is circular,
4473	not of finite length, and therefore not a list */
4474	return -1;
4475	}
4476	}
4477	}	4532	}
4478		4533
4479	static int	4534	static int
4480	opexe_2 (SCHEME_P_ enum scheme_opcodes op)	4535	opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481	{	4536	{
…		…
4515	pointer d = cdr (args);	4570	pointer d = cdr (args);
4516	int r;	4571	int r;
4517		4572
4518	switch (op)	4573	switch (op)
4519	{	4574	{
4520	case OP_NOT: /* not */ r = is_false (a) ; break;	4575	case OP_NOT: /* not */ r = is_false (a) ; break;
4521	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;	4576	case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4522	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;	4577	case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523	case OP_NULLP: /* null? */ r = a == NIL ; break;	4578	case OP_NULLP: /* null? */ r = a == NIL ; break;
4524	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;	4579	case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
		4580	case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4525	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;	4581	case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526	case OP_STRINGP: /* string? */ r = is_string (a) ; break;	4582	case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;	4583	case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */	4584	case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529	case OP_CHARP: /* char? */ r = is_character (a) ; break;	4585	case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530		4586
4531	#if USE_CHAR_CLASSIFIERS	4587	#if USE_CHAR_CLASSIFIERS
4532	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;	4588	case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;	4589	case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;	4590	case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;	4591	case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;	4592	case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537	#endif	4593	#endif
4538		4594
4539	#if USE_PORTS	4595	#if USE_PORTS
4540	case OP_PORTP: /* port? */ r = is_port (a) ; break;	4596	case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;	4597	case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
…		…
4584	}	4640	}
4585	else	4641	else
4586	s_return (SCHEME_V->code);	4642	s_return (SCHEME_V->code);
4587		4643
4588	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4644	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4589	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4645	*CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4590	s_return (SCHEME_V->value);	4646	s_return (SCHEME_V->value);
4591		4647
4592	#if USE_PORTS	4648	#if USE_PORTS
4593		4649
4594	case OP_WRITE: /* write */	4650	case OP_WRITE: /* write */
…		…
4739	SCHEME_V->gc_verbose = (a != S_F);	4795	SCHEME_V->gc_verbose = (a != S_F);
4740	s_retbool (was);	4796	s_retbool (was);
4741	}	4797	}
4742		4798
4743	case OP_NEWSEGMENT: /* new-segment */	4799	case OP_NEWSEGMENT: /* new-segment */
		4800	#if 0
4744	if (!is_pair (args) || !is_number (a))	4801	if (!is_pair (args) || !is_number (a))
4745	Error_0 ("new-segment: argument must be a number");	4802	Error_0 ("new-segment: argument must be a number");
4746		4803	#endif
4747	alloc_cellseg (SCHEME_A_ (int)ivalue (a));	4804	s_retbool (alloc_cellseg (SCHEME_A));
4748
4749	s_return (S_T);
4750		4805
4751	case OP_OBLIST: /* oblist */	4806	case OP_OBLIST: /* oblist */
4752	s_return (oblist_all_symbols (SCHEME_A));	4807	s_return (oblist_all_symbols (SCHEME_A));
4753		4808
4754	#if USE_PORTS	4809	#if USE_PORTS
…		…
4824	s_return (p == NIL ? S_F : p);	4879	s_return (p == NIL ? S_F : p);
4825	}	4880	}
4826		4881
4827	case OP_GET_OUTSTRING: /* get-output-string */	4882	case OP_GET_OUTSTRING: /* get-output-string */
4828	{	4883	{
4829	port *p;	4884	port *p = port (a);
4830		4885
4831	if ((p = a->object.port)->kind & port_string)	4886	if (p->kind & port_string)
4832	{	4887	{
4833	off_t size;	4888	off_t size;
4834	char *str;	4889	char *str;
4835		4890
4836	size = p->rep.string.curr - p->rep.string.start + 1;	4891	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4941	int res;	4996	int res;
4942		4997
4943	if (is_pair (args))	4998	if (is_pair (args))
4944	p = car (args);	4999	p = car (args);
4945		5000
4946	res = p->object.port->kind & port_string;	5001	res = port (p)->kind & port_string;
4947		5002
4948	s_retbool (res);	5003	s_retbool (res);
4949	}	5004	}
4950		5005
4951	case OP_SET_INPORT: /* set-input-port */	5006	case OP_SET_INPORT: /* set-input-port */
…		…
5010	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);	5065	s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011	SCHEME_V->tok = token (SCHEME_A);	5066	SCHEME_V->tok = token (SCHEME_A);
5012	s_goto (OP_RDSEXPR);	5067	s_goto (OP_RDSEXPR);
5013		5068
5014	case TOK_ATOM:	5069	case TOK_ATOM:
5015	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS)));	5070	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
		5071
		5072	case TOK_DOTATOM:
		5073	SCHEME_V->strbuff[0] = '.';
		5074	s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
		5075
		5076	case TOK_STRATOM:
		5077	x = readstrexp (SCHEME_A_ '|');
		5078	//TODO: haven't checked whether the garbage collector could interfere
		5079	s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016		5080
5017	case TOK_DQUOTE:	5081	case TOK_DQUOTE:
5018	x = readstrexp (SCHEME_A);	5082	x = readstrexp (SCHEME_A_ '"');
5019		5083
5020	if (x == S_F)	5084	if (x == S_F)
5021	Error_0 ("Error reading string");	5085	Error_0 ("Error reading string");
5022		5086
5023	setimmutable (x);	5087	setimmutable (x);
…		…
5035	s_goto (OP_EVAL);	5099	s_goto (OP_EVAL);
5036	}	5100	}
5037	}	5101	}
5038		5102
5039	case TOK_SHARP_CONST:	5103	case TOK_SHARP_CONST:
5040	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL)	5104	if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041	Error_0 ("undefined sharp expression");	5105	Error_0 ("undefined sharp expression");
5042	else	5106	else
5043	s_return (x);	5107	s_return (x);
5044		5108
5045	default:	5109	default:
…		…
5197	putstr (SCHEME_A_ ")");	5261	putstr (SCHEME_A_ ")");
5198	s_return (S_T);	5262	s_return (S_T);
5199	}	5263	}
5200	else	5264	else
5201	{	5265	{
5202	pointer elem = vector_elem (vec, i);	5266	pointer elem = vector_get (vec, i);
5203		5267
5204	ivalue_unchecked (cdr (args)) = i + 1;	5268	ivalue_unchecked (cdr (args)) = i + 1;
5205	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);	5269	s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206	SCHEME_V->args = elem;	5270	SCHEME_V->args = elem;
5207		5271
…		…
5267		5331
5268	case OP_CLOSUREP: /* closure? */	5332	case OP_CLOSUREP: /* closure? */
5269	/*	5333	/*
5270	* Note, macro object is also a closure.	5334	* Note, macro object is also a closure.
5271	* Therefore, (closure? <#MACRO>) ==> #t	5335	* Therefore, (closure? <#MACRO>) ==> #t
		5336	* (schmorp) well, obviously not, fix? TODO
5272	*/	5337	*/
5273	s_retbool (is_closure (a));	5338	s_retbool (is_closure (a));
5274		5339
5275	case OP_MACROP: /* macro? */	5340	case OP_MACROP: /* macro? */
5276	s_retbool (is_macro (a));	5341	s_retbool (is_macro (a));
…		…
5282	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */	5347	/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5283	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);	5348	typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284		5349
5285	typedef int (*test_predicate)(pointer);	5350	typedef int (*test_predicate)(pointer);
5286	static int	5351	static int
5287	is_any (pointer p)	5352	tst_any (pointer p)
5288	{	5353	{
5289	return 1;	5354	return 1;
5290	}	5355	}
5291		5356
5292	static int	5357	static int
5293	is_nonneg (pointer p)	5358	tst_inonneg (pointer p)
5294	{	5359	{
5295	return ivalue (p) >= 0 && is_integer (p);	5360	return is_integer (p) && ivalue_unchecked (p) >= 0;
5296	}	5361	}
5297		5362
5298	static int	5363	static int
5299	tst_is_list (pointer p)	5364	tst_is_list (SCHEME_P_ pointer p)
5300	{	5365	{
5301	return p == NIL || is_pair (p);	5366	return p == NIL || is_pair (p);
5302	}	5367	}
5303		5368
5304	/* Correspond carefully with following defines! */	5369	/* Correspond carefully with following defines! */
5305	static struct	5370	static struct
5306	{	5371	{
5307	test_predicate fct;	5372	test_predicate fct;
5308	const char *kind;	5373	const char *kind;
5309	} tests[] =	5374	} tests[] = {
5310	{
5311	{ is_any, 0 },	5375	{ tst_any , 0 },
5312	{ is_string, "string" },	5376	{ is_string , "string" },
5313	{ is_symbol, "symbol" },	5377	{ is_symbol , "symbol" },
5314	{ is_port, "port" },	5378	{ is_port , "port" },
5315	{ is_inport, "input port" },	5379	{ is_inport , "input port" },
5316	{ is_outport, "output port" },	5380	{ is_outport , "output port" },
5317	{ is_environment, "environment" },	5381	{ is_environment, "environment" },
5318	{ is_pair, "pair" },	5382	{ is_pair , "pair" },
5319	{ tst_is_list, "pair or '()" },	5383	{ 0 , "pair or '()" },
5320	{ is_character, "character" },	5384	{ is_character , "character" },
5321	{ is_vector, "vector" },	5385	{ is_vector , "vector" },
5322	{ is_number, "number" },	5386	{ is_number , "number" },
5323	{ is_integer, "integer" },	5387	{ is_integer , "integer" },
5324	{ is_nonneg, "non-negative integer" }	5388	{ tst_inonneg , "non-negative integer" }
5325	};	5389	};
5326		5390
5327	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */	5391	#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328	#define TST_ANY "\001"	5392	#define TST_ANY "\001"
5329	#define TST_STRING "\002"	5393	#define TST_STRING "\002"
…		…
5370	typedef struct	5434	typedef struct
5371	{	5435	{
5372	uint8_t func;	5436	uint8_t func;
5373	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */	5437	/*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374	uint8_t builtin;	5438	uint8_t builtin;
		5439	#if USE_ERROR_CHECKING
5375	uint8_t min_arity;	5440	uint8_t min_arity;
5376	uint8_t max_arity;	5441	uint8_t max_arity;
5377	char arg_tests_encoding[3];	5442	char arg_tests_encoding[3];
		5443	#endif
5378	} op_code_info;	5444	} op_code_info;
5379		5445
5380	static const op_code_info dispatch_table[] = {	5446	static const op_code_info dispatch_table[] = {
		5447	#if USE_ERROR_CHECKING
5381	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },	5448	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
		5449	#else
		5450	#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
		5451	#endif
5382	#include "opdefines.h"	5452	#include "opdefines.h"
5383	#undef OP_DEF	5453	#undef OP_DEF
5384	{0}	5454	{0}
5385	};	5455	};
5386		5456
…		…
5428	{	5498	{
5429	pointer arg = car (arglist);	5499	pointer arg = car (arglist);
5430		5500
5431	j = t[0];	5501	j = t[0];
5432		5502
		5503	/*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
		5504	if (j == TST_LIST[0])
		5505	{
		5506	if (!tst_is_list (SCHEME_A_ arg))
		5507	break;
		5508	}
		5509	else
		5510	{
5433	if (!tests[j - 1].fct (arg))	5511	if (!tests[j - 1].fct (arg))
5434	break;	5512	break;
		5513	}
5435		5514
5436	if (t[1]) /* last test is replicated as necessary */	5515	if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437	t++;	5516	t++;
5438		5517
5439	arglist = cdr (arglist);	5518	arglist = cdr (arglist);
5440	i++;	5519	i++;
5441	}	5520	}
…		…
5496	mk_proc (SCHEME_P_ enum scheme_opcodes op)	5575	mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497	{	5576	{
5498	pointer y = get_cell (SCHEME_A_ NIL, NIL);	5577	pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499	set_typeflag (y, (T_PROC | T_ATOM));	5578	set_typeflag (y, (T_PROC | T_ATOM));
5500	ivalue_unchecked (y) = op;	5579	ivalue_unchecked (y) = op;
5501	set_num_integer (y);
5502	return y;	5580	return y;
5503	}	5581	}
5504		5582
5505	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */	5583	/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506	static int	5584	static int
5507	syntaxnum (pointer p)	5585	syntaxnum (pointer p)
5508	{	5586	{
5509	const char *s = strvalue (car (p));	5587	const char *s = strvalue (p);
5510		5588
5511	switch (strlength (car (p)))	5589	switch (strlength (p))
5512	{	5590	{
5513	case 2:	5591	case 2:
5514	if (s[0] == 'i')	5592	if (s[0] == 'i')
5515	return OP_IF0; /* if */	5593	return OP_IF0; /* if */
5516	else	5594	else
…		…
5591	ecb_cold int	5669	ecb_cold int
5592	scheme_init (SCHEME_P)	5670	scheme_init (SCHEME_P)
5593	{	5671	{
5594	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5672	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5595	pointer x;	5673	pointer x;
		5674
		5675	/* this memset is not strictly correct, as we assume (intcache)
		5676	* that memset 0 will also set pointers to 0, but memset does
		5677	* of course not guarantee that. screw such systems.
		5678	*/
		5679	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5596		5680
5597	num_set_fixnum (num_zero, 1);	5681	num_set_fixnum (num_zero, 1);
5598	num_set_ivalue (num_zero, 0);	5682	num_set_ivalue (num_zero, 0);
5599	num_set_fixnum (num_one, 1);	5683	num_set_fixnum (num_one, 1);
5600	num_set_ivalue (num_one, 1);	5684	num_set_ivalue (num_one, 1);
…		…
5612	SCHEME_V->save_inport = NIL;	5696	SCHEME_V->save_inport = NIL;
5613	SCHEME_V->loadport = NIL;	5697	SCHEME_V->loadport = NIL;
5614	SCHEME_V->nesting = 0;	5698	SCHEME_V->nesting = 0;
5615	SCHEME_V->interactive_repl = 0;	5699	SCHEME_V->interactive_repl = 0;
5616		5700
5617	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5701	if (!alloc_cellseg (SCHEME_A))
5618	{	5702	{
5619	#if USE_ERROR_CHECKING	5703	#if USE_ERROR_CHECKING
5620	SCHEME_V->no_memory = 1;	5704	SCHEME_V->no_memory = 1;
5621	return 0;	5705	return 0;
5622	#endif	5706	#endif
…		…
5952	# endif	6036	# endif
5953	int fin;	6037	int fin;
5954	char *file_name = InitFile;	6038	char *file_name = InitFile;
5955	int retcode;	6039	int retcode;
5956	int isfile = 1;	6040	int isfile = 1;
		6041	system ("ps v $PPID");//D
5957		6042
5958	if (argc == 2 && strcmp (argv[1], "-?") == 0)	6043	if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959	{	6044	{
5960	xwrstr ("Usage: tinyscheme -?\n");	6045	xwrstr ("Usage: tinyscheme -?\n");
5961	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6046	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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