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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC vs.
Revision 1.61 by root, Wed Dec 2 07:43:46 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
224ecb_inline int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 268
230static num num_zero; 269static num num_zero;
231static num num_one; 270static num num_one;
232 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
233/* macros for cell operations */ 276/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
237 280
238INTERFACE int 281INTERFACE int
239is_string (pointer p) 282is_string (pointer p)
240{ 283{
241 return type (p) == T_STRING; 284 return type (p) == T_STRING;
242} 285}
243 286
244#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
246
247INTERFACE int is_list (SCHEME_P_ pointer p);
248 289
249INTERFACE int 290INTERFACE int
250is_vector (pointer p) 291is_vector (pointer p)
251{ 292{
252 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
253} 294}
254 295
255#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 301
262INTERFACE uint32_t 302INTERFACE int
263vector_length (pointer vec) 303is_integer (pointer p)
264{ 304{
265 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;
266} 313}
267 314
268INTERFACE int 315INTERFACE int
269is_number (pointer p) 316is_number (pointer p)
270{ 317{
271 return type (p) == T_NUMBER; 318 return is_integer (p) || is_real (p);
272}
273
274INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290} 319}
291 320
292INTERFACE int 321INTERFACE int
293is_character (pointer p) 322is_character (pointer p)
294{ 323{
… …
299string_value (pointer p) 328string_value (pointer p)
300{ 329{
301 return strvalue (p); 330 return strvalue (p);
302} 331}
303 332
304ecb_inline num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
335
335#if USE_REAL 336#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 339#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
341# define set_num_integer(p) 0 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 342#endif
344 343
345INTERFACE long 344INTERFACE long
346charvalue (pointer p) 345charvalue (pointer p)
347{ 346{
348 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
349} 348}
350 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
351INTERFACE int 352INTERFACE int
352is_port (pointer p) 353is_port (pointer p)
353{ 354{
354 return type (p) == T_PORT; 355 return type (p) == T_PORT;
355} 356}
356 357
357INTERFACE int 358INTERFACE int
358is_inport (pointer p) 359is_inport (pointer p)
359{ 360{
360 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
361} 362}
362 363
363INTERFACE int 364INTERFACE int
364is_outport (pointer p) 365is_outport (pointer p)
365{ 366{
366 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
367} 368}
368 369
369INTERFACE int 370INTERFACE int
370is_pair (pointer p) 371is_pair (pointer p)
371{ 372{
372 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
373} 374}
374 375
375#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
376#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
377 378
378static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
379static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
380static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
381static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
385static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
386 387
387INTERFACE void 388INTERFACE void
388set_car (pointer p, pointer q) 389set_car (pointer p, pointer q)
389{ 390{
390 p->object.cons.car = q; 391 CELL(p)->object.cons.car = CELL (q);
391} 392}
392 393
393INTERFACE void 394INTERFACE void
394set_cdr (pointer p, pointer q) 395set_cdr (pointer p, pointer q)
395{ 396{
396 p->object.cons.cdr = q; 397 CELL(p)->object.cons.cdr = CELL (q);
397} 398}
398 399
399INTERFACE pointer 400INTERFACE pointer
400pair_car (pointer p) 401pair_car (pointer p)
401{ 402{
… …
415} 416}
416 417
417INTERFACE char * 418INTERFACE char *
418symname (pointer p) 419symname (pointer p)
419{ 420{
420 return strvalue (car (p)); 421 return strvalue (p);
421} 422}
422 423
423#if USE_PLIST 424#if USE_PLIST
425#error plists are broken because symbols are no longer pairs
426#define symprop(p) cdr(p)
424SCHEME_EXPORT int 427SCHEME_EXPORT int
425hasprop (pointer p) 428hasprop (pointer p)
426{ 429{
427 return typeflag (p) & T_SYMBOL; 430 return typeflag (p) & T_SYMBOL;
428} 431}
429
430# define symprop(p) cdr(p)
431#endif 432#endif
432 433
433INTERFACE int 434INTERFACE int
434is_syntax (pointer p) 435is_syntax (pointer p)
435{ 436{
… …
449} 450}
450 451
451INTERFACE char * 452INTERFACE char *
452syntaxname (pointer p) 453syntaxname (pointer p)
453{ 454{
454 return strvalue (car (p)); 455 return strvalue (p);
455} 456}
456 457
457#define procnum(p) ivalue (p) 458#define procnum(p) ivalue_unchecked (p)
458static const char *procname (pointer x); 459static const char *procname (pointer x);
459 460
460INTERFACE int 461INTERFACE int
461is_closure (pointer p) 462is_closure (pointer p)
462{ 463{
… …
525#if USE_ERROR_CHECKING 526#if USE_ERROR_CHECKING
526 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 527 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527#endif 528#endif
528} 529}
529 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
530#if USE_CHAR_CLASSIFIERS 585#if USE_CHAR_CLASSIFIERS
586
531ecb_inline int 587ecb_inline int
532Cisalpha (int c) 588Cisalpha (int c)
533{ 589{
534 return isascii (c) && isalpha (c); 590 return isascii (c) && isalpha (c);
535} 591}
… …
593 "gs", 649 "gs",
594 "rs", 650 "rs",
595 "us" 651 "us"
596}; 652};
597 653
598static int 654ecb_cold static int
599is_ascii_name (const char *name, int *pc) 655is_ascii_name (const char *name, int *pc)
600{ 656{
601 int i; 657 int i;
602 658
603 for (i = 0; i < 32; i++) 659 for (i = 0; i < 32; i++)
… …
621#endif 677#endif
622 678
623static int file_push (SCHEME_P_ const char *fname); 679static int file_push (SCHEME_P_ const char *fname);
624static void file_pop (SCHEME_P); 680static void file_pop (SCHEME_P);
625static int file_interactive (SCHEME_P); 681static int file_interactive (SCHEME_P);
626ecb_inline int is_one_of (char *s, int c); 682ecb_inline int is_one_of (const char *s, int c);
627static int alloc_cellseg (SCHEME_P_ int n); 683static int alloc_cellseg (SCHEME_P);
628ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 684ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629static void finalize_cell (SCHEME_P_ pointer a); 685static void finalize_cell (SCHEME_P_ pointer a);
630static int count_consecutive_cells (pointer x, int needed);
631static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 686static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
632static pointer mk_number (SCHEME_P_ const num n); 687static pointer mk_number (SCHEME_P_ const num n);
633static 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);
634static pointer mk_vector (SCHEME_P_ uint32_t len); 689static pointer mk_vector (SCHEME_P_ uint32_t len);
635static pointer mk_atom (SCHEME_P_ char *q); 690static pointer mk_atom (SCHEME_P_ char *q);
636static pointer mk_sharp_const (SCHEME_P_ char *name); 691static pointer mk_sharp_const (SCHEME_P_ char *name);
637 692
693static pointer mk_port (SCHEME_P_ port *p);
694
638#if USE_PORTS 695#if USE_PORTS
639static pointer mk_port (SCHEME_P_ port *p);
640static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 696static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
641static pointer port_from_file (SCHEME_P_ int, int prop); 697static pointer port_from_file (SCHEME_P_ int, int prop);
642static 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);
643static 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);
644static port *port_rep_from_file (SCHEME_P_ int, int prop); 700static port *port_rep_from_file (SCHEME_P_ int, int prop);
645static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 701static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
646static void port_close (SCHEME_P_ pointer p, int flag); 702static void port_close (SCHEME_P_ pointer p, int flag);
647#endif 703#endif
704
648static void mark (pointer a); 705static void mark (pointer a);
649static void gc (SCHEME_P_ pointer a, pointer b); 706static void gc (SCHEME_P_ pointer a, pointer b);
650static int basic_inchar (port *pt); 707static int basic_inchar (port *pt);
651static int inchar (SCHEME_P); 708static int inchar (SCHEME_P);
652static void backchar (SCHEME_P_ int c); 709static void backchar (SCHEME_P_ int c);
653static char *readstr_upto (SCHEME_P_ char *delim); 710static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654static pointer readstrexp (SCHEME_P); 711static pointer readstrexp (SCHEME_P_ char delim);
655ecb_inline int skipspace (SCHEME_P); 712ecb_inline int skipspace (SCHEME_P);
656static int token (SCHEME_P); 713static int token (SCHEME_P);
657static void printslashstring (SCHEME_P_ char *s, int len); 714static void printslashstring (SCHEME_P_ char *s, int len);
658static 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);
659static void printatom (SCHEME_P_ pointer l, int f); 716static void printatom (SCHEME_P_ pointer l, int f);
… …
676static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 733static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677static void assign_syntax (SCHEME_P_ const char *name); 734static void assign_syntax (SCHEME_P_ const char *name);
678static int syntaxnum (pointer p); 735static int syntaxnum (pointer p);
679static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 736static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680 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
681static num 765static num
682num_op (enum num_op op, num a, num b) 766num_op (enum num_op op, num a, num b)
683{ 767{
684 num ret; 768 num ret;
685 769
686 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));
687 771
688 if (num_is_fixnum (ret)) 772 if (num_is_fixnum (ret))
689 { 773 {
690 IVALUE av = num_get_ivalue (a);
691 IVALUE bv = num_get_ivalue (b);
692
693 switch (op) 774 switch (op)
694 { 775 {
695 case NUM_ADD: av += bv; break; 776 case NUM_ADD: a.ivalue += b.ivalue; break;
696 case NUM_SUB: av -= bv; break; 777 case NUM_SUB: a.ivalue -= b.ivalue; break;
697 case NUM_MUL: av *= bv; break; 778 case NUM_MUL: a.ivalue *= b.ivalue; break;
698 case NUM_INTDIV: av /= bv; break; 779 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699 } 780 }
700 781
701 num_set_ivalue (ret, av); 782 num_set_ivalue (ret, a.ivalue);
702 } 783 }
784#if USE_REAL
703 else 785 else
704 { 786 {
705 RVALUE av = num_get_rvalue (a);
706 RVALUE bv = num_get_rvalue (b);
707
708 switch (op) 787 switch (op)
709 { 788 {
710 case NUM_ADD: av += bv; break; 789 case NUM_ADD: a.rvalue += b.rvalue; break;
711 case NUM_SUB: av -= bv; break; 790 case NUM_SUB: a.rvalue -= b.rvalue; break;
712 case NUM_MUL: av *= bv; break; 791 case NUM_MUL: a.rvalue *= b.rvalue; break;
713 case NUM_INTDIV: av /= bv; break; 792 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714 } 793 }
715 794
716 num_set_rvalue (ret, av); 795 num_set_rvalue (ret, a.rvalue);
717 } 796 }
797#endif
718 798
719 return ret; 799 return ret;
720} 800}
721 801
722static num 802static num
723num_div (num a, num b) 803num_div (num a, num b)
724{ 804{
725 num ret; 805 num ret;
726 806
727 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);
728 808
729 if (num_is_fixnum (ret)) 809 if (num_is_fixnum (ret))
730 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 810 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731 else 811 else
732 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 812 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733 813
734 return ret; 814 return ret;
735} 815}
736 816
737static num 817static num
… …
739{ 819{
740 num ret; 820 num ret;
741 long e1, e2, res; 821 long e1, e2, res;
742 822
743 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));
744 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
745 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
746 res = e1 % e2; 826 res = e1 % e2;
747 827
748 /* remainder should have same sign as second operand */ 828 /* remainder should have same sign as second operand */
749 if (res > 0) 829 if (res > 0)
750 { 830 {
… …
766{ 846{
767 num ret; 847 num ret;
768 long e1, e2, res; 848 long e1, e2, res;
769 849
770 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));
771 e1 = num_get_ivalue (a); 851 e1 = num_ivalue (a);
772 e2 = num_get_ivalue (b); 852 e2 = num_ivalue (b);
773 res = e1 % e2; 853 res = e1 % e2;
774 854
775 /* modulo should have same sign as second operand */ 855 /* modulo should have same sign as second operand */
776 if (res * e2 < 0) 856 if (res * e2 < 0)
777 res += e2; 857 res += e2;
… …
787 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 867 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788 int ret; 868 int ret;
789 869
790 if (is_fixnum) 870 if (is_fixnum)
791 { 871 {
792 IVALUE av = num_get_ivalue (a); 872 IVALUE av = num_ivalue (a);
793 IVALUE bv = num_get_ivalue (b); 873 IVALUE bv = num_ivalue (b);
794 874
795 ret = av == bv ? 0 : av < bv ? -1 : +1; 875 ret = av == bv ? 0 : av < bv ? -1 : +1;
796 } 876 }
797 else 877 else
798 { 878 {
799 RVALUE av = num_get_rvalue (a); 879 RVALUE av = num_rvalue (a);
800 RVALUE bv = num_get_rvalue (b); 880 RVALUE bv = num_rvalue (b);
801 881
802 ret = av == bv ? 0 : av < bv ? -1 : +1; 882 ret = av == bv ? 0 : av < bv ? -1 : +1;
803 } 883 }
804 884
805 return ret; 885 return ret;
806} 886}
807
808#if USE_MATH
809
810/* Round to nearest. Round to even if midway */
811static double
812round_per_R5RS (double x)
813{
814 double fl = floor (x);
815 double ce = ceil (x);
816 double dfl = x - fl;
817 double dce = ce - x;
818
819 if (dfl > dce)
820 return ce;
821 else if (dfl < dce)
822 return fl;
823 else
824 {
825 if (fmod (fl, 2) == 0) /* I imagine this holds */
826 return fl;
827 else
828 return ce;
829 }
830}
831#endif
832 887
833static int 888static int
834is_zero_rvalue (RVALUE x) 889is_zero_rvalue (RVALUE x)
835{ 890{
836 return x == 0; 891 return x == 0;
… …
842#endif 897#endif
843#endif 898#endif
844} 899}
845 900
846/* allocate new cell segment */ 901/* allocate new cell segment */
847static int 902ecb_cold static int
848alloc_cellseg (SCHEME_P_ int n) 903alloc_cellseg (SCHEME_P)
849{ 904{
850 pointer newp; 905 struct cell *newp;
851 pointer last; 906 struct cell *last;
852 pointer p; 907 struct cell *p;
853 char *cp; 908 char *cp;
854 long i; 909 long i;
855 int k; 910 int k;
856 911
857 static int segsize = CELL_SEGSIZE >> 1; 912 static int segsize = CELL_SEGSIZE >> 1;
858 segsize <<= 1; 913 segsize <<= 1;
859 914
860 for (k = 0; k < n; k++)
861 {
862 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
863 return k;
864
865 cp = malloc (segsize * sizeof (struct cell)); 915 cp = malloc (segsize * sizeof (struct cell));
866 916
867 if (!cp && USE_ERROR_CHECKING) 917 if (!cp && USE_ERROR_CHECKING)
868 return k; 918 return k;
869 919
870 i = ++SCHEME_V->last_cell_seg; 920 i = ++SCHEME_V->last_cell_seg;
871 SCHEME_V->alloc_seg[i] = cp; 921 SCHEME_V->alloc_seg[i] = cp;
872 922
873 /* insert new segment in address order */ 923 newp = (struct cell *)cp;
874 newp = (pointer)cp;
875 SCHEME_V->cell_seg[i] = newp; 924 SCHEME_V->cell_seg[i] = newp;
876 SCHEME_V->cell_segsize[i] = segsize; 925 SCHEME_V->cell_segsize[i] = segsize;
877
878 //TODO: insert, not swap
879 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880 {
881 p = SCHEME_V->cell_seg[i];
882 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883 SCHEME_V->cell_seg[i - 1] = p;
884
885 k = SCHEME_V->cell_segsize[i];
886 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887 SCHEME_V->cell_segsize[i - 1] = k;
888
889 --i;
890 }
891
892 SCHEME_V->fcells += segsize; 926 SCHEME_V->fcells += segsize;
893 last = newp + segsize - 1; 927 last = newp + segsize - 1;
894 928
895 for (p = newp; p <= last; p++) 929 for (p = newp; p <= last; p++)
896 { 930 {
931 pointer cp = POINTER (p);
897 set_typeflag (p, T_FREE); 932 set_typeflag (cp, T_PAIR);
898 set_car (p, NIL); 933 set_car (cp, NIL);
899 set_cdr (p, p + 1); 934 set_cdr (cp, POINTER (p + 1));
900 } 935 }
901 936
902 /* insert new cells in address order on free list */
903 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
904 {
905 set_cdr (last, SCHEME_V->free_cell); 937 set_cdr (POINTER (last), SCHEME_V->free_cell);
906 SCHEME_V->free_cell = newp; 938 SCHEME_V->free_cell = POINTER (newp);
907 }
908 else
909 {
910 p = SCHEME_V->free_cell;
911 939
912 while (cdr (p) != NIL && newp > cdr (p))
913 p = cdr (p);
914
915 set_cdr (last, cdr (p));
916 set_cdr (p, newp);
917 }
918 }
919
920 return n; 940 return 1;
921} 941}
922 942
923/* get new cell. parameter a, b is marked by gc. */ 943/* get new cell. parameter a, b is marked by gc. */
924ecb_inline pointer 944ecb_inline pointer
925get_cell_x (SCHEME_P_ pointer a, pointer b) 945get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 949 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
930 return S_SINK; 950 return S_SINK;
931 951
932 if (SCHEME_V->free_cell == NIL) 952 if (SCHEME_V->free_cell == NIL)
933 { 953 {
934 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 954 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
935 955
936 gc (SCHEME_A_ a, b); 956 gc (SCHEME_A_ a, b);
937 957
938 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 958 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
939 { 959 {
940 /* if only a few recovered, get more to avoid fruitless gc's */ 960 /* if only a few recovered, get more to avoid fruitless gc's */
941 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 961 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
942 { 962 {
943#if USE_ERROR_CHECKING 963#if USE_ERROR_CHECKING
944 SCHEME_V->no_memory = 1; 964 SCHEME_V->no_memory = 1;
945 return S_SINK; 965 return S_SINK;
946#endif 966#endif
… …
958 } 978 }
959} 979}
960 980
961/* To retain recent allocs before interpreter knows about them - 981/* To retain recent allocs before interpreter knows about them -
962 Tehom */ 982 Tehom */
963 983ecb_hot static void
964static void
965push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 984push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
966{ 985{
967 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 986 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
968 987
969 set_typeflag (holder, T_PAIR); 988 set_typeflag (holder, T_PAIR);
… …
971 set_car (holder, recent); 990 set_car (holder, recent);
972 set_cdr (holder, car (S_SINK)); 991 set_cdr (holder, car (S_SINK));
973 set_car (S_SINK, holder); 992 set_car (S_SINK, holder);
974} 993}
975 994
976static pointer 995ecb_hot static pointer
977get_cell (SCHEME_P_ pointer a, pointer b) 996get_cell (SCHEME_P_ pointer a, pointer b)
978{ 997{
979 pointer cell = get_cell_x (SCHEME_A_ a, b); 998 pointer cell = get_cell_x (SCHEME_A_ a, b);
980 999
981 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1000 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
990} 1009}
991 1010
992static pointer 1011static pointer
993get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1012get_vector_object (SCHEME_P_ uint32_t len, pointer init)
994{ 1013{
995 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1014 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
996 pointer *e = malloc (len * sizeof (pointer)); 1015 pointer *e = malloc (len * sizeof (pointer));
997 1016
998 if (!e && USE_ERROR_CHECKING) 1017 if (!e && USE_ERROR_CHECKING)
999 return S_SINK; 1018 return S_SINK;
1000 1019
1001 /* Record it as a vector so that gc understands it. */ 1020 /* Record it as a vector so that gc understands it. */
1002 set_typeflag (v, T_VECTOR | T_ATOM); 1021 set_typeflag (v, T_VECTOR | T_ATOM);
1003 1022
1004 v->object.vector.vvalue = e; 1023 CELL(v)->object.vector.vvalue = e;
1005 v->object.vector.length = len; 1024 CELL(v)->object.vector.length = len;
1006 fill_vector (v, init); 1025 fill_vector (v, 0, init);
1007 push_recent_alloc (SCHEME_A_ v, NIL); 1026 push_recent_alloc (SCHEME_A_ v, NIL);
1008 1027
1009 return v; 1028 return v;
1010} 1029}
1011 1030
… …
1019static void 1038static void
1020check_cell_alloced (pointer p, int expect_alloced) 1039check_cell_alloced (pointer p, int expect_alloced)
1021{ 1040{
1022 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1041 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1023 if (typeflag (p) & !expect_alloced) 1042 if (typeflag (p) & !expect_alloced)
1024 xwrstr ("Cell is already allocated!\n"); 1043 putstr (SCHEME_A_ "Cell is already allocated!\n");
1025 1044
1026 if (!(typeflag (p)) & expect_alloced) 1045 if (!(typeflag (p)) & expect_alloced)
1027 xwrstr ("Cell is not allocated!\n"); 1046 putstr (SCHEME_A_ "Cell is not allocated!\n");
1028} 1047}
1029 1048
1030static void 1049static void
1031check_range_alloced (pointer p, int n, int expect_alloced) 1050check_range_alloced (pointer p, int n, int expect_alloced)
1032{ 1051{
… …
1038#endif 1057#endif
1039 1058
1040/* Medium level cell allocation */ 1059/* Medium level cell allocation */
1041 1060
1042/* get new cons cell */ 1061/* get new cons cell */
1043pointer 1062ecb_hot static pointer
1044xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1063xcons (SCHEME_P_ pointer a, pointer b)
1045{ 1064{
1046 pointer x = get_cell (SCHEME_A_ a, b); 1065 pointer x = get_cell (SCHEME_A_ a, b);
1047 1066
1048 set_typeflag (x, T_PAIR); 1067 set_typeflag (x, T_PAIR);
1049
1050 if (immutable)
1051 setimmutable (x);
1052 1068
1053 set_car (x, a); 1069 set_car (x, a);
1054 set_cdr (x, b); 1070 set_cdr (x, b);
1055 1071
1056 return x; 1072 return x;
1057} 1073}
1058 1074
1075ecb_hot static pointer
1076ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1077{
1078 pointer x = xcons (SCHEME_A_ a, b);
1079 setimmutable (x);
1080 return x;
1081}
1082
1083#define cons(a,b) xcons (SCHEME_A_ a, b)
1084#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1085
1086ecb_cold static pointer
1087generate_symbol (SCHEME_P_ const char *name)
1088{
1089 pointer x = mk_string (SCHEME_A_ name);
1090 setimmutable (x);
1091 set_typeflag (x, T_SYMBOL | T_ATOM);
1092 return x;
1093}
1094
1059/* ========== oblist implementation ========== */ 1095/* ========== oblist implementation ========== */
1060 1096
1061#ifndef USE_OBJECT_LIST 1097#ifndef USE_OBJECT_LIST
1062 1098
1099static int
1063static int hash_fn (const char *key, int table_size); 1100hash_fn (const char *key, int table_size)
1101{
1102 const unsigned char *p = (unsigned char *)key;
1103 uint32_t hash = 2166136261;
1064 1104
1105 while (*p)
1106 hash = (hash ^ *p++) * 16777619;
1107
1108 return hash % table_size;
1109}
1110
1065static pointer 1111ecb_cold static pointer
1066oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1067{ 1113{
1068 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1114 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1069} 1115}
1070 1116
1071/* returns the new symbol */ 1117/* returns the new symbol */
1072static pointer 1118ecb_cold static pointer
1073oblist_add_by_name (SCHEME_P_ const char *name) 1119oblist_add_by_name (SCHEME_P_ const char *name)
1074{ 1120{
1075 int location; 1121 pointer x = generate_symbol (SCHEME_A_ name);
1076
1077 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078 set_typeflag (x, T_SYMBOL);
1079 setimmutable (car (x));
1080
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1122 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1123 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083 return x; 1124 return x;
1084} 1125}
1085 1126
1086ecb_inline pointer 1127ecb_cold static pointer
1087oblist_find_by_name (SCHEME_P_ const char *name) 1128oblist_find_by_name (SCHEME_P_ const char *name)
1088{ 1129{
1089 int location; 1130 int location;
1090 pointer x; 1131 pointer x;
1091 char *s; 1132 char *s;
1092 1133
1093 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 location = hash_fn (name, veclength (SCHEME_V->oblist));
1094 1135
1095 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1136 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096 { 1137 {
1097 s = symname (car (x)); 1138 s = symname (car (x));
1098 1139
1099 /* case-insensitive, per R5RS section 2 */ 1140 /* case-insensitive, per R5RS section 2 */
1100 if (stricmp (name, s) == 0) 1141 if (stricmp (name, s) == 0)
… …
1102 } 1143 }
1103 1144
1104 return NIL; 1145 return NIL;
1105} 1146}
1106 1147
1107static pointer 1148ecb_cold static pointer
1108oblist_all_symbols (SCHEME_P) 1149oblist_all_symbols (SCHEME_P)
1109{ 1150{
1110 int i; 1151 int i;
1111 pointer x; 1152 pointer x;
1112 pointer ob_list = NIL; 1153 pointer ob_list = NIL;
1113 1154
1114 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1155 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1156 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116 ob_list = cons (x, ob_list); 1157 ob_list = cons (x, ob_list);
1117 1158
1118 return ob_list; 1159 return ob_list;
1119} 1160}
1120 1161
1121#else 1162#else
1122 1163
1123static pointer 1164ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1165oblist_initial_value (SCHEME_P)
1125{ 1166{
1126 return NIL; 1167 return NIL;
1127} 1168}
1128 1169
1129ecb_inline pointer 1170ecb_cold static pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1171oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1172{
1132 pointer x; 1173 pointer x;
1133 char *s; 1174 char *s;
1134 1175
… …
1143 1184
1144 return NIL; 1185 return NIL;
1145} 1186}
1146 1187
1147/* returns the new symbol */ 1188/* returns the new symbol */
1148static pointer 1189ecb_cold static pointer
1149oblist_add_by_name (SCHEME_P_ const char *name) 1190oblist_add_by_name (SCHEME_P_ const char *name)
1150{ 1191{
1151 pointer x; 1192 pointer x = generate_symbol (SCHEME_A_ name);
1152
1153 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154 set_typeflag (x, T_SYMBOL);
1155 setimmutable (car (x));
1156 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1193 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157 return x; 1194 return x;
1158} 1195}
1159 1196
1160static pointer 1197ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1198oblist_all_symbols (SCHEME_P)
1162{ 1199{
1163 return SCHEME_V->oblist; 1200 return SCHEME_V->oblist;
1164} 1201}
1165 1202
1166#endif 1203#endif
1167 1204
1168#if USE_PORTS
1169static pointer 1205ecb_cold static pointer
1170mk_port (SCHEME_P_ port *p) 1206mk_port (SCHEME_P_ port *p)
1171{ 1207{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1208 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1209
1174 set_typeflag (x, T_PORT | T_ATOM); 1210 set_typeflag (x, T_PORT | T_ATOM);
1175 x->object.port = p; 1211 set_port (x, p);
1176 1212
1177 return x; 1213 return x;
1178} 1214}
1179#endif
1180 1215
1181pointer 1216ecb_cold pointer
1182mk_foreign_func (SCHEME_P_ foreign_func f) 1217mk_foreign_func (SCHEME_P_ foreign_func f)
1183{ 1218{
1184 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1219 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1185 1220
1186 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1221 set_typeflag (x, T_FOREIGN | T_ATOM);
1187 x->object.ff = f; 1222 CELL(x)->object.ff = f;
1188 1223
1189 return x; 1224 return x;
1190} 1225}
1191 1226
1192INTERFACE pointer 1227INTERFACE pointer
1193mk_character (SCHEME_P_ int c) 1228mk_character (SCHEME_P_ int c)
1194{ 1229{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1231
1197 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1232 set_typeflag (x, T_CHARACTER | T_ATOM);
1198 ivalue_unchecked (x) = c & 0xff; 1233 set_ivalue (x, c & 0xff);
1199 set_num_integer (x); 1234
1200 return x; 1235 return x;
1201} 1236}
1202 1237
1203/* get number atom (integer) */ 1238/* get number atom (integer) */
1204INTERFACE pointer 1239INTERFACE pointer
1205mk_integer (SCHEME_P_ long num) 1240mk_integer (SCHEME_P_ long n)
1206{ 1241{
1242 pointer p = 0;
1243 pointer *pp = &p;
1244
1245#if USE_INTCACHE
1246 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1247 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1248#endif
1249
1250 if (!*pp)
1251 {
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1252 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1253
1209 set_typeflag (x, (T_NUMBER | T_ATOM)); 1254 set_typeflag (x, T_INTEGER | T_ATOM);
1210 ivalue_unchecked (x) = num; 1255 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1211 set_num_integer (x); 1256 set_ivalue (x, n);
1257
1258 *pp = x;
1259 }
1260
1212 return x; 1261 return *pp;
1213} 1262}
1214 1263
1215INTERFACE pointer 1264INTERFACE pointer
1216mk_real (SCHEME_P_ RVALUE n) 1265mk_real (SCHEME_P_ RVALUE n)
1217{ 1266{
1267#if USE_REAL
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1269
1220 set_typeflag (x, (T_NUMBER | T_ATOM)); 1270 set_typeflag (x, T_REAL | T_ATOM);
1221 rvalue_unchecked (x) = n; 1271 set_rvalue (x, n);
1222 set_num_real (x); 1272
1223 return x; 1273 return x;
1274#else
1275 return mk_integer (SCHEME_A_ n);
1276#endif
1224} 1277}
1225 1278
1226static pointer 1279static pointer
1227mk_number (SCHEME_P_ const num n) 1280mk_number (SCHEME_P_ const num n)
1228{ 1281{
1282#if USE_REAL
1229 if (num_is_fixnum (n)) 1283 return num_is_fixnum (n)
1284 ? mk_integer (SCHEME_A_ num_ivalue (n))
1285 : mk_real (SCHEME_A_ num_rvalue (n));
1286#else
1230 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1287 return mk_integer (SCHEME_A_ num_ivalue (n));
1231 else 1288#endif
1232 return mk_real (SCHEME_A_ num_get_rvalue (n));
1233} 1289}
1234 1290
1235/* allocate name to string area */ 1291/* allocate name to string area */
1236static char * 1292static char *
1237store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1293store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1243 SCHEME_V->no_memory = 1; 1299 SCHEME_V->no_memory = 1;
1244 return SCHEME_V->strbuff; 1300 return SCHEME_V->strbuff;
1245 } 1301 }
1246 1302
1247 if (str) 1303 if (str)
1248 { 1304 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249 int l = strlen (str);
1250
1251 if (l > len_str)
1252 l = len_str;
1253
1254 memcpy (q, str, l);
1255 q[l] = 0;
1256 }
1257 else 1305 else
1258 {
1259 memset (q, fill, len_str); 1306 memset (q, fill, len_str);
1307
1260 q[len_str] = 0; 1308 q[len_str] = 0;
1261 }
1262 1309
1263 return q; 1310 return q;
1264} 1311}
1265 1312
1266INTERFACE pointer 1313INTERFACE pointer
… …
1280 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1327 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281 1328
1282 set_typeflag (x, T_STRING | T_ATOM); 1329 set_typeflag (x, T_STRING | T_ATOM);
1283 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1330 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284 strlength (x) = len; 1331 strlength (x) = len;
1332
1285 return x; 1333 return x;
1286} 1334}
1287 1335
1288INTERFACE pointer 1336INTERFACE pointer
1289mk_string (SCHEME_P_ const char *str) 1337mk_string (SCHEME_P_ const char *str)
… …
1296{ 1344{
1297 return get_vector_object (SCHEME_A_ len, NIL); 1345 return get_vector_object (SCHEME_A_ len, NIL);
1298} 1346}
1299 1347
1300INTERFACE void 1348INTERFACE void
1301fill_vector (pointer vec, pointer obj) 1349fill_vector (pointer vec, uint32_t start, pointer obj)
1302{ 1350{
1303 int i; 1351 int i;
1304 1352
1305 for (i = 0; i < vec->object.vector.length; i++) 1353 for (i = start; i < veclength (vec); i++)
1306 vecvalue (vec)[i] = obj; 1354 vecvalue (vec)[i] = obj;
1307} 1355}
1308 1356
1357INTERFACE void
1358vector_resize (pointer vec, uint32_t newsize, pointer fill)
1359{
1360 uint32_t oldsize = veclength (vec);
1361 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1362 veclength (vec) = newsize;
1363 fill_vector (vec, oldsize, fill);
1364}
1365
1309INTERFACE pointer 1366INTERFACE pointer
1310vector_elem (pointer vec, uint32_t ielem) 1367vector_get (pointer vec, uint32_t ielem)
1311{ 1368{
1312 return vecvalue(vec)[ielem]; 1369 return vecvalue(vec)[ielem];
1313} 1370}
1314 1371
1315INTERFACE void 1372INTERFACE void
1316set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1373vector_set (pointer vec, uint32_t ielem, pointer a)
1317{ 1374{
1318 vecvalue(vec)[ielem] = a; 1375 vecvalue(vec)[ielem] = a;
1319} 1376}
1320 1377
1321/* get new symbol */ 1378/* get new symbol */
… …
1329 x = oblist_add_by_name (SCHEME_A_ name); 1386 x = oblist_add_by_name (SCHEME_A_ name);
1330 1387
1331 return x; 1388 return x;
1332} 1389}
1333 1390
1334INTERFACE pointer 1391ecb_cold INTERFACE pointer
1335gensym (SCHEME_P) 1392gensym (SCHEME_P)
1336{ 1393{
1337 pointer x; 1394 pointer x;
1338
1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340 {
1341 char name[40] = "gensym-"; 1395 char name[40] = "gensym-";
1342 xnum (name + 7, SCHEME_V->gensym_cnt); 1396 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343 1397
1344 /* first check oblist */ 1398 return generate_symbol (SCHEME_A_ name);
1345 x = oblist_find_by_name (SCHEME_A_ name); 1399}
1346 1400
1347 if (x == NIL) 1401static int
1348 { 1402is_gensym (SCHEME_P_ pointer x)
1349 x = oblist_add_by_name (SCHEME_A_ name); 1403{
1350 return x; 1404 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351 }
1352 }
1353
1354 return NIL;
1355} 1405}
1356 1406
1357/* make symbol or number atom from string */ 1407/* make symbol or number atom from string */
1358static pointer 1408ecb_cold static pointer
1359mk_atom (SCHEME_P_ char *q) 1409mk_atom (SCHEME_P_ char *q)
1360{ 1410{
1361 char c, *p; 1411 char c, *p;
1362 int has_dec_point = 0; 1412 int has_dec_point = 0;
1363 int has_fp_exp = 0; 1413 int has_fp_exp = 0;
… …
1413 } 1463 }
1414 else if ((c == 'e') || (c == 'E')) 1464 else if ((c == 'e') || (c == 'E'))
1415 { 1465 {
1416 if (!has_fp_exp) 1466 if (!has_fp_exp)
1417 { 1467 {
1418 has_dec_point = 1; /* decimal point illegal 1468 has_dec_point = 1; /* decimal point illegal from now on */
1419 from now on */
1420 p++; 1469 p++;
1421 1470
1422 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1471 if ((*p == '-') || (*p == '+') || isdigit (*p))
1423 continue; 1472 continue;
1424 } 1473 }
… …
1435 1484
1436 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1485 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1437} 1486}
1438 1487
1439/* make constant */ 1488/* make constant */
1440static pointer 1489ecb_cold static pointer
1441mk_sharp_const (SCHEME_P_ char *name) 1490mk_sharp_const (SCHEME_P_ char *name)
1442{ 1491{
1443 if (!strcmp (name, "t")) 1492 if (!strcmp (name, "t"))
1444 return S_T; 1493 return S_T;
1445 else if (!strcmp (name, "f")) 1494 else if (!strcmp (name, "f"))
1446 return S_F; 1495 return S_F;
1447 else if (*name == '\\') /* #\w (character) */ 1496 else if (*name == '\\') /* #\w (character) */
1448 { 1497 {
1449 int c; 1498 int c;
1450 1499
1500 // TODO: optimise
1451 if (stricmp (name + 1, "space") == 0) 1501 if (stricmp (name + 1, "space") == 0)
1452 c = ' '; 1502 c = ' ';
1453 else if (stricmp (name + 1, "newline") == 0) 1503 else if (stricmp (name + 1, "newline") == 0)
1454 c = '\n'; 1504 c = '\n';
1455 else if (stricmp (name + 1, "return") == 0) 1505 else if (stricmp (name + 1, "return") == 0)
1456 c = '\r'; 1506 c = '\r';
1457 else if (stricmp (name + 1, "tab") == 0) 1507 else if (stricmp (name + 1, "tab") == 0)
1458 c = '\t'; 1508 c = '\t';
1509 else if (stricmp (name + 1, "alarm") == 0)
1510 c = 0x07;
1511 else if (stricmp (name + 1, "backspace") == 0)
1512 c = 0x08;
1513 else if (stricmp (name + 1, "escape") == 0)
1514 c = 0x1b;
1515 else if (stricmp (name + 1, "delete") == 0)
1516 c = 0x7f;
1517 else if (stricmp (name + 1, "null") == 0)
1518 c = 0;
1459 else if (name[1] == 'x' && name[2] != 0) 1519 else if (name[1] == 'x' && name[2] != 0)
1460 { 1520 {
1461 long c1 = strtol (name + 2, 0, 16); 1521 long c1 = strtol (name + 2, 0, 16);
1462 1522
1463 if (0 <= c1 && c1 <= UCHAR_MAX) 1523 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1488 return NIL; 1548 return NIL;
1489 } 1549 }
1490} 1550}
1491 1551
1492/* ========== garbage collector ========== */ 1552/* ========== garbage collector ========== */
1553
1554static void
1555finalize_cell (SCHEME_P_ pointer a)
1556{
1557 /* TODO, fast bitmap check? */
1558 if (is_string (a) || is_symbol (a))
1559 free (strvalue (a));
1560 else if (is_vector (a))
1561 free (vecvalue (a));
1562#if USE_PORTS
1563 else if (is_port (a))
1564 {
1565 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1566 port_close (SCHEME_A_ a, port_input | port_output);
1567
1568 free (port (a));
1569 }
1570#endif
1571}
1493 1572
1494/*-- 1573/*--
1495 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1497 * for marking. 1576 * for marking.
1498 * 1577 *
1499 * The exception is vectors - vectors are currently marked recursively, 1578 * The exception is vectors - vectors are currently marked recursively,
1500 * which is inherited form tinyscheme and could be fixed by having another 1579 * which is inherited form tinyscheme and could be fixed by having another
1501 * word of context in the vector 1580 * word of context in the vector
1502 */ 1581 */
1503static void 1582ecb_hot static void
1504mark (pointer a) 1583mark (pointer a)
1505{ 1584{
1506 pointer t, q, p; 1585 pointer t, q, p;
1507 1586
1508 t = 0; 1587 t = 0;
… …
1512 1591
1513 if (ecb_expect_false (is_vector (p))) 1592 if (ecb_expect_false (is_vector (p)))
1514 { 1593 {
1515 int i; 1594 int i;
1516 1595
1517 for (i = 0; i < p->object.vector.length; i++) 1596 for (i = 0; i < veclength (p); i++)
1518 mark (vecvalue (p)[i]); 1597 mark (vecvalue (p)[i]);
1519 } 1598 }
1520 1599
1521 if (is_atom (p)) 1600 if (is_atom (p))
1522 goto E6; 1601 goto E6;
… …
1565 p = q; 1644 p = q;
1566 goto E6; 1645 goto E6;
1567 } 1646 }
1568} 1647}
1569 1648
1649ecb_hot static void
1650gc_free (SCHEME_P)
1651{
1652 int i;
1653 uint32_t total = 0;
1654
1655 /* Here we scan the cells to build the free-list. */
1656 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1657 {
1658 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1659 struct cell *p;
1660 total += SCHEME_V->cell_segsize [i];
1661
1662 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1663 {
1664 pointer c = POINTER (p);
1665
1666 if (is_mark (c))
1667 clrmark (c);
1668 else
1669 {
1670 /* reclaim cell */
1671 if (typeflag (c) != T_PAIR)
1672 {
1673 finalize_cell (SCHEME_A_ c);
1674 set_typeflag (c, T_PAIR);
1675 set_car (c, NIL);
1676 }
1677
1678 ++SCHEME_V->fcells;
1679 set_cdr (c, SCHEME_V->free_cell);
1680 SCHEME_V->free_cell = c;
1681 }
1682 }
1683 }
1684
1685 if (SCHEME_V->gc_verbose)
1686 {
1687 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");
1688 }
1689}
1690
1570/* garbage collection. parameter a, b is marked. */ 1691/* garbage collection. parameter a, b is marked. */
1571static void 1692ecb_cold static void
1572gc (SCHEME_P_ pointer a, pointer b) 1693gc (SCHEME_P_ pointer a, pointer b)
1573{ 1694{
1574 pointer p;
1575 int i; 1695 int i;
1576 1696
1577 if (SCHEME_V->gc_verbose) 1697 if (SCHEME_V->gc_verbose)
1578 putstr (SCHEME_A_ "gc..."); 1698 putstr (SCHEME_A_ "gc...");
1579 1699
… …
1595 /* Mark recent objects the interpreter doesn't know about yet. */ 1715 /* Mark recent objects the interpreter doesn't know about yet. */
1596 mark (car (S_SINK)); 1716 mark (car (S_SINK));
1597 /* Mark any older stuff above nested C calls */ 1717 /* Mark any older stuff above nested C calls */
1598 mark (SCHEME_V->c_nest); 1718 mark (SCHEME_V->c_nest);
1599 1719
1720#if USE_INTCACHE
1721 /* mark intcache */
1722 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1723 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1724 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1725#endif
1726
1600 /* mark variables a, b */ 1727 /* mark variables a, b */
1601 mark (a); 1728 mark (a);
1602 mark (b); 1729 mark (b);
1603 1730
1604 /* garbage collect */ 1731 /* garbage collect */
1605 clrmark (NIL); 1732 clrmark (NIL);
1606 SCHEME_V->fcells = 0; 1733 SCHEME_V->fcells = 0;
1607 SCHEME_V->free_cell = NIL; 1734 SCHEME_V->free_cell = NIL;
1608 1735
1609 /* free-list is kept sorted by address so as to maintain consecutive
1610 ranges, if possible, for use with vectors. Here we scan the cells
1611 (which are also kept sorted by address) downwards to build the
1612 free-list in sorted order.
1613 */
1614 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615 {
1616 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1617
1618 while (--p >= SCHEME_V->cell_seg[i])
1619 {
1620 if (is_mark (p))
1621 clrmark (p);
1622 else
1623 {
1624 /* reclaim cell */
1625 if (typeflag (p) != T_FREE)
1626 {
1627 finalize_cell (SCHEME_A_ p);
1628 set_typeflag (p, T_FREE);
1629 set_car (p, NIL);
1630 }
1631
1632 ++SCHEME_V->fcells;
1633 set_cdr (p, SCHEME_V->free_cell);
1634 SCHEME_V->free_cell = p;
1635 }
1636 }
1637 }
1638
1639 if (SCHEME_V->gc_verbose) 1736 if (SCHEME_V->gc_verbose)
1640 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1737 putstr (SCHEME_A_ "freeing...");
1641}
1642 1738
1643static void 1739 gc_free (SCHEME_A);
1644finalize_cell (SCHEME_P_ pointer a)
1645{
1646 /* TODO, fast bitmap check? */
1647 if (is_string (a))
1648 free (strvalue (a));
1649 else if (is_vector (a))
1650 free (vecvalue (a));
1651#if USE_PORTS
1652 else if (is_port (a))
1653 {
1654 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1655 port_close (SCHEME_A_ a, port_input | port_output);
1656
1657 free (a->object.port);
1658 }
1659#endif
1660} 1740}
1661 1741
1662/* ========== Routines for Reading ========== */ 1742/* ========== Routines for Reading ========== */
1663 1743
1664static int 1744ecb_cold static int
1665file_push (SCHEME_P_ const char *fname) 1745file_push (SCHEME_P_ const char *fname)
1666{ 1746{
1667#if USE_PORTS
1668 int fin; 1747 int fin;
1669 1748
1670 if (SCHEME_V->file_i == MAXFIL - 1) 1749 if (SCHEME_V->file_i == MAXFIL - 1)
1671 return 0; 1750 return 0;
1672 1751
… …
1678 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1679 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1680 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1681 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1682 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1761 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1683 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1762 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1684 1763
1685#if SHOW_ERROR_LINE 1764#if SHOW_ERROR_LINE
1686 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1765 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1687 1766
1688 if (fname) 1767 if (fname)
1689 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1690#endif 1769#endif
1691 } 1770 }
1692 1771
1693 return fin >= 0; 1772 return fin >= 0;
1694
1695#else
1696 return 1;
1697#endif
1698} 1773}
1699 1774
1700static void 1775ecb_cold static void
1701file_pop (SCHEME_P) 1776file_pop (SCHEME_P)
1702{ 1777{
1703 if (SCHEME_V->file_i != 0) 1778 if (SCHEME_V->file_i != 0)
1704 { 1779 {
1705 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1780 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1706#if USE_PORTS 1781#if USE_PORTS
1707 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1782 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1708#endif 1783#endif
1709 SCHEME_V->file_i--; 1784 SCHEME_V->file_i--;
1710 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1785 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1711 } 1786 }
1712} 1787}
1713 1788
1714static int 1789ecb_cold static int
1715file_interactive (SCHEME_P) 1790file_interactive (SCHEME_P)
1716{ 1791{
1717#if USE_PORTS 1792#if USE_PORTS
1718 return SCHEME_V->file_i == 0 1793 return SCHEME_V->file_i == 0
1719 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1794 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1720 && (SCHEME_V->inport->object.port->kind & port_file); 1795 && (port (SCHEME_V->inport)->kind & port_file);
1721#else 1796#else
1722 return 0; 1797 return 0;
1723#endif 1798#endif
1724} 1799}
1725 1800
1726#if USE_PORTS 1801#if USE_PORTS
1727static port * 1802ecb_cold static port *
1728port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1803port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1729{ 1804{
1730 int fd; 1805 int fd;
1731 int flags; 1806 int flags;
1732 char *rw; 1807 char *rw;
… …
1755# endif 1830# endif
1756 1831
1757 return pt; 1832 return pt;
1758} 1833}
1759 1834
1760static pointer 1835ecb_cold static pointer
1761port_from_filename (SCHEME_P_ const char *fn, int prop) 1836port_from_filename (SCHEME_P_ const char *fn, int prop)
1762{ 1837{
1763 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1838 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1764 1839
1765 if (!pt && USE_ERROR_CHECKING) 1840 if (!pt && USE_ERROR_CHECKING)
1766 return NIL; 1841 return NIL;
1767 1842
1768 return mk_port (SCHEME_A_ pt); 1843 return mk_port (SCHEME_A_ pt);
1769} 1844}
1770 1845
1771static port * 1846ecb_cold static port *
1772port_rep_from_file (SCHEME_P_ int f, int prop) 1847port_rep_from_file (SCHEME_P_ int f, int prop)
1773{ 1848{
1774 port *pt = malloc (sizeof *pt); 1849 port *pt = malloc (sizeof *pt);
1775 1850
1776 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
… …
1781 pt->rep.stdio.file = f; 1856 pt->rep.stdio.file = f;
1782 pt->rep.stdio.closeit = 0; 1857 pt->rep.stdio.closeit = 0;
1783 return pt; 1858 return pt;
1784} 1859}
1785 1860
1786static pointer 1861ecb_cold static pointer
1787port_from_file (SCHEME_P_ int f, int prop) 1862port_from_file (SCHEME_P_ int f, int prop)
1788{ 1863{
1789 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1864 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1790 1865
1791 if (!pt && USE_ERROR_CHECKING) 1866 if (!pt && USE_ERROR_CHECKING)
1792 return NIL; 1867 return NIL;
1793 1868
1794 return mk_port (SCHEME_A_ pt); 1869 return mk_port (SCHEME_A_ pt);
1795} 1870}
1796 1871
1797static port * 1872ecb_cold static port *
1798port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1873port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1799{ 1874{
1800 port *pt = malloc (sizeof (port)); 1875 port *pt = malloc (sizeof (port));
1801 1876
1802 if (!pt && USE_ERROR_CHECKING) 1877 if (!pt && USE_ERROR_CHECKING)
… …
1808 pt->rep.string.curr = start; 1883 pt->rep.string.curr = start;
1809 pt->rep.string.past_the_end = past_the_end; 1884 pt->rep.string.past_the_end = past_the_end;
1810 return pt; 1885 return pt;
1811} 1886}
1812 1887
1813static pointer 1888ecb_cold static pointer
1814port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1889port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1815{ 1890{
1816 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1891 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1817 1892
1818 if (!pt && USE_ERROR_CHECKING) 1893 if (!pt && USE_ERROR_CHECKING)
… …
1821 return mk_port (SCHEME_A_ pt); 1896 return mk_port (SCHEME_A_ pt);
1822} 1897}
1823 1898
1824# define BLOCK_SIZE 256 1899# define BLOCK_SIZE 256
1825 1900
1826static port * 1901ecb_cold static port *
1827port_rep_from_scratch (SCHEME_P) 1902port_rep_from_scratch (SCHEME_P)
1828{ 1903{
1829 char *start; 1904 char *start;
1830 port *pt = malloc (sizeof (port)); 1905 port *pt = malloc (sizeof (port));
1831 1906
… …
1845 pt->rep.string.curr = start; 1920 pt->rep.string.curr = start;
1846 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1921 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1847 return pt; 1922 return pt;
1848} 1923}
1849 1924
1850static pointer 1925ecb_cold static pointer
1851port_from_scratch (SCHEME_P) 1926port_from_scratch (SCHEME_P)
1852{ 1927{
1853 port *pt = port_rep_from_scratch (SCHEME_A); 1928 port *pt = port_rep_from_scratch (SCHEME_A);
1854 1929
1855 if (!pt && USE_ERROR_CHECKING) 1930 if (!pt && USE_ERROR_CHECKING)
1856 return NIL; 1931 return NIL;
1857 1932
1858 return mk_port (SCHEME_A_ pt); 1933 return mk_port (SCHEME_A_ pt);
1859} 1934}
1860 1935
1861static void 1936ecb_cold static void
1862port_close (SCHEME_P_ pointer p, int flag) 1937port_close (SCHEME_P_ pointer p, int flag)
1863{ 1938{
1864 port *pt = p->object.port; 1939 port *pt = port (p);
1865 1940
1866 pt->kind &= ~flag; 1941 pt->kind &= ~flag;
1867 1942
1868 if ((pt->kind & (port_input | port_output)) == 0) 1943 if ((pt->kind & (port_input | port_output)) == 0)
1869 { 1944 {
… …
1886 } 1961 }
1887} 1962}
1888#endif 1963#endif
1889 1964
1890/* get new character from input file */ 1965/* get new character from input file */
1891static int 1966ecb_cold static int
1892inchar (SCHEME_P) 1967inchar (SCHEME_P)
1893{ 1968{
1894 int c; 1969 int c;
1895 port *pt; 1970 port *pt = port (SCHEME_V->inport);
1896
1897 pt = SCHEME_V->inport->object.port;
1898 1971
1899 if (pt->kind & port_saw_EOF) 1972 if (pt->kind & port_saw_EOF)
1900 return EOF; 1973 return EOF;
1901 1974
1902 c = basic_inchar (pt); 1975 c = basic_inchar (pt);
… …
1912 } 1985 }
1913 1986
1914 return c; 1987 return c;
1915} 1988}
1916 1989
1917static int ungot = -1; 1990ecb_cold static int
1918
1919static int
1920basic_inchar (port *pt) 1991basic_inchar (port *pt)
1921{ 1992{
1922#if USE_PORTS
1923 if (pt->unget != -1) 1993 if (pt->unget != -1)
1924 { 1994 {
1925 int r = pt->unget; 1995 int r = pt->unget;
1926 pt->unget = -1; 1996 pt->unget = -1;
1927 return r; 1997 return r;
1928 } 1998 }
1929 1999
2000#if USE_PORTS
1930 if (pt->kind & port_file) 2001 if (pt->kind & port_file)
1931 { 2002 {
1932 char c; 2003 char c;
1933 2004
1934 if (!read (pt->rep.stdio.file, &c, 1)) 2005 if (!read (pt->rep.stdio.file, &c, 1))
… …
1942 return EOF; 2013 return EOF;
1943 else 2014 else
1944 return *pt->rep.string.curr++; 2015 return *pt->rep.string.curr++;
1945 } 2016 }
1946#else 2017#else
1947 if (ungot == -1)
1948 {
1949 char c; 2018 char c;
1950 if (!read (0, &c, 1)) 2019
2020 if (!read (pt->rep.stdio.file, &c, 1))
1951 return EOF; 2021 return EOF;
1952 2022
1953 ungot = c;
1954 }
1955
1956 {
1957 int r = ungot;
1958 ungot = -1;
1959 return r; 2023 return c;
1960 }
1961#endif 2024#endif
1962} 2025}
1963 2026
1964/* back character to input buffer */ 2027/* back character to input buffer */
1965static void 2028ecb_cold static void
1966backchar (SCHEME_P_ int c) 2029backchar (SCHEME_P_ int c)
1967{ 2030{
1968#if USE_PORTS 2031 port *pt = port (SCHEME_V->inport);
1969 port *pt;
1970 2032
1971 if (c == EOF) 2033 if (c == EOF)
1972 return; 2034 return;
1973 2035
1974 pt = SCHEME_V->inport->object.port;
1975 pt->unget = c; 2036 pt->unget = c;
1976#else
1977 if (c == EOF)
1978 return;
1979
1980 ungot = c;
1981#endif
1982} 2037}
1983 2038
1984#if USE_PORTS 2039#if USE_PORTS
1985static int 2040ecb_cold static int
1986realloc_port_string (SCHEME_P_ port *p) 2041realloc_port_string (SCHEME_P_ port *p)
1987{ 2042{
1988 char *start = p->rep.string.start; 2043 char *start = p->rep.string.start;
1989 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2044 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
1990 char *str = malloc (new_size); 2045 char *str = malloc (new_size);
… …
2003 else 2058 else
2004 return 0; 2059 return 0;
2005} 2060}
2006#endif 2061#endif
2007 2062
2008INTERFACE void 2063ecb_cold static void
2009putstr (SCHEME_P_ const char *s) 2064putchars (SCHEME_P_ const char *s, int len)
2010{ 2065{
2066 port *pt = port (SCHEME_V->outport);
2067
2011#if USE_PORTS 2068#if USE_PORTS
2012 port *pt = SCHEME_V->outport->object.port;
2013
2014 if (pt->kind & port_file)
2015 write (pt->rep.stdio.file, s, strlen (s));
2016 else
2017 for (; *s; s++)
2018 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2019 *pt->rep.string.curr++ = *s;
2020 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2021 *pt->rep.string.curr++ = *s;
2022
2023#else
2024 xwrstr (s);
2025#endif
2026}
2027
2028static void
2029putchars (SCHEME_P_ const char *s, int len)
2030{
2031#if USE_PORTS
2032 port *pt = SCHEME_V->outport->object.port;
2033
2034 if (pt->kind & port_file) 2069 if (pt->kind & port_file)
2035 write (pt->rep.stdio.file, s, len); 2070 write (pt->rep.stdio.file, s, len);
2036 else 2071 else
2037 { 2072 {
2038 for (; len; len--) 2073 for (; len; len--)
… …
2043 *pt->rep.string.curr++ = *s++; 2078 *pt->rep.string.curr++ = *s++;
2044 } 2079 }
2045 } 2080 }
2046 2081
2047#else 2082#else
2048 write (1, s, len); 2083 write (1, s, len); // output not initialised
2049#endif 2084#endif
2085}
2086
2087INTERFACE void
2088putstr (SCHEME_P_ const char *s)
2089{
2090 putchars (SCHEME_A_ s, strlen (s));
2050} 2091}
2051 2092
2052INTERFACE void 2093INTERFACE void
2053putcharacter (SCHEME_P_ int c) 2094putcharacter (SCHEME_P_ int c)
2054{ 2095{
2055#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port;
2057
2058 if (pt->kind & port_file)
2059 {
2060 char cc = c;
2061 write (pt->rep.stdio.file, &cc, 1);
2062 }
2063 else
2064 {
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = c;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = c;
2069 }
2070
2071#else
2072 char cc = c; 2096 char cc = c;
2073 write (1, &c, 1); 2097
2074#endif 2098 putchars (SCHEME_A_ &cc, 1);
2075} 2099}
2076 2100
2077/* read characters up to delimiter, but cater to character constants */ 2101/* read characters up to delimiter, but cater to character constants */
2078static char * 2102ecb_cold static char *
2079readstr_upto (SCHEME_P_ char *delim) 2103readstr_upto (SCHEME_P_ int skip, const char *delim)
2080{ 2104{
2081 char *p = SCHEME_V->strbuff; 2105 char *p = SCHEME_V->strbuff + skip;
2082 2106
2083 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2107 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2084 2108
2085 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2109 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086 *p = 0; 2110 *p = 0;
… …
2092 2116
2093 return SCHEME_V->strbuff; 2117 return SCHEME_V->strbuff;
2094} 2118}
2095 2119
2096/* read string expression "xxx...xxx" */ 2120/* read string expression "xxx...xxx" */
2097static pointer 2121ecb_cold static pointer
2098readstrexp (SCHEME_P) 2122readstrexp (SCHEME_P_ char delim)
2099{ 2123{
2100 char *p = SCHEME_V->strbuff; 2124 char *p = SCHEME_V->strbuff;
2101 int c; 2125 int c;
2102 int c1 = 0; 2126 int c1 = 0;
2103 enum
2104 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2127 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105 2128
2106 for (;;) 2129 for (;;)
2107 { 2130 {
2108 c = inchar (SCHEME_A); 2131 c = inchar (SCHEME_A);
2109 2132
… …
2111 return S_F; 2134 return S_F;
2112 2135
2113 switch (state) 2136 switch (state)
2114 { 2137 {
2115 case st_ok: 2138 case st_ok:
2116 switch (c) 2139 if (ecb_expect_false (c == delim))
2117 {
2118 case '\\':
2119 state = st_bsl;
2120 break;
2121
2122 case '"':
2123 *p = 0;
2124 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2140 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125 2141
2126 default: 2142 if (ecb_expect_false (c == '\\'))
2143 state = st_bsl;
2144 else
2127 *p++ = c; 2145 *p++ = c;
2128 break;
2129 }
2130 2146
2131 break; 2147 break;
2132 2148
2133 case st_bsl: 2149 case st_bsl:
2134 switch (c) 2150 switch (c)
… …
2143 case '7': 2159 case '7':
2144 state = st_oct1; 2160 state = st_oct1;
2145 c1 = c - '0'; 2161 c1 = c - '0';
2146 break; 2162 break;
2147 2163
2164 case 'a': *p++ = '\a'; state = st_ok; break;
2165 case 'n': *p++ = '\n'; state = st_ok; break;
2166 case 'r': *p++ = '\r'; state = st_ok; break;
2167 case 't': *p++ = '\t'; state = st_ok; break;
2168
2169 case '\\':
2170 skipspace (SCHEME_A);
2171 break;
2172
2173 //TODO: x should end in ;, not two-digit hex
2148 case 'x': 2174 case 'x':
2149 case 'X': 2175 case 'X':
2150 state = st_x1; 2176 state = st_x1;
2151 c1 = 0; 2177 c1 = 0;
2152 break; 2178 break;
2153 2179
2154 case 'n':
2155 *p++ = '\n';
2156 state = st_ok;
2157 break;
2158
2159 case 't':
2160 *p++ = '\t';
2161 state = st_ok;
2162 break;
2163
2164 case 'r':
2165 *p++ = '\r';
2166 state = st_ok;
2167 break;
2168
2169 case '"':
2170 *p++ = '"';
2171 state = st_ok;
2172 break;
2173
2174 default: 2180 default:
2175 *p++ = c; 2181 *p++ = c;
2176 state = st_ok; 2182 state = st_ok;
2177 break; 2183 break;
2178 } 2184 }
2179 2185
2180 break; 2186 break;
2181 2187
2182 case st_x1: 2188 case st_x1:
2183 case st_x2: 2189 case st_x2:
2184 c = toupper (c); 2190 c = tolower (c);
2185 2191
2186 if (c >= '0' && c <= 'F') 2192 if (c >= '0' && c <= '9')
2187 {
2188 if (c <= '9')
2189 c1 = (c1 << 4) + c - '0'; 2193 c1 = (c1 << 4) + c - '0';
2190 else 2194 else if (c >= 'a' && c <= 'f')
2191 c1 = (c1 << 4) + c - 'A' + 10; 2195 c1 = (c1 << 4) + c - 'a' + 10;
2192
2193 if (state == st_x1)
2194 state = st_x2;
2195 else
2196 {
2197 *p++ = c1;
2198 state = st_ok;
2199 }
2200 }
2201 else 2196 else
2202 return S_F; 2197 return S_F;
2198
2199 if (state == st_x1)
2200 state = st_x2;
2201 else
2202 {
2203 *p++ = c1;
2204 state = st_ok;
2205 }
2203 2206
2204 break; 2207 break;
2205 2208
2206 case st_oct1: 2209 case st_oct1:
2207 case st_oct2: 2210 case st_oct2:
… …
2211 backchar (SCHEME_A_ c); 2214 backchar (SCHEME_A_ c);
2212 state = st_ok; 2215 state = st_ok;
2213 } 2216 }
2214 else 2217 else
2215 { 2218 {
2216 if (state == st_oct2 && c1 >= 32) 2219 if (state == st_oct2 && c1 >= ' ')
2217 return S_F; 2220 return S_F;
2218 2221
2219 c1 = (c1 << 3) + (c - '0'); 2222 c1 = (c1 << 3) + (c - '0');
2220 2223
2221 if (state == st_oct1) 2224 if (state == st_oct1)
… …
2226 state = st_ok; 2229 state = st_ok;
2227 } 2230 }
2228 } 2231 }
2229 2232
2230 break; 2233 break;
2231
2232 } 2234 }
2233 } 2235 }
2234} 2236}
2235 2237
2236/* check c is in chars */ 2238/* check c is in chars */
2237ecb_inline int 2239ecb_cold int
2238is_one_of (char *s, int c) 2240is_one_of (const char *s, int c)
2239{ 2241{
2240 if (c == EOF)
2241 return 1;
2242
2243 return !!strchr (s, c); 2242 return c == EOF || !!strchr (s, c);
2244} 2243}
2245 2244
2246/* skip white characters */ 2245/* skip white characters */
2247ecb_inline int 2246ecb_cold int
2248skipspace (SCHEME_P) 2247skipspace (SCHEME_P)
2249{ 2248{
2250 int c, curr_line = 0; 2249 int c, curr_line = 0;
2251 2250
2252 do 2251 do
2253 { 2252 {
2254 c = inchar (SCHEME_A); 2253 c = inchar (SCHEME_A);
2254
2255#if SHOW_ERROR_LINE 2255#if SHOW_ERROR_LINE
2256 if (c == '\n') 2256 if (ecb_expect_false (c == '\n'))
2257 curr_line++; 2257 curr_line++;
2258#endif 2258#endif
2259
2260 if (ecb_expect_false (c == EOF))
2261 return c;
2259 } 2262 }
2260 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2263 while (is_one_of (WHITESPACE, c));
2261 2264
2262 /* record it */ 2265 /* record it */
2263#if SHOW_ERROR_LINE 2266#if SHOW_ERROR_LINE
2264 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2267 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2265 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2268 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2266#endif 2269#endif
2267 2270
2268 if (c != EOF)
2269 {
2270 backchar (SCHEME_A_ c); 2271 backchar (SCHEME_A_ c);
2271 return 1; 2272 return 1;
2272 }
2273 else
2274 return EOF;
2275} 2273}
2276 2274
2277/* get token */ 2275/* get token */
2278static int 2276ecb_cold static int
2279token (SCHEME_P) 2277token (SCHEME_P)
2280{ 2278{
2281 int c = skipspace (SCHEME_A); 2279 int c = skipspace (SCHEME_A);
2282 2280
2283 if (c == EOF) 2281 if (c == EOF)
… …
2295 return TOK_RPAREN; 2293 return TOK_RPAREN;
2296 2294
2297 case '.': 2295 case '.':
2298 c = inchar (SCHEME_A); 2296 c = inchar (SCHEME_A);
2299 2297
2300 if (is_one_of (" \n\t", c)) 2298 if (is_one_of (WHITESPACE, c))
2301 return TOK_DOT; 2299 return TOK_DOT;
2302 else 2300 else
2303 { 2301 {
2304 //TODO: ungetc twice in a row is not supported in C
2305 backchar (SCHEME_A_ c); 2302 backchar (SCHEME_A_ c);
2306 backchar (SCHEME_A_ '.');
2307 return TOK_ATOM; 2303 return TOK_DOTATOM;
2308 } 2304 }
2305
2306 case '|':
2307 return TOK_STRATOM;
2309 2308
2310 case '\'': 2309 case '\'':
2311 return TOK_QUOTE; 2310 return TOK_QUOTE;
2312 2311
2313 case ';': 2312 case ';':
… …
2380} 2379}
2381 2380
2382/* ========== Routines for Printing ========== */ 2381/* ========== Routines for Printing ========== */
2383#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2382#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2384 2383
2385static void 2384ecb_cold static void
2386printslashstring (SCHEME_P_ char *p, int len) 2385printslashstring (SCHEME_P_ char *p, int len)
2387{ 2386{
2388 int i; 2387 int i;
2389 unsigned char *s = (unsigned char *) p; 2388 unsigned char *s = (unsigned char *) p;
2390 2389
… …
2445 } 2444 }
2446 2445
2447 putcharacter (SCHEME_A_ '"'); 2446 putcharacter (SCHEME_A_ '"');
2448} 2447}
2449 2448
2450
2451/* print atoms */ 2449/* print atoms */
2452static void 2450ecb_cold static void
2453printatom (SCHEME_P_ pointer l, int f) 2451printatom (SCHEME_P_ pointer l, int f)
2454{ 2452{
2455 char *p; 2453 char *p;
2456 int len; 2454 int len;
2457 2455
2458 atom2str (SCHEME_A_ l, f, &p, &len); 2456 atom2str (SCHEME_A_ l, f, &p, &len);
2459 putchars (SCHEME_A_ p, len); 2457 putchars (SCHEME_A_ p, len);
2460} 2458}
2461 2459
2462
2463/* Uses internal buffer unless string pointer is already available */ 2460/* Uses internal buffer unless string pointer is already available */
2464static void 2461ecb_cold static void
2465atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2462atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466{ 2463{
2467 char *p; 2464 char *p;
2468 2465
2469 if (l == NIL) 2466 if (l == NIL)
… …
2480 { 2477 {
2481 p = SCHEME_V->strbuff; 2478 p = SCHEME_V->strbuff;
2482 2479
2483 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2480 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2484 { 2481 {
2485 if (num_is_integer (l)) 2482 if (is_integer (l))
2486 xnum (p, ivalue_unchecked (l)); 2483 xnum (p, ivalue_unchecked (l));
2487#if USE_REAL 2484#if USE_REAL
2488 else 2485 else
2489 { 2486 {
2490 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2487 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2627#endif 2624#endif
2628 } 2625 }
2629 else if (is_continuation (l)) 2626 else if (is_continuation (l))
2630 p = "#<CONTINUATION>"; 2627 p = "#<CONTINUATION>";
2631 else 2628 else
2629 {
2630#if USE_PRINTF
2631 p = SCHEME_V->strbuff;
2632 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2633#else
2632 p = "#<ERROR>"; 2634 p = "#<ERROR>";
2635#endif
2636 }
2633 2637
2634 *pp = p; 2638 *pp = p;
2635 *plen = strlen (p); 2639 *plen = strlen (p);
2636} 2640}
2637 2641
… …
2669 return car (d); 2673 return car (d);
2670 2674
2671 p = cons (car (d), cdr (d)); 2675 p = cons (car (d), cdr (d));
2672 q = p; 2676 q = p;
2673 2677
2674 while (cdr (cdr (p)) != NIL) 2678 while (cddr (p) != NIL)
2675 { 2679 {
2676 d = cons (car (p), cdr (p)); 2680 d = cons (car (p), cdr (p));
2677 2681
2678 if (cdr (cdr (p)) != NIL) 2682 if (cddr (p) != NIL)
2679 p = cdr (d); 2683 p = cdr (d);
2680 } 2684 }
2681 2685
2682 set_cdr (p, car (cdr (p))); 2686 set_cdr (p, cadr (p));
2683 return q; 2687 return q;
2684} 2688}
2685 2689
2686/* reverse list -- produce new list */ 2690/* reverse list -- produce new list */
2687static pointer 2691ecb_hot static pointer
2688reverse (SCHEME_P_ pointer a) 2692reverse (SCHEME_P_ pointer a)
2689{ 2693{
2690 /* a must be checked by gc */ 2694 /* a must be checked by gc */
2691 pointer p = NIL; 2695 pointer p = NIL;
2692 2696
… …
2695 2699
2696 return p; 2700 return p;
2697} 2701}
2698 2702
2699/* reverse list --- in-place */ 2703/* reverse list --- in-place */
2700static pointer 2704ecb_hot static pointer
2701reverse_in_place (SCHEME_P_ pointer term, pointer list) 2705reverse_in_place (SCHEME_P_ pointer term, pointer list)
2702{ 2706{
2703 pointer result = term; 2707 pointer result = term;
2704 pointer p = list; 2708 pointer p = list;
2705 2709
… …
2713 2717
2714 return result; 2718 return result;
2715} 2719}
2716 2720
2717/* append list -- produce new list (in reverse order) */ 2721/* append list -- produce new list (in reverse order) */
2718static pointer 2722ecb_hot static pointer
2719revappend (SCHEME_P_ pointer a, pointer b) 2723revappend (SCHEME_P_ pointer a, pointer b)
2720{ 2724{
2721 pointer result = a; 2725 pointer result = a;
2722 pointer p = b; 2726 pointer p = b;
2723 2727
… …
2732 2736
2733 return S_F; /* signal an error */ 2737 return S_F; /* signal an error */
2734} 2738}
2735 2739
2736/* equivalence of atoms */ 2740/* equivalence of atoms */
2737int 2741ecb_hot int
2738eqv (pointer a, pointer b) 2742eqv (pointer a, pointer b)
2739{ 2743{
2740 if (is_string (a)) 2744 if (is_string (a))
2741 { 2745 {
2742 if (is_string (b)) 2746 if (is_string (b))
… …
2745 return 0; 2749 return 0;
2746 } 2750 }
2747 else if (is_number (a)) 2751 else if (is_number (a))
2748 { 2752 {
2749 if (is_number (b)) 2753 if (is_number (b))
2750 if (num_is_integer (a) == num_is_integer (b))
2751 return num_cmp (nvalue (a), nvalue (b)) == 0; 2754 return num_cmp (nvalue (a), nvalue (b)) == 0;
2752 2755
2753 return 0; 2756 return 0;
2754 } 2757 }
2755 else if (is_character (a)) 2758 else if (is_character (a))
2756 { 2759 {
… …
2782/* () is #t in R5RS */ 2785/* () is #t in R5RS */
2783#define is_true(p) ((p) != S_F) 2786#define is_true(p) ((p) != S_F)
2784#define is_false(p) ((p) == S_F) 2787#define is_false(p) ((p) == S_F)
2785 2788
2786/* ========== Environment implementation ========== */ 2789/* ========== Environment implementation ========== */
2787
2788#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790static int
2791hash_fn (const char *key, int table_size)
2792{
2793 const unsigned char *p = key;
2794 uint32_t hash = 2166136261;
2795
2796 while (*p)
2797 hash = (hash ^ *p++) * 16777619;
2798
2799 return hash % table_size;
2800}
2801#endif
2802 2790
2803#ifndef USE_ALIST_ENV 2791#ifndef USE_ALIST_ENV
2804 2792
2805/* 2793/*
2806 * In this implementation, each frame of the environment may be 2794 * In this implementation, each frame of the environment may be
… …
2823 2811
2824 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2812 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825 setenvironment (SCHEME_V->envir); 2813 setenvironment (SCHEME_V->envir);
2826} 2814}
2827 2815
2816static uint32_t
2817sym_hash (pointer sym, uint32_t size)
2818{
2819 uintptr_t ptr = (uintptr_t)sym;
2820
2821#if 0
2822 /* table size is prime, so why mix */
2823 ptr += ptr >> 32;
2824 ptr += ptr >> 16;
2825 ptr += ptr >> 8;
2826#endif
2827
2828 return ptr % size;
2829}
2830
2828ecb_inline void 2831ecb_inline void
2829new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2832new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830{ 2833{
2831 pointer slot = immutable_cons (variable, value); 2834 pointer slot = immutable_cons (variable, value);
2832 2835
2833 if (is_vector (car (env))) 2836 if (is_vector (car (env)))
2834 { 2837 {
2835 int location = hash_fn (symname (variable), veclength (car (env))); 2838 int location = sym_hash (variable, veclength (car (env)));
2836
2837 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2839 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838 } 2840 }
2839 else 2841 else
2840 set_car (env, immutable_cons (slot, car (env))); 2842 set_car (env, immutable_cons (slot, car (env)));
2841} 2843}
2842 2844
2843static pointer 2845ecb_hot static pointer
2844find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2846find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845{ 2847{
2846 pointer x, y; 2848 pointer x, y;
2847 int location;
2848 2849
2849 for (x = env; x != NIL; x = cdr (x)) 2850 for (x = env; x != NIL; x = cdr (x))
2850 { 2851 {
2851 if (is_vector (car (x))) 2852 if (is_vector (car (x)))
2852 { 2853 {
2853 location = hash_fn (symname (hdl), veclength (car (x))); 2854 int location = sym_hash (hdl, veclength (car (x)));
2854 y = vector_elem (car (x), location); 2855 y = vector_get (car (x), location);
2855 } 2856 }
2856 else 2857 else
2857 y = car (x); 2858 y = car (x);
2858 2859
2859 for (; y != NIL; y = cdr (y)) 2860 for (; y != NIL; y = cdr (y))
2860 if (caar (y) == hdl) 2861 if (caar (y) == hdl)
2861 break; 2862 break;
2862 2863
2863 if (y != NIL) 2864 if (y != NIL)
2865 return car (y);
2866
2867 if (!all)
2864 break; 2868 break;
2865
2866 if (!all)
2867 return NIL;
2868 } 2869 }
2869
2870 if (x != NIL)
2871 return car (y);
2872 2870
2873 return NIL; 2871 return NIL;
2874} 2872}
2875 2873
2876#else /* USE_ALIST_ENV */ 2874#else /* USE_ALIST_ENV */
2877 2875
2878ecb_inline void 2876static void
2879new_frame_in_env (SCHEME_P_ pointer old_env) 2877new_frame_in_env (SCHEME_P_ pointer old_env)
2880{ 2878{
2881 SCHEME_V->envir = immutable_cons (NIL, old_env); 2879 SCHEME_V->envir = immutable_cons (NIL, old_env);
2882 setenvironment (SCHEME_V->envir); 2880 setenvironment (SCHEME_V->envir);
2883} 2881}
2884 2882
2885ecb_inline void 2883static void
2886new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2884new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2887{ 2885{
2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2886 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2889} 2887}
2890 2888
2891static pointer 2889ecb_hot static pointer
2892find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2890find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2893{ 2891{
2894 pointer x, y; 2892 pointer x, y;
2895 2893
2896 for (x = env; x != NIL; x = cdr (x)) 2894 for (x = env; x != NIL; x = cdr (x))
… …
2898 for (y = car (x); y != NIL; y = cdr (y)) 2896 for (y = car (x); y != NIL; y = cdr (y))
2899 if (caar (y) == hdl) 2897 if (caar (y) == hdl)
2900 break; 2898 break;
2901 2899
2902 if (y != NIL) 2900 if (y != NIL)
2901 return car (y);
2903 break; 2902 break;
2904 2903
2905 if (!all) 2904 if (!all)
2906 return NIL; 2905 break;
2907 } 2906 }
2908
2909 if (x != NIL)
2910 return car (y);
2911 2907
2912 return NIL; 2908 return NIL;
2913} 2909}
2914 2910
2915#endif /* USE_ALIST_ENV else */ 2911#endif /* USE_ALIST_ENV else */
2916 2912
2917ecb_inline void 2913static void
2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2914new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919{ 2915{
2916 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2917 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2921} 2918}
2922 2919
2923ecb_inline void 2920static void
2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2921set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2925{ 2922{
2926 set_cdr (slot, value); 2923 set_cdr (slot, value);
2927} 2924}
2928 2925
2929ecb_inline pointer 2926static pointer
2930slot_value_in_env (pointer slot) 2927slot_value_in_env (pointer slot)
2931{ 2928{
2932 return cdr (slot); 2929 return cdr (slot);
2933} 2930}
2934 2931
2935/* ========== Evaluation Cycle ========== */ 2932/* ========== Evaluation Cycle ========== */
2936 2933
2937static int 2934ecb_cold static int
2938xError_1 (SCHEME_P_ const char *s, pointer a) 2935xError_1 (SCHEME_P_ const char *s, pointer a)
2939{ 2936{
2940#if USE_ERROR_HOOK 2937#if USE_ERROR_HOOK
2941 pointer x; 2938 pointer x;
2942 pointer hdl = SCHEME_V->ERROR_HOOK; 2939 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3018 pointer code; 3015 pointer code;
3019}; 3016};
3020 3017
3021# define STACK_GROWTH 3 3018# define STACK_GROWTH 3
3022 3019
3023static void 3020ecb_hot static void
3024s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3021s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3025{ 3022{
3026 int nframes = (uintptr_t)SCHEME_V->dump; 3023 int nframes = (uintptr_t)SCHEME_V->dump;
3027 struct dump_stack_frame *next_frame; 3024 struct dump_stack_frame *next_frame;
3028 3025
3029 /* enough room for the next frame? */ 3026 /* enough room for the next frame? */
3030 if (nframes >= SCHEME_V->dump_size) 3027 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3031 { 3028 {
3032 SCHEME_V->dump_size += STACK_GROWTH; 3029 SCHEME_V->dump_size += STACK_GROWTH;
3033 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3030 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3034 } 3031 }
3035 3032
… …
3041 next_frame->code = code; 3038 next_frame->code = code;
3042 3039
3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3040 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3044} 3041}
3045 3042
3046static int 3043static ecb_hot int
3047xs_return (SCHEME_P_ pointer a) 3044xs_return (SCHEME_P_ pointer a)
3048{ 3045{
3049 int nframes = (uintptr_t)SCHEME_V->dump; 3046 int nframes = (uintptr_t)SCHEME_V->dump;
3050 struct dump_stack_frame *frame; 3047 struct dump_stack_frame *frame;
3051 3048
… …
3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3059 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3063 3060
3064 return 0; 3061 return 0;
3065} 3062}
3066 3063
3067ecb_inline void 3064ecb_cold void
3068dump_stack_reset (SCHEME_P) 3065dump_stack_reset (SCHEME_P)
3069{ 3066{
3070 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3067 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3071 SCHEME_V->dump = (pointer)+0; 3068 SCHEME_V->dump = (pointer)+0;
3072} 3069}
3073 3070
3074ecb_inline void 3071ecb_cold void
3075dump_stack_initialize (SCHEME_P) 3072dump_stack_initialize (SCHEME_P)
3076{ 3073{
3077 SCHEME_V->dump_size = 0; 3074 SCHEME_V->dump_size = 0;
3078 SCHEME_V->dump_base = 0; 3075 SCHEME_V->dump_base = 0;
3079 dump_stack_reset (SCHEME_A); 3076 dump_stack_reset (SCHEME_A);
3080} 3077}
3081 3078
3082static void 3079ecb_cold static void
3083dump_stack_free (SCHEME_P) 3080dump_stack_free (SCHEME_P)
3084{ 3081{
3085 free (SCHEME_V->dump_base); 3082 free (SCHEME_V->dump_base);
3086 SCHEME_V->dump_base = 0; 3083 SCHEME_V->dump_base = 0;
3087 SCHEME_V->dump = (pointer)0; 3084 SCHEME_V->dump = (pointer)0;
3088 SCHEME_V->dump_size = 0; 3085 SCHEME_V->dump_size = 0;
3089} 3086}
3090 3087
3091static void 3088ecb_cold static void
3092dump_stack_mark (SCHEME_P) 3089dump_stack_mark (SCHEME_P)
3093{ 3090{
3094 int nframes = (uintptr_t)SCHEME_V->dump; 3091 int nframes = (uintptr_t)SCHEME_V->dump;
3095 int i; 3092 int i;
3096 3093
… …
3102 mark (frame->envir); 3099 mark (frame->envir);
3103 mark (frame->code); 3100 mark (frame->code);
3104 } 3101 }
3105} 3102}
3106 3103
3107static pointer 3104ecb_cold static pointer
3108ss_get_cont (SCHEME_P) 3105ss_get_cont (SCHEME_P)
3109{ 3106{
3110 int nframes = (uintptr_t)SCHEME_V->dump; 3107 int nframes = (uintptr_t)SCHEME_V->dump;
3111 int i; 3108 int i;
3112 3109
… …
3124 } 3121 }
3125 3122
3126 return cont; 3123 return cont;
3127} 3124}
3128 3125
3129static void 3126ecb_cold static void
3130ss_set_cont (SCHEME_P_ pointer cont) 3127ss_set_cont (SCHEME_P_ pointer cont)
3131{ 3128{
3132 int i = 0; 3129 int i = 0;
3133 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3130 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134 3131
3135 while (cont != NIL) 3132 while (cont != NIL)
3136 { 3133 {
3137 frame->op = ivalue (car (cont)); cont = cdr (cont); 3134 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138 frame->args = car (cont) ; cont = cdr (cont); 3135 frame->args = car (cont) ; cont = cdr (cont);
3139 frame->envir = car (cont) ; cont = cdr (cont); 3136 frame->envir = car (cont) ; cont = cdr (cont);
3140 frame->code = car (cont) ; cont = cdr (cont); 3137 frame->code = car (cont) ; cont = cdr (cont);
3141 3138
3142 ++frame; 3139 ++frame;
3143 ++i; 3140 ++i;
3144 } 3141 }
3145 3142
3146 SCHEME_V->dump = (pointer)(uintptr_t)i; 3143 SCHEME_V->dump = (pointer)(uintptr_t)i;
3147} 3144}
3148 3145
3149#else 3146#else
3150 3147
3151ecb_inline void 3148ecb_cold void
3152dump_stack_reset (SCHEME_P) 3149dump_stack_reset (SCHEME_P)
3153{ 3150{
3154 SCHEME_V->dump = NIL; 3151 SCHEME_V->dump = NIL;
3155} 3152}
3156 3153
3157ecb_inline void 3154ecb_cold void
3158dump_stack_initialize (SCHEME_P) 3155dump_stack_initialize (SCHEME_P)
3159{ 3156{
3160 dump_stack_reset (SCHEME_A); 3157 dump_stack_reset (SCHEME_A);
3161} 3158}
3162 3159
3163static void 3160ecb_cold static void
3164dump_stack_free (SCHEME_P) 3161dump_stack_free (SCHEME_P)
3165{ 3162{
3166 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3167} 3164}
3168 3165
3169static int 3166ecb_hot static int
3170xs_return (SCHEME_P_ pointer a) 3167xs_return (SCHEME_P_ pointer a)
3171{ 3168{
3172 pointer dump = SCHEME_V->dump; 3169 pointer dump = SCHEME_V->dump;
3173 3170
3174 SCHEME_V->value = a; 3171 SCHEME_V->value = a;
3175 3172
3176 if (dump == NIL) 3173 if (dump == NIL)
3177 return -1; 3174 return -1;
3178 3175
3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3176 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3177 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3178 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3179 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183 3180
3184 SCHEME_V->dump = dump; 3181 SCHEME_V->dump = dump;
3185 3182
3186 return 0; 3183 return 0;
3187} 3184}
3188 3185
3189static void 3186ecb_hot static void
3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3187s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3191{ 3188{
3192 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3189 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3193 cons (args, 3190 cons (args,
3194 cons (SCHEME_V->envir, 3191 cons (SCHEME_V->envir,
3195 cons (code, 3192 cons (code,
3196 SCHEME_V->dump)))); 3193 SCHEME_V->dump))));
3197} 3194}
3198 3195
3196ecb_cold static void
3197dump_stack_mark (SCHEME_P)
3198{
3199 mark (SCHEME_V->dump);
3200}
3201
3202ecb_cold static pointer
3203ss_get_cont (SCHEME_P)
3204{
3205 return SCHEME_V->dump;
3206}
3207
3208ecb_cold static void
3209ss_set_cont (SCHEME_P_ pointer cont)
3210{
3211 SCHEME_V->dump = cont;
3212}
3213
3214#endif
3215
3216#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3217
3218#if EXPERIMENT
3219
3220typedef void *stream[1];
3221
3222#define stream_init() { 0 }
3223
3224ecb_cold static void
3225stream_put (void **s, uint8_t byte)
3226{
3227 uint32_t *sp = *s;
3228 uint32_t size = sizeof (uint32_t) * 2;
3229 uint32_t offs = size;
3230
3231 if (ecb_expect_true (sp))
3232 {
3233 offs = sp[0];
3234 size = sp[1];
3235 }
3236
3237 if (ecb_expect_false (offs == size))
3238 {
3239 size *= 2;
3240 sp = realloc (sp, size);
3241 *s = sp;
3242 sp[1] = size;
3243
3244 }
3245
3246 ((uint8_t *)sp)[offs++] = byte;
3247 sp[0] = offs;
3248}
3249
3250#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3251#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3252#define stream_free(s) free (s[0])
3253
3254// calculates a (preferably small) integer that makes it possible to find
3255// the symbol again. if pointers were offsets into a memory area... until
3256// then, we return segment number in the low bits, and offset in the high
3257// bits
3258static uint32_t
3259symbol_id (SCHEME_P_ pointer sym)
3260{
3261 struct cell *p = CELL (sym);
3262 int i;
3263
3264 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3265 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3266 {
3267 printf ("seg %d ofs %d/%d\n",i,(p - SCHEME_V->cell_seg[i]),SCHEME_V->cell_segsize[i]);//D
3268 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3269 }
3270
3271 abort ();
3272}
3273
3199static void 3274static void
3200dump_stack_mark (SCHEME_P) 3275compile (SCHEME_P_ stream s, pointer x)
3201{ 3276{
3202 mark (SCHEME_V->dump); 3277 if (x == NIL)
3203} 3278 {
3279 stream_put (s, 0);
3280 return;
3281 }
3204 3282
3205static pointer 3283 if (is_syntax (x))
3206ss_get_cont (SCHEME_P) 3284 {
3207{ 3285 stream_put (s, 1);
3208 return SCHEME_V->dump; 3286 stream_put (s, syntaxnum (x));
3209} 3287 return;
3288 }
3210 3289
3211static void 3290 switch (type (x))
3212ss_set_cont (SCHEME_P_ pointer cont) 3291 {
3213{ 3292 case T_INTEGER:
3214 SCHEME_V->dump = cont; 3293 stream_put (s, 2);
3215} 3294 stream_put (s, 0);
3295 stream_put (s, 0);
3296 stream_put (s, 0);
3297 stream_put (s, 0);
3298 return;
3216 3299
3217#endif 3300 case T_SYMBOL:
3301 {
3302 uint32_t sym = symbol_id (SCHEME_A_ x);
3303 printf ("sym %x\n", sym);//D
3218 3304
3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3305 stream_put (s, 3);
3306
3307 while (sym > 0x7f)
3308 {
3309 stream_put (s, sym | 0x80);
3310 sym >>= 8;
3311 }
3312
3313 stream_put (s, sym);
3314 }
3315 return;
3316
3317 case T_PAIR:
3318 stream_put (s, 4);
3319 while (x != NIL)
3320 {
3321 compile (SCHEME_A_ s, car (x));
3322 x = cdr (x);
3323 }
3324 stream_put (s, 0xff);
3325 return;
3326
3327 default:
3328 stream_put (s, 5);
3329 stream_put (s, type (x));
3330 stream_put (s, 0);
3331 stream_put (s, 0);
3332 stream_put (s, 0);
3333 stream_put (s, 0);
3334 break;
3335 }
3336}
3220 3337
3221static int 3338static int
3339compile_closure (SCHEME_P_ pointer p)
3340{
3341 stream s = stream_init ();
3342
3343 printatom (SCHEME_A_ p, 1);//D
3344 compile (SCHEME_A_ s, car (p));
3345
3346 FILE *xxd = popen ("xxd", "we");
3347 fwrite (stream_data (s), 1, stream_size (s), xxd);
3348 fclose (xxd);
3349
3350 return stream_size (s);
3351}
3352
3353static int
3354dtree (SCHEME_P_ int indent, pointer x)
3355{
3356 int c;
3357
3358 if (is_syntax (x))
3359 {
3360 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3361 return 8 + 8;
3362 }
3363
3364 if (x == NIL)
3365 {
3366 printf ("%*sNIL\n", indent, "");
3367 return 3;
3368 }
3369
3370 switch (type (x))
3371 {
3372 case T_INTEGER:
3373 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3374 return 32+8;
3375
3376 case T_SYMBOL:
3377 printf ("%*sS<%s>\n", indent, "", symname (x));
3378 return 24+8;
3379
3380 case T_CLOSURE:
3381 printf ("%*sS<%s>\n", indent, "", "closure");
3382 dtree (SCHEME_A_ indent + 3, cdr(x));
3383 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3384
3385 case T_PAIR:
3386 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3387 c = dtree (SCHEME_A_ indent + 3, car (x));
3388 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3389 return c + 1;
3390
3391 case T_PORT:
3392 printf ("%*sS<%s>\n", indent, "", "port");
3393 return 24+8;
3394
3395 case T_VECTOR:
3396 printf ("%*sS<%s>\n", indent, "", "vector");
3397 return 24+8;
3398
3399 case T_ENVIRONMENT:
3400 printf ("%*sS<%s>\n", indent, "", "environment");
3401 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3402
3403 default:
3404 printf ("unhandled type %d\n", type (x));
3405 break;
3406 }
3407}
3408#endif
3409
3410/* syntax, eval, core, ... */
3411ecb_hot static int
3222opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3412opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223{ 3413{
3224 pointer args = SCHEME_V->args; 3414 pointer args = SCHEME_V->args;
3225 pointer x, y; 3415 pointer x, y;
3226 3416
3227 switch (op) 3417 switch (op)
3228 { 3418 {
3419#if EXPERIMENT //D
3420 case OP_DEBUG:
3421 {
3422 uint32_t len = compile_closure (SCHEME_A_ car (args));
3423 printf ("len = %d\n", len);
3424 printf ("\n");
3425 s_return (S_T);
3426 }
3427#endif
3229 case OP_LOAD: /* load */ 3428 case OP_LOAD: /* load */
3230 if (file_interactive (SCHEME_A)) 3429 if (file_interactive (SCHEME_A))
3231 { 3430 {
3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3431 putstr (SCHEME_A_ "Loading ");
3233 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3432 putstr (SCHEME_A_ strvalue (car (args)));
3433 putcharacter (SCHEME_A_ '\n');
3234 } 3434 }
3235 3435
3236 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3436 if (!file_push (SCHEME_A_ strvalue (car (args))))
3237 Error_1 ("unable to open", car (args)); 3437 Error_1 ("unable to open", car (args));
3238 else 3438
3239 {
3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3439 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3241 s_goto (OP_T0LVL); 3440 s_goto (OP_T0LVL);
3242 }
3243 3441
3244 case OP_T0LVL: /* top level */ 3442 case OP_T0LVL: /* top level */
3245 3443
3246 /* If we reached the end of file, this loop is done. */ 3444 /* If we reached the end of file, this loop is done. */
3247 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3445 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3248 { 3446 {
3249 if (SCHEME_V->file_i == 0) 3447 if (SCHEME_V->file_i == 0)
3250 { 3448 {
3251 SCHEME_V->args = NIL; 3449 SCHEME_V->args = NIL;
3252 s_goto (OP_QUIT); 3450 s_goto (OP_QUIT);
… …
3263 /* If interactive, be nice to user. */ 3461 /* If interactive, be nice to user. */
3264 if (file_interactive (SCHEME_A)) 3462 if (file_interactive (SCHEME_A))
3265 { 3463 {
3266 SCHEME_V->envir = SCHEME_V->global_env; 3464 SCHEME_V->envir = SCHEME_V->global_env;
3267 dump_stack_reset (SCHEME_A); 3465 dump_stack_reset (SCHEME_A);
3268 putstr (SCHEME_A_ "\n"); 3466 putcharacter (SCHEME_A_ '\n');
3269 putstr (SCHEME_A_ prompt); 3467 putstr (SCHEME_A_ prompt);
3270 } 3468 }
3271 3469
3272 /* Set up another iteration of REPL */ 3470 /* Set up another iteration of REPL */
3273 SCHEME_V->nesting = 0; 3471 SCHEME_V->nesting = 0;
… …
3308 { 3506 {
3309 SCHEME_V->print_flag = 1; 3507 SCHEME_V->print_flag = 1;
3310 SCHEME_V->args = SCHEME_V->value; 3508 SCHEME_V->args = SCHEME_V->value;
3311 s_goto (OP_P0LIST); 3509 s_goto (OP_P0LIST);
3312 } 3510 }
3313 else 3511
3314 s_return (SCHEME_V->value); 3512 s_return (SCHEME_V->value);
3315 3513
3316 case OP_EVAL: /* main part of evaluation */ 3514 case OP_EVAL: /* main part of evaluation */
3317#if USE_TRACING 3515#if USE_TRACING
3318 if (SCHEME_V->tracing) 3516 if (SCHEME_V->tracing)
3319 { 3517 {
… …
3330#endif 3528#endif
3331 if (is_symbol (SCHEME_V->code)) /* symbol */ 3529 if (is_symbol (SCHEME_V->code)) /* symbol */
3332 { 3530 {
3333 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3531 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3334 3532
3335 if (x != NIL) 3533 if (x == NIL)
3336 s_return (slot_value_in_env (x));
3337 else
3338 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3534 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3535
3536 s_return (slot_value_in_env (x));
3339 } 3537 }
3340 else if (is_pair (SCHEME_V->code)) 3538 else if (is_pair (SCHEME_V->code))
3341 { 3539 {
3342 x = car (SCHEME_V->code); 3540 x = car (SCHEME_V->code);
3343 3541
… …
3352 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3550 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3353 SCHEME_V->code = x; 3551 SCHEME_V->code = x;
3354 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3355 } 3553 }
3356 } 3554 }
3357 else 3555
3358 s_return (SCHEME_V->code); 3556 s_return (SCHEME_V->code);
3359 3557
3360 case OP_E0ARGS: /* eval arguments */ 3558 case OP_E0ARGS: /* eval arguments */
3361 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3559 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362 { 3560 {
3363 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3561 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3562 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3366 s_goto (OP_APPLY); 3564 s_goto (OP_APPLY);
… …
3393 3591
3394 case OP_TRACING: 3592 case OP_TRACING:
3395 { 3593 {
3396 int tr = SCHEME_V->tracing; 3594 int tr = SCHEME_V->tracing;
3397 3595
3398 SCHEME_V->tracing = ivalue (car (args)); 3596 SCHEME_V->tracing = ivalue_unchecked (car (args));
3399 s_return (mk_integer (SCHEME_A_ tr)); 3597 s_return (mk_integer (SCHEME_A_ tr));
3400 } 3598 }
3401 3599
3402#endif 3600#endif
3403 3601
… …
3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3618 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3421 else if (is_foreign (SCHEME_V->code)) 3619 else if (is_foreign (SCHEME_V->code))
3422 { 3620 {
3423 /* Keep nested calls from GC'ing the arglist */ 3621 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3622 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3623 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426 3624
3427 s_return (x); 3625 s_return (x);
3428 } 3626 }
3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3627 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3430 { 3628 {
… …
3467 3665
3468 case OP_DOMACRO: /* do macro */ 3666 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3667 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3668 s_goto (OP_EVAL);
3471 3669
3472#if 1
3473
3474 case OP_LAMBDA: /* lambda */ 3670 case OP_LAMBDA: /* lambda */
3475 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3671 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3476 set SCHEME_V->value fall thru */ 3672 set SCHEME_V->value fall thru */
3477 { 3673 {
3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3674 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3484 SCHEME_V->code = slot_value_in_env (f); 3680 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3681 s_goto (OP_APPLY);
3486 } 3682 }
3487 3683
3488 SCHEME_V->value = SCHEME_V->code; 3684 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3685 }
3686 /* Fallthru */
3491 3687
3492 case OP_LAMBDA1: 3688 case OP_LAMBDA1:
3493 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3689 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3494
3495#else
3496
3497 case OP_LAMBDA: /* lambda */
3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3499
3500#endif
3501 3690
3502 case OP_MKCLOSURE: /* make-closure */ 3691 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3692 x = car (args);
3504 3693
3505 if (car (x) == SCHEME_V->LAMBDA) 3694 if (car (x) == SCHEME_V->LAMBDA)
… …
3544 else 3733 else
3545 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3734 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3546 3735
3547 s_return (SCHEME_V->code); 3736 s_return (SCHEME_V->code);
3548 3737
3549
3550 case OP_DEFP: /* defined? */ 3738 case OP_DEFP: /* defined? */
3551 x = SCHEME_V->envir; 3739 x = SCHEME_V->envir;
3552 3740
3553 if (cdr (args) != NIL) 3741 if (cdr (args) != NIL)
3554 x = cadr (args); 3742 x = cadr (args);
… …
3571 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3759 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3572 s_return (SCHEME_V->value); 3760 s_return (SCHEME_V->value);
3573 } 3761 }
3574 else 3762 else
3575 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3763 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3576
3577 3764
3578 case OP_BEGIN: /* begin */ 3765 case OP_BEGIN: /* begin */
3579 if (!is_pair (SCHEME_V->code)) 3766 if (!is_pair (SCHEME_V->code))
3580 s_return (SCHEME_V->code); 3767 s_return (SCHEME_V->code);
3581 3768
… …
3593 case OP_IF1: /* if */ 3780 case OP_IF1: /* if */
3594 if (is_true (SCHEME_V->value)) 3781 if (is_true (SCHEME_V->value))
3595 SCHEME_V->code = car (SCHEME_V->code); 3782 SCHEME_V->code = car (SCHEME_V->code);
3596 else 3783 else
3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 3784 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3785
3598 s_goto (OP_EVAL); 3786 s_goto (OP_EVAL);
3599 3787
3600 case OP_LET0: /* let */ 3788 case OP_LET0: /* let */
3601 SCHEME_V->args = NIL; 3789 SCHEME_V->args = NIL;
3602 SCHEME_V->value = SCHEME_V->code; 3790 SCHEME_V->value = SCHEME_V->code;
… …
3758 } 3946 }
3759 else 3947 else
3760 { 3948 {
3761 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3949 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3762 s_return (NIL); 3950 s_return (NIL);
3763 else 3951
3764 {
3765 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3952 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3766 SCHEME_V->code = caar (SCHEME_V->code); 3953 SCHEME_V->code = caar (SCHEME_V->code);
3767 s_goto (OP_EVAL); 3954 s_goto (OP_EVAL);
3768 }
3769 } 3955 }
3770 3956
3771 case OP_DELAY: /* delay */ 3957 case OP_DELAY: /* delay */
3772 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3958 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3773 set_typeflag (x, T_PROMISE); 3959 set_typeflag (x, T_PROMISE);
… …
3784 case OP_AND1: /* and */ 3970 case OP_AND1: /* and */
3785 if (is_false (SCHEME_V->value)) 3971 if (is_false (SCHEME_V->value))
3786 s_return (SCHEME_V->value); 3972 s_return (SCHEME_V->value);
3787 else if (SCHEME_V->code == NIL) 3973 else if (SCHEME_V->code == NIL)
3788 s_return (SCHEME_V->value); 3974 s_return (SCHEME_V->value);
3789 else 3975
3790 {
3791 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3976 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3792 SCHEME_V->code = car (SCHEME_V->code); 3977 SCHEME_V->code = car (SCHEME_V->code);
3793 s_goto (OP_EVAL); 3978 s_goto (OP_EVAL);
3794 }
3795 3979
3796 case OP_OR0: /* or */ 3980 case OP_OR0: /* or */
3797 if (SCHEME_V->code == NIL) 3981 if (SCHEME_V->code == NIL)
3798 s_return (S_F); 3982 s_return (S_F);
3799 3983
… …
3804 case OP_OR1: /* or */ 3988 case OP_OR1: /* or */
3805 if (is_true (SCHEME_V->value)) 3989 if (is_true (SCHEME_V->value))
3806 s_return (SCHEME_V->value); 3990 s_return (SCHEME_V->value);
3807 else if (SCHEME_V->code == NIL) 3991 else if (SCHEME_V->code == NIL)
3808 s_return (SCHEME_V->value); 3992 s_return (SCHEME_V->value);
3809 else 3993
3810 {
3811 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3994 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3812 SCHEME_V->code = car (SCHEME_V->code); 3995 SCHEME_V->code = car (SCHEME_V->code);
3813 s_goto (OP_EVAL); 3996 s_goto (OP_EVAL);
3814 }
3815 3997
3816 case OP_C0STREAM: /* cons-stream */ 3998 case OP_C0STREAM: /* cons-stream */
3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3999 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3818 SCHEME_V->code = car (SCHEME_V->code); 4000 SCHEME_V->code = car (SCHEME_V->code);
3819 s_goto (OP_EVAL); 4001 s_goto (OP_EVAL);
… …
3884 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4066 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3885 SCHEME_V->code = caar (x); 4067 SCHEME_V->code = caar (x);
3886 s_goto (OP_EVAL); 4068 s_goto (OP_EVAL);
3887 } 4069 }
3888 } 4070 }
3889 else 4071
3890 s_return (NIL); 4072 s_return (NIL);
3891 4073
3892 case OP_CASE2: /* case */ 4074 case OP_CASE2: /* case */
3893 if (is_true (SCHEME_V->value)) 4075 if (is_true (SCHEME_V->value))
3894 s_goto (OP_BEGIN); 4076 s_goto (OP_BEGIN);
3895 else 4077
3896 s_return (NIL); 4078 s_return (NIL);
3897 4079
3898 case OP_PAPPLY: /* apply */ 4080 case OP_PAPPLY: /* apply */
3899 SCHEME_V->code = car (args); 4081 SCHEME_V->code = car (args);
3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4082 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3901 /*SCHEME_V->args = cadr(args); */ 4083 /*SCHEME_V->args = cadr(args); */
… …
3915 } 4097 }
3916 4098
3917 if (USE_ERROR_CHECKING) abort (); 4099 if (USE_ERROR_CHECKING) abort ();
3918} 4100}
3919 4101
3920static int 4102/* math, cxr */
4103ecb_hot static int
3921opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4104opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3922{ 4105{
3923 pointer args = SCHEME_V->args; 4106 pointer args = SCHEME_V->args;
3924 pointer x = car (args); 4107 pointer x = car (args);
3925 num v; 4108 num v;
3926 4109
3927#if USE_MATH
3928 RVALUE dd;
3929#endif
3930
3931 switch (op) 4110 switch (op)
3932 { 4111 {
3933#if USE_MATH 4112#if USE_MATH
3934 case OP_INEX2EX: /* inexact->exact */ 4113 case OP_INEX2EX: /* inexact->exact */
3935 if (num_is_integer (x)) 4114 if (!is_integer (x))
3936 s_return (x); 4115 {
3937 else if (modf (rvalue_unchecked (x), &dd) == 0) 4116 RVALUE r = rvalue_unchecked (x);
3938 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4117
4118 if (r == (RVALUE)(IVALUE)r)
4119 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3939 else 4120 else
3940 Error_1 ("inexact->exact: not integral:", x); 4121 Error_1 ("inexact->exact: not integral:", x);
4122 }
3941 4123
4124 s_return (x);
4125
4126 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4127 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4128 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4129 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4130
4131 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4132 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4133 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4134 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4135 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4136 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4137 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4138 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4139 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3949 4140
3950 case OP_ATAN: 4141 case OP_ATAN:
4142 s_return (mk_real (SCHEME_A_
3951 if (cdr (args) == NIL) 4143 cdr (args) == NIL
3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4144 ? atan (rvalue (x))
3953 else 4145 : atan2 (rvalue (x), rvalue (cadr (args)))));
3954 {
3955 pointer y = cadr (args);
3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3957 }
3958
3959 case OP_SQRT:
3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3961 4146
3962 case OP_EXPT: 4147 case OP_EXPT:
3963 { 4148 {
3964 RVALUE result; 4149 RVALUE result;
3965 int real_result = 1; 4150 int real_result = 1;
3966 pointer y = cadr (args); 4151 pointer y = cadr (args);
3967 4152
3968 if (num_is_integer (x) && num_is_integer (y)) 4153 if (is_integer (x) && is_integer (y))
3969 real_result = 0; 4154 real_result = 0;
3970 4155
3971 /* This 'if' is an R5RS compatibility fix. */ 4156 /* This 'if' is an R5RS compatibility fix. */
3972 /* NOTE: Remove this 'if' fix for R6RS. */ 4157 /* NOTE: Remove this 'if' fix for R6RS. */
3973 if (rvalue (x) == 0 && rvalue (y) < 0) 4158 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3979 /* If the test fails, result is too big for integer. */ 4164 /* If the test fails, result is too big for integer. */
3980 if (!real_result) 4165 if (!real_result)
3981 { 4166 {
3982 long result_as_long = result; 4167 long result_as_long = result;
3983 4168
3984 if (result != (RVALUE) result_as_long) 4169 if (result != result_as_long)
3985 real_result = 1; 4170 real_result = 1;
3986 } 4171 }
3987 4172
3988 if (real_result) 4173 if (real_result)
3989 s_return (mk_real (SCHEME_A_ result)); 4174 s_return (mk_real (SCHEME_A_ result));
3990 else 4175 else
3991 s_return (mk_integer (SCHEME_A_ result)); 4176 s_return (mk_integer (SCHEME_A_ result));
3992 } 4177 }
3993
3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996
3997 case OP_TRUNCATE:
3998 {
3999 RVALUE rvalue_of_x;
4000
4001 rvalue_of_x = rvalue (x);
4002
4003 if (rvalue_of_x > 0)
4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4005 else
4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007 }
4008
4009 case OP_ROUND:
4010 if (num_is_integer (x))
4011 s_return (x);
4012
4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014#endif 4178#endif
4015 4179
4016 case OP_ADD: /* + */ 4180 case OP_ADD: /* + */
4017 v = num_zero; 4181 v = num_zero;
4018 4182
… …
4106 else 4270 else
4107 Error_0 ("modulo: division by zero"); 4271 Error_0 ("modulo: division by zero");
4108 4272
4109 s_return (mk_number (SCHEME_A_ v)); 4273 s_return (mk_number (SCHEME_A_ v));
4110 4274
4111 case OP_CAR: /* car */ 4275 /* the compiler will optimize this mess... */
4112 s_return (caar (args)); 4276 case OP_CAR: op_car: s_return (car (x));
4113 4277 case OP_CDR: op_cdr: s_return (cdr (x));
4114 case OP_CDR: /* cdr */ 4278 case OP_CAAR: op_caar: x = car (x); goto op_car;
4115 s_return (cdar (args)); 4279 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4280 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4281 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4282 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4283 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4284 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4285 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4286 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4287 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4288 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4289 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4290 case OP_CAAAAR: x = car (x); goto op_caaar;
4291 case OP_CAAADR: x = cdr (x); goto op_caaar;
4292 case OP_CAADAR: x = car (x); goto op_caadr;
4293 case OP_CAADDR: x = cdr (x); goto op_caadr;
4294 case OP_CADAAR: x = car (x); goto op_cadar;
4295 case OP_CADADR: x = cdr (x); goto op_cadar;
4296 case OP_CADDAR: x = car (x); goto op_caddr;
4297 case OP_CADDDR: x = cdr (x); goto op_caddr;
4298 case OP_CDAAAR: x = car (x); goto op_cdaar;
4299 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4300 case OP_CDADAR: x = car (x); goto op_cdadr;
4301 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4302 case OP_CDDAAR: x = car (x); goto op_cddar;
4303 case OP_CDDADR: x = cdr (x); goto op_cddar;
4304 case OP_CDDDAR: x = car (x); goto op_cdddr;
4305 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4116 4306
4117 case OP_CONS: /* cons */ 4307 case OP_CONS: /* cons */
4118 set_cdr (args, cadr (args)); 4308 set_cdr (args, cadr (args));
4119 s_return (args); 4309 s_return (args);
4120 4310
… …
4135 } 4325 }
4136 else 4326 else
4137 Error_0 ("set-cdr!: unable to alter immutable pair"); 4327 Error_0 ("set-cdr!: unable to alter immutable pair");
4138 4328
4139 case OP_CHAR2INT: /* char->integer */ 4329 case OP_CHAR2INT: /* char->integer */
4140 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4330 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141 4331
4142 case OP_INT2CHAR: /* integer->char */ 4332 case OP_INT2CHAR: /* integer->char */
4143 s_return (mk_character (SCHEME_A_ ivalue (x))); 4333 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144 4334
4145 case OP_CHARUPCASE: 4335 case OP_CHARUPCASE:
4146 { 4336 {
4147 unsigned char c = ivalue (x); 4337 unsigned char c = ivalue_unchecked (x);
4148 c = toupper (c); 4338 c = toupper (c);
4149 s_return (mk_character (SCHEME_A_ c)); 4339 s_return (mk_character (SCHEME_A_ c));
4150 } 4340 }
4151 4341
4152 case OP_CHARDNCASE: 4342 case OP_CHARDNCASE:
4153 { 4343 {
4154 unsigned char c = ivalue (x); 4344 unsigned char c = ivalue_unchecked (x);
4155 c = tolower (c); 4345 c = tolower (c);
4156 s_return (mk_character (SCHEME_A_ c)); 4346 s_return (mk_character (SCHEME_A_ c));
4157 } 4347 }
4158 4348
4159 case OP_STR2SYM: /* string->symbol */ 4349 case OP_STR2SYM: /* string->symbol */
… …
4236 Error_1 ("atom->string: not an atom:", x); 4426 Error_1 ("atom->string: not an atom:", x);
4237 } 4427 }
4238 4428
4239 case OP_MKSTRING: /* make-string */ 4429 case OP_MKSTRING: /* make-string */
4240 { 4430 {
4241 int fill = ' '; 4431 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242 int len;
4243
4244 len = ivalue (x); 4432 int len = ivalue_unchecked (x);
4245
4246 if (cdr (args) != NIL)
4247 fill = charvalue (cadr (args));
4248 4433
4249 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4434 s_return (mk_empty_string (SCHEME_A_ len, fill));
4250 } 4435 }
4251 4436
4252 case OP_STRLEN: /* string-length */ 4437 case OP_STRLEN: /* string-length */
4253 s_return (mk_integer (SCHEME_A_ strlength (x))); 4438 s_return (mk_integer (SCHEME_A_ strlength (x)));
4254 4439
4255 case OP_STRREF: /* string-ref */ 4440 case OP_STRREF: /* string-ref */
4256 { 4441 {
4257 char *str;
4258 int index;
4259
4260 str = strvalue (x); 4442 char *str = strvalue (x);
4261
4262 index = ivalue (cadr (args)); 4443 int index = ivalue_unchecked (cadr (args));
4263 4444
4264 if (index >= strlength (x)) 4445 if (index >= strlength (x))
4265 Error_1 ("string-ref: out of bounds:", cadr (args)); 4446 Error_1 ("string-ref: out of bounds:", cadr (args));
4266 4447
4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4448 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268 } 4449 }
4269 4450
4270 case OP_STRSET: /* string-set! */ 4451 case OP_STRSET: /* string-set! */
4271 { 4452 {
4272 char *str; 4453 char *str = strvalue (x);
4273 int index; 4454 int index = ivalue_unchecked (cadr (args));
4274 int c; 4455 int c;
4275 4456
4276 if (is_immutable (x)) 4457 if (is_immutable (x))
4277 Error_1 ("string-set!: unable to alter immutable string:", x); 4458 Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279 str = strvalue (x);
4280
4281 index = ivalue (cadr (args));
4282 4459
4283 if (index >= strlength (x)) 4460 if (index >= strlength (x))
4284 Error_1 ("string-set!: out of bounds:", cadr (args)); 4461 Error_1 ("string-set!: out of bounds:", cadr (args));
4285 4462
4286 c = charvalue (caddr (args)); 4463 c = charvalue (caddr (args));
… …
4307 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4484 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4308 4485
4309 s_return (newstr); 4486 s_return (newstr);
4310 } 4487 }
4311 4488
4312 case OP_SUBSTR: /* substring */ 4489 case OP_STRING_COPY: /* substring/string-copy */
4313 { 4490 {
4314 char *str; 4491 char *str = strvalue (x);
4315 int index0; 4492 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4316 int index1; 4493 int index1;
4317 int len; 4494 int len;
4318 4495
4319 str = strvalue (x);
4320
4321 index0 = ivalue (cadr (args));
4322
4323 if (index0 > strlength (x)) 4496 if (index0 > strlength (x))
4324 Error_1 ("substring: start out of bounds:", cadr (args)); 4497 Error_1 ("string->copy: start out of bounds:", cadr (args));
4325 4498
4326 if (cddr (args) != NIL) 4499 if (cddr (args) != NIL)
4327 { 4500 {
4328 index1 = ivalue (caddr (args)); 4501 index1 = ivalue_unchecked (caddr (args));
4329 4502
4330 if (index1 > strlength (x) || index1 < index0) 4503 if (index1 > strlength (x) || index1 < index0)
4331 Error_1 ("substring: end out of bounds:", caddr (args)); 4504 Error_1 ("string->copy: end out of bounds:", caddr (args));
4332 } 4505 }
4333 else 4506 else
4334 index1 = strlength (x); 4507 index1 = strlength (x);
4335 4508
4336 len = index1 - index0; 4509 len = index1 - index0;
4337 x = mk_empty_string (SCHEME_A_ len, ' '); 4510 x = mk_counted_string (SCHEME_A_ str + index0, len);
4338 memcpy (strvalue (x), str + index0, len);
4339 strvalue (x)[len] = 0;
4340 4511
4341 s_return (x); 4512 s_return (x);
4342 } 4513 }
4343 4514
4344 case OP_VECTOR: /* vector */ 4515 case OP_VECTOR: /* vector */
… …
4356 if (SCHEME_V->no_memory) 4527 if (SCHEME_V->no_memory)
4357 s_return (S_SINK); 4528 s_return (S_SINK);
4358#endif 4529#endif
4359 4530
4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4531 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361 set_vector_elem (vec, i, car (x)); 4532 vector_set (vec, i, car (x));
4362 4533
4363 s_return (vec); 4534 s_return (vec);
4364 } 4535 }
4365 4536
4366 case OP_MKVECTOR: /* make-vector */ 4537 case OP_MKVECTOR: /* make-vector */
4367 { 4538 {
4368 pointer fill = NIL; 4539 pointer fill = NIL;
4369 int len;
4370 pointer vec; 4540 pointer vec;
4371
4372 len = ivalue (x); 4541 int len = ivalue_unchecked (x);
4373 4542
4374 if (cdr (args) != NIL) 4543 if (cdr (args) != NIL)
4375 fill = cadr (args); 4544 fill = cadr (args);
4376 4545
4377 vec = mk_vector (SCHEME_A_ len); 4546 vec = mk_vector (SCHEME_A_ len);
… …
4380 if (SCHEME_V->no_memory) 4549 if (SCHEME_V->no_memory)
4381 s_return (S_SINK); 4550 s_return (S_SINK);
4382#endif 4551#endif
4383 4552
4384 if (fill != NIL) 4553 if (fill != NIL)
4385 fill_vector (vec, fill); 4554 fill_vector (vec, 0, fill);
4386 4555
4387 s_return (vec); 4556 s_return (vec);
4388 } 4557 }
4389 4558
4390 case OP_VECLEN: /* vector-length */ 4559 case OP_VECLEN: /* vector-length */
4391 s_return (mk_integer (SCHEME_A_ veclength (x))); 4560 s_return (mk_integer (SCHEME_A_ veclength (x)));
4392 4561
4562 case OP_VECRESIZE:
4563 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4564 s_return (x);
4565
4393 case OP_VECREF: /* vector-ref */ 4566 case OP_VECREF: /* vector-ref */
4394 { 4567 {
4395 int index;
4396
4397 index = ivalue (cadr (args)); 4568 int index = ivalue_unchecked (cadr (args));
4398 4569
4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4570 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4571 Error_1 ("vector-ref: out of bounds:", cadr (args));
4401 4572
4402 s_return (vector_elem (x, index)); 4573 s_return (vector_get (x, index));
4403 } 4574 }
4404 4575
4405 case OP_VECSET: /* vector-set! */ 4576 case OP_VECSET: /* vector-set! */
4406 { 4577 {
4407 int index; 4578 int index = ivalue_unchecked (cadr (args));
4408 4579
4409 if (is_immutable (x)) 4580 if (is_immutable (x))
4410 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4581 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411 4582
4412 index = ivalue (cadr (args));
4413
4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4583 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4584 Error_1 ("vector-set!: out of bounds:", cadr (args));
4416 4585
4417 set_vector_elem (x, index, caddr (args)); 4586 vector_set (x, index, caddr (args));
4418 s_return (x); 4587 s_return (x);
4419 } 4588 }
4420 } 4589 }
4421 4590
4422 if (USE_ERROR_CHECKING) abort (); 4591 if (USE_ERROR_CHECKING) abort ();
4423} 4592}
4424 4593
4425INTERFACE int 4594/* relational ops */
4426is_list (SCHEME_P_ pointer a) 4595ecb_hot static int
4427{
4428 return list_length (SCHEME_A_ a) >= 0;
4429}
4430
4431/* Result is:
4432 proper list: length
4433 circular list: -1
4434 not even a pair: -2
4435 dotted list: -2 minus length before dot
4436*/
4437INTERFACE int
4438list_length (SCHEME_P_ pointer a)
4439{
4440 int i = 0;
4441 pointer slow, fast;
4442
4443 slow = fast = a;
4444
4445 while (1)
4446 {
4447 if (fast == NIL)
4448 return i;
4449
4450 if (!is_pair (fast))
4451 return -2 - i;
4452
4453 fast = cdr (fast);
4454 ++i;
4455
4456 if (fast == NIL)
4457 return i;
4458
4459 if (!is_pair (fast))
4460 return -2 - i;
4461
4462 ++i;
4463 fast = cdr (fast);
4464
4465 /* Safe because we would have already returned if `fast'
4466 encountered a non-pair. */
4467 slow = cdr (slow);
4468
4469 if (fast == slow)
4470 {
4471 /* the fast pointer has looped back around and caught up
4472 with the slow pointer, hence the structure is circular,
4473 not of finite length, and therefore not a list */
4474 return -1;
4475 }
4476 }
4477}
4478
4479static int
4480opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4596opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{ 4597{
4482 pointer x = SCHEME_V->args; 4598 pointer x = SCHEME_V->args;
4483 4599
4484 for (;;) 4600 for (;;)
… …
4505 } 4621 }
4506 4622
4507 s_return (S_T); 4623 s_return (S_T);
4508} 4624}
4509 4625
4510static int 4626/* predicates */
4627ecb_hot static int
4511opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4628opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4512{ 4629{
4513 pointer args = SCHEME_V->args; 4630 pointer args = SCHEME_V->args;
4514 pointer a = car (args); 4631 pointer a = car (args);
4515 pointer d = cdr (args); 4632 pointer d = cdr (args);
4516 int r; 4633 int r;
4517 4634
4518 switch (op) 4635 switch (op)
4519 { 4636 {
4520 case OP_NOT: /* not */ r = is_false (a) ; break; 4637 case OP_NOT: /* not */ r = is_false (a) ; break;
4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4638 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4639 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break; 4640 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4641 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4642 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4643 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4644 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4645 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4646 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4647 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530 4648
4531#if USE_CHAR_CLASSIFIERS 4649#if USE_CHAR_CLASSIFIERS
4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4650 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4651 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4652 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4653 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4654 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537#endif 4655#endif
4538 4656
4539#if USE_PORTS 4657#if USE_PORTS
4540 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4658 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4659 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4561 } 4679 }
4562 4680
4563 s_retbool (r); 4681 s_retbool (r);
4564} 4682}
4565 4683
4566static int 4684/* promises, list ops, ports */
4685ecb_hot static int
4567opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4686opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4568{ 4687{
4569 pointer args = SCHEME_V->args; 4688 pointer args = SCHEME_V->args;
4570 pointer a = car (args); 4689 pointer a = car (args);
4571 pointer x, y; 4690 pointer x, y;
… …
4584 } 4703 }
4585 else 4704 else
4586 s_return (SCHEME_V->code); 4705 s_return (SCHEME_V->code);
4587 4706
4588 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4707 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4589 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4708 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4590 s_return (SCHEME_V->value); 4709 s_return (SCHEME_V->value);
4591 4710
4592#if USE_PORTS 4711#if USE_PORTS
4712
4713 case OP_EOF_OBJECT: /* eof-object */
4714 s_return (S_EOF);
4593 4715
4594 case OP_WRITE: /* write */ 4716 case OP_WRITE: /* write */
4595 case OP_DISPLAY: /* display */ 4717 case OP_DISPLAY: /* display */
4596 case OP_WRITE_CHAR: /* write-char */ 4718 case OP_WRITE_CHAR: /* write-char */
4597 if (is_pair (cdr (SCHEME_V->args))) 4719 if (is_pair (cdr (SCHEME_V->args)))
… …
4611 else 4733 else
4612 SCHEME_V->print_flag = 0; 4734 SCHEME_V->print_flag = 0;
4613 4735
4614 s_goto (OP_P0LIST); 4736 s_goto (OP_P0LIST);
4615 4737
4738 //TODO: move to scheme
4616 case OP_NEWLINE: /* newline */ 4739 case OP_NEWLINE: /* newline */
4617 if (is_pair (args)) 4740 if (is_pair (args))
4618 { 4741 {
4619 if (a != SCHEME_V->outport) 4742 if (a != SCHEME_V->outport)
4620 { 4743 {
… …
4622 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4745 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4623 SCHEME_V->outport = a; 4746 SCHEME_V->outport = a;
4624 } 4747 }
4625 } 4748 }
4626 4749
4627 putstr (SCHEME_A_ "\n"); 4750 putcharacter (SCHEME_A_ '\n');
4628 s_return (S_T); 4751 s_return (S_T);
4629#endif 4752#endif
4630 4753
4631 case OP_ERR0: /* error */ 4754 case OP_ERR0: /* error */
4632 SCHEME_V->retcode = -1; 4755 SCHEME_V->retcode = -1;
… …
4641 putstr (SCHEME_A_ strvalue (car (args))); 4764 putstr (SCHEME_A_ strvalue (car (args)));
4642 SCHEME_V->args = cdr (args); 4765 SCHEME_V->args = cdr (args);
4643 s_goto (OP_ERR1); 4766 s_goto (OP_ERR1);
4644 4767
4645 case OP_ERR1: /* error */ 4768 case OP_ERR1: /* error */
4646 putstr (SCHEME_A_ " "); 4769 putcharacter (SCHEME_A_ ' ');
4647 4770
4648 if (args != NIL) 4771 if (args != NIL)
4649 { 4772 {
4650 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4773 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4651 SCHEME_V->args = a; 4774 SCHEME_V->args = a;
4652 SCHEME_V->print_flag = 1; 4775 SCHEME_V->print_flag = 1;
4653 s_goto (OP_P0LIST); 4776 s_goto (OP_P0LIST);
4654 } 4777 }
4655 else 4778 else
4656 { 4779 {
4657 putstr (SCHEME_A_ "\n"); 4780 putcharacter (SCHEME_A_ '\n');
4658 4781
4659 if (SCHEME_V->interactive_repl) 4782 if (SCHEME_V->interactive_repl)
4660 s_goto (OP_T0LVL); 4783 s_goto (OP_T0LVL);
4661 else 4784 else
4662 return -1; 4785 return -1;
… …
4739 SCHEME_V->gc_verbose = (a != S_F); 4862 SCHEME_V->gc_verbose = (a != S_F);
4740 s_retbool (was); 4863 s_retbool (was);
4741 } 4864 }
4742 4865
4743 case OP_NEWSEGMENT: /* new-segment */ 4866 case OP_NEWSEGMENT: /* new-segment */
4867#if 0
4744 if (!is_pair (args) || !is_number (a)) 4868 if (!is_pair (args) || !is_number (a))
4745 Error_0 ("new-segment: argument must be a number"); 4869 Error_0 ("new-segment: argument must be a number");
4746 4870#endif
4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4871 s_retbool (alloc_cellseg (SCHEME_A));
4748
4749 s_return (S_T);
4750 4872
4751 case OP_OBLIST: /* oblist */ 4873 case OP_OBLIST: /* oblist */
4752 s_return (oblist_all_symbols (SCHEME_A)); 4874 s_return (oblist_all_symbols (SCHEME_A));
4753 4875
4754#if USE_PORTS 4876#if USE_PORTS
… …
4824 s_return (p == NIL ? S_F : p); 4946 s_return (p == NIL ? S_F : p);
4825 } 4947 }
4826 4948
4827 case OP_GET_OUTSTRING: /* get-output-string */ 4949 case OP_GET_OUTSTRING: /* get-output-string */
4828 { 4950 {
4829 port *p; 4951 port *p = port (a);
4830 4952
4831 if ((p = a->object.port)->kind & port_string) 4953 if (p->kind & port_string)
4832 { 4954 {
4833 off_t size; 4955 off_t size;
4834 char *str; 4956 char *str;
4835 4957
4836 size = p->rep.string.curr - p->rep.string.start + 1; 4958 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4871 } 4993 }
4872 4994
4873 if (USE_ERROR_CHECKING) abort (); 4995 if (USE_ERROR_CHECKING) abort ();
4874} 4996}
4875 4997
4876static int 4998/* reading */
4999ecb_cold static int
4877opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5000opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4878{ 5001{
4879 pointer args = SCHEME_V->args; 5002 pointer args = SCHEME_V->args;
4880 pointer x; 5003 pointer x;
4881 5004
… …
4941 int res; 5064 int res;
4942 5065
4943 if (is_pair (args)) 5066 if (is_pair (args))
4944 p = car (args); 5067 p = car (args);
4945 5068
4946 res = p->object.port->kind & port_string; 5069 res = port (p)->kind & port_string;
4947 5070
4948 s_retbool (res); 5071 s_retbool (res);
4949 } 5072 }
4950 5073
4951 case OP_SET_INPORT: /* set-input-port */ 5074 case OP_SET_INPORT: /* set-input-port */
… …
5010 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5133 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011 SCHEME_V->tok = token (SCHEME_A); 5134 SCHEME_V->tok = token (SCHEME_A);
5012 s_goto (OP_RDSEXPR); 5135 s_goto (OP_RDSEXPR);
5013 5136
5014 case TOK_ATOM: 5137 case TOK_ATOM:
5015 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5138 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5139
5140 case TOK_DOTATOM:
5141 SCHEME_V->strbuff[0] = '.';
5142 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5143
5144 case TOK_STRATOM:
5145 x = readstrexp (SCHEME_A_ '|');
5146 //TODO: haven't checked whether the garbage collector could interfere
5147 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016 5148
5017 case TOK_DQUOTE: 5149 case TOK_DQUOTE:
5018 x = readstrexp (SCHEME_A); 5150 x = readstrexp (SCHEME_A_ '"');
5019 5151
5020 if (x == S_F) 5152 if (x == S_F)
5021 Error_0 ("Error reading string"); 5153 Error_0 ("Error reading string");
5022 5154
5023 setimmutable (x); 5155 setimmutable (x);
… …
5035 s_goto (OP_EVAL); 5167 s_goto (OP_EVAL);
5036 } 5168 }
5037 } 5169 }
5038 5170
5039 case TOK_SHARP_CONST: 5171 case TOK_SHARP_CONST:
5040 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5172 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041 Error_0 ("undefined sharp expression"); 5173 Error_0 ("undefined sharp expression");
5042 else 5174 else
5043 s_return (x); 5175 s_return (x);
5044 5176
5045 default: 5177 default:
… …
5141 pointer b = cdr (args); 5273 pointer b = cdr (args);
5142 int ok_abbr = ok_abbrev (b); 5274 int ok_abbr = ok_abbrev (b);
5143 SCHEME_V->args = car (b); 5275 SCHEME_V->args = car (b);
5144 5276
5145 if (a == SCHEME_V->QUOTE && ok_abbr) 5277 if (a == SCHEME_V->QUOTE && ok_abbr)
5146 putstr (SCHEME_A_ "'"); 5278 putcharacter (SCHEME_A_ '\'');
5147 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5279 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5148 putstr (SCHEME_A_ "`"); 5280 putcharacter (SCHEME_A_ '`');
5149 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5281 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5150 putstr (SCHEME_A_ ","); 5282 putcharacter (SCHEME_A_ ',');
5151 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5283 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5152 putstr (SCHEME_A_ ",@"); 5284 putstr (SCHEME_A_ ",@");
5153 else 5285 else
5154 { 5286 {
5155 putstr (SCHEME_A_ "("); 5287 putcharacter (SCHEME_A_ '(');
5156 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5288 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5157 SCHEME_V->args = a; 5289 SCHEME_V->args = a;
5158 } 5290 }
5159 5291
5160 s_goto (OP_P0LIST); 5292 s_goto (OP_P0LIST);
… …
5162 5294
5163 case OP_P1LIST: 5295 case OP_P1LIST:
5164 if (is_pair (args)) 5296 if (is_pair (args))
5165 { 5297 {
5166 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5298 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5167 putstr (SCHEME_A_ " "); 5299 putcharacter (SCHEME_A_ ' ');
5168 SCHEME_V->args = car (args); 5300 SCHEME_V->args = car (args);
5169 s_goto (OP_P0LIST); 5301 s_goto (OP_P0LIST);
5170 } 5302 }
5171 else if (is_vector (args)) 5303 else if (is_vector (args))
5172 { 5304 {
… …
5180 { 5312 {
5181 putstr (SCHEME_A_ " . "); 5313 putstr (SCHEME_A_ " . ");
5182 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5314 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5183 } 5315 }
5184 5316
5185 putstr (SCHEME_A_ ")"); 5317 putcharacter (SCHEME_A_ ')');
5186 s_return (S_T); 5318 s_return (S_T);
5187 } 5319 }
5188 5320
5189 case OP_PVECFROM: 5321 case OP_PVECFROM:
5190 { 5322 {
… …
5192 pointer vec = car (args); 5324 pointer vec = car (args);
5193 int len = veclength (vec); 5325 int len = veclength (vec);
5194 5326
5195 if (i == len) 5327 if (i == len)
5196 { 5328 {
5197 putstr (SCHEME_A_ ")"); 5329 putcharacter (SCHEME_A_ ')');
5198 s_return (S_T); 5330 s_return (S_T);
5199 } 5331 }
5200 else 5332 else
5201 { 5333 {
5202 pointer elem = vector_elem (vec, i); 5334 pointer elem = vector_get (vec, i);
5203 5335
5204 ivalue_unchecked (cdr (args)) = i + 1; 5336 ivalue_unchecked (cdr (args)) = i + 1;
5205 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5337 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206 SCHEME_V->args = elem; 5338 SCHEME_V->args = elem;
5207 5339
5208 if (i > 0) 5340 if (i > 0)
5209 putstr (SCHEME_A_ " "); 5341 putcharacter (SCHEME_A_ ' ');
5210 5342
5211 s_goto (OP_P0LIST); 5343 s_goto (OP_P0LIST);
5212 } 5344 }
5213 } 5345 }
5214 } 5346 }
5215 5347
5216 if (USE_ERROR_CHECKING) abort (); 5348 if (USE_ERROR_CHECKING) abort ();
5217} 5349}
5218 5350
5219static int 5351/* list ops */
5352ecb_hot static int
5220opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5353opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5221{ 5354{
5222 pointer args = SCHEME_V->args; 5355 pointer args = SCHEME_V->args;
5223 pointer a = car (args); 5356 pointer a = car (args);
5224 pointer x, y; 5357 pointer x, y;
… …
5267 5400
5268 case OP_CLOSUREP: /* closure? */ 5401 case OP_CLOSUREP: /* closure? */
5269 /* 5402 /*
5270 * Note, macro object is also a closure. 5403 * Note, macro object is also a closure.
5271 * Therefore, (closure? <#MACRO>) ==> #t 5404 * Therefore, (closure? <#MACRO>) ==> #t
5405 * (schmorp) well, obviously not, fix? TODO
5272 */ 5406 */
5273 s_retbool (is_closure (a)); 5407 s_retbool (is_closure (a));
5274 5408
5275 case OP_MACROP: /* macro? */ 5409 case OP_MACROP: /* macro? */
5276 s_retbool (is_macro (a)); 5410 s_retbool (is_macro (a));
… …
5281 5415
5282/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5416/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5283typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5417typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284 5418
5285typedef int (*test_predicate)(pointer); 5419typedef int (*test_predicate)(pointer);
5286static int 5420
5421ecb_hot static int
5287is_any (pointer p) 5422tst_any (pointer p)
5288{ 5423{
5289 return 1; 5424 return 1;
5290} 5425}
5291 5426
5292static int 5427ecb_hot static int
5293is_nonneg (pointer p) 5428tst_inonneg (pointer p)
5294{ 5429{
5295 return ivalue (p) >= 0 && is_integer (p); 5430 return is_integer (p) && ivalue_unchecked (p) >= 0;
5296} 5431}
5297 5432
5298static int 5433ecb_hot static int
5299tst_is_list (pointer p) 5434tst_is_list (SCHEME_P_ pointer p)
5300{ 5435{
5301 return p == NIL || is_pair (p); 5436 return p == NIL || is_pair (p);
5302} 5437}
5303 5438
5304/* Correspond carefully with following defines! */ 5439/* Correspond carefully with following defines! */
5305static struct 5440static struct
5306{ 5441{
5307 test_predicate fct; 5442 test_predicate fct;
5308 const char *kind; 5443 const char *kind;
5309} tests[] = 5444} tests[] = {
5310{
5311 { is_any, 0 }, 5445 { tst_any , 0 },
5312 { is_string, "string" }, 5446 { is_string , "string" },
5313 { is_symbol, "symbol" }, 5447 { is_symbol , "symbol" },
5314 { is_port, "port" }, 5448 { is_port , "port" },
5315 { is_inport, "input port" }, 5449 { is_inport , "input port" },
5316 { is_outport, "output port" }, 5450 { is_outport , "output port" },
5317 { is_environment, "environment" }, 5451 { is_environment, "environment" },
5318 { is_pair, "pair" }, 5452 { is_pair , "pair" },
5319 { tst_is_list, "pair or '()" }, 5453 { 0 , "pair or '()" },
5320 { is_character, "character" }, 5454 { is_character , "character" },
5321 { is_vector, "vector" }, 5455 { is_vector , "vector" },
5322 { is_number, "number" }, 5456 { is_number , "number" },
5323 { is_integer, "integer" }, 5457 { is_integer , "integer" },
5324 { is_nonneg, "non-negative integer" } 5458 { tst_inonneg , "non-negative integer" }
5325}; 5459};
5326 5460
5327#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5461#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328#define TST_ANY "\001" 5462#define TST_ANY "\001"
5329#define TST_STRING "\002" 5463#define TST_STRING "\002"
… …
5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5481#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5348#include "opdefines.h" 5482#include "opdefines.h"
5349#undef OP_DEF 5483#undef OP_DEF
5350; 5484;
5351 5485
5352static const char * 5486ecb_cold static const char *
5353opname (int idx) 5487opname (int idx)
5354{ 5488{
5355 const char *name = opnames; 5489 const char *name = opnames;
5356 5490
5357 /* should do this at compile time, but would require external program, right? */ 5491 /* should do this at compile time, but would require external program, right? */
… …
5359 name += strlen (name) + 1; 5493 name += strlen (name) + 1;
5360 5494
5361 return *name ? name : "ILLEGAL"; 5495 return *name ? name : "ILLEGAL";
5362} 5496}
5363 5497
5364static const char * 5498ecb_cold static const char *
5365procname (pointer x) 5499procname (pointer x)
5366{ 5500{
5367 return opname (procnum (x)); 5501 return opname (procnum (x));
5368} 5502}
5369 5503
5370typedef struct 5504typedef struct
5371{ 5505{
5372 uint8_t func; 5506 uint8_t func;
5373 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5507 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374 uint8_t builtin; 5508 uint8_t builtin;
5509#if USE_ERROR_CHECKING
5375 uint8_t min_arity; 5510 uint8_t min_arity;
5376 uint8_t max_arity; 5511 uint8_t max_arity;
5377 char arg_tests_encoding[3]; 5512 char arg_tests_encoding[3];
5513#endif
5378} op_code_info; 5514} op_code_info;
5379 5515
5380static const op_code_info dispatch_table[] = { 5516static const op_code_info dispatch_table[] = {
5517#if USE_ERROR_CHECKING
5381#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5518#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5519#else
5520#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5521#endif
5382#include "opdefines.h" 5522#include "opdefines.h"
5383#undef OP_DEF 5523#undef OP_DEF
5384 {0} 5524 {0}
5385}; 5525};
5386 5526
5387/* kernel of this interpreter */ 5527/* kernel of this interpreter */
5388static void ecb_hot 5528ecb_hot static void
5389Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5529Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5390{ 5530{
5391 SCHEME_V->op = op; 5531 SCHEME_V->op = op;
5392 5532
5393 for (;;) 5533 for (;;)
… …
5428 { 5568 {
5429 pointer arg = car (arglist); 5569 pointer arg = car (arglist);
5430 5570
5431 j = t[0]; 5571 j = t[0];
5432 5572
5573 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5574 if (j == TST_LIST[0])
5575 {
5576 if (!tst_is_list (SCHEME_A_ arg))
5577 break;
5578 }
5579 else
5580 {
5433 if (!tests[j - 1].fct (arg)) 5581 if (!tests[j - 1].fct (arg))
5434 break; 5582 break;
5583 }
5435 5584
5436 if (t[1]) /* last test is replicated as necessary */ 5585 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437 t++; 5586 t++;
5438 5587
5439 arglist = cdr (arglist); 5588 arglist = cdr (arglist);
5440 i++; 5589 i++;
5441 } 5590 }
… …
5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5616 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5468 return; 5617 return;
5469 5618
5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5619 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5471 { 5620 {
5472 xwrstr ("No memory!\n"); 5621 putstr (SCHEME_A_ "No memory!\n");
5473 return; 5622 return;
5474 } 5623 }
5475 } 5624 }
5476} 5625}
5477 5626
5478/* ========== Initialization of internal keywords ========== */ 5627/* ========== Initialization of internal keywords ========== */
5479 5628
5480static void 5629ecb_cold static void
5481assign_syntax (SCHEME_P_ const char *name) 5630assign_syntax (SCHEME_P_ const char *name)
5482{ 5631{
5483 pointer x = oblist_add_by_name (SCHEME_A_ name); 5632 pointer x = oblist_add_by_name (SCHEME_A_ name);
5484 set_typeflag (x, typeflag (x) | T_SYNTAX); 5633 set_typeflag (x, typeflag (x) | T_SYNTAX);
5485} 5634}
5486 5635
5487static void 5636ecb_cold static void
5488assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5637assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5489{ 5638{
5490 pointer x = mk_symbol (SCHEME_A_ name); 5639 pointer x = mk_symbol (SCHEME_A_ name);
5491 pointer y = mk_proc (SCHEME_A_ op); 5640 pointer y = mk_proc (SCHEME_A_ op);
5492 new_slot_in_env (SCHEME_A_ x, y); 5641 new_slot_in_env (SCHEME_A_ x, y);
… …
5496mk_proc (SCHEME_P_ enum scheme_opcodes op) 5645mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497{ 5646{
5498 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5647 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499 set_typeflag (y, (T_PROC | T_ATOM)); 5648 set_typeflag (y, (T_PROC | T_ATOM));
5500 ivalue_unchecked (y) = op; 5649 ivalue_unchecked (y) = op;
5501 set_num_integer (y);
5502 return y; 5650 return y;
5503} 5651}
5504 5652
5505/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5653/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5506static int 5654ecb_hot static int
5507syntaxnum (pointer p) 5655syntaxnum (pointer p)
5508{ 5656{
5509 const char *s = strvalue (car (p)); 5657 const char *s = strvalue (p);
5510 5658
5511 switch (strlength (car (p))) 5659 switch (strlength (p))
5512 { 5660 {
5513 case 2: 5661 case 2:
5514 if (s[0] == 'i') 5662 if (s[0] == 'i')
5515 return OP_IF0; /* if */ 5663 return OP_IF0; /* if */
5516 else 5664 else
… …
5591ecb_cold int 5739ecb_cold int
5592scheme_init (SCHEME_P) 5740scheme_init (SCHEME_P)
5593{ 5741{
5594 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5742 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5595 pointer x; 5743 pointer x;
5744
5745 /* this memset is not strictly correct, as we assume (intcache)
5746 * that memset 0 will also set pointers to 0, but memset does
5747 * of course not guarantee that. screw such systems.
5748 */
5749 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5596 5750
5597 num_set_fixnum (num_zero, 1); 5751 num_set_fixnum (num_zero, 1);
5598 num_set_ivalue (num_zero, 0); 5752 num_set_ivalue (num_zero, 0);
5599 num_set_fixnum (num_one, 1); 5753 num_set_fixnum (num_one, 1);
5600 num_set_ivalue (num_one, 1); 5754 num_set_ivalue (num_one, 1);
… …
5612 SCHEME_V->save_inport = NIL; 5766 SCHEME_V->save_inport = NIL;
5613 SCHEME_V->loadport = NIL; 5767 SCHEME_V->loadport = NIL;
5614 SCHEME_V->nesting = 0; 5768 SCHEME_V->nesting = 0;
5615 SCHEME_V->interactive_repl = 0; 5769 SCHEME_V->interactive_repl = 0;
5616 5770
5617 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5771 if (!alloc_cellseg (SCHEME_A))
5618 { 5772 {
5619#if USE_ERROR_CHECKING 5773#if USE_ERROR_CHECKING
5620 SCHEME_V->no_memory = 1; 5774 SCHEME_V->no_memory = 1;
5621 return 0; 5775 return 0;
5622#endif 5776#endif
5623 } 5777 }
5624 5778
5625 SCHEME_V->gc_verbose = 0; 5779 SCHEME_V->gc_verbose = 0;
5626 dump_stack_initialize (SCHEME_A); 5780 dump_stack_initialize (SCHEME_A);
5627 SCHEME_V->code = NIL; 5781 SCHEME_V->code = NIL;
5628 SCHEME_V->args = NIL; 5782 SCHEME_V->args = NIL;
5629 SCHEME_V->envir = NIL; 5783 SCHEME_V->envir = NIL;
5784 SCHEME_V->value = NIL;
5630 SCHEME_V->tracing = 0; 5785 SCHEME_V->tracing = 0;
5631 5786
5632 /* init NIL */ 5787 /* init NIL */
5633 set_typeflag (NIL, T_ATOM | T_MARK); 5788 set_typeflag (NIL, T_ATOM | T_MARK);
5634 set_car (NIL, NIL); 5789 set_car (NIL, NIL);
… …
5690 5845
5691 return !SCHEME_V->no_memory; 5846 return !SCHEME_V->no_memory;
5692} 5847}
5693 5848
5694#if USE_PORTS 5849#if USE_PORTS
5695void 5850ecb_cold void
5696scheme_set_input_port_file (SCHEME_P_ int fin) 5851scheme_set_input_port_file (SCHEME_P_ int fin)
5697{ 5852{
5698 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5853 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5699} 5854}
5700 5855
5701void 5856ecb_cold void
5702scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5857scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5703{ 5858{
5704 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5859 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5705} 5860}
5706 5861
5707void 5862ecb_cold void
5708scheme_set_output_port_file (SCHEME_P_ int fout) 5863scheme_set_output_port_file (SCHEME_P_ int fout)
5709{ 5864{
5710 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5865 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5711} 5866}
5712 5867
5713void 5868ecb_cold void
5714scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5869scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5715{ 5870{
5716 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5871 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5717} 5872}
5718#endif 5873#endif
5719 5874
5720void 5875ecb_cold void
5721scheme_set_external_data (SCHEME_P_ void *p) 5876scheme_set_external_data (SCHEME_P_ void *p)
5722{ 5877{
5723 SCHEME_V->ext_data = p; 5878 SCHEME_V->ext_data = p;
5724} 5879}
5725 5880
… …
5773 } 5928 }
5774 } 5929 }
5775#endif 5930#endif
5776} 5931}
5777 5932
5778void 5933ecb_cold void
5779scheme_load_file (SCHEME_P_ int fin) 5934scheme_load_file (SCHEME_P_ int fin)
5780{ 5935{
5781 scheme_load_named_file (SCHEME_A_ fin, 0); 5936 scheme_load_named_file (SCHEME_A_ fin, 0);
5782} 5937}
5783 5938
5784void 5939ecb_cold void
5785scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5940scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5786{ 5941{
5787 dump_stack_reset (SCHEME_A); 5942 dump_stack_reset (SCHEME_A);
5788 SCHEME_V->envir = SCHEME_V->global_env; 5943 SCHEME_V->envir = SCHEME_V->global_env;
5789 SCHEME_V->file_i = 0; 5944 SCHEME_V->file_i = 0;
5790 SCHEME_V->load_stack[0].unget = -1; 5945 SCHEME_V->load_stack[0].unget = -1;
5791 SCHEME_V->load_stack[0].kind = port_input | port_file; 5946 SCHEME_V->load_stack[0].kind = port_input | port_file;
5792 SCHEME_V->load_stack[0].rep.stdio.file = fin; 5947 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5793#if USE_PORTS
5794 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5948 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5795#endif
5796 SCHEME_V->retcode = 0; 5949 SCHEME_V->retcode = 0;
5797 5950
5798#if USE_PORTS
5799 if (fin == STDIN_FILENO) 5951 if (fin == STDIN_FILENO)
5800 SCHEME_V->interactive_repl = 1; 5952 SCHEME_V->interactive_repl = 1;
5801#endif
5802 5953
5803#if USE_PORTS 5954#if USE_PORTS
5804#if SHOW_ERROR_LINE 5955#if SHOW_ERROR_LINE
5805 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 5956 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5806 5957
… …
5810#endif 5961#endif
5811 5962
5812 SCHEME_V->inport = SCHEME_V->loadport; 5963 SCHEME_V->inport = SCHEME_V->loadport;
5813 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5964 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5814 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5965 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5966
5815 set_typeflag (SCHEME_V->loadport, T_ATOM); 5967 set_typeflag (SCHEME_V->loadport, T_ATOM);
5816 5968
5817 if (SCHEME_V->retcode == 0) 5969 if (SCHEME_V->retcode == 0)
5818 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5970 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5819} 5971}
5820 5972
5821void 5973ecb_cold void
5822scheme_load_string (SCHEME_P_ const char *cmd) 5974scheme_load_string (SCHEME_P_ const char *cmd)
5823{ 5975{
5976#if USE_PORTs
5824 dump_stack_reset (SCHEME_A); 5977 dump_stack_reset (SCHEME_A);
5825 SCHEME_V->envir = SCHEME_V->global_env; 5978 SCHEME_V->envir = SCHEME_V->global_env;
5826 SCHEME_V->file_i = 0; 5979 SCHEME_V->file_i = 0;
5827 SCHEME_V->load_stack[0].kind = port_input | port_string; 5980 SCHEME_V->load_stack[0].kind = port_input | port_string;
5828 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 5981 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5829 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 5982 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5830 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 5983 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5831#if USE_PORTS
5832 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5984 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5833#endif
5834 SCHEME_V->retcode = 0; 5985 SCHEME_V->retcode = 0;
5835 SCHEME_V->interactive_repl = 0; 5986 SCHEME_V->interactive_repl = 0;
5836 SCHEME_V->inport = SCHEME_V->loadport; 5987 SCHEME_V->inport = SCHEME_V->loadport;
5837 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5988 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5838 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5989 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5839 set_typeflag (SCHEME_V->loadport, T_ATOM); 5990 set_typeflag (SCHEME_V->loadport, T_ATOM);
5840 5991
5841 if (SCHEME_V->retcode == 0) 5992 if (SCHEME_V->retcode == 0)
5842 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5993 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5994#else
5995 abort ();
5996#endif
5843} 5997}
5844 5998
5845void 5999ecb_cold void
5846scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6000scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5847{ 6001{
5848 pointer x; 6002 pointer x;
5849 6003
5850 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6004 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5855 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6009 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5856} 6010}
5857 6011
5858#if !STANDALONE 6012#if !STANDALONE
5859 6013
5860void 6014ecb_cold void
5861scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6015scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5862{ 6016{
5863 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6017 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5864} 6018}
5865 6019
5866void 6020ecb_cold void
5867scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6021scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5868{ 6022{
5869 int i; 6023 int i;
5870 6024
5871 for (i = 0; i < count; i++) 6025 for (i = 0; i < count; i++)
5872 scheme_register_foreign_func (SCHEME_A_ list + i); 6026 scheme_register_foreign_func (SCHEME_A_ list + i);
5873} 6027}
5874 6028
5875pointer 6029ecb_cold pointer
5876scheme_apply0 (SCHEME_P_ const char *procname) 6030scheme_apply0 (SCHEME_P_ const char *procname)
5877{ 6031{
5878 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6032 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5879} 6033}
5880 6034
5881void 6035ecb_cold void
5882save_from_C_call (SCHEME_P) 6036save_from_C_call (SCHEME_P)
5883{ 6037{
5884 pointer saved_data = cons (car (S_SINK), 6038 pointer saved_data = cons (car (S_SINK),
5885 cons (SCHEME_V->envir, 6039 cons (SCHEME_V->envir,
5886 SCHEME_V->dump)); 6040 SCHEME_V->dump));
… …
5890 /* Truncate the dump stack so TS will return here when done, not 6044 /* Truncate the dump stack so TS will return here when done, not
5891 directly resume pre-C-call operations. */ 6045 directly resume pre-C-call operations. */
5892 dump_stack_reset (SCHEME_A); 6046 dump_stack_reset (SCHEME_A);
5893} 6047}
5894 6048
5895void 6049ecb_cold void
5896restore_from_C_call (SCHEME_P) 6050restore_from_C_call (SCHEME_P)
5897{ 6051{
5898 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6052 set_car (S_SINK, caar (SCHEME_V->c_nest));
5899 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6053 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5900 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6054 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5901 /* Pop */ 6055 /* Pop */
5902 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6056 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5903} 6057}
5904 6058
5905/* "func" and "args" are assumed to be already eval'ed. */ 6059/* "func" and "args" are assumed to be already eval'ed. */
5906pointer 6060ecb_cold pointer
5907scheme_call (SCHEME_P_ pointer func, pointer args) 6061scheme_call (SCHEME_P_ pointer func, pointer args)
5908{ 6062{
5909 int old_repl = SCHEME_V->interactive_repl; 6063 int old_repl = SCHEME_V->interactive_repl;
5910 6064
5911 SCHEME_V->interactive_repl = 0; 6065 SCHEME_V->interactive_repl = 0;
… …
5918 SCHEME_V->interactive_repl = old_repl; 6072 SCHEME_V->interactive_repl = old_repl;
5919 restore_from_C_call (SCHEME_A); 6073 restore_from_C_call (SCHEME_A);
5920 return SCHEME_V->value; 6074 return SCHEME_V->value;
5921} 6075}
5922 6076
5923pointer 6077ecb_cold pointer
5924scheme_eval (SCHEME_P_ pointer obj) 6078scheme_eval (SCHEME_P_ pointer obj)
5925{ 6079{
5926 int old_repl = SCHEME_V->interactive_repl; 6080 int old_repl = SCHEME_V->interactive_repl;
5927 6081
5928 SCHEME_V->interactive_repl = 0; 6082 SCHEME_V->interactive_repl = 0;
… …
5940 6094
5941/* ========== Main ========== */ 6095/* ========== Main ========== */
5942 6096
5943#if STANDALONE 6097#if STANDALONE
5944 6098
5945int 6099ecb_cold int
5946main (int argc, char **argv) 6100main (int argc, char **argv)
5947{ 6101{
5948# if USE_MULTIPLICITY 6102# if USE_MULTIPLICITY
5949 scheme ssc; 6103 scheme ssc;
5950 scheme *const SCHEME_V = &ssc; 6104 scheme *const SCHEME_V = &ssc;
… …
5952# endif 6106# endif
5953 int fin; 6107 int fin;
5954 char *file_name = InitFile; 6108 char *file_name = InitFile;
5955 int retcode; 6109 int retcode;
5956 int isfile = 1; 6110 int isfile = 1;
6111 system ("ps v $PPID");//D
5957 6112
5958 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6113 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959 { 6114 {
5960 xwrstr ("Usage: tinyscheme -?\n"); 6115 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5961 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6116 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5962 xwrstr ("followed by\n"); 6117 putstr (SCHEME_A_ "followed by\n");
5963 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6118 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5964 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6119 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5965 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6120 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5966 xwrstr ("Use - as filename for stdin.\n"); 6121 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5967 return 1; 6122 return 1;
5968 } 6123 }
5969 6124
5970 if (!scheme_init (SCHEME_A)) 6125 if (!scheme_init (SCHEME_A))
5971 { 6126 {
5972 xwrstr ("Could not initialize!\n"); 6127 putstr (SCHEME_A_ "Could not initialize!\n");
5973 return 2; 6128 return 2;
5974 } 6129 }
5975 6130
5976# if USE_PORTS 6131# if USE_PORTS
5977 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6132 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5990 } 6145 }
5991#endif 6146#endif
5992 6147
5993 do 6148 do
5994 { 6149 {
5995#if USE_PORTS
5996 if (strcmp (file_name, "-") == 0) 6150 if (strcmp (file_name, "-") == 0)
5997 fin = STDIN_FILENO; 6151 fin = STDIN_FILENO;
5998 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6152 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5999 { 6153 {
6000 pointer args = NIL; 6154 pointer args = NIL;
… …
6018 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6172 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6019 6173
6020 } 6174 }
6021 else 6175 else
6022 fin = open (file_name, O_RDONLY); 6176 fin = open (file_name, O_RDONLY);
6023#endif
6024 6177
6025 if (isfile && fin < 0) 6178 if (isfile && fin < 0)
6026 { 6179 {
6027 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6180 putstr (SCHEME_A_ "Could not open file ");
6181 putstr (SCHEME_A_ file_name);
6182 putcharacter (SCHEME_A_ '\n');
6028 } 6183 }
6029 else 6184 else
6030 { 6185 {
6031 if (isfile) 6186 if (isfile)
6032 scheme_load_named_file (SCHEME_A_ fin, file_name); 6187 scheme_load_named_file (SCHEME_A_ fin, file_name);
6033 else 6188 else
6034 scheme_load_string (SCHEME_A_ file_name); 6189 scheme_load_string (SCHEME_A_ file_name);
6035 6190
6036#if USE_PORTS
6037 if (!isfile || fin != STDIN_FILENO) 6191 if (!isfile || fin != STDIN_FILENO)
6038 { 6192 {
6039 if (SCHEME_V->retcode != 0) 6193 if (SCHEME_V->retcode != 0)
6040 { 6194 {
6041 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6195 putstr (SCHEME_A_ "Errors encountered reading ");
6196 putstr (SCHEME_A_ file_name);
6197 putcharacter (SCHEME_A_ '\n');
6042 } 6198 }
6043 6199
6044 if (isfile) 6200 if (isfile)
6045 close (fin); 6201 close (fin);
6046 } 6202 }
6047#endif
6048 } 6203 }
6049 6204
6050 file_name = *argv++; 6205 file_name = *argv++;
6051 } 6206 }
6052 while (file_name != 0); 6207 while (file_name != 0);

Diff Legend

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