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.24 by root, Fri Nov 27 02:12:08 2015 UTC vs.
Revision 1.64 by root, Wed Dec 2 17:01:18 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 PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _GNU_SOURCE 1
22#include "malloc.c" 22#define _POSIX_C_SOURCE 200201
23#define _XOPEN_SOURCE 600
24
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
26#ifndef WIN32 28#ifndef WIN32
27# include <unistd.h> 29# include <unistd.h>
28#endif 30#endif
29#if USE_MATH 31#if USE_MATH
30# include <math.h> 32# include <math.h>
31#endif 33#endif
32 34
35#define ECB_NO_THREADS 1
33#include "ecb.h" 36#include "ecb.h"
34 37
35#include <sys/types.h> 38#include <sys/types.h>
36#include <sys/stat.h> 39#include <sys/stat.h>
37#include <fcntl.h> 40#include <fcntl.h>
38 41
42#if !USE_ERROR_CHECKING
43# define NDEBUG
44#endif
45
46#include <assert.h>
47#include <stdlib.h>
39#include <string.h> 48#include <string.h>
40#include <stdlib.h>
41 49
42#include <limits.h> 50#include <limits.h>
43#include <inttypes.h> 51#include <inttypes.h>
44#include <float.h> 52#include <float.h>
45//#include <ctype.h> 53
54#if !USE_SYSTEM_MALLOC
55# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
56# include "malloc.c"
57# define malloc(n) tiny_malloc (n)
58# define realloc(p,n) tiny_realloc (p, n)
59# define free(p) tiny_free (p)
60#endif
61
62#if '1' != '0' + 1 \
63 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
64 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
65 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
66 || 'f' != 'a' + 5
67# error "execution character set digits not consecutive"
68#endif
46 69
47enum { 70enum {
48 TOK_EOF, 71 TOK_EOF,
49 TOK_LPAREN, 72 TOK_LPAREN,
50 TOK_RPAREN, 73 TOK_RPAREN,
51 TOK_DOT, 74 TOK_DOT,
52 TOK_ATOM, 75 TOK_ATOM,
76 TOK_DOTATOM, /* atom name starting with '.' */
77 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 78 TOK_QUOTE,
54 TOK_DQUOTE, 79 TOK_DQUOTE,
55 TOK_BQUOTE, 80 TOK_BQUOTE,
56 TOK_COMMA, 81 TOK_COMMA,
57 TOK_ATMARK, 82 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 84 TOK_SHARP_CONST,
60 TOK_VEC 85 TOK_VEC
61}; 86};
62 87
63#define BACKQUOTE '`' 88#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 89#define WHITESPACE " \t\r\n\v\f"
90#define DELIMITERS "()\";" WHITESPACE
65 91
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 92#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 93#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 94#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 95#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 96#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 97
72#if !USE_MULTIPLICITY 98#if !USE_MULTIPLICITY
73static scheme sc; 99static scheme sc;
74#endif 100#endif
75 101
76static void 102ecb_cold static void
77xbase (char *s, long n, int base) 103xbase (char *s, long n, int base)
78{ 104{
79 if (n < 0) 105 if (n < 0)
80 { 106 {
81 *s++ = '-'; 107 *s++ = '-';
… …
83 } 109 }
84 110
85 char *p = s; 111 char *p = s;
86 112
87 do { 113 do {
88 *p++ = '0' + n % base; 114 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 115 n /= base;
90 } while (n); 116 } while (n);
91 117
92 *p-- = 0; 118 *p-- = 0;
93 119
… …
96 char x = *s; *s = *p; *p = x; 122 char x = *s; *s = *p; *p = x;
97 --p; ++s; 123 --p; ++s;
98 } 124 }
99} 125}
100 126
101static void 127ecb_cold static void
102xnum (char *s, long n) 128xnum (char *s, long n)
103{ 129{
104 xbase (s, n, 10); 130 xbase (s, n, 10);
105} 131}
106 132
107static void 133ecb_cold static void
108xwrstr (const char *s) 134putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 135{
116 char buf[64]; 136 char buf[64];
117 137
118 xnum (buf, n); 138 xnum (buf, n);
119 xwrstr (buf); 139 putstr (SCHEME_A_ buf);
120} 140}
141
142#if USE_CHAR_CLASSIFIERS
143#include <ctype.h>
144#else
121 145
122static char 146static char
123xtoupper (char c) 147xtoupper (char c)
124{ 148{
125 if (c >= 'a' && c <= 'z') 149 if (c >= 'a' && c <= 'z')
… …
145 169
146#define toupper(c) xtoupper (c) 170#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 171#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 172#define isdigit(c) xisdigit (c)
149 173
174#endif
175
150#if USE_IGNORECASE 176#if USE_IGNORECASE
151static const char * 177ecb_cold static const char *
152xstrlwr (char *s) 178xstrlwr (char *s)
153{ 179{
154 const char *p = s; 180 const char *p = s;
155 181
156 while (*s) 182 while (*s)
… …
169# define stricmp(a,b) strcmp (a, b) 195# define stricmp(a,b) strcmp (a, b)
170# define strlwr(s) (s) 196# define strlwr(s) (s)
171#endif 197#endif
172 198
173#ifndef prompt 199#ifndef prompt
174# define prompt "ts> " 200# define prompt "ms> "
175#endif 201#endif
176 202
177#ifndef InitFile 203#ifndef InitFile
178# define InitFile "init.scm" 204# define InitFile "init.scm"
179#endif 205#endif
180 206
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 207enum scheme_types
186{ 208{
209 T_INTEGER,
210 T_CHARACTER,
187 T_FREE, 211 T_REAL,
188 T_STRING, 212 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 213 T_SYMBOL,
191 T_PROC, 214 T_PROC,
192 T_PAIR, 215 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 216 T_CLOSURE,
217 T_BYTECODE, // temp
218 T_MACRO,
194 T_CONTINUATION, 219 T_CONTINUATION,
195 T_FOREIGN, 220 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 221 T_PORT,
198 T_VECTOR, 222 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 223 T_PROMISE,
201 T_ENVIRONMENT, 224 T_ENVIRONMENT,
202 /* one more... */ 225
203 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
204}; 227};
205 228
206#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x000f
207#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 233#define T_MARK 0x0080 /* only for gc */
211 234
235/* num, for generic arithmetic */
236struct num
237{
238 IVALUE ivalue;
239#if USE_REAL
240 RVALUE rvalue;
241 char is_fixnum;
242#endif
243};
244
245#if USE_REAL
246# define num_is_fixnum(n) (n).is_fixnum
247# define num_set_fixnum(n,f) (n).is_fixnum = (f)
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).rvalue
250# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).rvalue = (r)
252#else
253# define num_is_fixnum(n) 1
254# define num_set_fixnum(n,f) 0
255# define num_ivalue(n) (n).ivalue
256# define num_rvalue(n) (n).ivalue
257# define num_set_ivalue(n,i) (n).ivalue = (i)
258# define num_set_rvalue(n,r) (n).ivalue = (r)
259#endif
260
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 261enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 262
214static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 265static num num_rem (num a, num b);
217static num num_mod (num a, num b); 266static num num_mod (num a, num b);
218 267
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
223
224ecb_inline int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 269
230static num num_zero; 270static num num_zero;
231static num num_one; 271static num num_one;
232 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
233/* macros for cell operations */ 277/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
237 281
238INTERFACE int 282INTERFACE int
239is_string (pointer p) 283is_string (pointer p)
240{ 284{
241 return type (p) == T_STRING; 285 return type (p) == T_STRING;
242} 286}
243 287
244#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
246
247INTERFACE int is_list (SCHEME_P_ pointer p);
248 290
249INTERFACE int 291INTERFACE int
250is_vector (pointer p) 292is_vector (pointer p)
251{ 293{
252 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
253} 295}
254 296
255#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 302
262INTERFACE uint32_t 303INTERFACE int
263vector_length (pointer vec) 304is_integer (pointer p)
264{ 305{
265 return vec->object.vector.length; 306 return type (p) == T_INTEGER;
307}
308
309/* not the same as in scheme, where integers are (correctly :) reals */
310INTERFACE int
311is_real (pointer p)
312{
313 return type (p) == T_REAL;
266} 314}
267 315
268INTERFACE int 316INTERFACE int
269is_number (pointer p) 317is_number (pointer p)
270{ 318{
271 return type (p) == T_NUMBER; 319 return is_integer (p) || is_real (p);
272}
273
274INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290} 320}
291 321
292INTERFACE int 322INTERFACE int
293is_character (pointer p) 323is_character (pointer p)
294{ 324{
… …
299string_value (pointer p) 329string_value (pointer p)
300{ 330{
301 return strvalue (p); 331 return strvalue (p);
302} 332}
303 333
304ecb_inline num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 334#define ivalue_unchecked(p) CELL(p)->object.ivalue
335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
336
335#if USE_REAL 337#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 340#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
341# define set_num_integer(p) 0 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 343#endif
344 344
345INTERFACE long 345INTERFACE long
346charvalue (pointer p) 346charvalue (pointer p)
347{ 347{
348 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
349} 349}
350 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
351INTERFACE int 353INTERFACE int
352is_port (pointer p) 354is_port (pointer p)
353{ 355{
354 return type (p) == T_PORT; 356 return type (p) == T_PORT;
355} 357}
356 358
357INTERFACE int 359INTERFACE int
358is_inport (pointer p) 360is_inport (pointer p)
359{ 361{
360 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
361} 363}
362 364
363INTERFACE int 365INTERFACE int
364is_outport (pointer p) 366is_outport (pointer p)
365{ 367{
366 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
367} 369}
368 370
369INTERFACE int 371INTERFACE int
370is_pair (pointer p) 372is_pair (pointer p)
371{ 373{
372 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
373} 375}
374 376
375#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
376#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
377 379
378static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
379static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
380static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
381static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
382 384
383static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
384static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
385static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
386 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
387INTERFACE void 391INTERFACE void
388set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
389{ 393{
390 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
391} 395}
392 396
393INTERFACE void 397INTERFACE void
394set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
395{ 399{
396 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
397} 401}
398 402
399INTERFACE pointer 403INTERFACE pointer
400pair_car (pointer p) 404pair_car (pointer p)
401{ 405{
… …
415} 419}
416 420
417INTERFACE char * 421INTERFACE char *
418symname (pointer p) 422symname (pointer p)
419{ 423{
420 return strvalue (car (p)); 424 return strvalue (p);
421} 425}
422 426
423#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
424SCHEME_EXPORT int 430SCHEME_EXPORT int
425hasprop (pointer p) 431hasprop (pointer p)
426{ 432{
427 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
428} 434}
429
430# define symprop(p) cdr(p)
431#endif 435#endif
432 436
433INTERFACE int 437INTERFACE int
434is_syntax (pointer p) 438is_syntax (pointer p)
435{ 439{
… …
449} 453}
450 454
451INTERFACE char * 455INTERFACE char *
452syntaxname (pointer p) 456syntaxname (pointer p)
453{ 457{
454 return strvalue (car (p)); 458 return strvalue (p);
455} 459}
456 460
457#define procnum(p) ivalue (p) 461#define procnum(p) ivalue_unchecked (p)
458static const char *procname (pointer x); 462static const char *procname (pointer x);
459 463
460INTERFACE int 464INTERFACE int
461is_closure (pointer p) 465is_closure (pointer p)
462{ 466{
… …
525#if USE_ERROR_CHECKING 529#if USE_ERROR_CHECKING
526 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 530 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527#endif 531#endif
528} 532}
529 533
534/* Result is:
535 proper list: length
536 circular list: -1
537 not even a pair: -2
538 dotted list: -2 minus length before dot
539*/
540ecb_hot INTERFACE int
541list_length (SCHEME_P_ pointer a)
542{
543 int i = 0;
544 pointer slow, fast;
545
546 slow = fast = a;
547
548 while (1)
549 {
550 if (fast == NIL)
551 return i;
552
553 if (!is_pair (fast))
554 return -2 - i;
555
556 fast = cdr (fast);
557 ++i;
558
559 if (fast == NIL)
560 return i;
561
562 if (!is_pair (fast))
563 return -2 - i;
564
565 ++i;
566 fast = cdr (fast);
567
568 /* Safe because we would have already returned if `fast'
569 encountered a non-pair. */
570 slow = cdr (slow);
571
572 if (fast == slow)
573 {
574 /* the fast pointer has looped back around and caught up
575 with the slow pointer, hence the structure is circular,
576 not of finite length, and therefore not a list */
577 return -1;
578 }
579 }
580}
581
582INTERFACE int
583is_list (SCHEME_P_ pointer a)
584{
585 return list_length (SCHEME_A_ a) >= 0;
586}
587
530#if USE_CHAR_CLASSIFIERS 588#if USE_CHAR_CLASSIFIERS
589
531ecb_inline int 590ecb_inline int
532Cisalpha (int c) 591Cisalpha (int c)
533{ 592{
534 return isascii (c) && isalpha (c); 593 return isascii (c) && isalpha (c);
535} 594}
… …
593 "gs", 652 "gs",
594 "rs", 653 "rs",
595 "us" 654 "us"
596}; 655};
597 656
598static int 657ecb_cold static int
599is_ascii_name (const char *name, int *pc) 658is_ascii_name (const char *name, int *pc)
600{ 659{
601 int i; 660 int i;
602 661
603 for (i = 0; i < 32; i++) 662 for (i = 0; i < 32; i++)
… …
621#endif 680#endif
622 681
623static int file_push (SCHEME_P_ const char *fname); 682static int file_push (SCHEME_P_ const char *fname);
624static void file_pop (SCHEME_P); 683static void file_pop (SCHEME_P);
625static int file_interactive (SCHEME_P); 684static int file_interactive (SCHEME_P);
626ecb_inline int is_one_of (char *s, int c); 685ecb_inline int is_one_of (const char *s, int c);
627static int alloc_cellseg (SCHEME_P_ int n); 686static int alloc_cellseg (SCHEME_P);
628ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 687ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629static void finalize_cell (SCHEME_P_ pointer a); 688static void finalize_cell (SCHEME_P_ pointer a);
630static int count_consecutive_cells (pointer x, int needed);
631static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 689static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
632static pointer mk_number (SCHEME_P_ const num n); 690static pointer mk_number (SCHEME_P_ const num n);
633static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 691static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
634static pointer mk_vector (SCHEME_P_ uint32_t len); 692static pointer mk_vector (SCHEME_P_ uint32_t len);
635static pointer mk_atom (SCHEME_P_ char *q); 693static pointer mk_atom (SCHEME_P_ char *q);
636static pointer mk_sharp_const (SCHEME_P_ char *name); 694static pointer mk_sharp_const (SCHEME_P_ char *name);
637 695
696static pointer mk_port (SCHEME_P_ port *p);
697
638#if USE_PORTS 698#if USE_PORTS
639static pointer mk_port (SCHEME_P_ port *p);
640static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 699static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
641static pointer port_from_file (SCHEME_P_ int, int prop); 700static pointer port_from_file (SCHEME_P_ int, int prop);
642static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 701static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
643static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 702static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
644static port *port_rep_from_file (SCHEME_P_ int, int prop); 703static port *port_rep_from_file (SCHEME_P_ int, int prop);
645static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 704static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
646static void port_close (SCHEME_P_ pointer p, int flag); 705static void port_close (SCHEME_P_ pointer p, int flag);
647#endif 706#endif
707
648static void mark (pointer a); 708static void mark (pointer a);
649static void gc (SCHEME_P_ pointer a, pointer b); 709static void gc (SCHEME_P_ pointer a, pointer b);
650static int basic_inchar (port *pt); 710static int basic_inchar (port *pt);
651static int inchar (SCHEME_P); 711static int inchar (SCHEME_P);
652static void backchar (SCHEME_P_ int c); 712static void backchar (SCHEME_P_ int c);
653static char *readstr_upto (SCHEME_P_ char *delim); 713static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654static pointer readstrexp (SCHEME_P); 714static pointer readstrexp (SCHEME_P_ char delim);
655ecb_inline int skipspace (SCHEME_P); 715static int skipspace (SCHEME_P);
656static int token (SCHEME_P); 716static int token (SCHEME_P);
657static void printslashstring (SCHEME_P_ char *s, int len); 717static void printslashstring (SCHEME_P_ char *s, int len);
658static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 718static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
659static void printatom (SCHEME_P_ pointer l, int f); 719static void printatom (SCHEME_P_ pointer l, int f);
660static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 720static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
676static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 736static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677static void assign_syntax (SCHEME_P_ const char *name); 737static void assign_syntax (SCHEME_P_ const char *name);
678static int syntaxnum (pointer p); 738static int syntaxnum (pointer p);
679static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 739static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680 740
741static IVALUE
742ivalue (pointer x)
743{
744 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
745}
746
747static RVALUE
748rvalue (pointer x)
749{
750 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
751}
752
753INTERFACE num
754nvalue (pointer x)
755{
756 num n;
757
758 num_set_fixnum (n, is_integer (x));
759
760 if (num_is_fixnum (n))
761 num_set_ivalue (n, ivalue_unchecked (x));
762 else
763 num_set_rvalue (n, rvalue_unchecked (x));
764
765 return n;
766}
767
681static num 768static num
682num_op (enum num_op op, num a, num b) 769num_op (enum num_op op, num a, num b)
683{ 770{
684 num ret; 771 num ret;
685 772
686 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 773 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687 774
688 if (num_is_fixnum (ret)) 775 if (num_is_fixnum (ret))
689 { 776 {
690 IVALUE av = num_get_ivalue (a);
691 IVALUE bv = num_get_ivalue (b);
692
693 switch (op) 777 switch (op)
694 { 778 {
695 case NUM_ADD: av += bv; break; 779 case NUM_ADD: a.ivalue += b.ivalue; break;
696 case NUM_SUB: av -= bv; break; 780 case NUM_SUB: a.ivalue -= b.ivalue; break;
697 case NUM_MUL: av *= bv; break; 781 case NUM_MUL: a.ivalue *= b.ivalue; break;
698 case NUM_INTDIV: av /= bv; break; 782 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699 } 783 }
700 784
701 num_set_ivalue (ret, av); 785 num_set_ivalue (ret, a.ivalue);
702 } 786 }
787#if USE_REAL
703 else 788 else
704 { 789 {
705 RVALUE av = num_get_rvalue (a);
706 RVALUE bv = num_get_rvalue (b);
707
708 switch (op) 790 switch (op)
709 { 791 {
710 case NUM_ADD: av += bv; break; 792 case NUM_ADD: a.rvalue += b.rvalue; break;
711 case NUM_SUB: av -= bv; break; 793 case NUM_SUB: a.rvalue -= b.rvalue; break;
712 case NUM_MUL: av *= bv; break; 794 case NUM_MUL: a.rvalue *= b.rvalue; break;
713 case NUM_INTDIV: av /= bv; break; 795 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714 } 796 }
715 797
716 num_set_rvalue (ret, av); 798 num_set_rvalue (ret, a.rvalue);
717 } 799 }
800#endif
718 801
719 return ret; 802 return ret;
720} 803}
721 804
722static num 805static num
723num_div (num a, num b) 806num_div (num a, num b)
724{ 807{
725 num ret; 808 num ret;
726 809
727 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 810 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728 811
729 if (num_is_fixnum (ret)) 812 if (num_is_fixnum (ret))
730 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 813 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731 else 814 else
732 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 815 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733 816
734 return ret; 817 return ret;
735} 818}
736 819
737static num 820static num
… …
739{ 822{
740 num ret; 823 num ret;
741 long e1, e2, res; 824 long e1, e2, res;
742 825
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 826 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744 e1 = num_get_ivalue (a); 827 e1 = num_ivalue (a);
745 e2 = num_get_ivalue (b); 828 e2 = num_ivalue (b);
746 res = e1 % e2; 829 res = e1 % e2;
747 830
748 /* remainder should have same sign as second operand */ 831 /* remainder should have same sign as second operand */
749 if (res > 0) 832 if (res > 0)
750 { 833 {
… …
766{ 849{
767 num ret; 850 num ret;
768 long e1, e2, res; 851 long e1, e2, res;
769 852
770 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 853 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771 e1 = num_get_ivalue (a); 854 e1 = num_ivalue (a);
772 e2 = num_get_ivalue (b); 855 e2 = num_ivalue (b);
773 res = e1 % e2; 856 res = e1 % e2;
774 857
775 /* modulo should have same sign as second operand */ 858 /* modulo should have same sign as second operand */
776 if (res * e2 < 0) 859 if (res * e2 < 0)
777 res += e2; 860 res += e2;
… …
787 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 870 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788 int ret; 871 int ret;
789 872
790 if (is_fixnum) 873 if (is_fixnum)
791 { 874 {
792 IVALUE av = num_get_ivalue (a); 875 IVALUE av = num_ivalue (a);
793 IVALUE bv = num_get_ivalue (b); 876 IVALUE bv = num_ivalue (b);
794 877
795 ret = av == bv ? 0 : av < bv ? -1 : +1; 878 ret = av == bv ? 0 : av < bv ? -1 : +1;
796 } 879 }
797 else 880 else
798 { 881 {
799 RVALUE av = num_get_rvalue (a); 882 RVALUE av = num_rvalue (a);
800 RVALUE bv = num_get_rvalue (b); 883 RVALUE bv = num_rvalue (b);
801 884
802 ret = av == bv ? 0 : av < bv ? -1 : +1; 885 ret = av == bv ? 0 : av < bv ? -1 : +1;
803 } 886 }
804 887
805 return ret; 888 return ret;
806} 889}
807
808#if USE_MATH
809
810/* Round to nearest. Round to even if midway */
811static double
812round_per_R5RS (double x)
813{
814 double fl = floor (x);
815 double ce = ceil (x);
816 double dfl = x - fl;
817 double dce = ce - x;
818
819 if (dfl > dce)
820 return ce;
821 else if (dfl < dce)
822 return fl;
823 else
824 {
825 if (fmod (fl, 2) == 0) /* I imagine this holds */
826 return fl;
827 else
828 return ce;
829 }
830}
831#endif
832 890
833static int 891static int
834is_zero_rvalue (RVALUE x) 892is_zero_rvalue (RVALUE x)
835{ 893{
836 return x == 0; 894 return x == 0;
… …
842#endif 900#endif
843#endif 901#endif
844} 902}
845 903
846/* allocate new cell segment */ 904/* allocate new cell segment */
847static int 905ecb_cold static int
848alloc_cellseg (SCHEME_P_ int n) 906alloc_cellseg (SCHEME_P)
849{ 907{
850 pointer newp; 908 struct cell *newp;
851 pointer last; 909 struct cell *last;
852 pointer p; 910 struct cell *p;
853 char *cp; 911 char *cp;
854 long i; 912 long i;
855 int k; 913 int k;
856 914
857 static int segsize = CELL_SEGSIZE >> 1; 915 static int segsize = CELL_SEGSIZE >> 1;
858 segsize <<= 1; 916 segsize <<= 1;
859 917
860 for (k = 0; k < n; k++)
861 {
862 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
863 return k;
864
865 cp = malloc (segsize * sizeof (struct cell)); 918 cp = malloc (segsize * sizeof (struct cell));
866 919
867 if (!cp && USE_ERROR_CHECKING) 920 if (!cp && USE_ERROR_CHECKING)
868 return k; 921 return k;
869 922
870 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
871 SCHEME_V->alloc_seg[i] = cp;
872 924
873 /* insert new segment in address order */ 925 newp = (struct cell *)cp;
874 newp = (pointer)cp;
875 SCHEME_V->cell_seg[i] = newp; 926 SCHEME_V->cell_seg[i] = newp;
876 SCHEME_V->cell_segsize[i] = segsize; 927 SCHEME_V->cell_segsize[i] = segsize;
877
878 //TODO: insert, not swap
879 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880 {
881 p = SCHEME_V->cell_seg[i];
882 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883 SCHEME_V->cell_seg[i - 1] = p;
884
885 k = SCHEME_V->cell_segsize[i];
886 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887 SCHEME_V->cell_segsize[i - 1] = k;
888
889 --i;
890 }
891
892 SCHEME_V->fcells += segsize; 928 SCHEME_V->fcells += segsize;
893 last = newp + segsize - 1; 929 last = newp + segsize - 1;
894 930
895 for (p = newp; p <= last; p++) 931 for (p = newp; p <= last; p++)
896 { 932 {
933 pointer cp = POINTER (p);
897 set_typeflag (p, T_FREE); 934 set_typeflag (cp, T_PAIR);
898 set_car (p, NIL); 935 set_car (cp, NIL);
899 set_cdr (p, p + 1); 936 set_cdr (cp, POINTER (p + 1));
900 } 937 }
901 938
902 /* insert new cells in address order on free list */
903 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
904 {
905 set_cdr (last, SCHEME_V->free_cell); 939 set_cdr (POINTER (last), SCHEME_V->free_cell);
906 SCHEME_V->free_cell = newp; 940 SCHEME_V->free_cell = POINTER (newp);
907 }
908 else
909 {
910 p = SCHEME_V->free_cell;
911 941
912 while (cdr (p) != NIL && newp > cdr (p))
913 p = cdr (p);
914
915 set_cdr (last, cdr (p));
916 set_cdr (p, newp);
917 }
918 }
919
920 return n; 942 return 1;
921} 943}
922 944
923/* get new cell. parameter a, b is marked by gc. */ 945/* get new cell. parameter a, b is marked by gc. */
924ecb_inline pointer 946ecb_inline pointer
925get_cell_x (SCHEME_P_ pointer a, pointer b) 947get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 951 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
930 return S_SINK; 952 return S_SINK;
931 953
932 if (SCHEME_V->free_cell == NIL) 954 if (SCHEME_V->free_cell == NIL)
933 { 955 {
934 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 956 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
935 957
936 gc (SCHEME_A_ a, b); 958 gc (SCHEME_A_ a, b);
937 959
938 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 960 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
939 { 961 {
940 /* if only a few recovered, get more to avoid fruitless gc's */ 962 /* if only a few recovered, get more to avoid fruitless gc's */
941 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 963 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
942 { 964 {
943#if USE_ERROR_CHECKING 965#if USE_ERROR_CHECKING
944 SCHEME_V->no_memory = 1; 966 SCHEME_V->no_memory = 1;
945 return S_SINK; 967 return S_SINK;
946#endif 968#endif
… …
958 } 980 }
959} 981}
960 982
961/* To retain recent allocs before interpreter knows about them - 983/* To retain recent allocs before interpreter knows about them -
962 Tehom */ 984 Tehom */
963 985ecb_hot static void
964static void
965push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 986push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
966{ 987{
967 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 988 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
968 989
969 set_typeflag (holder, T_PAIR); 990 set_typeflag (holder, T_PAIR);
… …
971 set_car (holder, recent); 992 set_car (holder, recent);
972 set_cdr (holder, car (S_SINK)); 993 set_cdr (holder, car (S_SINK));
973 set_car (S_SINK, holder); 994 set_car (S_SINK, holder);
974} 995}
975 996
976static pointer 997ecb_hot static pointer
977get_cell (SCHEME_P_ pointer a, pointer b) 998get_cell (SCHEME_P_ pointer a, pointer b)
978{ 999{
979 pointer cell = get_cell_x (SCHEME_A_ a, b); 1000 pointer cell = get_cell_x (SCHEME_A_ a, b);
980 1001
981 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1002 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
990} 1011}
991 1012
992static pointer 1013static pointer
993get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1014get_vector_object (SCHEME_P_ uint32_t len, pointer init)
994{ 1015{
995 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1016 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
996 pointer *e = malloc (len * sizeof (pointer)); 1017 pointer *e = malloc (len * sizeof (pointer));
997 1018
998 if (!e && USE_ERROR_CHECKING) 1019 if (!e && USE_ERROR_CHECKING)
999 return S_SINK; 1020 return S_SINK;
1000 1021
1001 /* Record it as a vector so that gc understands it. */ 1022 /* Record it as a vector so that gc understands it. */
1002 set_typeflag (v, T_VECTOR | T_ATOM); 1023 set_typeflag (v, T_VECTOR | T_ATOM);
1003 1024
1004 v->object.vector.vvalue = e; 1025 CELL(v)->object.vector.vvalue = e;
1005 v->object.vector.length = len; 1026 CELL(v)->object.vector.length = len;
1006 fill_vector (v, init); 1027 fill_vector (v, 0, init);
1007 push_recent_alloc (SCHEME_A_ v, NIL); 1028 push_recent_alloc (SCHEME_A_ v, NIL);
1008 1029
1009 return v; 1030 return v;
1010} 1031}
1011 1032
… …
1019static void 1040static void
1020check_cell_alloced (pointer p, int expect_alloced) 1041check_cell_alloced (pointer p, int expect_alloced)
1021{ 1042{
1022 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1043 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1023 if (typeflag (p) & !expect_alloced) 1044 if (typeflag (p) & !expect_alloced)
1024 xwrstr ("Cell is already allocated!\n"); 1045 putstr (SCHEME_A_ "Cell is already allocated!\n");
1025 1046
1026 if (!(typeflag (p)) & expect_alloced) 1047 if (!(typeflag (p)) & expect_alloced)
1027 xwrstr ("Cell is not allocated!\n"); 1048 putstr (SCHEME_A_ "Cell is not allocated!\n");
1028} 1049}
1029 1050
1030static void 1051static void
1031check_range_alloced (pointer p, int n, int expect_alloced) 1052check_range_alloced (pointer p, int n, int expect_alloced)
1032{ 1053{
… …
1038#endif 1059#endif
1039 1060
1040/* Medium level cell allocation */ 1061/* Medium level cell allocation */
1041 1062
1042/* get new cons cell */ 1063/* get new cons cell */
1043pointer 1064ecb_hot static pointer
1044xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1065xcons (SCHEME_P_ pointer a, pointer b)
1045{ 1066{
1046 pointer x = get_cell (SCHEME_A_ a, b); 1067 pointer x = get_cell (SCHEME_A_ a, b);
1047 1068
1048 set_typeflag (x, T_PAIR); 1069 set_typeflag (x, T_PAIR);
1049
1050 if (immutable)
1051 setimmutable (x);
1052 1070
1053 set_car (x, a); 1071 set_car (x, a);
1054 set_cdr (x, b); 1072 set_cdr (x, b);
1055 1073
1056 return x; 1074 return x;
1057} 1075}
1058 1076
1077ecb_hot static pointer
1078ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1079{
1080 pointer x = xcons (SCHEME_A_ a, b);
1081 setimmutable (x);
1082 return x;
1083}
1084
1085#define cons(a,b) xcons (SCHEME_A_ a, b)
1086#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1087
1088ecb_cold static pointer
1089generate_symbol (SCHEME_P_ const char *name)
1090{
1091 pointer x = mk_string (SCHEME_A_ name);
1092 setimmutable (x);
1093 set_typeflag (x, T_SYMBOL | T_ATOM);
1094 return x;
1095}
1096
1059/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1060 1098
1061#ifndef USE_OBJECT_LIST 1099#ifndef USE_OBJECT_LIST
1062 1100
1101static int
1063static int hash_fn (const char *key, int table_size); 1102hash_fn (const char *key, int table_size)
1103{
1104 const unsigned char *p = (unsigned char *)key;
1105 uint32_t hash = 2166136261U;
1064 1106
1107 while (*p)
1108 hash = (hash ^ *p++) * 16777619;
1109
1110 return hash % table_size;
1111}
1112
1065static pointer 1113ecb_cold static pointer
1066oblist_initial_value (SCHEME_P) 1114oblist_initial_value (SCHEME_P)
1067{ 1115{
1068 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1116 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1069} 1117}
1070 1118
1071/* returns the new symbol */ 1119/* returns the new symbol */
1072static pointer 1120ecb_cold static pointer
1073oblist_add_by_name (SCHEME_P_ const char *name) 1121oblist_add_by_name (SCHEME_P_ const char *name)
1074{ 1122{
1075 int location; 1123 pointer x = generate_symbol (SCHEME_A_ name);
1076
1077 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078 set_typeflag (x, T_SYMBOL);
1079 setimmutable (car (x));
1080
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1124 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1125 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083 return x; 1126 return x;
1084} 1127}
1085 1128
1086ecb_inline pointer 1129ecb_cold static pointer
1087oblist_find_by_name (SCHEME_P_ const char *name) 1130oblist_find_by_name (SCHEME_P_ const char *name)
1088{ 1131{
1089 int location; 1132 int location;
1090 pointer x; 1133 pointer x;
1091 char *s; 1134 char *s;
1092 1135
1093 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1136 location = hash_fn (name, veclength (SCHEME_V->oblist));
1094 1137
1095 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096 { 1139 {
1097 s = symname (car (x)); 1140 s = symname (car (x));
1098 1141
1099 /* case-insensitive, per R5RS section 2 */ 1142 /* case-insensitive, per R5RS section 2 */
1100 if (stricmp (name, s) == 0) 1143 if (stricmp (name, s) == 0)
… …
1102 } 1145 }
1103 1146
1104 return NIL; 1147 return NIL;
1105} 1148}
1106 1149
1107static pointer 1150ecb_cold static pointer
1108oblist_all_symbols (SCHEME_P) 1151oblist_all_symbols (SCHEME_P)
1109{ 1152{
1110 int i; 1153 int i;
1111 pointer x; 1154 pointer x;
1112 pointer ob_list = NIL; 1155 pointer ob_list = NIL;
1113 1156
1114 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1158 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116 ob_list = cons (x, ob_list); 1159 ob_list = cons (x, ob_list);
1117 1160
1118 return ob_list; 1161 return ob_list;
1119} 1162}
1120 1163
1121#else 1164#else
1122 1165
1123static pointer 1166ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1167oblist_initial_value (SCHEME_P)
1125{ 1168{
1126 return NIL; 1169 return NIL;
1127} 1170}
1128 1171
1129ecb_inline pointer 1172ecb_cold static pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1173oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1174{
1132 pointer x; 1175 pointer x;
1133 char *s; 1176 char *s;
1134 1177
… …
1143 1186
1144 return NIL; 1187 return NIL;
1145} 1188}
1146 1189
1147/* returns the new symbol */ 1190/* returns the new symbol */
1148static pointer 1191ecb_cold static pointer
1149oblist_add_by_name (SCHEME_P_ const char *name) 1192oblist_add_by_name (SCHEME_P_ const char *name)
1150{ 1193{
1151 pointer x; 1194 pointer x = generate_symbol (SCHEME_A_ name);
1152
1153 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154 set_typeflag (x, T_SYMBOL);
1155 setimmutable (car (x));
1156 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1195 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157 return x; 1196 return x;
1158} 1197}
1159 1198
1160static pointer 1199ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1200oblist_all_symbols (SCHEME_P)
1162{ 1201{
1163 return SCHEME_V->oblist; 1202 return SCHEME_V->oblist;
1164} 1203}
1165 1204
1166#endif 1205#endif
1167 1206
1168#if USE_PORTS
1169static pointer 1207ecb_cold static pointer
1170mk_port (SCHEME_P_ port *p) 1208mk_port (SCHEME_P_ port *p)
1171{ 1209{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1211
1174 set_typeflag (x, T_PORT | T_ATOM); 1212 set_typeflag (x, T_PORT | T_ATOM);
1175 x->object.port = p; 1213 set_port (x, p);
1176 1214
1177 return x; 1215 return x;
1178} 1216}
1179#endif
1180 1217
1181pointer 1218ecb_cold pointer
1182mk_foreign_func (SCHEME_P_ foreign_func f) 1219mk_foreign_func (SCHEME_P_ foreign_func f)
1183{ 1220{
1184 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1221 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1185 1222
1186 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1223 set_typeflag (x, T_FOREIGN | T_ATOM);
1187 x->object.ff = f; 1224 CELL(x)->object.ff = f;
1188 1225
1189 return x; 1226 return x;
1190} 1227}
1191 1228
1192INTERFACE pointer 1229INTERFACE pointer
1193mk_character (SCHEME_P_ int c) 1230mk_character (SCHEME_P_ int c)
1194{ 1231{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1233
1197 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1234 set_typeflag (x, T_CHARACTER | T_ATOM);
1198 ivalue_unchecked (x) = c & 0xff; 1235 set_ivalue (x, c & 0xff);
1199 set_num_integer (x); 1236
1200 return x; 1237 return x;
1201} 1238}
1202 1239
1203/* get number atom (integer) */ 1240/* get number atom (integer) */
1204INTERFACE pointer 1241INTERFACE pointer
1205mk_integer (SCHEME_P_ long num) 1242mk_integer (SCHEME_P_ long n)
1206{ 1243{
1244 pointer p = 0;
1245 pointer *pp = &p;
1246
1247#if USE_INTCACHE
1248 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1249 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1250#endif
1251
1252 if (!*pp)
1253 {
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1254 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1255
1209 set_typeflag (x, (T_NUMBER | T_ATOM)); 1256 set_typeflag (x, T_INTEGER | T_ATOM);
1210 ivalue_unchecked (x) = num; 1257 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1211 set_num_integer (x); 1258 set_ivalue (x, n);
1259
1260 *pp = x;
1261 }
1262
1212 return x; 1263 return *pp;
1213} 1264}
1214 1265
1215INTERFACE pointer 1266INTERFACE pointer
1216mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1217{ 1268{
1269#if USE_REAL
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1271
1220 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, T_REAL | T_ATOM);
1221 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1222 set_num_real (x); 1274
1223 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1224} 1279}
1225 1280
1226static pointer 1281static pointer
1227mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1228{ 1283{
1284#if USE_REAL
1229 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1230 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1231 else 1290#endif
1232 return mk_real (SCHEME_A_ num_get_rvalue (n));
1233} 1291}
1234 1292
1235/* allocate name to string area */ 1293/* allocate name to string area */
1236static char * 1294static char *
1237store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1243 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1244 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1245 } 1303 }
1246 1304
1247 if (str) 1305 if (str)
1248 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249 int l = strlen (str);
1250
1251 if (l > len_str)
1252 l = len_str;
1253
1254 memcpy (q, str, l);
1255 q[l] = 0;
1256 }
1257 else 1307 else
1258 {
1259 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1260 q[len_str] = 0; 1310 q[len_str] = 0;
1261 }
1262 1311
1263 return q; 1312 return q;
1264} 1313}
1265 1314
1266INTERFACE pointer 1315INTERFACE pointer
… …
1280 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281 1330
1282 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1283 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284 strlength (x) = len; 1333 strlength (x) = len;
1334
1285 return x; 1335 return x;
1286} 1336}
1287 1337
1288INTERFACE pointer 1338INTERFACE pointer
1289mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1296{ 1346{
1297 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1298} 1348}
1299 1349
1300INTERFACE void 1350INTERFACE void
1301fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1302{ 1352{
1303 int i; 1353 int i;
1304 1354
1305 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1306 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1307} 1357}
1308 1358
1359INTERFACE void
1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1366}
1367
1309INTERFACE pointer 1368INTERFACE pointer
1310vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1311{ 1370{
1312 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1313} 1372}
1314 1373
1315INTERFACE void 1374INTERFACE void
1316set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1317{ 1376{
1318 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1319} 1378}
1320 1379
1321/* get new symbol */ 1380/* get new symbol */
… …
1329 x = oblist_add_by_name (SCHEME_A_ name); 1388 x = oblist_add_by_name (SCHEME_A_ name);
1330 1389
1331 return x; 1390 return x;
1332} 1391}
1333 1392
1334INTERFACE pointer 1393ecb_cold INTERFACE pointer
1335gensym (SCHEME_P) 1394gensym (SCHEME_P)
1336{ 1395{
1337 pointer x; 1396 pointer x;
1338
1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340 {
1341 char name[40] = "gensym-"; 1397 char name[40] = "gensym-";
1342 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343 1399
1344 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1345 x = oblist_find_by_name (SCHEME_A_ name); 1401}
1346 1402
1347 if (x == NIL) 1403static int
1348 { 1404is_gensym (SCHEME_P_ pointer x)
1349 x = oblist_add_by_name (SCHEME_A_ name); 1405{
1350 return x; 1406 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351 }
1352 }
1353
1354 return NIL;
1355} 1407}
1356 1408
1357/* make symbol or number atom from string */ 1409/* make symbol or number atom from string */
1358static pointer 1410ecb_cold static pointer
1359mk_atom (SCHEME_P_ char *q) 1411mk_atom (SCHEME_P_ char *q)
1360{ 1412{
1361 char c, *p; 1413 char c, *p;
1362 int has_dec_point = 0; 1414 int has_dec_point = 0;
1363 int has_fp_exp = 0; 1415 int has_fp_exp = 0;
… …
1413 } 1465 }
1414 else if ((c == 'e') || (c == 'E')) 1466 else if ((c == 'e') || (c == 'E'))
1415 { 1467 {
1416 if (!has_fp_exp) 1468 if (!has_fp_exp)
1417 { 1469 {
1418 has_dec_point = 1; /* decimal point illegal 1470 has_dec_point = 1; /* decimal point illegal from now on */
1419 from now on */
1420 p++; 1471 p++;
1421 1472
1422 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1473 if ((*p == '-') || (*p == '+') || isdigit (*p))
1423 continue; 1474 continue;
1424 } 1475 }
… …
1435 1486
1436 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1487 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1437} 1488}
1438 1489
1439/* make constant */ 1490/* make constant */
1440static pointer 1491ecb_cold static pointer
1441mk_sharp_const (SCHEME_P_ char *name) 1492mk_sharp_const (SCHEME_P_ char *name)
1442{ 1493{
1443 if (!strcmp (name, "t")) 1494 if (!strcmp (name, "t"))
1444 return S_T; 1495 return S_T;
1445 else if (!strcmp (name, "f")) 1496 else if (!strcmp (name, "f"))
1446 return S_F; 1497 return S_F;
1447 else if (*name == '\\') /* #\w (character) */ 1498 else if (*name == '\\') /* #\w (character) */
1448 { 1499 {
1449 int c; 1500 int c;
1450 1501
1502 // TODO: optimise
1451 if (stricmp (name + 1, "space") == 0) 1503 if (stricmp (name + 1, "space") == 0)
1452 c = ' '; 1504 c = ' ';
1453 else if (stricmp (name + 1, "newline") == 0) 1505 else if (stricmp (name + 1, "newline") == 0)
1454 c = '\n'; 1506 c = '\n';
1455 else if (stricmp (name + 1, "return") == 0) 1507 else if (stricmp (name + 1, "return") == 0)
1456 c = '\r'; 1508 c = '\r';
1457 else if (stricmp (name + 1, "tab") == 0) 1509 else if (stricmp (name + 1, "tab") == 0)
1458 c = '\t'; 1510 c = '\t';
1511 else if (stricmp (name + 1, "alarm") == 0)
1512 c = 0x07;
1513 else if (stricmp (name + 1, "backspace") == 0)
1514 c = 0x08;
1515 else if (stricmp (name + 1, "escape") == 0)
1516 c = 0x1b;
1517 else if (stricmp (name + 1, "delete") == 0)
1518 c = 0x7f;
1519 else if (stricmp (name + 1, "null") == 0)
1520 c = 0;
1459 else if (name[1] == 'x' && name[2] != 0) 1521 else if (name[1] == 'x' && name[2] != 0)
1460 { 1522 {
1461 long c1 = strtol (name + 2, 0, 16); 1523 long c1 = strtol (name + 2, 0, 16);
1462 1524
1463 if (0 <= c1 && c1 <= UCHAR_MAX) 1525 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1488 return NIL; 1550 return NIL;
1489 } 1551 }
1490} 1552}
1491 1553
1492/* ========== garbage collector ========== */ 1554/* ========== garbage collector ========== */
1555
1556static void
1557finalize_cell (SCHEME_P_ pointer a)
1558{
1559 /* TODO, fast bitmap check? */
1560 if (is_string (a) || is_symbol (a))
1561 free (strvalue (a));
1562 else if (is_vector (a))
1563 free (vecvalue (a));
1564#if USE_PORTS
1565 else if (is_port (a))
1566 {
1567 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1568 port_close (SCHEME_A_ a, port_input | port_output);
1569
1570 free (port (a));
1571 }
1572#endif
1573}
1493 1574
1494/*-- 1575/*--
1495 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1576 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1577 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1497 * for marking. 1578 * for marking.
1498 * 1579 *
1499 * The exception is vectors - vectors are currently marked recursively, 1580 * The exception is vectors - vectors are currently marked recursively,
1500 * which is inherited form tinyscheme and could be fixed by having another 1581 * which is inherited form tinyscheme and could be fixed by having another
1501 * word of context in the vector 1582 * word of context in the vector
1502 */ 1583 */
1503static void 1584ecb_hot static void
1504mark (pointer a) 1585mark (pointer a)
1505{ 1586{
1506 pointer t, q, p; 1587 pointer t, q, p;
1507 1588
1508 t = 0; 1589 t = 0;
… …
1512 1593
1513 if (ecb_expect_false (is_vector (p))) 1594 if (ecb_expect_false (is_vector (p)))
1514 { 1595 {
1515 int i; 1596 int i;
1516 1597
1517 for (i = 0; i < p->object.vector.length; i++) 1598 for (i = 0; i < veclength (p); i++)
1518 mark (vecvalue (p)[i]); 1599 mark (vecvalue (p)[i]);
1519 } 1600 }
1520 1601
1521 if (is_atom (p)) 1602 if (is_atom (p))
1522 goto E6; 1603 goto E6;
… …
1565 p = q; 1646 p = q;
1566 goto E6; 1647 goto E6;
1567 } 1648 }
1568} 1649}
1569 1650
1651ecb_hot static void
1652gc_free (SCHEME_P)
1653{
1654 int i;
1655 uint32_t total = 0;
1656
1657 /* Here we scan the cells to build the free-list. */
1658 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1659 {
1660 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1661 struct cell *p;
1662 total += SCHEME_V->cell_segsize [i];
1663
1664 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1665 {
1666 pointer c = POINTER (p);
1667
1668 if (is_mark (c))
1669 clrmark (c);
1670 else
1671 {
1672 /* reclaim cell */
1673 if (typeflag (c) != T_PAIR)
1674 {
1675 finalize_cell (SCHEME_A_ c);
1676 set_typeflag (c, T_PAIR);
1677 set_car (c, NIL);
1678 }
1679
1680 ++SCHEME_V->fcells;
1681 set_cdr (c, SCHEME_V->free_cell);
1682 SCHEME_V->free_cell = c;
1683 }
1684 }
1685 }
1686
1687 if (SCHEME_V->gc_verbose)
1688 {
1689 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");
1690 }
1691}
1692
1570/* garbage collection. parameter a, b is marked. */ 1693/* garbage collection. parameter a, b is marked. */
1571static void 1694ecb_cold static void
1572gc (SCHEME_P_ pointer a, pointer b) 1695gc (SCHEME_P_ pointer a, pointer b)
1573{ 1696{
1574 pointer p;
1575 int i; 1697 int i;
1576 1698
1577 if (SCHEME_V->gc_verbose) 1699 if (SCHEME_V->gc_verbose)
1578 putstr (SCHEME_A_ "gc..."); 1700 putstr (SCHEME_A_ "gc...");
1579 1701
… …
1595 /* Mark recent objects the interpreter doesn't know about yet. */ 1717 /* Mark recent objects the interpreter doesn't know about yet. */
1596 mark (car (S_SINK)); 1718 mark (car (S_SINK));
1597 /* Mark any older stuff above nested C calls */ 1719 /* Mark any older stuff above nested C calls */
1598 mark (SCHEME_V->c_nest); 1720 mark (SCHEME_V->c_nest);
1599 1721
1722#if USE_INTCACHE
1723 /* mark intcache */
1724 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1725 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1726 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1727#endif
1728
1600 /* mark variables a, b */ 1729 /* mark variables a, b */
1601 mark (a); 1730 mark (a);
1602 mark (b); 1731 mark (b);
1603 1732
1604 /* garbage collect */ 1733 /* garbage collect */
1605 clrmark (NIL); 1734 clrmark (NIL);
1606 SCHEME_V->fcells = 0; 1735 SCHEME_V->fcells = 0;
1607 SCHEME_V->free_cell = NIL; 1736 SCHEME_V->free_cell = NIL;
1608 1737
1609 /* free-list is kept sorted by address so as to maintain consecutive
1610 ranges, if possible, for use with vectors. Here we scan the cells
1611 (which are also kept sorted by address) downwards to build the
1612 free-list in sorted order.
1613 */
1614 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615 {
1616 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1617
1618 while (--p >= SCHEME_V->cell_seg[i])
1619 {
1620 if (is_mark (p))
1621 clrmark (p);
1622 else
1623 {
1624 /* reclaim cell */
1625 if (typeflag (p) != T_FREE)
1626 {
1627 finalize_cell (SCHEME_A_ p);
1628 set_typeflag (p, T_FREE);
1629 set_car (p, NIL);
1630 }
1631
1632 ++SCHEME_V->fcells;
1633 set_cdr (p, SCHEME_V->free_cell);
1634 SCHEME_V->free_cell = p;
1635 }
1636 }
1637 }
1638
1639 if (SCHEME_V->gc_verbose) 1738 if (SCHEME_V->gc_verbose)
1640 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1739 putstr (SCHEME_A_ "freeing...");
1641}
1642 1740
1643static void 1741 gc_free (SCHEME_A);
1644finalize_cell (SCHEME_P_ pointer a)
1645{
1646 /* TODO, fast bitmap check? */
1647 if (is_string (a))
1648 free (strvalue (a));
1649 else if (is_vector (a))
1650 free (vecvalue (a));
1651#if USE_PORTS
1652 else if (is_port (a))
1653 {
1654 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1655 port_close (SCHEME_A_ a, port_input | port_output);
1656
1657 free (a->object.port);
1658 }
1659#endif
1660} 1742}
1661 1743
1662/* ========== Routines for Reading ========== */ 1744/* ========== Routines for Reading ========== */
1663 1745
1664static int 1746ecb_cold static int
1665file_push (SCHEME_P_ const char *fname) 1747file_push (SCHEME_P_ const char *fname)
1666{ 1748{
1667#if USE_PORTS
1668 int fin; 1749 int fin;
1669 1750
1670 if (SCHEME_V->file_i == MAXFIL - 1) 1751 if (SCHEME_V->file_i == MAXFIL - 1)
1671 return 0; 1752 return 0;
1672 1753
… …
1678 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1679 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1680 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1761 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1681 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1762 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1682 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1763 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1683 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1764 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1684 1765
1685#if SHOW_ERROR_LINE 1766#if SHOW_ERROR_LINE
1686 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1767 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1687 1768
1688 if (fname) 1769 if (fname)
1689 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1770 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1690#endif 1771#endif
1691 } 1772 }
1692 1773
1693 return fin >= 0; 1774 return fin >= 0;
1694
1695#else
1696 return 1;
1697#endif
1698} 1775}
1699 1776
1700static void 1777ecb_cold static void
1701file_pop (SCHEME_P) 1778file_pop (SCHEME_P)
1702{ 1779{
1703 if (SCHEME_V->file_i != 0) 1780 if (SCHEME_V->file_i != 0)
1704 { 1781 {
1705 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1782 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1706#if USE_PORTS 1783#if USE_PORTS
1707 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1784 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1708#endif 1785#endif
1709 SCHEME_V->file_i--; 1786 SCHEME_V->file_i--;
1710 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1787 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1711 } 1788 }
1712} 1789}
1713 1790
1714static int 1791ecb_cold static int
1715file_interactive (SCHEME_P) 1792file_interactive (SCHEME_P)
1716{ 1793{
1717#if USE_PORTS 1794#if USE_PORTS
1718 return SCHEME_V->file_i == 0 1795 return SCHEME_V->file_i == 0
1719 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1796 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1720 && (SCHEME_V->inport->object.port->kind & port_file); 1797 && (port (SCHEME_V->inport)->kind & port_file);
1721#else 1798#else
1722 return 0; 1799 return 0;
1723#endif 1800#endif
1724} 1801}
1725 1802
1726#if USE_PORTS 1803#if USE_PORTS
1727static port * 1804ecb_cold static port *
1728port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1805port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1729{ 1806{
1730 int fd; 1807 int fd;
1731 int flags; 1808 int flags;
1732 char *rw; 1809 char *rw;
… …
1755# endif 1832# endif
1756 1833
1757 return pt; 1834 return pt;
1758} 1835}
1759 1836
1760static pointer 1837ecb_cold static pointer
1761port_from_filename (SCHEME_P_ const char *fn, int prop) 1838port_from_filename (SCHEME_P_ const char *fn, int prop)
1762{ 1839{
1763 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1840 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1764 1841
1765 if (!pt && USE_ERROR_CHECKING) 1842 if (!pt && USE_ERROR_CHECKING)
1766 return NIL; 1843 return NIL;
1767 1844
1768 return mk_port (SCHEME_A_ pt); 1845 return mk_port (SCHEME_A_ pt);
1769} 1846}
1770 1847
1771static port * 1848ecb_cold static port *
1772port_rep_from_file (SCHEME_P_ int f, int prop) 1849port_rep_from_file (SCHEME_P_ int f, int prop)
1773{ 1850{
1774 port *pt = malloc (sizeof *pt); 1851 port *pt = malloc (sizeof *pt);
1775 1852
1776 if (!pt && USE_ERROR_CHECKING) 1853 if (!pt && USE_ERROR_CHECKING)
… …
1781 pt->rep.stdio.file = f; 1858 pt->rep.stdio.file = f;
1782 pt->rep.stdio.closeit = 0; 1859 pt->rep.stdio.closeit = 0;
1783 return pt; 1860 return pt;
1784} 1861}
1785 1862
1786static pointer 1863ecb_cold static pointer
1787port_from_file (SCHEME_P_ int f, int prop) 1864port_from_file (SCHEME_P_ int f, int prop)
1788{ 1865{
1789 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1866 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1790 1867
1791 if (!pt && USE_ERROR_CHECKING) 1868 if (!pt && USE_ERROR_CHECKING)
1792 return NIL; 1869 return NIL;
1793 1870
1794 return mk_port (SCHEME_A_ pt); 1871 return mk_port (SCHEME_A_ pt);
1795} 1872}
1796 1873
1797static port * 1874ecb_cold static port *
1798port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1875port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1799{ 1876{
1800 port *pt = malloc (sizeof (port)); 1877 port *pt = malloc (sizeof (port));
1801 1878
1802 if (!pt && USE_ERROR_CHECKING) 1879 if (!pt && USE_ERROR_CHECKING)
… …
1808 pt->rep.string.curr = start; 1885 pt->rep.string.curr = start;
1809 pt->rep.string.past_the_end = past_the_end; 1886 pt->rep.string.past_the_end = past_the_end;
1810 return pt; 1887 return pt;
1811} 1888}
1812 1889
1813static pointer 1890ecb_cold static pointer
1814port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1891port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1815{ 1892{
1816 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1893 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1817 1894
1818 if (!pt && USE_ERROR_CHECKING) 1895 if (!pt && USE_ERROR_CHECKING)
… …
1821 return mk_port (SCHEME_A_ pt); 1898 return mk_port (SCHEME_A_ pt);
1822} 1899}
1823 1900
1824# define BLOCK_SIZE 256 1901# define BLOCK_SIZE 256
1825 1902
1826static port * 1903ecb_cold static port *
1827port_rep_from_scratch (SCHEME_P) 1904port_rep_from_scratch (SCHEME_P)
1828{ 1905{
1829 char *start; 1906 char *start;
1830 port *pt = malloc (sizeof (port)); 1907 port *pt = malloc (sizeof (port));
1831 1908
… …
1845 pt->rep.string.curr = start; 1922 pt->rep.string.curr = start;
1846 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1923 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1847 return pt; 1924 return pt;
1848} 1925}
1849 1926
1850static pointer 1927ecb_cold static pointer
1851port_from_scratch (SCHEME_P) 1928port_from_scratch (SCHEME_P)
1852{ 1929{
1853 port *pt = port_rep_from_scratch (SCHEME_A); 1930 port *pt = port_rep_from_scratch (SCHEME_A);
1854 1931
1855 if (!pt && USE_ERROR_CHECKING) 1932 if (!pt && USE_ERROR_CHECKING)
1856 return NIL; 1933 return NIL;
1857 1934
1858 return mk_port (SCHEME_A_ pt); 1935 return mk_port (SCHEME_A_ pt);
1859} 1936}
1860 1937
1861static void 1938ecb_cold static void
1862port_close (SCHEME_P_ pointer p, int flag) 1939port_close (SCHEME_P_ pointer p, int flag)
1863{ 1940{
1864 port *pt = p->object.port; 1941 port *pt = port (p);
1865 1942
1866 pt->kind &= ~flag; 1943 pt->kind &= ~flag;
1867 1944
1868 if ((pt->kind & (port_input | port_output)) == 0) 1945 if ((pt->kind & (port_input | port_output)) == 0)
1869 { 1946 {
… …
1886 } 1963 }
1887} 1964}
1888#endif 1965#endif
1889 1966
1890/* get new character from input file */ 1967/* get new character from input file */
1891static int 1968ecb_cold static int
1892inchar (SCHEME_P) 1969inchar (SCHEME_P)
1893{ 1970{
1894 int c; 1971 int c;
1895 port *pt; 1972 port *pt = port (SCHEME_V->inport);
1896
1897 pt = SCHEME_V->inport->object.port;
1898 1973
1899 if (pt->kind & port_saw_EOF) 1974 if (pt->kind & port_saw_EOF)
1900 return EOF; 1975 return EOF;
1901 1976
1902 c = basic_inchar (pt); 1977 c = basic_inchar (pt);
… …
1912 } 1987 }
1913 1988
1914 return c; 1989 return c;
1915} 1990}
1916 1991
1917static int ungot = -1; 1992ecb_cold static int
1918
1919static int
1920basic_inchar (port *pt) 1993basic_inchar (port *pt)
1921{ 1994{
1922#if USE_PORTS
1923 if (pt->unget != -1) 1995 if (pt->unget != -1)
1924 { 1996 {
1925 int r = pt->unget; 1997 int r = pt->unget;
1926 pt->unget = -1; 1998 pt->unget = -1;
1927 return r; 1999 return r;
1928 } 2000 }
1929 2001
2002#if USE_PORTS
1930 if (pt->kind & port_file) 2003 if (pt->kind & port_file)
1931 { 2004 {
1932 char c; 2005 char c;
1933 2006
1934 if (!read (pt->rep.stdio.file, &c, 1)) 2007 if (!read (pt->rep.stdio.file, &c, 1))
… …
1942 return EOF; 2015 return EOF;
1943 else 2016 else
1944 return *pt->rep.string.curr++; 2017 return *pt->rep.string.curr++;
1945 } 2018 }
1946#else 2019#else
1947 if (ungot == -1)
1948 {
1949 char c; 2020 char c;
1950 if (!read (0, &c, 1)) 2021
2022 if (!read (pt->rep.stdio.file, &c, 1))
1951 return EOF; 2023 return EOF;
1952 2024
1953 ungot = c;
1954 }
1955
1956 {
1957 int r = ungot;
1958 ungot = -1;
1959 return r; 2025 return c;
1960 }
1961#endif 2026#endif
1962} 2027}
1963 2028
1964/* back character to input buffer */ 2029/* back character to input buffer */
1965static void 2030ecb_cold static void
1966backchar (SCHEME_P_ int c) 2031backchar (SCHEME_P_ int c)
1967{ 2032{
1968#if USE_PORTS 2033 port *pt = port (SCHEME_V->inport);
1969 port *pt;
1970 2034
1971 if (c == EOF) 2035 if (c == EOF)
1972 return; 2036 return;
1973 2037
1974 pt = SCHEME_V->inport->object.port;
1975 pt->unget = c; 2038 pt->unget = c;
1976#else
1977 if (c == EOF)
1978 return;
1979
1980 ungot = c;
1981#endif
1982} 2039}
1983 2040
1984#if USE_PORTS 2041#if USE_PORTS
1985static int 2042ecb_cold static int
1986realloc_port_string (SCHEME_P_ port *p) 2043realloc_port_string (SCHEME_P_ port *p)
1987{ 2044{
1988 char *start = p->rep.string.start; 2045 char *start = p->rep.string.start;
1989 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2046 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
1990 char *str = malloc (new_size); 2047 char *str = malloc (new_size);
… …
2003 else 2060 else
2004 return 0; 2061 return 0;
2005} 2062}
2006#endif 2063#endif
2007 2064
2008INTERFACE void 2065ecb_cold static void
2009putstr (SCHEME_P_ const char *s) 2066putchars (SCHEME_P_ const char *s, int len)
2010{ 2067{
2068 port *pt = port (SCHEME_V->outport);
2069
2011#if USE_PORTS 2070#if USE_PORTS
2012 port *pt = SCHEME_V->outport->object.port;
2013
2014 if (pt->kind & port_file)
2015 write (pt->rep.stdio.file, s, strlen (s));
2016 else
2017 for (; *s; s++)
2018 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2019 *pt->rep.string.curr++ = *s;
2020 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2021 *pt->rep.string.curr++ = *s;
2022
2023#else
2024 xwrstr (s);
2025#endif
2026}
2027
2028static void
2029putchars (SCHEME_P_ const char *s, int len)
2030{
2031#if USE_PORTS
2032 port *pt = SCHEME_V->outport->object.port;
2033
2034 if (pt->kind & port_file) 2071 if (pt->kind & port_file)
2035 write (pt->rep.stdio.file, s, len); 2072 write (pt->rep.stdio.file, s, len);
2036 else 2073 else
2037 { 2074 {
2038 for (; len; len--) 2075 for (; len; len--)
… …
2043 *pt->rep.string.curr++ = *s++; 2080 *pt->rep.string.curr++ = *s++;
2044 } 2081 }
2045 } 2082 }
2046 2083
2047#else 2084#else
2048 write (1, s, len); 2085 write (1, s, len); // output not initialised
2049#endif 2086#endif
2087}
2088
2089INTERFACE void
2090putstr (SCHEME_P_ const char *s)
2091{
2092 putchars (SCHEME_A_ s, strlen (s));
2050} 2093}
2051 2094
2052INTERFACE void 2095INTERFACE void
2053putcharacter (SCHEME_P_ int c) 2096putcharacter (SCHEME_P_ int c)
2054{ 2097{
2055#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port;
2057
2058 if (pt->kind & port_file)
2059 {
2060 char cc = c;
2061 write (pt->rep.stdio.file, &cc, 1);
2062 }
2063 else
2064 {
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = c;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = c;
2069 }
2070
2071#else
2072 char cc = c; 2098 char cc = c;
2073 write (1, &c, 1); 2099
2074#endif 2100 putchars (SCHEME_A_ &cc, 1);
2075} 2101}
2076 2102
2077/* read characters up to delimiter, but cater to character constants */ 2103/* read characters up to delimiter, but cater to character constants */
2078static char * 2104ecb_cold static char *
2079readstr_upto (SCHEME_P_ char *delim) 2105readstr_upto (SCHEME_P_ int skip, const char *delim)
2080{ 2106{
2081 char *p = SCHEME_V->strbuff; 2107 char *p = SCHEME_V->strbuff + skip;
2082 2108
2083 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2109 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2084 2110
2085 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2111 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086 *p = 0; 2112 *p = 0;
… …
2092 2118
2093 return SCHEME_V->strbuff; 2119 return SCHEME_V->strbuff;
2094} 2120}
2095 2121
2096/* read string expression "xxx...xxx" */ 2122/* read string expression "xxx...xxx" */
2097static pointer 2123ecb_cold static pointer
2098readstrexp (SCHEME_P) 2124readstrexp (SCHEME_P_ char delim)
2099{ 2125{
2100 char *p = SCHEME_V->strbuff; 2126 char *p = SCHEME_V->strbuff;
2101 int c; 2127 int c;
2102 int c1 = 0; 2128 int c1 = 0;
2103 enum
2104 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2129 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105 2130
2106 for (;;) 2131 for (;;)
2107 { 2132 {
2108 c = inchar (SCHEME_A); 2133 c = inchar (SCHEME_A);
2109 2134
… …
2111 return S_F; 2136 return S_F;
2112 2137
2113 switch (state) 2138 switch (state)
2114 { 2139 {
2115 case st_ok: 2140 case st_ok:
2116 switch (c) 2141 if (ecb_expect_false (c == delim))
2117 {
2118 case '\\':
2119 state = st_bsl;
2120 break;
2121
2122 case '"':
2123 *p = 0;
2124 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2142 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125 2143
2126 default: 2144 if (ecb_expect_false (c == '\\'))
2145 state = st_bsl;
2146 else
2127 *p++ = c; 2147 *p++ = c;
2128 break;
2129 }
2130 2148
2131 break; 2149 break;
2132 2150
2133 case st_bsl: 2151 case st_bsl:
2134 switch (c) 2152 switch (c)
… …
2143 case '7': 2161 case '7':
2144 state = st_oct1; 2162 state = st_oct1;
2145 c1 = c - '0'; 2163 c1 = c - '0';
2146 break; 2164 break;
2147 2165
2166 case 'a': *p++ = '\a'; state = st_ok; break;
2167 case 'n': *p++ = '\n'; state = st_ok; break;
2168 case 'r': *p++ = '\r'; state = st_ok; break;
2169 case 't': *p++ = '\t'; state = st_ok; break;
2170
2171 // this overshoots the minimum requirements of r7rs
2172 case ' ':
2173 case '\t':
2174 case '\r':
2175 case '\n':
2176 skipspace (SCHEME_A);
2177 state = st_ok;
2178 break;
2179
2180 //TODO: x should end in ;, not two-digit hex
2148 case 'x': 2181 case 'x':
2149 case 'X': 2182 case 'X':
2150 state = st_x1; 2183 state = st_x1;
2151 c1 = 0; 2184 c1 = 0;
2152 break; 2185 break;
2153 2186
2154 case 'n':
2155 *p++ = '\n';
2156 state = st_ok;
2157 break;
2158
2159 case 't':
2160 *p++ = '\t';
2161 state = st_ok;
2162 break;
2163
2164 case 'r':
2165 *p++ = '\r';
2166 state = st_ok;
2167 break;
2168
2169 case '"':
2170 *p++ = '"';
2171 state = st_ok;
2172 break;
2173
2174 default: 2187 default:
2175 *p++ = c; 2188 *p++ = c;
2176 state = st_ok; 2189 state = st_ok;
2177 break; 2190 break;
2178 } 2191 }
2179 2192
2180 break; 2193 break;
2181 2194
2182 case st_x1: 2195 case st_x1:
2183 case st_x2: 2196 case st_x2:
2184 c = toupper (c); 2197 c = tolower (c);
2185 2198
2186 if (c >= '0' && c <= 'F') 2199 if (c >= '0' && c <= '9')
2187 {
2188 if (c <= '9')
2189 c1 = (c1 << 4) + c - '0'; 2200 c1 = (c1 << 4) + c - '0';
2190 else 2201 else if (c >= 'a' && c <= 'f')
2191 c1 = (c1 << 4) + c - 'A' + 10; 2202 c1 = (c1 << 4) + c - 'a' + 10;
2192
2193 if (state == st_x1)
2194 state = st_x2;
2195 else
2196 {
2197 *p++ = c1;
2198 state = st_ok;
2199 }
2200 }
2201 else 2203 else
2202 return S_F; 2204 return S_F;
2205
2206 if (state == st_x1)
2207 state = st_x2;
2208 else
2209 {
2210 *p++ = c1;
2211 state = st_ok;
2212 }
2203 2213
2204 break; 2214 break;
2205 2215
2206 case st_oct1: 2216 case st_oct1:
2207 case st_oct2: 2217 case st_oct2:
… …
2211 backchar (SCHEME_A_ c); 2221 backchar (SCHEME_A_ c);
2212 state = st_ok; 2222 state = st_ok;
2213 } 2223 }
2214 else 2224 else
2215 { 2225 {
2216 if (state == st_oct2 && c1 >= 32) 2226 if (state == st_oct2 && c1 >= ' ')
2217 return S_F; 2227 return S_F;
2218 2228
2219 c1 = (c1 << 3) + (c - '0'); 2229 c1 = (c1 << 3) + (c - '0');
2220 2230
2221 if (state == st_oct1) 2231 if (state == st_oct1)
… …
2226 state = st_ok; 2236 state = st_ok;
2227 } 2237 }
2228 } 2238 }
2229 2239
2230 break; 2240 break;
2231
2232 } 2241 }
2233 } 2242 }
2234} 2243}
2235 2244
2236/* check c is in chars */ 2245/* check c is in chars */
2237ecb_inline int 2246ecb_cold int
2238is_one_of (char *s, int c) 2247is_one_of (const char *s, int c)
2239{ 2248{
2240 if (c == EOF)
2241 return 1;
2242
2243 return !!strchr (s, c); 2249 return c == EOF || !!strchr (s, c);
2244} 2250}
2245 2251
2246/* skip white characters */ 2252/* skip white characters */
2247ecb_inline int 2253ecb_cold int
2248skipspace (SCHEME_P) 2254skipspace (SCHEME_P)
2249{ 2255{
2250 int c, curr_line = 0; 2256 int c, curr_line = 0;
2251 2257
2252 do 2258 do
2253 { 2259 {
2254 c = inchar (SCHEME_A); 2260 c = inchar (SCHEME_A);
2261
2255#if SHOW_ERROR_LINE 2262#if SHOW_ERROR_LINE
2256 if (c == '\n') 2263 if (ecb_expect_false (c == '\n'))
2257 curr_line++; 2264 curr_line++;
2258#endif 2265#endif
2266
2267 if (ecb_expect_false (c == EOF))
2268 return c;
2259 } 2269 }
2260 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2270 while (is_one_of (WHITESPACE, c));
2261 2271
2262 /* record it */ 2272 /* record it */
2263#if SHOW_ERROR_LINE 2273#if SHOW_ERROR_LINE
2264 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2274 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2265 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2275 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2266#endif 2276#endif
2267 2277
2268 if (c != EOF)
2269 {
2270 backchar (SCHEME_A_ c); 2278 backchar (SCHEME_A_ c);
2271 return 1; 2279 return 1;
2272 }
2273 else
2274 return EOF;
2275} 2280}
2276 2281
2277/* get token */ 2282/* get token */
2278static int 2283ecb_cold static int
2279token (SCHEME_P) 2284token (SCHEME_P)
2280{ 2285{
2281 int c = skipspace (SCHEME_A); 2286 int c = skipspace (SCHEME_A);
2282 2287
2283 if (c == EOF) 2288 if (c == EOF)
… …
2295 return TOK_RPAREN; 2300 return TOK_RPAREN;
2296 2301
2297 case '.': 2302 case '.':
2298 c = inchar (SCHEME_A); 2303 c = inchar (SCHEME_A);
2299 2304
2300 if (is_one_of (" \n\t", c)) 2305 if (is_one_of (WHITESPACE, c))
2301 return TOK_DOT; 2306 return TOK_DOT;
2302 else 2307 else
2303 { 2308 {
2304 //TODO: ungetc twice in a row is not supported in C
2305 backchar (SCHEME_A_ c); 2309 backchar (SCHEME_A_ c);
2306 backchar (SCHEME_A_ '.');
2307 return TOK_ATOM; 2310 return TOK_DOTATOM;
2308 } 2311 }
2312
2313 case '|':
2314 return TOK_STRATOM;
2309 2315
2310 case '\'': 2316 case '\'':
2311 return TOK_QUOTE; 2317 return TOK_QUOTE;
2312 2318
2313 case ';': 2319 case ';':
… …
2380} 2386}
2381 2387
2382/* ========== Routines for Printing ========== */ 2388/* ========== Routines for Printing ========== */
2383#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2389#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2384 2390
2385static void 2391ecb_cold static void
2386printslashstring (SCHEME_P_ char *p, int len) 2392printslashstring (SCHEME_P_ char *p, int len)
2387{ 2393{
2388 int i; 2394 int i;
2389 unsigned char *s = (unsigned char *) p; 2395 unsigned char *s = (unsigned char *) p;
2390 2396
… …
2445 } 2451 }
2446 2452
2447 putcharacter (SCHEME_A_ '"'); 2453 putcharacter (SCHEME_A_ '"');
2448} 2454}
2449 2455
2450
2451/* print atoms */ 2456/* print atoms */
2452static void 2457ecb_cold static void
2453printatom (SCHEME_P_ pointer l, int f) 2458printatom (SCHEME_P_ pointer l, int f)
2454{ 2459{
2455 char *p; 2460 char *p;
2456 int len; 2461 int len;
2457 2462
2458 atom2str (SCHEME_A_ l, f, &p, &len); 2463 atom2str (SCHEME_A_ l, f, &p, &len);
2459 putchars (SCHEME_A_ p, len); 2464 putchars (SCHEME_A_ p, len);
2460} 2465}
2461 2466
2462
2463/* Uses internal buffer unless string pointer is already available */ 2467/* Uses internal buffer unless string pointer is already available */
2464static void 2468ecb_cold static void
2465atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2469atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466{ 2470{
2467 char *p; 2471 char *p;
2468 2472
2469 if (l == NIL) 2473 if (l == NIL)
… …
2480 { 2484 {
2481 p = SCHEME_V->strbuff; 2485 p = SCHEME_V->strbuff;
2482 2486
2483 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2487 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2484 { 2488 {
2485 if (num_is_integer (l)) 2489 if (is_integer (l))
2486 xnum (p, ivalue_unchecked (l)); 2490 xnum (p, ivalue_unchecked (l));
2487#if USE_REAL 2491#if USE_REAL
2488 else 2492 else
2489 { 2493 {
2490 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2494 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2627#endif 2631#endif
2628 } 2632 }
2629 else if (is_continuation (l)) 2633 else if (is_continuation (l))
2630 p = "#<CONTINUATION>"; 2634 p = "#<CONTINUATION>";
2631 else 2635 else
2636 {
2637#if USE_PRINTF
2638 p = SCHEME_V->strbuff;
2639 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2640#else
2632 p = "#<ERROR>"; 2641 p = "#<ERROR>";
2642#endif
2643 }
2633 2644
2634 *pp = p; 2645 *pp = p;
2635 *plen = strlen (p); 2646 *plen = strlen (p);
2636} 2647}
2637 2648
… …
2669 return car (d); 2680 return car (d);
2670 2681
2671 p = cons (car (d), cdr (d)); 2682 p = cons (car (d), cdr (d));
2672 q = p; 2683 q = p;
2673 2684
2674 while (cdr (cdr (p)) != NIL) 2685 while (cddr (p) != NIL)
2675 { 2686 {
2676 d = cons (car (p), cdr (p)); 2687 d = cons (car (p), cdr (p));
2677 2688
2678 if (cdr (cdr (p)) != NIL) 2689 if (cddr (p) != NIL)
2679 p = cdr (d); 2690 p = cdr (d);
2680 } 2691 }
2681 2692
2682 set_cdr (p, car (cdr (p))); 2693 set_cdr (p, cadr (p));
2683 return q; 2694 return q;
2684} 2695}
2685 2696
2686/* reverse list -- produce new list */ 2697/* reverse list -- produce new list */
2687static pointer 2698ecb_hot static pointer
2688reverse (SCHEME_P_ pointer a) 2699reverse (SCHEME_P_ pointer a)
2689{ 2700{
2690 /* a must be checked by gc */ 2701 /* a must be checked by gc */
2691 pointer p = NIL; 2702 pointer p = NIL;
2692 2703
… …
2695 2706
2696 return p; 2707 return p;
2697} 2708}
2698 2709
2699/* reverse list --- in-place */ 2710/* reverse list --- in-place */
2700static pointer 2711ecb_hot static pointer
2701reverse_in_place (SCHEME_P_ pointer term, pointer list) 2712reverse_in_place (SCHEME_P_ pointer term, pointer list)
2702{ 2713{
2703 pointer result = term; 2714 pointer result = term;
2704 pointer p = list; 2715 pointer p = list;
2705 2716
… …
2713 2724
2714 return result; 2725 return result;
2715} 2726}
2716 2727
2717/* append list -- produce new list (in reverse order) */ 2728/* append list -- produce new list (in reverse order) */
2718static pointer 2729ecb_hot static pointer
2719revappend (SCHEME_P_ pointer a, pointer b) 2730revappend (SCHEME_P_ pointer a, pointer b)
2720{ 2731{
2721 pointer result = a; 2732 pointer result = a;
2722 pointer p = b; 2733 pointer p = b;
2723 2734
… …
2732 2743
2733 return S_F; /* signal an error */ 2744 return S_F; /* signal an error */
2734} 2745}
2735 2746
2736/* equivalence of atoms */ 2747/* equivalence of atoms */
2737int 2748ecb_hot int
2738eqv (pointer a, pointer b) 2749eqv (pointer a, pointer b)
2739{ 2750{
2740 if (is_string (a)) 2751 if (is_string (a))
2741 { 2752 {
2742 if (is_string (b)) 2753 if (is_string (b))
… …
2745 return 0; 2756 return 0;
2746 } 2757 }
2747 else if (is_number (a)) 2758 else if (is_number (a))
2748 { 2759 {
2749 if (is_number (b)) 2760 if (is_number (b))
2750 if (num_is_integer (a) == num_is_integer (b))
2751 return num_cmp (nvalue (a), nvalue (b)) == 0; 2761 return num_cmp (nvalue (a), nvalue (b)) == 0;
2752 2762
2753 return 0; 2763 return 0;
2754 } 2764 }
2755 else if (is_character (a)) 2765 else if (is_character (a))
2756 { 2766 {
… …
2782/* () is #t in R5RS */ 2792/* () is #t in R5RS */
2783#define is_true(p) ((p) != S_F) 2793#define is_true(p) ((p) != S_F)
2784#define is_false(p) ((p) == S_F) 2794#define is_false(p) ((p) == S_F)
2785 2795
2786/* ========== Environment implementation ========== */ 2796/* ========== Environment implementation ========== */
2787
2788#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790static int
2791hash_fn (const char *key, int table_size)
2792{
2793 const unsigned char *p = key;
2794 uint32_t hash = 2166136261;
2795
2796 while (*p)
2797 hash = (hash ^ *p++) * 16777619;
2798
2799 return hash % table_size;
2800}
2801#endif
2802 2797
2803#ifndef USE_ALIST_ENV 2798#ifndef USE_ALIST_ENV
2804 2799
2805/* 2800/*
2806 * In this implementation, each frame of the environment may be 2801 * In this implementation, each frame of the environment may be
… …
2823 2818
2824 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2819 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825 setenvironment (SCHEME_V->envir); 2820 setenvironment (SCHEME_V->envir);
2826} 2821}
2827 2822
2823static uint32_t
2824sym_hash (pointer sym, uint32_t size)
2825{
2826 uintptr_t ptr = (uintptr_t)sym;
2827
2828#if 0
2829 /* table size is prime, so why mix */
2830 ptr += ptr >> 32;
2831 ptr += ptr >> 16;
2832 ptr += ptr >> 8;
2833#endif
2834
2835 return ptr % size;
2836}
2837
2828ecb_inline void 2838ecb_inline void
2829new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2839new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830{ 2840{
2831 pointer slot = immutable_cons (variable, value); 2841 pointer slot = immutable_cons (variable, value);
2832 2842
2833 if (is_vector (car (env))) 2843 if (is_vector (car (env)))
2834 { 2844 {
2835 int location = hash_fn (symname (variable), veclength (car (env))); 2845 int location = sym_hash (variable, veclength (car (env)));
2836
2837 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2846 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838 } 2847 }
2839 else 2848 else
2840 set_car (env, immutable_cons (slot, car (env))); 2849 set_car (env, immutable_cons (slot, car (env)));
2841} 2850}
2842 2851
2843static pointer 2852ecb_hot static pointer
2844find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2853find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845{ 2854{
2846 pointer x, y; 2855 pointer x, y;
2847 int location;
2848 2856
2849 for (x = env; x != NIL; x = cdr (x)) 2857 for (x = env; x != NIL; x = cdr (x))
2850 { 2858 {
2851 if (is_vector (car (x))) 2859 if (is_vector (car (x)))
2852 { 2860 {
2853 location = hash_fn (symname (hdl), veclength (car (x))); 2861 int location = sym_hash (hdl, veclength (car (x)));
2854 y = vector_elem (car (x), location); 2862 y = vector_get (car (x), location);
2855 } 2863 }
2856 else 2864 else
2857 y = car (x); 2865 y = car (x);
2858 2866
2859 for (; y != NIL; y = cdr (y)) 2867 for (; y != NIL; y = cdr (y))
2860 if (caar (y) == hdl) 2868 if (caar (y) == hdl)
2861 break; 2869 break;
2862 2870
2863 if (y != NIL) 2871 if (y != NIL)
2872 return car (y);
2873
2874 if (!all)
2864 break; 2875 break;
2865
2866 if (!all)
2867 return NIL;
2868 } 2876 }
2869
2870 if (x != NIL)
2871 return car (y);
2872 2877
2873 return NIL; 2878 return NIL;
2874} 2879}
2875 2880
2876#else /* USE_ALIST_ENV */ 2881#else /* USE_ALIST_ENV */
2877 2882
2878ecb_inline void 2883static void
2879new_frame_in_env (SCHEME_P_ pointer old_env) 2884new_frame_in_env (SCHEME_P_ pointer old_env)
2880{ 2885{
2881 SCHEME_V->envir = immutable_cons (NIL, old_env); 2886 SCHEME_V->envir = immutable_cons (NIL, old_env);
2882 setenvironment (SCHEME_V->envir); 2887 setenvironment (SCHEME_V->envir);
2883} 2888}
2884 2889
2885ecb_inline void 2890static void
2886new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2891new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2887{ 2892{
2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2893 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2889} 2894}
2890 2895
2891static pointer 2896ecb_hot static pointer
2892find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2897find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2893{ 2898{
2894 pointer x, y; 2899 pointer x, y;
2895 2900
2896 for (x = env; x != NIL; x = cdr (x)) 2901 for (x = env; x != NIL; x = cdr (x))
… …
2898 for (y = car (x); y != NIL; y = cdr (y)) 2903 for (y = car (x); y != NIL; y = cdr (y))
2899 if (caar (y) == hdl) 2904 if (caar (y) == hdl)
2900 break; 2905 break;
2901 2906
2902 if (y != NIL) 2907 if (y != NIL)
2908 return car (y);
2903 break; 2909 break;
2904 2910
2905 if (!all) 2911 if (!all)
2906 return NIL; 2912 break;
2907 } 2913 }
2908
2909 if (x != NIL)
2910 return car (y);
2911 2914
2912 return NIL; 2915 return NIL;
2913} 2916}
2914 2917
2915#endif /* USE_ALIST_ENV else */ 2918#endif /* USE_ALIST_ENV else */
2916 2919
2917ecb_inline void 2920static void
2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2921new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919{ 2922{
2923 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2924 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2921} 2925}
2922 2926
2923ecb_inline void 2927static void
2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2928set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2925{ 2929{
2926 set_cdr (slot, value); 2930 set_cdr (slot, value);
2927} 2931}
2928 2932
2929ecb_inline pointer 2933static pointer
2930slot_value_in_env (pointer slot) 2934slot_value_in_env (pointer slot)
2931{ 2935{
2932 return cdr (slot); 2936 return cdr (slot);
2933} 2937}
2934 2938
2935/* ========== Evaluation Cycle ========== */ 2939/* ========== Evaluation Cycle ========== */
2936 2940
2937static int 2941ecb_cold static int
2938xError_1 (SCHEME_P_ const char *s, pointer a) 2942xError_1 (SCHEME_P_ const char *s, pointer a)
2939{ 2943{
2940#if USE_ERROR_HOOK
2941 pointer x;
2942 pointer hdl = SCHEME_V->ERROR_HOOK;
2943#endif
2944
2945#if USE_PRINTF 2944#if USE_PRINTF
2946#if SHOW_ERROR_LINE 2945#if SHOW_ERROR_LINE
2947 char sbuf[STRBUFFSIZE]; 2946 char sbuf[STRBUFFSIZE];
2948 2947
2949 /* make sure error is not in REPL */ 2948 /* make sure error is not in REPL */
… …
2964 } 2963 }
2965#endif 2964#endif
2966#endif 2965#endif
2967 2966
2968#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
2969 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2968 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2970 2969
2971 if (x != NIL) 2970 if (x != NIL)
2972 { 2971 {
2973 pointer code = a 2972 pointer code = a
2974 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2973 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3018 pointer code; 3017 pointer code;
3019}; 3018};
3020 3019
3021# define STACK_GROWTH 3 3020# define STACK_GROWTH 3
3022 3021
3023static void 3022ecb_hot static void
3024s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3023s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3025{ 3024{
3026 int nframes = (uintptr_t)SCHEME_V->dump; 3025 int nframes = (uintptr_t)SCHEME_V->dump;
3027 struct dump_stack_frame *next_frame; 3026 struct dump_stack_frame *next_frame;
3028 3027
3029 /* enough room for the next frame? */ 3028 /* enough room for the next frame? */
3030 if (nframes >= SCHEME_V->dump_size) 3029 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3031 { 3030 {
3032 SCHEME_V->dump_size += STACK_GROWTH; 3031 SCHEME_V->dump_size += STACK_GROWTH;
3033 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3032 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3034 } 3033 }
3035 3034
… …
3041 next_frame->code = code; 3040 next_frame->code = code;
3042 3041
3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3042 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3044} 3043}
3045 3044
3046static int 3045static ecb_hot int
3047xs_return (SCHEME_P_ pointer a) 3046xs_return (SCHEME_P_ pointer a)
3048{ 3047{
3049 int nframes = (uintptr_t)SCHEME_V->dump; 3048 int nframes = (uintptr_t)SCHEME_V->dump;
3050 struct dump_stack_frame *frame; 3049 struct dump_stack_frame *frame;
3051 3050
… …
3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3061 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3063 3062
3064 return 0; 3063 return 0;
3065} 3064}
3066 3065
3067ecb_inline void 3066ecb_cold void
3068dump_stack_reset (SCHEME_P) 3067dump_stack_reset (SCHEME_P)
3069{ 3068{
3070 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3069 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3071 SCHEME_V->dump = (pointer)+0; 3070 SCHEME_V->dump = (pointer)+0;
3072} 3071}
3073 3072
3074ecb_inline void 3073ecb_cold void
3075dump_stack_initialize (SCHEME_P) 3074dump_stack_initialize (SCHEME_P)
3076{ 3075{
3077 SCHEME_V->dump_size = 0; 3076 SCHEME_V->dump_size = 0;
3078 SCHEME_V->dump_base = 0; 3077 SCHEME_V->dump_base = 0;
3079 dump_stack_reset (SCHEME_A); 3078 dump_stack_reset (SCHEME_A);
3080} 3079}
3081 3080
3082static void 3081ecb_cold static void
3083dump_stack_free (SCHEME_P) 3082dump_stack_free (SCHEME_P)
3084{ 3083{
3085 free (SCHEME_V->dump_base); 3084 free (SCHEME_V->dump_base);
3086 SCHEME_V->dump_base = 0; 3085 SCHEME_V->dump_base = 0;
3087 SCHEME_V->dump = (pointer)0; 3086 SCHEME_V->dump = (pointer)0;
3088 SCHEME_V->dump_size = 0; 3087 SCHEME_V->dump_size = 0;
3089} 3088}
3090 3089
3091static void 3090ecb_cold static void
3092dump_stack_mark (SCHEME_P) 3091dump_stack_mark (SCHEME_P)
3093{ 3092{
3094 int nframes = (uintptr_t)SCHEME_V->dump; 3093 int nframes = (uintptr_t)SCHEME_V->dump;
3095 int i; 3094 int i;
3096 3095
… …
3102 mark (frame->envir); 3101 mark (frame->envir);
3103 mark (frame->code); 3102 mark (frame->code);
3104 } 3103 }
3105} 3104}
3106 3105
3107static pointer 3106ecb_cold static pointer
3108ss_get_cont (SCHEME_P) 3107ss_get_cont (SCHEME_P)
3109{ 3108{
3110 int nframes = (uintptr_t)SCHEME_V->dump; 3109 int nframes = (uintptr_t)SCHEME_V->dump;
3111 int i; 3110 int i;
3112 3111
… …
3124 } 3123 }
3125 3124
3126 return cont; 3125 return cont;
3127} 3126}
3128 3127
3129static void 3128ecb_cold static void
3130ss_set_cont (SCHEME_P_ pointer cont) 3129ss_set_cont (SCHEME_P_ pointer cont)
3131{ 3130{
3132 int i = 0; 3131 int i = 0;
3133 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3132 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134 3133
3135 while (cont != NIL) 3134 while (cont != NIL)
3136 { 3135 {
3137 frame->op = ivalue (car (cont)); cont = cdr (cont); 3136 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138 frame->args = car (cont) ; cont = cdr (cont); 3137 frame->args = car (cont) ; cont = cdr (cont);
3139 frame->envir = car (cont) ; cont = cdr (cont); 3138 frame->envir = car (cont) ; cont = cdr (cont);
3140 frame->code = car (cont) ; cont = cdr (cont); 3139 frame->code = car (cont) ; cont = cdr (cont);
3141 3140
3142 ++frame; 3141 ++frame;
3143 ++i; 3142 ++i;
3144 } 3143 }
3145 3144
3146 SCHEME_V->dump = (pointer)(uintptr_t)i; 3145 SCHEME_V->dump = (pointer)(uintptr_t)i;
3147} 3146}
3148 3147
3149#else 3148#else
3150 3149
3151ecb_inline void 3150ecb_cold void
3152dump_stack_reset (SCHEME_P) 3151dump_stack_reset (SCHEME_P)
3153{ 3152{
3154 SCHEME_V->dump = NIL; 3153 SCHEME_V->dump = NIL;
3155} 3154}
3156 3155
3157ecb_inline void 3156ecb_cold void
3158dump_stack_initialize (SCHEME_P) 3157dump_stack_initialize (SCHEME_P)
3159{ 3158{
3160 dump_stack_reset (SCHEME_A); 3159 dump_stack_reset (SCHEME_A);
3161} 3160}
3162 3161
3163static void 3162ecb_cold static void
3164dump_stack_free (SCHEME_P) 3163dump_stack_free (SCHEME_P)
3165{ 3164{
3166 SCHEME_V->dump = NIL; 3165 SCHEME_V->dump = NIL;
3167} 3166}
3168 3167
3169static int 3168ecb_hot static int
3170xs_return (SCHEME_P_ pointer a) 3169xs_return (SCHEME_P_ pointer a)
3171{ 3170{
3172 pointer dump = SCHEME_V->dump; 3171 pointer dump = SCHEME_V->dump;
3173 3172
3174 SCHEME_V->value = a; 3173 SCHEME_V->value = a;
3175 3174
3176 if (dump == NIL) 3175 if (dump == NIL)
3177 return -1; 3176 return -1;
3178 3177
3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3178 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3179 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183 3182
3184 SCHEME_V->dump = dump; 3183 SCHEME_V->dump = dump;
3185 3184
3186 return 0; 3185 return 0;
3187} 3186}
3188 3187
3189static void 3188ecb_hot static void
3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3189s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3191{ 3190{
3192 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3191 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3193 cons (args, 3192 cons (args,
3194 cons (SCHEME_V->envir, 3193 cons (SCHEME_V->envir,
3195 cons (code, 3194 cons (code,
3196 SCHEME_V->dump)))); 3195 SCHEME_V->dump))));
3197} 3196}
3198 3197
3198ecb_cold static void
3199dump_stack_mark (SCHEME_P)
3200{
3201 mark (SCHEME_V->dump);
3202}
3203
3204ecb_cold static pointer
3205ss_get_cont (SCHEME_P)
3206{
3207 return SCHEME_V->dump;
3208}
3209
3210ecb_cold static void
3211ss_set_cont (SCHEME_P_ pointer cont)
3212{
3213 SCHEME_V->dump = cont;
3214}
3215
3216#endif
3217
3218#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3219
3220#if EXPERIMENT
3221
3222static int
3223dtree (SCHEME_P_ int indent, pointer x)
3224{
3225 int c;
3226
3227 if (is_syntax (x))
3228 {
3229 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3230 return 8 + 8;
3231 }
3232
3233 if (x == NIL)
3234 {
3235 printf ("%*sNIL\n", indent, "");
3236 return 3;
3237 }
3238
3239 switch (type (x))
3240 {
3241 case T_INTEGER:
3242 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3243 return 32+8;
3244
3245 case T_SYMBOL:
3246 printf ("%*sS<%s>\n", indent, "", symname (x));
3247 return 24+8;
3248
3249 case T_CLOSURE:
3250 printf ("%*sS<%s>\n", indent, "", "closure");
3251 dtree (SCHEME_A_ indent + 3, cdr(x));
3252 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3253
3254 case T_PAIR:
3255 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3256 c = dtree (SCHEME_A_ indent + 3, car (x));
3257 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3258 return c + 1;
3259
3260 case T_PORT:
3261 printf ("%*sS<%s>\n", indent, "", "port");
3262 return 24+8;
3263
3264 case T_VECTOR:
3265 printf ("%*sS<%s>\n", indent, "", "vector");
3266 return 24+8;
3267
3268 case T_ENVIRONMENT:
3269 printf ("%*sS<%s>\n", indent, "", "environment");
3270 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3271
3272 default:
3273 printf ("unhandled type %d\n", type (x));
3274 break;
3275 }
3276}
3277
3278#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3279
3280typedef void *stream[1];
3281
3282#define stream_init() { 0 }
3283#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3284#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3285#define stream_free(s) free (s[0])
3286
3287ecb_cold static void
3288stream_put (stream s, uint8_t byte)
3289{
3290 uint32_t *sp = *s;
3291 uint32_t size = sizeof (uint32_t) * 2;
3292 uint32_t offs = size;
3293
3294 if (ecb_expect_true (sp))
3295 {
3296 offs = sp[0];
3297 size = sp[1];
3298 }
3299
3300 if (ecb_expect_false (offs == size))
3301 {
3302 size *= 2;
3303 sp = realloc (sp, size);
3304 *s = sp;
3305 sp[1] = size;
3306
3307 }
3308
3309 ((uint8_t *)sp)[offs++] = byte;
3310 sp[0] = offs;
3311}
3312
3313ecb_cold static void
3314stream_put_v (stream s, uint32_t v)
3315{
3316 while (v > 0x7f)
3317 {
3318 stream_put (s, v | 0x80);
3319 v >>= 7;
3320 }
3321
3322 stream_put (s, v);
3323}
3324
3325ecb_cold static void
3326stream_put_tv (stream s, int bop, uint32_t v)
3327{
3328 printf ("put tv %d %d\n", bop, v);//D
3329 stream_put (s, bop);
3330 stream_put_v (s, v);
3331}
3332
3333ecb_cold static void
3334stream_put_stream (stream s, stream o)
3335{
3336 uint32_t i;
3337
3338 for (i = 0; i < stream_size (o); ++i)
3339 stream_put (s, stream_data (o)[i]);
3340
3341 stream_free (o);
3342}
3343
3344// calculates a (preferably small) integer that makes it possible to find
3345// the symbol again. if pointers were offsets into a memory area... until
3346// then, we return segment number in the low bits, and offset in the high
3347// bits.
3348// also, this function must never return 0.
3349ecb_cold static uint32_t
3350symbol_id (SCHEME_P_ pointer sym)
3351{
3352 struct cell *p = CELL (sym);
3353 int i;
3354
3355 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3356 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3357 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3358
3359 abort ();
3360}
3361
3362ecb_cold static uint32_t
3363cell_id (SCHEME_P_ pointer p)
3364{
3365 return symbol_id (SCHEME_A_ p);
3366}
3367
3368enum byteop
3369{
3370 BOP_NIL,
3371 BOP_SYNTAX,
3372 BOP_INTEGER,
3373 BOP_SYMBOL,
3374 BOP_LIST_BEG,
3375 BOP_LIST_END,
3376 BOP_BIFT, // branch if true
3377 BOP_BIFF, // branch if false
3378 BOP_BIFNE, // branch if not eqv?
3379 BOP_BRA, // "short" branch
3380 BOP_JMP, // "long" jump
3381 BOP_DATUM,
3382 BOP_LET,
3383 BOP_LETAST,
3384 BOP_LETREC,
3385 BOP_DEFINE,
3386 BOP_MACRO,
3387 BOP_SET,
3388 BOP_BEGIN,
3389 BOP_LAMBDA,
3390};
3391
3392ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3393
3394ecb_cold static void
3395compile_list (SCHEME_P_ stream s, pointer x)
3396{
3397 for (; x != NIL; x = cdr (x))
3398 compile_expr (SCHEME_A_ s, car (x));
3399}
3400
3199static void 3401static void
3200dump_stack_mark (SCHEME_P) 3402compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3201{ 3403{
3202 mark (SCHEME_V->dump); 3404 //TODO: borked
3203} 3405 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3204 3406
3205static pointer 3407 stream_put (s, BOP_BIFF);
3206ss_get_cont (SCHEME_P) 3408 compile_expr (SCHEME_A_ s, cond);
3409 stream_put_v (s, stream_size (sift));
3410 stream_put_stream (s, sift);
3411
3412 if (iff != NIL)
3413 {
3414 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3415 stream_put_tv (s, BOP_BRA, stream_size (siff));
3416 stream_put_stream (s, siff);
3417 }
3418}
3419
3420typedef uint32_t stream_fixup;
3421
3422static stream_fixup
3423stream_put_fixup (stream s)
3207{ 3424{
3208 return SCHEME_V->dump; 3425 stream_put (s, 0);
3426 stream_put (s, 0);
3427
3428 return stream_size (s);
3209} 3429}
3210 3430
3211static void 3431static void
3212ss_set_cont (SCHEME_P_ pointer cont) 3432stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3213{ 3433{
3214 SCHEME_V->dump = cont; 3434 target -= fixup;
3435 assert (target < (1 << 14));
3436 stream_data (s)[fixup - 2] = target | 0x80;
3437 stream_data (s)[fixup - 1] = target >> 7;
3215} 3438}
3216 3439
3217#endif
3218
3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3220
3221static int 3440static void
3441compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3442{
3443 if (cdr (x) == NIL)
3444 compile_expr (SCHEME_A_ s, car (x));
3445 else
3446 {
3447 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3448 compile_expr (SCHEME_A_ s, car (x));
3449 stream_fixup end = stream_put_fixup (s);
3450
3451 compile_and_or (SCHEME_A_ s, and, cdr (x));
3452 stream_fix_fixup (s, end, stream_size (s));
3453 }
3454}
3455
3456ecb_cold static void
3457compile_expr (SCHEME_P_ stream s, pointer x)
3458{
3459 if (x == NIL)
3460 {
3461 stream_put (s, BOP_NIL);
3462 return;
3463 }
3464
3465 if (is_pair (x))
3466 {
3467 pointer head = car (x);
3468
3469 if (is_syntax (head))
3470 {
3471 x = cdr (x);
3472
3473 switch (syntaxnum (head))
3474 {
3475 case OP_IF0: /* if */
3476 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3477 break;
3478
3479 case OP_OR0: /* or */
3480 compile_and_or (SCHEME_A_ s, 0, x);
3481 break;
3482
3483 case OP_AND0: /* and */
3484 compile_and_or (SCHEME_A_ s, 1, x);
3485 break;
3486
3487 case OP_CASE0: /* case */
3488 abort ();
3489 break;
3490
3491 case OP_COND0: /* cond */
3492 abort ();
3493 break;
3494
3495 case OP_LET0: /* let */
3496 case OP_LET0AST: /* let* */
3497 case OP_LET0REC: /* letrec */
3498 switch (syntaxnum (head))
3499 {
3500 case OP_LET0: stream_put (s, BOP_LET ); break;
3501 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3502 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3503 }
3504
3505 {
3506 pointer bindings = car (x);
3507 pointer body = cadr (x);
3508
3509 for (x = bindings; x != NIL; x = cdr (x))
3510 {
3511 pointer init = NIL;
3512 pointer var = car (x);
3513
3514 if (is_pair (var))
3515 {
3516 init = cdr (var);
3517 var = car (var);
3518 }
3519
3520 stream_put_v (s, symbol_id (SCHEME_A_ var));
3521 compile_expr (SCHEME_A_ s, init);
3522 }
3523
3524 stream_put_v (s, 0);
3525 compile_expr (SCHEME_A_ s, body);
3526 }
3527 break;
3528
3529 case OP_DEF0: /* define */
3530 case OP_MACRO0: /* macro */
3531 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3532 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3533 compile_expr (SCHEME_A_ s, cadr (x));
3534 break;
3535
3536 case OP_SET0: /* set! */
3537 stream_put (s, BOP_SET);
3538 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3539 compile_expr (SCHEME_A_ s, cadr (x));
3540 break;
3541
3542 case OP_BEGIN: /* begin */
3543 stream_put (s, BOP_BEGIN);
3544 compile_list (SCHEME_A_ s, x);
3545 return;
3546
3547 case OP_DELAY: /* delay */
3548 abort ();
3549 break;
3550
3551 case OP_QUOTE: /* quote */
3552 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3553 break;
3554
3555 case OP_LAMBDA: /* lambda */
3556 {
3557 pointer formals = car (x);
3558 pointer body = cadr (x);
3559
3560 stream_put (s, BOP_LAMBDA);
3561
3562 for (; is_pair (formals); formals = cdr (formals))
3563 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3564
3565 stream_put_v (s, 0);
3566 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3567
3568 compile_expr (SCHEME_A_ s, body);
3569 }
3570 break;
3571
3572 case OP_C0STREAM:/* cons-stream */
3573 abort ();
3574 break;
3575 }
3576
3577 return;
3578 }
3579
3580 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3581
3582 if (m != NIL)
3583 {
3584 m = slot_value_in_env (m);
3585
3586 if (is_macro (m))
3587 {
3588 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3589 SCHEME_V->code = m;
3590 SCHEME_V->args = cons (x, NIL);
3591 Eval_Cycle (SCHEME_A_ OP_APPLY);
3592 x = SCHEME_V->value;
3593 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3594 return;
3595 }
3596 }
3597 }
3598
3599 switch (type (x))
3600 {
3601 case T_INTEGER:
3602 {
3603 IVALUE iv = ivalue_unchecked (x);
3604 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3605 stream_put_tv (s, BOP_INTEGER, iv);
3606 }
3607 return;
3608
3609 case T_SYMBOL:
3610 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3611 return;
3612
3613 case T_PAIR:
3614 stream_put (s, BOP_LIST_BEG);
3615
3616 for (; x != NIL; x = cdr (x))
3617 compile_expr (SCHEME_A_ s, car (x));
3618
3619 stream_put (s, BOP_LIST_END);
3620 return;
3621
3622 default:
3623 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3624 break;
3625 }
3626}
3627
3628ecb_cold static int
3629compile_closure (SCHEME_P_ pointer p)
3630{
3631 stream s = stream_init ();
3632
3633 compile_list (SCHEME_A_ s, cdar (p));
3634
3635 FILE *xxd = popen ("xxd", "we");
3636 fwrite (stream_data (s), 1, stream_size (s), xxd);
3637 fclose (xxd);
3638
3639 return stream_size (s);
3640}
3641
3642#endif
3643
3644/* syntax, eval, core, ... */
3645ecb_hot static int
3222opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3646opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223{ 3647{
3224 pointer args = SCHEME_V->args; 3648 pointer args = SCHEME_V->args;
3225 pointer x, y; 3649 pointer x, y;
3226 3650
3227 switch (op) 3651 switch (op)
3228 { 3652 {
3653#if EXPERIMENT //D
3654 case OP_DEBUG:
3655 {
3656 uint32_t len = compile_closure (SCHEME_A_ car (args));
3657 printf ("len = %d\n", len);
3658 printf ("\n");
3659 s_return (S_T);
3660 }
3661
3662 case OP_DEBUG2:
3663 return -1;
3664#endif
3665
3229 case OP_LOAD: /* load */ 3666 case OP_LOAD: /* load */
3230 if (file_interactive (SCHEME_A)) 3667 if (file_interactive (SCHEME_A))
3231 { 3668 {
3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3669 putstr (SCHEME_A_ "Loading ");
3233 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3670 putstr (SCHEME_A_ strvalue (car (args)));
3671 putcharacter (SCHEME_A_ '\n');
3234 } 3672 }
3235 3673
3236 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3674 if (!file_push (SCHEME_A_ strvalue (car (args))))
3237 Error_1 ("unable to open", car (args)); 3675 Error_1 ("unable to open", car (args));
3238 else 3676
3239 {
3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3677 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3241 s_goto (OP_T0LVL); 3678 s_goto (OP_T0LVL);
3242 }
3243 3679
3244 case OP_T0LVL: /* top level */ 3680 case OP_T0LVL: /* top level */
3245 3681
3246 /* If we reached the end of file, this loop is done. */ 3682 /* If we reached the end of file, this loop is done. */
3247 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3683 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3248 { 3684 {
3249 if (SCHEME_V->file_i == 0) 3685 if (SCHEME_V->file_i == 0)
3250 { 3686 {
3251 SCHEME_V->args = NIL; 3687 SCHEME_V->args = NIL;
3252 s_goto (OP_QUIT); 3688 s_goto (OP_QUIT);
… …
3263 /* If interactive, be nice to user. */ 3699 /* If interactive, be nice to user. */
3264 if (file_interactive (SCHEME_A)) 3700 if (file_interactive (SCHEME_A))
3265 { 3701 {
3266 SCHEME_V->envir = SCHEME_V->global_env; 3702 SCHEME_V->envir = SCHEME_V->global_env;
3267 dump_stack_reset (SCHEME_A); 3703 dump_stack_reset (SCHEME_A);
3268 putstr (SCHEME_A_ "\n"); 3704 putcharacter (SCHEME_A_ '\n');
3705#if EXPERIMENT
3706 system ("ps v $PPID");
3707#endif
3269 putstr (SCHEME_A_ prompt); 3708 putstr (SCHEME_A_ prompt);
3270 } 3709 }
3271 3710
3272 /* Set up another iteration of REPL */ 3711 /* Set up another iteration of REPL */
3273 SCHEME_V->nesting = 0; 3712 SCHEME_V->nesting = 0;
… …
3308 { 3747 {
3309 SCHEME_V->print_flag = 1; 3748 SCHEME_V->print_flag = 1;
3310 SCHEME_V->args = SCHEME_V->value; 3749 SCHEME_V->args = SCHEME_V->value;
3311 s_goto (OP_P0LIST); 3750 s_goto (OP_P0LIST);
3312 } 3751 }
3313 else 3752
3314 s_return (SCHEME_V->value); 3753 s_return (SCHEME_V->value);
3315 3754
3316 case OP_EVAL: /* main part of evaluation */ 3755 case OP_EVAL: /* main part of evaluation */
3317#if USE_TRACING 3756#if USE_TRACING
3318 if (SCHEME_V->tracing) 3757 if (SCHEME_V->tracing)
3319 { 3758 {
… …
3330#endif 3769#endif
3331 if (is_symbol (SCHEME_V->code)) /* symbol */ 3770 if (is_symbol (SCHEME_V->code)) /* symbol */
3332 { 3771 {
3333 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3772 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3334 3773
3335 if (x != NIL) 3774 if (x == NIL)
3336 s_return (slot_value_in_env (x));
3337 else
3338 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3775 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3776
3777 s_return (slot_value_in_env (x));
3339 } 3778 }
3340 else if (is_pair (SCHEME_V->code)) 3779 else if (is_pair (SCHEME_V->code))
3341 { 3780 {
3342 x = car (SCHEME_V->code); 3781 x = car (SCHEME_V->code);
3343 3782
… …
3352 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3791 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3353 SCHEME_V->code = x; 3792 SCHEME_V->code = x;
3354 s_goto (OP_EVAL); 3793 s_goto (OP_EVAL);
3355 } 3794 }
3356 } 3795 }
3357 else 3796
3358 s_return (SCHEME_V->code); 3797 s_return (SCHEME_V->code);
3359 3798
3360 case OP_E0ARGS: /* eval arguments */ 3799 case OP_E0ARGS: /* eval arguments */
3361 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3800 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362 { 3801 {
3363 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3802 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3803 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365 SCHEME_V->code = SCHEME_V->value; 3804 SCHEME_V->code = SCHEME_V->value;
3366 s_goto (OP_APPLY); 3805 s_goto (OP_APPLY);
3367 } 3806 }
3368 else 3807
3369 {
3370 SCHEME_V->code = cdr (SCHEME_V->code); 3808 SCHEME_V->code = cdr (SCHEME_V->code);
3371 s_goto (OP_E1ARGS); 3809 s_goto (OP_E1ARGS);
3372 }
3373 3810
3374 case OP_E1ARGS: /* eval arguments */ 3811 case OP_E1ARGS: /* eval arguments */
3375 args = cons (SCHEME_V->value, args); 3812 args = cons (SCHEME_V->value, args);
3376 3813
3377 if (is_pair (SCHEME_V->code)) /* continue */ 3814 if (is_pair (SCHEME_V->code)) /* continue */
… …
3388 SCHEME_V->args = cdr (args); 3825 SCHEME_V->args = cdr (args);
3389 s_goto (OP_APPLY); 3826 s_goto (OP_APPLY);
3390 } 3827 }
3391 3828
3392#if USE_TRACING 3829#if USE_TRACING
3393
3394 case OP_TRACING: 3830 case OP_TRACING:
3395 { 3831 {
3396 int tr = SCHEME_V->tracing; 3832 int tr = SCHEME_V->tracing;
3397 3833
3398 SCHEME_V->tracing = ivalue (car (args)); 3834 SCHEME_V->tracing = ivalue_unchecked (car (args));
3399 s_return (mk_integer (SCHEME_A_ tr)); 3835 s_return (mk_integer (SCHEME_A_ tr));
3400 } 3836 }
3401
3402#endif 3837#endif
3403 3838
3404 case OP_APPLY: /* apply 'code' to 'args' */ 3839 case OP_APPLY: /* apply 'code' to 'args' */
3405#if USE_TRACING 3840#if USE_TRACING
3406 if (SCHEME_V->tracing) 3841 if (SCHEME_V->tracing)
… …
3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3855 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3421 else if (is_foreign (SCHEME_V->code)) 3856 else if (is_foreign (SCHEME_V->code))
3422 { 3857 {
3423 /* Keep nested calls from GC'ing the arglist */ 3858 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3859 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3860 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426 3861
3427 s_return (x); 3862 s_return (x);
3428 } 3863 }
3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3864 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3430 { 3865 {
… …
3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3895 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3461 { 3896 {
3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3897 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3463 s_return (args != NIL ? car (args) : NIL); 3898 s_return (args != NIL ? car (args) : NIL);
3464 } 3899 }
3465 else 3900
3466 Error_0 ("illegal function"); 3901 Error_0 ("illegal function");
3467 3902
3468 case OP_DOMACRO: /* do macro */ 3903 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3904 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3905 s_goto (OP_EVAL);
3471
3472#if 1
3473 3906
3474 case OP_LAMBDA: /* lambda */ 3907 case OP_LAMBDA: /* lambda */
3475 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3908 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3476 set SCHEME_V->value fall thru */ 3909 set SCHEME_V->value fall thru */
3477 { 3910 {
… …
3484 SCHEME_V->code = slot_value_in_env (f); 3917 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3918 s_goto (OP_APPLY);
3486 } 3919 }
3487 3920
3488 SCHEME_V->value = SCHEME_V->code; 3921 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3922 }
3923 /* Fallthru */
3491 3924
3492 case OP_LAMBDA1: 3925 case OP_LAMBDA1:
3493 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3926 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 3927
3502 case OP_MKCLOSURE: /* make-closure */ 3928 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3929 x = car (args);
3504 3930
3505 if (car (x) == SCHEME_V->LAMBDA) 3931 if (car (x) == SCHEME_V->LAMBDA)
… …
3544 else 3970 else
3545 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3971 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3546 3972
3547 s_return (SCHEME_V->code); 3973 s_return (SCHEME_V->code);
3548 3974
3549
3550 case OP_DEFP: /* defined? */ 3975 case OP_DEFP: /* defined? */
3551 x = SCHEME_V->envir; 3976 x = SCHEME_V->envir;
3552 3977
3553 if (cdr (args) != NIL) 3978 if (cdr (args) != NIL)
3554 x = cadr (args); 3979 x = cadr (args);
… …
3572 s_return (SCHEME_V->value); 3997 s_return (SCHEME_V->value);
3573 } 3998 }
3574 else 3999 else
3575 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4000 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3576 4001
3577
3578 case OP_BEGIN: /* begin */ 4002 case OP_BEGIN: /* begin */
3579 if (!is_pair (SCHEME_V->code)) 4003 if (!is_pair (SCHEME_V->code))
3580 s_return (SCHEME_V->code); 4004 s_return (SCHEME_V->code);
3581 4005
3582 if (cdr (SCHEME_V->code) != NIL) 4006 if (cdr (SCHEME_V->code) != NIL)
… …
3593 case OP_IF1: /* if */ 4017 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 4018 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 4019 SCHEME_V->code = car (SCHEME_V->code);
3596 else 4020 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4021 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4022
3598 s_goto (OP_EVAL); 4023 s_goto (OP_EVAL);
3599 4024
3600 case OP_LET0: /* let */ 4025 case OP_LET0: /* let */
3601 SCHEME_V->args = NIL; 4026 SCHEME_V->args = NIL;
3602 SCHEME_V->value = SCHEME_V->code; 4027 SCHEME_V->value = SCHEME_V->code;
3603 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4028 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3604 s_goto (OP_LET1); 4029 s_goto (OP_LET1);
3605 4030
3606 case OP_LET1: /* let (calculate parameters) */ 4031 case OP_LET1: /* let (calculate parameters) */
4032 case OP_LET1REC: /* letrec (calculate parameters) */
3607 args = cons (SCHEME_V->value, args); 4033 args = cons (SCHEME_V->value, args);
3608 4034
3609 if (is_pair (SCHEME_V->code)) /* continue */ 4035 if (is_pair (SCHEME_V->code)) /* continue */
3610 { 4036 {
3611 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4037 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3612 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4038 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3613 4039
3614 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4040 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3615 SCHEME_V->code = cadar (SCHEME_V->code); 4041 SCHEME_V->code = cadar (SCHEME_V->code);
3616 SCHEME_V->args = NIL; 4042 SCHEME_V->args = NIL;
3617 s_goto (OP_EVAL); 4043 s_goto (OP_EVAL);
3618 } 4044 }
3619 else /* end */ 4045
3620 { 4046 /* end */
3621 args = reverse_in_place (SCHEME_A_ NIL, args); 4047 args = reverse_in_place (SCHEME_A_ NIL, args);
3622 SCHEME_V->code = car (args); 4048 SCHEME_V->code = car (args);
3623 SCHEME_V->args = cdr (args); 4049 SCHEME_V->args = cdr (args);
3624 s_goto (OP_LET2); 4050 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3625 }
3626 4051
3627 case OP_LET2: /* let */ 4052 case OP_LET2: /* let */
3628 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4053 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3629 4054
3630 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4055 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3634 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4059 if (is_symbol (car (SCHEME_V->code))) /* named let */
3635 { 4060 {
3636 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4061 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3637 { 4062 {
3638 if (!is_pair (x)) 4063 if (!is_pair (x))
3639 Error_1 ("Bad syntax of binding in let :", x); 4064 Error_1 ("Bad syntax of binding in let:", x);
3640 4065
3641 if (!is_list (SCHEME_A_ car (x))) 4066 if (!is_list (SCHEME_A_ car (x)))
3642 Error_1 ("Bad syntax of binding in let :", car (x)); 4067 Error_1 ("Bad syntax of binding in let:", car (x));
3643 4068
3644 args = cons (caar (x), args); 4069 args = cons (caar (x), args);
3645 } 4070 }
3646 4071
3647 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4072 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3664 SCHEME_V->code = cdr (SCHEME_V->code); 4089 SCHEME_V->code = cdr (SCHEME_V->code);
3665 s_goto (OP_BEGIN); 4090 s_goto (OP_BEGIN);
3666 } 4091 }
3667 4092
3668 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4093 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3669 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4094 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3670 4095
3671 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4096 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3672 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4097 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3673 s_goto (OP_EVAL); 4098 s_goto (OP_EVAL);
3674 4099
… …
3685 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4110 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3686 SCHEME_V->code = cadar (SCHEME_V->code); 4111 SCHEME_V->code = cadar (SCHEME_V->code);
3687 SCHEME_V->args = NIL; 4112 SCHEME_V->args = NIL;
3688 s_goto (OP_EVAL); 4113 s_goto (OP_EVAL);
3689 } 4114 }
3690 else /* end */ 4115
4116 /* end */
3691 { 4117
3692 SCHEME_V->code = args; 4118 SCHEME_V->code = args;
3693 SCHEME_V->args = NIL; 4119 SCHEME_V->args = NIL;
3694 s_goto (OP_BEGIN); 4120 s_goto (OP_BEGIN);
3695 }
3696 4121
3697 case OP_LET0REC: /* letrec */ 4122 case OP_LET0REC: /* letrec */
3698 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4123 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3699 SCHEME_V->args = NIL; 4124 SCHEME_V->args = NIL;
3700 SCHEME_V->value = SCHEME_V->code; 4125 SCHEME_V->value = SCHEME_V->code;
3701 SCHEME_V->code = car (SCHEME_V->code); 4126 SCHEME_V->code = car (SCHEME_V->code);
3702 s_goto (OP_LET1REC); 4127 s_goto (OP_LET1REC);
3703 4128
3704 case OP_LET1REC: /* letrec (calculate parameters) */ 4129 /* OP_LET1REC handled by OP_LET1 */
3705 args = cons (SCHEME_V->value, args);
3706
3707 if (is_pair (SCHEME_V->code)) /* continue */
3708 {
3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3710 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3711
3712 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3713 SCHEME_V->code = cadar (SCHEME_V->code);
3714 SCHEME_V->args = NIL;
3715 s_goto (OP_EVAL);
3716 }
3717 else /* end */
3718 {
3719 args = reverse_in_place (SCHEME_A_ NIL, args);
3720 SCHEME_V->code = car (args);
3721 SCHEME_V->args = cdr (args);
3722 s_goto (OP_LET2REC);
3723 }
3724 4130
3725 case OP_LET2REC: /* letrec */ 4131 case OP_LET2REC: /* letrec */
3726 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4132 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3727 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4133 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3728 4134
… …
3758 } 4164 }
3759 else 4165 else
3760 { 4166 {
3761 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4167 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3762 s_return (NIL); 4168 s_return (NIL);
3763 else 4169
3764 {
3765 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4170 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3766 SCHEME_V->code = caar (SCHEME_V->code); 4171 SCHEME_V->code = caar (SCHEME_V->code);
3767 s_goto (OP_EVAL); 4172 s_goto (OP_EVAL);
3768 }
3769 } 4173 }
3770 4174
3771 case OP_DELAY: /* delay */ 4175 case OP_DELAY: /* delay */
3772 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4176 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3773 set_typeflag (x, T_PROMISE); 4177 set_typeflag (x, T_PROMISE);
… …
3784 case OP_AND1: /* and */ 4188 case OP_AND1: /* and */
3785 if (is_false (SCHEME_V->value)) 4189 if (is_false (SCHEME_V->value))
3786 s_return (SCHEME_V->value); 4190 s_return (SCHEME_V->value);
3787 else if (SCHEME_V->code == NIL) 4191 else if (SCHEME_V->code == NIL)
3788 s_return (SCHEME_V->value); 4192 s_return (SCHEME_V->value);
3789 else 4193
3790 {
3791 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4194 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3792 SCHEME_V->code = car (SCHEME_V->code); 4195 SCHEME_V->code = car (SCHEME_V->code);
3793 s_goto (OP_EVAL); 4196 s_goto (OP_EVAL);
3794 }
3795 4197
3796 case OP_OR0: /* or */ 4198 case OP_OR0: /* or */
3797 if (SCHEME_V->code == NIL) 4199 if (SCHEME_V->code == NIL)
3798 s_return (S_F); 4200 s_return (S_F);
3799 4201
… …
3804 case OP_OR1: /* or */ 4206 case OP_OR1: /* or */
3805 if (is_true (SCHEME_V->value)) 4207 if (is_true (SCHEME_V->value))
3806 s_return (SCHEME_V->value); 4208 s_return (SCHEME_V->value);
3807 else if (SCHEME_V->code == NIL) 4209 else if (SCHEME_V->code == NIL)
3808 s_return (SCHEME_V->value); 4210 s_return (SCHEME_V->value);
3809 else 4211
3810 {
3811 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4212 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3812 SCHEME_V->code = car (SCHEME_V->code); 4213 SCHEME_V->code = car (SCHEME_V->code);
3813 s_goto (OP_EVAL); 4214 s_goto (OP_EVAL);
3814 }
3815 4215
3816 case OP_C0STREAM: /* cons-stream */ 4216 case OP_C0STREAM: /* cons-stream */
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4217 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 4218 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 4219 s_goto (OP_EVAL);
… …
3884 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4284 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3885 SCHEME_V->code = caar (x); 4285 SCHEME_V->code = caar (x);
3886 s_goto (OP_EVAL); 4286 s_goto (OP_EVAL);
3887 } 4287 }
3888 } 4288 }
3889 else 4289
3890 s_return (NIL); 4290 s_return (NIL);
3891 4291
3892 case OP_CASE2: /* case */ 4292 case OP_CASE2: /* case */
3893 if (is_true (SCHEME_V->value)) 4293 if (is_true (SCHEME_V->value))
3894 s_goto (OP_BEGIN); 4294 s_goto (OP_BEGIN);
3895 else 4295
3896 s_return (NIL); 4296 s_return (NIL);
3897 4297
3898 case OP_PAPPLY: /* apply */ 4298 case OP_PAPPLY: /* apply */
3899 SCHEME_V->code = car (args); 4299 SCHEME_V->code = car (args);
3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4300 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3901 /*SCHEME_V->args = cadr(args); */ 4301 /*SCHEME_V->args = cadr(args); */
… …
3915 } 4315 }
3916 4316
3917 if (USE_ERROR_CHECKING) abort (); 4317 if (USE_ERROR_CHECKING) abort ();
3918} 4318}
3919 4319
3920static int 4320/* math, cxr */
4321ecb_hot static int
3921opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4322opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3922{ 4323{
3923 pointer args = SCHEME_V->args; 4324 pointer args = SCHEME_V->args;
3924 pointer x = car (args); 4325 pointer x = car (args);
3925 num v; 4326 num v;
3926 4327
3927#if USE_MATH
3928 RVALUE dd;
3929#endif
3930
3931 switch (op) 4328 switch (op)
3932 { 4329 {
3933#if USE_MATH 4330#if USE_MATH
3934 case OP_INEX2EX: /* inexact->exact */ 4331 case OP_INEX2EX: /* inexact->exact */
3935 if (num_is_integer (x)) 4332 if (!is_integer (x))
3936 s_return (x); 4333 {
3937 else if (modf (rvalue_unchecked (x), &dd) == 0) 4334 RVALUE r = rvalue_unchecked (x);
3938 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4335
4336 if (r == (RVALUE)(IVALUE)r)
4337 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3939 else 4338 else
3940 Error_1 ("inexact->exact: not integral:", x); 4339 Error_1 ("inexact->exact: not integral:", x);
4340 }
3941 4341
4342 s_return (x);
4343
4344 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4345 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4346 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4347 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4348
4349 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4350 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4351 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4352 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4353 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4354 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4355 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4356 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4357 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3949 4358
3950 case OP_ATAN: 4359 case OP_ATAN:
4360 s_return (mk_real (SCHEME_A_
3951 if (cdr (args) == NIL) 4361 cdr (args) == NIL
3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4362 ? atan (rvalue (x))
3953 else 4363 : atan2 (rvalue (x), rvalue (cadr (args)))));
3954 {
3955 pointer y = cadr (args);
3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3957 }
3958
3959 case OP_SQRT:
3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3961 4364
3962 case OP_EXPT: 4365 case OP_EXPT:
3963 { 4366 {
3964 RVALUE result; 4367 RVALUE result;
3965 int real_result = 1; 4368 int real_result = 1;
3966 pointer y = cadr (args); 4369 pointer y = cadr (args);
3967 4370
3968 if (num_is_integer (x) && num_is_integer (y)) 4371 if (is_integer (x) && is_integer (y))
3969 real_result = 0; 4372 real_result = 0;
3970 4373
3971 /* This 'if' is an R5RS compatibility fix. */ 4374 /* This 'if' is an R5RS compatibility fix. */
3972 /* NOTE: Remove this 'if' fix for R6RS. */ 4375 /* NOTE: Remove this 'if' fix for R6RS. */
3973 if (rvalue (x) == 0 && rvalue (y) < 0) 4376 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3979 /* If the test fails, result is too big for integer. */ 4382 /* If the test fails, result is too big for integer. */
3980 if (!real_result) 4383 if (!real_result)
3981 { 4384 {
3982 long result_as_long = result; 4385 long result_as_long = result;
3983 4386
3984 if (result != (RVALUE) result_as_long) 4387 if (result != result_as_long)
3985 real_result = 1; 4388 real_result = 1;
3986 } 4389 }
3987 4390
3988 if (real_result) 4391 if (real_result)
3989 s_return (mk_real (SCHEME_A_ result)); 4392 s_return (mk_real (SCHEME_A_ result));
3990 else 4393 else
3991 s_return (mk_integer (SCHEME_A_ result)); 4394 s_return (mk_integer (SCHEME_A_ result));
3992 } 4395 }
3993
3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996
3997 case OP_TRUNCATE:
3998 {
3999 RVALUE rvalue_of_x;
4000
4001 rvalue_of_x = rvalue (x);
4002
4003 if (rvalue_of_x > 0)
4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4005 else
4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007 }
4008
4009 case OP_ROUND:
4010 if (num_is_integer (x))
4011 s_return (x);
4012
4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014#endif 4396#endif
4015 4397
4016 case OP_ADD: /* + */ 4398 case OP_ADD: /* + */
4017 v = num_zero; 4399 v = num_zero;
4018 4400
… …
4106 else 4488 else
4107 Error_0 ("modulo: division by zero"); 4489 Error_0 ("modulo: division by zero");
4108 4490
4109 s_return (mk_number (SCHEME_A_ v)); 4491 s_return (mk_number (SCHEME_A_ v));
4110 4492
4111 case OP_CAR: /* car */ 4493 /* the compiler will optimize this mess... */
4112 s_return (caar (args)); 4494 case OP_CAR: op_car: s_return (car (x));
4113 4495 case OP_CDR: op_cdr: s_return (cdr (x));
4114 case OP_CDR: /* cdr */ 4496 case OP_CAAR: op_caar: x = car (x); goto op_car;
4115 s_return (cdar (args)); 4497 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4498 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4499 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4500 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4501 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4502 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4503 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4504 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4505 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4506 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4507 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4508 case OP_CAAAAR: x = car (x); goto op_caaar;
4509 case OP_CAAADR: x = cdr (x); goto op_caaar;
4510 case OP_CAADAR: x = car (x); goto op_caadr;
4511 case OP_CAADDR: x = cdr (x); goto op_caadr;
4512 case OP_CADAAR: x = car (x); goto op_cadar;
4513 case OP_CADADR: x = cdr (x); goto op_cadar;
4514 case OP_CADDAR: x = car (x); goto op_caddr;
4515 case OP_CADDDR: x = cdr (x); goto op_caddr;
4516 case OP_CDAAAR: x = car (x); goto op_cdaar;
4517 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4518 case OP_CDADAR: x = car (x); goto op_cdadr;
4519 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4520 case OP_CDDAAR: x = car (x); goto op_cddar;
4521 case OP_CDDADR: x = cdr (x); goto op_cddar;
4522 case OP_CDDDAR: x = car (x); goto op_cdddr;
4523 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4116 4524
4117 case OP_CONS: /* cons */ 4525 case OP_CONS: /* cons */
4118 set_cdr (args, cadr (args)); 4526 set_cdr (args, cadr (args));
4119 s_return (args); 4527 s_return (args);
4120 4528
… …
4135 } 4543 }
4136 else 4544 else
4137 Error_0 ("set-cdr!: unable to alter immutable pair"); 4545 Error_0 ("set-cdr!: unable to alter immutable pair");
4138 4546
4139 case OP_CHAR2INT: /* char->integer */ 4547 case OP_CHAR2INT: /* char->integer */
4140 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4548 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141 4549
4142 case OP_INT2CHAR: /* integer->char */ 4550 case OP_INT2CHAR: /* integer->char */
4143 s_return (mk_character (SCHEME_A_ ivalue (x))); 4551 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144 4552
4145 case OP_CHARUPCASE: 4553 case OP_CHARUPCASE:
4146 { 4554 {
4147 unsigned char c = ivalue (x); 4555 unsigned char c = ivalue_unchecked (x);
4148 c = toupper (c); 4556 c = toupper (c);
4149 s_return (mk_character (SCHEME_A_ c)); 4557 s_return (mk_character (SCHEME_A_ c));
4150 } 4558 }
4151 4559
4152 case OP_CHARDNCASE: 4560 case OP_CHARDNCASE:
4153 { 4561 {
4154 unsigned char c = ivalue (x); 4562 unsigned char c = ivalue_unchecked (x);
4155 c = tolower (c); 4563 c = tolower (c);
4156 s_return (mk_character (SCHEME_A_ c)); 4564 s_return (mk_character (SCHEME_A_ c));
4157 } 4565 }
4158 4566
4159 case OP_STR2SYM: /* string->symbol */ 4567 case OP_STR2SYM: /* string->symbol */
… …
4236 Error_1 ("atom->string: not an atom:", x); 4644 Error_1 ("atom->string: not an atom:", x);
4237 } 4645 }
4238 4646
4239 case OP_MKSTRING: /* make-string */ 4647 case OP_MKSTRING: /* make-string */
4240 { 4648 {
4241 int fill = ' '; 4649 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242 int len;
4243
4244 len = ivalue (x); 4650 int len = ivalue_unchecked (x);
4245
4246 if (cdr (args) != NIL)
4247 fill = charvalue (cadr (args));
4248 4651
4249 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4652 s_return (mk_empty_string (SCHEME_A_ len, fill));
4250 } 4653 }
4251 4654
4252 case OP_STRLEN: /* string-length */ 4655 case OP_STRLEN: /* string-length */
4253 s_return (mk_integer (SCHEME_A_ strlength (x))); 4656 s_return (mk_integer (SCHEME_A_ strlength (x)));
4254 4657
4255 case OP_STRREF: /* string-ref */ 4658 case OP_STRREF: /* string-ref */
4256 { 4659 {
4257 char *str;
4258 int index;
4259
4260 str = strvalue (x); 4660 char *str = strvalue (x);
4261
4262 index = ivalue (cadr (args)); 4661 int index = ivalue_unchecked (cadr (args));
4263 4662
4264 if (index >= strlength (x)) 4663 if (index >= strlength (x))
4265 Error_1 ("string-ref: out of bounds:", cadr (args)); 4664 Error_1 ("string-ref: out of bounds:", cadr (args));
4266 4665
4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4666 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268 } 4667 }
4269 4668
4270 case OP_STRSET: /* string-set! */ 4669 case OP_STRSET: /* string-set! */
4271 { 4670 {
4272 char *str; 4671 char *str = strvalue (x);
4273 int index; 4672 int index = ivalue_unchecked (cadr (args));
4274 int c; 4673 int c;
4275 4674
4276 if (is_immutable (x)) 4675 if (is_immutable (x))
4277 Error_1 ("string-set!: unable to alter immutable string:", x); 4676 Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279 str = strvalue (x);
4280
4281 index = ivalue (cadr (args));
4282 4677
4283 if (index >= strlength (x)) 4678 if (index >= strlength (x))
4284 Error_1 ("string-set!: out of bounds:", cadr (args)); 4679 Error_1 ("string-set!: out of bounds:", cadr (args));
4285 4680
4286 c = charvalue (caddr (args)); 4681 c = charvalue (caddr (args));
… …
4307 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4702 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4308 4703
4309 s_return (newstr); 4704 s_return (newstr);
4310 } 4705 }
4311 4706
4312 case OP_SUBSTR: /* substring */ 4707 case OP_STRING_COPY: /* substring/string-copy */
4313 { 4708 {
4314 char *str; 4709 char *str = strvalue (x);
4315 int index0; 4710 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4316 int index1; 4711 int index1;
4317 int len; 4712 int len;
4318 4713
4319 str = strvalue (x);
4320
4321 index0 = ivalue (cadr (args));
4322
4323 if (index0 > strlength (x)) 4714 if (index0 > strlength (x))
4324 Error_1 ("substring: start out of bounds:", cadr (args)); 4715 Error_1 ("string->copy: start out of bounds:", cadr (args));
4325 4716
4326 if (cddr (args) != NIL) 4717 if (cddr (args) != NIL)
4327 { 4718 {
4328 index1 = ivalue (caddr (args)); 4719 index1 = ivalue_unchecked (caddr (args));
4329 4720
4330 if (index1 > strlength (x) || index1 < index0) 4721 if (index1 > strlength (x) || index1 < index0)
4331 Error_1 ("substring: end out of bounds:", caddr (args)); 4722 Error_1 ("string->copy: end out of bounds:", caddr (args));
4332 } 4723 }
4333 else 4724 else
4334 index1 = strlength (x); 4725 index1 = strlength (x);
4335 4726
4336 len = index1 - index0; 4727 len = index1 - index0;
4337 x = mk_empty_string (SCHEME_A_ len, ' '); 4728 x = mk_counted_string (SCHEME_A_ str + index0, len);
4338 memcpy (strvalue (x), str + index0, len);
4339 strvalue (x)[len] = 0;
4340 4729
4341 s_return (x); 4730 s_return (x);
4342 } 4731 }
4343 4732
4344 case OP_VECTOR: /* vector */ 4733 case OP_VECTOR: /* vector */
… …
4356 if (SCHEME_V->no_memory) 4745 if (SCHEME_V->no_memory)
4357 s_return (S_SINK); 4746 s_return (S_SINK);
4358#endif 4747#endif
4359 4748
4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4749 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361 set_vector_elem (vec, i, car (x)); 4750 vector_set (vec, i, car (x));
4362 4751
4363 s_return (vec); 4752 s_return (vec);
4364 } 4753 }
4365 4754
4366 case OP_MKVECTOR: /* make-vector */ 4755 case OP_MKVECTOR: /* make-vector */
4367 { 4756 {
4368 pointer fill = NIL; 4757 pointer fill = NIL;
4369 int len;
4370 pointer vec; 4758 pointer vec;
4371
4372 len = ivalue (x); 4759 int len = ivalue_unchecked (x);
4373 4760
4374 if (cdr (args) != NIL) 4761 if (cdr (args) != NIL)
4375 fill = cadr (args); 4762 fill = cadr (args);
4376 4763
4377 vec = mk_vector (SCHEME_A_ len); 4764 vec = mk_vector (SCHEME_A_ len);
… …
4380 if (SCHEME_V->no_memory) 4767 if (SCHEME_V->no_memory)
4381 s_return (S_SINK); 4768 s_return (S_SINK);
4382#endif 4769#endif
4383 4770
4384 if (fill != NIL) 4771 if (fill != NIL)
4385 fill_vector (vec, fill); 4772 fill_vector (vec, 0, fill);
4386 4773
4387 s_return (vec); 4774 s_return (vec);
4388 } 4775 }
4389 4776
4390 case OP_VECLEN: /* vector-length */ 4777 case OP_VECLEN: /* vector-length */
4391 s_return (mk_integer (SCHEME_A_ veclength (x))); 4778 s_return (mk_integer (SCHEME_A_ veclength (x)));
4392 4779
4780 case OP_VECRESIZE:
4781 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4782 s_return (x);
4783
4393 case OP_VECREF: /* vector-ref */ 4784 case OP_VECREF: /* vector-ref */
4394 { 4785 {
4395 int index;
4396
4397 index = ivalue (cadr (args)); 4786 int index = ivalue_unchecked (cadr (args));
4398 4787
4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4788 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4789 Error_1 ("vector-ref: out of bounds:", cadr (args));
4401 4790
4402 s_return (vector_elem (x, index)); 4791 s_return (vector_get (x, index));
4403 } 4792 }
4404 4793
4405 case OP_VECSET: /* vector-set! */ 4794 case OP_VECSET: /* vector-set! */
4406 { 4795 {
4407 int index; 4796 int index = ivalue_unchecked (cadr (args));
4408 4797
4409 if (is_immutable (x)) 4798 if (is_immutable (x))
4410 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4799 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411 4800
4412 index = ivalue (cadr (args));
4413
4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4801 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4802 Error_1 ("vector-set!: out of bounds:", cadr (args));
4416 4803
4417 set_vector_elem (x, index, caddr (args)); 4804 vector_set (x, index, caddr (args));
4418 s_return (x); 4805 s_return (x);
4419 } 4806 }
4420 } 4807 }
4421 4808
4422 if (USE_ERROR_CHECKING) abort (); 4809 if (USE_ERROR_CHECKING) abort ();
4423} 4810}
4424 4811
4425INTERFACE int 4812/* relational ops */
4426is_list (SCHEME_P_ pointer a) 4813ecb_hot static int
4427{
4428 return list_length (SCHEME_A_ a) >= 0;
4429}
4430
4431/* Result is:
4432 proper list: length
4433 circular list: -1
4434 not even a pair: -2
4435 dotted list: -2 minus length before dot
4436*/
4437INTERFACE int
4438list_length (SCHEME_P_ pointer a)
4439{
4440 int i = 0;
4441 pointer slow, fast;
4442
4443 slow = fast = a;
4444
4445 while (1)
4446 {
4447 if (fast == NIL)
4448 return i;
4449
4450 if (!is_pair (fast))
4451 return -2 - i;
4452
4453 fast = cdr (fast);
4454 ++i;
4455
4456 if (fast == NIL)
4457 return i;
4458
4459 if (!is_pair (fast))
4460 return -2 - i;
4461
4462 ++i;
4463 fast = cdr (fast);
4464
4465 /* Safe because we would have already returned if `fast'
4466 encountered a non-pair. */
4467 slow = cdr (slow);
4468
4469 if (fast == slow)
4470 {
4471 /* the fast pointer has looped back around and caught up
4472 with the slow pointer, hence the structure is circular,
4473 not of finite length, and therefore not a list */
4474 return -1;
4475 }
4476 }
4477}
4478
4479static int
4480opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4814opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{ 4815{
4482 pointer x = SCHEME_V->args; 4816 pointer x = SCHEME_V->args;
4483 4817
4484 for (;;) 4818 for (;;)
… …
4505 } 4839 }
4506 4840
4507 s_return (S_T); 4841 s_return (S_T);
4508} 4842}
4509 4843
4510static int 4844/* predicates */
4845ecb_hot static int
4511opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4846opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4512{ 4847{
4513 pointer args = SCHEME_V->args; 4848 pointer args = SCHEME_V->args;
4514 pointer a = car (args); 4849 pointer a = car (args);
4515 pointer d = cdr (args); 4850 pointer d = cdr (args);
4516 int r; 4851 int r;
4517 4852
4518 switch (op) 4853 switch (op)
4519 { 4854 {
4520 case OP_NOT: /* not */ r = is_false (a) ; break; 4855 case OP_NOT: /* not */ r = is_false (a) ; break;
4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4856 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4857 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break; 4858 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4859 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4860 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4861 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4862 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4863 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4864 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4865 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530 4866
4531#if USE_CHAR_CLASSIFIERS 4867#if USE_CHAR_CLASSIFIERS
4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4868 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4869 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4870 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4871 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4872 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537#endif 4873#endif
4538 4874
4539#if USE_PORTS 4875#if USE_PORTS
4540 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4876 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4877 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4561 } 4897 }
4562 4898
4563 s_retbool (r); 4899 s_retbool (r);
4564} 4900}
4565 4901
4566static int 4902/* promises, list ops, ports */
4903ecb_hot static int
4567opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4904opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4568{ 4905{
4569 pointer args = SCHEME_V->args; 4906 pointer args = SCHEME_V->args;
4570 pointer a = car (args); 4907 pointer a = car (args);
4571 pointer x, y; 4908 pointer x, y;
… …
4584 } 4921 }
4585 else 4922 else
4586 s_return (SCHEME_V->code); 4923 s_return (SCHEME_V->code);
4587 4924
4588 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4925 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4589 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4926 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4590 s_return (SCHEME_V->value); 4927 s_return (SCHEME_V->value);
4591 4928
4592#if USE_PORTS 4929#if USE_PORTS
4930
4931 case OP_EOF_OBJECT: /* eof-object */
4932 s_return (S_EOF);
4593 4933
4594 case OP_WRITE: /* write */ 4934 case OP_WRITE: /* write */
4595 case OP_DISPLAY: /* display */ 4935 case OP_DISPLAY: /* display */
4596 case OP_WRITE_CHAR: /* write-char */ 4936 case OP_WRITE_CHAR: /* write-char */
4597 if (is_pair (cdr (SCHEME_V->args))) 4937 if (is_pair (cdr (SCHEME_V->args)))
… …
4611 else 4951 else
4612 SCHEME_V->print_flag = 0; 4952 SCHEME_V->print_flag = 0;
4613 4953
4614 s_goto (OP_P0LIST); 4954 s_goto (OP_P0LIST);
4615 4955
4956 //TODO: move to scheme
4616 case OP_NEWLINE: /* newline */ 4957 case OP_NEWLINE: /* newline */
4617 if (is_pair (args)) 4958 if (is_pair (args))
4618 { 4959 {
4619 if (a != SCHEME_V->outport) 4960 if (a != SCHEME_V->outport)
4620 { 4961 {
… …
4622 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4963 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4623 SCHEME_V->outport = a; 4964 SCHEME_V->outport = a;
4624 } 4965 }
4625 } 4966 }
4626 4967
4627 putstr (SCHEME_A_ "\n"); 4968 putcharacter (SCHEME_A_ '\n');
4628 s_return (S_T); 4969 s_return (S_T);
4629#endif 4970#endif
4630 4971
4631 case OP_ERR0: /* error */ 4972 case OP_ERR0: /* error */
4632 SCHEME_V->retcode = -1; 4973 SCHEME_V->retcode = -1;
… …
4641 putstr (SCHEME_A_ strvalue (car (args))); 4982 putstr (SCHEME_A_ strvalue (car (args)));
4642 SCHEME_V->args = cdr (args); 4983 SCHEME_V->args = cdr (args);
4643 s_goto (OP_ERR1); 4984 s_goto (OP_ERR1);
4644 4985
4645 case OP_ERR1: /* error */ 4986 case OP_ERR1: /* error */
4646 putstr (SCHEME_A_ " "); 4987 putcharacter (SCHEME_A_ ' ');
4647 4988
4648 if (args != NIL) 4989 if (args != NIL)
4649 { 4990 {
4650 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4991 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4651 SCHEME_V->args = a; 4992 SCHEME_V->args = a;
4652 SCHEME_V->print_flag = 1; 4993 SCHEME_V->print_flag = 1;
4653 s_goto (OP_P0LIST); 4994 s_goto (OP_P0LIST);
4654 } 4995 }
4655 else 4996 else
4656 { 4997 {
4657 putstr (SCHEME_A_ "\n"); 4998 putcharacter (SCHEME_A_ '\n');
4658 4999
4659 if (SCHEME_V->interactive_repl) 5000 if (SCHEME_V->interactive_repl)
4660 s_goto (OP_T0LVL); 5001 s_goto (OP_T0LVL);
4661 else 5002 else
4662 return -1; 5003 return -1;
… …
4739 SCHEME_V->gc_verbose = (a != S_F); 5080 SCHEME_V->gc_verbose = (a != S_F);
4740 s_retbool (was); 5081 s_retbool (was);
4741 } 5082 }
4742 5083
4743 case OP_NEWSEGMENT: /* new-segment */ 5084 case OP_NEWSEGMENT: /* new-segment */
5085#if 0
4744 if (!is_pair (args) || !is_number (a)) 5086 if (!is_pair (args) || !is_number (a))
4745 Error_0 ("new-segment: argument must be a number"); 5087 Error_0 ("new-segment: argument must be a number");
4746 5088#endif
4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 5089 s_retbool (alloc_cellseg (SCHEME_A));
4748
4749 s_return (S_T);
4750 5090
4751 case OP_OBLIST: /* oblist */ 5091 case OP_OBLIST: /* oblist */
4752 s_return (oblist_all_symbols (SCHEME_A)); 5092 s_return (oblist_all_symbols (SCHEME_A));
4753 5093
4754#if USE_PORTS 5094#if USE_PORTS
… …
4824 s_return (p == NIL ? S_F : p); 5164 s_return (p == NIL ? S_F : p);
4825 } 5165 }
4826 5166
4827 case OP_GET_OUTSTRING: /* get-output-string */ 5167 case OP_GET_OUTSTRING: /* get-output-string */
4828 { 5168 {
4829 port *p; 5169 port *p = port (a);
4830 5170
4831 if ((p = a->object.port)->kind & port_string) 5171 if (p->kind & port_string)
4832 { 5172 {
4833 off_t size; 5173 off_t size;
4834 char *str; 5174 char *str;
4835 5175
4836 size = p->rep.string.curr - p->rep.string.start + 1; 5176 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4871 } 5211 }
4872 5212
4873 if (USE_ERROR_CHECKING) abort (); 5213 if (USE_ERROR_CHECKING) abort ();
4874} 5214}
4875 5215
4876static int 5216/* reading */
5217ecb_cold static int
4877opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5218opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4878{ 5219{
4879 pointer args = SCHEME_V->args; 5220 pointer args = SCHEME_V->args;
4880 pointer x; 5221 pointer x;
4881 5222
… …
4941 int res; 5282 int res;
4942 5283
4943 if (is_pair (args)) 5284 if (is_pair (args))
4944 p = car (args); 5285 p = car (args);
4945 5286
4946 res = p->object.port->kind & port_string; 5287 res = port (p)->kind & port_string;
4947 5288
4948 s_retbool (res); 5289 s_retbool (res);
4949 } 5290 }
4950 5291
4951 case OP_SET_INPORT: /* set-input-port */ 5292 case OP_SET_INPORT: /* set-input-port */
… …
4960 case OP_RDSEXPR: 5301 case OP_RDSEXPR:
4961 switch (SCHEME_V->tok) 5302 switch (SCHEME_V->tok)
4962 { 5303 {
4963 case TOK_EOF: 5304 case TOK_EOF:
4964 s_return (S_EOF); 5305 s_return (S_EOF);
4965 /* NOTREACHED */
4966 5306
4967 case TOK_VEC: 5307 case TOK_VEC:
4968 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5308 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4969 /* fall through */ 5309 /* fall through */
4970 5310
… …
4973 5313
4974 if (SCHEME_V->tok == TOK_RPAREN) 5314 if (SCHEME_V->tok == TOK_RPAREN)
4975 s_return (NIL); 5315 s_return (NIL);
4976 else if (SCHEME_V->tok == TOK_DOT) 5316 else if (SCHEME_V->tok == TOK_DOT)
4977 Error_0 ("syntax error: illegal dot expression"); 5317 Error_0 ("syntax error: illegal dot expression");
4978 else 5318
4979 {
4980 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5319 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4981 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5320 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4982 s_goto (OP_RDSEXPR); 5321 s_goto (OP_RDSEXPR);
4983 }
4984 5322
4985 case TOK_QUOTE: 5323 case TOK_QUOTE:
4986 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5324 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4987 SCHEME_V->tok = token (SCHEME_A); 5325 SCHEME_V->tok = token (SCHEME_A);
4988 s_goto (OP_RDSEXPR); 5326 s_goto (OP_RDSEXPR);
… …
4994 { 5332 {
4995 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5333 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4996 SCHEME_V->tok = TOK_LPAREN; 5334 SCHEME_V->tok = TOK_LPAREN;
4997 s_goto (OP_RDSEXPR); 5335 s_goto (OP_RDSEXPR);
4998 } 5336 }
4999 else 5337
5000 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5338 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5001
5002 s_goto (OP_RDSEXPR); 5339 s_goto (OP_RDSEXPR);
5003 5340
5004 case TOK_COMMA: 5341 case TOK_COMMA:
5005 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5342 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5006 SCHEME_V->tok = token (SCHEME_A); 5343 SCHEME_V->tok = token (SCHEME_A);
… …
5010 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5347 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011 SCHEME_V->tok = token (SCHEME_A); 5348 SCHEME_V->tok = token (SCHEME_A);
5012 s_goto (OP_RDSEXPR); 5349 s_goto (OP_RDSEXPR);
5013 5350
5014 case TOK_ATOM: 5351 case TOK_ATOM:
5015 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5352 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5353
5354 case TOK_DOTATOM:
5355 SCHEME_V->strbuff[0] = '.';
5356 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5357
5358 case TOK_STRATOM:
5359 //TODO: haven't checked whether the garbage collector could interfere and free x
5360 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5361 x = readstrexp (SCHEME_A_ '|');
5362 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016 5363
5017 case TOK_DQUOTE: 5364 case TOK_DQUOTE:
5018 x = readstrexp (SCHEME_A); 5365 x = readstrexp (SCHEME_A_ '"');
5019 5366
5020 if (x == S_F) 5367 if (x == S_F)
5021 Error_0 ("Error reading string"); 5368 Error_0 ("Error reading string");
5022 5369
5023 setimmutable (x); 5370 setimmutable (x);
… …
5027 { 5374 {
5028 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5375 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5029 5376
5030 if (f == NIL) 5377 if (f == NIL)
5031 Error_0 ("undefined sharp expression"); 5378 Error_0 ("undefined sharp expression");
5032 else 5379
5033 {
5034 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5380 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5035 s_goto (OP_EVAL); 5381 s_goto (OP_EVAL);
5036 }
5037 } 5382 }
5038 5383
5039 case TOK_SHARP_CONST: 5384 case TOK_SHARP_CONST:
5040 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5385 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041 Error_0 ("undefined sharp expression"); 5386 Error_0 ("undefined sharp expression");
5042 else 5387
5043 s_return (x); 5388 s_return (x);
5044 5389
5045 default: 5390 default:
5046 Error_0 ("syntax error: illegal token"); 5391 Error_0 ("syntax error: illegal token");
5047 } 5392 }
5048 5393
… …
5141 pointer b = cdr (args); 5486 pointer b = cdr (args);
5142 int ok_abbr = ok_abbrev (b); 5487 int ok_abbr = ok_abbrev (b);
5143 SCHEME_V->args = car (b); 5488 SCHEME_V->args = car (b);
5144 5489
5145 if (a == SCHEME_V->QUOTE && ok_abbr) 5490 if (a == SCHEME_V->QUOTE && ok_abbr)
5146 putstr (SCHEME_A_ "'"); 5491 putcharacter (SCHEME_A_ '\'');
5147 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5492 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5148 putstr (SCHEME_A_ "`"); 5493 putcharacter (SCHEME_A_ '`');
5149 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5494 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5150 putstr (SCHEME_A_ ","); 5495 putcharacter (SCHEME_A_ ',');
5151 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5496 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5152 putstr (SCHEME_A_ ",@"); 5497 putstr (SCHEME_A_ ",@");
5153 else 5498 else
5154 { 5499 {
5155 putstr (SCHEME_A_ "("); 5500 putcharacter (SCHEME_A_ '(');
5156 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5501 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5157 SCHEME_V->args = a; 5502 SCHEME_V->args = a;
5158 } 5503 }
5159 5504
5160 s_goto (OP_P0LIST); 5505 s_goto (OP_P0LIST);
… …
5162 5507
5163 case OP_P1LIST: 5508 case OP_P1LIST:
5164 if (is_pair (args)) 5509 if (is_pair (args))
5165 { 5510 {
5166 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5511 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5167 putstr (SCHEME_A_ " "); 5512 putcharacter (SCHEME_A_ ' ');
5168 SCHEME_V->args = car (args); 5513 SCHEME_V->args = car (args);
5169 s_goto (OP_P0LIST); 5514 s_goto (OP_P0LIST);
5170 } 5515 }
5171 else if (is_vector (args)) 5516 else if (is_vector (args))
5172 { 5517 {
… …
5180 { 5525 {
5181 putstr (SCHEME_A_ " . "); 5526 putstr (SCHEME_A_ " . ");
5182 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5527 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5183 } 5528 }
5184 5529
5185 putstr (SCHEME_A_ ")"); 5530 putcharacter (SCHEME_A_ ')');
5186 s_return (S_T); 5531 s_return (S_T);
5187 } 5532 }
5188 5533
5189 case OP_PVECFROM: 5534 case OP_PVECFROM:
5190 { 5535 {
… …
5192 pointer vec = car (args); 5537 pointer vec = car (args);
5193 int len = veclength (vec); 5538 int len = veclength (vec);
5194 5539
5195 if (i == len) 5540 if (i == len)
5196 { 5541 {
5197 putstr (SCHEME_A_ ")"); 5542 putcharacter (SCHEME_A_ ')');
5198 s_return (S_T); 5543 s_return (S_T);
5199 } 5544 }
5200 else 5545 else
5201 { 5546 {
5202 pointer elem = vector_elem (vec, i); 5547 pointer elem = vector_get (vec, i);
5203 5548
5204 ivalue_unchecked (cdr (args)) = i + 1; 5549 ivalue_unchecked (cdr (args)) = i + 1;
5205 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5550 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206 SCHEME_V->args = elem; 5551 SCHEME_V->args = elem;
5207 5552
5208 if (i > 0) 5553 if (i > 0)
5209 putstr (SCHEME_A_ " "); 5554 putcharacter (SCHEME_A_ ' ');
5210 5555
5211 s_goto (OP_P0LIST); 5556 s_goto (OP_P0LIST);
5212 } 5557 }
5213 } 5558 }
5214 } 5559 }
5215 5560
5216 if (USE_ERROR_CHECKING) abort (); 5561 if (USE_ERROR_CHECKING) abort ();
5217} 5562}
5218 5563
5219static int 5564/* list ops */
5565ecb_hot static int
5220opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5566opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5221{ 5567{
5222 pointer args = SCHEME_V->args; 5568 pointer args = SCHEME_V->args;
5223 pointer a = car (args); 5569 pointer a = car (args);
5224 pointer x, y; 5570 pointer x, y;
… …
5247 break; 5593 break;
5248 } 5594 }
5249 5595
5250 if (is_pair (y)) 5596 if (is_pair (y))
5251 s_return (car (y)); 5597 s_return (car (y));
5252 else 5598
5253 s_return (S_F); 5599 s_return (S_F);
5254
5255 5600
5256 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5601 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5257 SCHEME_V->args = a; 5602 SCHEME_V->args = a;
5258 5603
5259 if (SCHEME_V->args == NIL) 5604 if (SCHEME_V->args == NIL)
5260 s_return (S_F); 5605 s_return (S_F);
5261 else if (is_closure (SCHEME_V->args)) 5606 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5262 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5607 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5263 else if (is_macro (SCHEME_V->args)) 5608
5264 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5265 else
5266 s_return (S_F); 5609 s_return (S_F);
5267 5610
5268 case OP_CLOSUREP: /* closure? */ 5611 case OP_CLOSUREP: /* closure? */
5269 /* 5612 /*
5270 * Note, macro object is also a closure. 5613 * Note, macro object is also a closure.
5271 * Therefore, (closure? <#MACRO>) ==> #t 5614 * Therefore, (closure? <#MACRO>) ==> #t
5615 * (schmorp) well, obviously not, fix? TODO
5272 */ 5616 */
5273 s_retbool (is_closure (a)); 5617 s_retbool (is_closure (a));
5274 5618
5275 case OP_MACROP: /* macro? */ 5619 case OP_MACROP: /* macro? */
5276 s_retbool (is_macro (a)); 5620 s_retbool (is_macro (a));
… …
5281 5625
5282/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5626/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5283typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5627typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284 5628
5285typedef int (*test_predicate)(pointer); 5629typedef int (*test_predicate)(pointer);
5286static int 5630
5631ecb_hot static int
5287is_any (pointer p) 5632tst_any (pointer p)
5288{ 5633{
5289 return 1; 5634 return 1;
5290} 5635}
5291 5636
5292static int 5637ecb_hot static int
5293is_nonneg (pointer p) 5638tst_inonneg (pointer p)
5294{ 5639{
5295 return ivalue (p) >= 0 && is_integer (p); 5640 return is_integer (p) && ivalue_unchecked (p) >= 0;
5296} 5641}
5297 5642
5298static int 5643ecb_hot static int
5299tst_is_list (pointer p) 5644tst_is_list (SCHEME_P_ pointer p)
5300{ 5645{
5301 return p == NIL || is_pair (p); 5646 return p == NIL || is_pair (p);
5302} 5647}
5303 5648
5304/* Correspond carefully with following defines! */ 5649/* Correspond carefully with following defines! */
5305static struct 5650static struct
5306{ 5651{
5307 test_predicate fct; 5652 test_predicate fct;
5308 const char *kind; 5653 const char *kind;
5309} tests[] = 5654} tests[] = {
5310{
5311 { is_any, 0 }, 5655 { tst_any , 0 },
5312 { is_string, "string" }, 5656 { is_string , "string" },
5313 { is_symbol, "symbol" }, 5657 { is_symbol , "symbol" },
5314 { is_port, "port" }, 5658 { is_port , "port" },
5315 { is_inport, "input port" }, 5659 { is_inport , "input port" },
5316 { is_outport, "output port" }, 5660 { is_outport , "output port" },
5317 { is_environment, "environment" }, 5661 { is_environment, "environment" },
5318 { is_pair, "pair" }, 5662 { is_pair , "pair" },
5319 { tst_is_list, "pair or '()" }, 5663 { 0 , "pair or '()" },
5320 { is_character, "character" }, 5664 { is_character , "character" },
5321 { is_vector, "vector" }, 5665 { is_vector , "vector" },
5322 { is_number, "number" }, 5666 { is_number , "number" },
5323 { is_integer, "integer" }, 5667 { is_integer , "integer" },
5324 { is_nonneg, "non-negative integer" } 5668 { tst_inonneg , "non-negative integer" }
5325}; 5669};
5326 5670
5327#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5671#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328#define TST_ANY "\001" 5672#define TST_ANY "\001"
5329#define TST_STRING "\002" 5673#define TST_STRING "\002"
… …
5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5691#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5348#include "opdefines.h" 5692#include "opdefines.h"
5349#undef OP_DEF 5693#undef OP_DEF
5350; 5694;
5351 5695
5352static const char * 5696ecb_cold static const char *
5353opname (int idx) 5697opname (int idx)
5354{ 5698{
5355 const char *name = opnames; 5699 const char *name = opnames;
5356 5700
5357 /* should do this at compile time, but would require external program, right? */ 5701 /* should do this at compile time, but would require external program, right? */
… …
5359 name += strlen (name) + 1; 5703 name += strlen (name) + 1;
5360 5704
5361 return *name ? name : "ILLEGAL"; 5705 return *name ? name : "ILLEGAL";
5362} 5706}
5363 5707
5364static const char * 5708ecb_cold static const char *
5365procname (pointer x) 5709procname (pointer x)
5366{ 5710{
5367 return opname (procnum (x)); 5711 return opname (procnum (x));
5368} 5712}
5369 5713
5370typedef struct 5714typedef struct
5371{ 5715{
5372 uint8_t func; 5716 uint8_t func;
5373 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5717 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374 uint8_t builtin; 5718 uint8_t builtin;
5719#if USE_ERROR_CHECKING
5375 uint8_t min_arity; 5720 uint8_t min_arity;
5376 uint8_t max_arity; 5721 uint8_t max_arity;
5377 char arg_tests_encoding[3]; 5722 char arg_tests_encoding[3];
5723#endif
5378} op_code_info; 5724} op_code_info;
5379 5725
5380static const op_code_info dispatch_table[] = { 5726static const op_code_info dispatch_table[] = {
5727#if USE_ERROR_CHECKING
5381#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5728#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5729#else
5730#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5731#endif
5382#include "opdefines.h" 5732#include "opdefines.h"
5383#undef OP_DEF 5733#undef OP_DEF
5384 {0} 5734 {0}
5385}; 5735};
5386 5736
5387/* kernel of this interpreter */ 5737/* kernel of this interpreter */
5388static void ecb_hot 5738ecb_hot static void
5389Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5739Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5390{ 5740{
5391 SCHEME_V->op = op; 5741 SCHEME_V->op = op;
5392 5742
5393 for (;;) 5743 for (;;)
… …
5428 { 5778 {
5429 pointer arg = car (arglist); 5779 pointer arg = car (arglist);
5430 5780
5431 j = t[0]; 5781 j = t[0];
5432 5782
5783 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5784 if (j == TST_LIST[0])
5785 {
5786 if (!tst_is_list (SCHEME_A_ arg))
5787 break;
5788 }
5789 else
5790 {
5433 if (!tests[j - 1].fct (arg)) 5791 if (!tests[j - 1].fct (arg))
5434 break; 5792 break;
5793 }
5435 5794
5436 if (t[1]) /* last test is replicated as necessary */ 5795 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437 t++; 5796 t++;
5438 5797
5439 arglist = cdr (arglist); 5798 arglist = cdr (arglist);
5440 i++; 5799 i++;
5441 } 5800 }
… …
5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5826 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5468 return; 5827 return;
5469 5828
5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5829 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5471 { 5830 {
5472 xwrstr ("No memory!\n"); 5831 putstr (SCHEME_A_ "No memory!\n");
5473 return; 5832 return;
5474 } 5833 }
5475 } 5834 }
5476} 5835}
5477 5836
5478/* ========== Initialization of internal keywords ========== */ 5837/* ========== Initialization of internal keywords ========== */
5479 5838
5480static void 5839ecb_cold static void
5481assign_syntax (SCHEME_P_ const char *name) 5840assign_syntax (SCHEME_P_ const char *name)
5482{ 5841{
5483 pointer x = oblist_add_by_name (SCHEME_A_ name); 5842 pointer x = oblist_add_by_name (SCHEME_A_ name);
5484 set_typeflag (x, typeflag (x) | T_SYNTAX); 5843 set_typeflag (x, typeflag (x) | T_SYNTAX);
5485} 5844}
5486 5845
5487static void 5846ecb_cold static void
5488assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5847assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5489{ 5848{
5490 pointer x = mk_symbol (SCHEME_A_ name); 5849 pointer x = mk_symbol (SCHEME_A_ name);
5491 pointer y = mk_proc (SCHEME_A_ op); 5850 pointer y = mk_proc (SCHEME_A_ op);
5492 new_slot_in_env (SCHEME_A_ x, y); 5851 new_slot_in_env (SCHEME_A_ x, y);
… …
5496mk_proc (SCHEME_P_ enum scheme_opcodes op) 5855mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497{ 5856{
5498 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5857 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499 set_typeflag (y, (T_PROC | T_ATOM)); 5858 set_typeflag (y, (T_PROC | T_ATOM));
5500 ivalue_unchecked (y) = op; 5859 ivalue_unchecked (y) = op;
5501 set_num_integer (y);
5502 return y; 5860 return y;
5503} 5861}
5504 5862
5505/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5863/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506static int 5864ecb_hot static int
5507syntaxnum (pointer p) 5865syntaxnum (pointer p)
5508{ 5866{
5509 const char *s = strvalue (car (p)); 5867 const char *s = strvalue (p);
5510 5868
5511 switch (strlength (car (p))) 5869 switch (strlength (p))
5512 { 5870 {
5513 case 2: 5871 case 2:
5514 if (s[0] == 'i') 5872 if (s[0] == 'i')
5515 return OP_IF0; /* if */ 5873 return OP_IF0; /* if */
5516 else 5874 else
… …
5591ecb_cold int 5949ecb_cold int
5592scheme_init (SCHEME_P) 5950scheme_init (SCHEME_P)
5593{ 5951{
5594 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5952 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5595 pointer x; 5953 pointer x;
5954
5955 /* this memset is not strictly correct, as we assume (intcache)
5956 * that memset 0 will also set pointers to 0, but memset does
5957 * of course not guarantee that. screw such systems.
5958 */
5959 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5596 5960
5597 num_set_fixnum (num_zero, 1); 5961 num_set_fixnum (num_zero, 1);
5598 num_set_ivalue (num_zero, 0); 5962 num_set_ivalue (num_zero, 0);
5599 num_set_fixnum (num_one, 1); 5963 num_set_fixnum (num_one, 1);
5600 num_set_ivalue (num_one, 1); 5964 num_set_ivalue (num_one, 1);
… …
5612 SCHEME_V->save_inport = NIL; 5976 SCHEME_V->save_inport = NIL;
5613 SCHEME_V->loadport = NIL; 5977 SCHEME_V->loadport = NIL;
5614 SCHEME_V->nesting = 0; 5978 SCHEME_V->nesting = 0;
5615 SCHEME_V->interactive_repl = 0; 5979 SCHEME_V->interactive_repl = 0;
5616 5980
5617 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5981 if (!alloc_cellseg (SCHEME_A))
5618 { 5982 {
5619#if USE_ERROR_CHECKING 5983#if USE_ERROR_CHECKING
5620 SCHEME_V->no_memory = 1; 5984 SCHEME_V->no_memory = 1;
5621 return 0; 5985 return 0;
5622#endif 5986#endif
5623 } 5987 }
5624 5988
5625 SCHEME_V->gc_verbose = 0; 5989 SCHEME_V->gc_verbose = 0;
5626 dump_stack_initialize (SCHEME_A); 5990 dump_stack_initialize (SCHEME_A);
5627 SCHEME_V->code = NIL; 5991 SCHEME_V->code = NIL;
5628 SCHEME_V->args = NIL; 5992 SCHEME_V->args = NIL;
5629 SCHEME_V->envir = NIL; 5993 SCHEME_V->envir = NIL;
5994 SCHEME_V->value = NIL;
5630 SCHEME_V->tracing = 0; 5995 SCHEME_V->tracing = 0;
5631 5996
5632 /* init NIL */ 5997 /* init NIL */
5633 set_typeflag (NIL, T_ATOM | T_MARK); 5998 set_typeflag (NIL, T_ATOM | T_MARK);
5634 set_car (NIL, NIL); 5999 set_car (NIL, NIL);
… …
5690 6055
5691 return !SCHEME_V->no_memory; 6056 return !SCHEME_V->no_memory;
5692} 6057}
5693 6058
5694#if USE_PORTS 6059#if USE_PORTS
5695void 6060ecb_cold void
5696scheme_set_input_port_file (SCHEME_P_ int fin) 6061scheme_set_input_port_file (SCHEME_P_ int fin)
5697{ 6062{
5698 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6063 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5699} 6064}
5700 6065
5701void 6066ecb_cold void
5702scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6067scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5703{ 6068{
5704 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6069 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5705} 6070}
5706 6071
5707void 6072ecb_cold void
5708scheme_set_output_port_file (SCHEME_P_ int fout) 6073scheme_set_output_port_file (SCHEME_P_ int fout)
5709{ 6074{
5710 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6075 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5711} 6076}
5712 6077
5713void 6078ecb_cold void
5714scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6079scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5715{ 6080{
5716 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6081 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5717} 6082}
5718#endif 6083#endif
5719 6084
5720void 6085ecb_cold void
5721scheme_set_external_data (SCHEME_P_ void *p) 6086scheme_set_external_data (SCHEME_P_ void *p)
5722{ 6087{
5723 SCHEME_V->ext_data = p; 6088 SCHEME_V->ext_data = p;
5724} 6089}
5725 6090
… …
5757 SCHEME_V->loadport = NIL; 6122 SCHEME_V->loadport = NIL;
5758 SCHEME_V->gc_verbose = 0; 6123 SCHEME_V->gc_verbose = 0;
5759 gc (SCHEME_A_ NIL, NIL); 6124 gc (SCHEME_A_ NIL, NIL);
5760 6125
5761 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6126 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5762 free (SCHEME_V->alloc_seg[i]); 6127 free (SCHEME_V->cell_seg[i]);
5763 6128
5764#if SHOW_ERROR_LINE 6129#if SHOW_ERROR_LINE
5765 for (i = 0; i <= SCHEME_V->file_i; i++) 6130 for (i = 0; i <= SCHEME_V->file_i; i++)
5766 {
5767 if (SCHEME_V->load_stack[i].kind & port_file) 6131 if (SCHEME_V->load_stack[i].kind & port_file)
5768 { 6132 {
5769 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6133 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5770 6134
5771 if (fname) 6135 if (fname)
5772 free (fname); 6136 free (fname);
5773 } 6137 }
5774 }
5775#endif 6138#endif
5776} 6139}
5777 6140
5778void 6141ecb_cold void
5779scheme_load_file (SCHEME_P_ int fin) 6142scheme_load_file (SCHEME_P_ int fin)
5780{ 6143{
5781 scheme_load_named_file (SCHEME_A_ fin, 0); 6144 scheme_load_named_file (SCHEME_A_ fin, 0);
5782} 6145}
5783 6146
5784void 6147ecb_cold void
5785scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6148scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5786{ 6149{
5787 dump_stack_reset (SCHEME_A); 6150 dump_stack_reset (SCHEME_A);
5788 SCHEME_V->envir = SCHEME_V->global_env; 6151 SCHEME_V->envir = SCHEME_V->global_env;
5789 SCHEME_V->file_i = 0; 6152 SCHEME_V->file_i = 0;
5790 SCHEME_V->load_stack[0].unget = -1; 6153 SCHEME_V->load_stack[0].unget = -1;
5791 SCHEME_V->load_stack[0].kind = port_input | port_file; 6154 SCHEME_V->load_stack[0].kind = port_input | port_file;
5792 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6155 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5793#if USE_PORTS
5794 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6156 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5795#endif
5796 SCHEME_V->retcode = 0; 6157 SCHEME_V->retcode = 0;
5797 6158
5798#if USE_PORTS
5799 if (fin == STDIN_FILENO) 6159 if (fin == STDIN_FILENO)
5800 SCHEME_V->interactive_repl = 1; 6160 SCHEME_V->interactive_repl = 1;
5801#endif
5802 6161
5803#if USE_PORTS 6162#if USE_PORTS
5804#if SHOW_ERROR_LINE 6163#if SHOW_ERROR_LINE
5805 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6164 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5806 6165
… …
5810#endif 6169#endif
5811 6170
5812 SCHEME_V->inport = SCHEME_V->loadport; 6171 SCHEME_V->inport = SCHEME_V->loadport;
5813 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6172 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5814 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6173 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6174
5815 set_typeflag (SCHEME_V->loadport, T_ATOM); 6175 set_typeflag (SCHEME_V->loadport, T_ATOM);
5816 6176
5817 if (SCHEME_V->retcode == 0) 6177 if (SCHEME_V->retcode == 0)
5818 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6178 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5819} 6179}
5820 6180
5821void 6181ecb_cold void
5822scheme_load_string (SCHEME_P_ const char *cmd) 6182scheme_load_string (SCHEME_P_ const char *cmd)
5823{ 6183{
6184#if USE_PORTs
5824 dump_stack_reset (SCHEME_A); 6185 dump_stack_reset (SCHEME_A);
5825 SCHEME_V->envir = SCHEME_V->global_env; 6186 SCHEME_V->envir = SCHEME_V->global_env;
5826 SCHEME_V->file_i = 0; 6187 SCHEME_V->file_i = 0;
5827 SCHEME_V->load_stack[0].kind = port_input | port_string; 6188 SCHEME_V->load_stack[0].kind = port_input | port_string;
5828 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6189 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5829 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6190 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5830 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6191 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5831#if USE_PORTS
5832 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6192 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5833#endif
5834 SCHEME_V->retcode = 0; 6193 SCHEME_V->retcode = 0;
5835 SCHEME_V->interactive_repl = 0; 6194 SCHEME_V->interactive_repl = 0;
5836 SCHEME_V->inport = SCHEME_V->loadport; 6195 SCHEME_V->inport = SCHEME_V->loadport;
5837 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6196 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5838 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6197 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5839 set_typeflag (SCHEME_V->loadport, T_ATOM); 6198 set_typeflag (SCHEME_V->loadport, T_ATOM);
5840 6199
5841 if (SCHEME_V->retcode == 0) 6200 if (SCHEME_V->retcode == 0)
5842 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6201 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6202#else
6203 abort ();
6204#endif
5843} 6205}
5844 6206
5845void 6207ecb_cold void
5846scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6208scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5847{ 6209{
5848 pointer x; 6210 pointer x;
5849 6211
5850 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6212 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5855 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6217 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5856} 6218}
5857 6219
5858#if !STANDALONE 6220#if !STANDALONE
5859 6221
5860void 6222ecb_cold void
5861scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6223scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5862{ 6224{
5863 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6225 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5864} 6226}
5865 6227
5866void 6228ecb_cold void
5867scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6229scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5868{ 6230{
5869 int i; 6231 int i;
5870 6232
5871 for (i = 0; i < count; i++) 6233 for (i = 0; i < count; i++)
5872 scheme_register_foreign_func (SCHEME_A_ list + i); 6234 scheme_register_foreign_func (SCHEME_A_ list + i);
5873} 6235}
5874 6236
5875pointer 6237ecb_cold pointer
5876scheme_apply0 (SCHEME_P_ const char *procname) 6238scheme_apply0 (SCHEME_P_ const char *procname)
5877{ 6239{
5878 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6240 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5879} 6241}
5880 6242
5881void 6243ecb_cold void
5882save_from_C_call (SCHEME_P) 6244save_from_C_call (SCHEME_P)
5883{ 6245{
5884 pointer saved_data = cons (car (S_SINK), 6246 pointer saved_data = cons (car (S_SINK),
5885 cons (SCHEME_V->envir, 6247 cons (SCHEME_V->envir,
5886 SCHEME_V->dump)); 6248 SCHEME_V->dump));
… …
5890 /* Truncate the dump stack so TS will return here when done, not 6252 /* Truncate the dump stack so TS will return here when done, not
5891 directly resume pre-C-call operations. */ 6253 directly resume pre-C-call operations. */
5892 dump_stack_reset (SCHEME_A); 6254 dump_stack_reset (SCHEME_A);
5893} 6255}
5894 6256
5895void 6257ecb_cold void
5896restore_from_C_call (SCHEME_P) 6258restore_from_C_call (SCHEME_P)
5897{ 6259{
5898 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6260 set_car (S_SINK, caar (SCHEME_V->c_nest));
5899 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6261 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5900 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6262 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5901 /* Pop */ 6263 /* Pop */
5902 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6264 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5903} 6265}
5904 6266
5905/* "func" and "args" are assumed to be already eval'ed. */ 6267/* "func" and "args" are assumed to be already eval'ed. */
5906pointer 6268ecb_cold pointer
5907scheme_call (SCHEME_P_ pointer func, pointer args) 6269scheme_call (SCHEME_P_ pointer func, pointer args)
5908{ 6270{
5909 int old_repl = SCHEME_V->interactive_repl; 6271 int old_repl = SCHEME_V->interactive_repl;
5910 6272
5911 SCHEME_V->interactive_repl = 0; 6273 SCHEME_V->interactive_repl = 0;
… …
5918 SCHEME_V->interactive_repl = old_repl; 6280 SCHEME_V->interactive_repl = old_repl;
5919 restore_from_C_call (SCHEME_A); 6281 restore_from_C_call (SCHEME_A);
5920 return SCHEME_V->value; 6282 return SCHEME_V->value;
5921} 6283}
5922 6284
5923pointer 6285ecb_cold pointer
5924scheme_eval (SCHEME_P_ pointer obj) 6286scheme_eval (SCHEME_P_ pointer obj)
5925{ 6287{
5926 int old_repl = SCHEME_V->interactive_repl; 6288 int old_repl = SCHEME_V->interactive_repl;
5927 6289
5928 SCHEME_V->interactive_repl = 0; 6290 SCHEME_V->interactive_repl = 0;
… …
5940 6302
5941/* ========== Main ========== */ 6303/* ========== Main ========== */
5942 6304
5943#if STANDALONE 6305#if STANDALONE
5944 6306
5945int 6307ecb_cold int
5946main (int argc, char **argv) 6308main (int argc, char **argv)
5947{ 6309{
5948# if USE_MULTIPLICITY 6310# if USE_MULTIPLICITY
5949 scheme ssc; 6311 scheme ssc;
5950 scheme *const SCHEME_V = &ssc; 6312 scheme *const SCHEME_V = &ssc;
… …
5952# endif 6314# endif
5953 int fin; 6315 int fin;
5954 char *file_name = InitFile; 6316 char *file_name = InitFile;
5955 int retcode; 6317 int retcode;
5956 int isfile = 1; 6318 int isfile = 1;
6319#if EXPERIMENT
6320 system ("ps v $PPID");
6321#endif
5957 6322
5958 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6323 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959 { 6324 {
5960 xwrstr ("Usage: tinyscheme -?\n"); 6325 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5961 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6326 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5962 xwrstr ("followed by\n"); 6327 putstr (SCHEME_A_ "followed by\n");
5963 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5964 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6329 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5965 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6330 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5966 xwrstr ("Use - as filename for stdin.\n"); 6331 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5967 return 1; 6332 return 1;
5968 } 6333 }
5969 6334
5970 if (!scheme_init (SCHEME_A)) 6335 if (!scheme_init (SCHEME_A))
5971 { 6336 {
5972 xwrstr ("Could not initialize!\n"); 6337 putstr (SCHEME_A_ "Could not initialize!\n");
5973 return 2; 6338 return 2;
5974 } 6339 }
5975 6340
5976# if USE_PORTS 6341# if USE_PORTS
5977 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6342 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5990 } 6355 }
5991#endif 6356#endif
5992 6357
5993 do 6358 do
5994 { 6359 {
5995#if USE_PORTS
5996 if (strcmp (file_name, "-") == 0) 6360 if (strcmp (file_name, "-") == 0)
5997 fin = STDIN_FILENO; 6361 fin = STDIN_FILENO;
5998 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6362 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5999 { 6363 {
6000 pointer args = NIL; 6364 pointer args = NIL;
… …
6018 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6382 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6019 6383
6020 } 6384 }
6021 else 6385 else
6022 fin = open (file_name, O_RDONLY); 6386 fin = open (file_name, O_RDONLY);
6023#endif
6024 6387
6025 if (isfile && fin < 0) 6388 if (isfile && fin < 0)
6026 { 6389 {
6027 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6390 putstr (SCHEME_A_ "Could not open file ");
6391 putstr (SCHEME_A_ file_name);
6392 putcharacter (SCHEME_A_ '\n');
6028 } 6393 }
6029 else 6394 else
6030 { 6395 {
6031 if (isfile) 6396 if (isfile)
6032 scheme_load_named_file (SCHEME_A_ fin, file_name); 6397 scheme_load_named_file (SCHEME_A_ fin, file_name);
6033 else 6398 else
6034 scheme_load_string (SCHEME_A_ file_name); 6399 scheme_load_string (SCHEME_A_ file_name);
6035 6400
6036#if USE_PORTS
6037 if (!isfile || fin != STDIN_FILENO) 6401 if (!isfile || fin != STDIN_FILENO)
6038 { 6402 {
6039 if (SCHEME_V->retcode != 0) 6403 if (SCHEME_V->retcode != 0)
6040 { 6404 {
6041 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6405 putstr (SCHEME_A_ "Errors encountered reading ");
6406 putstr (SCHEME_A_ file_name);
6407 putcharacter (SCHEME_A_ '\n');
6042 } 6408 }
6043 6409
6044 if (isfile) 6410 if (isfile)
6045 close (fin); 6411 close (fin);
6046 } 6412 }
6047#endif
6048 } 6413 }
6049 6414
6050 file_name = *argv++; 6415 file_name = *argv++;
6051 } 6416 }
6052 while (file_name != 0); 6417 while (file_name != 0);

Diff Legend

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