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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.64 by root, Wed Dec 2 17:01:18 2015 UTC

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

Diff Legend

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