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.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.62 by root, Wed Dec 2 07:59:15 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>
… …
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
46 68
47enum { 69enum {
48 TOK_EOF, 70 TOK_EOF,
49 TOK_LPAREN, 71 TOK_LPAREN,
50 TOK_RPAREN, 72 TOK_RPAREN,
51 TOK_DOT, 73 TOK_DOT,
52 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 77 TOK_QUOTE,
54 TOK_DQUOTE, 78 TOK_DQUOTE,
55 TOK_BQUOTE, 79 TOK_BQUOTE,
56 TOK_COMMA, 80 TOK_COMMA,
57 TOK_ATMARK, 81 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
60 TOK_VEC 84 TOK_VEC
61}; 85};
62 86
63#define BACKQUOTE '`' 87#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
65 90
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 96
72#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
73static scheme sc; 98static scheme sc;
74#endif 99#endif
75 100
76static void 101ecb_cold static void
77xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
78{ 103{
79 if (n < 0) 104 if (n < 0)
80 { 105 {
81 *s++ = '-'; 106 *s++ = '-';
… …
83 } 108 }
84 109
85 char *p = s; 110 char *p = s;
86 111
87 do { 112 do {
88 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 114 n /= base;
90 } while (n); 115 } while (n);
91 116
92 *p-- = 0; 117 *p-- = 0;
93 118
… …
96 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
97 --p; ++s; 122 --p; ++s;
98 } 123 }
99} 124}
100 125
101static void 126ecb_cold static void
102xnum (char *s, long n) 127xnum (char *s, long n)
103{ 128{
104 xbase (s, n, 10); 129 xbase (s, n, 10);
105} 130}
106 131
107static void 132ecb_cold static void
108xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 134{
116 char buf[64]; 135 char buf[64];
117 136
118 xnum (buf, n); 137 xnum (buf, n);
119 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
120} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
121 144
122static char 145static char
123xtoupper (char c) 146xtoupper (char c)
124{ 147{
125 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
145 168
146#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
149 172
173#endif
174
150#if USE_IGNORECASE 175#if USE_IGNORECASE
151static const char * 176ecb_cold static const char *
152xstrlwr (char *s) 177xstrlwr (char *s)
153{ 178{
154 const char *p = s; 179 const char *p = s;
155 180
156 while (*s) 181 while (*s)
… …
176 201
177#ifndef InitFile 202#ifndef InitFile
178# define InitFile "init.scm" 203# define InitFile "init.scm"
179#endif 204#endif
180 205
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 206enum scheme_types
186{ 207{
208 T_INTEGER,
209 T_CHARACTER,
187 T_FREE, 210 T_REAL,
188 T_STRING, 211 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 212 T_SYMBOL,
191 T_PROC, 213 T_PROC,
192 T_PAIR, 214 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
194 T_CONTINUATION, 218 T_CONTINUATION,
195 T_FOREIGN, 219 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 220 T_PORT,
198 T_VECTOR, 221 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 222 T_PROMISE,
201 T_ENVIRONMENT, 223 T_ENVIRONMENT,
202 /* one more... */ 224
203 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
204}; 226};
205 227
206#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
207#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 230#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 231#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 232#define T_MARK 0x0080 /* only for gc */
211 233
234/* num, for generic arithmetic */
235struct num
236{
237 IVALUE ivalue;
238#if USE_REAL
239 RVALUE rvalue;
240 char is_fixnum;
241#endif
242};
243
244#if USE_REAL
245# define num_is_fixnum(n) (n).is_fixnum
246# define num_set_fixnum(n,f) (n).is_fixnum = (f)
247# define num_ivalue(n) (n).ivalue
248# define num_rvalue(n) (n).rvalue
249# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
250# define num_set_rvalue(n,r) (n).rvalue = (r)
251#else
252# define num_is_fixnum(n) 1
253# define num_set_fixnum(n,f) 0
254# define num_ivalue(n) (n).ivalue
255# define num_rvalue(n) (n).ivalue
256# define num_set_ivalue(n,i) (n).ivalue = (i)
257# define num_set_rvalue(n,r) (n).ivalue = (r)
258#endif
259
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 260enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 261
214static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 264static num num_rem (num a, num b);
217static num num_mod (num a, num b); 265static num num_mod (num a, num b);
218 266
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
223 268
224static num num_zero; 269static num num_zero;
225static num num_one; 270static num num_one;
226 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
227/* macros for cell operations */ 276/* macros for cell operations */
228#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
229#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
230#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
231 280
232INTERFACE int 281INTERFACE int
233is_string (pointer p) 282is_string (pointer p)
234{ 283{
235 return type (p) == T_STRING; 284 return type (p) == T_STRING;
236} 285}
237 286
238#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
240
241INTERFACE int is_list (SCHEME_P_ pointer p);
242 289
243INTERFACE int 290INTERFACE int
244is_vector (pointer p) 291is_vector (pointer p)
245{ 292{
246 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
247} 294}
248 295
249#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
251INTERFACE void fill_vector (pointer vec, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252INTERFACE uint32_t vector_length (pointer vec);
253INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255 301
256INTERFACE uint32_t 302INTERFACE int
257vector_length (pointer vec) 303is_integer (pointer p)
258{ 304{
259 return vec->object.vector.length; 305 return type (p) == T_INTEGER;
306}
307
308/* not the same as in scheme, where integers are (correctly :) reals */
309INTERFACE int
310is_real (pointer p)
311{
312 return type (p) == T_REAL;
260} 313}
261 314
262INTERFACE int 315INTERFACE int
263is_number (pointer p) 316is_number (pointer p)
264{ 317{
265 return type (p) == T_NUMBER; 318 return is_integer (p) || is_real (p);
266}
267
268INTERFACE int
269is_integer (pointer p)
270{
271 return is_number (p) && num_is_fixnum (p->object.number);
272}
273
274INTERFACE int
275is_real (pointer p)
276{
277 return is_number (p) && !num_is_fixnum (p->object.number);
278} 319}
279 320
280INTERFACE int 321INTERFACE int
281is_character (pointer p) 322is_character (pointer p)
282{ 323{
… …
287string_value (pointer p) 328string_value (pointer p)
288{ 329{
289 return strvalue (p); 330 return strvalue (p);
290} 331}
291 332
292ecb_inline num
293nvalue (pointer p)
294{
295 return (p)->object.number;
296}
297
298static IVALUE
299num_get_ivalue (const num n)
300{
301 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302}
303
304static RVALUE
305num_get_rvalue (const num n)
306{
307 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308}
309
310INTERFACE IVALUE
311ivalue (pointer p)
312{
313 return num_get_ivalue (p->object.number);
314}
315
316INTERFACE RVALUE
317rvalue (pointer p)
318{
319 return num_get_rvalue (p->object.number);
320}
321
322#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
335
323#if USE_REAL 336#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 339#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
329# define set_num_integer(p) 0 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 342#endif
332 343
333INTERFACE long 344INTERFACE long
334charvalue (pointer p) 345charvalue (pointer p)
335{ 346{
336 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
337} 348}
338 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
339INTERFACE int 352INTERFACE int
340is_port (pointer p) 353is_port (pointer p)
341{ 354{
342 return type (p) == T_PORT; 355 return type (p) == T_PORT;
343} 356}
344 357
345INTERFACE int 358INTERFACE int
346is_inport (pointer p) 359is_inport (pointer p)
347{ 360{
348 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
349} 362}
350 363
351INTERFACE int 364INTERFACE int
352is_outport (pointer p) 365is_outport (pointer p)
353{ 366{
354 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
355} 368}
356 369
357INTERFACE int 370INTERFACE int
358is_pair (pointer p) 371is_pair (pointer p)
359{ 372{
360 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
361} 374}
362 375
363#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
364#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
365 378
366static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
367static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
368static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
369static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
373static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
374 387
375INTERFACE void 388INTERFACE void
376set_car (pointer p, pointer q) 389set_car (pointer p, pointer q)
377{ 390{
378 p->object.cons.car = q; 391 CELL(p)->object.cons.car = CELL (q);
379} 392}
380 393
381INTERFACE void 394INTERFACE void
382set_cdr (pointer p, pointer q) 395set_cdr (pointer p, pointer q)
383{ 396{
384 p->object.cons.cdr = q; 397 CELL(p)->object.cons.cdr = CELL (q);
385} 398}
386 399
387INTERFACE pointer 400INTERFACE pointer
388pair_car (pointer p) 401pair_car (pointer p)
389{ 402{
… …
403} 416}
404 417
405INTERFACE char * 418INTERFACE char *
406symname (pointer p) 419symname (pointer p)
407{ 420{
408 return strvalue (car (p)); 421 return strvalue (p);
409} 422}
410 423
411#if USE_PLIST 424#if USE_PLIST
425#error plists are broken because symbols are no longer pairs
426#define symprop(p) cdr(p)
412SCHEME_EXPORT int 427SCHEME_EXPORT int
413hasprop (pointer p) 428hasprop (pointer p)
414{ 429{
415 return typeflag (p) & T_SYMBOL; 430 return typeflag (p) & T_SYMBOL;
416} 431}
417
418# define symprop(p) cdr(p)
419#endif 432#endif
420 433
421INTERFACE int 434INTERFACE int
422is_syntax (pointer p) 435is_syntax (pointer p)
423{ 436{
… …
437} 450}
438 451
439INTERFACE char * 452INTERFACE char *
440syntaxname (pointer p) 453syntaxname (pointer p)
441{ 454{
442 return strvalue (car (p)); 455 return strvalue (p);
443} 456}
444 457
445#define procnum(p) ivalue (p) 458#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 459static const char *procname (pointer x);
447 460
448INTERFACE int 461INTERFACE int
449is_closure (pointer p) 462is_closure (pointer p)
450{ 463{
… …
513#if USE_ERROR_CHECKING 526#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 527 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 528#endif
516} 529}
517 530
531/* Result is:
532 proper list: length
533 circular list: -1
534 not even a pair: -2
535 dotted list: -2 minus length before dot
536*/
537ecb_hot INTERFACE int
538list_length (SCHEME_P_ pointer a)
539{
540 int i = 0;
541 pointer slow, fast;
542
543 slow = fast = a;
544
545 while (1)
546 {
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 fast = cdr (fast);
554 ++i;
555
556 if (fast == NIL)
557 return i;
558
559 if (!is_pair (fast))
560 return -2 - i;
561
562 ++i;
563 fast = cdr (fast);
564
565 /* Safe because we would have already returned if `fast'
566 encountered a non-pair. */
567 slow = cdr (slow);
568
569 if (fast == slow)
570 {
571 /* the fast pointer has looped back around and caught up
572 with the slow pointer, hence the structure is circular,
573 not of finite length, and therefore not a list */
574 return -1;
575 }
576 }
577}
578
579INTERFACE int
580is_list (SCHEME_P_ pointer a)
581{
582 return list_length (SCHEME_A_ a) >= 0;
583}
584
518#if USE_CHAR_CLASSIFIERS 585#if USE_CHAR_CLASSIFIERS
586
519ecb_inline int 587ecb_inline int
520Cisalpha (int c) 588Cisalpha (int c)
521{ 589{
522 return isascii (c) && isalpha (c); 590 return isascii (c) && isalpha (c);
523} 591}
… …
581 "gs", 649 "gs",
582 "rs", 650 "rs",
583 "us" 651 "us"
584}; 652};
585 653
586static int 654ecb_cold static int
587is_ascii_name (const char *name, int *pc) 655is_ascii_name (const char *name, int *pc)
588{ 656{
589 int i; 657 int i;
590 658
591 for (i = 0; i < 32; i++) 659 for (i = 0; i < 32; i++)
… …
609#endif 677#endif
610 678
611static int file_push (SCHEME_P_ const char *fname); 679static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 680static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 681static int file_interactive (SCHEME_P);
614ecb_inline int is_one_of (char *s, int c); 682ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 683static int alloc_cellseg (SCHEME_P);
616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 684ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617static void finalize_cell (SCHEME_P_ pointer a); 685static void finalize_cell (SCHEME_P_ pointer a);
618static int count_consecutive_cells (pointer x, int needed);
619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 686static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
620static pointer mk_number (SCHEME_P_ const num n); 687static pointer mk_number (SCHEME_P_ const num n);
621static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 688static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
622static pointer mk_vector (SCHEME_P_ uint32_t len); 689static pointer mk_vector (SCHEME_P_ uint32_t len);
623static pointer mk_atom (SCHEME_P_ char *q); 690static pointer mk_atom (SCHEME_P_ char *q);
624static pointer mk_sharp_const (SCHEME_P_ char *name); 691static pointer mk_sharp_const (SCHEME_P_ char *name);
625 692
693static pointer mk_port (SCHEME_P_ port *p);
694
626#if USE_PORTS 695#if USE_PORTS
627static pointer mk_port (SCHEME_P_ port *p);
628static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 696static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
629static pointer port_from_file (SCHEME_P_ int, int prop); 697static pointer port_from_file (SCHEME_P_ int, int prop);
630static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 698static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
631static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 699static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
632static port *port_rep_from_file (SCHEME_P_ int, int prop); 700static port *port_rep_from_file (SCHEME_P_ int, int prop);
633static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 701static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
634static void port_close (SCHEME_P_ pointer p, int flag); 702static void port_close (SCHEME_P_ pointer p, int flag);
635#endif 703#endif
704
636static void mark (pointer a); 705static void mark (pointer a);
637static void gc (SCHEME_P_ pointer a, pointer b); 706static void gc (SCHEME_P_ pointer a, pointer b);
638static int basic_inchar (port *pt); 707static int basic_inchar (port *pt);
639static int inchar (SCHEME_P); 708static int inchar (SCHEME_P);
640static void backchar (SCHEME_P_ int c); 709static void backchar (SCHEME_P_ int c);
641static char *readstr_upto (SCHEME_P_ char *delim); 710static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642static pointer readstrexp (SCHEME_P); 711static pointer readstrexp (SCHEME_P_ char delim);
643ecb_inline int skipspace (SCHEME_P); 712static int skipspace (SCHEME_P);
644static int token (SCHEME_P); 713static int token (SCHEME_P);
645static void printslashstring (SCHEME_P_ char *s, int len); 714static void printslashstring (SCHEME_P_ char *s, int len);
646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 715static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647static void printatom (SCHEME_P_ pointer l, int f); 716static void printatom (SCHEME_P_ pointer l, int f);
648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 717static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 733static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 734static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 735static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 736static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 737
738static IVALUE
739ivalue (pointer x)
740{
741 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
742}
743
744static RVALUE
745rvalue (pointer x)
746{
747 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
748}
749
750INTERFACE num
751nvalue (pointer x)
752{
753 num n;
754
755 num_set_fixnum (n, is_integer (x));
756
757 if (num_is_fixnum (n))
758 num_set_ivalue (n, ivalue_unchecked (x));
759 else
760 num_set_rvalue (n, rvalue_unchecked (x));
761
762 return n;
763}
764
669static num 765static num
670num_op (enum num_op op, num a, num b) 766num_op (enum num_op op, num a, num b)
671{ 767{
672 num ret; 768 num ret;
673 769
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 770 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 771
676 if (num_is_fixnum (ret)) 772 if (num_is_fixnum (ret))
677 { 773 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 774 switch (op)
682 { 775 {
683 case NUM_ADD: av += bv; break; 776 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 777 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 778 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 779 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 780 }
688 781
689 num_set_ivalue (ret, av); 782 num_set_ivalue (ret, a.ivalue);
690 } 783 }
784#if USE_REAL
691 else 785 else
692 { 786 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 787 switch (op)
697 { 788 {
698 case NUM_ADD: av += bv; break; 789 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 790 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 791 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 792 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 793 }
703 794
704 num_set_rvalue (ret, av); 795 num_set_rvalue (ret, a.rvalue);
705 } 796 }
797#endif
706 798
707 return ret; 799 return ret;
708} 800}
709 801
710static num 802static num
711num_div (num a, num b) 803num_div (num a, num b)
712{ 804{
713 num ret; 805 num ret;
714 806
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 807 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 808
717 if (num_is_fixnum (ret)) 809 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 810 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 811 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 812 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 813
722 return ret; 814 return ret;
723} 815}
724 816
725static num 817static num
… …
727{ 819{
728 num ret; 820 num ret;
729 long e1, e2, res; 821 long e1, e2, res;
730 822
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 823 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
734 res = e1 % e2; 826 res = e1 % e2;
735 827
736 /* remainder should have same sign as second operand */ 828 /* remainder should have same sign as second operand */
737 if (res > 0) 829 if (res > 0)
738 { 830 {
… …
754{ 846{
755 num ret; 847 num ret;
756 long e1, e2, res; 848 long e1, e2, res;
757 849
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 850 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 851 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 852 e2 = num_ivalue (b);
761 res = e1 % e2; 853 res = e1 % e2;
762 854
763 /* modulo should have same sign as second operand */ 855 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 856 if (res * e2 < 0)
765 res += e2; 857 res += e2;
… …
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 867 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 868 int ret;
777 869
778 if (is_fixnum) 870 if (is_fixnum)
779 { 871 {
780 IVALUE av = num_get_ivalue (a); 872 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 873 IVALUE bv = num_ivalue (b);
782 874
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 875 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 876 }
785 else 877 else
786 { 878 {
787 RVALUE av = num_get_rvalue (a); 879 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 880 RVALUE bv = num_rvalue (b);
789 881
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 882 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 883 }
792 884
793 return ret; 885 return ret;
794} 886}
795
796#if USE_MATH
797
798/* Round to nearest. Round to even if midway */
799static double
800round_per_R5RS (double x)
801{
802 double fl = floor (x);
803 double ce = ceil (x);
804 double dfl = x - fl;
805 double dce = ce - x;
806
807 if (dfl > dce)
808 return ce;
809 else if (dfl < dce)
810 return fl;
811 else
812 {
813 if (fmod (fl, 2) == 0) /* I imagine this holds */
814 return fl;
815 else
816 return ce;
817 }
818}
819#endif
820 887
821static int 888static int
822is_zero_rvalue (RVALUE x) 889is_zero_rvalue (RVALUE x)
823{ 890{
824 return x == 0; 891 return x == 0;
… …
830#endif 897#endif
831#endif 898#endif
832} 899}
833 900
834/* allocate new cell segment */ 901/* allocate new cell segment */
835static int 902ecb_cold static int
836alloc_cellseg (SCHEME_P_ int n) 903alloc_cellseg (SCHEME_P)
837{ 904{
838 pointer newp; 905 struct cell *newp;
839 pointer last; 906 struct cell *last;
840 pointer p; 907 struct cell *p;
841 char *cp; 908 char *cp;
842 long i; 909 long i;
843 int k; 910 int k;
844 911
845 static int segsize = CELL_SEGSIZE >> 1; 912 static int segsize = CELL_SEGSIZE >> 1;
846 segsize <<= 1; 913 segsize <<= 1;
847 914
848 for (k = 0; k < n; k++)
849 {
850 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
851 return k;
852
853 cp = malloc (segsize * sizeof (struct cell)); 915 cp = malloc (segsize * sizeof (struct cell));
854 916
855 if (!cp && USE_ERROR_CHECKING) 917 if (!cp && USE_ERROR_CHECKING)
856 return k; 918 return k;
857 919
858 i = ++SCHEME_V->last_cell_seg; 920 i = ++SCHEME_V->last_cell_seg;
859 SCHEME_V->alloc_seg[i] = cp;
860 921
861 /* insert new segment in address order */ 922 newp = (struct cell *)cp;
862 newp = (pointer)cp;
863 SCHEME_V->cell_seg[i] = newp; 923 SCHEME_V->cell_seg[i] = newp;
864 SCHEME_V->cell_segsize[i] = segsize; 924 SCHEME_V->cell_segsize[i] = segsize;
865
866 //TODO: insert, not swap
867 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868 {
869 p = SCHEME_V->cell_seg[i];
870 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871 SCHEME_V->cell_seg[i - 1] = p;
872
873 k = SCHEME_V->cell_segsize[i];
874 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875 SCHEME_V->cell_segsize[i - 1] = k;
876
877 --i;
878 }
879
880 SCHEME_V->fcells += segsize; 925 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 926 last = newp + segsize - 1;
882 927
883 for (p = newp; p <= last; p++) 928 for (p = newp; p <= last; p++)
884 { 929 {
930 pointer cp = POINTER (p);
885 set_typeflag (p, T_FREE); 931 set_typeflag (cp, T_PAIR);
886 set_car (p, NIL); 932 set_car (cp, NIL);
887 set_cdr (p, p + 1); 933 set_cdr (cp, POINTER (p + 1));
888 } 934 }
889 935
890 /* insert new cells in address order on free list */
891 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892 {
893 set_cdr (last, SCHEME_V->free_cell); 936 set_cdr (POINTER (last), SCHEME_V->free_cell);
894 SCHEME_V->free_cell = newp; 937 SCHEME_V->free_cell = POINTER (newp);
895 }
896 else
897 {
898 p = SCHEME_V->free_cell;
899 938
900 while (cdr (p) != NIL && newp > cdr (p))
901 p = cdr (p);
902
903 set_cdr (last, cdr (p));
904 set_cdr (p, newp);
905 }
906 }
907
908 return n; 939 return 1;
909} 940}
910 941
911/* get new cell. parameter a, b is marked by gc. */ 942/* get new cell. parameter a, b is marked by gc. */
912ecb_inline pointer 943ecb_inline pointer
913get_cell_x (SCHEME_P_ pointer a, pointer b) 944get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 948 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
918 return S_SINK; 949 return S_SINK;
919 950
920 if (SCHEME_V->free_cell == NIL) 951 if (SCHEME_V->free_cell == NIL)
921 { 952 {
922 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 953 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
923 954
924 gc (SCHEME_A_ a, b); 955 gc (SCHEME_A_ a, b);
925 956
926 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 957 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
927 { 958 {
928 /* if only a few recovered, get more to avoid fruitless gc's */ 959 /* if only a few recovered, get more to avoid fruitless gc's */
929 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 960 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
930 { 961 {
931#if USE_ERROR_CHECKING 962#if USE_ERROR_CHECKING
932 SCHEME_V->no_memory = 1; 963 SCHEME_V->no_memory = 1;
933 return S_SINK; 964 return S_SINK;
934#endif 965#endif
… …
946 } 977 }
947} 978}
948 979
949/* To retain recent allocs before interpreter knows about them - 980/* To retain recent allocs before interpreter knows about them -
950 Tehom */ 981 Tehom */
951 982ecb_hot static void
952static void
953push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 983push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
954{ 984{
955 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 985 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
956 986
957 set_typeflag (holder, T_PAIR); 987 set_typeflag (holder, T_PAIR);
… …
959 set_car (holder, recent); 989 set_car (holder, recent);
960 set_cdr (holder, car (S_SINK)); 990 set_cdr (holder, car (S_SINK));
961 set_car (S_SINK, holder); 991 set_car (S_SINK, holder);
962} 992}
963 993
964static pointer 994ecb_hot static pointer
965get_cell (SCHEME_P_ pointer a, pointer b) 995get_cell (SCHEME_P_ pointer a, pointer b)
966{ 996{
967 pointer cell = get_cell_x (SCHEME_A_ a, b); 997 pointer cell = get_cell_x (SCHEME_A_ a, b);
968 998
969 /* For right now, include "a" and "b" in "cell" so that gc doesn't 999 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
978} 1008}
979 1009
980static pointer 1010static pointer
981get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1011get_vector_object (SCHEME_P_ uint32_t len, pointer init)
982{ 1012{
983 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1013 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
984 pointer *e = malloc (len * sizeof (pointer)); 1014 pointer *e = malloc (len * sizeof (pointer));
985 1015
986 if (!e && USE_ERROR_CHECKING) 1016 if (!e && USE_ERROR_CHECKING)
987 return S_SINK; 1017 return S_SINK;
988 1018
989 /* Record it as a vector so that gc understands it. */ 1019 /* Record it as a vector so that gc understands it. */
990 set_typeflag (v, T_VECTOR | T_ATOM); 1020 set_typeflag (v, T_VECTOR | T_ATOM);
991 1021
992 v->object.vector.vvalue = e; 1022 CELL(v)->object.vector.vvalue = e;
993 v->object.vector.length = len; 1023 CELL(v)->object.vector.length = len;
994 fill_vector (v, init); 1024 fill_vector (v, 0, init);
995 push_recent_alloc (SCHEME_A_ v, NIL); 1025 push_recent_alloc (SCHEME_A_ v, NIL);
996 1026
997 return v; 1027 return v;
998} 1028}
999 1029
… …
1007static void 1037static void
1008check_cell_alloced (pointer p, int expect_alloced) 1038check_cell_alloced (pointer p, int expect_alloced)
1009{ 1039{
1010 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1040 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1011 if (typeflag (p) & !expect_alloced) 1041 if (typeflag (p) & !expect_alloced)
1012 xwrstr ("Cell is already allocated!\n"); 1042 putstr (SCHEME_A_ "Cell is already allocated!\n");
1013 1043
1014 if (!(typeflag (p)) & expect_alloced) 1044 if (!(typeflag (p)) & expect_alloced)
1015 xwrstr ("Cell is not allocated!\n"); 1045 putstr (SCHEME_A_ "Cell is not allocated!\n");
1016} 1046}
1017 1047
1018static void 1048static void
1019check_range_alloced (pointer p, int n, int expect_alloced) 1049check_range_alloced (pointer p, int n, int expect_alloced)
1020{ 1050{
… …
1026#endif 1056#endif
1027 1057
1028/* Medium level cell allocation */ 1058/* Medium level cell allocation */
1029 1059
1030/* get new cons cell */ 1060/* get new cons cell */
1031pointer 1061ecb_hot static pointer
1032xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1062xcons (SCHEME_P_ pointer a, pointer b)
1033{ 1063{
1034 pointer x = get_cell (SCHEME_A_ a, b); 1064 pointer x = get_cell (SCHEME_A_ a, b);
1035 1065
1036 set_typeflag (x, T_PAIR); 1066 set_typeflag (x, T_PAIR);
1037
1038 if (immutable)
1039 setimmutable (x);
1040 1067
1041 set_car (x, a); 1068 set_car (x, a);
1042 set_cdr (x, b); 1069 set_cdr (x, b);
1043 1070
1044 return x; 1071 return x;
1045} 1072}
1046 1073
1074ecb_hot static pointer
1075ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1076{
1077 pointer x = xcons (SCHEME_A_ a, b);
1078 setimmutable (x);
1079 return x;
1080}
1081
1082#define cons(a,b) xcons (SCHEME_A_ a, b)
1083#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1084
1085ecb_cold static pointer
1086generate_symbol (SCHEME_P_ const char *name)
1087{
1088 pointer x = mk_string (SCHEME_A_ name);
1089 setimmutable (x);
1090 set_typeflag (x, T_SYMBOL | T_ATOM);
1091 return x;
1092}
1093
1047/* ========== oblist implementation ========== */ 1094/* ========== oblist implementation ========== */
1048 1095
1049#ifndef USE_OBJECT_LIST 1096#ifndef USE_OBJECT_LIST
1050 1097
1098static int
1051static int hash_fn (const char *key, int table_size); 1099hash_fn (const char *key, int table_size)
1100{
1101 const unsigned char *p = (unsigned char *)key;
1102 uint32_t hash = 2166136261;
1052 1103
1104 while (*p)
1105 hash = (hash ^ *p++) * 16777619;
1106
1107 return hash % table_size;
1108}
1109
1053static pointer 1110ecb_cold static pointer
1054oblist_initial_value (SCHEME_P) 1111oblist_initial_value (SCHEME_P)
1055{ 1112{
1056 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1113 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1057} 1114}
1058 1115
1059/* returns the new symbol */ 1116/* returns the new symbol */
1060static pointer 1117ecb_cold static pointer
1061oblist_add_by_name (SCHEME_P_ const char *name) 1118oblist_add_by_name (SCHEME_P_ const char *name)
1062{ 1119{
1063 int location; 1120 pointer x = generate_symbol (SCHEME_A_ name);
1064
1065 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066 set_typeflag (x, T_SYMBOL);
1067 setimmutable (car (x));
1068
1069 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1121 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1122 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071 return x; 1123 return x;
1072} 1124}
1073 1125
1074ecb_inline pointer 1126ecb_cold static pointer
1075oblist_find_by_name (SCHEME_P_ const char *name) 1127oblist_find_by_name (SCHEME_P_ const char *name)
1076{ 1128{
1077 int location; 1129 int location;
1078 pointer x; 1130 pointer x;
1079 char *s; 1131 char *s;
1080 1132
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1133 location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 1134
1083 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1135 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084 { 1136 {
1085 s = symname (car (x)); 1137 s = symname (car (x));
1086 1138
1087 /* case-insensitive, per R5RS section 2 */ 1139 /* case-insensitive, per R5RS section 2 */
1088 if (stricmp (name, s) == 0) 1140 if (stricmp (name, s) == 0)
… …
1090 } 1142 }
1091 1143
1092 return NIL; 1144 return NIL;
1093} 1145}
1094 1146
1095static pointer 1147ecb_cold static pointer
1096oblist_all_symbols (SCHEME_P) 1148oblist_all_symbols (SCHEME_P)
1097{ 1149{
1098 int i; 1150 int i;
1099 pointer x; 1151 pointer x;
1100 pointer ob_list = NIL; 1152 pointer ob_list = NIL;
1101 1153
1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1154 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1155 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104 ob_list = cons (x, ob_list); 1156 ob_list = cons (x, ob_list);
1105 1157
1106 return ob_list; 1158 return ob_list;
1107} 1159}
1108 1160
1109#else 1161#else
1110 1162
1111static pointer 1163ecb_cold static pointer
1112oblist_initial_value (SCHEME_P) 1164oblist_initial_value (SCHEME_P)
1113{ 1165{
1114 return NIL; 1166 return NIL;
1115} 1167}
1116 1168
1117ecb_inline pointer 1169ecb_cold static pointer
1118oblist_find_by_name (SCHEME_P_ const char *name) 1170oblist_find_by_name (SCHEME_P_ const char *name)
1119{ 1171{
1120 pointer x; 1172 pointer x;
1121 char *s; 1173 char *s;
1122 1174
… …
1131 1183
1132 return NIL; 1184 return NIL;
1133} 1185}
1134 1186
1135/* returns the new symbol */ 1187/* returns the new symbol */
1136static pointer 1188ecb_cold static pointer
1137oblist_add_by_name (SCHEME_P_ const char *name) 1189oblist_add_by_name (SCHEME_P_ const char *name)
1138{ 1190{
1139 pointer x; 1191 pointer x = generate_symbol (SCHEME_A_ name);
1140
1141 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142 set_typeflag (x, T_SYMBOL);
1143 setimmutable (car (x));
1144 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1192 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145 return x; 1193 return x;
1146} 1194}
1147 1195
1148static pointer 1196ecb_cold static pointer
1149oblist_all_symbols (SCHEME_P) 1197oblist_all_symbols (SCHEME_P)
1150{ 1198{
1151 return SCHEME_V->oblist; 1199 return SCHEME_V->oblist;
1152} 1200}
1153 1201
1154#endif 1202#endif
1155 1203
1156#if USE_PORTS
1157static pointer 1204ecb_cold static pointer
1158mk_port (SCHEME_P_ port *p) 1205mk_port (SCHEME_P_ port *p)
1159{ 1206{
1160 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1207 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1161 1208
1162 set_typeflag (x, T_PORT | T_ATOM); 1209 set_typeflag (x, T_PORT | T_ATOM);
1163 x->object.port = p; 1210 set_port (x, p);
1164 1211
1165 return x; 1212 return x;
1166} 1213}
1167#endif
1168 1214
1169pointer 1215ecb_cold pointer
1170mk_foreign_func (SCHEME_P_ foreign_func f) 1216mk_foreign_func (SCHEME_P_ foreign_func f)
1171{ 1217{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1219
1174 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1220 set_typeflag (x, T_FOREIGN | T_ATOM);
1175 x->object.ff = f; 1221 CELL(x)->object.ff = f;
1176 1222
1177 return x; 1223 return x;
1178} 1224}
1179 1225
1180INTERFACE pointer 1226INTERFACE pointer
1181mk_character (SCHEME_P_ int c) 1227mk_character (SCHEME_P_ int c)
1182{ 1228{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1229 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1230
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1231 set_typeflag (x, T_CHARACTER | T_ATOM);
1186 ivalue_unchecked (x) = c & 0xff; 1232 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1233
1188 return x; 1234 return x;
1189} 1235}
1190 1236
1191/* get number atom (integer) */ 1237/* get number atom (integer) */
1192INTERFACE pointer 1238INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1239mk_integer (SCHEME_P_ long n)
1194{ 1240{
1241 pointer p = 0;
1242 pointer *pp = &p;
1243
1244#if USE_INTCACHE
1245 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1246 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1247#endif
1248
1249 if (!*pp)
1250 {
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1251 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1252
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1253 set_typeflag (x, T_INTEGER | T_ATOM);
1198 ivalue_unchecked (x) = num; 1254 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1199 set_num_integer (x); 1255 set_ivalue (x, n);
1256
1257 *pp = x;
1258 }
1259
1200 return x; 1260 return *pp;
1201} 1261}
1202 1262
1203INTERFACE pointer 1263INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1264mk_real (SCHEME_P_ RVALUE n)
1205{ 1265{
1266#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1267 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1268
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1269 set_typeflag (x, T_REAL | T_ATOM);
1209 rvalue_unchecked (x) = n; 1270 set_rvalue (x, n);
1210 set_num_real (x); 1271
1211 return x; 1272 return x;
1273#else
1274 return mk_integer (SCHEME_A_ n);
1275#endif
1212} 1276}
1213 1277
1214static pointer 1278static pointer
1215mk_number (SCHEME_P_ const num n) 1279mk_number (SCHEME_P_ const num n)
1216{ 1280{
1281#if USE_REAL
1217 if (num_is_fixnum (n)) 1282 return num_is_fixnum (n)
1283 ? mk_integer (SCHEME_A_ num_ivalue (n))
1284 : mk_real (SCHEME_A_ num_rvalue (n));
1285#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1286 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1287#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1288}
1222 1289
1223/* allocate name to string area */ 1290/* allocate name to string area */
1224static char * 1291static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1292store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1231 SCHEME_V->no_memory = 1; 1298 SCHEME_V->no_memory = 1;
1232 return SCHEME_V->strbuff; 1299 return SCHEME_V->strbuff;
1233 } 1300 }
1234 1301
1235 if (str) 1302 if (str)
1236 { 1303 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237 int l = strlen (str);
1238
1239 if (l > len_str)
1240 l = len_str;
1241
1242 memcpy (q, str, l);
1243 q[l] = 0;
1244 }
1245 else 1304 else
1246 {
1247 memset (q, fill, len_str); 1305 memset (q, fill, len_str);
1306
1248 q[len_str] = 0; 1307 q[len_str] = 0;
1249 }
1250 1308
1251 return q; 1309 return q;
1252} 1310}
1253 1311
1254INTERFACE pointer 1312INTERFACE pointer
… …
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1326 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1327
1270 set_typeflag (x, T_STRING | T_ATOM); 1328 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1329 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272 strlength (x) = len; 1330 strlength (x) = len;
1331
1273 return x; 1332 return x;
1274} 1333}
1275 1334
1276INTERFACE pointer 1335INTERFACE pointer
1277mk_string (SCHEME_P_ const char *str) 1336mk_string (SCHEME_P_ const char *str)
… …
1284{ 1343{
1285 return get_vector_object (SCHEME_A_ len, NIL); 1344 return get_vector_object (SCHEME_A_ len, NIL);
1286} 1345}
1287 1346
1288INTERFACE void 1347INTERFACE void
1289fill_vector (pointer vec, pointer obj) 1348fill_vector (pointer vec, uint32_t start, pointer obj)
1290{ 1349{
1291 int i; 1350 int i;
1292 1351
1293 for (i = 0; i < vec->object.vector.length; i++) 1352 for (i = start; i < veclength (vec); i++)
1294 vecvalue (vec)[i] = obj; 1353 vecvalue (vec)[i] = obj;
1295} 1354}
1296 1355
1356INTERFACE void
1357vector_resize (pointer vec, uint32_t newsize, pointer fill)
1358{
1359 uint32_t oldsize = veclength (vec);
1360 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1361 veclength (vec) = newsize;
1362 fill_vector (vec, oldsize, fill);
1363}
1364
1297INTERFACE pointer 1365INTERFACE pointer
1298vector_elem (pointer vec, uint32_t ielem) 1366vector_get (pointer vec, uint32_t ielem)
1299{ 1367{
1300 return vecvalue(vec)[ielem]; 1368 return vecvalue(vec)[ielem];
1301} 1369}
1302 1370
1303INTERFACE void 1371INTERFACE void
1304set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1372vector_set (pointer vec, uint32_t ielem, pointer a)
1305{ 1373{
1306 vecvalue(vec)[ielem] = a; 1374 vecvalue(vec)[ielem] = a;
1307} 1375}
1308 1376
1309/* get new symbol */ 1377/* get new symbol */
… …
1317 x = oblist_add_by_name (SCHEME_A_ name); 1385 x = oblist_add_by_name (SCHEME_A_ name);
1318 1386
1319 return x; 1387 return x;
1320} 1388}
1321 1389
1322INTERFACE pointer 1390ecb_cold INTERFACE pointer
1323gensym (SCHEME_P) 1391gensym (SCHEME_P)
1324{ 1392{
1325 pointer x; 1393 pointer x;
1326
1327 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328 {
1329 char name[40] = "gensym-"; 1394 char name[40] = "gensym-";
1330 xnum (name + 7, SCHEME_V->gensym_cnt); 1395 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331 1396
1332 /* first check oblist */ 1397 return generate_symbol (SCHEME_A_ name);
1333 x = oblist_find_by_name (SCHEME_A_ name); 1398}
1334 1399
1335 if (x == NIL) 1400static int
1336 { 1401is_gensym (SCHEME_P_ pointer x)
1337 x = oblist_add_by_name (SCHEME_A_ name); 1402{
1338 return x; 1403 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1339 }
1340 }
1341
1342 return NIL;
1343} 1404}
1344 1405
1345/* make symbol or number atom from string */ 1406/* make symbol or number atom from string */
1346static pointer 1407ecb_cold static pointer
1347mk_atom (SCHEME_P_ char *q) 1408mk_atom (SCHEME_P_ char *q)
1348{ 1409{
1349 char c, *p; 1410 char c, *p;
1350 int has_dec_point = 0; 1411 int has_dec_point = 0;
1351 int has_fp_exp = 0; 1412 int has_fp_exp = 0;
… …
1401 } 1462 }
1402 else if ((c == 'e') || (c == 'E')) 1463 else if ((c == 'e') || (c == 'E'))
1403 { 1464 {
1404 if (!has_fp_exp) 1465 if (!has_fp_exp)
1405 { 1466 {
1406 has_dec_point = 1; /* decimal point illegal 1467 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1468 p++;
1409 1469
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1470 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1471 continue;
1412 } 1472 }
… …
1423 1483
1424 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1484 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1425} 1485}
1426 1486
1427/* make constant */ 1487/* make constant */
1428static pointer 1488ecb_cold static pointer
1429mk_sharp_const (SCHEME_P_ char *name) 1489mk_sharp_const (SCHEME_P_ char *name)
1430{ 1490{
1431 if (!strcmp (name, "t")) 1491 if (!strcmp (name, "t"))
1432 return S_T; 1492 return S_T;
1433 else if (!strcmp (name, "f")) 1493 else if (!strcmp (name, "f"))
1434 return S_F; 1494 return S_F;
1435 else if (*name == '\\') /* #\w (character) */ 1495 else if (*name == '\\') /* #\w (character) */
1436 { 1496 {
1437 int c; 1497 int c;
1438 1498
1499 // TODO: optimise
1439 if (stricmp (name + 1, "space") == 0) 1500 if (stricmp (name + 1, "space") == 0)
1440 c = ' '; 1501 c = ' ';
1441 else if (stricmp (name + 1, "newline") == 0) 1502 else if (stricmp (name + 1, "newline") == 0)
1442 c = '\n'; 1503 c = '\n';
1443 else if (stricmp (name + 1, "return") == 0) 1504 else if (stricmp (name + 1, "return") == 0)
1444 c = '\r'; 1505 c = '\r';
1445 else if (stricmp (name + 1, "tab") == 0) 1506 else if (stricmp (name + 1, "tab") == 0)
1446 c = '\t'; 1507 c = '\t';
1508 else if (stricmp (name + 1, "alarm") == 0)
1509 c = 0x07;
1510 else if (stricmp (name + 1, "backspace") == 0)
1511 c = 0x08;
1512 else if (stricmp (name + 1, "escape") == 0)
1513 c = 0x1b;
1514 else if (stricmp (name + 1, "delete") == 0)
1515 c = 0x7f;
1516 else if (stricmp (name + 1, "null") == 0)
1517 c = 0;
1447 else if (name[1] == 'x' && name[2] != 0) 1518 else if (name[1] == 'x' && name[2] != 0)
1448 { 1519 {
1449 long c1 = strtol (name + 2, 0, 16); 1520 long c1 = strtol (name + 2, 0, 16);
1450 1521
1451 if (0 <= c1 && c1 <= UCHAR_MAX) 1522 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1476 return NIL; 1547 return NIL;
1477 } 1548 }
1478} 1549}
1479 1550
1480/* ========== garbage collector ========== */ 1551/* ========== garbage collector ========== */
1552
1553static void
1554finalize_cell (SCHEME_P_ pointer a)
1555{
1556 /* TODO, fast bitmap check? */
1557 if (is_string (a) || is_symbol (a))
1558 free (strvalue (a));
1559 else if (is_vector (a))
1560 free (vecvalue (a));
1561#if USE_PORTS
1562 else if (is_port (a))
1563 {
1564 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1565 port_close (SCHEME_A_ a, port_input | port_output);
1566
1567 free (port (a));
1568 }
1569#endif
1570}
1481 1571
1482/*-- 1572/*--
1483 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1573 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1484 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1574 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1485 * for marking. 1575 * for marking.
1486 * 1576 *
1487 * The exception is vectors - vectors are currently marked recursively, 1577 * The exception is vectors - vectors are currently marked recursively,
1488 * which is inherited form tinyscheme and could be fixed by having another 1578 * which is inherited form tinyscheme and could be fixed by having another
1489 * word of context in the vector 1579 * word of context in the vector
1490 */ 1580 */
1491static void 1581ecb_hot static void
1492mark (pointer a) 1582mark (pointer a)
1493{ 1583{
1494 pointer t, q, p; 1584 pointer t, q, p;
1495 1585
1496 t = 0; 1586 t = 0;
… …
1500 1590
1501 if (ecb_expect_false (is_vector (p))) 1591 if (ecb_expect_false (is_vector (p)))
1502 { 1592 {
1503 int i; 1593 int i;
1504 1594
1505 for (i = 0; i < p->object.vector.length; i++) 1595 for (i = 0; i < veclength (p); i++)
1506 mark (vecvalue (p)[i]); 1596 mark (vecvalue (p)[i]);
1507 } 1597 }
1508 1598
1509 if (is_atom (p)) 1599 if (is_atom (p))
1510 goto E6; 1600 goto E6;
… …
1553 p = q; 1643 p = q;
1554 goto E6; 1644 goto E6;
1555 } 1645 }
1556} 1646}
1557 1647
1648ecb_hot static void
1649gc_free (SCHEME_P)
1650{
1651 int i;
1652 uint32_t total = 0;
1653
1654 /* Here we scan the cells to build the free-list. */
1655 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1656 {
1657 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1658 struct cell *p;
1659 total += SCHEME_V->cell_segsize [i];
1660
1661 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1662 {
1663 pointer c = POINTER (p);
1664
1665 if (is_mark (c))
1666 clrmark (c);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (c) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (c, T_PAIR);
1674 set_car (c, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = c;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose)
1685 {
1686 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");
1687 }
1688}
1689
1558/* garbage collection. parameter a, b is marked. */ 1690/* garbage collection. parameter a, b is marked. */
1559static void 1691ecb_cold static void
1560gc (SCHEME_P_ pointer a, pointer b) 1692gc (SCHEME_P_ pointer a, pointer b)
1561{ 1693{
1562 pointer p;
1563 int i; 1694 int i;
1564 1695
1565 if (SCHEME_V->gc_verbose) 1696 if (SCHEME_V->gc_verbose)
1566 putstr (SCHEME_A_ "gc..."); 1697 putstr (SCHEME_A_ "gc...");
1567 1698
… …
1583 /* Mark recent objects the interpreter doesn't know about yet. */ 1714 /* Mark recent objects the interpreter doesn't know about yet. */
1584 mark (car (S_SINK)); 1715 mark (car (S_SINK));
1585 /* Mark any older stuff above nested C calls */ 1716 /* Mark any older stuff above nested C calls */
1586 mark (SCHEME_V->c_nest); 1717 mark (SCHEME_V->c_nest);
1587 1718
1719#if USE_INTCACHE
1720 /* mark intcache */
1721 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1722 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1723 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1724#endif
1725
1588 /* mark variables a, b */ 1726 /* mark variables a, b */
1589 mark (a); 1727 mark (a);
1590 mark (b); 1728 mark (b);
1591 1729
1592 /* garbage collect */ 1730 /* garbage collect */
1593 clrmark (NIL); 1731 clrmark (NIL);
1594 SCHEME_V->fcells = 0; 1732 SCHEME_V->fcells = 0;
1595 SCHEME_V->free_cell = NIL; 1733 SCHEME_V->free_cell = NIL;
1596 1734
1597 /* free-list is kept sorted by address so as to maintain consecutive
1598 ranges, if possible, for use with vectors. Here we scan the cells
1599 (which are also kept sorted by address) downwards to build the
1600 free-list in sorted order.
1601 */
1602 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1603 {
1604 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1605
1606 while (--p >= SCHEME_V->cell_seg[i])
1607 {
1608 if (is_mark (p))
1609 clrmark (p);
1610 else
1611 {
1612 /* reclaim cell */
1613 if (typeflag (p) != T_FREE)
1614 {
1615 finalize_cell (SCHEME_A_ p);
1616 set_typeflag (p, T_FREE);
1617 set_car (p, NIL);
1618 }
1619
1620 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell);
1622 SCHEME_V->free_cell = p;
1623 }
1624 }
1625 }
1626
1627 if (SCHEME_V->gc_verbose) 1735 if (SCHEME_V->gc_verbose)
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1736 putstr (SCHEME_A_ "freeing...");
1629}
1630 1737
1631static void 1738 gc_free (SCHEME_A);
1632finalize_cell (SCHEME_P_ pointer a)
1633{
1634 /* TODO, fast bitmap check? */
1635 if (is_string (a))
1636 free (strvalue (a));
1637 else if (is_vector (a))
1638 free (vecvalue (a));
1639#if USE_PORTS
1640 else if (is_port (a))
1641 {
1642 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1643 port_close (SCHEME_A_ a, port_input | port_output);
1644
1645 free (a->object.port);
1646 }
1647#endif
1648} 1739}
1649 1740
1650/* ========== Routines for Reading ========== */ 1741/* ========== Routines for Reading ========== */
1651 1742
1652static int 1743ecb_cold static int
1653file_push (SCHEME_P_ const char *fname) 1744file_push (SCHEME_P_ const char *fname)
1654{ 1745{
1655#if USE_PORTS
1656 int fin; 1746 int fin;
1657 1747
1658 if (SCHEME_V->file_i == MAXFIL - 1) 1748 if (SCHEME_V->file_i == MAXFIL - 1)
1659 return 0; 1749 return 0;
1660 1750
… …
1666 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1667 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1668 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1669 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1670 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1760 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1671 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1761 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1672 1762
1673#if SHOW_ERROR_LINE 1763#if SHOW_ERROR_LINE
1674 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1764 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1675 1765
1676 if (fname) 1766 if (fname)
1677 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1767 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1678#endif 1768#endif
1679 } 1769 }
1680 1770
1681 return fin >= 0; 1771 return fin >= 0;
1682
1683#else
1684 return 1;
1685#endif
1686} 1772}
1687 1773
1688static void 1774ecb_cold static void
1689file_pop (SCHEME_P) 1775file_pop (SCHEME_P)
1690{ 1776{
1691 if (SCHEME_V->file_i != 0) 1777 if (SCHEME_V->file_i != 0)
1692 { 1778 {
1693 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1694#if USE_PORTS 1780#if USE_PORTS
1695 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1696#endif 1782#endif
1697 SCHEME_V->file_i--; 1783 SCHEME_V->file_i--;
1698 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1784 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1699 } 1785 }
1700} 1786}
1701 1787
1702static int 1788ecb_cold static int
1703file_interactive (SCHEME_P) 1789file_interactive (SCHEME_P)
1704{ 1790{
1705#if USE_PORTS 1791#if USE_PORTS
1706 return SCHEME_V->file_i == 0 1792 return SCHEME_V->file_i == 0
1707 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1708 && (SCHEME_V->inport->object.port->kind & port_file); 1794 && (port (SCHEME_V->inport)->kind & port_file);
1709#else 1795#else
1710 return 0; 1796 return 0;
1711#endif 1797#endif
1712} 1798}
1713 1799
1714#if USE_PORTS 1800#if USE_PORTS
1715static port * 1801ecb_cold static port *
1716port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1802port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1717{ 1803{
1718 int fd; 1804 int fd;
1719 int flags; 1805 int flags;
1720 char *rw; 1806 char *rw;
… …
1743# endif 1829# endif
1744 1830
1745 return pt; 1831 return pt;
1746} 1832}
1747 1833
1748static pointer 1834ecb_cold static pointer
1749port_from_filename (SCHEME_P_ const char *fn, int prop) 1835port_from_filename (SCHEME_P_ const char *fn, int prop)
1750{ 1836{
1751 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1837 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1752 1838
1753 if (!pt && USE_ERROR_CHECKING) 1839 if (!pt && USE_ERROR_CHECKING)
1754 return NIL; 1840 return NIL;
1755 1841
1756 return mk_port (SCHEME_A_ pt); 1842 return mk_port (SCHEME_A_ pt);
1757} 1843}
1758 1844
1759static port * 1845ecb_cold static port *
1760port_rep_from_file (SCHEME_P_ int f, int prop) 1846port_rep_from_file (SCHEME_P_ int f, int prop)
1761{ 1847{
1762 port *pt = malloc (sizeof *pt); 1848 port *pt = malloc (sizeof *pt);
1763 1849
1764 if (!pt && USE_ERROR_CHECKING) 1850 if (!pt && USE_ERROR_CHECKING)
… …
1769 pt->rep.stdio.file = f; 1855 pt->rep.stdio.file = f;
1770 pt->rep.stdio.closeit = 0; 1856 pt->rep.stdio.closeit = 0;
1771 return pt; 1857 return pt;
1772} 1858}
1773 1859
1774static pointer 1860ecb_cold static pointer
1775port_from_file (SCHEME_P_ int f, int prop) 1861port_from_file (SCHEME_P_ int f, int prop)
1776{ 1862{
1777 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1863 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1778 1864
1779 if (!pt && USE_ERROR_CHECKING) 1865 if (!pt && USE_ERROR_CHECKING)
1780 return NIL; 1866 return NIL;
1781 1867
1782 return mk_port (SCHEME_A_ pt); 1868 return mk_port (SCHEME_A_ pt);
1783} 1869}
1784 1870
1785static port * 1871ecb_cold static port *
1786port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1872port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1787{ 1873{
1788 port *pt = malloc (sizeof (port)); 1874 port *pt = malloc (sizeof (port));
1789 1875
1790 if (!pt && USE_ERROR_CHECKING) 1876 if (!pt && USE_ERROR_CHECKING)
… …
1796 pt->rep.string.curr = start; 1882 pt->rep.string.curr = start;
1797 pt->rep.string.past_the_end = past_the_end; 1883 pt->rep.string.past_the_end = past_the_end;
1798 return pt; 1884 return pt;
1799} 1885}
1800 1886
1801static pointer 1887ecb_cold static pointer
1802port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1888port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1803{ 1889{
1804 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1890 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1805 1891
1806 if (!pt && USE_ERROR_CHECKING) 1892 if (!pt && USE_ERROR_CHECKING)
… …
1809 return mk_port (SCHEME_A_ pt); 1895 return mk_port (SCHEME_A_ pt);
1810} 1896}
1811 1897
1812# define BLOCK_SIZE 256 1898# define BLOCK_SIZE 256
1813 1899
1814static port * 1900ecb_cold static port *
1815port_rep_from_scratch (SCHEME_P) 1901port_rep_from_scratch (SCHEME_P)
1816{ 1902{
1817 char *start; 1903 char *start;
1818 port *pt = malloc (sizeof (port)); 1904 port *pt = malloc (sizeof (port));
1819 1905
… …
1833 pt->rep.string.curr = start; 1919 pt->rep.string.curr = start;
1834 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1920 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1835 return pt; 1921 return pt;
1836} 1922}
1837 1923
1838static pointer 1924ecb_cold static pointer
1839port_from_scratch (SCHEME_P) 1925port_from_scratch (SCHEME_P)
1840{ 1926{
1841 port *pt = port_rep_from_scratch (SCHEME_A); 1927 port *pt = port_rep_from_scratch (SCHEME_A);
1842 1928
1843 if (!pt && USE_ERROR_CHECKING) 1929 if (!pt && USE_ERROR_CHECKING)
1844 return NIL; 1930 return NIL;
1845 1931
1846 return mk_port (SCHEME_A_ pt); 1932 return mk_port (SCHEME_A_ pt);
1847} 1933}
1848 1934
1849static void 1935ecb_cold static void
1850port_close (SCHEME_P_ pointer p, int flag) 1936port_close (SCHEME_P_ pointer p, int flag)
1851{ 1937{
1852 port *pt = p->object.port; 1938 port *pt = port (p);
1853 1939
1854 pt->kind &= ~flag; 1940 pt->kind &= ~flag;
1855 1941
1856 if ((pt->kind & (port_input | port_output)) == 0) 1942 if ((pt->kind & (port_input | port_output)) == 0)
1857 { 1943 {
… …
1874 } 1960 }
1875} 1961}
1876#endif 1962#endif
1877 1963
1878/* get new character from input file */ 1964/* get new character from input file */
1879static int 1965ecb_cold static int
1880inchar (SCHEME_P) 1966inchar (SCHEME_P)
1881{ 1967{
1882 int c; 1968 int c;
1883 port *pt; 1969 port *pt = port (SCHEME_V->inport);
1884
1885 pt = SCHEME_V->inport->object.port;
1886 1970
1887 if (pt->kind & port_saw_EOF) 1971 if (pt->kind & port_saw_EOF)
1888 return EOF; 1972 return EOF;
1889 1973
1890 c = basic_inchar (pt); 1974 c = basic_inchar (pt);
… …
1900 } 1984 }
1901 1985
1902 return c; 1986 return c;
1903} 1987}
1904 1988
1905static int ungot = -1; 1989ecb_cold static int
1906
1907static int
1908basic_inchar (port *pt) 1990basic_inchar (port *pt)
1909{ 1991{
1910#if USE_PORTS
1911 if (pt->unget != -1) 1992 if (pt->unget != -1)
1912 { 1993 {
1913 int r = pt->unget; 1994 int r = pt->unget;
1914 pt->unget = -1; 1995 pt->unget = -1;
1915 return r; 1996 return r;
1916 } 1997 }
1917 1998
1999#if USE_PORTS
1918 if (pt->kind & port_file) 2000 if (pt->kind & port_file)
1919 { 2001 {
1920 char c; 2002 char c;
1921 2003
1922 if (!read (pt->rep.stdio.file, &c, 1)) 2004 if (!read (pt->rep.stdio.file, &c, 1))
… …
1930 return EOF; 2012 return EOF;
1931 else 2013 else
1932 return *pt->rep.string.curr++; 2014 return *pt->rep.string.curr++;
1933 } 2015 }
1934#else 2016#else
1935 if (ungot == -1)
1936 {
1937 char c; 2017 char c;
1938 if (!read (0, &c, 1)) 2018
2019 if (!read (pt->rep.stdio.file, &c, 1))
1939 return EOF; 2020 return EOF;
1940 2021
1941 ungot = c;
1942 }
1943
1944 {
1945 int r = ungot;
1946 ungot = -1;
1947 return r; 2022 return c;
1948 }
1949#endif 2023#endif
1950} 2024}
1951 2025
1952/* back character to input buffer */ 2026/* back character to input buffer */
1953static void 2027ecb_cold static void
1954backchar (SCHEME_P_ int c) 2028backchar (SCHEME_P_ int c)
1955{ 2029{
1956#if USE_PORTS 2030 port *pt = port (SCHEME_V->inport);
1957 port *pt;
1958 2031
1959 if (c == EOF) 2032 if (c == EOF)
1960 return; 2033 return;
1961 2034
1962 pt = SCHEME_V->inport->object.port;
1963 pt->unget = c; 2035 pt->unget = c;
1964#else
1965 if (c == EOF)
1966 return;
1967
1968 ungot = c;
1969#endif
1970} 2036}
1971 2037
1972#if USE_PORTS 2038#if USE_PORTS
1973static int 2039ecb_cold static int
1974realloc_port_string (SCHEME_P_ port *p) 2040realloc_port_string (SCHEME_P_ port *p)
1975{ 2041{
1976 char *start = p->rep.string.start; 2042 char *start = p->rep.string.start;
1977 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2043 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
1978 char *str = malloc (new_size); 2044 char *str = malloc (new_size);
… …
1991 else 2057 else
1992 return 0; 2058 return 0;
1993} 2059}
1994#endif 2060#endif
1995 2061
1996INTERFACE void 2062ecb_cold static void
1997putstr (SCHEME_P_ const char *s) 2063putchars (SCHEME_P_ const char *s, int len)
1998{ 2064{
2065 port *pt = port (SCHEME_V->outport);
2066
1999#if USE_PORTS 2067#if USE_PORTS
2000 port *pt = SCHEME_V->outport->object.port;
2001
2002 if (pt->kind & port_file)
2003 write (pt->rep.stdio.file, s, strlen (s));
2004 else
2005 for (; *s; s++)
2006 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2007 *pt->rep.string.curr++ = *s;
2008 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2009 *pt->rep.string.curr++ = *s;
2010
2011#else
2012 xwrstr (s);
2013#endif
2014}
2015
2016static void
2017putchars (SCHEME_P_ const char *s, int len)
2018{
2019#if USE_PORTS
2020 port *pt = SCHEME_V->outport->object.port;
2021
2022 if (pt->kind & port_file) 2068 if (pt->kind & port_file)
2023 write (pt->rep.stdio.file, s, len); 2069 write (pt->rep.stdio.file, s, len);
2024 else 2070 else
2025 { 2071 {
2026 for (; len; len--) 2072 for (; len; len--)
… …
2031 *pt->rep.string.curr++ = *s++; 2077 *pt->rep.string.curr++ = *s++;
2032 } 2078 }
2033 } 2079 }
2034 2080
2035#else 2081#else
2036 write (1, s, len); 2082 write (1, s, len); // output not initialised
2037#endif 2083#endif
2084}
2085
2086INTERFACE void
2087putstr (SCHEME_P_ const char *s)
2088{
2089 putchars (SCHEME_A_ s, strlen (s));
2038} 2090}
2039 2091
2040INTERFACE void 2092INTERFACE void
2041putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2042{ 2094{
2043#if USE_PORTS
2044 port *pt = SCHEME_V->outport->object.port;
2045
2046 if (pt->kind & port_file)
2047 {
2048 char cc = c;
2049 write (pt->rep.stdio.file, &cc, 1);
2050 }
2051 else
2052 {
2053 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2054 *pt->rep.string.curr++ = c;
2055 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2056 *pt->rep.string.curr++ = c;
2057 }
2058
2059#else
2060 char cc = c; 2095 char cc = c;
2061 write (1, &c, 1); 2096
2062#endif 2097 putchars (SCHEME_A_ &cc, 1);
2063} 2098}
2064 2099
2065/* read characters up to delimiter, but cater to character constants */ 2100/* read characters up to delimiter, but cater to character constants */
2066static char * 2101ecb_cold static char *
2067readstr_upto (SCHEME_P_ char *delim) 2102readstr_upto (SCHEME_P_ int skip, const char *delim)
2068{ 2103{
2069 char *p = SCHEME_V->strbuff; 2104 char *p = SCHEME_V->strbuff + skip;
2070 2105
2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2106 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072 2107
2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2108 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074 *p = 0; 2109 *p = 0;
… …
2080 2115
2081 return SCHEME_V->strbuff; 2116 return SCHEME_V->strbuff;
2082} 2117}
2083 2118
2084/* read string expression "xxx...xxx" */ 2119/* read string expression "xxx...xxx" */
2085static pointer 2120ecb_cold static pointer
2086readstrexp (SCHEME_P) 2121readstrexp (SCHEME_P_ char delim)
2087{ 2122{
2088 char *p = SCHEME_V->strbuff; 2123 char *p = SCHEME_V->strbuff;
2089 int c; 2124 int c;
2090 int c1 = 0; 2125 int c1 = 0;
2091 enum
2092 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2126 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093 2127
2094 for (;;) 2128 for (;;)
2095 { 2129 {
2096 c = inchar (SCHEME_A); 2130 c = inchar (SCHEME_A);
2097 2131
… …
2099 return S_F; 2133 return S_F;
2100 2134
2101 switch (state) 2135 switch (state)
2102 { 2136 {
2103 case st_ok: 2137 case st_ok:
2104 switch (c) 2138 if (ecb_expect_false (c == delim))
2105 {
2106 case '\\':
2107 state = st_bsl;
2108 break;
2109
2110 case '"':
2111 *p = 0;
2112 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2139 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113 2140
2114 default: 2141 if (ecb_expect_false (c == '\\'))
2142 state = st_bsl;
2143 else
2115 *p++ = c; 2144 *p++ = c;
2116 break;
2117 }
2118 2145
2119 break; 2146 break;
2120 2147
2121 case st_bsl: 2148 case st_bsl:
2122 switch (c) 2149 switch (c)
… …
2131 case '7': 2158 case '7':
2132 state = st_oct1; 2159 state = st_oct1;
2133 c1 = c - '0'; 2160 c1 = c - '0';
2134 break; 2161 break;
2135 2162
2163 case 'a': *p++ = '\a'; state = st_ok; break;
2164 case 'n': *p++ = '\n'; state = st_ok; break;
2165 case 'r': *p++ = '\r'; state = st_ok; break;
2166 case 't': *p++ = '\t'; state = st_ok; break;
2167
2168 // this overshoots the minimum requirements of r7rs
2169 case ' ':
2170 case '\t':
2171 case '\r':
2172 case '\n':
2173 skipspace (SCHEME_A);
2174 state = st_ok;
2175 break;
2176
2177 //TODO: x should end in ;, not two-digit hex
2136 case 'x': 2178 case 'x':
2137 case 'X': 2179 case 'X':
2138 state = st_x1; 2180 state = st_x1;
2139 c1 = 0; 2181 c1 = 0;
2140 break; 2182 break;
2141 2183
2142 case 'n':
2143 *p++ = '\n';
2144 state = st_ok;
2145 break;
2146
2147 case 't':
2148 *p++ = '\t';
2149 state = st_ok;
2150 break;
2151
2152 case 'r':
2153 *p++ = '\r';
2154 state = st_ok;
2155 break;
2156
2157 case '"':
2158 *p++ = '"';
2159 state = st_ok;
2160 break;
2161
2162 default: 2184 default:
2163 *p++ = c; 2185 *p++ = c;
2164 state = st_ok; 2186 state = st_ok;
2165 break; 2187 break;
2166 } 2188 }
2167 2189
2168 break; 2190 break;
2169 2191
2170 case st_x1: 2192 case st_x1:
2171 case st_x2: 2193 case st_x2:
2172 c = toupper (c); 2194 c = tolower (c);
2173 2195
2174 if (c >= '0' && c <= 'F') 2196 if (c >= '0' && c <= '9')
2175 {
2176 if (c <= '9')
2177 c1 = (c1 << 4) + c - '0'; 2197 c1 = (c1 << 4) + c - '0';
2178 else 2198 else if (c >= 'a' && c <= 'f')
2179 c1 = (c1 << 4) + c - 'A' + 10; 2199 c1 = (c1 << 4) + c - 'a' + 10;
2180
2181 if (state == st_x1)
2182 state = st_x2;
2183 else
2184 {
2185 *p++ = c1;
2186 state = st_ok;
2187 }
2188 }
2189 else 2200 else
2190 return S_F; 2201 return S_F;
2202
2203 if (state == st_x1)
2204 state = st_x2;
2205 else
2206 {
2207 *p++ = c1;
2208 state = st_ok;
2209 }
2191 2210
2192 break; 2211 break;
2193 2212
2194 case st_oct1: 2213 case st_oct1:
2195 case st_oct2: 2214 case st_oct2:
… …
2199 backchar (SCHEME_A_ c); 2218 backchar (SCHEME_A_ c);
2200 state = st_ok; 2219 state = st_ok;
2201 } 2220 }
2202 else 2221 else
2203 { 2222 {
2204 if (state == st_oct2 && c1 >= 32) 2223 if (state == st_oct2 && c1 >= ' ')
2205 return S_F; 2224 return S_F;
2206 2225
2207 c1 = (c1 << 3) + (c - '0'); 2226 c1 = (c1 << 3) + (c - '0');
2208 2227
2209 if (state == st_oct1) 2228 if (state == st_oct1)
… …
2214 state = st_ok; 2233 state = st_ok;
2215 } 2234 }
2216 } 2235 }
2217 2236
2218 break; 2237 break;
2219
2220 } 2238 }
2221 } 2239 }
2222} 2240}
2223 2241
2224/* check c is in chars */ 2242/* check c is in chars */
2225ecb_inline int 2243ecb_cold int
2226is_one_of (char *s, int c) 2244is_one_of (const char *s, int c)
2227{ 2245{
2228 if (c == EOF)
2229 return 1;
2230
2231 return !!strchr (s, c); 2246 return c == EOF || !!strchr (s, c);
2232} 2247}
2233 2248
2234/* skip white characters */ 2249/* skip white characters */
2235ecb_inline int 2250ecb_cold int
2236skipspace (SCHEME_P) 2251skipspace (SCHEME_P)
2237{ 2252{
2238 int c, curr_line = 0; 2253 int c, curr_line = 0;
2239 2254
2240 do 2255 do
2241 { 2256 {
2242 c = inchar (SCHEME_A); 2257 c = inchar (SCHEME_A);
2258
2243#if SHOW_ERROR_LINE 2259#if SHOW_ERROR_LINE
2244 if (c == '\n') 2260 if (ecb_expect_false (c == '\n'))
2245 curr_line++; 2261 curr_line++;
2246#endif 2262#endif
2263
2264 if (ecb_expect_false (c == EOF))
2265 return c;
2247 } 2266 }
2248 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2267 while (is_one_of (WHITESPACE, c));
2249 2268
2250 /* record it */ 2269 /* record it */
2251#if SHOW_ERROR_LINE 2270#if SHOW_ERROR_LINE
2252 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2271 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2272 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254#endif 2273#endif
2255 2274
2256 if (c != EOF)
2257 {
2258 backchar (SCHEME_A_ c); 2275 backchar (SCHEME_A_ c);
2259 return 1; 2276 return 1;
2260 }
2261 else
2262 return EOF;
2263} 2277}
2264 2278
2265/* get token */ 2279/* get token */
2266static int 2280ecb_cold static int
2267token (SCHEME_P) 2281token (SCHEME_P)
2268{ 2282{
2269 int c = skipspace (SCHEME_A); 2283 int c = skipspace (SCHEME_A);
2270 2284
2271 if (c == EOF) 2285 if (c == EOF)
… …
2283 return TOK_RPAREN; 2297 return TOK_RPAREN;
2284 2298
2285 case '.': 2299 case '.':
2286 c = inchar (SCHEME_A); 2300 c = inchar (SCHEME_A);
2287 2301
2288 if (is_one_of (" \n\t", c)) 2302 if (is_one_of (WHITESPACE, c))
2289 return TOK_DOT; 2303 return TOK_DOT;
2290 else 2304 else
2291 { 2305 {
2292 //TODO: ungetc twice in a row is not supported in C
2293 backchar (SCHEME_A_ c); 2306 backchar (SCHEME_A_ c);
2294 backchar (SCHEME_A_ '.');
2295 return TOK_ATOM; 2307 return TOK_DOTATOM;
2296 } 2308 }
2309
2310 case '|':
2311 return TOK_STRATOM;
2297 2312
2298 case '\'': 2313 case '\'':
2299 return TOK_QUOTE; 2314 return TOK_QUOTE;
2300 2315
2301 case ';': 2316 case ';':
… …
2368} 2383}
2369 2384
2370/* ========== Routines for Printing ========== */ 2385/* ========== Routines for Printing ========== */
2371#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2386#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2372 2387
2373static void 2388ecb_cold static void
2374printslashstring (SCHEME_P_ char *p, int len) 2389printslashstring (SCHEME_P_ char *p, int len)
2375{ 2390{
2376 int i; 2391 int i;
2377 unsigned char *s = (unsigned char *) p; 2392 unsigned char *s = (unsigned char *) p;
2378 2393
… …
2433 } 2448 }
2434 2449
2435 putcharacter (SCHEME_A_ '"'); 2450 putcharacter (SCHEME_A_ '"');
2436} 2451}
2437 2452
2438
2439/* print atoms */ 2453/* print atoms */
2440static void 2454ecb_cold static void
2441printatom (SCHEME_P_ pointer l, int f) 2455printatom (SCHEME_P_ pointer l, int f)
2442{ 2456{
2443 char *p; 2457 char *p;
2444 int len; 2458 int len;
2445 2459
2446 atom2str (SCHEME_A_ l, f, &p, &len); 2460 atom2str (SCHEME_A_ l, f, &p, &len);
2447 putchars (SCHEME_A_ p, len); 2461 putchars (SCHEME_A_ p, len);
2448} 2462}
2449 2463
2450
2451/* Uses internal buffer unless string pointer is already available */ 2464/* Uses internal buffer unless string pointer is already available */
2452static void 2465ecb_cold static void
2453atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2466atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454{ 2467{
2455 char *p; 2468 char *p;
2456 2469
2457 if (l == NIL) 2470 if (l == NIL)
… …
2615#endif 2628#endif
2616 } 2629 }
2617 else if (is_continuation (l)) 2630 else if (is_continuation (l))
2618 p = "#<CONTINUATION>"; 2631 p = "#<CONTINUATION>";
2619 else 2632 else
2633 {
2634#if USE_PRINTF
2635 p = SCHEME_V->strbuff;
2636 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2637#else
2620 p = "#<ERROR>"; 2638 p = "#<ERROR>";
2639#endif
2640 }
2621 2641
2622 *pp = p; 2642 *pp = p;
2623 *plen = strlen (p); 2643 *plen = strlen (p);
2624} 2644}
2625 2645
… …
2657 return car (d); 2677 return car (d);
2658 2678
2659 p = cons (car (d), cdr (d)); 2679 p = cons (car (d), cdr (d));
2660 q = p; 2680 q = p;
2661 2681
2662 while (cdr (cdr (p)) != NIL) 2682 while (cddr (p) != NIL)
2663 { 2683 {
2664 d = cons (car (p), cdr (p)); 2684 d = cons (car (p), cdr (p));
2665 2685
2666 if (cdr (cdr (p)) != NIL) 2686 if (cddr (p) != NIL)
2667 p = cdr (d); 2687 p = cdr (d);
2668 } 2688 }
2669 2689
2670 set_cdr (p, car (cdr (p))); 2690 set_cdr (p, cadr (p));
2671 return q; 2691 return q;
2672} 2692}
2673 2693
2674/* reverse list -- produce new list */ 2694/* reverse list -- produce new list */
2675static pointer 2695ecb_hot static pointer
2676reverse (SCHEME_P_ pointer a) 2696reverse (SCHEME_P_ pointer a)
2677{ 2697{
2678 /* a must be checked by gc */ 2698 /* a must be checked by gc */
2679 pointer p = NIL; 2699 pointer p = NIL;
2680 2700
… …
2683 2703
2684 return p; 2704 return p;
2685} 2705}
2686 2706
2687/* reverse list --- in-place */ 2707/* reverse list --- in-place */
2688static pointer 2708ecb_hot static pointer
2689reverse_in_place (SCHEME_P_ pointer term, pointer list) 2709reverse_in_place (SCHEME_P_ pointer term, pointer list)
2690{ 2710{
2691 pointer result = term; 2711 pointer result = term;
2692 pointer p = list; 2712 pointer p = list;
2693 2713
… …
2701 2721
2702 return result; 2722 return result;
2703} 2723}
2704 2724
2705/* append list -- produce new list (in reverse order) */ 2725/* append list -- produce new list (in reverse order) */
2706static pointer 2726ecb_hot static pointer
2707revappend (SCHEME_P_ pointer a, pointer b) 2727revappend (SCHEME_P_ pointer a, pointer b)
2708{ 2728{
2709 pointer result = a; 2729 pointer result = a;
2710 pointer p = b; 2730 pointer p = b;
2711 2731
… …
2720 2740
2721 return S_F; /* signal an error */ 2741 return S_F; /* signal an error */
2722} 2742}
2723 2743
2724/* equivalence of atoms */ 2744/* equivalence of atoms */
2725int 2745ecb_hot int
2726eqv (pointer a, pointer b) 2746eqv (pointer a, pointer b)
2727{ 2747{
2728 if (is_string (a)) 2748 if (is_string (a))
2729 { 2749 {
2730 if (is_string (b)) 2750 if (is_string (b))
… …
2769/* () is #t in R5RS */ 2789/* () is #t in R5RS */
2770#define is_true(p) ((p) != S_F) 2790#define is_true(p) ((p) != S_F)
2771#define is_false(p) ((p) == S_F) 2791#define is_false(p) ((p) == S_F)
2772 2792
2773/* ========== Environment implementation ========== */ 2793/* ========== Environment implementation ========== */
2774
2775#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777static int
2778hash_fn (const char *key, int table_size)
2779{
2780 const unsigned char *p = key;
2781 uint32_t hash = 2166136261;
2782
2783 while (*p)
2784 hash = (hash ^ *p++) * 16777619;
2785
2786 return hash % table_size;
2787}
2788#endif
2789 2794
2790#ifndef USE_ALIST_ENV 2795#ifndef USE_ALIST_ENV
2791 2796
2792/* 2797/*
2793 * In this implementation, each frame of the environment may be 2798 * In this implementation, each frame of the environment may be
… …
2810 2815
2811 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2816 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812 setenvironment (SCHEME_V->envir); 2817 setenvironment (SCHEME_V->envir);
2813} 2818}
2814 2819
2820static uint32_t
2821sym_hash (pointer sym, uint32_t size)
2822{
2823 uintptr_t ptr = (uintptr_t)sym;
2824
2825#if 0
2826 /* table size is prime, so why mix */
2827 ptr += ptr >> 32;
2828 ptr += ptr >> 16;
2829 ptr += ptr >> 8;
2830#endif
2831
2832 return ptr % size;
2833}
2834
2815ecb_inline void 2835ecb_inline void
2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2836new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817{ 2837{
2818 pointer slot = immutable_cons (variable, value); 2838 pointer slot = immutable_cons (variable, value);
2819 2839
2820 if (is_vector (car (env))) 2840 if (is_vector (car (env)))
2821 { 2841 {
2822 int location = hash_fn (symname (variable), veclength (car (env))); 2842 int location = sym_hash (variable, veclength (car (env)));
2823
2824 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2843 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825 } 2844 }
2826 else 2845 else
2827 set_car (env, immutable_cons (slot, car (env))); 2846 set_car (env, immutable_cons (slot, car (env)));
2828} 2847}
2829 2848
2830static pointer 2849ecb_hot static pointer
2831find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2850find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832{ 2851{
2833 pointer x, y; 2852 pointer x, y;
2834 int location;
2835 2853
2836 for (x = env; x != NIL; x = cdr (x)) 2854 for (x = env; x != NIL; x = cdr (x))
2837 { 2855 {
2838 if (is_vector (car (x))) 2856 if (is_vector (car (x)))
2839 { 2857 {
2840 location = hash_fn (symname (hdl), veclength (car (x))); 2858 int location = sym_hash (hdl, veclength (car (x)));
2841 y = vector_elem (car (x), location); 2859 y = vector_get (car (x), location);
2842 } 2860 }
2843 else 2861 else
2844 y = car (x); 2862 y = car (x);
2845 2863
2846 for (; y != NIL; y = cdr (y)) 2864 for (; y != NIL; y = cdr (y))
2847 if (caar (y) == hdl) 2865 if (caar (y) == hdl)
2848 break; 2866 break;
2849 2867
2850 if (y != NIL) 2868 if (y != NIL)
2869 return car (y);
2870
2871 if (!all)
2851 break; 2872 break;
2852
2853 if (!all)
2854 return NIL;
2855 } 2873 }
2856
2857 if (x != NIL)
2858 return car (y);
2859 2874
2860 return NIL; 2875 return NIL;
2861} 2876}
2862 2877
2863#else /* USE_ALIST_ENV */ 2878#else /* USE_ALIST_ENV */
2864 2879
2865ecb_inline void 2880static void
2866new_frame_in_env (SCHEME_P_ pointer old_env) 2881new_frame_in_env (SCHEME_P_ pointer old_env)
2867{ 2882{
2868 SCHEME_V->envir = immutable_cons (NIL, old_env); 2883 SCHEME_V->envir = immutable_cons (NIL, old_env);
2869 setenvironment (SCHEME_V->envir); 2884 setenvironment (SCHEME_V->envir);
2870} 2885}
2871 2886
2872ecb_inline void 2887static void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2888new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2889{
2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2890 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2876} 2891}
2877 2892
2878static pointer 2893ecb_hot static pointer
2879find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2894find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2880{ 2895{
2881 pointer x, y; 2896 pointer x, y;
2882 2897
2883 for (x = env; x != NIL; x = cdr (x)) 2898 for (x = env; x != NIL; x = cdr (x))
… …
2885 for (y = car (x); y != NIL; y = cdr (y)) 2900 for (y = car (x); y != NIL; y = cdr (y))
2886 if (caar (y) == hdl) 2901 if (caar (y) == hdl)
2887 break; 2902 break;
2888 2903
2889 if (y != NIL) 2904 if (y != NIL)
2905 return car (y);
2890 break; 2906 break;
2891 2907
2892 if (!all) 2908 if (!all)
2893 return NIL; 2909 break;
2894 } 2910 }
2895
2896 if (x != NIL)
2897 return car (y);
2898 2911
2899 return NIL; 2912 return NIL;
2900} 2913}
2901 2914
2902#endif /* USE_ALIST_ENV else */ 2915#endif /* USE_ALIST_ENV else */
2903 2916
2904ecb_inline void 2917static void
2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906{ 2919{
2920 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2921 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908} 2922}
2909 2923
2910ecb_inline void 2924static void
2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2925set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2912{ 2926{
2913 set_cdr (slot, value); 2927 set_cdr (slot, value);
2914} 2928}
2915 2929
2916ecb_inline pointer 2930static pointer
2917slot_value_in_env (pointer slot) 2931slot_value_in_env (pointer slot)
2918{ 2932{
2919 return cdr (slot); 2933 return cdr (slot);
2920} 2934}
2921 2935
2922/* ========== Evaluation Cycle ========== */ 2936/* ========== Evaluation Cycle ========== */
2923 2937
2924static int 2938ecb_cold static int
2925xError_1 (SCHEME_P_ const char *s, pointer a) 2939xError_1 (SCHEME_P_ const char *s, pointer a)
2926{ 2940{
2927#if USE_ERROR_HOOK 2941#if USE_ERROR_HOOK
2928 pointer x; 2942 pointer x;
2929 pointer hdl = SCHEME_V->ERROR_HOOK; 2943 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3005 pointer code; 3019 pointer code;
3006}; 3020};
3007 3021
3008# define STACK_GROWTH 3 3022# define STACK_GROWTH 3
3009 3023
3010static void 3024ecb_hot static void
3011s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3025s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3012{ 3026{
3013 int nframes = (uintptr_t)SCHEME_V->dump; 3027 int nframes = (uintptr_t)SCHEME_V->dump;
3014 struct dump_stack_frame *next_frame; 3028 struct dump_stack_frame *next_frame;
3015 3029
3016 /* enough room for the next frame? */ 3030 /* enough room for the next frame? */
3017 if (nframes >= SCHEME_V->dump_size) 3031 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3018 { 3032 {
3019 SCHEME_V->dump_size += STACK_GROWTH; 3033 SCHEME_V->dump_size += STACK_GROWTH;
3020 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3034 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3021 } 3035 }
3022 3036
… …
3028 next_frame->code = code; 3042 next_frame->code = code;
3029 3043
3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3044 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3031} 3045}
3032 3046
3033static int 3047static ecb_hot int
3034xs_return (SCHEME_P_ pointer a) 3048xs_return (SCHEME_P_ pointer a)
3035{ 3049{
3036 int nframes = (uintptr_t)SCHEME_V->dump; 3050 int nframes = (uintptr_t)SCHEME_V->dump;
3037 struct dump_stack_frame *frame; 3051 struct dump_stack_frame *frame;
3038 3052
… …
3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3063 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3050 3064
3051 return 0; 3065 return 0;
3052} 3066}
3053 3067
3054ecb_inline void 3068ecb_cold void
3055dump_stack_reset (SCHEME_P) 3069dump_stack_reset (SCHEME_P)
3056{ 3070{
3057 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3071 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3058 SCHEME_V->dump = (pointer)+0; 3072 SCHEME_V->dump = (pointer)+0;
3059} 3073}
3060 3074
3061ecb_inline void 3075ecb_cold void
3062dump_stack_initialize (SCHEME_P) 3076dump_stack_initialize (SCHEME_P)
3063{ 3077{
3064 SCHEME_V->dump_size = 0; 3078 SCHEME_V->dump_size = 0;
3065 SCHEME_V->dump_base = 0; 3079 SCHEME_V->dump_base = 0;
3066 dump_stack_reset (SCHEME_A); 3080 dump_stack_reset (SCHEME_A);
3067} 3081}
3068 3082
3069static void 3083ecb_cold static void
3070dump_stack_free (SCHEME_P) 3084dump_stack_free (SCHEME_P)
3071{ 3085{
3072 free (SCHEME_V->dump_base); 3086 free (SCHEME_V->dump_base);
3073 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3074 SCHEME_V->dump = (pointer)0; 3088 SCHEME_V->dump = (pointer)0;
3075 SCHEME_V->dump_size = 0; 3089 SCHEME_V->dump_size = 0;
3076} 3090}
3077 3091
3078static void 3092ecb_cold static void
3079dump_stack_mark (SCHEME_P) 3093dump_stack_mark (SCHEME_P)
3080{ 3094{
3081 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3082 int i; 3096 int i;
3083 3097
… …
3089 mark (frame->envir); 3103 mark (frame->envir);
3090 mark (frame->code); 3104 mark (frame->code);
3091 } 3105 }
3092} 3106}
3093 3107
3094static pointer 3108ecb_cold static pointer
3095ss_get_cont (SCHEME_P) 3109ss_get_cont (SCHEME_P)
3096{ 3110{
3097 int nframes = (uintptr_t)SCHEME_V->dump; 3111 int nframes = (uintptr_t)SCHEME_V->dump;
3098 int i; 3112 int i;
3099 3113
… …
3111 } 3125 }
3112 3126
3113 return cont; 3127 return cont;
3114} 3128}
3115 3129
3116static void 3130ecb_cold static void
3117ss_set_cont (SCHEME_P_ pointer cont) 3131ss_set_cont (SCHEME_P_ pointer cont)
3118{ 3132{
3119 int i = 0; 3133 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3134 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3135
3122 while (cont != NIL) 3136 while (cont != NIL)
3123 { 3137 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3138 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3139 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3140 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3141 frame->code = car (cont) ; cont = cdr (cont);
3128 3142
3129 ++frame; 3143 ++frame;
3130 ++i; 3144 ++i;
3131 } 3145 }
3132 3146
3133 SCHEME_V->dump = (pointer)(uintptr_t)i; 3147 SCHEME_V->dump = (pointer)(uintptr_t)i;
3134} 3148}
3135 3149
3136#else 3150#else
3137 3151
3138ecb_inline void 3152ecb_cold void
3139dump_stack_reset (SCHEME_P) 3153dump_stack_reset (SCHEME_P)
3140{ 3154{
3141 SCHEME_V->dump = NIL; 3155 SCHEME_V->dump = NIL;
3142} 3156}
3143 3157
3144ecb_inline void 3158ecb_cold void
3145dump_stack_initialize (SCHEME_P) 3159dump_stack_initialize (SCHEME_P)
3146{ 3160{
3147 dump_stack_reset (SCHEME_A); 3161 dump_stack_reset (SCHEME_A);
3148} 3162}
3149 3163
3150static void 3164ecb_cold static void
3151dump_stack_free (SCHEME_P) 3165dump_stack_free (SCHEME_P)
3152{ 3166{
3153 SCHEME_V->dump = NIL; 3167 SCHEME_V->dump = NIL;
3154} 3168}
3155 3169
3156static int 3170ecb_hot static int
3157xs_return (SCHEME_P_ pointer a) 3171xs_return (SCHEME_P_ pointer a)
3158{ 3172{
3159 pointer dump = SCHEME_V->dump; 3173 pointer dump = SCHEME_V->dump;
3160 3174
3161 SCHEME_V->value = a; 3175 SCHEME_V->value = a;
3162 3176
3163 if (dump == NIL) 3177 if (dump == NIL)
3164 return -1; 3178 return -1;
3165 3179
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3180 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3183 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3184
3171 SCHEME_V->dump = dump; 3185 SCHEME_V->dump = dump;
3172 3186
3173 return 0; 3187 return 0;
3174} 3188}
3175 3189
3176static void 3190ecb_hot static void
3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3191s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3178{ 3192{
3179 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3193 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3180 cons (args, 3194 cons (args,
3181 cons (SCHEME_V->envir, 3195 cons (SCHEME_V->envir,
3182 cons (code, 3196 cons (code,
3183 SCHEME_V->dump)))); 3197 SCHEME_V->dump))));
3184} 3198}
3185 3199
3200ecb_cold static void
3201dump_stack_mark (SCHEME_P)
3202{
3203 mark (SCHEME_V->dump);
3204}
3205
3206ecb_cold static pointer
3207ss_get_cont (SCHEME_P)
3208{
3209 return SCHEME_V->dump;
3210}
3211
3212ecb_cold static void
3213ss_set_cont (SCHEME_P_ pointer cont)
3214{
3215 SCHEME_V->dump = cont;
3216}
3217
3218#endif
3219
3220#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3221
3222#if EXPERIMENT
3223
3224typedef void *stream[1];
3225
3226#define stream_init() { 0 }
3227
3228ecb_cold static void
3229stream_put (void **s, uint8_t byte)
3230{
3231 uint32_t *sp = *s;
3232 uint32_t size = sizeof (uint32_t) * 2;
3233 uint32_t offs = size;
3234
3235 if (ecb_expect_true (sp))
3236 {
3237 offs = sp[0];
3238 size = sp[1];
3239 }
3240
3241 if (ecb_expect_false (offs == size))
3242 {
3243 size *= 2;
3244 sp = realloc (sp, size);
3245 *s = sp;
3246 sp[1] = size;
3247
3248 }
3249
3250 ((uint8_t *)sp)[offs++] = byte;
3251 sp[0] = offs;
3252}
3253
3254#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3255#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3256#define stream_free(s) free (s[0])
3257
3258// calculates a (preferably small) integer that makes it possible to find
3259// the symbol again. if pointers were offsets into a memory area... until
3260// then, we return segment number in the low bits, and offset in the high
3261// bits
3262static uint32_t
3263symbol_id (SCHEME_P_ pointer sym)
3264{
3265 struct cell *p = CELL (sym);
3266 int i;
3267
3268 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3269 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3270 {
3271 printf ("seg %d ofs %d/%d\n",i,(p - SCHEME_V->cell_seg[i]),SCHEME_V->cell_segsize[i]);//D
3272 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3273 }
3274
3275 abort ();
3276}
3277
3186static void 3278static void
3187dump_stack_mark (SCHEME_P) 3279compile (SCHEME_P_ stream s, pointer x)
3188{ 3280{
3189 mark (SCHEME_V->dump); 3281 if (x == NIL)
3190} 3282 {
3283 stream_put (s, 0);
3284 return;
3285 }
3191 3286
3192static pointer 3287 if (is_syntax (x))
3193ss_get_cont (SCHEME_P) 3288 {
3194{ 3289 stream_put (s, 1);
3195 return SCHEME_V->dump; 3290 stream_put (s, syntaxnum (x));
3196} 3291 return;
3292 }
3197 3293
3198static void 3294 switch (type (x))
3199ss_set_cont (SCHEME_P_ pointer cont) 3295 {
3200{ 3296 case T_INTEGER:
3201 SCHEME_V->dump = cont; 3297 stream_put (s, 2);
3202} 3298 stream_put (s, 0);
3299 stream_put (s, 0);
3300 stream_put (s, 0);
3301 stream_put (s, 0);
3302 return;
3203 3303
3204#endif 3304 case T_SYMBOL:
3305 {
3306 uint32_t sym = symbol_id (SCHEME_A_ x);
3307 printf ("sym %x\n", sym);//D
3205 3308
3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3309 stream_put (s, 3);
3310
3311 while (sym > 0x7f)
3312 {
3313 stream_put (s, sym | 0x80);
3314 sym >>= 8;
3315 }
3316
3317 stream_put (s, sym);
3318 }
3319 return;
3320
3321 case T_PAIR:
3322 stream_put (s, 4);
3323 while (x != NIL)
3324 {
3325 compile (SCHEME_A_ s, car (x));
3326 x = cdr (x);
3327 }
3328 stream_put (s, 0xff);
3329 return;
3330
3331 default:
3332 stream_put (s, 5);
3333 stream_put (s, type (x));
3334 stream_put (s, 0);
3335 stream_put (s, 0);
3336 stream_put (s, 0);
3337 stream_put (s, 0);
3338 break;
3339 }
3340}
3207 3341
3208static int 3342static int
3343compile_closure (SCHEME_P_ pointer p)
3344{
3345 stream s = stream_init ();
3346
3347 printatom (SCHEME_A_ p, 1);//D
3348 compile (SCHEME_A_ s, car (p));
3349
3350 FILE *xxd = popen ("xxd", "we");
3351 fwrite (stream_data (s), 1, stream_size (s), xxd);
3352 fclose (xxd);
3353
3354 return stream_size (s);
3355}
3356
3357static int
3358dtree (SCHEME_P_ int indent, pointer x)
3359{
3360 int c;
3361
3362 if (is_syntax (x))
3363 {
3364 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3365 return 8 + 8;
3366 }
3367
3368 if (x == NIL)
3369 {
3370 printf ("%*sNIL\n", indent, "");
3371 return 3;
3372 }
3373
3374 switch (type (x))
3375 {
3376 case T_INTEGER:
3377 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3378 return 32+8;
3379
3380 case T_SYMBOL:
3381 printf ("%*sS<%s>\n", indent, "", symname (x));
3382 return 24+8;
3383
3384 case T_CLOSURE:
3385 printf ("%*sS<%s>\n", indent, "", "closure");
3386 dtree (SCHEME_A_ indent + 3, cdr(x));
3387 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3388
3389 case T_PAIR:
3390 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3391 c = dtree (SCHEME_A_ indent + 3, car (x));
3392 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3393 return c + 1;
3394
3395 case T_PORT:
3396 printf ("%*sS<%s>\n", indent, "", "port");
3397 return 24+8;
3398
3399 case T_VECTOR:
3400 printf ("%*sS<%s>\n", indent, "", "vector");
3401 return 24+8;
3402
3403 case T_ENVIRONMENT:
3404 printf ("%*sS<%s>\n", indent, "", "environment");
3405 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3406
3407 default:
3408 printf ("unhandled type %d\n", type (x));
3409 break;
3410 }
3411}
3412#endif
3413
3414/* syntax, eval, core, ... */
3415ecb_hot static int
3209opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3416opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210{ 3417{
3211 pointer args = SCHEME_V->args; 3418 pointer args = SCHEME_V->args;
3212 pointer x, y; 3419 pointer x, y;
3213 3420
3214 switch (op) 3421 switch (op)
3215 { 3422 {
3423#if EXPERIMENT //D
3424 case OP_DEBUG:
3425 {
3426 uint32_t len = compile_closure (SCHEME_A_ car (args));
3427 printf ("len = %d\n", len);
3428 printf ("\n");
3429 s_return (S_T);
3430 }
3431#endif
3216 case OP_LOAD: /* load */ 3432 case OP_LOAD: /* load */
3217 if (file_interactive (SCHEME_A)) 3433 if (file_interactive (SCHEME_A))
3218 { 3434 {
3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3435 putstr (SCHEME_A_ "Loading ");
3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3436 putstr (SCHEME_A_ strvalue (car (args)));
3437 putcharacter (SCHEME_A_ '\n');
3221 } 3438 }
3222 3439
3223 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3440 if (!file_push (SCHEME_A_ strvalue (car (args))))
3224 Error_1 ("unable to open", car (args)); 3441 Error_1 ("unable to open", car (args));
3225 else 3442
3226 {
3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3443 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3228 s_goto (OP_T0LVL); 3444 s_goto (OP_T0LVL);
3229 }
3230 3445
3231 case OP_T0LVL: /* top level */ 3446 case OP_T0LVL: /* top level */
3232 3447
3233 /* If we reached the end of file, this loop is done. */ 3448 /* If we reached the end of file, this loop is done. */
3234 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3449 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3235 { 3450 {
3236 if (SCHEME_V->file_i == 0) 3451 if (SCHEME_V->file_i == 0)
3237 { 3452 {
3238 SCHEME_V->args = NIL; 3453 SCHEME_V->args = NIL;
3239 s_goto (OP_QUIT); 3454 s_goto (OP_QUIT);
… …
3250 /* If interactive, be nice to user. */ 3465 /* If interactive, be nice to user. */
3251 if (file_interactive (SCHEME_A)) 3466 if (file_interactive (SCHEME_A))
3252 { 3467 {
3253 SCHEME_V->envir = SCHEME_V->global_env; 3468 SCHEME_V->envir = SCHEME_V->global_env;
3254 dump_stack_reset (SCHEME_A); 3469 dump_stack_reset (SCHEME_A);
3255 putstr (SCHEME_A_ "\n"); 3470 putcharacter (SCHEME_A_ '\n');
3256 putstr (SCHEME_A_ prompt); 3471 putstr (SCHEME_A_ prompt);
3257 } 3472 }
3258 3473
3259 /* Set up another iteration of REPL */ 3474 /* Set up another iteration of REPL */
3260 SCHEME_V->nesting = 0; 3475 SCHEME_V->nesting = 0;
… …
3295 { 3510 {
3296 SCHEME_V->print_flag = 1; 3511 SCHEME_V->print_flag = 1;
3297 SCHEME_V->args = SCHEME_V->value; 3512 SCHEME_V->args = SCHEME_V->value;
3298 s_goto (OP_P0LIST); 3513 s_goto (OP_P0LIST);
3299 } 3514 }
3300 else 3515
3301 s_return (SCHEME_V->value); 3516 s_return (SCHEME_V->value);
3302 3517
3303 case OP_EVAL: /* main part of evaluation */ 3518 case OP_EVAL: /* main part of evaluation */
3304#if USE_TRACING 3519#if USE_TRACING
3305 if (SCHEME_V->tracing) 3520 if (SCHEME_V->tracing)
3306 { 3521 {
… …
3317#endif 3532#endif
3318 if (is_symbol (SCHEME_V->code)) /* symbol */ 3533 if (is_symbol (SCHEME_V->code)) /* symbol */
3319 { 3534 {
3320 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3535 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3321 3536
3322 if (x != NIL) 3537 if (x == NIL)
3323 s_return (slot_value_in_env (x));
3324 else
3325 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3538 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3539
3540 s_return (slot_value_in_env (x));
3326 } 3541 }
3327 else if (is_pair (SCHEME_V->code)) 3542 else if (is_pair (SCHEME_V->code))
3328 { 3543 {
3329 x = car (SCHEME_V->code); 3544 x = car (SCHEME_V->code);
3330 3545
… …
3339 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3554 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3340 SCHEME_V->code = x; 3555 SCHEME_V->code = x;
3341 s_goto (OP_EVAL); 3556 s_goto (OP_EVAL);
3342 } 3557 }
3343 } 3558 }
3344 else 3559
3345 s_return (SCHEME_V->code); 3560 s_return (SCHEME_V->code);
3346 3561
3347 case OP_E0ARGS: /* eval arguments */ 3562 case OP_E0ARGS: /* eval arguments */
3348 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3563 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349 { 3564 {
3350 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3565 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3566 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352 SCHEME_V->code = SCHEME_V->value; 3567 SCHEME_V->code = SCHEME_V->value;
3353 s_goto (OP_APPLY); 3568 s_goto (OP_APPLY);
… …
3380 3595
3381 case OP_TRACING: 3596 case OP_TRACING:
3382 { 3597 {
3383 int tr = SCHEME_V->tracing; 3598 int tr = SCHEME_V->tracing;
3384 3599
3385 SCHEME_V->tracing = ivalue (car (args)); 3600 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3601 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3602 }
3388 3603
3389#endif 3604#endif
3390 3605
… …
3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3622 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3408 else if (is_foreign (SCHEME_V->code)) 3623 else if (is_foreign (SCHEME_V->code))
3409 { 3624 {
3410 /* Keep nested calls from GC'ing the arglist */ 3625 /* Keep nested calls from GC'ing the arglist */
3411 push_recent_alloc (SCHEME_A_ args, NIL); 3626 push_recent_alloc (SCHEME_A_ args, NIL);
3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3627 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3413 3628
3414 s_return (x); 3629 s_return (x);
3415 } 3630 }
3416 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3631 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3417 { 3632 {
… …
3454 3669
3455 case OP_DOMACRO: /* do macro */ 3670 case OP_DOMACRO: /* do macro */
3456 SCHEME_V->code = SCHEME_V->value; 3671 SCHEME_V->code = SCHEME_V->value;
3457 s_goto (OP_EVAL); 3672 s_goto (OP_EVAL);
3458 3673
3459#if 1
3460
3461 case OP_LAMBDA: /* lambda */ 3674 case OP_LAMBDA: /* lambda */
3462 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3675 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3463 set SCHEME_V->value fall thru */ 3676 set SCHEME_V->value fall thru */
3464 { 3677 {
3465 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3678 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3471 SCHEME_V->code = slot_value_in_env (f); 3684 SCHEME_V->code = slot_value_in_env (f);
3472 s_goto (OP_APPLY); 3685 s_goto (OP_APPLY);
3473 } 3686 }
3474 3687
3475 SCHEME_V->value = SCHEME_V->code; 3688 SCHEME_V->value = SCHEME_V->code;
3476 /* Fallthru */
3477 } 3689 }
3690 /* Fallthru */
3478 3691
3479 case OP_LAMBDA1: 3692 case OP_LAMBDA1:
3480 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3693 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3481
3482#else
3483
3484 case OP_LAMBDA: /* lambda */
3485 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3486
3487#endif
3488 3694
3489 case OP_MKCLOSURE: /* make-closure */ 3695 case OP_MKCLOSURE: /* make-closure */
3490 x = car (args); 3696 x = car (args);
3491 3697
3492 if (car (x) == SCHEME_V->LAMBDA) 3698 if (car (x) == SCHEME_V->LAMBDA)
… …
3531 else 3737 else
3532 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3738 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3533 3739
3534 s_return (SCHEME_V->code); 3740 s_return (SCHEME_V->code);
3535 3741
3536
3537 case OP_DEFP: /* defined? */ 3742 case OP_DEFP: /* defined? */
3538 x = SCHEME_V->envir; 3743 x = SCHEME_V->envir;
3539 3744
3540 if (cdr (args) != NIL) 3745 if (cdr (args) != NIL)
3541 x = cadr (args); 3746 x = cadr (args);
… …
3558 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3763 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3559 s_return (SCHEME_V->value); 3764 s_return (SCHEME_V->value);
3560 } 3765 }
3561 else 3766 else
3562 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3767 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3563
3564 3768
3565 case OP_BEGIN: /* begin */ 3769 case OP_BEGIN: /* begin */
3566 if (!is_pair (SCHEME_V->code)) 3770 if (!is_pair (SCHEME_V->code))
3567 s_return (SCHEME_V->code); 3771 s_return (SCHEME_V->code);
3568 3772
… …
3580 case OP_IF1: /* if */ 3784 case OP_IF1: /* if */
3581 if (is_true (SCHEME_V->value)) 3785 if (is_true (SCHEME_V->value))
3582 SCHEME_V->code = car (SCHEME_V->code); 3786 SCHEME_V->code = car (SCHEME_V->code);
3583 else 3787 else
3584 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 3788 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3789
3585 s_goto (OP_EVAL); 3790 s_goto (OP_EVAL);
3586 3791
3587 case OP_LET0: /* let */ 3792 case OP_LET0: /* let */
3588 SCHEME_V->args = NIL; 3793 SCHEME_V->args = NIL;
3589 SCHEME_V->value = SCHEME_V->code; 3794 SCHEME_V->value = SCHEME_V->code;
… …
3745 } 3950 }
3746 else 3951 else
3747 { 3952 {
3748 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3953 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3749 s_return (NIL); 3954 s_return (NIL);
3750 else 3955
3751 {
3752 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3956 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3753 SCHEME_V->code = caar (SCHEME_V->code); 3957 SCHEME_V->code = caar (SCHEME_V->code);
3754 s_goto (OP_EVAL); 3958 s_goto (OP_EVAL);
3755 }
3756 } 3959 }
3757 3960
3758 case OP_DELAY: /* delay */ 3961 case OP_DELAY: /* delay */
3759 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3962 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3760 set_typeflag (x, T_PROMISE); 3963 set_typeflag (x, T_PROMISE);
… …
3771 case OP_AND1: /* and */ 3974 case OP_AND1: /* and */
3772 if (is_false (SCHEME_V->value)) 3975 if (is_false (SCHEME_V->value))
3773 s_return (SCHEME_V->value); 3976 s_return (SCHEME_V->value);
3774 else if (SCHEME_V->code == NIL) 3977 else if (SCHEME_V->code == NIL)
3775 s_return (SCHEME_V->value); 3978 s_return (SCHEME_V->value);
3776 else 3979
3777 {
3778 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3980 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3779 SCHEME_V->code = car (SCHEME_V->code); 3981 SCHEME_V->code = car (SCHEME_V->code);
3780 s_goto (OP_EVAL); 3982 s_goto (OP_EVAL);
3781 }
3782 3983
3783 case OP_OR0: /* or */ 3984 case OP_OR0: /* or */
3784 if (SCHEME_V->code == NIL) 3985 if (SCHEME_V->code == NIL)
3785 s_return (S_F); 3986 s_return (S_F);
3786 3987
… …
3791 case OP_OR1: /* or */ 3992 case OP_OR1: /* or */
3792 if (is_true (SCHEME_V->value)) 3993 if (is_true (SCHEME_V->value))
3793 s_return (SCHEME_V->value); 3994 s_return (SCHEME_V->value);
3794 else if (SCHEME_V->code == NIL) 3995 else if (SCHEME_V->code == NIL)
3795 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3796 else 3997
3797 {
3798 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3998 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3799 SCHEME_V->code = car (SCHEME_V->code); 3999 SCHEME_V->code = car (SCHEME_V->code);
3800 s_goto (OP_EVAL); 4000 s_goto (OP_EVAL);
3801 }
3802 4001
3803 case OP_C0STREAM: /* cons-stream */ 4002 case OP_C0STREAM: /* cons-stream */
3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4003 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3805 SCHEME_V->code = car (SCHEME_V->code); 4004 SCHEME_V->code = car (SCHEME_V->code);
3806 s_goto (OP_EVAL); 4005 s_goto (OP_EVAL);
… …
3871 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4070 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3872 SCHEME_V->code = caar (x); 4071 SCHEME_V->code = caar (x);
3873 s_goto (OP_EVAL); 4072 s_goto (OP_EVAL);
3874 } 4073 }
3875 } 4074 }
3876 else 4075
3877 s_return (NIL); 4076 s_return (NIL);
3878 4077
3879 case OP_CASE2: /* case */ 4078 case OP_CASE2: /* case */
3880 if (is_true (SCHEME_V->value)) 4079 if (is_true (SCHEME_V->value))
3881 s_goto (OP_BEGIN); 4080 s_goto (OP_BEGIN);
3882 else 4081
3883 s_return (NIL); 4082 s_return (NIL);
3884 4083
3885 case OP_PAPPLY: /* apply */ 4084 case OP_PAPPLY: /* apply */
3886 SCHEME_V->code = car (args); 4085 SCHEME_V->code = car (args);
3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4086 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3888 /*SCHEME_V->args = cadr(args); */ 4087 /*SCHEME_V->args = cadr(args); */
… …
3902 } 4101 }
3903 4102
3904 if (USE_ERROR_CHECKING) abort (); 4103 if (USE_ERROR_CHECKING) abort ();
3905} 4104}
3906 4105
3907static int 4106/* math, cxr */
4107ecb_hot static int
3908opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4108opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3909{ 4109{
3910 pointer args = SCHEME_V->args; 4110 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 4111 pointer x = car (args);
3912 num v; 4112 num v;
3913 4113
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 4114 switch (op)
3919 { 4115 {
3920#if USE_MATH 4116#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 4117 case OP_INEX2EX: /* inexact->exact */
3922 if (is_integer (x)) 4118 if (!is_integer (x))
3923 s_return (x); 4119 {
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 4120 RVALUE r = rvalue_unchecked (x);
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4121
4122 if (r == (RVALUE)(IVALUE)r)
4123 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3926 else 4124 else
3927 Error_1 ("inexact->exact: not integral:", x); 4125 Error_1 ("inexact->exact: not integral:", x);
4126 }
3928 4127
4128 s_return (x);
4129
4130 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4131 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4132 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4133 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4134
4135 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4136 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4137 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4138 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4139 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4140 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4141 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4142 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4143 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3936 4144
3937 case OP_ATAN: 4145 case OP_ATAN:
4146 s_return (mk_real (SCHEME_A_
3938 if (cdr (args) == NIL) 4147 cdr (args) == NIL
3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4148 ? atan (rvalue (x))
3940 else 4149 : atan2 (rvalue (x), rvalue (cadr (args)))));
3941 {
3942 pointer y = cadr (args);
3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3944 }
3945
3946 case OP_SQRT:
3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3948 4150
3949 case OP_EXPT: 4151 case OP_EXPT:
3950 { 4152 {
3951 RVALUE result; 4153 RVALUE result;
3952 int real_result = 1; 4154 int real_result = 1;
… …
3966 /* If the test fails, result is too big for integer. */ 4168 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4169 if (!real_result)
3968 { 4170 {
3969 long result_as_long = result; 4171 long result_as_long = result;
3970 4172
3971 if (result != (RVALUE) result_as_long) 4173 if (result != result_as_long)
3972 real_result = 1; 4174 real_result = 1;
3973 } 4175 }
3974 4176
3975 if (real_result) 4177 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4178 s_return (mk_real (SCHEME_A_ result));
3977 else 4179 else
3978 s_return (mk_integer (SCHEME_A_ result)); 4180 s_return (mk_integer (SCHEME_A_ result));
3979 } 4181 }
3980
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983
3984 case OP_TRUNCATE:
3985 {
3986 RVALUE rvalue_of_x;
3987
3988 rvalue_of_x = rvalue (x);
3989
3990 if (rvalue_of_x > 0)
3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
3992 else
3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994 }
3995
3996 case OP_ROUND:
3997 if (num_is_integer (x))
3998 s_return (x);
3999
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4182#endif
4002 4183
4003 case OP_ADD: /* + */ 4184 case OP_ADD: /* + */
4004 v = num_zero; 4185 v = num_zero;
4005 4186
… …
4093 else 4274 else
4094 Error_0 ("modulo: division by zero"); 4275 Error_0 ("modulo: division by zero");
4095 4276
4096 s_return (mk_number (SCHEME_A_ v)); 4277 s_return (mk_number (SCHEME_A_ v));
4097 4278
4098 case OP_CAR: /* car */ 4279 /* the compiler will optimize this mess... */
4099 s_return (caar (args)); 4280 case OP_CAR: op_car: s_return (car (x));
4100 4281 case OP_CDR: op_cdr: s_return (cdr (x));
4101 case OP_CDR: /* cdr */ 4282 case OP_CAAR: op_caar: x = car (x); goto op_car;
4102 s_return (cdar (args)); 4283 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4284 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4285 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4286 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4287 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4288 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4289 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4290 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4291 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4292 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4293 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4294 case OP_CAAAAR: x = car (x); goto op_caaar;
4295 case OP_CAAADR: x = cdr (x); goto op_caaar;
4296 case OP_CAADAR: x = car (x); goto op_caadr;
4297 case OP_CAADDR: x = cdr (x); goto op_caadr;
4298 case OP_CADAAR: x = car (x); goto op_cadar;
4299 case OP_CADADR: x = cdr (x); goto op_cadar;
4300 case OP_CADDAR: x = car (x); goto op_caddr;
4301 case OP_CADDDR: x = cdr (x); goto op_caddr;
4302 case OP_CDAAAR: x = car (x); goto op_cdaar;
4303 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4304 case OP_CDADAR: x = car (x); goto op_cdadr;
4305 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4306 case OP_CDDAAR: x = car (x); goto op_cddar;
4307 case OP_CDDADR: x = cdr (x); goto op_cddar;
4308 case OP_CDDDAR: x = car (x); goto op_cdddr;
4309 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4103 4310
4104 case OP_CONS: /* cons */ 4311 case OP_CONS: /* cons */
4105 set_cdr (args, cadr (args)); 4312 set_cdr (args, cadr (args));
4106 s_return (args); 4313 s_return (args);
4107 4314
… …
4122 } 4329 }
4123 else 4330 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4331 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4332
4126 case OP_CHAR2INT: /* char->integer */ 4333 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4334 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4335
4129 case OP_INT2CHAR: /* integer->char */ 4336 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4337 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4338
4132 case OP_CHARUPCASE: 4339 case OP_CHARUPCASE:
4133 { 4340 {
4134 unsigned char c = ivalue (x); 4341 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4342 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4343 s_return (mk_character (SCHEME_A_ c));
4137 } 4344 }
4138 4345
4139 case OP_CHARDNCASE: 4346 case OP_CHARDNCASE:
4140 { 4347 {
4141 unsigned char c = ivalue (x); 4348 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4349 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4350 s_return (mk_character (SCHEME_A_ c));
4144 } 4351 }
4145 4352
4146 case OP_STR2SYM: /* string->symbol */ 4353 case OP_STR2SYM: /* string->symbol */
… …
4223 Error_1 ("atom->string: not an atom:", x); 4430 Error_1 ("atom->string: not an atom:", x);
4224 } 4431 }
4225 4432
4226 case OP_MKSTRING: /* make-string */ 4433 case OP_MKSTRING: /* make-string */
4227 { 4434 {
4228 int fill = ' '; 4435 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4436 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4437
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4438 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4439 }
4238 4440
4239 case OP_STRLEN: /* string-length */ 4441 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4442 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4443
4242 case OP_STRREF: /* string-ref */ 4444 case OP_STRREF: /* string-ref */
4243 { 4445 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4446 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4447 int index = ivalue_unchecked (cadr (args));
4250 4448
4251 if (index >= strlength (x)) 4449 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4450 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4451
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4452 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4453 }
4256 4454
4257 case OP_STRSET: /* string-set! */ 4455 case OP_STRSET: /* string-set! */
4258 { 4456 {
4259 char *str; 4457 char *str = strvalue (x);
4260 int index; 4458 int index = ivalue_unchecked (cadr (args));
4261 int c; 4459 int c;
4262 4460
4263 if (is_immutable (x)) 4461 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4462 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4463
4270 if (index >= strlength (x)) 4464 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4465 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4466
4273 c = charvalue (caddr (args)); 4467 c = charvalue (caddr (args));
… …
4294 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4488 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4295 4489
4296 s_return (newstr); 4490 s_return (newstr);
4297 } 4491 }
4298 4492
4299 case OP_SUBSTR: /* substring */ 4493 case OP_STRING_COPY: /* substring/string-copy */
4300 { 4494 {
4301 char *str; 4495 char *str = strvalue (x);
4302 int index0; 4496 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4303 int index1; 4497 int index1;
4304 int len; 4498 int len;
4305 4499
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4500 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4501 Error_1 ("string->copy: start out of bounds:", cadr (args));
4312 4502
4313 if (cddr (args) != NIL) 4503 if (cddr (args) != NIL)
4314 { 4504 {
4315 index1 = ivalue (caddr (args)); 4505 index1 = ivalue_unchecked (caddr (args));
4316 4506
4317 if (index1 > strlength (x) || index1 < index0) 4507 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4508 Error_1 ("string->copy: end out of bounds:", caddr (args));
4319 } 4509 }
4320 else 4510 else
4321 index1 = strlength (x); 4511 index1 = strlength (x);
4322 4512
4323 len = index1 - index0; 4513 len = index1 - index0;
4324 x = mk_empty_string (SCHEME_A_ len, ' '); 4514 x = mk_counted_string (SCHEME_A_ str + index0, len);
4325 memcpy (strvalue (x), str + index0, len);
4326 strvalue (x)[len] = 0;
4327 4515
4328 s_return (x); 4516 s_return (x);
4329 } 4517 }
4330 4518
4331 case OP_VECTOR: /* vector */ 4519 case OP_VECTOR: /* vector */
… …
4343 if (SCHEME_V->no_memory) 4531 if (SCHEME_V->no_memory)
4344 s_return (S_SINK); 4532 s_return (S_SINK);
4345#endif 4533#endif
4346 4534
4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4535 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348 set_vector_elem (vec, i, car (x)); 4536 vector_set (vec, i, car (x));
4349 4537
4350 s_return (vec); 4538 s_return (vec);
4351 } 4539 }
4352 4540
4353 case OP_MKVECTOR: /* make-vector */ 4541 case OP_MKVECTOR: /* make-vector */
4354 { 4542 {
4355 pointer fill = NIL; 4543 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4544 pointer vec;
4358
4359 len = ivalue (x); 4545 int len = ivalue_unchecked (x);
4360 4546
4361 if (cdr (args) != NIL) 4547 if (cdr (args) != NIL)
4362 fill = cadr (args); 4548 fill = cadr (args);
4363 4549
4364 vec = mk_vector (SCHEME_A_ len); 4550 vec = mk_vector (SCHEME_A_ len);
… …
4367 if (SCHEME_V->no_memory) 4553 if (SCHEME_V->no_memory)
4368 s_return (S_SINK); 4554 s_return (S_SINK);
4369#endif 4555#endif
4370 4556
4371 if (fill != NIL) 4557 if (fill != NIL)
4372 fill_vector (vec, fill); 4558 fill_vector (vec, 0, fill);
4373 4559
4374 s_return (vec); 4560 s_return (vec);
4375 } 4561 }
4376 4562
4377 case OP_VECLEN: /* vector-length */ 4563 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4564 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4565
4566 case OP_VECRESIZE:
4567 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4568 s_return (x);
4569
4380 case OP_VECREF: /* vector-ref */ 4570 case OP_VECREF: /* vector-ref */
4381 { 4571 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4572 int index = ivalue_unchecked (cadr (args));
4385 4573
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4574 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4575 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4576
4389 s_return (vector_elem (x, index)); 4577 s_return (vector_get (x, index));
4390 } 4578 }
4391 4579
4392 case OP_VECSET: /* vector-set! */ 4580 case OP_VECSET: /* vector-set! */
4393 { 4581 {
4394 int index; 4582 int index = ivalue_unchecked (cadr (args));
4395 4583
4396 if (is_immutable (x)) 4584 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4585 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398 4586
4399 index = ivalue (cadr (args));
4400
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4587 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4588 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4589
4404 set_vector_elem (x, index, caddr (args)); 4590 vector_set (x, index, caddr (args));
4405 s_return (x); 4591 s_return (x);
4406 } 4592 }
4407 } 4593 }
4408 4594
4409 if (USE_ERROR_CHECKING) abort (); 4595 if (USE_ERROR_CHECKING) abort ();
4410} 4596}
4411 4597
4412INTERFACE int 4598/* relational ops */
4413is_list (SCHEME_P_ pointer a) 4599ecb_hot static int
4414{
4415 return list_length (SCHEME_A_ a) >= 0;
4416}
4417
4418/* Result is:
4419 proper list: length
4420 circular list: -1
4421 not even a pair: -2
4422 dotted list: -2 minus length before dot
4423*/
4424INTERFACE int
4425list_length (SCHEME_P_ pointer a)
4426{
4427 int i = 0;
4428 pointer slow, fast;
4429
4430 slow = fast = a;
4431
4432 while (1)
4433 {
4434 if (fast == NIL)
4435 return i;
4436
4437 if (!is_pair (fast))
4438 return -2 - i;
4439
4440 fast = cdr (fast);
4441 ++i;
4442
4443 if (fast == NIL)
4444 return i;
4445
4446 if (!is_pair (fast))
4447 return -2 - i;
4448
4449 ++i;
4450 fast = cdr (fast);
4451
4452 /* Safe because we would have already returned if `fast'
4453 encountered a non-pair. */
4454 slow = cdr (slow);
4455
4456 if (fast == slow)
4457 {
4458 /* the fast pointer has looped back around and caught up
4459 with the slow pointer, hence the structure is circular,
4460 not of finite length, and therefore not a list */
4461 return -1;
4462 }
4463 }
4464}
4465
4466static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4600opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4601{
4469 pointer x = SCHEME_V->args; 4602 pointer x = SCHEME_V->args;
4470 4603
4471 for (;;) 4604 for (;;)
… …
4492 } 4625 }
4493 4626
4494 s_return (S_T); 4627 s_return (S_T);
4495} 4628}
4496 4629
4497static int 4630/* predicates */
4631ecb_hot static int
4498opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4632opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4499{ 4633{
4500 pointer args = SCHEME_V->args; 4634 pointer args = SCHEME_V->args;
4501 pointer a = car (args); 4635 pointer a = car (args);
4502 pointer d = cdr (args); 4636 pointer d = cdr (args);
4503 int r; 4637 int r;
4504 4638
4505 switch (op) 4639 switch (op)
4506 { 4640 {
4507 case OP_NOT: /* not */ r = is_false (a) ; break; 4641 case OP_NOT: /* not */ r = is_false (a) ; break;
4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4642 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4643 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break; 4644 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4645 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4646 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4647 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4648 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4649 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4650 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4651 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4652
4518#if USE_CHAR_CLASSIFIERS 4653#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4654 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4655 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4656 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4657 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4658 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4659#endif
4525 4660
4526#if USE_PORTS 4661#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4662 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4663 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4548 } 4683 }
4549 4684
4550 s_retbool (r); 4685 s_retbool (r);
4551} 4686}
4552 4687
4553static int 4688/* promises, list ops, ports */
4689ecb_hot static int
4554opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4690opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4555{ 4691{
4556 pointer args = SCHEME_V->args; 4692 pointer args = SCHEME_V->args;
4557 pointer a = car (args); 4693 pointer a = car (args);
4558 pointer x, y; 4694 pointer x, y;
… …
4571 } 4707 }
4572 else 4708 else
4573 s_return (SCHEME_V->code); 4709 s_return (SCHEME_V->code);
4574 4710
4575 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4711 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4576 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4712 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4577 s_return (SCHEME_V->value); 4713 s_return (SCHEME_V->value);
4578 4714
4579#if USE_PORTS 4715#if USE_PORTS
4716
4717 case OP_EOF_OBJECT: /* eof-object */
4718 s_return (S_EOF);
4580 4719
4581 case OP_WRITE: /* write */ 4720 case OP_WRITE: /* write */
4582 case OP_DISPLAY: /* display */ 4721 case OP_DISPLAY: /* display */
4583 case OP_WRITE_CHAR: /* write-char */ 4722 case OP_WRITE_CHAR: /* write-char */
4584 if (is_pair (cdr (SCHEME_V->args))) 4723 if (is_pair (cdr (SCHEME_V->args)))
… …
4598 else 4737 else
4599 SCHEME_V->print_flag = 0; 4738 SCHEME_V->print_flag = 0;
4600 4739
4601 s_goto (OP_P0LIST); 4740 s_goto (OP_P0LIST);
4602 4741
4742 //TODO: move to scheme
4603 case OP_NEWLINE: /* newline */ 4743 case OP_NEWLINE: /* newline */
4604 if (is_pair (args)) 4744 if (is_pair (args))
4605 { 4745 {
4606 if (a != SCHEME_V->outport) 4746 if (a != SCHEME_V->outport)
4607 { 4747 {
… …
4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4749 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4610 SCHEME_V->outport = a; 4750 SCHEME_V->outport = a;
4611 } 4751 }
4612 } 4752 }
4613 4753
4614 putstr (SCHEME_A_ "\n"); 4754 putcharacter (SCHEME_A_ '\n');
4615 s_return (S_T); 4755 s_return (S_T);
4616#endif 4756#endif
4617 4757
4618 case OP_ERR0: /* error */ 4758 case OP_ERR0: /* error */
4619 SCHEME_V->retcode = -1; 4759 SCHEME_V->retcode = -1;
… …
4628 putstr (SCHEME_A_ strvalue (car (args))); 4768 putstr (SCHEME_A_ strvalue (car (args)));
4629 SCHEME_V->args = cdr (args); 4769 SCHEME_V->args = cdr (args);
4630 s_goto (OP_ERR1); 4770 s_goto (OP_ERR1);
4631 4771
4632 case OP_ERR1: /* error */ 4772 case OP_ERR1: /* error */
4633 putstr (SCHEME_A_ " "); 4773 putcharacter (SCHEME_A_ ' ');
4634 4774
4635 if (args != NIL) 4775 if (args != NIL)
4636 { 4776 {
4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4777 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4638 SCHEME_V->args = a; 4778 SCHEME_V->args = a;
4639 SCHEME_V->print_flag = 1; 4779 SCHEME_V->print_flag = 1;
4640 s_goto (OP_P0LIST); 4780 s_goto (OP_P0LIST);
4641 } 4781 }
4642 else 4782 else
4643 { 4783 {
4644 putstr (SCHEME_A_ "\n"); 4784 putcharacter (SCHEME_A_ '\n');
4645 4785
4646 if (SCHEME_V->interactive_repl) 4786 if (SCHEME_V->interactive_repl)
4647 s_goto (OP_T0LVL); 4787 s_goto (OP_T0LVL);
4648 else 4788 else
4649 return -1; 4789 return -1;
… …
4726 SCHEME_V->gc_verbose = (a != S_F); 4866 SCHEME_V->gc_verbose = (a != S_F);
4727 s_retbool (was); 4867 s_retbool (was);
4728 } 4868 }
4729 4869
4730 case OP_NEWSEGMENT: /* new-segment */ 4870 case OP_NEWSEGMENT: /* new-segment */
4871#if 0
4731 if (!is_pair (args) || !is_number (a)) 4872 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 4873 Error_0 ("new-segment: argument must be a number");
4733 4874#endif
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4875 s_retbool (alloc_cellseg (SCHEME_A));
4735
4736 s_return (S_T);
4737 4876
4738 case OP_OBLIST: /* oblist */ 4877 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 4878 s_return (oblist_all_symbols (SCHEME_A));
4740 4879
4741#if USE_PORTS 4880#if USE_PORTS
… …
4811 s_return (p == NIL ? S_F : p); 4950 s_return (p == NIL ? S_F : p);
4812 } 4951 }
4813 4952
4814 case OP_GET_OUTSTRING: /* get-output-string */ 4953 case OP_GET_OUTSTRING: /* get-output-string */
4815 { 4954 {
4816 port *p; 4955 port *p = port (a);
4817 4956
4818 if ((p = a->object.port)->kind & port_string) 4957 if (p->kind & port_string)
4819 { 4958 {
4820 off_t size; 4959 off_t size;
4821 char *str; 4960 char *str;
4822 4961
4823 size = p->rep.string.curr - p->rep.string.start + 1; 4962 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4858 } 4997 }
4859 4998
4860 if (USE_ERROR_CHECKING) abort (); 4999 if (USE_ERROR_CHECKING) abort ();
4861} 5000}
4862 5001
4863static int 5002/* reading */
5003ecb_cold static int
4864opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5004opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4865{ 5005{
4866 pointer args = SCHEME_V->args; 5006 pointer args = SCHEME_V->args;
4867 pointer x; 5007 pointer x;
4868 5008
… …
4928 int res; 5068 int res;
4929 5069
4930 if (is_pair (args)) 5070 if (is_pair (args))
4931 p = car (args); 5071 p = car (args);
4932 5072
4933 res = p->object.port->kind & port_string; 5073 res = port (p)->kind & port_string;
4934 5074
4935 s_retbool (res); 5075 s_retbool (res);
4936 } 5076 }
4937 5077
4938 case OP_SET_INPORT: /* set-input-port */ 5078 case OP_SET_INPORT: /* set-input-port */
… …
4997 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5137 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 5138 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 5139 s_goto (OP_RDSEXPR);
5000 5140
5001 case TOK_ATOM: 5141 case TOK_ATOM:
5002 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5142 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5143
5144 case TOK_DOTATOM:
5145 SCHEME_V->strbuff[0] = '.';
5146 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5147
5148 case TOK_STRATOM:
5149 x = readstrexp (SCHEME_A_ '|');
5150 //TODO: haven't checked whether the garbage collector could interfere
5151 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003 5152
5004 case TOK_DQUOTE: 5153 case TOK_DQUOTE:
5005 x = readstrexp (SCHEME_A); 5154 x = readstrexp (SCHEME_A_ '"');
5006 5155
5007 if (x == S_F) 5156 if (x == S_F)
5008 Error_0 ("Error reading string"); 5157 Error_0 ("Error reading string");
5009 5158
5010 setimmutable (x); 5159 setimmutable (x);
… …
5022 s_goto (OP_EVAL); 5171 s_goto (OP_EVAL);
5023 } 5172 }
5024 } 5173 }
5025 5174
5026 case TOK_SHARP_CONST: 5175 case TOK_SHARP_CONST:
5027 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5176 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028 Error_0 ("undefined sharp expression"); 5177 Error_0 ("undefined sharp expression");
5029 else 5178 else
5030 s_return (x); 5179 s_return (x);
5031 5180
5032 default: 5181 default:
… …
5128 pointer b = cdr (args); 5277 pointer b = cdr (args);
5129 int ok_abbr = ok_abbrev (b); 5278 int ok_abbr = ok_abbrev (b);
5130 SCHEME_V->args = car (b); 5279 SCHEME_V->args = car (b);
5131 5280
5132 if (a == SCHEME_V->QUOTE && ok_abbr) 5281 if (a == SCHEME_V->QUOTE && ok_abbr)
5133 putstr (SCHEME_A_ "'"); 5282 putcharacter (SCHEME_A_ '\'');
5134 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5283 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ "`"); 5284 putcharacter (SCHEME_A_ '`');
5136 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5285 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5137 putstr (SCHEME_A_ ","); 5286 putcharacter (SCHEME_A_ ',');
5138 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5287 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5139 putstr (SCHEME_A_ ",@"); 5288 putstr (SCHEME_A_ ",@");
5140 else 5289 else
5141 { 5290 {
5142 putstr (SCHEME_A_ "("); 5291 putcharacter (SCHEME_A_ '(');
5143 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5292 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5144 SCHEME_V->args = a; 5293 SCHEME_V->args = a;
5145 } 5294 }
5146 5295
5147 s_goto (OP_P0LIST); 5296 s_goto (OP_P0LIST);
… …
5149 5298
5150 case OP_P1LIST: 5299 case OP_P1LIST:
5151 if (is_pair (args)) 5300 if (is_pair (args))
5152 { 5301 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5302 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5154 putstr (SCHEME_A_ " "); 5303 putcharacter (SCHEME_A_ ' ');
5155 SCHEME_V->args = car (args); 5304 SCHEME_V->args = car (args);
5156 s_goto (OP_P0LIST); 5305 s_goto (OP_P0LIST);
5157 } 5306 }
5158 else if (is_vector (args)) 5307 else if (is_vector (args))
5159 { 5308 {
… …
5167 { 5316 {
5168 putstr (SCHEME_A_ " . "); 5317 putstr (SCHEME_A_ " . ");
5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5318 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5170 } 5319 }
5171 5320
5172 putstr (SCHEME_A_ ")"); 5321 putcharacter (SCHEME_A_ ')');
5173 s_return (S_T); 5322 s_return (S_T);
5174 } 5323 }
5175 5324
5176 case OP_PVECFROM: 5325 case OP_PVECFROM:
5177 { 5326 {
… …
5179 pointer vec = car (args); 5328 pointer vec = car (args);
5180 int len = veclength (vec); 5329 int len = veclength (vec);
5181 5330
5182 if (i == len) 5331 if (i == len)
5183 { 5332 {
5184 putstr (SCHEME_A_ ")"); 5333 putcharacter (SCHEME_A_ ')');
5185 s_return (S_T); 5334 s_return (S_T);
5186 } 5335 }
5187 else 5336 else
5188 { 5337 {
5189 pointer elem = vector_elem (vec, i); 5338 pointer elem = vector_get (vec, i);
5190 5339
5191 ivalue_unchecked (cdr (args)) = i + 1; 5340 ivalue_unchecked (cdr (args)) = i + 1;
5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5341 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193 SCHEME_V->args = elem; 5342 SCHEME_V->args = elem;
5194 5343
5195 if (i > 0) 5344 if (i > 0)
5196 putstr (SCHEME_A_ " "); 5345 putcharacter (SCHEME_A_ ' ');
5197 5346
5198 s_goto (OP_P0LIST); 5347 s_goto (OP_P0LIST);
5199 } 5348 }
5200 } 5349 }
5201 } 5350 }
5202 5351
5203 if (USE_ERROR_CHECKING) abort (); 5352 if (USE_ERROR_CHECKING) abort ();
5204} 5353}
5205 5354
5206static int 5355/* list ops */
5356ecb_hot static int
5207opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5357opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5208{ 5358{
5209 pointer args = SCHEME_V->args; 5359 pointer args = SCHEME_V->args;
5210 pointer a = car (args); 5360 pointer a = car (args);
5211 pointer x, y; 5361 pointer x, y;
… …
5254 5404
5255 case OP_CLOSUREP: /* closure? */ 5405 case OP_CLOSUREP: /* closure? */
5256 /* 5406 /*
5257 * Note, macro object is also a closure. 5407 * Note, macro object is also a closure.
5258 * Therefore, (closure? <#MACRO>) ==> #t 5408 * Therefore, (closure? <#MACRO>) ==> #t
5409 * (schmorp) well, obviously not, fix? TODO
5259 */ 5410 */
5260 s_retbool (is_closure (a)); 5411 s_retbool (is_closure (a));
5261 5412
5262 case OP_MACROP: /* macro? */ 5413 case OP_MACROP: /* macro? */
5263 s_retbool (is_macro (a)); 5414 s_retbool (is_macro (a));
… …
5268 5419
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5420/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5421typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5422
5272typedef int (*test_predicate)(pointer); 5423typedef int (*test_predicate)(pointer);
5273static int 5424
5425ecb_hot static int
5274is_any (pointer p) 5426tst_any (pointer p)
5275{ 5427{
5276 return 1; 5428 return 1;
5277} 5429}
5278 5430
5279static int 5431ecb_hot static int
5280is_nonneg (pointer p) 5432tst_inonneg (pointer p)
5281{ 5433{
5282 return ivalue (p) >= 0 && is_integer (p); 5434 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5435}
5284 5436
5285static int 5437ecb_hot static int
5286tst_is_list (pointer p) 5438tst_is_list (SCHEME_P_ pointer p)
5287{ 5439{
5288 return p == NIL || is_pair (p); 5440 return p == NIL || is_pair (p);
5289} 5441}
5290 5442
5291/* Correspond carefully with following defines! */ 5443/* Correspond carefully with following defines! */
5292static struct 5444static struct
5293{ 5445{
5294 test_predicate fct; 5446 test_predicate fct;
5295 const char *kind; 5447 const char *kind;
5296} tests[] = 5448} tests[] = {
5297{
5298 { is_any, 0 }, 5449 { tst_any , 0 },
5299 { is_string, "string" }, 5450 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5451 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5452 { is_port , "port" },
5302 { is_inport, "input port" }, 5453 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5454 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5455 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5456 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5457 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5458 { is_character , "character" },
5308 { is_vector, "vector" }, 5459 { is_vector , "vector" },
5309 { is_number, "number" }, 5460 { is_number , "number" },
5310 { is_integer, "integer" }, 5461 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5462 { tst_inonneg , "non-negative integer" }
5312}; 5463};
5313 5464
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5465#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5466#define TST_ANY "\001"
5316#define TST_STRING "\002" 5467#define TST_STRING "\002"
… …
5334#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5485#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5335#include "opdefines.h" 5486#include "opdefines.h"
5336#undef OP_DEF 5487#undef OP_DEF
5337; 5488;
5338 5489
5339static const char * 5490ecb_cold static const char *
5340opname (int idx) 5491opname (int idx)
5341{ 5492{
5342 const char *name = opnames; 5493 const char *name = opnames;
5343 5494
5344 /* should do this at compile time, but would require external program, right? */ 5495 /* should do this at compile time, but would require external program, right? */
… …
5346 name += strlen (name) + 1; 5497 name += strlen (name) + 1;
5347 5498
5348 return *name ? name : "ILLEGAL"; 5499 return *name ? name : "ILLEGAL";
5349} 5500}
5350 5501
5351static const char * 5502ecb_cold static const char *
5352procname (pointer x) 5503procname (pointer x)
5353{ 5504{
5354 return opname (procnum (x)); 5505 return opname (procnum (x));
5355} 5506}
5356 5507
5357typedef struct 5508typedef struct
5358{ 5509{
5359 uint8_t func; 5510 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5511 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5512 uint8_t builtin;
5513#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5514 uint8_t min_arity;
5363 uint8_t max_arity; 5515 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5516 char arg_tests_encoding[3];
5517#endif
5365} op_code_info; 5518} op_code_info;
5366 5519
5367static const op_code_info dispatch_table[] = { 5520static const op_code_info dispatch_table[] = {
5521#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5522#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5523#else
5524#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5525#endif
5369#include "opdefines.h" 5526#include "opdefines.h"
5370#undef OP_DEF 5527#undef OP_DEF
5371 {0} 5528 {0}
5372}; 5529};
5373 5530
5374/* kernel of this interpreter */ 5531/* kernel of this interpreter */
5375static void ecb_hot 5532ecb_hot static void
5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5533Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5377{ 5534{
5378 SCHEME_V->op = op; 5535 SCHEME_V->op = op;
5379 5536
5380 for (;;) 5537 for (;;)
… …
5415 { 5572 {
5416 pointer arg = car (arglist); 5573 pointer arg = car (arglist);
5417 5574
5418 j = t[0]; 5575 j = t[0];
5419 5576
5577 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5578 if (j == TST_LIST[0])
5579 {
5580 if (!tst_is_list (SCHEME_A_ arg))
5581 break;
5582 }
5583 else
5584 {
5420 if (!tests[j - 1].fct (arg)) 5585 if (!tests[j - 1].fct (arg))
5421 break; 5586 break;
5587 }
5422 5588
5423 if (t[1]) /* last test is replicated as necessary */ 5589 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424 t++; 5590 t++;
5425 5591
5426 arglist = cdr (arglist); 5592 arglist = cdr (arglist);
5427 i++; 5593 i++;
5428 } 5594 }
… …
5454 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5620 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5455 return; 5621 return;
5456 5622
5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5623 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5458 { 5624 {
5459 xwrstr ("No memory!\n"); 5625 putstr (SCHEME_A_ "No memory!\n");
5460 return; 5626 return;
5461 } 5627 }
5462 } 5628 }
5463} 5629}
5464 5630
5465/* ========== Initialization of internal keywords ========== */ 5631/* ========== Initialization of internal keywords ========== */
5466 5632
5467static void 5633ecb_cold static void
5468assign_syntax (SCHEME_P_ const char *name) 5634assign_syntax (SCHEME_P_ const char *name)
5469{ 5635{
5470 pointer x = oblist_add_by_name (SCHEME_A_ name); 5636 pointer x = oblist_add_by_name (SCHEME_A_ name);
5471 set_typeflag (x, typeflag (x) | T_SYNTAX); 5637 set_typeflag (x, typeflag (x) | T_SYNTAX);
5472} 5638}
5473 5639
5474static void 5640ecb_cold static void
5475assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5641assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5476{ 5642{
5477 pointer x = mk_symbol (SCHEME_A_ name); 5643 pointer x = mk_symbol (SCHEME_A_ name);
5478 pointer y = mk_proc (SCHEME_A_ op); 5644 pointer y = mk_proc (SCHEME_A_ op);
5479 new_slot_in_env (SCHEME_A_ x, y); 5645 new_slot_in_env (SCHEME_A_ x, y);
… …
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5649mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5650{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5651 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5652 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5653 ivalue_unchecked (y) = op;
5488 set_num_integer (y);
5489 return y; 5654 return y;
5490} 5655}
5491 5656
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5658ecb_hot static int
5494syntaxnum (pointer p) 5659syntaxnum (pointer p)
5495{ 5660{
5496 const char *s = strvalue (car (p)); 5661 const char *s = strvalue (p);
5497 5662
5498 switch (strlength (car (p))) 5663 switch (strlength (p))
5499 { 5664 {
5500 case 2: 5665 case 2:
5501 if (s[0] == 'i') 5666 if (s[0] == 'i')
5502 return OP_IF0; /* if */ 5667 return OP_IF0; /* if */
5503 else 5668 else
… …
5578ecb_cold int 5743ecb_cold int
5579scheme_init (SCHEME_P) 5744scheme_init (SCHEME_P)
5580{ 5745{
5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5582 pointer x; 5747 pointer x;
5748
5749 /* this memset is not strictly correct, as we assume (intcache)
5750 * that memset 0 will also set pointers to 0, but memset does
5751 * of course not guarantee that. screw such systems.
5752 */
5753 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5583 5754
5584 num_set_fixnum (num_zero, 1); 5755 num_set_fixnum (num_zero, 1);
5585 num_set_ivalue (num_zero, 0); 5756 num_set_ivalue (num_zero, 0);
5586 num_set_fixnum (num_one, 1); 5757 num_set_fixnum (num_one, 1);
5587 num_set_ivalue (num_one, 1); 5758 num_set_ivalue (num_one, 1);
… …
5599 SCHEME_V->save_inport = NIL; 5770 SCHEME_V->save_inport = NIL;
5600 SCHEME_V->loadport = NIL; 5771 SCHEME_V->loadport = NIL;
5601 SCHEME_V->nesting = 0; 5772 SCHEME_V->nesting = 0;
5602 SCHEME_V->interactive_repl = 0; 5773 SCHEME_V->interactive_repl = 0;
5603 5774
5604 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5775 if (!alloc_cellseg (SCHEME_A))
5605 { 5776 {
5606#if USE_ERROR_CHECKING 5777#if USE_ERROR_CHECKING
5607 SCHEME_V->no_memory = 1; 5778 SCHEME_V->no_memory = 1;
5608 return 0; 5779 return 0;
5609#endif 5780#endif
5610 } 5781 }
5611 5782
5612 SCHEME_V->gc_verbose = 0; 5783 SCHEME_V->gc_verbose = 0;
5613 dump_stack_initialize (SCHEME_A); 5784 dump_stack_initialize (SCHEME_A);
5614 SCHEME_V->code = NIL; 5785 SCHEME_V->code = NIL;
5615 SCHEME_V->args = NIL; 5786 SCHEME_V->args = NIL;
5616 SCHEME_V->envir = NIL; 5787 SCHEME_V->envir = NIL;
5788 SCHEME_V->value = NIL;
5617 SCHEME_V->tracing = 0; 5789 SCHEME_V->tracing = 0;
5618 5790
5619 /* init NIL */ 5791 /* init NIL */
5620 set_typeflag (NIL, T_ATOM | T_MARK); 5792 set_typeflag (NIL, T_ATOM | T_MARK);
5621 set_car (NIL, NIL); 5793 set_car (NIL, NIL);
… …
5677 5849
5678 return !SCHEME_V->no_memory; 5850 return !SCHEME_V->no_memory;
5679} 5851}
5680 5852
5681#if USE_PORTS 5853#if USE_PORTS
5682void 5854ecb_cold void
5683scheme_set_input_port_file (SCHEME_P_ int fin) 5855scheme_set_input_port_file (SCHEME_P_ int fin)
5684{ 5856{
5685 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5857 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5686} 5858}
5687 5859
5688void 5860ecb_cold void
5689scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5861scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5690{ 5862{
5691 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5863 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5692} 5864}
5693 5865
5694void 5866ecb_cold void
5695scheme_set_output_port_file (SCHEME_P_ int fout) 5867scheme_set_output_port_file (SCHEME_P_ int fout)
5696{ 5868{
5697 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5869 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5698} 5870}
5699 5871
5700void 5872ecb_cold void
5701scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5873scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5702{ 5874{
5703 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5875 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5704} 5876}
5705#endif 5877#endif
5706 5878
5707void 5879ecb_cold void
5708scheme_set_external_data (SCHEME_P_ void *p) 5880scheme_set_external_data (SCHEME_P_ void *p)
5709{ 5881{
5710 SCHEME_V->ext_data = p; 5882 SCHEME_V->ext_data = p;
5711} 5883}
5712 5884
… …
5744 SCHEME_V->loadport = NIL; 5916 SCHEME_V->loadport = NIL;
5745 SCHEME_V->gc_verbose = 0; 5917 SCHEME_V->gc_verbose = 0;
5746 gc (SCHEME_A_ NIL, NIL); 5918 gc (SCHEME_A_ NIL, NIL);
5747 5919
5748 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 5920 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5749 free (SCHEME_V->alloc_seg[i]); 5921 free (SCHEME_V->cell_seg[i]);
5750 5922
5751#if SHOW_ERROR_LINE 5923#if SHOW_ERROR_LINE
5752 for (i = 0; i <= SCHEME_V->file_i; i++) 5924 for (i = 0; i <= SCHEME_V->file_i; i++)
5753 { 5925 {
5754 if (SCHEME_V->load_stack[i].kind & port_file) 5926 if (SCHEME_V->load_stack[i].kind & port_file)
… …
5760 } 5932 }
5761 } 5933 }
5762#endif 5934#endif
5763} 5935}
5764 5936
5765void 5937ecb_cold void
5766scheme_load_file (SCHEME_P_ int fin) 5938scheme_load_file (SCHEME_P_ int fin)
5767{ 5939{
5768 scheme_load_named_file (SCHEME_A_ fin, 0); 5940 scheme_load_named_file (SCHEME_A_ fin, 0);
5769} 5941}
5770 5942
5771void 5943ecb_cold void
5772scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5944scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5773{ 5945{
5774 dump_stack_reset (SCHEME_A); 5946 dump_stack_reset (SCHEME_A);
5775 SCHEME_V->envir = SCHEME_V->global_env; 5947 SCHEME_V->envir = SCHEME_V->global_env;
5776 SCHEME_V->file_i = 0; 5948 SCHEME_V->file_i = 0;
5777 SCHEME_V->load_stack[0].unget = -1; 5949 SCHEME_V->load_stack[0].unget = -1;
5778 SCHEME_V->load_stack[0].kind = port_input | port_file; 5950 SCHEME_V->load_stack[0].kind = port_input | port_file;
5779 SCHEME_V->load_stack[0].rep.stdio.file = fin; 5951 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5780#if USE_PORTS
5781 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5952 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5782#endif
5783 SCHEME_V->retcode = 0; 5953 SCHEME_V->retcode = 0;
5784 5954
5785#if USE_PORTS
5786 if (fin == STDIN_FILENO) 5955 if (fin == STDIN_FILENO)
5787 SCHEME_V->interactive_repl = 1; 5956 SCHEME_V->interactive_repl = 1;
5788#endif
5789 5957
5790#if USE_PORTS 5958#if USE_PORTS
5791#if SHOW_ERROR_LINE 5959#if SHOW_ERROR_LINE
5792 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 5960 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5793 5961
… …
5797#endif 5965#endif
5798 5966
5799 SCHEME_V->inport = SCHEME_V->loadport; 5967 SCHEME_V->inport = SCHEME_V->loadport;
5800 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5968 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5801 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5969 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5970
5802 set_typeflag (SCHEME_V->loadport, T_ATOM); 5971 set_typeflag (SCHEME_V->loadport, T_ATOM);
5803 5972
5804 if (SCHEME_V->retcode == 0) 5973 if (SCHEME_V->retcode == 0)
5805 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5974 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5806} 5975}
5807 5976
5808void 5977ecb_cold void
5809scheme_load_string (SCHEME_P_ const char *cmd) 5978scheme_load_string (SCHEME_P_ const char *cmd)
5810{ 5979{
5980#if USE_PORTs
5811 dump_stack_reset (SCHEME_A); 5981 dump_stack_reset (SCHEME_A);
5812 SCHEME_V->envir = SCHEME_V->global_env; 5982 SCHEME_V->envir = SCHEME_V->global_env;
5813 SCHEME_V->file_i = 0; 5983 SCHEME_V->file_i = 0;
5814 SCHEME_V->load_stack[0].kind = port_input | port_string; 5984 SCHEME_V->load_stack[0].kind = port_input | port_string;
5815 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 5985 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5816 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 5986 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 5987 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5818#if USE_PORTS
5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5988 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5820#endif
5821 SCHEME_V->retcode = 0; 5989 SCHEME_V->retcode = 0;
5822 SCHEME_V->interactive_repl = 0; 5990 SCHEME_V->interactive_repl = 0;
5823 SCHEME_V->inport = SCHEME_V->loadport; 5991 SCHEME_V->inport = SCHEME_V->loadport;
5824 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5992 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5825 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5993 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5826 set_typeflag (SCHEME_V->loadport, T_ATOM); 5994 set_typeflag (SCHEME_V->loadport, T_ATOM);
5827 5995
5828 if (SCHEME_V->retcode == 0) 5996 if (SCHEME_V->retcode == 0)
5829 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5997 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5998#else
5999 abort ();
6000#endif
5830} 6001}
5831 6002
5832void 6003ecb_cold void
5833scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6004scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5834{ 6005{
5835 pointer x; 6006 pointer x;
5836 6007
5837 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6008 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5842 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6013 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5843} 6014}
5844 6015
5845#if !STANDALONE 6016#if !STANDALONE
5846 6017
5847void 6018ecb_cold void
5848scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6019scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5849{ 6020{
5850 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6021 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5851} 6022}
5852 6023
5853void 6024ecb_cold void
5854scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6025scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5855{ 6026{
5856 int i; 6027 int i;
5857 6028
5858 for (i = 0; i < count; i++) 6029 for (i = 0; i < count; i++)
5859 scheme_register_foreign_func (SCHEME_A_ list + i); 6030 scheme_register_foreign_func (SCHEME_A_ list + i);
5860} 6031}
5861 6032
5862pointer 6033ecb_cold pointer
5863scheme_apply0 (SCHEME_P_ const char *procname) 6034scheme_apply0 (SCHEME_P_ const char *procname)
5864{ 6035{
5865 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6036 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5866} 6037}
5867 6038
5868void 6039ecb_cold void
5869save_from_C_call (SCHEME_P) 6040save_from_C_call (SCHEME_P)
5870{ 6041{
5871 pointer saved_data = cons (car (S_SINK), 6042 pointer saved_data = cons (car (S_SINK),
5872 cons (SCHEME_V->envir, 6043 cons (SCHEME_V->envir,
5873 SCHEME_V->dump)); 6044 SCHEME_V->dump));
… …
5877 /* Truncate the dump stack so TS will return here when done, not 6048 /* Truncate the dump stack so TS will return here when done, not
5878 directly resume pre-C-call operations. */ 6049 directly resume pre-C-call operations. */
5879 dump_stack_reset (SCHEME_A); 6050 dump_stack_reset (SCHEME_A);
5880} 6051}
5881 6052
5882void 6053ecb_cold void
5883restore_from_C_call (SCHEME_P) 6054restore_from_C_call (SCHEME_P)
5884{ 6055{
5885 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6056 set_car (S_SINK, caar (SCHEME_V->c_nest));
5886 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6057 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5887 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6058 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5888 /* Pop */ 6059 /* Pop */
5889 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6060 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5890} 6061}
5891 6062
5892/* "func" and "args" are assumed to be already eval'ed. */ 6063/* "func" and "args" are assumed to be already eval'ed. */
5893pointer 6064ecb_cold pointer
5894scheme_call (SCHEME_P_ pointer func, pointer args) 6065scheme_call (SCHEME_P_ pointer func, pointer args)
5895{ 6066{
5896 int old_repl = SCHEME_V->interactive_repl; 6067 int old_repl = SCHEME_V->interactive_repl;
5897 6068
5898 SCHEME_V->interactive_repl = 0; 6069 SCHEME_V->interactive_repl = 0;
… …
5905 SCHEME_V->interactive_repl = old_repl; 6076 SCHEME_V->interactive_repl = old_repl;
5906 restore_from_C_call (SCHEME_A); 6077 restore_from_C_call (SCHEME_A);
5907 return SCHEME_V->value; 6078 return SCHEME_V->value;
5908} 6079}
5909 6080
5910pointer 6081ecb_cold pointer
5911scheme_eval (SCHEME_P_ pointer obj) 6082scheme_eval (SCHEME_P_ pointer obj)
5912{ 6083{
5913 int old_repl = SCHEME_V->interactive_repl; 6084 int old_repl = SCHEME_V->interactive_repl;
5914 6085
5915 SCHEME_V->interactive_repl = 0; 6086 SCHEME_V->interactive_repl = 0;
… …
5927 6098
5928/* ========== Main ========== */ 6099/* ========== Main ========== */
5929 6100
5930#if STANDALONE 6101#if STANDALONE
5931 6102
5932int 6103ecb_cold int
5933main (int argc, char **argv) 6104main (int argc, char **argv)
5934{ 6105{
5935# if USE_MULTIPLICITY 6106# if USE_MULTIPLICITY
5936 scheme ssc; 6107 scheme ssc;
5937 scheme *const SCHEME_V = &ssc; 6108 scheme *const SCHEME_V = &ssc;
… …
5939# endif 6110# endif
5940 int fin; 6111 int fin;
5941 char *file_name = InitFile; 6112 char *file_name = InitFile;
5942 int retcode; 6113 int retcode;
5943 int isfile = 1; 6114 int isfile = 1;
6115 system ("ps v $PPID");//D
5944 6116
5945 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6117 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946 { 6118 {
5947 xwrstr ("Usage: tinyscheme -?\n"); 6119 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6120 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5949 xwrstr ("followed by\n"); 6121 putstr (SCHEME_A_ "followed by\n");
5950 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6122 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5951 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6123 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5952 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6124 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5953 xwrstr ("Use - as filename for stdin.\n"); 6125 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5954 return 1; 6126 return 1;
5955 } 6127 }
5956 6128
5957 if (!scheme_init (SCHEME_A)) 6129 if (!scheme_init (SCHEME_A))
5958 { 6130 {
5959 xwrstr ("Could not initialize!\n"); 6131 putstr (SCHEME_A_ "Could not initialize!\n");
5960 return 2; 6132 return 2;
5961 } 6133 }
5962 6134
5963# if USE_PORTS 6135# if USE_PORTS
5964 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6136 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5977 } 6149 }
5978#endif 6150#endif
5979 6151
5980 do 6152 do
5981 { 6153 {
5982#if USE_PORTS
5983 if (strcmp (file_name, "-") == 0) 6154 if (strcmp (file_name, "-") == 0)
5984 fin = STDIN_FILENO; 6155 fin = STDIN_FILENO;
5985 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6156 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5986 { 6157 {
5987 pointer args = NIL; 6158 pointer args = NIL;
… …
6005 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6176 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6006 6177
6007 } 6178 }
6008 else 6179 else
6009 fin = open (file_name, O_RDONLY); 6180 fin = open (file_name, O_RDONLY);
6010#endif
6011 6181
6012 if (isfile && fin < 0) 6182 if (isfile && fin < 0)
6013 { 6183 {
6014 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6184 putstr (SCHEME_A_ "Could not open file ");
6185 putstr (SCHEME_A_ file_name);
6186 putcharacter (SCHEME_A_ '\n');
6015 } 6187 }
6016 else 6188 else
6017 { 6189 {
6018 if (isfile) 6190 if (isfile)
6019 scheme_load_named_file (SCHEME_A_ fin, file_name); 6191 scheme_load_named_file (SCHEME_A_ fin, file_name);
6020 else 6192 else
6021 scheme_load_string (SCHEME_A_ file_name); 6193 scheme_load_string (SCHEME_A_ file_name);
6022 6194
6023#if USE_PORTS
6024 if (!isfile || fin != STDIN_FILENO) 6195 if (!isfile || fin != STDIN_FILENO)
6025 { 6196 {
6026 if (SCHEME_V->retcode != 0) 6197 if (SCHEME_V->retcode != 0)
6027 { 6198 {
6028 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6199 putstr (SCHEME_A_ "Errors encountered reading ");
6200 putstr (SCHEME_A_ file_name);
6201 putcharacter (SCHEME_A_ '\n');
6029 } 6202 }
6030 6203
6031 if (isfile) 6204 if (isfile)
6032 close (fin); 6205 close (fin);
6033 } 6206 }
6034#endif
6035 } 6207 }
6036 6208
6037 file_name = *argv++; 6209 file_name = *argv++;
6038 } 6210 }
6039 while (file_name != 0); 6211 while (file_name != 0);

Diff Legend

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