ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.17 by root, Thu Nov 26 10:15:51 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 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>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#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
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79 91
80#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
81static scheme sc; 93static scheme sc;
82#endif 94#endif
83 95
84static void 96ecb_cold static void
85xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
86{ 98{
87 if (n < 0) 99 if (n < 0)
88 { 100 {
89 *s++ = '-'; 101 *s++ = '-';
… …
91 } 103 }
92 104
93 char *p = s; 105 char *p = s;
94 106
95 do { 107 do {
96 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
97 n /= base; 109 n /= base;
98 } while (n); 110 } while (n);
99 111
100 *p-- = 0; 112 *p-- = 0;
101 113
… …
104 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
105 --p; ++s; 117 --p; ++s;
106 } 118 }
107} 119}
108 120
109static void 121ecb_cold static void
110xnum (char *s, long n) 122xnum (char *s, long n)
111{ 123{
112 xbase (s, n, 10); 124 xbase (s, n, 10);
113} 125}
114 126
115static void 127ecb_cold static void
116xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
117{
118 write (1, s, strlen (s));
119}
120
121static void
122xwrnum (long n)
123{ 129{
124 char buf[64]; 130 char buf[64];
125 131
126 xnum (buf, n); 132 xnum (buf, n);
127 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
128} 134}
129 135
130static char 136ecb_cold static char
131xtoupper (char c) 137xtoupper (char c)
132{ 138{
133 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
134 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
135 141
136 return c; 142 return c;
137} 143}
138 144
139static char 145ecb_cold static char
140xtolower (char c) 146xtolower (char c)
141{ 147{
142 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
143 c += 'a' - 'A'; 149 c += 'a' - 'A';
144 150
145 return c; 151 return c;
146} 152}
147 153
148static int 154ecb_cold static int
149xisdigit (char c) 155xisdigit (char c)
150{ 156{
151 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
152} 158}
153 159
154#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
157 163
158#if USE_STRLWR 164#if USE_IGNORECASE
159static const char * 165ecb_cold static const char *
160strlwr (char *s) 166xstrlwr (char *s)
161{ 167{
162 const char *p = s; 168 const char *p = s;
163 169
164 while (*s) 170 while (*s)
165 { 171 {
… …
167 s++; 173 s++;
168 } 174 }
169 175
170 return p; 176 return p;
171} 177}
172#endif
173 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
174#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
176 186
177#ifndef prompt 187#ifndef prompt
178# define prompt "ts> " 188# define prompt "ts> "
179#endif 189#endif
180 190
181#ifndef InitFile 191#ifndef InitFile
182# define InitFile "init.scm" 192# define InitFile "init.scm"
183#endif 193#endif
184 194
185#ifndef FIRST_CELLSEGS
186# define FIRST_CELLSEGS 3
187#endif
188
189enum scheme_types 195enum scheme_types
190{ 196{
197 T_INTEGER,
198 T_CHARACTER,
191 T_FREE, 199 T_REAL,
192 T_STRING, 200 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 201 T_SYMBOL,
195 T_PROC, 202 T_PROC,
196 T_PAIR, 203 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
198 T_CONTINUATION, 206 T_CONTINUATION,
199 T_FOREIGN, 207 T_FOREIGN,
200 T_CHARACTER,
201 T_PORT, 208 T_PORT,
202 T_VECTOR, 209 T_VECTOR,
203 T_MACRO,
204 T_PROMISE, 210 T_PROMISE,
205 T_ENVIRONMENT, 211 T_ENVIRONMENT,
206 /* one more... */ 212 /* one more... */
207 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
208}; 214};
… …
211#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
215 221
222/* num, for generic arithmetic */
223struct num
224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 249
218static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 252static num num_rem (num a, num b);
221static num num_mod (num a, num b); 253static num num_mod (num a, num b);
222 254
223#if USE_MATH
224static double round_per_R5RS (double x);
225#endif
226static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 256
234static num num_zero; 257static num num_zero;
235static num num_one; 258static num num_one;
236 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
237/* macros for cell operations */ 264/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
241 268
242INTERFACE INLINE int 269INTERFACE int
243is_string (pointer p) 270is_string (pointer p)
244{ 271{
245 return type (p) == T_STRING; 272 return type (p) == T_STRING;
246} 273}
247 274
248#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
250 277
251INTERFACE int is_list (SCHEME_P_ pointer p);
252INTERFACE INLINE int 278INTERFACE int
253is_vector (pointer p) 279is_vector (pointer p)
254{ 280{
255 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
256} 282}
257 283
258#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
259#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
260INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
261INTERFACE uint32_t vector_length (pointer vec);
262INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
263INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
264 289
265INTERFACE uint32_t 290INTERFACE int
266vector_length (pointer vec) 291is_integer (pointer p)
267{ 292{
268 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
269} 294}
270 295
296/* not the same as in scheme, where integers are (correctly :) reals */
271INTERFACE INLINE int 297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
301}
302
303INTERFACE int
272is_number (pointer p) 304is_number (pointer p)
273{ 305{
274 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
275} 307}
276 308
277INTERFACE INLINE int 309INTERFACE int
278is_integer (pointer p)
279{
280 if (!is_number (p))
281 return 0;
282
283 if (num_is_integer (p) || ivalue (p) == rvalue (p))
284 return 1;
285
286 return 0;
287}
288
289INTERFACE INLINE int
290is_real (pointer p)
291{
292 return is_number (p) && !num_is_fixnum (p->object.number);
293}
294
295INTERFACE INLINE int
296is_character (pointer p) 310is_character (pointer p)
297{ 311{
298 return type (p) == T_CHARACTER; 312 return type (p) == T_CHARACTER;
299} 313}
300 314
301INTERFACE INLINE char * 315INTERFACE char *
302string_value (pointer p) 316string_value (pointer p)
303{ 317{
304 return strvalue (p); 318 return strvalue (p);
305} 319}
306 320
307INLINE num
308nvalue (pointer p)
309{
310 return (p)->object.number;
311}
312
313static IVALUE
314num_get_ivalue (const num n)
315{
316 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
317}
318
319static RVALUE
320num_get_rvalue (const num n)
321{
322 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
323}
324
325INTERFACE IVALUE
326ivalue (pointer p)
327{
328 return num_get_ivalue (p->object.number);
329}
330
331INTERFACE RVALUE
332rvalue (pointer p)
333{
334 return num_get_rvalue (p->object.number);
335}
336
337#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
338#if USE_REAL 324#if USE_REAL
339# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
340# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
341# define set_num_real(p) (p)->object.number.is_fixnum=0;
342#else 327#else
343# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
344# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
345# define set_num_real(p) 0
346#endif 330#endif
331
347INTERFACE long 332INTERFACE long
348charvalue (pointer p) 333charvalue (pointer p)
349{ 334{
350 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
351} 336}
352 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
353INTERFACE INLINE int 340INTERFACE int
354is_port (pointer p) 341is_port (pointer p)
355{ 342{
356 return type (p) == T_PORT; 343 return type (p) == T_PORT;
357} 344}
358 345
359INTERFACE INLINE int 346INTERFACE int
360is_inport (pointer p) 347is_inport (pointer p)
361{ 348{
362 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
363} 350}
364 351
365INTERFACE INLINE int 352INTERFACE int
366is_outport (pointer p) 353is_outport (pointer p)
367{ 354{
368 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
369} 356}
370 357
371INTERFACE INLINE int 358INTERFACE int
372is_pair (pointer p) 359is_pair (pointer p)
373{ 360{
374 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
375} 362}
376 363
377#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
378#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
379 366
380static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
381static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
382static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
383static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
387static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
388 375
389INTERFACE void 376INTERFACE void
390set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
391{ 378{
392 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
393} 380}
394 381
395INTERFACE void 382INTERFACE void
396set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
397{ 384{
398 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
399} 386}
400 387
401INTERFACE pointer 388INTERFACE pointer
402pair_car (pointer p) 389pair_car (pointer p)
403{ 390{
… …
408pair_cdr (pointer p) 395pair_cdr (pointer p)
409{ 396{
410 return cdr (p); 397 return cdr (p);
411} 398}
412 399
413INTERFACE INLINE int 400INTERFACE int
414is_symbol (pointer p) 401is_symbol (pointer p)
415{ 402{
416 return type (p) == T_SYMBOL; 403 return type (p) == T_SYMBOL;
417} 404}
418 405
419INTERFACE INLINE char * 406INTERFACE char *
420symname (pointer p) 407symname (pointer p)
421{ 408{
422 return strvalue (car (p)); 409 return strvalue (p);
423} 410}
424 411
425#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
426SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
427hasprop (pointer p) 416hasprop (pointer p)
428{ 417{
429 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
430} 419}
431
432# define symprop(p) cdr(p)
433#endif 420#endif
434 421
435INTERFACE INLINE int 422INTERFACE int
436is_syntax (pointer p) 423is_syntax (pointer p)
437{ 424{
438 return typeflag (p) & T_SYNTAX; 425 return typeflag (p) & T_SYNTAX;
439} 426}
440 427
441INTERFACE INLINE int 428INTERFACE int
442is_proc (pointer p) 429is_proc (pointer p)
443{ 430{
444 return type (p) == T_PROC; 431 return type (p) == T_PROC;
445} 432}
446 433
447INTERFACE INLINE int 434INTERFACE int
448is_foreign (pointer p) 435is_foreign (pointer p)
449{ 436{
450 return type (p) == T_FOREIGN; 437 return type (p) == T_FOREIGN;
451} 438}
452 439
453INTERFACE INLINE char * 440INTERFACE char *
454syntaxname (pointer p) 441syntaxname (pointer p)
455{ 442{
456 return strvalue (car (p)); 443 return strvalue (p);
457} 444}
458 445
459#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
460static const char *procname (pointer x); 447static const char *procname (pointer x);
461 448
462INTERFACE INLINE int 449INTERFACE int
463is_closure (pointer p) 450is_closure (pointer p)
464{ 451{
465 return type (p) == T_CLOSURE; 452 return type (p) == T_CLOSURE;
466} 453}
467 454
468INTERFACE INLINE int 455INTERFACE int
469is_macro (pointer p) 456is_macro (pointer p)
470{ 457{
471 return type (p) == T_MACRO; 458 return type (p) == T_MACRO;
472} 459}
473 460
474INTERFACE INLINE pointer 461INTERFACE pointer
475closure_code (pointer p) 462closure_code (pointer p)
476{ 463{
477 return car (p); 464 return car (p);
478} 465}
479 466
480INTERFACE INLINE pointer 467INTERFACE pointer
481closure_env (pointer p) 468closure_env (pointer p)
482{ 469{
483 return cdr (p); 470 return cdr (p);
484} 471}
485 472
486INTERFACE INLINE int 473INTERFACE int
487is_continuation (pointer p) 474is_continuation (pointer p)
488{ 475{
489 return type (p) == T_CONTINUATION; 476 return type (p) == T_CONTINUATION;
490} 477}
491 478
492#define cont_dump(p) cdr (p) 479#define cont_dump(p) cdr (p)
493#define set_cont_dump(p,v) set_cdr ((p), (v)) 480#define set_cont_dump(p,v) set_cdr ((p), (v))
494 481
495/* To do: promise should be forced ONCE only */ 482/* To do: promise should be forced ONCE only */
496INTERFACE INLINE int 483INTERFACE int
497is_promise (pointer p) 484is_promise (pointer p)
498{ 485{
499 return type (p) == T_PROMISE; 486 return type (p) == T_PROMISE;
500} 487}
501 488
502INTERFACE INLINE int 489INTERFACE int
503is_environment (pointer p) 490is_environment (pointer p)
504{ 491{
505 return type (p) == T_ENVIRONMENT; 492 return type (p) == T_ENVIRONMENT;
506} 493}
507 494
… …
513 500
514#define is_mark(p) (typeflag (p) & T_MARK) 501#define is_mark(p) (typeflag (p) & T_MARK)
515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
517 504
518INTERFACE INLINE int 505INTERFACE int
519is_immutable (pointer p) 506is_immutable (pointer p)
520{ 507{
521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
522} 509}
523 510
524INTERFACE INLINE void 511INTERFACE void
525setimmutable (pointer p) 512setimmutable (pointer p)
526{ 513{
527#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
528 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
529#endif 516#endif
530} 517}
531 518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525ecb_hot INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
571}
572
532#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
533static INLINE int 574ecb_inline int
534Cisalpha (int c) 575Cisalpha (int c)
535{ 576{
536 return isascii (c) && isalpha (c); 577 return isascii (c) && isalpha (c);
537} 578}
538 579
539static INLINE int 580ecb_inline int
540Cisdigit (int c) 581Cisdigit (int c)
541{ 582{
542 return isascii (c) && isdigit (c); 583 return isascii (c) && isdigit (c);
543} 584}
544 585
545static INLINE int 586ecb_inline int
546Cisspace (int c) 587Cisspace (int c)
547{ 588{
548 return isascii (c) && isspace (c); 589 return isascii (c) && isspace (c);
549} 590}
550 591
551static INLINE int 592ecb_inline int
552Cisupper (int c) 593Cisupper (int c)
553{ 594{
554 return isascii (c) && isupper (c); 595 return isascii (c) && isupper (c);
555} 596}
556 597
557static INLINE int 598ecb_inline int
558Cislower (int c) 599Cislower (int c)
559{ 600{
560 return isascii (c) && islower (c); 601 return isascii (c) && islower (c);
561} 602}
562#endif 603#endif
… …
595 "gs", 636 "gs",
596 "rs", 637 "rs",
597 "us" 638 "us"
598}; 639};
599 640
600static int 641ecb_cold static int
601is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
602{ 643{
603 int i; 644 int i;
604 645
605 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
623#endif 664#endif
624 665
625static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
626static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
627static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
628static INLINE int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
629static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
630static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
631static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
632static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
633static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
634static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
635static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
650static void mark (pointer a); 691static void mark (pointer a);
651static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
652static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
653static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
654static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
655static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
656static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
657static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
658static int token (SCHEME_P); 699static int token (SCHEME_P);
659static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
660static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
661static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
662static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
666static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
667static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
668static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
669static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
670static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
671static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
713static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
678static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
679static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
680static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
681static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
682 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
683static num 751static num
684num_op (enum num_op op, num a, num b) 752num_op (enum num_op op, num a, num b)
685{ 753{
686 num ret; 754 num ret;
687 755
688 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
689 757
690 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
691 { 759 {
692 IVALUE av = num_get_ivalue (a);
693 IVALUE bv = num_get_ivalue (b);
694
695 switch (op) 760 switch (op)
696 { 761 {
697 case NUM_ADD: av += bv; break; 762 case NUM_ADD: a.ivalue += b.ivalue; break;
698 case NUM_SUB: av -= bv; break; 763 case NUM_SUB: a.ivalue -= b.ivalue; break;
699 case NUM_MUL: av *= bv; break; 764 case NUM_MUL: a.ivalue *= b.ivalue; break;
700 case NUM_INTDIV: av /= bv; break; 765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
701 } 766 }
702 767
703 num_set_ivalue (ret, av); 768 num_set_ivalue (ret, a.ivalue);
704 } 769 }
770#if USE_REAL
705 else 771 else
706 { 772 {
707 RVALUE av = num_get_rvalue (a);
708 RVALUE bv = num_get_rvalue (b);
709
710 switch (op) 773 switch (op)
711 { 774 {
712 case NUM_ADD: av += bv; break; 775 case NUM_ADD: a.rvalue += b.rvalue; break;
713 case NUM_SUB: av -= bv; break; 776 case NUM_SUB: a.rvalue -= b.rvalue; break;
714 case NUM_MUL: av *= bv; break; 777 case NUM_MUL: a.rvalue *= b.rvalue; break;
715 case NUM_INTDIV: av /= bv; break; 778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
716 } 779 }
717 780
718 num_set_rvalue (ret, av); 781 num_set_rvalue (ret, a.rvalue);
719 } 782 }
783#endif
720 784
721 return ret; 785 return ret;
722} 786}
723 787
724static num 788static num
725num_div (num a, num b) 789num_div (num a, num b)
726{ 790{
727 num ret; 791 num ret;
728 792
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
730 794
731 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
733 else 797 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
735 799
736 return ret; 800 return ret;
737} 801}
738 802
739static num 803static num
… …
741{ 805{
742 num ret; 806 num ret;
743 long e1, e2, res; 807 long e1, e2, res;
744 808
745 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
746 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
747 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
748 res = e1 % e2; 812 res = e1 % e2;
749 813
750 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
751 if (res > 0) 815 if (res > 0)
752 { 816 {
… …
768{ 832{
769 num ret; 833 num ret;
770 long e1, e2, res; 834 long e1, e2, res;
771 835
772 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
773 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
774 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
775 res = e1 % e2; 839 res = e1 % e2;
776 840
777 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
778 if (res * e2 < 0) 842 if (res * e2 < 0)
779 res += e2; 843 res += e2;
780 844
781 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
782 return ret; 846 return ret;
783} 847}
784 848
785/* this completely disrespects NaNs */ 849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
786static int 850static int
787num_cmp (num a, num b) 851num_cmp (num a, num b)
788{ 852{
789 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
790 int ret; 854 int ret;
791 855
792 if (is_fixnum) 856 if (is_fixnum)
793 { 857 {
794 IVALUE av = num_get_ivalue (a); 858 IVALUE av = num_ivalue (a);
795 IVALUE bv = num_get_ivalue (b); 859 IVALUE bv = num_ivalue (b);
796 860
797 ret = av == bv ? 0 : av < bv ? -1 : +1; 861 ret = av == bv ? 0 : av < bv ? -1 : +1;
798 } 862 }
799 else 863 else
800 { 864 {
801 RVALUE av = num_get_rvalue (a); 865 RVALUE av = num_rvalue (a);
802 RVALUE bv = num_get_rvalue (b); 866 RVALUE bv = num_rvalue (b);
803 867
804 ret = av == bv ? 0 : av < bv ? -1 : +1; 868 ret = av == bv ? 0 : av < bv ? -1 : +1;
805 } 869 }
806 870
807 return ret; 871 return ret;
808} 872}
809
810#if USE_MATH
811
812/* Round to nearest. Round to even if midway */
813static double
814round_per_R5RS (double x)
815{
816 double fl = floor (x);
817 double ce = ceil (x);
818 double dfl = x - fl;
819 double dce = ce - x;
820
821 if (dfl > dce)
822 return ce;
823 else if (dfl < dce)
824 return fl;
825 else
826 {
827 if (fmod (fl, 2) == 0) /* I imagine this holds */
828 return fl;
829 else
830 return ce;
831 }
832}
833#endif
834 873
835static int 874static int
836is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
837{ 876{
877 return x == 0;
878#if 0
838#if USE_REAL 879#if USE_REAL
839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 880 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
840#else 881#else
841 return x == 0; 882 return x == 0;
842#endif 883#endif
884#endif
843} 885}
844 886
845/* allocate new cell segment */ 887/* allocate new cell segment */
846static int 888ecb_cold static int
847alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
848{ 890{
849 pointer newp; 891 struct cell *newp;
850 pointer last; 892 struct cell *last;
851 pointer p; 893 struct cell *p;
852 char *cp; 894 char *cp;
853 long i; 895 long i;
854 int k; 896 int k;
855 897
856 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
857 segsize <<= 1; 899 segsize <<= 1;
858 900
859 for (k = 0; k < n; k++)
860 {
861 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
862 return k;
863
864 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
865 902
866 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
867 return k; 904 return k;
868 905
869 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
870 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
871 908
872 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
873 newp = (pointer)cp;
874 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
875 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
876
877 //TODO: insert, not swap
878 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
879 {
880 p = SCHEME_V->cell_seg[i];
881 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
882 SCHEME_V->cell_seg[i - 1] = p;
883
884 k = SCHEME_V->cell_segsize[i];
885 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
886 SCHEME_V->cell_segsize[i - 1] = k;
887
888 --i;
889 }
890
891 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
892 last = newp + segsize - 1; 913 last = newp + segsize - 1;
893 914
894 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
895 { 916 {
917 pointer cp = POINTER (p);
896 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
897 set_car (p, NIL); 919 set_car (cp, NIL);
898 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
899 } 921 }
900 922
901 /* insert new cells in address order on free list */
902 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
903 {
904 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
905 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
906 }
907 else
908 {
909 p = SCHEME_V->free_cell;
910 925
911 while (cdr (p) != NIL && newp > cdr (p))
912 p = cdr (p);
913
914 set_cdr (last, cdr (p));
915 set_cdr (p, newp);
916 }
917 }
918
919 return n; 926 return 1;
920} 927}
921 928
922/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
923static INLINE pointer 930ecb_inline pointer
924get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
925{ 932{
926 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
927 { 934 {
928 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
929 return S_SINK; 936 return S_SINK;
930 937
931 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
932 { 939 {
933 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
934 941
935 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
936 943
937 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
938 { 945 {
939 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
940 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
941 { 948 {
942#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
943 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
944 return S_SINK; 951 return S_SINK;
945#endif 952#endif
… …
957 } 964 }
958} 965}
959 966
960/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
961 Tehom */ 968 Tehom */
962 969ecb_hot static void
963static void
964push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
965{ 971{
966 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
967 973
968 set_typeflag (holder, T_PAIR); 974 set_typeflag (holder, T_PAIR);
… …
970 set_car (holder, recent); 976 set_car (holder, recent);
971 set_cdr (holder, car (S_SINK)); 977 set_cdr (holder, car (S_SINK));
972 set_car (S_SINK, holder); 978 set_car (S_SINK, holder);
973} 979}
974 980
975static pointer 981ecb_hot static pointer
976get_cell (SCHEME_P_ pointer a, pointer b) 982get_cell (SCHEME_P_ pointer a, pointer b)
977{ 983{
978 pointer cell = get_cell_x (SCHEME_A_ a, b); 984 pointer cell = get_cell_x (SCHEME_A_ a, b);
979 985
980 /* For right now, include "a" and "b" in "cell" so that gc doesn't 986 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
989} 995}
990 996
991static pointer 997static pointer
992get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
993{ 999{
994 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
995 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
996 1002
997 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
998 return S_SINK; 1004 return S_SINK;
999 1005
1000 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1001 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1002 1008
1003 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1004 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1005 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1006 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1007 1013
1008 return v; 1014 return v;
1009} 1015}
1010 1016
1011static INLINE void 1017ecb_inline void
1012ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1013{ 1019{
1014 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1015} 1021}
1016 1022
… …
1018static void 1024static void
1019check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1020{ 1026{
1021 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1022 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1023 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1024 1030
1025 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1026 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1027} 1033}
1028 1034
1029static void 1035static void
1030check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1031{ 1037{
… …
1037#endif 1043#endif
1038 1044
1039/* Medium level cell allocation */ 1045/* Medium level cell allocation */
1040 1046
1041/* get new cons cell */ 1047/* get new cons cell */
1042pointer 1048ecb_hot pointer
1043xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1049xcons (SCHEME_P_ pointer a, pointer b, int immutable)
1044{ 1050{
1045 pointer x = get_cell (SCHEME_A_ a, b); 1051 pointer x = get_cell (SCHEME_A_ a, b);
1046 1052
1047 set_typeflag (x, T_PAIR); 1053 set_typeflag (x, T_PAIR);
… …
1053 set_cdr (x, b); 1059 set_cdr (x, b);
1054 1060
1055 return x; 1061 return x;
1056} 1062}
1057 1063
1064ecb_cold static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1058/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1059 1074
1060#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1061 1076
1077static int
1062static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1063 1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1088
1064static pointer 1089ecb_cold static pointer
1065oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1066{ 1091{
1067 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1068} 1093}
1069 1094
1070/* returns the new symbol */ 1095/* returns the new symbol */
1071static pointer 1096ecb_cold static pointer
1072oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1073{ 1098{
1074 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1075
1076 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1077 set_typeflag (x, T_SYMBOL);
1078 setimmutable (car (x));
1079
1080 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1081 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1082 return x; 1102 return x;
1083} 1103}
1084 1104
1085static INLINE pointer 1105ecb_cold static pointer
1086oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1087{ 1107{
1088 int location; 1108 int location;
1089 pointer x; 1109 pointer x;
1090 char *s; 1110 char *s;
1091 1111
1092 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1093 1113
1094 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1095 { 1115 {
1096 s = symname (car (x)); 1116 s = symname (car (x));
1097 1117
1098 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1099 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1101 } 1121 }
1102 1122
1103 return NIL; 1123 return NIL;
1104} 1124}
1105 1125
1106static pointer 1126ecb_cold static pointer
1107oblist_all_symbols (SCHEME_P) 1127oblist_all_symbols (SCHEME_P)
1108{ 1128{
1109 int i; 1129 int i;
1110 pointer x; 1130 pointer x;
1111 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1112 1132
1113 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1114 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1115 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1116 1136
1117 return ob_list; 1137 return ob_list;
1118} 1138}
1119 1139
1120#else 1140#else
1121 1141
1122static pointer 1142ecb_cold static pointer
1123oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1124{ 1144{
1125 return NIL; 1145 return NIL;
1126} 1146}
1127 1147
1128static INLINE pointer 1148ecb_cold static pointer
1129oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1130{ 1150{
1131 pointer x; 1151 pointer x;
1132 char *s; 1152 char *s;
1133 1153
… …
1142 1162
1143 return NIL; 1163 return NIL;
1144} 1164}
1145 1165
1146/* returns the new symbol */ 1166/* returns the new symbol */
1147static pointer 1167ecb_cold static pointer
1148oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1149{ 1169{
1150 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1151
1152 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1153 set_typeflag (x, T_SYMBOL);
1154 setimmutable (car (x));
1155 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1156 return x; 1172 return x;
1157} 1173}
1158 1174
1159static pointer 1175ecb_cold static pointer
1160oblist_all_symbols (SCHEME_P) 1176oblist_all_symbols (SCHEME_P)
1161{ 1177{
1162 return SCHEME_V->oblist; 1178 return SCHEME_V->oblist;
1163} 1179}
1164 1180
1165#endif 1181#endif
1166 1182
1167#if USE_PORTS 1183#if USE_PORTS
1168static pointer 1184ecb_cold static pointer
1169mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1170{ 1186{
1171 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1172 1188
1173 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1174 x->object.port = p; 1190 set_port (x, p);
1175 1191
1176 return x; 1192 return x;
1177} 1193}
1178#endif 1194#endif
1179 1195
1180pointer 1196ecb_cold pointer
1181mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1182{ 1198{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1200
1185 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1186 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1187 1203
1188 return x; 1204 return x;
1189} 1205}
1190 1206
1191INTERFACE pointer 1207INTERFACE pointer
1192mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1193{ 1209{
1194 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1195 1211
1196 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1197 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1198 set_num_integer (x); 1214
1199 return x; 1215 return x;
1200} 1216}
1201 1217
1202/* get number atom (integer) */ 1218/* get number atom (integer) */
1203INTERFACE pointer 1219INTERFACE pointer
1204mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1205{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1233
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1209 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1210 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1211 return x; 1241 return *pp;
1212} 1242}
1213 1243
1214INTERFACE pointer 1244INTERFACE pointer
1215mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1216{ 1246{
1247#if USE_REAL
1217 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1218 1249
1219 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1220 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1221 set_num_real (x); 1252
1222 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1223} 1257}
1224 1258
1225static pointer 1259static pointer
1226mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1227{ 1261{
1262#if USE_REAL
1228 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1229 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1230 else 1268#endif
1231 return mk_real (SCHEME_A_ num_get_rvalue (n));
1232} 1269}
1233 1270
1234/* allocate name to string area */ 1271/* allocate name to string area */
1235static char * 1272static char *
1236store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1242 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1243 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1244 } 1281 }
1245 1282
1246 if (str) 1283 if (str)
1247 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1248 int l = strlen (str);
1249
1250 if (l > len_str)
1251 l = len_str;
1252
1253 memcpy (q, str, l);
1254 q[l] = 0;
1255 }
1256 else 1285 else
1257 {
1258 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1259 q[len_str] = 0; 1288 q[len_str] = 0;
1260 }
1261 1289
1262 return q; 1290 return q;
1263} 1291}
1264 1292
1265INTERFACE pointer 1293INTERFACE pointer
… …
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1308
1281 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1282 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1283 strlength (x) = len; 1311 strlength (x) = len;
1312
1284 return x; 1313 return x;
1285} 1314}
1286 1315
1287INTERFACE pointer 1316INTERFACE pointer
1288mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1295{ 1324{
1296 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1297} 1326}
1298 1327
1299INTERFACE void 1328INTERFACE void
1300fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1301{ 1330{
1302 int i; 1331 int i;
1303 1332
1304 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1305 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1306} 1335}
1307 1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1344}
1345
1308INTERFACE pointer 1346INTERFACE pointer
1309vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1310{ 1348{
1311 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1312} 1350}
1313 1351
1314INTERFACE void 1352INTERFACE void
1315set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1316{ 1354{
1317 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1318} 1356}
1319 1357
1320/* get new symbol */ 1358/* get new symbol */
… …
1328 x = oblist_add_by_name (SCHEME_A_ name); 1366 x = oblist_add_by_name (SCHEME_A_ name);
1329 1367
1330 return x; 1368 return x;
1331} 1369}
1332 1370
1333INTERFACE pointer 1371ecb_cold INTERFACE pointer
1334gensym (SCHEME_P) 1372gensym (SCHEME_P)
1335{ 1373{
1336 pointer x; 1374 pointer x;
1337
1338 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1339 {
1340 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1341 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1342 1377
1343 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1344 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1345 1380
1346 if (x == NIL) 1381static int
1347 { 1382is_gensym (SCHEME_P_ pointer x)
1348 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1349 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1350 }
1351 }
1352
1353 return NIL;
1354} 1385}
1355 1386
1356/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1357static pointer 1388ecb_cold static pointer
1358mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1359{ 1390{
1360 char c, *p; 1391 char c, *p;
1361 int has_dec_point = 0; 1392 int has_dec_point = 0;
1362 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
… …
1412 } 1443 }
1413 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1414 { 1445 {
1415 if (!has_fp_exp) 1446 if (!has_fp_exp)
1416 { 1447 {
1417 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1418 from now on */
1419 p++; 1449 p++;
1420 1450
1421 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1422 continue; 1452 continue;
1423 } 1453 }
… …
1434 1464
1435 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1436} 1466}
1437 1467
1438/* make constant */ 1468/* make constant */
1439static pointer 1469ecb_cold static pointer
1440mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1441{ 1471{
1442 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1443 return S_T; 1473 return S_T;
1444 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1445 return S_F; 1475 return S_F;
1446 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1447 { 1477 {
1448 int c; 1478 int c;
1449 1479
1480 // TODO: optimise
1450 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1451 c = ' '; 1482 c = ' ';
1452 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1453 c = '\n'; 1484 c = '\n';
1454 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1455 c = '\r'; 1486 c = '\r';
1456 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1457 c = '\t'; 1488 c = '\t';
1489 else if (stricmp (name + 1, "alarm") == 0)
1490 c = 0x07;
1491 else if (stricmp (name + 1, "backspace") == 0)
1492 c = 0x08;
1493 else if (stricmp (name + 1, "escape") == 0)
1494 c = 0x1b;
1495 else if (stricmp (name + 1, "delete") == 0)
1496 c = 0x7f;
1497 else if (stricmp (name + 1, "null") == 0)
1498 c = 0;
1458 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1459 { 1500 {
1460 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1461 1502
1462 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1487 return NIL; 1528 return NIL;
1488 } 1529 }
1489} 1530}
1490 1531
1491/* ========== garbage collector ========== */ 1532/* ========== garbage collector ========== */
1533
1534static void
1535finalize_cell (SCHEME_P_ pointer a)
1536{
1537 /* TODO, fast bitmap check? */
1538 if (is_string (a) || is_symbol (a))
1539 free (strvalue (a));
1540 else if (is_vector (a))
1541 free (vecvalue (a));
1542#if USE_PORTS
1543 else if (is_port (a))
1544 {
1545 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1546 port_close (SCHEME_A_ a, port_input | port_output);
1547
1548 free (port (a));
1549 }
1550#endif
1551}
1492 1552
1493/*-- 1553/*--
1494 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1554 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1495 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1555 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1496 * for marking. 1556 * for marking.
1497 * 1557 *
1498 * The exception is vectors - vectors are currently marked recursively, 1558 * The exception is vectors - vectors are currently marked recursively,
1499 * which is inherited form tinyscheme and could be fixed by having another 1559 * which is inherited form tinyscheme and could be fixed by having another
1500 * word of context in the vector 1560 * word of context in the vector
1501 */ 1561 */
1502static void 1562ecb_hot static void
1503mark (pointer a) 1563mark (pointer a)
1504{ 1564{
1505 pointer t, q, p; 1565 pointer t, q, p;
1506 1566
1507 t = 0; 1567 t = 0;
… …
1511 1571
1512 if (ecb_expect_false (is_vector (p))) 1572 if (ecb_expect_false (is_vector (p)))
1513 { 1573 {
1514 int i; 1574 int i;
1515 1575
1516 for (i = 0; i < p->object.vector.length; i++) 1576 for (i = 0; i < veclength (p); i++)
1517 mark (vecvalue (p)[i]); 1577 mark (vecvalue (p)[i]);
1518 } 1578 }
1519 1579
1520 if (is_atom (p)) 1580 if (is_atom (p))
1521 goto E6; 1581 goto E6;
… …
1564 p = q; 1624 p = q;
1565 goto E6; 1625 goto E6;
1566 } 1626 }
1567} 1627}
1568 1628
1629ecb_hot static void
1630gc_free (SCHEME_P)
1631{
1632 int i;
1633 uint32_t total = 0;
1634
1635 /* Here we scan the cells to build the free-list. */
1636 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1637 {
1638 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1639 struct cell *p;
1640 total += SCHEME_V->cell_segsize [i];
1641
1642 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1643 {
1644 pointer c = POINTER (p);
1645
1646 if (is_mark (c))
1647 clrmark (c);
1648 else
1649 {
1650 /* reclaim cell */
1651 if (typeflag (c) != T_PAIR)
1652 {
1653 finalize_cell (SCHEME_A_ c);
1654 set_typeflag (c, T_PAIR);
1655 set_car (c, NIL);
1656 }
1657
1658 ++SCHEME_V->fcells;
1659 set_cdr (c, SCHEME_V->free_cell);
1660 SCHEME_V->free_cell = c;
1661 }
1662 }
1663 }
1664
1665 if (SCHEME_V->gc_verbose)
1666 {
1667 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1668 }
1669}
1670
1569/* garbage collection. parameter a, b is marked. */ 1671/* garbage collection. parameter a, b is marked. */
1570static void 1672ecb_cold static void
1571gc (SCHEME_P_ pointer a, pointer b) 1673gc (SCHEME_P_ pointer a, pointer b)
1572{ 1674{
1573 pointer p;
1574 int i; 1675 int i;
1575 1676
1576 if (SCHEME_V->gc_verbose) 1677 if (SCHEME_V->gc_verbose)
1577 putstr (SCHEME_A_ "gc..."); 1678 putstr (SCHEME_A_ "gc...");
1578 1679
… …
1594 /* Mark recent objects the interpreter doesn't know about yet. */ 1695 /* Mark recent objects the interpreter doesn't know about yet. */
1595 mark (car (S_SINK)); 1696 mark (car (S_SINK));
1596 /* Mark any older stuff above nested C calls */ 1697 /* Mark any older stuff above nested C calls */
1597 mark (SCHEME_V->c_nest); 1698 mark (SCHEME_V->c_nest);
1598 1699
1700#if USE_INTCACHE
1701 /* mark intcache */
1702 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1703 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1704 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1705#endif
1706
1599 /* mark variables a, b */ 1707 /* mark variables a, b */
1600 mark (a); 1708 mark (a);
1601 mark (b); 1709 mark (b);
1602 1710
1603 /* garbage collect */ 1711 /* garbage collect */
1604 clrmark (NIL); 1712 clrmark (NIL);
1605 SCHEME_V->fcells = 0; 1713 SCHEME_V->fcells = 0;
1606 SCHEME_V->free_cell = NIL; 1714 SCHEME_V->free_cell = NIL;
1607 1715
1608 /* free-list is kept sorted by address so as to maintain consecutive
1609 ranges, if possible, for use with vectors. Here we scan the cells
1610 (which are also kept sorted by address) downwards to build the
1611 free-list in sorted order.
1612 */
1613 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1614 {
1615 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1616
1617 while (--p >= SCHEME_V->cell_seg[i])
1618 {
1619 if (is_mark (p))
1620 clrmark (p);
1621 else
1622 {
1623 /* reclaim cell */
1624 if (typeflag (p) != T_FREE)
1625 {
1626 finalize_cell (SCHEME_A_ p);
1627 set_typeflag (p, T_FREE);
1628 set_car (p, NIL);
1629 }
1630
1631 ++SCHEME_V->fcells;
1632 set_cdr (p, SCHEME_V->free_cell);
1633 SCHEME_V->free_cell = p;
1634 }
1635 }
1636 }
1637
1638 if (SCHEME_V->gc_verbose) 1716 if (SCHEME_V->gc_verbose)
1639 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1717 putstr (SCHEME_A_ "freeing...");
1640}
1641 1718
1642static void 1719 gc_free (SCHEME_A);
1643finalize_cell (SCHEME_P_ pointer a)
1644{
1645 /* TODO, fast bitmap check? */
1646 if (is_string (a))
1647 free (strvalue (a));
1648 else if (is_vector (a))
1649 free (vecvalue (a));
1650#if USE_PORTS
1651 else if (is_port (a))
1652 {
1653 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1654 port_close (SCHEME_A_ a, port_input | port_output);
1655
1656 free (a->object.port);
1657 }
1658#endif
1659} 1720}
1660 1721
1661/* ========== Routines for Reading ========== */ 1722/* ========== Routines for Reading ========== */
1662 1723
1663static int 1724ecb_cold static int
1664file_push (SCHEME_P_ const char *fname) 1725file_push (SCHEME_P_ const char *fname)
1665{ 1726{
1666#if USE_PORTS 1727#if USE_PORTS
1667 int fin; 1728 int fin;
1668 1729
… …
1677 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1738 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1678 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1739 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1679 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1740 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1680 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1741 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1681 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1742 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1682 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1743 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1683 1744
1684#if SHOW_ERROR_LINE 1745#if SHOW_ERROR_LINE
1685 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1746 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1686 1747
1687 if (fname) 1748 if (fname)
… …
1694#else 1755#else
1695 return 1; 1756 return 1;
1696#endif 1757#endif
1697} 1758}
1698 1759
1699static void 1760ecb_cold static void
1700file_pop (SCHEME_P) 1761file_pop (SCHEME_P)
1701{ 1762{
1702 if (SCHEME_V->file_i != 0) 1763 if (SCHEME_V->file_i != 0)
1703 { 1764 {
1704 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1765 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1705#if USE_PORTS 1766#if USE_PORTS
1706 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1767 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1707#endif 1768#endif
1708 SCHEME_V->file_i--; 1769 SCHEME_V->file_i--;
1709 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1770 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1710 } 1771 }
1711} 1772}
1712 1773
1713static int 1774ecb_cold static int
1714file_interactive (SCHEME_P) 1775file_interactive (SCHEME_P)
1715{ 1776{
1716#if USE_PORTS 1777#if USE_PORTS
1717 return SCHEME_V->file_i == 0 1778 return SCHEME_V->file_i == 0
1718 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1779 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1719 && (SCHEME_V->inport->object.port->kind & port_file); 1780 && (port (SCHEME_V->inport)->kind & port_file);
1720#else 1781#else
1721 return 0; 1782 return 0;
1722#endif 1783#endif
1723} 1784}
1724 1785
1725#if USE_PORTS 1786#if USE_PORTS
1726static port * 1787ecb_cold static port *
1727port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1788port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1728{ 1789{
1729 int fd; 1790 int fd;
1730 int flags; 1791 int flags;
1731 char *rw; 1792 char *rw;
… …
1754# endif 1815# endif
1755 1816
1756 return pt; 1817 return pt;
1757} 1818}
1758 1819
1759static pointer 1820ecb_cold static pointer
1760port_from_filename (SCHEME_P_ const char *fn, int prop) 1821port_from_filename (SCHEME_P_ const char *fn, int prop)
1761{ 1822{
1762 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1823 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1763 1824
1764 if (!pt && USE_ERROR_CHECKING) 1825 if (!pt && USE_ERROR_CHECKING)
1765 return NIL; 1826 return NIL;
1766 1827
1767 return mk_port (SCHEME_A_ pt); 1828 return mk_port (SCHEME_A_ pt);
1768} 1829}
1769 1830
1770static port * 1831ecb_cold static port *
1771port_rep_from_file (SCHEME_P_ int f, int prop) 1832port_rep_from_file (SCHEME_P_ int f, int prop)
1772{ 1833{
1773 port *pt = malloc (sizeof *pt); 1834 port *pt = malloc (sizeof *pt);
1774 1835
1775 if (!pt && USE_ERROR_CHECKING) 1836 if (!pt && USE_ERROR_CHECKING)
… …
1780 pt->rep.stdio.file = f; 1841 pt->rep.stdio.file = f;
1781 pt->rep.stdio.closeit = 0; 1842 pt->rep.stdio.closeit = 0;
1782 return pt; 1843 return pt;
1783} 1844}
1784 1845
1785static pointer 1846ecb_cold static pointer
1786port_from_file (SCHEME_P_ int f, int prop) 1847port_from_file (SCHEME_P_ int f, int prop)
1787{ 1848{
1788 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1849 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1789 1850
1790 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
1791 return NIL; 1852 return NIL;
1792 1853
1793 return mk_port (SCHEME_A_ pt); 1854 return mk_port (SCHEME_A_ pt);
1794} 1855}
1795 1856
1796static port * 1857ecb_cold static port *
1797port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1858port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1798{ 1859{
1799 port *pt = malloc (sizeof (port)); 1860 port *pt = malloc (sizeof (port));
1800 1861
1801 if (!pt && USE_ERROR_CHECKING) 1862 if (!pt && USE_ERROR_CHECKING)
… …
1807 pt->rep.string.curr = start; 1868 pt->rep.string.curr = start;
1808 pt->rep.string.past_the_end = past_the_end; 1869 pt->rep.string.past_the_end = past_the_end;
1809 return pt; 1870 return pt;
1810} 1871}
1811 1872
1812static pointer 1873ecb_cold static pointer
1813port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1814{ 1875{
1815 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1876 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1816 1877
1817 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1820 return mk_port (SCHEME_A_ pt); 1881 return mk_port (SCHEME_A_ pt);
1821} 1882}
1822 1883
1823# define BLOCK_SIZE 256 1884# define BLOCK_SIZE 256
1824 1885
1825static port * 1886ecb_cold static port *
1826port_rep_from_scratch (SCHEME_P) 1887port_rep_from_scratch (SCHEME_P)
1827{ 1888{
1828 char *start; 1889 char *start;
1829 port *pt = malloc (sizeof (port)); 1890 port *pt = malloc (sizeof (port));
1830 1891
… …
1844 pt->rep.string.curr = start; 1905 pt->rep.string.curr = start;
1845 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1906 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1846 return pt; 1907 return pt;
1847} 1908}
1848 1909
1849static pointer 1910ecb_cold static pointer
1850port_from_scratch (SCHEME_P) 1911port_from_scratch (SCHEME_P)
1851{ 1912{
1852 port *pt = port_rep_from_scratch (SCHEME_A); 1913 port *pt = port_rep_from_scratch (SCHEME_A);
1853 1914
1854 if (!pt && USE_ERROR_CHECKING) 1915 if (!pt && USE_ERROR_CHECKING)
1855 return NIL; 1916 return NIL;
1856 1917
1857 return mk_port (SCHEME_A_ pt); 1918 return mk_port (SCHEME_A_ pt);
1858} 1919}
1859 1920
1860static void 1921ecb_cold static void
1861port_close (SCHEME_P_ pointer p, int flag) 1922port_close (SCHEME_P_ pointer p, int flag)
1862{ 1923{
1863 port *pt = p->object.port; 1924 port *pt = port (p);
1864 1925
1865 pt->kind &= ~flag; 1926 pt->kind &= ~flag;
1866 1927
1867 if ((pt->kind & (port_input | port_output)) == 0) 1928 if ((pt->kind & (port_input | port_output)) == 0)
1868 { 1929 {
… …
1889/* get new character from input file */ 1950/* get new character from input file */
1890static int 1951static int
1891inchar (SCHEME_P) 1952inchar (SCHEME_P)
1892{ 1953{
1893 int c; 1954 int c;
1894 port *pt; 1955 port *pt = port (SCHEME_V->inport);
1895
1896 pt = SCHEME_V->inport->object.port;
1897 1956
1898 if (pt->kind & port_saw_EOF) 1957 if (pt->kind & port_saw_EOF)
1899 return EOF; 1958 return EOF;
1900 1959
1901 c = basic_inchar (pt); 1960 c = basic_inchar (pt);
… …
1968 port *pt; 2027 port *pt;
1969 2028
1970 if (c == EOF) 2029 if (c == EOF)
1971 return; 2030 return;
1972 2031
1973 pt = SCHEME_V->inport->object.port; 2032 pt = port (SCHEME_V->inport);
1974 pt->unget = c; 2033 pt->unget = c;
1975#else 2034#else
1976 if (c == EOF) 2035 if (c == EOF)
1977 return; 2036 return;
1978 2037
1979 ungot = c; 2038 ungot = c;
1980#endif 2039#endif
1981} 2040}
1982 2041
1983#if USE_PORTS 2042#if USE_PORTS
1984static int 2043ecb_cold static int
1985realloc_port_string (SCHEME_P_ port *p) 2044realloc_port_string (SCHEME_P_ port *p)
1986{ 2045{
1987 char *start = p->rep.string.start; 2046 char *start = p->rep.string.start;
1988 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2047 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
1989 char *str = malloc (new_size); 2048 char *str = malloc (new_size);
… …
2002 else 2061 else
2003 return 0; 2062 return 0;
2004} 2063}
2005#endif 2064#endif
2006 2065
2007INTERFACE void 2066ecb_cold INTERFACE void
2008putstr (SCHEME_P_ const char *s) 2067putstr (SCHEME_P_ const char *s)
2009{ 2068{
2010#if USE_PORTS 2069#if USE_PORTS
2011 port *pt = SCHEME_V->outport->object.port; 2070 port *pt = port (SCHEME_V->outport);
2012 2071
2013 if (pt->kind & port_file) 2072 if (pt->kind & port_file)
2014 write (pt->rep.stdio.file, s, strlen (s)); 2073 write (pt->rep.stdio.file, s, strlen (s));
2015 else 2074 else
2016 for (; *s; s++) 2075 for (; *s; s++)
… …
2018 *pt->rep.string.curr++ = *s; 2077 *pt->rep.string.curr++ = *s;
2019 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2078 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2020 *pt->rep.string.curr++ = *s; 2079 *pt->rep.string.curr++ = *s;
2021 2080
2022#else 2081#else
2023 xwrstr (s); 2082 write (pt->rep.stdio.file, s, strlen (s));
2024#endif 2083#endif
2025} 2084}
2026 2085
2027static void 2086ecb_cold static void
2028putchars (SCHEME_P_ const char *s, int len) 2087putchars (SCHEME_P_ const char *s, int len)
2029{ 2088{
2030#if USE_PORTS 2089#if USE_PORTS
2031 port *pt = SCHEME_V->outport->object.port; 2090 port *pt = port (SCHEME_V->outport);
2032 2091
2033 if (pt->kind & port_file) 2092 if (pt->kind & port_file)
2034 write (pt->rep.stdio.file, s, len); 2093 write (pt->rep.stdio.file, s, len);
2035 else 2094 else
2036 { 2095 {
… …
2046#else 2105#else
2047 write (1, s, len); 2106 write (1, s, len);
2048#endif 2107#endif
2049} 2108}
2050 2109
2051INTERFACE void 2110ecb_cold INTERFACE void
2052putcharacter (SCHEME_P_ int c) 2111putcharacter (SCHEME_P_ int c)
2053{ 2112{
2054#if USE_PORTS 2113#if USE_PORTS
2055 port *pt = SCHEME_V->outport->object.port; 2114 port *pt = port (SCHEME_V->outport);
2056 2115
2057 if (pt->kind & port_file) 2116 if (pt->kind & port_file)
2058 { 2117 {
2059 char cc = c; 2118 char cc = c;
2060 write (pt->rep.stdio.file, &cc, 1); 2119 write (pt->rep.stdio.file, &cc, 1);
… …
2072 write (1, &c, 1); 2131 write (1, &c, 1);
2073#endif 2132#endif
2074} 2133}
2075 2134
2076/* read characters up to delimiter, but cater to character constants */ 2135/* read characters up to delimiter, but cater to character constants */
2077static char * 2136ecb_cold static char *
2078readstr_upto (SCHEME_P_ char *delim) 2137readstr_upto (SCHEME_P_ int skip, const char *delim)
2079{ 2138{
2080 char *p = SCHEME_V->strbuff; 2139 char *p = SCHEME_V->strbuff + skip;
2081 2140
2082 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2141 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2083 2142
2084 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2143 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2085 *p = 0; 2144 *p = 0;
… …
2091 2150
2092 return SCHEME_V->strbuff; 2151 return SCHEME_V->strbuff;
2093} 2152}
2094 2153
2095/* read string expression "xxx...xxx" */ 2154/* read string expression "xxx...xxx" */
2096static pointer 2155ecb_cold static pointer
2097readstrexp (SCHEME_P) 2156readstrexp (SCHEME_P_ char delim)
2098{ 2157{
2099 char *p = SCHEME_V->strbuff; 2158 char *p = SCHEME_V->strbuff;
2100 int c; 2159 int c;
2101 int c1 = 0; 2160 int c1 = 0;
2102 enum
2103 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2161 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2104 2162
2105 for (;;) 2163 for (;;)
2106 { 2164 {
2107 c = inchar (SCHEME_A); 2165 c = inchar (SCHEME_A);
2108 2166
… …
2110 return S_F; 2168 return S_F;
2111 2169
2112 switch (state) 2170 switch (state)
2113 { 2171 {
2114 case st_ok: 2172 case st_ok:
2115 switch (c) 2173 if (ecb_expect_false (c == delim))
2116 {
2117 case '\\':
2118 state = st_bsl;
2119 break;
2120
2121 case '"':
2122 *p = 0;
2123 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2174 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2124 2175
2125 default: 2176 if (ecb_expect_false (c == '\\'))
2177 state = st_bsl;
2178 else
2126 *p++ = c; 2179 *p++ = c;
2127 break;
2128 }
2129 2180
2130 break; 2181 break;
2131 2182
2132 case st_bsl: 2183 case st_bsl:
2133 switch (c) 2184 switch (c)
… …
2142 case '7': 2193 case '7':
2143 state = st_oct1; 2194 state = st_oct1;
2144 c1 = c - '0'; 2195 c1 = c - '0';
2145 break; 2196 break;
2146 2197
2198 case 'a': *p++ = '\a'; state = st_ok; break;
2199 case 'n': *p++ = '\n'; state = st_ok; break;
2200 case 'r': *p++ = '\r'; state = st_ok; break;
2201 case 't': *p++ = '\t'; state = st_ok; break;
2202
2203 //TODO: \whitespace eol whitespace
2204
2205 //TODO: x should end in ;, not two-digit hex
2147 case 'x': 2206 case 'x':
2148 case 'X': 2207 case 'X':
2149 state = st_x1; 2208 state = st_x1;
2150 c1 = 0; 2209 c1 = 0;
2151 break; 2210 break;
2152 2211
2153 case 'n':
2154 *p++ = '\n';
2155 state = st_ok;
2156 break;
2157
2158 case 't':
2159 *p++ = '\t';
2160 state = st_ok;
2161 break;
2162
2163 case 'r':
2164 *p++ = '\r';
2165 state = st_ok;
2166 break;
2167
2168 case '"':
2169 *p++ = '"';
2170 state = st_ok;
2171 break;
2172
2173 default: 2212 default:
2174 *p++ = c; 2213 *p++ = c;
2175 state = st_ok; 2214 state = st_ok;
2176 break; 2215 break;
2177 } 2216 }
2178 2217
2179 break; 2218 break;
2180 2219
2181 case st_x1: 2220 case st_x1:
2182 case st_x2: 2221 case st_x2:
2183 c = toupper (c); 2222 c = tolower (c);
2184 2223
2185 if (c >= '0' && c <= 'F') 2224 if (c >= '0' && c <= '9')
2186 {
2187 if (c <= '9')
2188 c1 = (c1 << 4) + c - '0'; 2225 c1 = (c1 << 4) + c - '0';
2189 else 2226 else if (c >= 'a' && c <= 'f')
2190 c1 = (c1 << 4) + c - 'A' + 10; 2227 c1 = (c1 << 4) + c - 'a' + 10;
2191
2192 if (state == st_x1)
2193 state = st_x2;
2194 else
2195 {
2196 *p++ = c1;
2197 state = st_ok;
2198 }
2199 }
2200 else 2228 else
2201 return S_F; 2229 return S_F;
2230
2231 if (state == st_x1)
2232 state = st_x2;
2233 else
2234 {
2235 *p++ = c1;
2236 state = st_ok;
2237 }
2202 2238
2203 break; 2239 break;
2204 2240
2205 case st_oct1: 2241 case st_oct1:
2206 case st_oct2: 2242 case st_oct2:
… …
2210 backchar (SCHEME_A_ c); 2246 backchar (SCHEME_A_ c);
2211 state = st_ok; 2247 state = st_ok;
2212 } 2248 }
2213 else 2249 else
2214 { 2250 {
2215 if (state == st_oct2 && c1 >= 32) 2251 if (state == st_oct2 && c1 >= ' ')
2216 return S_F; 2252 return S_F;
2217 2253
2218 c1 = (c1 << 3) + (c - '0'); 2254 c1 = (c1 << 3) + (c - '0');
2219 2255
2220 if (state == st_oct1) 2256 if (state == st_oct1)
… …
2225 state = st_ok; 2261 state = st_ok;
2226 } 2262 }
2227 } 2263 }
2228 2264
2229 break; 2265 break;
2230
2231 } 2266 }
2232 } 2267 }
2233} 2268}
2234 2269
2235/* check c is in chars */ 2270/* check c is in chars */
2236static INLINE int 2271ecb_cold int
2237is_one_of (char *s, int c) 2272is_one_of (const char *s, int c)
2238{ 2273{
2239 if (c == EOF)
2240 return 1;
2241
2242 return !!strchr (s, c); 2274 return c == EOF || !!strchr (s, c);
2243} 2275}
2244 2276
2245/* skip white characters */ 2277/* skip white characters */
2246static INLINE int 2278ecb_cold int
2247skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2248{ 2280{
2249 int c, curr_line = 0; 2281 int c, curr_line = 0;
2250 2282
2251 do 2283 do
2252 { 2284 {
2253 c = inchar (SCHEME_A); 2285 c = inchar (SCHEME_A);
2286
2254#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2255 if (c == '\n') 2288 if (ecb_expect_false (c == '\n'))
2256 curr_line++; 2289 curr_line++;
2257#endif 2290#endif
2291
2292 if (ecb_expect_false (c == EOF))
2293 return c;
2258 } 2294 }
2259 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2295 while (is_one_of (WHITESPACE, c));
2260 2296
2261 /* record it */ 2297 /* record it */
2262#if SHOW_ERROR_LINE 2298#if SHOW_ERROR_LINE
2263 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2299 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2264 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2300 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2265#endif 2301#endif
2266 2302
2267 if (c != EOF)
2268 {
2269 backchar (SCHEME_A_ c); 2303 backchar (SCHEME_A_ c);
2270 return 1; 2304 return 1;
2271 }
2272 else
2273 return EOF;
2274} 2305}
2275 2306
2276/* get token */ 2307/* get token */
2277static int 2308ecb_cold static int
2278token (SCHEME_P) 2309token (SCHEME_P)
2279{ 2310{
2280 int c = skipspace (SCHEME_A); 2311 int c = skipspace (SCHEME_A);
2281 2312
2282 if (c == EOF) 2313 if (c == EOF)
… …
2294 return TOK_RPAREN; 2325 return TOK_RPAREN;
2295 2326
2296 case '.': 2327 case '.':
2297 c = inchar (SCHEME_A); 2328 c = inchar (SCHEME_A);
2298 2329
2299 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (WHITESPACE, c))
2300 return TOK_DOT; 2331 return TOK_DOT;
2301 else 2332 else
2302 { 2333 {
2303 //TODO: ungetc twice in a row is not supported in C
2304 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2305 backchar (SCHEME_A_ '.');
2306 return TOK_ATOM; 2335 return TOK_DOTATOM;
2307 } 2336 }
2337
2338 case '|':
2339 return TOK_STRATOM;
2308 2340
2309 case '\'': 2341 case '\'':
2310 return TOK_QUOTE; 2342 return TOK_QUOTE;
2311 2343
2312 case ';': 2344 case ';':
… …
2379} 2411}
2380 2412
2381/* ========== Routines for Printing ========== */ 2413/* ========== Routines for Printing ========== */
2382#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2383 2415
2384static void 2416ecb_cold static void
2385printslashstring (SCHEME_P_ char *p, int len) 2417printslashstring (SCHEME_P_ char *p, int len)
2386{ 2418{
2387 int i; 2419 int i;
2388 unsigned char *s = (unsigned char *) p; 2420 unsigned char *s = (unsigned char *) p;
2389 2421
… …
2444 } 2476 }
2445 2477
2446 putcharacter (SCHEME_A_ '"'); 2478 putcharacter (SCHEME_A_ '"');
2447} 2479}
2448 2480
2449
2450/* print atoms */ 2481/* print atoms */
2451static void 2482ecb_cold static void
2452printatom (SCHEME_P_ pointer l, int f) 2483printatom (SCHEME_P_ pointer l, int f)
2453{ 2484{
2454 char *p; 2485 char *p;
2455 int len; 2486 int len;
2456 2487
2457 atom2str (SCHEME_A_ l, f, &p, &len); 2488 atom2str (SCHEME_A_ l, f, &p, &len);
2458 putchars (SCHEME_A_ p, len); 2489 putchars (SCHEME_A_ p, len);
2459} 2490}
2460 2491
2461
2462/* Uses internal buffer unless string pointer is already available */ 2492/* Uses internal buffer unless string pointer is already available */
2463static void 2493ecb_cold static void
2464atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2465{ 2495{
2466 char *p; 2496 char *p;
2467 2497
2468 if (l == NIL) 2498 if (l == NIL)
… …
2479 { 2509 {
2480 p = SCHEME_V->strbuff; 2510 p = SCHEME_V->strbuff;
2481 2511
2482 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2512 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2483 { 2513 {
2484 if (num_is_integer (l)) 2514 if (is_integer (l))
2485 xnum (p, ivalue_unchecked (l)); 2515 xnum (p, ivalue_unchecked (l));
2486#if USE_REAL 2516#if USE_REAL
2487 else 2517 else
2488 { 2518 {
2489 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2519 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2626#endif 2656#endif
2627 } 2657 }
2628 else if (is_continuation (l)) 2658 else if (is_continuation (l))
2629 p = "#<CONTINUATION>"; 2659 p = "#<CONTINUATION>";
2630 else 2660 else
2661 {
2662#if USE_PRINTF
2663 p = SCHEME_V->strbuff;
2664 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2665#else
2631 p = "#<ERROR>"; 2666 p = "#<ERROR>";
2667#endif
2668 }
2632 2669
2633 *pp = p; 2670 *pp = p;
2634 *plen = strlen (p); 2671 *plen = strlen (p);
2635} 2672}
2636 2673
… …
2668 return car (d); 2705 return car (d);
2669 2706
2670 p = cons (car (d), cdr (d)); 2707 p = cons (car (d), cdr (d));
2671 q = p; 2708 q = p;
2672 2709
2673 while (cdr (cdr (p)) != NIL) 2710 while (cddr (p) != NIL)
2674 { 2711 {
2675 d = cons (car (p), cdr (p)); 2712 d = cons (car (p), cdr (p));
2676 2713
2677 if (cdr (cdr (p)) != NIL) 2714 if (cddr (p) != NIL)
2678 p = cdr (d); 2715 p = cdr (d);
2679 } 2716 }
2680 2717
2681 set_cdr (p, car (cdr (p))); 2718 set_cdr (p, cadr (p));
2682 return q; 2719 return q;
2683} 2720}
2684 2721
2685/* reverse list -- produce new list */ 2722/* reverse list -- produce new list */
2686static pointer 2723ecb_hot static pointer
2687reverse (SCHEME_P_ pointer a) 2724reverse (SCHEME_P_ pointer a)
2688{ 2725{
2689 /* a must be checked by gc */ 2726 /* a must be checked by gc */
2690 pointer p = NIL; 2727 pointer p = NIL;
2691 2728
… …
2694 2731
2695 return p; 2732 return p;
2696} 2733}
2697 2734
2698/* reverse list --- in-place */ 2735/* reverse list --- in-place */
2699static pointer 2736ecb_hot static pointer
2700reverse_in_place (SCHEME_P_ pointer term, pointer list) 2737reverse_in_place (SCHEME_P_ pointer term, pointer list)
2701{ 2738{
2702 pointer result = term; 2739 pointer result = term;
2703 pointer p = list; 2740 pointer p = list;
2704 2741
… …
2712 2749
2713 return result; 2750 return result;
2714} 2751}
2715 2752
2716/* append list -- produce new list (in reverse order) */ 2753/* append list -- produce new list (in reverse order) */
2717static pointer 2754ecb_hot static pointer
2718revappend (SCHEME_P_ pointer a, pointer b) 2755revappend (SCHEME_P_ pointer a, pointer b)
2719{ 2756{
2720 pointer result = a; 2757 pointer result = a;
2721 pointer p = b; 2758 pointer p = b;
2722 2759
… …
2731 2768
2732 return S_F; /* signal an error */ 2769 return S_F; /* signal an error */
2733} 2770}
2734 2771
2735/* equivalence of atoms */ 2772/* equivalence of atoms */
2736int 2773ecb_hot int
2737eqv (pointer a, pointer b) 2774eqv (pointer a, pointer b)
2738{ 2775{
2739 if (is_string (a)) 2776 if (is_string (a))
2740 { 2777 {
2741 if (is_string (b)) 2778 if (is_string (b))
… …
2744 return 0; 2781 return 0;
2745 } 2782 }
2746 else if (is_number (a)) 2783 else if (is_number (a))
2747 { 2784 {
2748 if (is_number (b)) 2785 if (is_number (b))
2749 if (num_is_integer (a) == num_is_integer (b))
2750 return num_cmp (nvalue (a), nvalue (b)) == 0; 2786 return num_cmp (nvalue (a), nvalue (b)) == 0;
2751 2787
2752 return 0; 2788 return 0;
2753 } 2789 }
2754 else if (is_character (a)) 2790 else if (is_character (a))
2755 { 2791 {
… …
2781/* () is #t in R5RS */ 2817/* () is #t in R5RS */
2782#define is_true(p) ((p) != S_F) 2818#define is_true(p) ((p) != S_F)
2783#define is_false(p) ((p) == S_F) 2819#define is_false(p) ((p) == S_F)
2784 2820
2785/* ========== Environment implementation ========== */ 2821/* ========== Environment implementation ========== */
2786
2787#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2788
2789static int
2790hash_fn (const char *key, int table_size)
2791{
2792 const unsigned char *p = key;
2793 uint32_t hash = 2166136261;
2794
2795 while (*p)
2796 hash = (hash ^ *p++) * 16777619;
2797
2798 return hash % table_size;
2799}
2800#endif
2801 2822
2802#ifndef USE_ALIST_ENV 2823#ifndef USE_ALIST_ENV
2803 2824
2804/* 2825/*
2805 * In this implementation, each frame of the environment may be 2826 * In this implementation, each frame of the environment may be
… …
2822 2843
2823 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2844 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2824 setenvironment (SCHEME_V->envir); 2845 setenvironment (SCHEME_V->envir);
2825} 2846}
2826 2847
2827static INLINE void 2848static uint32_t
2849sym_hash (pointer sym, uint32_t size)
2850{
2851 uintptr_t ptr = (uintptr_t)sym;
2852
2853#if 0
2854 /* table size is prime, so why mix */
2855 ptr += ptr >> 32;
2856 ptr += ptr >> 16;
2857 ptr += ptr >> 8;
2858#endif
2859
2860 return ptr % size;
2861}
2862
2863ecb_inline void
2828new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2864new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2829{ 2865{
2830 pointer slot = immutable_cons (variable, value); 2866 pointer slot = immutable_cons (variable, value);
2831 2867
2832 if (is_vector (car (env))) 2868 if (is_vector (car (env)))
2833 { 2869 {
2834 int location = hash_fn (symname (variable), veclength (car (env))); 2870 int location = sym_hash (variable, veclength (car (env)));
2835
2836 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2871 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2837 } 2872 }
2838 else 2873 else
2839 set_car (env, immutable_cons (slot, car (env))); 2874 set_car (env, immutable_cons (slot, car (env)));
2840} 2875}
2841 2876
2842static pointer 2877ecb_hot static pointer
2843find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2878find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2844{ 2879{
2845 pointer x, y; 2880 pointer x, y;
2846 int location;
2847 2881
2848 for (x = env; x != NIL; x = cdr (x)) 2882 for (x = env; x != NIL; x = cdr (x))
2849 { 2883 {
2850 if (is_vector (car (x))) 2884 if (is_vector (car (x)))
2851 { 2885 {
2852 location = hash_fn (symname (hdl), veclength (car (x))); 2886 int location = sym_hash (hdl, veclength (car (x)));
2853 y = vector_elem (car (x), location); 2887 y = vector_get (car (x), location);
2854 } 2888 }
2855 else 2889 else
2856 y = car (x); 2890 y = car (x);
2857 2891
2858 for (; y != NIL; y = cdr (y)) 2892 for (; y != NIL; y = cdr (y))
2859 if (caar (y) == hdl) 2893 if (caar (y) == hdl)
2860 break; 2894 break;
2861 2895
2862 if (y != NIL) 2896 if (y != NIL)
2897 return car (y);
2898
2899 if (!all)
2863 break; 2900 break;
2864
2865 if (!all)
2866 return NIL;
2867 } 2901 }
2868
2869 if (x != NIL)
2870 return car (y);
2871 2902
2872 return NIL; 2903 return NIL;
2873} 2904}
2874 2905
2875#else /* USE_ALIST_ENV */ 2906#else /* USE_ALIST_ENV */
2876 2907
2877static INLINE void 2908static void
2878new_frame_in_env (SCHEME_P_ pointer old_env) 2909new_frame_in_env (SCHEME_P_ pointer old_env)
2879{ 2910{
2880 SCHEME_V->envir = immutable_cons (NIL, old_env); 2911 SCHEME_V->envir = immutable_cons (NIL, old_env);
2881 setenvironment (SCHEME_V->envir); 2912 setenvironment (SCHEME_V->envir);
2882} 2913}
2883 2914
2884static INLINE void 2915static void
2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2916new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2886{ 2917{
2887 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2918 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2888} 2919}
2889 2920
2890static pointer 2921ecb_hot static pointer
2891find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2922find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2892{ 2923{
2893 pointer x, y; 2924 pointer x, y;
2894 2925
2895 for (x = env; x != NIL; x = cdr (x)) 2926 for (x = env; x != NIL; x = cdr (x))
… …
2897 for (y = car (x); y != NIL; y = cdr (y)) 2928 for (y = car (x); y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2929 if (caar (y) == hdl)
2899 break; 2930 break;
2900 2931
2901 if (y != NIL) 2932 if (y != NIL)
2933 return car (y);
2902 break; 2934 break;
2903 2935
2904 if (!all) 2936 if (!all)
2905 return NIL; 2937 break;
2906 } 2938 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2939
2911 return NIL; 2940 return NIL;
2912} 2941}
2913 2942
2914#endif /* USE_ALIST_ENV else */ 2943#endif /* USE_ALIST_ENV else */
2915 2944
2916static INLINE void 2945static void
2917new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2918{ 2947{
2948 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2919 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2949 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2920} 2950}
2921 2951
2922static INLINE void 2952static void
2923set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2953set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2924{ 2954{
2925 set_cdr (slot, value); 2955 set_cdr (slot, value);
2926} 2956}
2927 2957
2928static INLINE pointer 2958static pointer
2929slot_value_in_env (pointer slot) 2959slot_value_in_env (pointer slot)
2930{ 2960{
2931 return cdr (slot); 2961 return cdr (slot);
2932} 2962}
2933 2963
2934/* ========== Evaluation Cycle ========== */ 2964/* ========== Evaluation Cycle ========== */
2935 2965
2936static pointer 2966ecb_cold static int
2937xError_1 (SCHEME_P_ const char *s, pointer a) 2967xError_1 (SCHEME_P_ const char *s, pointer a)
2938{ 2968{
2939#if USE_ERROR_HOOK 2969#if USE_ERROR_HOOK
2940 pointer x; 2970 pointer x;
2941 pointer hdl = SCHEME_V->ERROR_HOOK; 2971 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
2976 code = cons (mk_string (SCHEME_A_ s), code); 3006 code = cons (mk_string (SCHEME_A_ s), code);
2977 setimmutable (car (code)); 3007 setimmutable (car (code));
2978 SCHEME_V->code = cons (slot_value_in_env (x), code); 3008 SCHEME_V->code = cons (slot_value_in_env (x), code);
2979 SCHEME_V->op = OP_EVAL; 3009 SCHEME_V->op = OP_EVAL;
2980 3010
2981 return S_T; 3011 return 0;
2982 } 3012 }
2983#endif 3013#endif
2984 3014
2985 if (a) 3015 if (a)
2986 SCHEME_V->args = cons (a, NIL); 3016 SCHEME_V->args = cons (a, NIL);
… …
2988 SCHEME_V->args = NIL; 3018 SCHEME_V->args = NIL;
2989 3019
2990 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3020 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2991 setimmutable (car (SCHEME_V->args)); 3021 setimmutable (car (SCHEME_V->args));
2992 SCHEME_V->op = OP_ERR0; 3022 SCHEME_V->op = OP_ERR0;
3023
2993 return S_T; 3024 return 0;
2994} 3025}
2995 3026
2996#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3027#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2997#define Error_0(s) Error_1 (s, 0) 3028#define Error_0(s) Error_1 (s, 0)
2998 3029
2999/* Too small to turn into function */ 3030/* Too small to turn into function */
3000#define BEGIN do { 3031#define BEGIN do {
3001#define END } while (0) 3032#define END } while (0)
3002#define s_goto(a) BEGIN \ 3033#define s_goto(a) BEGIN \
3003 SCHEME_V->op = a; \ 3034 SCHEME_V->op = a; \
3004 return S_T; END 3035 return 0; END
3005 3036
3006#define s_return(a) return xs_return (SCHEME_A_ a) 3037#define s_return(a) return xs_return (SCHEME_A_ a)
3007 3038
3008#ifndef USE_SCHEME_STACK 3039#ifndef USE_SCHEME_STACK
3009 3040
… …
3016 pointer code; 3047 pointer code;
3017}; 3048};
3018 3049
3019# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3020 3051
3021static void 3052ecb_hot static void
3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3023{ 3054{
3024 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3025 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3026 3057
3027 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3028 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3029 { 3060 {
3030 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3062 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3032 } 3063 }
3033 3064
… …
3039 next_frame->code = code; 3070 next_frame->code = code;
3040 3071
3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3042} 3073}
3043 3074
3044static pointer 3075static ecb_hot int
3045xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3046{ 3077{
3047 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3048 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3049 3080
3050 SCHEME_V->value = a; 3081 SCHEME_V->value = a;
3051 3082
3052 if (nframes <= 0) 3083 if (nframes <= 0)
3053 return NIL; 3084 return -1;
3054 3085
3055 frame = &SCHEME_V->dump_base[--nframes]; 3086 frame = &SCHEME_V->dump_base[--nframes];
3056 SCHEME_V->op = frame->op; 3087 SCHEME_V->op = frame->op;
3057 SCHEME_V->args = frame->args; 3088 SCHEME_V->args = frame->args;
3058 SCHEME_V->envir = frame->envir; 3089 SCHEME_V->envir = frame->envir;
3059 SCHEME_V->code = frame->code; 3090 SCHEME_V->code = frame->code;
3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3061 3092
3062 return S_T; 3093 return 0;
3063} 3094}
3064 3095
3065static INLINE void 3096ecb_cold void
3066dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3067{ 3098{
3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3099 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3069 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3070} 3101}
3071 3102
3072static INLINE void 3103ecb_cold void
3073dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3074{ 3105{
3075 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3076 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3077 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3078} 3109}
3079 3110
3080static void 3111ecb_cold static void
3081dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3082{ 3113{
3083 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3084 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3085 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3086 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3087} 3118}
3088 3119
3089static void 3120ecb_cold static void
3090dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3091{ 3122{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3093 int i; 3124 int i;
3094 3125
… …
3100 mark (frame->envir); 3131 mark (frame->envir);
3101 mark (frame->code); 3132 mark (frame->code);
3102 } 3133 }
3103} 3134}
3104 3135
3105static pointer 3136ecb_cold static pointer
3106ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3107{ 3138{
3108 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3109 int i; 3140 int i;
3110 3141
… …
3122 } 3153 }
3123 3154
3124 return cont; 3155 return cont;
3125} 3156}
3126 3157
3127static void 3158ecb_cold static void
3128ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3129{ 3160{
3130 int i = 0; 3161 int i = 0;
3131 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3132 3163
3133 while (cont != NIL) 3164 while (cont != NIL)
3134 { 3165 {
3135 frame->op = ivalue (car (cont)); cont = cdr (cont); 3166 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3136 frame->args = car (cont) ; cont = cdr (cont); 3167 frame->args = car (cont) ; cont = cdr (cont);
3137 frame->envir = car (cont) ; cont = cdr (cont); 3168 frame->envir = car (cont) ; cont = cdr (cont);
3138 frame->code = car (cont) ; cont = cdr (cont); 3169 frame->code = car (cont) ; cont = cdr (cont);
3139 3170
3140 ++frame; 3171 ++frame;
3141 ++i; 3172 ++i;
3142 } 3173 }
3143 3174
3144 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3145} 3176}
3146 3177
3147#else 3178#else
3148 3179
3149static INLINE void 3180ecb_cold void
3150dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3151{ 3182{
3152 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3153} 3184}
3154 3185
3155static INLINE void 3186ecb_cold void
3156dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3157{ 3188{
3158 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3159} 3190}
3160 3191
3161static void 3192ecb_cold static void
3162dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3163{ 3194{
3164 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3165} 3196}
3166 3197
3167static pointer 3198ecb_hot static int
3168xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3169{ 3200{
3170 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3171 3202
3172 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
3173 3204
3174 if (dump == NIL) 3205 if (dump == NIL)
3175 return NIL; 3206 return -1;
3176 3207
3177 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3208 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3178 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3179 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3210 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3211 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3181 3212
3182 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3183 3214
3184 return S_T; 3215 return 0;
3185} 3216}
3186 3217
3187static void 3218ecb_hot static void
3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3189{ 3220{
3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3191 cons (args, 3222 cons (args,
3192 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3193 cons (code, 3224 cons (code,
3194 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3195} 3226}
3196 3227
3197static void 3228ecb_cold static void
3198dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3199{ 3230{
3200 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3201} 3232}
3202 3233
3203static pointer 3234ecb_cold static pointer
3204ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3205{ 3236{
3206 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3207} 3238}
3208 3239
3209static void 3240ecb_cold static void
3210ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3211{ 3242{
3212 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3213} 3244}
3214 3245
3215#endif 3246#endif
3216 3247
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3248#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218 3249
3250#if EXPERIMENT
3219static pointer 3251static int
3252debug (SCHEME_P_ int indent, pointer x)
3253{
3254 int c;
3255
3256 if (is_syntax (x))
3257 {
3258 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3259 return 8 + 8;
3260 }
3261
3262 if (x == NIL)
3263 {
3264 printf ("%*sNIL\n", indent, "");
3265 return 3;
3266 }
3267
3268 switch (type (x))
3269 {
3270 case T_INTEGER:
3271 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3272 return 32+8;
3273
3274 case T_SYMBOL:
3275 printf ("%*sS<%s>\n", indent, "", symname (x));
3276 return 24+8;
3277
3278 case T_CLOSURE:
3279 printf ("%*sS<%s>\n", indent, "", "closure");
3280 debug (SCHEME_A_ indent + 3, cdr(x));
3281 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3282
3283 case T_PAIR:
3284 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3285 c = debug (SCHEME_A_ indent + 3, car (x));
3286 c += debug (SCHEME_A_ indent + 3, cdr (x));
3287 return c + 1;
3288
3289 case T_PORT:
3290 printf ("%*sS<%s>\n", indent, "", "port");
3291 return 24+8;
3292
3293 case T_VECTOR:
3294 printf ("%*sS<%s>\n", indent, "", "vector");
3295 return 24+8;
3296
3297 case T_ENVIRONMENT:
3298 printf ("%*sS<%s>\n", indent, "", "environment");
3299 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3300
3301 default:
3302 printf ("unhandled type %d\n", type (x));
3303 break;
3304 }
3305}
3306#endif
3307
3308/* syntax, eval, core, ... */
3309ecb_hot static int
3220opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3221{ 3311{
3222 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3223 pointer x, y; 3313 pointer x, y;
3224 3314
3225 switch (op) 3315 switch (op)
3226 { 3316 {
3317#if EXPERIMENT //D
3318 case OP_DEBUG:
3319 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3320 printf ("\n");
3321 s_return (S_T);
3322#endif
3227 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3228 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3229 { 3325 {
3230 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3231 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3327 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3232 } 3328 }
3233 3329
3234 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3235 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3236 else 3332 else
… …
3240 } 3336 }
3241 3337
3242 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3243 3339
3244 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3245 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3246 { 3342 {
3247 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3248 { 3344 {
3249 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3250 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3328#endif 3424#endif
3329 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3330 { 3426 {
3331 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3427 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3332 3428
3333 if (x != NIL) 3429 if (x == NIL)
3334 s_return (slot_value_in_env (x));
3335 else
3336 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3430 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3431
3432 s_return (slot_value_in_env (x));
3337 } 3433 }
3338 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3339 { 3435 {
3340 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3341 3437
… …
3354 } 3450 }
3355 else 3451 else
3356 s_return (SCHEME_V->code); 3452 s_return (SCHEME_V->code);
3357 3453
3358 case OP_E0ARGS: /* eval arguments */ 3454 case OP_E0ARGS: /* eval arguments */
3359 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3455 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3360 { 3456 {
3361 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3457 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3362 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3458 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3363 SCHEME_V->code = SCHEME_V->value; 3459 SCHEME_V->code = SCHEME_V->value;
3364 s_goto (OP_APPLY); 3460 s_goto (OP_APPLY);
… …
3391 3487
3392 case OP_TRACING: 3488 case OP_TRACING:
3393 { 3489 {
3394 int tr = SCHEME_V->tracing; 3490 int tr = SCHEME_V->tracing;
3395 3491
3396 SCHEME_V->tracing = ivalue (car (args)); 3492 SCHEME_V->tracing = ivalue_unchecked (car (args));
3397 s_return (mk_integer (SCHEME_A_ tr)); 3493 s_return (mk_integer (SCHEME_A_ tr));
3398 } 3494 }
3399 3495
3400#endif 3496#endif
3401 3497
… …
3413 /* fall through */ 3509 /* fall through */
3414 3510
3415 case OP_REAL_APPLY: 3511 case OP_REAL_APPLY:
3416#endif 3512#endif
3417 if (is_proc (SCHEME_V->code)) 3513 if (is_proc (SCHEME_V->code))
3418 {
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 }
3421 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3422 { 3516 {
3423 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426 3520
3427 s_return (x); 3521 s_return (x);
3428 } 3522 }
3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3523 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3430 { 3524 {
… …
3467 3561
3468 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3471 3565
3472#if 1
3473
3474 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3475 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3567 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3476 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3477 { 3569 {
3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3570 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); 3576 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3486 } 3578 }
3487 3579
3488 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3581 }
3582 /* Fallthru */
3491 3583
3492 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3493 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3585 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 3586
3502 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3588 x = car (args);
3504 3589
3505 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
3592 3677
3593 case OP_IF1: /* if */ 3678 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3679 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3680 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3681 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3682 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3598
3599 * car(NIL) = NIL */
3600 s_goto (OP_EVAL); 3683 s_goto (OP_EVAL);
3601 3684
3602 case OP_LET0: /* let */ 3685 case OP_LET0: /* let */
3603 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3604 SCHEME_V->value = SCHEME_V->code; 3687 SCHEME_V->value = SCHEME_V->code;
… …
3914 SCHEME_V->code = car (args); 3997 SCHEME_V->code = car (args);
3915 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3998 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3916 s_goto (OP_APPLY); 3999 s_goto (OP_APPLY);
3917 } 4000 }
3918 4001
3919 abort (); 4002 if (USE_ERROR_CHECKING) abort ();
3920} 4003}
3921 4004
3922static pointer 4005/* math, cxr */
4006ecb_hot static int
3923opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3924{ 4008{
3925 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
3926 pointer x = car (args); 4010 pointer x = car (args);
3927 num v; 4011 num v;
3928 4012
3929#if USE_MATH
3930 RVALUE dd;
3931#endif
3932
3933 switch (op) 4013 switch (op)
3934 { 4014 {
3935#if USE_MATH 4015#if USE_MATH
3936 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
3937 if (num_is_integer (x)) 4017 if (!is_integer (x))
3938 s_return (x); 4018 {
3939 else if (modf (rvalue_unchecked (x), &dd) == 0) 4019 RVALUE r = rvalue_unchecked (x);
3940 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4020
4021 if (r == (RVALUE)(IVALUE)r)
4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3941 else 4023 else
3942 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
4025 }
3943 4026
4027 s_return (x);
4028
4029 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4030 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4032 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4033
4034 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3944 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4035 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3945 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4036 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4037 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3946 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4038 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3947 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4039 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3948 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4040 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3949 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4041 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3950 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4042 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3951 4043
3952 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
3953 if (cdr (args) == NIL) 4046 cdr (args) == NIL
3954 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
3955 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
3956 {
3957 pointer y = cadr (args);
3958 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3959 }
3960
3961 case OP_SQRT:
3962 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3963 4049
3964 case OP_EXPT: 4050 case OP_EXPT:
3965 { 4051 {
3966 RVALUE result; 4052 RVALUE result;
3967 int real_result = 1; 4053 int real_result = 1;
3968 pointer y = cadr (args); 4054 pointer y = cadr (args);
3969 4055
3970 if (num_is_integer (x) && num_is_integer (y)) 4056 if (is_integer (x) && is_integer (y))
3971 real_result = 0; 4057 real_result = 0;
3972 4058
3973 /* This 'if' is an R5RS compatibility fix. */ 4059 /* This 'if' is an R5RS compatibility fix. */
3974 /* NOTE: Remove this 'if' fix for R6RS. */ 4060 /* NOTE: Remove this 'if' fix for R6RS. */
3975 if (rvalue (x) == 0 && rvalue (y) < 0) 4061 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3981 /* If the test fails, result is too big for integer. */ 4067 /* If the test fails, result is too big for integer. */
3982 if (!real_result) 4068 if (!real_result)
3983 { 4069 {
3984 long result_as_long = result; 4070 long result_as_long = result;
3985 4071
3986 if (result != (RVALUE) result_as_long) 4072 if (result != result_as_long)
3987 real_result = 1; 4073 real_result = 1;
3988 } 4074 }
3989 4075
3990 if (real_result) 4076 if (real_result)
3991 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
3992 else 4078 else
3993 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
3994 } 4080 }
3995
3996 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3997 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3998
3999 case OP_TRUNCATE:
4000 {
4001 RVALUE rvalue_of_x;
4002
4003 rvalue_of_x = rvalue (x);
4004
4005 if (rvalue_of_x > 0)
4006 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4007 else
4008 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4009 }
4010
4011 case OP_ROUND:
4012 if (num_is_integer (x))
4013 s_return (x);
4014
4015 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4016#endif 4081#endif
4017 4082
4018 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4019 v = num_zero; 4084 v = num_zero;
4020 4085
4021 for (x = args; x != NIL; x = cdr (x)) 4086 for (x = args; x != NIL; x = cdr (x))
4022 v = num_op ('+', v, nvalue (car (x))); 4087 v = num_op (NUM_ADD, v, nvalue (car (x)));
4023 4088
4024 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4025 4090
4026 case OP_MUL: /* * */ 4091 case OP_MUL: /* * */
4027 v = num_one; 4092 v = num_one;
4028 4093
4029 for (x = args; x != NIL; x = cdr (x)) 4094 for (x = args; x != NIL; x = cdr (x))
4030 v = num_op ('+', v, nvalue (car (x))); 4095 v = num_op (NUM_MUL, v, nvalue (car (x)));
4031 4096
4032 s_return (mk_number (SCHEME_A_ v)); 4097 s_return (mk_number (SCHEME_A_ v));
4033 4098
4034 case OP_SUB: /* - */ 4099 case OP_SUB: /* - */
4035 if (cdr (args) == NIL) 4100 if (cdr (args) == NIL)
… …
4042 x = cdr (args); 4107 x = cdr (args);
4043 v = nvalue (car (args)); 4108 v = nvalue (car (args));
4044 } 4109 }
4045 4110
4046 for (; x != NIL; x = cdr (x)) 4111 for (; x != NIL; x = cdr (x))
4047 v = num_op ('+', v, nvalue (car (x))); 4112 v = num_op (NUM_SUB, v, nvalue (car (x)));
4048 4113
4049 s_return (mk_number (SCHEME_A_ v)); 4114 s_return (mk_number (SCHEME_A_ v));
4050 4115
4051 case OP_DIV: /* / */ 4116 case OP_DIV: /* / */
4052 if (cdr (args) == NIL) 4117 if (cdr (args) == NIL)
… …
4059 x = cdr (args); 4124 x = cdr (args);
4060 v = nvalue (car (args)); 4125 v = nvalue (car (args));
4061 } 4126 }
4062 4127
4063 for (; x != NIL; x = cdr (x)) 4128 for (; x != NIL; x = cdr (x))
4064 {
4065 if (!is_zero_rvalue (rvalue (car (x)))) 4129 if (!is_zero_rvalue (rvalue (car (x))))
4066 v = num_div (v, nvalue (car (x))); 4130 v = num_div (v, nvalue (car (x)));
4067 else 4131 else
4068 Error_0 ("/: division by zero"); 4132 Error_0 ("/: division by zero");
4069 }
4070 4133
4071 s_return (mk_number (SCHEME_A_ v)); 4134 s_return (mk_number (SCHEME_A_ v));
4072 4135
4073 case OP_INTDIV: /* quotient */ 4136 case OP_INTDIV: /* quotient */
4074 if (cdr (args) == NIL) 4137 if (cdr (args) == NIL)
… …
4083 } 4146 }
4084 4147
4085 for (; x != NIL; x = cdr (x)) 4148 for (; x != NIL; x = cdr (x))
4086 { 4149 {
4087 if (ivalue (car (x)) != 0) 4150 if (ivalue (car (x)) != 0)
4088 v = num_op ('/', v, nvalue (car (x))); 4151 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4089 else 4152 else
4090 Error_0 ("quotient: division by zero"); 4153 Error_0 ("quotient: division by zero");
4091 } 4154 }
4092 4155
4093 s_return (mk_number (SCHEME_A_ v)); 4156 s_return (mk_number (SCHEME_A_ v));
… …
4110 else 4173 else
4111 Error_0 ("modulo: division by zero"); 4174 Error_0 ("modulo: division by zero");
4112 4175
4113 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4114 4177
4115 case OP_CAR: /* car */ 4178 /* the compiler will optimize this mess... */
4116 s_return (caar (args)); 4179 case OP_CAR: op_car: s_return (car (x));
4117 4180 case OP_CDR: op_cdr: s_return (cdr (x));
4118 case OP_CDR: /* cdr */ 4181 case OP_CAAR: op_caar: x = car (x); goto op_car;
4119 s_return (cdar (args)); 4182 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4183 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4184 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4185 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4186 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4187 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4188 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4189 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4190 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4191 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4192 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4193 case OP_CAAAAR: x = car (x); goto op_caaar;
4194 case OP_CAAADR: x = cdr (x); goto op_caaar;
4195 case OP_CAADAR: x = car (x); goto op_caadr;
4196 case OP_CAADDR: x = cdr (x); goto op_caadr;
4197 case OP_CADAAR: x = car (x); goto op_cadar;
4198 case OP_CADADR: x = cdr (x); goto op_cadar;
4199 case OP_CADDAR: x = car (x); goto op_caddr;
4200 case OP_CADDDR: x = cdr (x); goto op_caddr;
4201 case OP_CDAAAR: x = car (x); goto op_cdaar;
4202 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4203 case OP_CDADAR: x = car (x); goto op_cdadr;
4204 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4205 case OP_CDDAAR: x = car (x); goto op_cddar;
4206 case OP_CDDADR: x = cdr (x); goto op_cddar;
4207 case OP_CDDDAR: x = car (x); goto op_cdddr;
4208 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4120 4209
4121 case OP_CONS: /* cons */ 4210 case OP_CONS: /* cons */
4122 set_cdr (args, cadr (args)); 4211 set_cdr (args, cadr (args));
4123 s_return (args); 4212 s_return (args);
4124 4213
… …
4139 } 4228 }
4140 else 4229 else
4141 Error_0 ("set-cdr!: unable to alter immutable pair"); 4230 Error_0 ("set-cdr!: unable to alter immutable pair");
4142 4231
4143 case OP_CHAR2INT: /* char->integer */ 4232 case OP_CHAR2INT: /* char->integer */
4144 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4233 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4145 4234
4146 case OP_INT2CHAR: /* integer->char */ 4235 case OP_INT2CHAR: /* integer->char */
4147 s_return (mk_character (SCHEME_A_ ivalue (x))); 4236 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4148 4237
4149 case OP_CHARUPCASE: 4238 case OP_CHARUPCASE:
4150 { 4239 {
4151 unsigned char c = ivalue (x); 4240 unsigned char c = ivalue_unchecked (x);
4152 c = toupper (c); 4241 c = toupper (c);
4153 s_return (mk_character (SCHEME_A_ c)); 4242 s_return (mk_character (SCHEME_A_ c));
4154 } 4243 }
4155 4244
4156 case OP_CHARDNCASE: 4245 case OP_CHARDNCASE:
4157 { 4246 {
4158 unsigned char c = ivalue (x); 4247 unsigned char c = ivalue_unchecked (x);
4159 c = tolower (c); 4248 c = tolower (c);
4160 s_return (mk_character (SCHEME_A_ c)); 4249 s_return (mk_character (SCHEME_A_ c));
4161 } 4250 }
4162 4251
4163 case OP_STR2SYM: /* string->symbol */ 4252 case OP_STR2SYM: /* string->symbol */
… …
4240 Error_1 ("atom->string: not an atom:", x); 4329 Error_1 ("atom->string: not an atom:", x);
4241 } 4330 }
4242 4331
4243 case OP_MKSTRING: /* make-string */ 4332 case OP_MKSTRING: /* make-string */
4244 { 4333 {
4245 int fill = ' '; 4334 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4246 int len;
4247
4248 len = ivalue (x); 4335 int len = ivalue_unchecked (x);
4249
4250 if (cdr (args) != NIL)
4251 fill = charvalue (cadr (args));
4252 4336
4253 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4337 s_return (mk_empty_string (SCHEME_A_ len, fill));
4254 } 4338 }
4255 4339
4256 case OP_STRLEN: /* string-length */ 4340 case OP_STRLEN: /* string-length */
4257 s_return (mk_integer (SCHEME_A_ strlength (x))); 4341 s_return (mk_integer (SCHEME_A_ strlength (x)));
4258 4342
4259 case OP_STRREF: /* string-ref */ 4343 case OP_STRREF: /* string-ref */
4260 { 4344 {
4261 char *str;
4262 int index;
4263
4264 str = strvalue (x); 4345 char *str = strvalue (x);
4265
4266 index = ivalue (cadr (args)); 4346 int index = ivalue_unchecked (cadr (args));
4267 4347
4268 if (index >= strlength (x)) 4348 if (index >= strlength (x))
4269 Error_1 ("string-ref: out of bounds:", cadr (args)); 4349 Error_1 ("string-ref: out of bounds:", cadr (args));
4270 4350
4271 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4351 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4272 } 4352 }
4273 4353
4274 case OP_STRSET: /* string-set! */ 4354 case OP_STRSET: /* string-set! */
4275 { 4355 {
4276 char *str; 4356 char *str = strvalue (x);
4277 int index; 4357 int index = ivalue_unchecked (cadr (args));
4278 int c; 4358 int c;
4279 4359
4280 if (is_immutable (x)) 4360 if (is_immutable (x))
4281 Error_1 ("string-set!: unable to alter immutable string:", x); 4361 Error_1 ("string-set!: unable to alter immutable string:", x);
4282
4283 str = strvalue (x);
4284
4285 index = ivalue (cadr (args));
4286 4362
4287 if (index >= strlength (x)) 4363 if (index >= strlength (x))
4288 Error_1 ("string-set!: out of bounds:", cadr (args)); 4364 Error_1 ("string-set!: out of bounds:", cadr (args));
4289 4365
4290 c = charvalue (caddr (args)); 4366 c = charvalue (caddr (args));
… …
4311 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4312 4388
4313 s_return (newstr); 4389 s_return (newstr);
4314 } 4390 }
4315 4391
4316 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4317 { 4393 {
4318 char *str; 4394 char *str = strvalue (x);
4319 int index0; 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4320 int index1; 4396 int index1;
4321 int len; 4397 int len;
4322 4398
4323 str = strvalue (x);
4324
4325 index0 = ivalue (cadr (args));
4326
4327 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4328 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4329 4401
4330 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4331 { 4403 {
4332 index1 = ivalue (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4333 4405
4334 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4335 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4336 } 4408 }
4337 else 4409 else
4338 index1 = strlength (x); 4410 index1 = strlength (x);
4339 4411
4340 len = index1 - index0; 4412 len = index1 - index0;
4341 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4342 memcpy (strvalue (x), str + index0, len);
4343 strvalue (x)[len] = 0;
4344 4414
4345 s_return (x); 4415 s_return (x);
4346 } 4416 }
4347 4417
4348 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4360 if (SCHEME_V->no_memory) 4430 if (SCHEME_V->no_memory)
4361 s_return (S_SINK); 4431 s_return (S_SINK);
4362#endif 4432#endif
4363 4433
4364 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4434 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4365 set_vector_elem (vec, i, car (x)); 4435 vector_set (vec, i, car (x));
4366 4436
4367 s_return (vec); 4437 s_return (vec);
4368 } 4438 }
4369 4439
4370 case OP_MKVECTOR: /* make-vector */ 4440 case OP_MKVECTOR: /* make-vector */
4371 { 4441 {
4372 pointer fill = NIL; 4442 pointer fill = NIL;
4373 int len;
4374 pointer vec; 4443 pointer vec;
4375
4376 len = ivalue (x); 4444 int len = ivalue_unchecked (x);
4377 4445
4378 if (cdr (args) != NIL) 4446 if (cdr (args) != NIL)
4379 fill = cadr (args); 4447 fill = cadr (args);
4380 4448
4381 vec = mk_vector (SCHEME_A_ len); 4449 vec = mk_vector (SCHEME_A_ len);
… …
4384 if (SCHEME_V->no_memory) 4452 if (SCHEME_V->no_memory)
4385 s_return (S_SINK); 4453 s_return (S_SINK);
4386#endif 4454#endif
4387 4455
4388 if (fill != NIL) 4456 if (fill != NIL)
4389 fill_vector (vec, fill); 4457 fill_vector (vec, 0, fill);
4390 4458
4391 s_return (vec); 4459 s_return (vec);
4392 } 4460 }
4393 4461
4394 case OP_VECLEN: /* vector-length */ 4462 case OP_VECLEN: /* vector-length */
4395 s_return (mk_integer (SCHEME_A_ veclength (x))); 4463 s_return (mk_integer (SCHEME_A_ veclength (x)));
4396 4464
4465 case OP_VECRESIZE:
4466 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4467 s_return (x);
4468
4397 case OP_VECREF: /* vector-ref */ 4469 case OP_VECREF: /* vector-ref */
4398 { 4470 {
4399 int index;
4400
4401 index = ivalue (cadr (args)); 4471 int index = ivalue_unchecked (cadr (args));
4402 4472
4403 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4473 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4404 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4474 Error_1 ("vector-ref: out of bounds:", cadr (args));
4405 4475
4406 s_return (vector_elem (x, index)); 4476 s_return (vector_get (x, index));
4407 } 4477 }
4408 4478
4409 case OP_VECSET: /* vector-set! */ 4479 case OP_VECSET: /* vector-set! */
4410 { 4480 {
4411 int index; 4481 int index = ivalue_unchecked (cadr (args));
4412 4482
4413 if (is_immutable (x)) 4483 if (is_immutable (x))
4414 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4484 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4415 4485
4416 index = ivalue (cadr (args));
4417
4418 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4486 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4419 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4487 Error_1 ("vector-set!: out of bounds:", cadr (args));
4420 4488
4421 set_vector_elem (x, index, caddr (args)); 4489 vector_set (x, index, caddr (args));
4422 s_return (x); 4490 s_return (x);
4423 } 4491 }
4424 } 4492 }
4425 4493
4426 return S_T; 4494 if (USE_ERROR_CHECKING) abort ();
4427} 4495}
4428 4496
4429INTERFACE int 4497/* relational ops */
4430is_list (SCHEME_P_ pointer a) 4498ecb_hot static int
4431{
4432 return list_length (SCHEME_A_ a) >= 0;
4433}
4434
4435/* Result is:
4436 proper list: length
4437 circular list: -1
4438 not even a pair: -2
4439 dotted list: -2 minus length before dot
4440*/
4441INTERFACE int
4442list_length (SCHEME_P_ pointer a)
4443{
4444 int i = 0;
4445 pointer slow, fast;
4446
4447 slow = fast = a;
4448
4449 while (1)
4450 {
4451 if (fast == NIL)
4452 return i;
4453
4454 if (!is_pair (fast))
4455 return -2 - i;
4456
4457 fast = cdr (fast);
4458 ++i;
4459
4460 if (fast == NIL)
4461 return i;
4462
4463 if (!is_pair (fast))
4464 return -2 - i;
4465
4466 ++i;
4467 fast = cdr (fast);
4468
4469 /* Safe because we would have already returned if `fast'
4470 encountered a non-pair. */
4471 slow = cdr (slow);
4472
4473 if (fast == slow)
4474 {
4475 /* the fast pointer has looped back around and caught up
4476 with the slow pointer, hence the structure is circular,
4477 not of finite length, and therefore not a list */
4478 return -1;
4479 }
4480 }
4481}
4482
4483static pointer
4484opexe_r (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4485{ 4500{
4486 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4487 4502
4488 for (;;) 4503 for (;;)
4489 { 4504 {
… …
4509 } 4524 }
4510 4525
4511 s_return (S_T); 4526 s_return (S_T);
4512} 4527}
4513 4528
4514static pointer 4529/* predicates */
4530ecb_hot static int
4515opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4516{ 4532{
4517 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4518 pointer a = car (args); 4534 pointer a = car (args);
4519 pointer d = cdr (args); 4535 pointer d = cdr (args);
4520 int r; 4536 int r;
4521 4537
4522 switch (op) 4538 switch (op)
4523 { 4539 {
4524 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4525 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4541 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4526 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4527 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4528 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4544 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4545 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4529 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4530 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4531 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4532 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4549 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4533 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4534 4551
4535#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4536 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4537 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4538 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4539 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4556 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4540 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4557 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4541#endif 4558#endif
4542 4559
4543#if USE_PORTS 4560#if USE_PORTS
4544 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4561 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4545 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4562 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4565 } 4582 }
4566 4583
4567 s_retbool (r); 4584 s_retbool (r);
4568} 4585}
4569 4586
4570static pointer 4587/* promises, list ops, ports */
4588ecb_hot static int
4571opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4572{ 4590{
4573 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4574 pointer a = car (args); 4592 pointer a = car (args);
4575 pointer x, y; 4593 pointer x, y;
… …
4588 } 4606 }
4589 else 4607 else
4590 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4591 4609
4592 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4593 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4594 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4595 4613
4596#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4597 4618
4598 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4599 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4600 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4601 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4661 putstr (SCHEME_A_ "\n"); 4682 putstr (SCHEME_A_ "\n");
4662 4683
4663 if (SCHEME_V->interactive_repl) 4684 if (SCHEME_V->interactive_repl)
4664 s_goto (OP_T0LVL); 4685 s_goto (OP_T0LVL);
4665 else 4686 else
4666 return NIL; 4687 return -1;
4667 } 4688 }
4668 4689
4669 case OP_REVERSE: /* reverse */ 4690 case OP_REVERSE: /* reverse */
4670 s_return (reverse (SCHEME_A_ a)); 4691 s_return (reverse (SCHEME_A_ a));
4671 4692
… …
4728 4749
4729 case OP_QUIT: /* quit */ 4750 case OP_QUIT: /* quit */
4730 if (is_pair (args)) 4751 if (is_pair (args))
4731 SCHEME_V->retcode = ivalue (a); 4752 SCHEME_V->retcode = ivalue (a);
4732 4753
4733 return NIL; 4754 return -1;
4734 4755
4735 case OP_GC: /* gc */ 4756 case OP_GC: /* gc */
4736 gc (SCHEME_A_ NIL, NIL); 4757 gc (SCHEME_A_ NIL, NIL);
4737 s_return (S_T); 4758 s_return (S_T);
4738 4759
… …
4743 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4744 s_retbool (was); 4765 s_retbool (was);
4745 } 4766 }
4746 4767
4747 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4748 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4749 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4750 4772#endif
4751 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4752
4753 s_return (S_T);
4754 4774
4755 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4756 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4757 4777
4758#if USE_PORTS 4778#if USE_PORTS
… …
4785 break; 4805 break;
4786 } 4806 }
4787 4807
4788 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4808 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4789 4809
4790 if (p == NIL) 4810 s_return (p == NIL ? S_F : p);
4791 s_return (S_F);
4792
4793 s_return (p);
4794 } 4811 }
4795 4812
4796# if USE_STRING_PORTS 4813# if USE_STRING_PORTS
4797 4814
4798 case OP_OPEN_INSTRING: /* open-input-string */ 4815 case OP_OPEN_INSTRING: /* open-input-string */
… …
4813 } 4830 }
4814 4831
4815 p = port_from_string (SCHEME_A_ strvalue (a), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
4816 strvalue (a) + strlength (a), prop); 4833 strvalue (a) + strlength (a), prop);
4817 4834
4818 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4819 s_return (S_F);
4820
4821 s_return (p);
4822 } 4836 }
4823 4837
4824 case OP_OPEN_OUTSTRING: /* open-output-string */ 4838 case OP_OPEN_OUTSTRING: /* open-output-string */
4825 { 4839 {
4826 pointer p; 4840 pointer p;
4827 4841
4828 if (a == NIL) 4842 if (a == NIL)
4829 {
4830 p = port_from_scratch (SCHEME_A); 4843 p = port_from_scratch (SCHEME_A);
4831
4832 if (p == NIL)
4833 s_return (S_F);
4834 }
4835 else 4844 else
4836 {
4837 p = port_from_string (SCHEME_A_ strvalue (a), 4845 p = port_from_string (SCHEME_A_ strvalue (a),
4838 strvalue (a) + strlength (a), port_output); 4846 strvalue (a) + strlength (a), port_output);
4839 4847
4840 if (p == NIL) 4848 s_return (p == NIL ? S_F : p);
4841 s_return (S_F);
4842 }
4843
4844 s_return (p);
4845 } 4849 }
4846 4850
4847 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4848 { 4852 {
4849 port *p; 4853 port *p = port (a);
4850 4854
4851 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4852 { 4856 {
4853 off_t size; 4857 off_t size;
4854 char *str; 4858 char *str;
4855 4859
4856 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4888 case OP_CURR_ENV: /* current-environment */ 4892 case OP_CURR_ENV: /* current-environment */
4889 s_return (SCHEME_V->envir); 4893 s_return (SCHEME_V->envir);
4890 4894
4891 } 4895 }
4892 4896
4893 abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4894} 4898}
4895 4899
4896static pointer 4900/* reading */
4901ecb_cold static int
4897opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4898{ 4903{
4904 pointer args = SCHEME_V->args;
4899 pointer x; 4905 pointer x;
4900 4906
4901 if (SCHEME_V->nesting != 0) 4907 if (SCHEME_V->nesting != 0)
4902 { 4908 {
4903 int n = SCHEME_V->nesting; 4909 int n = SCHEME_V->nesting;
… …
4910 switch (op) 4916 switch (op)
4911 { 4917 {
4912 /* ========== reading part ========== */ 4918 /* ========== reading part ========== */
4913#if USE_PORTS 4919#if USE_PORTS
4914 case OP_READ: 4920 case OP_READ:
4915 if (!is_pair (SCHEME_V->args)) 4921 if (!is_pair (args))
4916 s_goto (OP_READ_INTERNAL); 4922 s_goto (OP_READ_INTERNAL);
4917 4923
4918 if (!is_inport (car (SCHEME_V->args))) 4924 if (!is_inport (car (args)))
4919 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4925 Error_1 ("read: not an input port:", car (args));
4920 4926
4921 if (car (SCHEME_V->args) == SCHEME_V->inport) 4927 if (car (args) == SCHEME_V->inport)
4922 s_goto (OP_READ_INTERNAL); 4928 s_goto (OP_READ_INTERNAL);
4923 4929
4924 x = SCHEME_V->inport; 4930 x = SCHEME_V->inport;
4925 SCHEME_V->inport = car (SCHEME_V->args); 4931 SCHEME_V->inport = car (args);
4926 x = cons (x, NIL); 4932 x = cons (x, NIL);
4927 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4928 s_goto (OP_READ_INTERNAL); 4934 s_goto (OP_READ_INTERNAL);
4929 4935
4930 case OP_READ_CHAR: /* read-char */ 4936 case OP_READ_CHAR: /* read-char */
4931 case OP_PEEK_CHAR: /* peek-char */ 4937 case OP_PEEK_CHAR: /* peek-char */
4932 { 4938 {
4933 int c; 4939 int c;
4934 4940
4935 if (is_pair (SCHEME_V->args)) 4941 if (is_pair (args))
4936 { 4942 {
4937 if (car (SCHEME_V->args) != SCHEME_V->inport) 4943 if (car (args) != SCHEME_V->inport)
4938 { 4944 {
4939 x = SCHEME_V->inport; 4945 x = SCHEME_V->inport;
4940 x = cons (x, NIL); 4946 x = cons (x, NIL);
4941 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4947 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
4942 SCHEME_V->inport = car (SCHEME_V->args); 4948 SCHEME_V->inport = car (args);
4943 } 4949 }
4944 } 4950 }
4945 4951
4946 c = inchar (SCHEME_A); 4952 c = inchar (SCHEME_A);
4947 4953
… …
4957 case OP_CHAR_READY: /* char-ready? */ 4963 case OP_CHAR_READY: /* char-ready? */
4958 { 4964 {
4959 pointer p = SCHEME_V->inport; 4965 pointer p = SCHEME_V->inport;
4960 int res; 4966 int res;
4961 4967
4962 if (is_pair (SCHEME_V->args)) 4968 if (is_pair (args))
4963 p = car (SCHEME_V->args); 4969 p = car (args);
4964 4970
4965 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4966 4972
4967 s_retbool (res); 4973 s_retbool (res);
4968 } 4974 }
4969 4975
4970 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
4971 SCHEME_V->inport = car (SCHEME_V->args); 4977 SCHEME_V->inport = car (args);
4972 s_return (SCHEME_V->value); 4978 s_return (SCHEME_V->value);
4973 4979
4974 case OP_SET_OUTPORT: /* set-output-port */ 4980 case OP_SET_OUTPORT: /* set-output-port */
4975 SCHEME_V->outport = car (SCHEME_V->args); 4981 SCHEME_V->outport = car (args);
4976 s_return (SCHEME_V->value); 4982 s_return (SCHEME_V->value);
4977#endif 4983#endif
4978 4984
4979 case OP_RDSEXPR: 4985 case OP_RDSEXPR:
4980 switch (SCHEME_V->tok) 4986 switch (SCHEME_V->tok)
… …
5029 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5035 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5030 SCHEME_V->tok = token (SCHEME_A); 5036 SCHEME_V->tok = token (SCHEME_A);
5031 s_goto (OP_RDSEXPR); 5037 s_goto (OP_RDSEXPR);
5032 5038
5033 case TOK_ATOM: 5039 case TOK_ATOM:
5034 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5040 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5041
5042 case TOK_DOTATOM:
5043 SCHEME_V->strbuff[0] = '.';
5044 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5045
5046 case TOK_STRATOM:
5047 x = readstrexp (SCHEME_A_ '|');
5048 //TODO: haven't checked whether the garbage collector could interfere
5049 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5035 5050
5036 case TOK_DQUOTE: 5051 case TOK_DQUOTE:
5037 x = readstrexp (SCHEME_A); 5052 x = readstrexp (SCHEME_A_ '"');
5038 5053
5039 if (x == S_F) 5054 if (x == S_F)
5040 Error_0 ("Error reading string"); 5055 Error_0 ("Error reading string");
5041 5056
5042 setimmutable (x); 5057 setimmutable (x);
… …
5054 s_goto (OP_EVAL); 5069 s_goto (OP_EVAL);
5055 } 5070 }
5056 } 5071 }
5057 5072
5058 case TOK_SHARP_CONST: 5073 case TOK_SHARP_CONST:
5059 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5074 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5060 Error_0 ("undefined sharp expression"); 5075 Error_0 ("undefined sharp expression");
5061 else 5076 else
5062 s_return (x); 5077 s_return (x);
5063 5078
5064 default: 5079 default:
… …
5066 } 5081 }
5067 5082
5068 break; 5083 break;
5069 5084
5070 case OP_RDLIST: 5085 case OP_RDLIST:
5071 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5086 SCHEME_V->args = cons (SCHEME_V->value, args);
5072 SCHEME_V->tok = token (SCHEME_A); 5087 SCHEME_V->tok = token (SCHEME_A);
5073 5088
5074 switch (SCHEME_V->tok) 5089 switch (SCHEME_V->tok)
5075 { 5090 {
5076 case TOK_EOF: 5091 case TOK_EOF:
… …
5104 case OP_RDDOT: 5119 case OP_RDDOT:
5105 if (token (SCHEME_A) != TOK_RPAREN) 5120 if (token (SCHEME_A) != TOK_RPAREN)
5106 Error_0 ("syntax error: illegal dot expression"); 5121 Error_0 ("syntax error: illegal dot expression");
5107 5122
5108 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5123 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5109 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5124 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5110 5125
5111 case OP_RDQUOTE: 5126 case OP_RDQUOTE:
5112 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5127 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5113 5128
5114 case OP_RDQQUOTE: 5129 case OP_RDQQUOTE:
… …
5136 SCHEME_V->args = SCHEME_V->value; 5151 SCHEME_V->args = SCHEME_V->value;
5137 s_goto (OP_VECTOR); 5152 s_goto (OP_VECTOR);
5138 5153
5139 /* ========== printing part ========== */ 5154 /* ========== printing part ========== */
5140 case OP_P0LIST: 5155 case OP_P0LIST:
5141 if (is_vector (SCHEME_V->args)) 5156 if (is_vector (args))
5142 { 5157 {
5143 putstr (SCHEME_A_ "#("); 5158 putstr (SCHEME_A_ "#(");
5144 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5159 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5145 s_goto (OP_PVECFROM); 5160 s_goto (OP_PVECFROM);
5146 } 5161 }
5147 else if (is_environment (SCHEME_V->args)) 5162 else if (is_environment (args))
5148 { 5163 {
5149 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5164 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5150 s_return (S_T); 5165 s_return (S_T);
5151 } 5166 }
5152 else if (!is_pair (SCHEME_V->args)) 5167 else if (!is_pair (args))
5153 { 5168 {
5154 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5155 s_return (S_T); 5170 s_return (S_T);
5156 } 5171 }
5157 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5172 else
5158 { 5173 {
5174 pointer a = car (args);
5175 pointer b = cdr (args);
5176 int ok_abbr = ok_abbrev (b);
5177 SCHEME_V->args = car (b);
5178
5179 if (a == SCHEME_V->QUOTE && ok_abbr)
5159 putstr (SCHEME_A_ "'"); 5180 putstr (SCHEME_A_ "'");
5160 SCHEME_V->args = cadr (SCHEME_V->args); 5181 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5182 putstr (SCHEME_A_ "`");
5183 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5184 putstr (SCHEME_A_ ",");
5185 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5186 putstr (SCHEME_A_ ",@");
5187 else
5188 {
5189 putstr (SCHEME_A_ "(");
5190 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5191 SCHEME_V->args = a;
5192 }
5193
5161 s_goto (OP_P0LIST); 5194 s_goto (OP_P0LIST);
5162 } 5195 }
5163 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5196
5197 case OP_P1LIST:
5198 if (is_pair (args))
5164 { 5199 {
5200 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5165 putstr (SCHEME_A_ "`"); 5201 putstr (SCHEME_A_ " ");
5166 SCHEME_V->args = cadr (SCHEME_V->args); 5202 SCHEME_V->args = car (args);
5167 s_goto (OP_P0LIST); 5203 s_goto (OP_P0LIST);
5168 } 5204 }
5169 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5170 {
5171 putstr (SCHEME_A_ ",");
5172 SCHEME_V->args = cadr (SCHEME_V->args);
5173 s_goto (OP_P0LIST);
5174 }
5175 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5176 {
5177 putstr (SCHEME_A_ ",@");
5178 SCHEME_V->args = cadr (SCHEME_V->args);
5179 s_goto (OP_P0LIST);
5180 }
5181 else
5182 {
5183 putstr (SCHEME_A_ "(");
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5185 SCHEME_V->args = car (SCHEME_V->args);
5186 s_goto (OP_P0LIST);
5187 }
5188
5189 case OP_P1LIST:
5190 if (is_pair (SCHEME_V->args))
5191 {
5192 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5193 putstr (SCHEME_A_ " ");
5194 SCHEME_V->args = car (SCHEME_V->args);
5195 s_goto (OP_P0LIST);
5196 }
5197 else if (is_vector (SCHEME_V->args)) 5205 else if (is_vector (args))
5198 { 5206 {
5199 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5207 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5200 putstr (SCHEME_A_ " . "); 5208 putstr (SCHEME_A_ " . ");
5201 s_goto (OP_P0LIST); 5209 s_goto (OP_P0LIST);
5202 } 5210 }
5203 else 5211 else
5204 { 5212 {
5205 if (SCHEME_V->args != NIL) 5213 if (args != NIL)
5206 { 5214 {
5207 putstr (SCHEME_A_ " . "); 5215 putstr (SCHEME_A_ " . ");
5208 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5216 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5209 } 5217 }
5210 5218
5211 putstr (SCHEME_A_ ")"); 5219 putstr (SCHEME_A_ ")");
5212 s_return (S_T); 5220 s_return (S_T);
5213 } 5221 }
5214 5222
5215 case OP_PVECFROM: 5223 case OP_PVECFROM:
5216 { 5224 {
5217 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5225 int i = ivalue_unchecked (cdr (args));
5218 pointer vec = car (SCHEME_V->args); 5226 pointer vec = car (args);
5219 int len = veclength (vec); 5227 int len = veclength (vec);
5220 5228
5221 if (i == len) 5229 if (i == len)
5222 { 5230 {
5223 putstr (SCHEME_A_ ")"); 5231 putstr (SCHEME_A_ ")");
5224 s_return (S_T); 5232 s_return (S_T);
5225 } 5233 }
5226 else 5234 else
5227 { 5235 {
5228 pointer elem = vector_elem (vec, i); 5236 pointer elem = vector_get (vec, i);
5229 5237
5230 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5238 ivalue_unchecked (cdr (args)) = i + 1;
5231 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5239 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5232 SCHEME_V->args = elem; 5240 SCHEME_V->args = elem;
5233 5241
5234 if (i > 0) 5242 if (i > 0)
5235 putstr (SCHEME_A_ " "); 5243 putstr (SCHEME_A_ " ");
5236 5244
5237 s_goto (OP_P0LIST); 5245 s_goto (OP_P0LIST);
5238 } 5246 }
5239 } 5247 }
5240 } 5248 }
5241 5249
5242 abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5243} 5251}
5244 5252
5245static pointer 5253/* list ops */
5254ecb_hot static int
5246opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5247{ 5256{
5257 pointer args = SCHEME_V->args;
5258 pointer a = car (args);
5248 pointer x, y; 5259 pointer x, y;
5249 5260
5250 switch (op) 5261 switch (op)
5251 { 5262 {
5252 case OP_LIST_LENGTH: /* length *//* a.k */ 5263 case OP_LIST_LENGTH: /* length *//* a.k */
5253 { 5264 {
5254 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5265 long v = list_length (SCHEME_A_ a);
5255 5266
5256 if (v < 0) 5267 if (v < 0)
5257 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5268 Error_1 ("length: not a list:", a);
5258 5269
5259 s_return (mk_integer (SCHEME_A_ v)); 5270 s_return (mk_integer (SCHEME_A_ v));
5260 } 5271 }
5261 5272
5262 case OP_ASSQ: /* assq *//* a.k */ 5273 case OP_ASSQ: /* assq *//* a.k */
5263 x = car (SCHEME_V->args); 5274 x = a;
5264 5275
5265 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5276 for (y = cadr (args); is_pair (y); y = cdr (y))
5266 { 5277 {
5267 if (!is_pair (car (y))) 5278 if (!is_pair (car (y)))
5268 Error_0 ("unable to handle non pair element"); 5279 Error_0 ("unable to handle non pair element");
5269 5280
5270 if (x == caar (y)) 5281 if (x == caar (y))
… …
5276 else 5287 else
5277 s_return (S_F); 5288 s_return (S_F);
5278 5289
5279 5290
5280 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5291 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5281 SCHEME_V->args = car (SCHEME_V->args); 5292 SCHEME_V->args = a;
5282 5293
5283 if (SCHEME_V->args == NIL) 5294 if (SCHEME_V->args == NIL)
5284 s_return (S_F); 5295 s_return (S_F);
5285 else if (is_closure (SCHEME_V->args)) 5296 else if (is_closure (SCHEME_V->args))
5286 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5297 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5291 5302
5292 case OP_CLOSUREP: /* closure? */ 5303 case OP_CLOSUREP: /* closure? */
5293 /* 5304 /*
5294 * Note, macro object is also a closure. 5305 * Note, macro object is also a closure.
5295 * Therefore, (closure? <#MACRO>) ==> #t 5306 * Therefore, (closure? <#MACRO>) ==> #t
5307 * (schmorp) well, obviously not, fix? TODO
5296 */ 5308 */
5297 s_retbool (is_closure (car (SCHEME_V->args))); 5309 s_retbool (is_closure (a));
5298 5310
5299 case OP_MACROP: /* macro? */ 5311 case OP_MACROP: /* macro? */
5300 s_retbool (is_macro (car (SCHEME_V->args))); 5312 s_retbool (is_macro (a));
5301 } 5313 }
5302 5314
5303 abort (); 5315 if (USE_ERROR_CHECKING) abort ();
5304} 5316}
5305 5317
5318/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5306typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5307 5320
5308typedef int (*test_predicate) (pointer); 5321typedef int (*test_predicate)(pointer);
5309static int 5322
5323ecb_hot static int
5310is_any (pointer p) 5324tst_any (pointer p)
5311{ 5325{
5312 return 1; 5326 return 1;
5313} 5327}
5314 5328
5315static int 5329ecb_hot static int
5316is_nonneg (pointer p) 5330tst_inonneg (pointer p)
5317{ 5331{
5318 return ivalue (p) >= 0 && is_integer (p); 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5333}
5334
5335ecb_hot static int
5336tst_is_list (SCHEME_P_ pointer p)
5337{
5338 return p == NIL || is_pair (p);
5319} 5339}
5320 5340
5321/* Correspond carefully with following defines! */ 5341/* Correspond carefully with following defines! */
5322static struct 5342static struct
5323{ 5343{
5324 test_predicate fct; 5344 test_predicate fct;
5325 const char *kind; 5345 const char *kind;
5326} tests[] = 5346} tests[] = {
5327{ 5347 { tst_any , 0 },
5328 { 0, 0}, /* unused */ 5348 { is_string , "string" },
5329 { is_any, 0}, 5349 { is_symbol , "symbol" },
5330 { is_string, "string" }, 5350 { is_port , "port" },
5331 { is_symbol, "symbol" },
5332 { is_port, "port" },
5333 { is_inport, "input port" }, 5351 { is_inport , "input port" },
5334 { is_outport, "output port" }, 5352 { is_outport , "output port" },
5335 { is_environment, "environment" }, 5353 { is_environment, "environment" },
5336 { is_pair, "pair" }, 5354 { is_pair , "pair" },
5337 { 0, "pair or '()" }, 5355 { 0 , "pair or '()" },
5338 { is_character, "character" }, 5356 { is_character , "character" },
5339 { is_vector, "vector" }, 5357 { is_vector , "vector" },
5340 { is_number, "number" }, 5358 { is_number , "number" },
5341 { is_integer, "integer" }, 5359 { is_integer , "integer" },
5342 { is_nonneg, "non-negative integer" } 5360 { tst_inonneg , "non-negative integer" }
5343}; 5361};
5344 5362
5345#define TST_NONE 0 5363#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5346#define TST_ANY "\001" 5364#define TST_ANY "\001"
5347#define TST_STRING "\002" 5365#define TST_STRING "\002"
5348#define TST_SYMBOL "\003" 5366#define TST_SYMBOL "\003"
5349#define TST_PORT "\004" 5367#define TST_PORT "\004"
5350#define TST_INPORT "\005" 5368#define TST_INPORT "\005"
5351#define TST_OUTPORT "\006" 5369#define TST_OUTPORT "\006"
5352#define TST_ENVIRONMENT "\007" 5370#define TST_ENVIRONMENT "\007"
5353#define TST_PAIR "\010" 5371#define TST_PAIR "\010"
5354#define TST_LIST "\011" 5372#define TST_LIST "\011"
5355#define TST_CHAR "\012" 5373#define TST_CHAR "\012"
5356#define TST_VECTOR "\013" 5374#define TST_VECTOR "\013"
5357#define TST_NUMBER "\014" 5375#define TST_NUMBER "\014"
5358#define TST_INTEGER "\015" 5376#define TST_INTEGER "\015"
5359#define TST_NATURAL "\016" 5377#define TST_NATURAL "\016"
5378
5379#define INF_ARG 0xff
5380#define UNNAMED_OP ""
5381
5382static const char opnames[] =
5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5384#include "opdefines.h"
5385#undef OP_DEF
5386;
5387
5388ecb_cold static const char *
5389opname (int idx)
5390{
5391 const char *name = opnames;
5392
5393 /* should do this at compile time, but would require external program, right? */
5394 while (idx--)
5395 name += strlen (name) + 1;
5396
5397 return *name ? name : "ILLEGAL";
5398}
5399
5400ecb_cold static const char *
5401procname (pointer x)
5402{
5403 return opname (procnum (x));
5404}
5360 5405
5361typedef struct 5406typedef struct
5362{ 5407{
5363 dispatch_func func; 5408 uint8_t func;
5364 char *name; 5409 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5410 uint8_t builtin;
5411#if USE_ERROR_CHECKING
5365 int min_arity; 5412 uint8_t min_arity;
5366 int max_arity; 5413 uint8_t max_arity;
5367 char *arg_tests_encoding; 5414 char arg_tests_encoding[3];
5415#endif
5368} op_code_info; 5416} op_code_info;
5369 5417
5370#define INF_ARG 0xffff
5371
5372static op_code_info dispatch_table[] = { 5418static const op_code_info dispatch_table[] = {
5373#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5419#if USE_ERROR_CHECKING
5420#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5421#else
5422#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5423#endif
5374#include "opdefines.h" 5424#include "opdefines.h"
5425#undef OP_DEF
5375 {0} 5426 {0}
5376}; 5427};
5377 5428
5378static const char *
5379procname (pointer x)
5380{
5381 int n = procnum (x);
5382 const char *name = dispatch_table[n].name;
5383
5384 if (name == 0)
5385 name = "ILLEGAL!";
5386
5387 return name;
5388}
5389
5390/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5391static void 5430ecb_hot static void
5392Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5393{ 5432{
5394 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5395 5434
5396 for (;;) 5435 for (;;)
5397 { 5436 {
5398 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5437 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5399 5438
5400#if USE_ERROR_CHECKING 5439#if USE_ERROR_CHECKING
5401 if (pcd->name) /* if built-in function, check arguments */ 5440 if (pcd->builtin) /* if built-in function, check arguments */
5402 { 5441 {
5403 int ok = 1;
5404 char msg[STRBUFFSIZE]; 5442 char msg[STRBUFFSIZE];
5405 int n = list_length (SCHEME_A_ SCHEME_V->args); 5443 int n = list_length (SCHEME_A_ SCHEME_V->args);
5406 5444
5407 /* Check number of arguments */ 5445 /* Check number of arguments */
5408 if (ecb_expect_false (n < pcd->min_arity)) 5446 if (ecb_expect_false (n < pcd->min_arity))
5409 { 5447 {
5410 ok = 0;
5411 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5448 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5412 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5449 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5450 xError_1 (SCHEME_A_ msg, 0);
5451 continue;
5413 } 5452 }
5414 else if (ecb_expect_false (n > pcd->max_arity)) 5453 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5415 { 5454 {
5416 ok = 0;
5417 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5455 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5418 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5456 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5457 xError_1 (SCHEME_A_ msg, 0);
5458 continue;
5419 } 5459 }
5420 5460 else
5421 if (ecb_expect_false (ok))
5422 { 5461 {
5423 if (pcd->arg_tests_encoding) 5462 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5424 { 5463 {
5425 int i = 0; 5464 int i = 0;
5426 int j; 5465 int j;
5427 const char *t = pcd->arg_tests_encoding; 5466 const char *t = pcd->arg_tests_encoding;
5428 pointer arglist = SCHEME_V->args; 5467 pointer arglist = SCHEME_V->args;
5429 5468
5430 do 5469 do
5431 { 5470 {
5432 pointer arg = car (arglist); 5471 pointer arg = car (arglist);
5433 5472
5434 j = (int) t[0]; 5473 j = t[0];
5435 5474
5475 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5436 if (j == TST_LIST[0]) 5476 if (j == TST_LIST[0])
5437 { 5477 {
5438 if (arg != NIL && !is_pair (arg)) 5478 if (!tst_is_list (SCHEME_A_ arg))
5439 break; 5479 break;
5440 } 5480 }
5441 else 5481 else
5442 { 5482 {
5443 if (!tests[j].fct (arg)) 5483 if (!tests[j - 1].fct (arg))
5444 break; 5484 break;
5445 } 5485 }
5446 5486
5447 if (t[1] != 0) /* last test is replicated as necessary */ 5487 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5448 t++; 5488 t++;
5449 5489
5450 arglist = cdr (arglist); 5490 arglist = cdr (arglist);
5451 i++; 5491 i++;
5452 } 5492 }
5453 while (i < n); 5493 while (i < n);
5454 5494
5455 if (i < n) 5495 if (i < n)
5456 { 5496 {
5457 ok = 0;
5458 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5497 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5498 xError_1 (SCHEME_A_ msg, 0);
5499 continue;
5459 } 5500 }
5460 } 5501 }
5461 } 5502 }
5462
5463 if (!ok)
5464 {
5465 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5466 return;
5467
5468 pcd = dispatch_table + SCHEME_V->op;
5469 }
5470 } 5503 }
5471#endif 5504#endif
5472 5505
5473 ok_to_freely_gc (SCHEME_A); 5506 ok_to_freely_gc (SCHEME_A);
5474 5507
5508 static const dispatch_func dispatch_funcs[] = {
5509 opexe_0,
5510 opexe_1,
5511 opexe_2,
5512 opexe_3,
5513 opexe_4,
5514 opexe_5,
5515 opexe_6,
5516 };
5517
5475 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5518 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5476 return; 5519 return;
5477 5520
5478 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5479 { 5522 {
5480 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5481 return; 5524 return;
5482 } 5525 }
5483 } 5526 }
5484} 5527}
5485 5528
5486/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5487 5530
5488static void 5531ecb_cold static void
5489assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5490{ 5533{
5491 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5492 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5493} 5536}
5494 5537
5495static void 5538ecb_cold static void
5496assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5497{ 5540{
5498 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5499 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5500 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5504mk_proc (SCHEME_P_ enum scheme_opcodes op) 5547mk_proc (SCHEME_P_ enum scheme_opcodes op)
5505{ 5548{
5506 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5549 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5507 set_typeflag (y, (T_PROC | T_ATOM)); 5550 set_typeflag (y, (T_PROC | T_ATOM));
5508 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5509 set_num_integer (y);
5510 return y; 5552 return y;
5511} 5553}
5512 5554
5513/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5555/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5514static int 5556ecb_hot static int
5515syntaxnum (pointer p) 5557syntaxnum (pointer p)
5516{ 5558{
5517 const char *s = strvalue (car (p)); 5559 const char *s = strvalue (p);
5518 5560
5519 switch (strlength (car (p))) 5561 switch (strlength (p))
5520 { 5562 {
5521 case 2: 5563 case 2:
5522 if (s[0] == 'i') 5564 if (s[0] == 'i')
5523 return OP_IF0; /* if */ 5565 return OP_IF0; /* if */
5524 else 5566 else
… …
5579 return OP_C0STREAM; /* cons-stream */ 5621 return OP_C0STREAM; /* cons-stream */
5580 } 5622 }
5581} 5623}
5582 5624
5583#if USE_MULTIPLICITY 5625#if USE_MULTIPLICITY
5584scheme * 5626ecb_cold scheme *
5585scheme_init_new () 5627scheme_init_new ()
5586{ 5628{
5587 scheme *sc = malloc (sizeof (scheme)); 5629 scheme *sc = malloc (sizeof (scheme));
5588 5630
5589 if (!scheme_init (SCHEME_A)) 5631 if (!scheme_init (SCHEME_A))
… …
5594 else 5636 else
5595 return sc; 5637 return sc;
5596} 5638}
5597#endif 5639#endif
5598 5640
5599int 5641ecb_cold int
5600scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5601{ 5643{
5602 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5603 pointer x; 5645 pointer x;
5646
5647 /* this memset is not strictly correct, as we assume (intcache)
5648 * that memset 0 will also set pointers to 0, but memset does
5649 * of course not guarantee that. screw such systems.
5650 */
5651 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5604 5652
5605 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5606 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5607 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5608 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5620 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5621 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5622 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5623 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5624 5672
5625 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5626 { 5674 {
5627#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5628 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5629 return 0; 5677 return 0;
5630#endif 5678#endif
… …
5677 5725
5678 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5726 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5679 assign_syntax (SCHEME_A_ syntax_names[i]); 5727 assign_syntax (SCHEME_A_ syntax_names[i]);
5680 } 5728 }
5681 5729
5730 // TODO: should iterate via strlen, to avoid n² complexity
5682 for (i = 0; i < n; i++) 5731 for (i = 0; i < n; i++)
5683 if (dispatch_table[i].name != 0) 5732 if (dispatch_table[i].builtin)
5684 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5733 assign_proc (SCHEME_A_ i, opname (i));
5685 5734
5686 /* initialization of global pointers to special symbols */ 5735 /* initialization of global pointers to special symbols */
5687 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5736 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5688 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5737 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5689 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5738 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5697 5746
5698 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5699} 5748}
5700 5749
5701#if USE_PORTS 5750#if USE_PORTS
5702void 5751ecb_cold void
5703scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5704{ 5753{
5705 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5706} 5755}
5707 5756
5708void 5757ecb_cold void
5709scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5758scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5710{ 5759{
5711 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5760 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5712} 5761}
5713 5762
5714void 5763ecb_cold void
5715scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5716{ 5765{
5717 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5718} 5767}
5719 5768
5720void 5769ecb_cold void
5721scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5770scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5722{ 5771{
5723 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5772 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5724} 5773}
5725#endif 5774#endif
5726 5775
5727void 5776ecb_cold void
5728scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5729{ 5778{
5730 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5731} 5780}
5732 5781
5733void 5782ecb_cold void
5734scheme_deinit (SCHEME_P) 5783scheme_deinit (SCHEME_P)
5735{ 5784{
5736 int i; 5785 int i;
5737 5786
5738#if SHOW_ERROR_LINE 5787#if SHOW_ERROR_LINE
… …
5780 } 5829 }
5781 } 5830 }
5782#endif 5831#endif
5783} 5832}
5784 5833
5785void 5834ecb_cold void
5786scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5787{ 5836{
5788 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5789} 5838}
5790 5839
5791void 5840ecb_cold void
5792scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5793{ 5842{
5794 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5795 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5796 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5823 5872
5824 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5825 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5826} 5875}
5827 5876
5828void 5877ecb_cold void
5829scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5830{ 5879{
5831 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5832 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5833 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5847 5896
5848 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5849 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5850} 5899}
5851 5900
5852void 5901ecb_cold void
5853scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5854{ 5903{
5855 pointer x; 5904 pointer x;
5856 5905
5857 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5862 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5863} 5912}
5864 5913
5865#if !STANDALONE 5914#if !STANDALONE
5866 5915
5867void 5916ecb_cold void
5868scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5869{ 5918{
5870 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5919 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5871} 5920}
5872 5921
5873void 5922ecb_cold void
5874scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5875{ 5924{
5876 int i; 5925 int i;
5877 5926
5878 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5879 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5880} 5929}
5881 5930
5882pointer 5931ecb_cold pointer
5883scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5884{ 5933{
5885 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 5934 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5886} 5935}
5887 5936
5888void 5937ecb_cold void
5889save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5890{ 5939{
5891 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5892 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5893 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5897 /* Truncate the dump stack so TS will return here when done, not 5946 /* Truncate the dump stack so TS will return here when done, not
5898 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5899 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5900} 5949}
5901 5950
5902void 5951ecb_cold void
5903restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5904{ 5953{
5905 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5906 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5907 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5908 /* Pop */ 5957 /* Pop */
5909 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5910} 5959}
5911 5960
5912/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5913pointer 5962ecb_cold pointer
5914scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5915{ 5964{
5916 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5917 5966
5918 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5925 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5926 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5927 return SCHEME_V->value; 5976 return SCHEME_V->value;
5928} 5977}
5929 5978
5930pointer 5979ecb_cold pointer
5931scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5932{ 5981{
5933 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5934 5983
5935 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
5947 5996
5948/* ========== Main ========== */ 5997/* ========== Main ========== */
5949 5998
5950#if STANDALONE 5999#if STANDALONE
5951 6000
5952int 6001ecb_cold int
5953main (int argc, char **argv) 6002main (int argc, char **argv)
5954{ 6003{
5955# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
5956 scheme ssc; 6005 scheme ssc;
5957 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
5959# endif 6008# endif
5960 int fin; 6009 int fin;
5961 char *file_name = InitFile; 6010 char *file_name = InitFile;
5962 int retcode; 6011 int retcode;
5963 int isfile = 1; 6012 int isfile = 1;
6013 system ("ps v $PPID");//D
5964 6014
5965 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5966 { 6016 {
5967 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5968 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5969 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
5970 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5971 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5972 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5973 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5974 return 1; 6024 return 1;
5975 } 6025 }
5976 6026
5977 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
5978 { 6028 {
5979 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
5980 return 2; 6030 return 2;
5981 } 6031 }
5982 6032
5983# if USE_PORTS 6033# if USE_PORTS
5984 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6029 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
6030#endif 6080#endif
6031 6081
6032 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
6033 { 6083 {
6034 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6084 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6035 } 6085 }
6036 else 6086 else
6037 { 6087 {
6038 if (isfile) 6088 if (isfile)
6039 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6043#if USE_PORTS 6093#if USE_PORTS
6044 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6045 { 6095 {
6046 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6047 { 6097 {
6048 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6098 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6049 } 6099 }
6050 6100
6051 if (isfile) 6101 if (isfile)
6052 close (fin); 6102 close (fin);
6053 } 6103 }

Diff Legend

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