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.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.63 by root, Wed Dec 2 12:16:24 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
11 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
12 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
13 * 18 *
14 */ 19 */
15 20
16#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _GNU_SOURCE 1
17#include "malloc.c" 22#define _POSIX_C_SOURCE 200201
23#define _XOPEN_SOURCE 600
24
18 25
19#define SCHEME_SOURCE 26#define SCHEME_SOURCE
20#include "scheme-private.h" 27#include "scheme-private.h"
21#ifndef WIN32 28#ifndef WIN32
22# include <unistd.h> 29# include <unistd.h>
23#endif 30#endif
24#if USE_MATH 31#if USE_MATH
25# include <math.h> 32# include <math.h>
26#endif 33#endif
27 34
35#define ECB_NO_THREADS 1
36#include "ecb.h"
37
28#include <sys/types.h> 38#include <sys/types.h>
29#include <sys/stat.h> 39#include <sys/stat.h>
30#include <fcntl.h> 40#include <fcntl.h>
31 41
42#if !USE_ERROR_CHECKING
43# define NDEBUG
44#endif
45
46#include <assert.h>
47#include <stdlib.h>
32#include <string.h> 48#include <string.h>
33#include <stdlib.h>
34 49
35#include <limits.h> 50#include <limits.h>
36#include <inttypes.h> 51#include <inttypes.h>
37#include <float.h> 52#include <float.h>
38//#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
39 69
40enum { 70enum {
41 TOK_EOF, 71 TOK_EOF,
42 TOK_LPAREN, 72 TOK_LPAREN,
43 TOK_RPAREN, 73 TOK_RPAREN,
44 TOK_DOT, 74 TOK_DOT,
45 TOK_ATOM, 75 TOK_ATOM,
76 TOK_DOTATOM, /* atom name starting with '.' */
77 TOK_STRATOM, /* atom name enclosed in | */
46 TOK_QUOTE, 78 TOK_QUOTE,
47 TOK_DQUOTE, 79 TOK_DQUOTE,
48 TOK_BQUOTE, 80 TOK_BQUOTE,
49 TOK_COMMA, 81 TOK_COMMA,
50 TOK_ATMARK, 82 TOK_ATMARK,
… …
52 TOK_SHARP_CONST, 84 TOK_SHARP_CONST,
53 TOK_VEC 85 TOK_VEC
54}; 86};
55 87
56#define BACKQUOTE '`' 88#define BACKQUOTE '`'
57#define DELIMITERS "()\";\f\t\v\n\r " 89#define WHITESPACE " \t\r\n\v\f"
90#define DELIMITERS "()\";" WHITESPACE
58 91
59#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 92#define NIL POINTER (&SCHEME_V->xNIL)
60#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 93#define S_T POINTER (&SCHEME_V->xT)
61#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 94#define S_F POINTER (&SCHEME_V->xF)
62#define S_SINK (&SCHEME_V->xsink) 95#define S_SINK POINTER (&SCHEME_V->xsink)
63#define S_EOF (&SCHEME_V->xEOF_OBJ) 96#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
64 97
65#if !USE_MULTIPLICITY 98#if !USE_MULTIPLICITY
66static scheme sc; 99static scheme sc;
67#endif 100#endif
68 101
69static void 102ecb_cold static void
70xbase (char *s, long n, int base) 103xbase (char *s, long n, int base)
71{ 104{
72 if (n < 0) 105 if (n < 0)
73 { 106 {
74 *s++ = '-'; 107 *s++ = '-';
… …
76 } 109 }
77 110
78 char *p = s; 111 char *p = s;
79 112
80 do { 113 do {
81 *p++ = '0' + n % base; 114 *p++ = "0123456789abcdef"[n % base];
82 n /= base; 115 n /= base;
83 } while (n); 116 } while (n);
84 117
85 *p-- = 0; 118 *p-- = 0;
86 119
… …
89 char x = *s; *s = *p; *p = x; 122 char x = *s; *s = *p; *p = x;
90 --p; ++s; 123 --p; ++s;
91 } 124 }
92} 125}
93 126
94static void 127ecb_cold static void
95xnum (char *s, long n) 128xnum (char *s, long n)
96{ 129{
97 xbase (s, n, 10); 130 xbase (s, n, 10);
98} 131}
99 132
100static void 133ecb_cold static void
101xwrstr (const char *s) 134putnum (SCHEME_P_ long n)
102{
103 write (1, s, strlen (s));
104}
105
106static void
107xwrnum (long n)
108{ 135{
109 char buf[64]; 136 char buf[64];
110 137
111 xnum (buf, n); 138 xnum (buf, n);
112 xwrstr (buf); 139 putstr (SCHEME_A_ buf);
113} 140}
141
142#if USE_CHAR_CLASSIFIERS
143#include <ctype.h>
144#else
114 145
115static char 146static char
116xtoupper (char c) 147xtoupper (char c)
117{ 148{
118 if (c >= 'a' && c <= 'z') 149 if (c >= 'a' && c <= 'z')
… …
128 c += 'a' - 'A'; 159 c += 'a' - 'A';
129 160
130 return c; 161 return c;
131} 162}
132 163
133#if USE_STRLWR 164static int
165xisdigit (char c)
166{
167 return c >= '0' && c <= '9';
168}
169
170#define toupper(c) xtoupper (c)
171#define tolower(c) xtolower (c)
172#define isdigit(c) xisdigit (c)
173
174#endif
175
176#if USE_IGNORECASE
134static const char * 177ecb_cold static const char *
135strlwr (char *s) 178xstrlwr (char *s)
136{ 179{
137 const char *p = s; 180 const char *p = s;
138 181
139 while (*s) 182 while (*s)
140 { 183 {
… …
142 s++; 185 s++;
143 } 186 }
144 187
145 return p; 188 return p;
146} 189}
147#endif
148 190
191#define stricmp(a,b) strcasecmp (a, b)
192#define strlwr(s) xstrlwr (s)
193
194#else
149#define stricmp(a,b) strcmp (a, b) 195# define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 196# define strlwr(s) (s)
151#define toupper(c) xtoupper(c) 197#endif
152#define tolower(c) xtolower(c)
153 198
154#ifndef prompt 199#ifndef prompt
155# define prompt "ts> " 200# define prompt "ms> "
156#endif 201#endif
157 202
158#ifndef InitFile 203#ifndef InitFile
159# define InitFile "init.scm" 204# define InitFile "init.scm"
160#endif 205#endif
161 206
162#ifndef FIRST_CELLSEGS
163# define FIRST_CELLSEGS 3
164#endif
165
166enum scheme_types 207enum scheme_types
167{ 208{
209 T_INTEGER,
210 T_CHARACTER,
168 T_FREE, 211 T_REAL,
169 T_STRING, 212 T_STRING,
170 T_NUMBER,
171 T_SYMBOL, 213 T_SYMBOL,
172 T_PROC, 214 T_PROC,
173 T_PAIR, 215 T_PAIR, /* also used for free cells */
174 T_CLOSURE, 216 T_CLOSURE,
217 T_BYTECODE, // temp
218 T_MACRO,
175 T_CONTINUATION, 219 T_CONTINUATION,
176 T_FOREIGN, 220 T_FOREIGN,
177 T_CHARACTER,
178 T_PORT, 221 T_PORT,
179 T_VECTOR, 222 T_VECTOR,
180 T_MACRO,
181 T_PROMISE, 223 T_PROMISE,
182 T_ENVIRONMENT, 224 T_ENVIRONMENT,
183 /* one more... */ 225
184 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
185}; 227};
186 228
187#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x000f
188#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 233#define T_MARK 0x0080 /* only for gc */
192 234
193static num num_add (num a, num b); 235/* num, for generic arithmetic */
194static num num_mul (num a, num b); 236struct num
195static num num_div (num a, num b); 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
261enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
262
263static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 265static num num_rem (num a, num b);
199static num num_mod (num a, num b); 266static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 267
206#if USE_MATH
207static double round_per_R5RS (double x);
208#endif
209static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
210
211static INLINE int
212num_is_integer (pointer p)
213{
214 return num_is_fixnum (p->object.number);
215}
216 269
217static num num_zero; 270static num num_zero;
218static num num_one; 271static num num_one;
219 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
220/* macros for cell operations */ 277/* macros for cell operations */
221#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
222#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
223#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
224 281
225INTERFACE INLINE int 282INTERFACE int
226is_string (pointer p) 283is_string (pointer p)
227{ 284{
228 return type (p) == T_STRING; 285 return type (p) == T_STRING;
229} 286}
230 287
231#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
232#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
233 290
234INTERFACE int is_list (SCHEME_P_ pointer p);
235INTERFACE INLINE int 291INTERFACE int
236is_vector (pointer p) 292is_vector (pointer p)
237{ 293{
238 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
239} 295}
240 296
297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
298#define veclength(p) (CELL(p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
242INTERFACE uint32_t vector_length (pointer vec);
243INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
244INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
245 302
246INTERFACE uint32_t 303INTERFACE int
247vector_length (pointer vec) 304is_integer (pointer p)
248{ 305{
249 return vec->object.vector.length; 306 return type (p) == T_INTEGER;
250} 307}
251 308
309/* not the same as in scheme, where integers are (correctly :) reals */
252INTERFACE INLINE int 310INTERFACE int
311is_real (pointer p)
312{
313 return type (p) == T_REAL;
314}
315
316INTERFACE int
253is_number (pointer p) 317is_number (pointer p)
254{ 318{
255 return type (p) == T_NUMBER; 319 return is_integer (p) || is_real (p);
256} 320}
257 321
258INTERFACE INLINE int 322INTERFACE int
259is_integer (pointer p)
260{
261 if (!is_number (p))
262 return 0;
263
264 if (num_is_integer (p) || ivalue (p) == rvalue (p))
265 return 1;
266
267 return 0;
268}
269
270INTERFACE INLINE int
271is_real (pointer p)
272{
273 return is_number (p) && !num_is_fixnum (p->object.number);
274}
275
276INTERFACE INLINE int
277is_character (pointer p) 323is_character (pointer p)
278{ 324{
279 return type (p) == T_CHARACTER; 325 return type (p) == T_CHARACTER;
280} 326}
281 327
282INTERFACE INLINE char * 328INTERFACE char *
283string_value (pointer p) 329string_value (pointer p)
284{ 330{
285 return strvalue (p); 331 return strvalue (p);
286} 332}
287 333
288INLINE num
289nvalue (pointer p)
290{
291 return (p)->object.number;
292}
293
294static IVALUE
295num_get_ivalue (const num n)
296{
297 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
298}
299
300static RVALUE
301num_get_rvalue (const num n)
302{
303 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
304}
305
306INTERFACE IVALUE
307ivalue (pointer p)
308{
309 return num_get_ivalue (p->object.number);
310}
311
312INTERFACE RVALUE
313rvalue (pointer p)
314{
315 return num_get_rvalue (p->object.number);
316}
317
318#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 334#define ivalue_unchecked(p) CELL(p)->object.ivalue
319#if USE_FLOAT 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
336
337#if USE_REAL
320# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
321# define set_num_integer(p) (p)->object.number.is_fixnum=1; 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
322# define set_num_real(p) (p)->object.number.is_fixnum=0;
323#else 340#else
324# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
325# define set_num_integer(p) 0 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
326# define set_num_real(p) 0
327#endif 343#endif
344
328INTERFACE long 345INTERFACE long
329charvalue (pointer p) 346charvalue (pointer p)
330{ 347{
331 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
332} 349}
333 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
334INTERFACE INLINE int 353INTERFACE int
335is_port (pointer p) 354is_port (pointer p)
336{ 355{
337 return type (p) == T_PORT; 356 return type (p) == T_PORT;
338} 357}
339 358
340INTERFACE INLINE int 359INTERFACE int
341is_inport (pointer p) 360is_inport (pointer p)
342{ 361{
343 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
344} 363}
345 364
346INTERFACE INLINE int 365INTERFACE int
347is_outport (pointer p) 366is_outport (pointer p)
348{ 367{
349 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
350} 369}
351 370
352INTERFACE INLINE int 371INTERFACE int
353is_pair (pointer p) 372is_pair (pointer p)
354{ 373{
355 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
356} 375}
357 376
358#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
359#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
360 379
361#define caar(p) car (car (p)) 380static pointer caar (pointer p) { return car (car (p)); }
362#define cadr(p) car (cdr (p)) 381static pointer cadr (pointer p) { return car (cdr (p)); }
363#define cdar(p) cdr (car (p)) 382static pointer cdar (pointer p) { return cdr (car (p)); }
364#define cddr(p) cdr (cdr (p)) 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
365 384
366#define cadar(p) car (cdr (car (p))) 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
367#define caddr(p) car (cdr (cdr (p))) 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
368#define cdaar(p) cdr (car (car (p))) 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
369 388
370INTERFACE void 389INTERFACE void
371set_car (pointer p, pointer q) 390set_car (pointer p, pointer q)
372{ 391{
373 p->object.cons.car = q; 392 CELL(p)->object.cons.car = CELL (q);
374} 393}
375 394
376INTERFACE void 395INTERFACE void
377set_cdr (pointer p, pointer q) 396set_cdr (pointer p, pointer q)
378{ 397{
379 p->object.cons.cdr = q; 398 CELL(p)->object.cons.cdr = CELL (q);
380} 399}
381 400
382INTERFACE pointer 401INTERFACE pointer
383pair_car (pointer p) 402pair_car (pointer p)
384{ 403{
… …
389pair_cdr (pointer p) 408pair_cdr (pointer p)
390{ 409{
391 return cdr (p); 410 return cdr (p);
392} 411}
393 412
394INTERFACE INLINE int 413INTERFACE int
395is_symbol (pointer p) 414is_symbol (pointer p)
396{ 415{
397 return type (p) == T_SYMBOL; 416 return type (p) == T_SYMBOL;
398} 417}
399 418
400INTERFACE INLINE char * 419INTERFACE char *
401symname (pointer p) 420symname (pointer p)
402{ 421{
403 return strvalue (car (p)); 422 return strvalue (p);
404} 423}
405 424
406#if USE_PLIST 425#if USE_PLIST
426#error plists are broken because symbols are no longer pairs
427#define symprop(p) cdr(p)
407SCHEME_EXPORT INLINE int 428SCHEME_EXPORT int
408hasprop (pointer p) 429hasprop (pointer p)
409{ 430{
410 return typeflag (p) & T_SYMBOL; 431 return typeflag (p) & T_SYMBOL;
411} 432}
412
413# define symprop(p) cdr(p)
414#endif 433#endif
415 434
416INTERFACE INLINE int 435INTERFACE int
417is_syntax (pointer p) 436is_syntax (pointer p)
418{ 437{
419 return typeflag (p) & T_SYNTAX; 438 return typeflag (p) & T_SYNTAX;
420} 439}
421 440
422INTERFACE INLINE int 441INTERFACE int
423is_proc (pointer p) 442is_proc (pointer p)
424{ 443{
425 return type (p) == T_PROC; 444 return type (p) == T_PROC;
426} 445}
427 446
428INTERFACE INLINE int 447INTERFACE int
429is_foreign (pointer p) 448is_foreign (pointer p)
430{ 449{
431 return type (p) == T_FOREIGN; 450 return type (p) == T_FOREIGN;
432} 451}
433 452
434INTERFACE INLINE char * 453INTERFACE char *
435syntaxname (pointer p) 454syntaxname (pointer p)
436{ 455{
437 return strvalue (car (p)); 456 return strvalue (p);
438} 457}
439 458
440#define procnum(p) ivalue (p) 459#define procnum(p) ivalue_unchecked (p)
441static const char *procname (pointer x); 460static const char *procname (pointer x);
442 461
443INTERFACE INLINE int 462INTERFACE int
444is_closure (pointer p) 463is_closure (pointer p)
445{ 464{
446 return type (p) == T_CLOSURE; 465 return type (p) == T_CLOSURE;
447} 466}
448 467
449INTERFACE INLINE int 468INTERFACE int
450is_macro (pointer p) 469is_macro (pointer p)
451{ 470{
452 return type (p) == T_MACRO; 471 return type (p) == T_MACRO;
453} 472}
454 473
455INTERFACE INLINE pointer 474INTERFACE pointer
456closure_code (pointer p) 475closure_code (pointer p)
457{ 476{
458 return car (p); 477 return car (p);
459} 478}
460 479
461INTERFACE INLINE pointer 480INTERFACE pointer
462closure_env (pointer p) 481closure_env (pointer p)
463{ 482{
464 return cdr (p); 483 return cdr (p);
465} 484}
466 485
467INTERFACE INLINE int 486INTERFACE int
468is_continuation (pointer p) 487is_continuation (pointer p)
469{ 488{
470 return type (p) == T_CONTINUATION; 489 return type (p) == T_CONTINUATION;
471} 490}
472 491
473#define cont_dump(p) cdr (p) 492#define cont_dump(p) cdr (p)
474#define set_cont_dump(p,v) set_cdr ((p), (v)) 493#define set_cont_dump(p,v) set_cdr ((p), (v))
475 494
476/* To do: promise should be forced ONCE only */ 495/* To do: promise should be forced ONCE only */
477INTERFACE INLINE int 496INTERFACE int
478is_promise (pointer p) 497is_promise (pointer p)
479{ 498{
480 return type (p) == T_PROMISE; 499 return type (p) == T_PROMISE;
481} 500}
482 501
483INTERFACE INLINE int 502INTERFACE int
484is_environment (pointer p) 503is_environment (pointer p)
485{ 504{
486 return type (p) == T_ENVIRONMENT; 505 return type (p) == T_ENVIRONMENT;
487} 506}
488 507
489#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 508#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
490 509
491#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
492#define is_atom(p) (typeflag (p) & T_ATOM) 510#define is_atom(p) (typeflag (p) & T_ATOM)
493#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 511#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
494#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 512#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
495 513
496#define is_mark(p) (typeflag (p) & T_MARK) 514#define is_mark(p) (typeflag (p) & T_MARK)
497#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 515#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
498#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 516#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
499 517
500#if 0
501static int
502is_atom(pointer p)
503{
504 if (!is_atom1(p) != !is_atom2(p))
505 printf ("atoms disagree %x\n", typeflag(p));
506
507 return is_atom2(p);
508}
509#endif
510
511INTERFACE INLINE int 518INTERFACE int
512is_immutable (pointer p) 519is_immutable (pointer p)
513{ 520{
514 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 521 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
515} 522}
516 523
517INTERFACE INLINE void 524INTERFACE void
518setimmutable (pointer p) 525setimmutable (pointer p)
519{ 526{
520#if USE_ERROR_CHECKING 527#if USE_ERROR_CHECKING
521 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 528 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
522#endif 529#endif
523} 530}
524 531
532/* Result is:
533 proper list: length
534 circular list: -1
535 not even a pair: -2
536 dotted list: -2 minus length before dot
537*/
538ecb_hot INTERFACE int
539list_length (SCHEME_P_ pointer a)
540{
541 int i = 0;
542 pointer slow, fast;
543
544 slow = fast = a;
545
546 while (1)
547 {
548 if (fast == NIL)
549 return i;
550
551 if (!is_pair (fast))
552 return -2 - i;
553
554 fast = cdr (fast);
555 ++i;
556
557 if (fast == NIL)
558 return i;
559
560 if (!is_pair (fast))
561 return -2 - i;
562
563 ++i;
564 fast = cdr (fast);
565
566 /* Safe because we would have already returned if `fast'
567 encountered a non-pair. */
568 slow = cdr (slow);
569
570 if (fast == slow)
571 {
572 /* the fast pointer has looped back around and caught up
573 with the slow pointer, hence the structure is circular,
574 not of finite length, and therefore not a list */
575 return -1;
576 }
577 }
578}
579
580INTERFACE int
581is_list (SCHEME_P_ pointer a)
582{
583 return list_length (SCHEME_A_ a) >= 0;
584}
585
525#if USE_CHAR_CLASSIFIERS 586#if USE_CHAR_CLASSIFIERS
526static INLINE int 587
588ecb_inline int
527Cisalpha (int c) 589Cisalpha (int c)
528{ 590{
529 return isascii (c) && isalpha (c); 591 return isascii (c) && isalpha (c);
530} 592}
531 593
532static INLINE int 594ecb_inline int
533Cisdigit (int c) 595Cisdigit (int c)
534{ 596{
535 return isascii (c) && isdigit (c); 597 return isascii (c) && isdigit (c);
536} 598}
537 599
538static INLINE int 600ecb_inline int
539Cisspace (int c) 601Cisspace (int c)
540{ 602{
541 return isascii (c) && isspace (c); 603 return isascii (c) && isspace (c);
542} 604}
543 605
544static INLINE int 606ecb_inline int
545Cisupper (int c) 607Cisupper (int c)
546{ 608{
547 return isascii (c) && isupper (c); 609 return isascii (c) && isupper (c);
548} 610}
549 611
550static INLINE int 612ecb_inline int
551Cislower (int c) 613Cislower (int c)
552{ 614{
553 return isascii (c) && islower (c); 615 return isascii (c) && islower (c);
554} 616}
555#endif 617#endif
… …
588 "gs", 650 "gs",
589 "rs", 651 "rs",
590 "us" 652 "us"
591}; 653};
592 654
593static int 655ecb_cold static int
594is_ascii_name (const char *name, int *pc) 656is_ascii_name (const char *name, int *pc)
595{ 657{
596 int i; 658 int i;
597 659
598 for (i = 0; i < 32; i++) 660 for (i = 0; i < 32; i++)
… …
616#endif 678#endif
617 679
618static int file_push (SCHEME_P_ const char *fname); 680static int file_push (SCHEME_P_ const char *fname);
619static void file_pop (SCHEME_P); 681static void file_pop (SCHEME_P);
620static int file_interactive (SCHEME_P); 682static int file_interactive (SCHEME_P);
621static INLINE int is_one_of (char *s, int c); 683ecb_inline int is_one_of (const char *s, int c);
622static int alloc_cellseg (SCHEME_P_ int n); 684static int alloc_cellseg (SCHEME_P);
623static long binary_decode (const char *s);
624static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 685ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
625static void finalize_cell (SCHEME_P_ pointer a); 686static void finalize_cell (SCHEME_P_ pointer a);
626static int count_consecutive_cells (pointer x, int needed);
627static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 687static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
628static pointer mk_number (SCHEME_P_ const num n); 688static pointer mk_number (SCHEME_P_ const num n);
629static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 689static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
630static pointer mk_vector (SCHEME_P_ uint32_t len); 690static pointer mk_vector (SCHEME_P_ uint32_t len);
631static pointer mk_atom (SCHEME_P_ char *q); 691static pointer mk_atom (SCHEME_P_ char *q);
632static pointer mk_sharp_const (SCHEME_P_ char *name); 692static pointer mk_sharp_const (SCHEME_P_ char *name);
633 693
694static pointer mk_port (SCHEME_P_ port *p);
695
634#if USE_PORTS 696#if USE_PORTS
635static pointer mk_port (SCHEME_P_ port *p);
636static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 697static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
637static pointer port_from_file (SCHEME_P_ int, int prop); 698static pointer port_from_file (SCHEME_P_ int, int prop);
638static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 699static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
639static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 700static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
640static port *port_rep_from_file (SCHEME_P_ int, int prop); 701static port *port_rep_from_file (SCHEME_P_ int, int prop);
641static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 702static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
642static void port_close (SCHEME_P_ pointer p, int flag); 703static void port_close (SCHEME_P_ pointer p, int flag);
643#endif 704#endif
705
644static void mark (pointer a); 706static void mark (pointer a);
645static void gc (SCHEME_P_ pointer a, pointer b); 707static void gc (SCHEME_P_ pointer a, pointer b);
646static int basic_inchar (port *pt); 708static int basic_inchar (port *pt);
647static int inchar (SCHEME_P); 709static int inchar (SCHEME_P);
648static void backchar (SCHEME_P_ int c); 710static void backchar (SCHEME_P_ int c);
649static char *readstr_upto (SCHEME_P_ char *delim); 711static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
650static pointer readstrexp (SCHEME_P); 712static pointer readstrexp (SCHEME_P_ char delim);
651static INLINE int skipspace (SCHEME_P); 713static int skipspace (SCHEME_P);
652static int token (SCHEME_P); 714static int token (SCHEME_P);
653static void printslashstring (SCHEME_P_ char *s, int len); 715static void printslashstring (SCHEME_P_ char *s, int len);
654static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 716static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
655static void printatom (SCHEME_P_ pointer l, int f); 717static void printatom (SCHEME_P_ pointer l, int f);
656static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 718static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
660static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 722static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
661static pointer revappend (SCHEME_P_ pointer a, pointer b); 723static pointer revappend (SCHEME_P_ pointer a, pointer b);
662static pointer ss_get_cont (SCHEME_P); 724static pointer ss_get_cont (SCHEME_P);
663static void ss_set_cont (SCHEME_P_ pointer cont); 725static void ss_set_cont (SCHEME_P_ pointer cont);
664static void dump_stack_mark (SCHEME_P); 726static void dump_stack_mark (SCHEME_P);
665static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 727static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
728static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 729static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
667static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 730static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 731static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 732static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 733static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
671static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 734static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
672static void assign_syntax (SCHEME_P_ const char *name); 735static void assign_syntax (SCHEME_P_ const char *name);
673static int syntaxnum (pointer p); 736static int syntaxnum (pointer p);
674static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 737static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
675 738
739static IVALUE
740ivalue (pointer x)
741{
742 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
743}
744
745static RVALUE
746rvalue (pointer x)
747{
748 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
749}
750
751INTERFACE num
752nvalue (pointer x)
753{
754 num n;
755
756 num_set_fixnum (n, is_integer (x));
757
758 if (num_is_fixnum (n))
759 num_set_ivalue (n, ivalue_unchecked (x));
760 else
761 num_set_rvalue (n, rvalue_unchecked (x));
762
763 return n;
764}
765
676static num 766static num
677num_add (num a, num b) 767num_op (enum num_op op, num a, num b)
678{ 768{
679 num ret; 769 num ret;
680 770
681 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 771 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
682 772
683 if (num_is_fixnum (ret)) 773 if (num_is_fixnum (ret))
684 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 774 {
775 switch (op)
776 {
777 case NUM_ADD: a.ivalue += b.ivalue; break;
778 case NUM_SUB: a.ivalue -= b.ivalue; break;
779 case NUM_MUL: a.ivalue *= b.ivalue; break;
780 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
781 }
782
783 num_set_ivalue (ret, a.ivalue);
784 }
785#if USE_REAL
685 else 786 else
686 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 787 {
788 switch (op)
789 {
790 case NUM_ADD: a.rvalue += b.rvalue; break;
791 case NUM_SUB: a.rvalue -= b.rvalue; break;
792 case NUM_MUL: a.rvalue *= b.rvalue; break;
793 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
794 }
687 795
688 return ret; 796 num_set_rvalue (ret, a.rvalue);
689} 797 }
690 798#endif
691static num
692num_mul (num a, num b)
693{
694 num ret;
695
696 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
697
698 if (num_is_fixnum (ret))
699 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
700 else
701 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
702 799
703 return ret; 800 return ret;
704} 801}
705 802
706static num 803static num
707num_div (num a, num b) 804num_div (num a, num b)
708{ 805{
709 num ret; 806 num ret;
710 807
711 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 808 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
712 809
713 if (num_is_fixnum (ret)) 810 if (num_is_fixnum (ret))
714 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 811 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
715 else 812 else
716 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 813 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
717
718 return ret;
719}
720
721static num
722num_intdiv (num a, num b)
723{
724 num ret;
725
726 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
727
728 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
730 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
732
733 return ret;
734}
735
736static num
737num_sub (num a, num b)
738{
739 num ret;
740
741 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
742
743 if (num_is_fixnum (ret))
744 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
745 else
746 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
747 814
748 return ret; 815 return ret;
749} 816}
750 817
751static num 818static num
… …
753{ 820{
754 num ret; 821 num ret;
755 long e1, e2, res; 822 long e1, e2, res;
756 823
757 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 824 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
758 e1 = num_get_ivalue (a); 825 e1 = num_ivalue (a);
759 e2 = num_get_ivalue (b); 826 e2 = num_ivalue (b);
760 res = e1 % e2; 827 res = e1 % e2;
761 828
762 /* remainder should have same sign as second operand */ 829 /* remainder should have same sign as second operand */
763 if (res > 0) 830 if (res > 0)
764 { 831 {
… …
780{ 847{
781 num ret; 848 num ret;
782 long e1, e2, res; 849 long e1, e2, res;
783 850
784 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 851 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
785 e1 = num_get_ivalue (a); 852 e1 = num_ivalue (a);
786 e2 = num_get_ivalue (b); 853 e2 = num_ivalue (b);
787 res = e1 % e2; 854 res = e1 % e2;
788 855
789 /* modulo should have same sign as second operand */ 856 /* modulo should have same sign as second operand */
790 if (res * e2 < 0) 857 if (res * e2 < 0)
791 res += e2; 858 res += e2;
792 859
793 num_set_ivalue (ret, res); 860 num_set_ivalue (ret, res);
794 return ret; 861 return ret;
795} 862}
796 863
864/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
797static int 865static int
798num_eq (num a, num b) 866num_cmp (num a, num b)
799{ 867{
868 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
800 int ret; 869 int ret;
801 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 870
803 if (is_fixnum) 871 if (is_fixnum)
804 ret = num_get_ivalue (a) == num_get_ivalue (b); 872 {
873 IVALUE av = num_ivalue (a);
874 IVALUE bv = num_ivalue (b);
875
876 ret = av == bv ? 0 : av < bv ? -1 : +1;
877 }
805 else 878 else
806 ret = num_get_rvalue (a) == num_get_rvalue (b); 879 {
880 RVALUE av = num_rvalue (a);
881 RVALUE bv = num_rvalue (b);
882
883 ret = av == bv ? 0 : av < bv ? -1 : +1;
884 }
807 885
808 return ret; 886 return ret;
809} 887}
810
811
812static int
813num_gt (num a, num b)
814{
815 int ret;
816 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
817
818 if (is_fixnum)
819 ret = num_get_ivalue (a) > num_get_ivalue (b);
820 else
821 ret = num_get_rvalue (a) > num_get_rvalue (b);
822
823 return ret;
824}
825
826static int
827num_ge (num a, num b)
828{
829 return !num_lt (a, b);
830}
831
832static int
833num_lt (num a, num b)
834{
835 int ret;
836 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
837
838 if (is_fixnum)
839 ret = num_get_ivalue (a) < num_get_ivalue (b);
840 else
841 ret = num_get_rvalue (a) < num_get_rvalue (b);
842
843 return ret;
844}
845
846static int
847num_le (num a, num b)
848{
849 return !num_gt (a, b);
850}
851
852#if USE_MATH
853
854/* Round to nearest. Round to even if midway */
855static double
856round_per_R5RS (double x)
857{
858 double fl = floor (x);
859 double ce = ceil (x);
860 double dfl = x - fl;
861 double dce = ce - x;
862
863 if (dfl > dce)
864 return ce;
865 else if (dfl < dce)
866 return fl;
867 else
868 {
869 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
870 return fl;
871 else
872 return ce;
873 }
874}
875#endif
876 888
877static int 889static int
878is_zero_rvalue (RVALUE x) 890is_zero_rvalue (RVALUE x)
879{ 891{
880#if USE_FLOAT 892 return x == 0;
893#if 0
894#if USE_REAL
881 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 895 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
882#else 896#else
883 return x == 0; 897 return x == 0;
884#endif 898#endif
885} 899#endif
886
887static long
888binary_decode (const char *s)
889{
890 long x = 0;
891
892 while (*s != 0 && (*s == '1' || *s == '0'))
893 {
894 x <<= 1;
895 x += *s - '0';
896 s++;
897 }
898
899 return x;
900} 900}
901 901
902/* allocate new cell segment */ 902/* allocate new cell segment */
903static int 903ecb_cold static int
904alloc_cellseg (SCHEME_P_ int n) 904alloc_cellseg (SCHEME_P)
905{ 905{
906 pointer newp; 906 struct cell *newp;
907 pointer last; 907 struct cell *last;
908 pointer p; 908 struct cell *p;
909 char *cp; 909 char *cp;
910 long i; 910 long i;
911 int k; 911 int k;
912 912
913 static int segsize = CELL_SEGSIZE >> 1; 913 static int segsize = CELL_SEGSIZE >> 1;
914 segsize <<= 1; 914 segsize <<= 1;
915 915
916 for (k = 0; k < n; k++)
917 {
918 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
919 return k;
920
921 cp = malloc (segsize * sizeof (struct cell)); 916 cp = malloc (segsize * sizeof (struct cell));
922 917
923 if (!cp && USE_ERROR_CHECKING) 918 if (!cp && USE_ERROR_CHECKING)
924 return k; 919 return k;
925 920
926 i = ++SCHEME_V->last_cell_seg; 921 i = ++SCHEME_V->last_cell_seg;
927 SCHEME_V->alloc_seg[i] = cp;
928 922
929 /* insert new segment in address order */ 923 newp = (struct cell *)cp;
930 newp = (pointer)cp;
931 SCHEME_V->cell_seg[i] = newp; 924 SCHEME_V->cell_seg[i] = newp;
932 SCHEME_V->cell_segsize[i] = segsize; 925 SCHEME_V->cell_segsize[i] = segsize;
933
934 //TODO: insert, not swap
935 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
936 {
937 p = SCHEME_V->cell_seg[i];
938 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
939 SCHEME_V->cell_seg[i - 1] = p;
940
941 k = SCHEME_V->cell_segsize[i];
942 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
943 SCHEME_V->cell_segsize[i - 1] = k;
944
945 --i;
946 }
947
948 SCHEME_V->fcells += segsize; 926 SCHEME_V->fcells += segsize;
949 last = newp + segsize - 1; 927 last = newp + segsize - 1;
950 928
951 for (p = newp; p <= last; p++) 929 for (p = newp; p <= last; p++)
952 { 930 {
931 pointer cp = POINTER (p);
953 set_typeflag (p, T_FREE); 932 set_typeflag (cp, T_PAIR);
954 set_car (p, NIL); 933 set_car (cp, NIL);
955 set_cdr (p, p + 1); 934 set_cdr (cp, POINTER (p + 1));
956 } 935 }
957 936
958 /* insert new cells in address order on free list */
959 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
960 {
961 set_cdr (last, SCHEME_V->free_cell); 937 set_cdr (POINTER (last), SCHEME_V->free_cell);
962 SCHEME_V->free_cell = newp; 938 SCHEME_V->free_cell = POINTER (newp);
963 }
964 else
965 {
966 p = SCHEME_V->free_cell;
967 939
968 while (cdr (p) != NIL && newp > cdr (p))
969 p = cdr (p);
970
971 set_cdr (last, cdr (p));
972 set_cdr (p, newp);
973 }
974 }
975
976 return n; 940 return 1;
977} 941}
978 942
979/* get new cell. parameter a, b is marked by gc. */ 943/* get new cell. parameter a, b is marked by gc. */
980static INLINE pointer 944ecb_inline pointer
981get_cell_x (SCHEME_P_ pointer a, pointer b) 945get_cell_x (SCHEME_P_ pointer a, pointer b)
982{ 946{
983 if (SCHEME_V->free_cell == NIL) 947 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
984 { 948 {
985 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 949 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
986 return S_SINK; 950 return S_SINK;
987 951
988 if (SCHEME_V->free_cell == NIL) 952 if (SCHEME_V->free_cell == NIL)
989 { 953 {
990 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 954 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
991 955
992 gc (SCHEME_A_ a, b); 956 gc (SCHEME_A_ a, b);
993 957
994 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 958 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
995 { 959 {
996 /* if only a few recovered, get more to avoid fruitless gc's */ 960 /* if only a few recovered, get more to avoid fruitless gc's */
997 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 961 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
998 { 962 {
999#if USE_ERROR_CHECKING 963#if USE_ERROR_CHECKING
1000 SCHEME_V->no_memory = 1; 964 SCHEME_V->no_memory = 1;
1001 return S_SINK; 965 return S_SINK;
1002#endif 966#endif
… …
1014 } 978 }
1015} 979}
1016 980
1017/* To retain recent allocs before interpreter knows about them - 981/* To retain recent allocs before interpreter knows about them -
1018 Tehom */ 982 Tehom */
1019 983ecb_hot static void
1020static void
1021push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 984push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1022{ 985{
1023 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 986 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1024 987
1025 set_typeflag (holder, T_PAIR); 988 set_typeflag (holder, T_PAIR);
… …
1027 set_car (holder, recent); 990 set_car (holder, recent);
1028 set_cdr (holder, car (S_SINK)); 991 set_cdr (holder, car (S_SINK));
1029 set_car (S_SINK, holder); 992 set_car (S_SINK, holder);
1030} 993}
1031 994
1032static pointer 995ecb_hot static pointer
1033get_cell (SCHEME_P_ pointer a, pointer b) 996get_cell (SCHEME_P_ pointer a, pointer b)
1034{ 997{
1035 pointer cell = get_cell_x (SCHEME_A_ a, b); 998 pointer cell = get_cell_x (SCHEME_A_ a, b);
1036 999
1037 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1000 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1046} 1009}
1047 1010
1048static pointer 1011static pointer
1049get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1012get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1050{ 1013{
1051 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1014 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1052 pointer *e = malloc (len * sizeof (pointer)); 1015 pointer *e = malloc (len * sizeof (pointer));
1053 1016
1054 if (!e && USE_ERROR_CHECKING) 1017 if (!e && USE_ERROR_CHECKING)
1055 return S_SINK; 1018 return S_SINK;
1056 1019
1057 /* Record it as a vector so that gc understands it. */ 1020 /* Record it as a vector so that gc understands it. */
1058 set_typeflag (v, T_VECTOR | T_ATOM); 1021 set_typeflag (v, T_VECTOR | T_ATOM);
1059 1022
1060 v->object.vector.vvalue = e; 1023 CELL(v)->object.vector.vvalue = e;
1061 v->object.vector.length = len; 1024 CELL(v)->object.vector.length = len;
1062 fill_vector (v, init); 1025 fill_vector (v, 0, init);
1063 push_recent_alloc (SCHEME_A_ v, NIL); 1026 push_recent_alloc (SCHEME_A_ v, NIL);
1064 1027
1065 return v; 1028 return v;
1066} 1029}
1067 1030
1068static INLINE void 1031ecb_inline void
1069ok_to_freely_gc (SCHEME_P) 1032ok_to_freely_gc (SCHEME_P)
1070{ 1033{
1071 set_car (S_SINK, NIL); 1034 set_car (S_SINK, NIL);
1072} 1035}
1073 1036
… …
1075static void 1038static void
1076check_cell_alloced (pointer p, int expect_alloced) 1039check_cell_alloced (pointer p, int expect_alloced)
1077{ 1040{
1078 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1041 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1079 if (typeflag (p) & !expect_alloced) 1042 if (typeflag (p) & !expect_alloced)
1080 xwrstr ("Cell is already allocated!\n"); 1043 putstr (SCHEME_A_ "Cell is already allocated!\n");
1081 1044
1082 if (!(typeflag (p)) & expect_alloced) 1045 if (!(typeflag (p)) & expect_alloced)
1083 xwrstr ("Cell is not allocated!\n"); 1046 putstr (SCHEME_A_ "Cell is not allocated!\n");
1084} 1047}
1085 1048
1086static void 1049static void
1087check_range_alloced (pointer p, int n, int expect_alloced) 1050check_range_alloced (pointer p, int n, int expect_alloced)
1088{ 1051{
… …
1094#endif 1057#endif
1095 1058
1096/* Medium level cell allocation */ 1059/* Medium level cell allocation */
1097 1060
1098/* get new cons cell */ 1061/* get new cons cell */
1099pointer 1062ecb_hot static pointer
1100xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1063xcons (SCHEME_P_ pointer a, pointer b)
1101{ 1064{
1102 pointer x = get_cell (SCHEME_A_ a, b); 1065 pointer x = get_cell (SCHEME_A_ a, b);
1103 1066
1104 set_typeflag (x, T_PAIR); 1067 set_typeflag (x, T_PAIR);
1105
1106 if (immutable)
1107 setimmutable (x);
1108 1068
1109 set_car (x, a); 1069 set_car (x, a);
1110 set_cdr (x, b); 1070 set_cdr (x, b);
1111 1071
1112 return x; 1072 return x;
1113} 1073}
1114 1074
1075ecb_hot static pointer
1076ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1077{
1078 pointer x = xcons (SCHEME_A_ a, b);
1079 setimmutable (x);
1080 return x;
1081}
1082
1083#define cons(a,b) xcons (SCHEME_A_ a, b)
1084#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1085
1086ecb_cold static pointer
1087generate_symbol (SCHEME_P_ const char *name)
1088{
1089 pointer x = mk_string (SCHEME_A_ name);
1090 setimmutable (x);
1091 set_typeflag (x, T_SYMBOL | T_ATOM);
1092 return x;
1093}
1094
1115/* ========== oblist implementation ========== */ 1095/* ========== oblist implementation ========== */
1116 1096
1117#ifndef USE_OBJECT_LIST 1097#ifndef USE_OBJECT_LIST
1118 1098
1099static int
1119static int hash_fn (const char *key, int table_size); 1100hash_fn (const char *key, int table_size)
1101{
1102 const unsigned char *p = (unsigned char *)key;
1103 uint32_t hash = 2166136261U;
1120 1104
1105 while (*p)
1106 hash = (hash ^ *p++) * 16777619;
1107
1108 return hash % table_size;
1109}
1110
1121static pointer 1111ecb_cold static pointer
1122oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1123{ 1113{
1124 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1114 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1125} 1115}
1126 1116
1127/* returns the new symbol */ 1117/* returns the new symbol */
1128static pointer 1118ecb_cold static pointer
1129oblist_add_by_name (SCHEME_P_ const char *name) 1119oblist_add_by_name (SCHEME_P_ const char *name)
1130{ 1120{
1131 int location; 1121 pointer x = generate_symbol (SCHEME_A_ name);
1132
1133 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1134 set_typeflag (x, T_SYMBOL);
1135 setimmutable (car (x));
1136
1137 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1122 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1138 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1123 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1139 return x; 1124 return x;
1140} 1125}
1141 1126
1142static INLINE pointer 1127ecb_cold static pointer
1143oblist_find_by_name (SCHEME_P_ const char *name) 1128oblist_find_by_name (SCHEME_P_ const char *name)
1144{ 1129{
1145 int location; 1130 int location;
1146 pointer x; 1131 pointer x;
1147 char *s; 1132 char *s;
1148 1133
1149 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1134 location = hash_fn (name, veclength (SCHEME_V->oblist));
1150 1135
1151 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1136 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1152 { 1137 {
1153 s = symname (car (x)); 1138 s = symname (car (x));
1154 1139
1155 /* case-insensitive, per R5RS section 2 */ 1140 /* case-insensitive, per R5RS section 2 */
1156 if (stricmp (name, s) == 0) 1141 if (stricmp (name, s) == 0)
… …
1158 } 1143 }
1159 1144
1160 return NIL; 1145 return NIL;
1161} 1146}
1162 1147
1163static pointer 1148ecb_cold static pointer
1164oblist_all_symbols (SCHEME_P) 1149oblist_all_symbols (SCHEME_P)
1165{ 1150{
1166 int i; 1151 int i;
1167 pointer x; 1152 pointer x;
1168 pointer ob_list = NIL; 1153 pointer ob_list = NIL;
1169 1154
1170 for (i = 0; i < vector_length (SCHEME_V->oblist); i++) 1155 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1171 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1156 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1172 ob_list = cons (x, ob_list); 1157 ob_list = cons (x, ob_list);
1173 1158
1174 return ob_list; 1159 return ob_list;
1175} 1160}
1176 1161
1177#else 1162#else
1178 1163
1179static pointer 1164ecb_cold static pointer
1180oblist_initial_value (SCHEME_P) 1165oblist_initial_value (SCHEME_P)
1181{ 1166{
1182 return NIL; 1167 return NIL;
1183} 1168}
1184 1169
1185static INLINE pointer 1170ecb_cold static pointer
1186oblist_find_by_name (SCHEME_P_ const char *name) 1171oblist_find_by_name (SCHEME_P_ const char *name)
1187{ 1172{
1188 pointer x; 1173 pointer x;
1189 char *s; 1174 char *s;
1190 1175
… …
1199 1184
1200 return NIL; 1185 return NIL;
1201} 1186}
1202 1187
1203/* returns the new symbol */ 1188/* returns the new symbol */
1204static pointer 1189ecb_cold static pointer
1205oblist_add_by_name (SCHEME_P_ const char *name) 1190oblist_add_by_name (SCHEME_P_ const char *name)
1206{ 1191{
1207 pointer x; 1192 pointer x = generate_symbol (SCHEME_A_ name);
1208
1209 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1210 set_typeflag (x, T_SYMBOL);
1211 setimmutable (car (x));
1212 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1193 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1213 return x; 1194 return x;
1214} 1195}
1215 1196
1216static pointer 1197ecb_cold static pointer
1217oblist_all_symbols (SCHEME_P) 1198oblist_all_symbols (SCHEME_P)
1218{ 1199{
1219 return SCHEME_V->oblist; 1200 return SCHEME_V->oblist;
1220} 1201}
1221 1202
1222#endif 1203#endif
1223 1204
1224#if USE_PORTS
1225static pointer 1205ecb_cold static pointer
1226mk_port (SCHEME_P_ port *p) 1206mk_port (SCHEME_P_ port *p)
1227{ 1207{
1228 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1208 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1229 1209
1230 set_typeflag (x, T_PORT | T_ATOM); 1210 set_typeflag (x, T_PORT | T_ATOM);
1231 x->object.port = p; 1211 set_port (x, p);
1232 1212
1233 return x; 1213 return x;
1234} 1214}
1235#endif
1236 1215
1237pointer 1216ecb_cold pointer
1238mk_foreign_func (SCHEME_P_ foreign_func f) 1217mk_foreign_func (SCHEME_P_ foreign_func f)
1239{ 1218{
1240 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1219 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1241 1220
1242 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1221 set_typeflag (x, T_FOREIGN | T_ATOM);
1243 x->object.ff = f; 1222 CELL(x)->object.ff = f;
1244 1223
1245 return x; 1224 return x;
1246} 1225}
1247 1226
1248INTERFACE pointer 1227INTERFACE pointer
1249mk_character (SCHEME_P_ int c) 1228mk_character (SCHEME_P_ int c)
1250{ 1229{
1251 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1252 1231
1253 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1232 set_typeflag (x, T_CHARACTER | T_ATOM);
1254 ivalue_unchecked (x) = c & 0xff; 1233 set_ivalue (x, c & 0xff);
1255 set_num_integer (x); 1234
1256 return x; 1235 return x;
1257} 1236}
1258 1237
1259/* get number atom (integer) */ 1238/* get number atom (integer) */
1260INTERFACE pointer 1239INTERFACE pointer
1261mk_integer (SCHEME_P_ long num) 1240mk_integer (SCHEME_P_ long n)
1262{ 1241{
1242 pointer p = 0;
1243 pointer *pp = &p;
1244
1245#if USE_INTCACHE
1246 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1247 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1248#endif
1249
1250 if (!*pp)
1251 {
1263 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1252 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1264 1253
1265 set_typeflag (x, (T_NUMBER | T_ATOM)); 1254 set_typeflag (x, T_INTEGER | T_ATOM);
1266 ivalue_unchecked (x) = num; 1255 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1267 set_num_integer (x); 1256 set_ivalue (x, n);
1257
1258 *pp = x;
1259 }
1260
1268 return x; 1261 return *pp;
1269} 1262}
1270 1263
1271INTERFACE pointer 1264INTERFACE pointer
1272mk_real (SCHEME_P_ RVALUE n) 1265mk_real (SCHEME_P_ RVALUE n)
1273{ 1266{
1267#if USE_REAL
1274 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1275 1269
1276 set_typeflag (x, (T_NUMBER | T_ATOM)); 1270 set_typeflag (x, T_REAL | T_ATOM);
1277 rvalue_unchecked (x) = n; 1271 set_rvalue (x, n);
1278 set_num_real (x); 1272
1279 return x; 1273 return x;
1274#else
1275 return mk_integer (SCHEME_A_ n);
1276#endif
1280} 1277}
1281 1278
1282static pointer 1279static pointer
1283mk_number (SCHEME_P_ const num n) 1280mk_number (SCHEME_P_ const num n)
1284{ 1281{
1282#if USE_REAL
1285 if (num_is_fixnum (n)) 1283 return num_is_fixnum (n)
1284 ? mk_integer (SCHEME_A_ num_ivalue (n))
1285 : mk_real (SCHEME_A_ num_rvalue (n));
1286#else
1286 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1287 return mk_integer (SCHEME_A_ num_ivalue (n));
1287 else 1288#endif
1288 return mk_real (SCHEME_A_ num_get_rvalue (n));
1289} 1289}
1290 1290
1291/* allocate name to string area */ 1291/* allocate name to string area */
1292static char * 1292static char *
1293store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1293store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1299 SCHEME_V->no_memory = 1; 1299 SCHEME_V->no_memory = 1;
1300 return SCHEME_V->strbuff; 1300 return SCHEME_V->strbuff;
1301 } 1301 }
1302 1302
1303 if (str) 1303 if (str)
1304 { 1304 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1305 int l = strlen (str);
1306
1307 if (l > len_str)
1308 l = len_str;
1309
1310 memcpy (q, str, l);
1311 q[l] = 0;
1312 }
1313 else 1305 else
1314 {
1315 memset (q, fill, len_str); 1306 memset (q, fill, len_str);
1307
1316 q[len_str] = 0; 1308 q[len_str] = 0;
1317 }
1318 1309
1319 return q; 1310 return q;
1320}
1321
1322/* get new string */
1323INTERFACE pointer
1324mk_string (SCHEME_P_ const char *str)
1325{
1326 return mk_counted_string (SCHEME_A_ str, strlen (str));
1327}
1328
1329INTERFACE pointer
1330mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1331{
1332 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1333
1334 set_typeflag (x, T_STRING | T_ATOM);
1335 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1336 strlength (x) = len;
1337 return x;
1338} 1311}
1339 1312
1340INTERFACE pointer 1313INTERFACE pointer
1341mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1314mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1342{ 1315{
… …
1347 strlength (x) = len; 1320 strlength (x) = len;
1348 return x; 1321 return x;
1349} 1322}
1350 1323
1351INTERFACE pointer 1324INTERFACE pointer
1325mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1326{
1327 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1328
1329 set_typeflag (x, T_STRING | T_ATOM);
1330 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1331 strlength (x) = len;
1332
1333 return x;
1334}
1335
1336INTERFACE pointer
1337mk_string (SCHEME_P_ const char *str)
1338{
1339 return mk_counted_string (SCHEME_A_ str, strlen (str));
1340}
1341
1342INTERFACE pointer
1352mk_vector (SCHEME_P_ uint32_t len) 1343mk_vector (SCHEME_P_ uint32_t len)
1353{ 1344{
1354 return get_vector_object (SCHEME_A_ len, NIL); 1345 return get_vector_object (SCHEME_A_ len, NIL);
1355} 1346}
1356 1347
1357INTERFACE void 1348INTERFACE void
1358fill_vector (pointer vec, pointer obj) 1349fill_vector (pointer vec, uint32_t start, pointer obj)
1359{ 1350{
1360 int i; 1351 int i;
1361 1352
1362 for (i = 0; i < vec->object.vector.length; i++) 1353 for (i = start; i < veclength (vec); i++)
1363 vec->object.vector.vvalue[i] = obj; 1354 vecvalue (vec)[i] = obj;
1355}
1356
1357INTERFACE void
1358vector_resize (pointer vec, uint32_t newsize, pointer fill)
1359{
1360 uint32_t oldsize = veclength (vec);
1361 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1362 veclength (vec) = newsize;
1363 fill_vector (vec, oldsize, fill);
1364} 1364}
1365 1365
1366INTERFACE pointer 1366INTERFACE pointer
1367vector_elem (pointer vec, uint32_t ielem) 1367vector_get (pointer vec, uint32_t ielem)
1368{ 1368{
1369 return vec->object.vector.vvalue[ielem]; 1369 return vecvalue(vec)[ielem];
1370} 1370}
1371 1371
1372INTERFACE void 1372INTERFACE void
1373set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1373vector_set (pointer vec, uint32_t ielem, pointer a)
1374{ 1374{
1375 vec->object.vector.vvalue[ielem] = a; 1375 vecvalue(vec)[ielem] = a;
1376} 1376}
1377 1377
1378/* get new symbol */ 1378/* get new symbol */
1379INTERFACE pointer 1379INTERFACE pointer
1380mk_symbol (SCHEME_P_ const char *name) 1380mk_symbol (SCHEME_P_ const char *name)
… …
1386 x = oblist_add_by_name (SCHEME_A_ name); 1386 x = oblist_add_by_name (SCHEME_A_ name);
1387 1387
1388 return x; 1388 return x;
1389} 1389}
1390 1390
1391INTERFACE pointer 1391ecb_cold INTERFACE pointer
1392gensym (SCHEME_P) 1392gensym (SCHEME_P)
1393{ 1393{
1394 pointer x; 1394 pointer x;
1395 char name[40]; 1395 char name[40] = "gensym-";
1396
1397 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1398 {
1399 strcpy (name, "gensym-");
1400 xnum (name + 7, SCHEME_V->gensym_cnt); 1396 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1401 1397
1402 /* first check oblist */ 1398 return generate_symbol (SCHEME_A_ name);
1403 x = oblist_find_by_name (SCHEME_A_ name); 1399}
1404 1400
1405 if (x != NIL) 1401static int
1406 continue; 1402is_gensym (SCHEME_P_ pointer x)
1407 else 1403{
1408 { 1404 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1409 x = oblist_add_by_name (SCHEME_A_ name);
1410 return x;
1411 }
1412 }
1413
1414 return NIL;
1415} 1405}
1416 1406
1417/* make symbol or number atom from string */ 1407/* make symbol or number atom from string */
1418static pointer 1408ecb_cold static pointer
1419mk_atom (SCHEME_P_ char *q) 1409mk_atom (SCHEME_P_ char *q)
1420{ 1410{
1421 char c, *p; 1411 char c, *p;
1422 int has_dec_point = 0; 1412 int has_dec_point = 0;
1423 int has_fp_exp = 0; 1413 int has_fp_exp = 0;
1424 1414
1425#if USE_COLON_HOOK 1415#if USE_COLON_HOOK
1426
1427 if ((p = strstr (q, "::")) != 0) 1416 if ((p = strstr (q, "::")) != 0)
1428 { 1417 {
1429 *p = 0; 1418 *p = 0;
1430 return cons (SCHEME_V->COLON_HOOK, 1419 return cons (SCHEME_V->COLON_HOOK,
1431 cons (cons (SCHEME_V->QUOTE, 1420 cons (cons (SCHEME_V->QUOTE,
1432 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1421 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1433 } 1422 }
1434
1435#endif 1423#endif
1436 1424
1437 p = q; 1425 p = q;
1438 c = *p++; 1426 c = *p++;
1439 1427
… …
1475 } 1463 }
1476 else if ((c == 'e') || (c == 'E')) 1464 else if ((c == 'e') || (c == 'E'))
1477 { 1465 {
1478 if (!has_fp_exp) 1466 if (!has_fp_exp)
1479 { 1467 {
1480 has_dec_point = 1; /* decimal point illegal 1468 has_dec_point = 1; /* decimal point illegal from now on */
1481 from now on */
1482 p++; 1469 p++;
1483 1470
1484 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1471 if ((*p == '-') || (*p == '+') || isdigit (*p))
1485 continue; 1472 continue;
1486 } 1473 }
… …
1488 1475
1489 return mk_symbol (SCHEME_A_ strlwr (q)); 1476 return mk_symbol (SCHEME_A_ strlwr (q));
1490 } 1477 }
1491 } 1478 }
1492 1479
1493#if USE_FLOAT 1480#if USE_REAL
1494 if (has_dec_point) 1481 if (has_dec_point)
1495 return mk_real (SCHEME_A_ atof (q)); 1482 return mk_real (SCHEME_A_ atof (q));
1496#endif 1483#endif
1497 1484
1498 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1485 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1499} 1486}
1500 1487
1501/* make constant */ 1488/* make constant */
1502static pointer 1489ecb_cold static pointer
1503mk_sharp_const (SCHEME_P_ char *name) 1490mk_sharp_const (SCHEME_P_ char *name)
1504{ 1491{
1505 long x;
1506 char tmp[STRBUFFSIZE];
1507
1508 if (!strcmp (name, "t")) 1492 if (!strcmp (name, "t"))
1509 return S_T; 1493 return S_T;
1510 else if (!strcmp (name, "f")) 1494 else if (!strcmp (name, "f"))
1511 return S_F; 1495 return S_F;
1512 else if (*name == 'o') /* #o (octal) */
1513 {
1514 x = strtol (name + 1, 0, 8);
1515 return mk_integer (SCHEME_A_ x);
1516 }
1517 else if (*name == 'd') /* #d (decimal) */
1518 {
1519 x = strtol (name + 1, 0, 10);
1520 return mk_integer (SCHEME_A_ x);
1521 }
1522 else if (*name == 'x') /* #x (hex) */
1523 {
1524 x = strtol (name + 1, 0, 16);
1525 return mk_integer (SCHEME_A_ x);
1526 }
1527 else if (*name == 'b') /* #b (binary) */
1528 {
1529 x = binary_decode (name + 1);
1530 return mk_integer (SCHEME_A_ x);
1531 }
1532 else if (*name == '\\') /* #\w (character) */ 1496 else if (*name == '\\') /* #\w (character) */
1533 { 1497 {
1534 int c = 0; 1498 int c;
1535 1499
1500 // TODO: optimise
1536 if (stricmp (name + 1, "space") == 0) 1501 if (stricmp (name + 1, "space") == 0)
1537 c = ' '; 1502 c = ' ';
1538 else if (stricmp (name + 1, "newline") == 0) 1503 else if (stricmp (name + 1, "newline") == 0)
1539 c = '\n'; 1504 c = '\n';
1540 else if (stricmp (name + 1, "return") == 0) 1505 else if (stricmp (name + 1, "return") == 0)
1541 c = '\r'; 1506 c = '\r';
1542 else if (stricmp (name + 1, "tab") == 0) 1507 else if (stricmp (name + 1, "tab") == 0)
1543 c = '\t'; 1508 c = '\t';
1509 else if (stricmp (name + 1, "alarm") == 0)
1510 c = 0x07;
1511 else if (stricmp (name + 1, "backspace") == 0)
1512 c = 0x08;
1513 else if (stricmp (name + 1, "escape") == 0)
1514 c = 0x1b;
1515 else if (stricmp (name + 1, "delete") == 0)
1516 c = 0x7f;
1517 else if (stricmp (name + 1, "null") == 0)
1518 c = 0;
1544 else if (name[1] == 'x' && name[2] != 0) 1519 else if (name[1] == 'x' && name[2] != 0)
1545 { 1520 {
1546 int c1 = strtol (name + 2, 0, 16); 1521 long c1 = strtol (name + 2, 0, 16);
1547 1522
1548 if (c1 <= UCHAR_MAX) 1523 if (0 <= c1 && c1 <= UCHAR_MAX)
1549 c = c1; 1524 c = c1;
1550 else 1525 else
1551 return NIL; 1526 return NIL;
1552 1527 }
1553#if USE_ASCII_NAMES 1528#if USE_ASCII_NAMES
1554 }
1555 else if (is_ascii_name (name + 1, &c)) 1529 else if (is_ascii_name (name + 1, &c))
1556 {
1557 /* nothing */ 1530 /* nothing */;
1558#endif 1531#endif
1559 }
1560 else if (name[2] == 0) 1532 else if (name[2] == 0)
1561 c = name[1]; 1533 c = name[1];
1562 else 1534 else
1563 return NIL; 1535 return NIL;
1564 1536
1565 return mk_character (SCHEME_A_ c); 1537 return mk_character (SCHEME_A_ c);
1566 } 1538 }
1567 else 1539 else
1540 {
1541 /* identify base by string index */
1542 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1543 char *base = strchr (baseidx, *name);
1544
1545 if (base)
1546 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1547
1568 return NIL; 1548 return NIL;
1549 }
1569} 1550}
1570 1551
1571/* ========== garbage collector ========== */ 1552/* ========== garbage collector ========== */
1553
1554static void
1555finalize_cell (SCHEME_P_ pointer a)
1556{
1557 /* TODO, fast bitmap check? */
1558 if (is_string (a) || is_symbol (a))
1559 free (strvalue (a));
1560 else if (is_vector (a))
1561 free (vecvalue (a));
1562#if USE_PORTS
1563 else if (is_port (a))
1564 {
1565 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1566 port_close (SCHEME_A_ a, port_input | port_output);
1567
1568 free (port (a));
1569 }
1570#endif
1571}
1572 1572
1573/*-- 1573/*--
1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1576 * for marking. 1576 * for marking.
1577 *
1578 * The exception is vectors - vectors are currently marked recursively,
1579 * which is inherited form tinyscheme and could be fixed by having another
1580 * word of context in the vector
1577 */ 1581 */
1578static void 1582ecb_hot static void
1579mark (pointer a) 1583mark (pointer a)
1580{ 1584{
1581 pointer t, q, p; 1585 pointer t, q, p;
1582 1586
1583 t = 0; 1587 t = 0;
1584 p = a; 1588 p = a;
1585E2: 1589E2:
1586 setmark (p); 1590 setmark (p);
1587 1591
1588 if (is_vector (p)) 1592 if (ecb_expect_false (is_vector (p)))
1589 { 1593 {
1590 int i; 1594 int i;
1591 1595
1592 for (i = 0; i < p->object.vector.length; i++) 1596 for (i = 0; i < veclength (p); i++)
1593 mark (p->object.vector.vvalue[i]); 1597 mark (vecvalue (p)[i]);
1594 } 1598 }
1595 1599
1596 if (is_atom (p)) 1600 if (is_atom (p))
1597 goto E6; 1601 goto E6;
1598 1602
… …
1640 p = q; 1644 p = q;
1641 goto E6; 1645 goto E6;
1642 } 1646 }
1643} 1647}
1644 1648
1649ecb_hot static void
1650gc_free (SCHEME_P)
1651{
1652 int i;
1653 uint32_t total = 0;
1654
1655 /* Here we scan the cells to build the free-list. */
1656 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1657 {
1658 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1659 struct cell *p;
1660 total += SCHEME_V->cell_segsize [i];
1661
1662 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1663 {
1664 pointer c = POINTER (p);
1665
1666 if (is_mark (c))
1667 clrmark (c);
1668 else
1669 {
1670 /* reclaim cell */
1671 if (typeflag (c) != T_PAIR)
1672 {
1673 finalize_cell (SCHEME_A_ c);
1674 set_typeflag (c, T_PAIR);
1675 set_car (c, NIL);
1676 }
1677
1678 ++SCHEME_V->fcells;
1679 set_cdr (c, SCHEME_V->free_cell);
1680 SCHEME_V->free_cell = c;
1681 }
1682 }
1683 }
1684
1685 if (SCHEME_V->gc_verbose)
1686 {
1687 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1688 }
1689}
1690
1645/* garbage collection. parameter a, b is marked. */ 1691/* garbage collection. parameter a, b is marked. */
1646static void 1692ecb_cold static void
1647gc (SCHEME_P_ pointer a, pointer b) 1693gc (SCHEME_P_ pointer a, pointer b)
1648{ 1694{
1649 pointer p;
1650 int i; 1695 int i;
1651 1696
1652 if (SCHEME_V->gc_verbose) 1697 if (SCHEME_V->gc_verbose)
1653 putstr (SCHEME_A_ "gc..."); 1698 putstr (SCHEME_A_ "gc...");
1654 1699
… …
1670 /* Mark recent objects the interpreter doesn't know about yet. */ 1715 /* Mark recent objects the interpreter doesn't know about yet. */
1671 mark (car (S_SINK)); 1716 mark (car (S_SINK));
1672 /* Mark any older stuff above nested C calls */ 1717 /* Mark any older stuff above nested C calls */
1673 mark (SCHEME_V->c_nest); 1718 mark (SCHEME_V->c_nest);
1674 1719
1720#if USE_INTCACHE
1721 /* mark intcache */
1722 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1723 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1724 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1725#endif
1726
1675 /* mark variables a, b */ 1727 /* mark variables a, b */
1676 mark (a); 1728 mark (a);
1677 mark (b); 1729 mark (b);
1678 1730
1679 /* garbage collect */ 1731 /* garbage collect */
1680 clrmark (NIL); 1732 clrmark (NIL);
1681 SCHEME_V->fcells = 0; 1733 SCHEME_V->fcells = 0;
1682 SCHEME_V->free_cell = NIL; 1734 SCHEME_V->free_cell = NIL;
1683 1735
1684 /* free-list is kept sorted by address so as to maintain consecutive
1685 ranges, if possible, for use with vectors. Here we scan the cells
1686 (which are also kept sorted by address) downwards to build the
1687 free-list in sorted order.
1688 */
1689 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1690 {
1691 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1692
1693 while (--p >= SCHEME_V->cell_seg[i])
1694 {
1695 if (is_mark (p))
1696 clrmark (p);
1697 else
1698 {
1699 /* reclaim cell */
1700 if (typeflag (p) != T_FREE)
1701 {
1702 finalize_cell (SCHEME_A_ p);
1703 set_typeflag (p, T_FREE);
1704 set_car (p, NIL);
1705 }
1706
1707 ++SCHEME_V->fcells;
1708 set_cdr (p, SCHEME_V->free_cell);
1709 SCHEME_V->free_cell = p;
1710 }
1711 }
1712 }
1713
1714 if (SCHEME_V->gc_verbose) 1736 if (SCHEME_V->gc_verbose)
1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1737 putstr (SCHEME_A_ "freeing...");
1716}
1717 1738
1718static void 1739 gc_free (SCHEME_A);
1719finalize_cell (SCHEME_P_ pointer a)
1720{
1721 if (is_string (a))
1722 free (strvalue (a));
1723 else if (is_vector (a))
1724 free (a->object.vector.vvalue);
1725#if USE_PORTS
1726 else if (is_port (a))
1727 {
1728 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1729 port_close (SCHEME_A_ a, port_input | port_output);
1730
1731 free (a->object.port);
1732 }
1733#endif
1734} 1740}
1735 1741
1736/* ========== Routines for Reading ========== */ 1742/* ========== Routines for Reading ========== */
1737 1743
1738static int 1744ecb_cold static int
1739file_push (SCHEME_P_ const char *fname) 1745file_push (SCHEME_P_ const char *fname)
1740{ 1746{
1741#if USE_PORTS
1742 int fin; 1747 int fin;
1743 1748
1744 if (SCHEME_V->file_i == MAXFIL - 1) 1749 if (SCHEME_V->file_i == MAXFIL - 1)
1745 return 0; 1750 return 0;
1746 1751
… …
1752 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1753 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1754 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1755 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1756 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1761 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1762 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 1763
1759#if SHOW_ERROR_LINE 1764#if SHOW_ERROR_LINE
1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1765 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1761 1766
1762 if (fname) 1767 if (fname)
1763 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1768 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1764#endif 1769#endif
1765 } 1770 }
1766 1771
1767 return fin >= 0; 1772 return fin >= 0;
1768
1769#else
1770 return 1;
1771#endif
1772} 1773}
1773 1774
1774static void 1775ecb_cold static void
1775file_pop (SCHEME_P) 1776file_pop (SCHEME_P)
1776{ 1777{
1777 if (SCHEME_V->file_i != 0) 1778 if (SCHEME_V->file_i != 0)
1778 { 1779 {
1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1780 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1780#if USE_PORTS 1781#if USE_PORTS
1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1782 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1782#endif 1783#endif
1783 SCHEME_V->file_i--; 1784 SCHEME_V->file_i--;
1784 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1785 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1785 } 1786 }
1786} 1787}
1787 1788
1788static int 1789ecb_cold static int
1789file_interactive (SCHEME_P) 1790file_interactive (SCHEME_P)
1790{ 1791{
1791#if USE_PORTS 1792#if USE_PORTS
1792 return SCHEME_V->file_i == 0 1793 return SCHEME_V->file_i == 0
1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1794 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1794 && (SCHEME_V->inport->object.port->kind & port_file); 1795 && (port (SCHEME_V->inport)->kind & port_file);
1795#else 1796#else
1796 return 0; 1797 return 0;
1797#endif 1798#endif
1798} 1799}
1799 1800
1800#if USE_PORTS 1801#if USE_PORTS
1801static port * 1802ecb_cold static port *
1802port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1803port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1803{ 1804{
1804 int fd; 1805 int fd;
1805 int flags; 1806 int flags;
1806 char *rw; 1807 char *rw;
… …
1829# endif 1830# endif
1830 1831
1831 return pt; 1832 return pt;
1832} 1833}
1833 1834
1834static pointer 1835ecb_cold static pointer
1835port_from_filename (SCHEME_P_ const char *fn, int prop) 1836port_from_filename (SCHEME_P_ const char *fn, int prop)
1836{ 1837{
1837 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1838 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1838 1839
1839 if (!pt && USE_ERROR_CHECKING) 1840 if (!pt && USE_ERROR_CHECKING)
1840 return NIL; 1841 return NIL;
1841 1842
1842 return mk_port (SCHEME_A_ pt); 1843 return mk_port (SCHEME_A_ pt);
1843} 1844}
1844 1845
1845static port * 1846ecb_cold static port *
1846port_rep_from_file (SCHEME_P_ int f, int prop) 1847port_rep_from_file (SCHEME_P_ int f, int prop)
1847{ 1848{
1848 port *pt = malloc (sizeof *pt); 1849 port *pt = malloc (sizeof *pt);
1849 1850
1850 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.stdio.file = f; 1856 pt->rep.stdio.file = f;
1856 pt->rep.stdio.closeit = 0; 1857 pt->rep.stdio.closeit = 0;
1857 return pt; 1858 return pt;
1858} 1859}
1859 1860
1860static pointer 1861ecb_cold static pointer
1861port_from_file (SCHEME_P_ int f, int prop) 1862port_from_file (SCHEME_P_ int f, int prop)
1862{ 1863{
1863 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1864 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1864 1865
1865 if (!pt && USE_ERROR_CHECKING) 1866 if (!pt && USE_ERROR_CHECKING)
1866 return NIL; 1867 return NIL;
1867 1868
1868 return mk_port (SCHEME_A_ pt); 1869 return mk_port (SCHEME_A_ pt);
1869} 1870}
1870 1871
1871static port * 1872ecb_cold static port *
1872port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1873port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1873{ 1874{
1874 port *pt = malloc (sizeof (port)); 1875 port *pt = malloc (sizeof (port));
1875 1876
1876 if (!pt && USE_ERROR_CHECKING) 1877 if (!pt && USE_ERROR_CHECKING)
… …
1882 pt->rep.string.curr = start; 1883 pt->rep.string.curr = start;
1883 pt->rep.string.past_the_end = past_the_end; 1884 pt->rep.string.past_the_end = past_the_end;
1884 return pt; 1885 return pt;
1885} 1886}
1886 1887
1887static pointer 1888ecb_cold static pointer
1888port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1889port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1889{ 1890{
1890 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1891 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1891 1892
1892 if (!pt && USE_ERROR_CHECKING) 1893 if (!pt && USE_ERROR_CHECKING)
… …
1895 return mk_port (SCHEME_A_ pt); 1896 return mk_port (SCHEME_A_ pt);
1896} 1897}
1897 1898
1898# define BLOCK_SIZE 256 1899# define BLOCK_SIZE 256
1899 1900
1900static port * 1901ecb_cold static port *
1901port_rep_from_scratch (SCHEME_P) 1902port_rep_from_scratch (SCHEME_P)
1902{ 1903{
1903 char *start; 1904 char *start;
1904 port *pt = malloc (sizeof (port)); 1905 port *pt = malloc (sizeof (port));
1905 1906
… …
1919 pt->rep.string.curr = start; 1920 pt->rep.string.curr = start;
1920 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1921 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1921 return pt; 1922 return pt;
1922} 1923}
1923 1924
1924static pointer 1925ecb_cold static pointer
1925port_from_scratch (SCHEME_P) 1926port_from_scratch (SCHEME_P)
1926{ 1927{
1927 port *pt = port_rep_from_scratch (SCHEME_A); 1928 port *pt = port_rep_from_scratch (SCHEME_A);
1928 1929
1929 if (!pt && USE_ERROR_CHECKING) 1930 if (!pt && USE_ERROR_CHECKING)
1930 return NIL; 1931 return NIL;
1931 1932
1932 return mk_port (SCHEME_A_ pt); 1933 return mk_port (SCHEME_A_ pt);
1933} 1934}
1934 1935
1935static void 1936ecb_cold static void
1936port_close (SCHEME_P_ pointer p, int flag) 1937port_close (SCHEME_P_ pointer p, int flag)
1937{ 1938{
1938 port *pt = p->object.port; 1939 port *pt = port (p);
1939 1940
1940 pt->kind &= ~flag; 1941 pt->kind &= ~flag;
1941 1942
1942 if ((pt->kind & (port_input | port_output)) == 0) 1943 if ((pt->kind & (port_input | port_output)) == 0)
1943 { 1944 {
… …
1960 } 1961 }
1961} 1962}
1962#endif 1963#endif
1963 1964
1964/* get new character from input file */ 1965/* get new character from input file */
1965static int 1966ecb_cold static int
1966inchar (SCHEME_P) 1967inchar (SCHEME_P)
1967{ 1968{
1968 int c; 1969 int c;
1969 port *pt; 1970 port *pt = port (SCHEME_V->inport);
1970
1971 pt = SCHEME_V->inport->object.port;
1972 1971
1973 if (pt->kind & port_saw_EOF) 1972 if (pt->kind & port_saw_EOF)
1974 return EOF; 1973 return EOF;
1975 1974
1976 c = basic_inchar (pt); 1975 c = basic_inchar (pt);
… …
1986 } 1985 }
1987 1986
1988 return c; 1987 return c;
1989} 1988}
1990 1989
1991static int ungot = -1; 1990ecb_cold static int
1992
1993static int
1994basic_inchar (port *pt) 1991basic_inchar (port *pt)
1995{ 1992{
1996#if USE_PORTS
1997 if (pt->unget != -1) 1993 if (pt->unget != -1)
1998 { 1994 {
1999 int r = pt->unget; 1995 int r = pt->unget;
2000 pt->unget = -1; 1996 pt->unget = -1;
2001 return r; 1997 return r;
2002 } 1998 }
2003 1999
2000#if USE_PORTS
2004 if (pt->kind & port_file) 2001 if (pt->kind & port_file)
2005 { 2002 {
2006 char c; 2003 char c;
2007 2004
2008 if (!read (pt->rep.stdio.file, &c, 1)) 2005 if (!read (pt->rep.stdio.file, &c, 1))
… …
2016 return EOF; 2013 return EOF;
2017 else 2014 else
2018 return *pt->rep.string.curr++; 2015 return *pt->rep.string.curr++;
2019 } 2016 }
2020#else 2017#else
2021 if (ungot == -1)
2022 {
2023 char c; 2018 char c;
2024 if (!read (0, &c, 1)) 2019
2020 if (!read (pt->rep.stdio.file, &c, 1))
2025 return EOF; 2021 return EOF;
2026 2022
2027 ungot = c;
2028 }
2029
2030 {
2031 int r = ungot;
2032 ungot = -1;
2033 return r; 2023 return c;
2034 }
2035#endif 2024#endif
2036} 2025}
2037 2026
2038/* back character to input buffer */ 2027/* back character to input buffer */
2039static void 2028ecb_cold static void
2040backchar (SCHEME_P_ int c) 2029backchar (SCHEME_P_ int c)
2041{ 2030{
2042#if USE_PORTS 2031 port *pt = port (SCHEME_V->inport);
2043 port *pt;
2044 2032
2045 if (c == EOF) 2033 if (c == EOF)
2046 return; 2034 return;
2047 2035
2048 pt = SCHEME_V->inport->object.port;
2049 pt->unget = c; 2036 pt->unget = c;
2050#else
2051 if (c == EOF)
2052 return;
2053
2054 ungot = c;
2055#endif
2056} 2037}
2057 2038
2058#if USE_PORTS 2039#if USE_PORTS
2059static int 2040ecb_cold static int
2060realloc_port_string (SCHEME_P_ port *p) 2041realloc_port_string (SCHEME_P_ port *p)
2061{ 2042{
2062 char *start = p->rep.string.start; 2043 char *start = p->rep.string.start;
2063 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2044 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2064 char *str = malloc (new_size); 2045 char *str = malloc (new_size);
… …
2077 else 2058 else
2078 return 0; 2059 return 0;
2079} 2060}
2080#endif 2061#endif
2081 2062
2082INTERFACE void 2063ecb_cold static void
2083putstr (SCHEME_P_ const char *s) 2064putchars (SCHEME_P_ const char *s, int len)
2084{ 2065{
2066 port *pt = port (SCHEME_V->outport);
2067
2085#if USE_PORTS 2068#if USE_PORTS
2086 port *pt = SCHEME_V->outport->object.port;
2087
2088 if (pt->kind & port_file)
2089 write (pt->rep.stdio.file, s, strlen (s));
2090 else
2091 for (; *s; s++)
2092 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2093 *pt->rep.string.curr++ = *s;
2094 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2095 *pt->rep.string.curr++ = *s;
2096
2097#else
2098 xwrstr (s);
2099#endif
2100}
2101
2102static void
2103putchars (SCHEME_P_ const char *s, int len)
2104{
2105#if USE_PORTS
2106 port *pt = SCHEME_V->outport->object.port;
2107
2108 if (pt->kind & port_file) 2069 if (pt->kind & port_file)
2109 write (pt->rep.stdio.file, s, len); 2070 write (pt->rep.stdio.file, s, len);
2110 else 2071 else
2111 { 2072 {
2112 for (; len; len--) 2073 for (; len; len--)
… …
2117 *pt->rep.string.curr++ = *s++; 2078 *pt->rep.string.curr++ = *s++;
2118 } 2079 }
2119 } 2080 }
2120 2081
2121#else 2082#else
2122 write (1, s, len); 2083 write (1, s, len); // output not initialised
2123#endif 2084#endif
2085}
2086
2087INTERFACE void
2088putstr (SCHEME_P_ const char *s)
2089{
2090 putchars (SCHEME_A_ s, strlen (s));
2124} 2091}
2125 2092
2126INTERFACE void 2093INTERFACE void
2127putcharacter (SCHEME_P_ int c) 2094putcharacter (SCHEME_P_ int c)
2128{ 2095{
2129#if USE_PORTS
2130 port *pt = SCHEME_V->outport->object.port;
2131
2132 if (pt->kind & port_file)
2133 {
2134 char cc = c;
2135 write (pt->rep.stdio.file, &cc, 1);
2136 }
2137 else
2138 {
2139 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2140 *pt->rep.string.curr++ = c;
2141 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2142 *pt->rep.string.curr++ = c;
2143 }
2144
2145#else
2146 char cc = c; 2096 char cc = c;
2147 write (1, &c, 1); 2097
2148#endif 2098 putchars (SCHEME_A_ &cc, 1);
2149} 2099}
2150 2100
2151/* read characters up to delimiter, but cater to character constants */ 2101/* read characters up to delimiter, but cater to character constants */
2152static char * 2102ecb_cold static char *
2153readstr_upto (SCHEME_P_ char *delim) 2103readstr_upto (SCHEME_P_ int skip, const char *delim)
2154{ 2104{
2155 char *p = SCHEME_V->strbuff; 2105 char *p = SCHEME_V->strbuff + skip;
2156 2106
2157 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2107 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2158 2108
2159 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2109 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2160 *p = 0; 2110 *p = 0;
… …
2166 2116
2167 return SCHEME_V->strbuff; 2117 return SCHEME_V->strbuff;
2168} 2118}
2169 2119
2170/* read string expression "xxx...xxx" */ 2120/* read string expression "xxx...xxx" */
2171static pointer 2121ecb_cold static pointer
2172readstrexp (SCHEME_P) 2122readstrexp (SCHEME_P_ char delim)
2173{ 2123{
2174 char *p = SCHEME_V->strbuff; 2124 char *p = SCHEME_V->strbuff;
2175 int c; 2125 int c;
2176 int c1 = 0; 2126 int c1 = 0;
2177 enum
2178 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2127 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2179 2128
2180 for (;;) 2129 for (;;)
2181 { 2130 {
2182 c = inchar (SCHEME_A); 2131 c = inchar (SCHEME_A);
2183 2132
… …
2185 return S_F; 2134 return S_F;
2186 2135
2187 switch (state) 2136 switch (state)
2188 { 2137 {
2189 case st_ok: 2138 case st_ok:
2190 switch (c) 2139 if (ecb_expect_false (c == delim))
2191 {
2192 case '\\':
2193 state = st_bsl;
2194 break;
2195
2196 case '"':
2197 *p = 0;
2198 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2140 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2199 2141
2200 default: 2142 if (ecb_expect_false (c == '\\'))
2143 state = st_bsl;
2144 else
2201 *p++ = c; 2145 *p++ = c;
2202 break;
2203 }
2204 2146
2205 break; 2147 break;
2206 2148
2207 case st_bsl: 2149 case st_bsl:
2208 switch (c) 2150 switch (c)
… …
2217 case '7': 2159 case '7':
2218 state = st_oct1; 2160 state = st_oct1;
2219 c1 = c - '0'; 2161 c1 = c - '0';
2220 break; 2162 break;
2221 2163
2164 case 'a': *p++ = '\a'; state = st_ok; break;
2165 case 'n': *p++ = '\n'; state = st_ok; break;
2166 case 'r': *p++ = '\r'; state = st_ok; break;
2167 case 't': *p++ = '\t'; state = st_ok; break;
2168
2169 // this overshoots the minimum requirements of r7rs
2170 case ' ':
2171 case '\t':
2172 case '\r':
2173 case '\n':
2174 skipspace (SCHEME_A);
2175 state = st_ok;
2176 break;
2177
2178 //TODO: x should end in ;, not two-digit hex
2222 case 'x': 2179 case 'x':
2223 case 'X': 2180 case 'X':
2224 state = st_x1; 2181 state = st_x1;
2225 c1 = 0; 2182 c1 = 0;
2226 break; 2183 break;
2227 2184
2228 case 'n':
2229 *p++ = '\n';
2230 state = st_ok;
2231 break;
2232
2233 case 't':
2234 *p++ = '\t';
2235 state = st_ok;
2236 break;
2237
2238 case 'r':
2239 *p++ = '\r';
2240 state = st_ok;
2241 break;
2242
2243 case '"':
2244 *p++ = '"';
2245 state = st_ok;
2246 break;
2247
2248 default: 2185 default:
2249 *p++ = c; 2186 *p++ = c;
2250 state = st_ok; 2187 state = st_ok;
2251 break; 2188 break;
2252 } 2189 }
2253 2190
2254 break; 2191 break;
2255 2192
2256 case st_x1: 2193 case st_x1:
2257 case st_x2: 2194 case st_x2:
2258 c = toupper (c); 2195 c = tolower (c);
2259 2196
2260 if (c >= '0' && c <= 'F') 2197 if (c >= '0' && c <= '9')
2261 {
2262 if (c <= '9')
2263 c1 = (c1 << 4) + c - '0'; 2198 c1 = (c1 << 4) + c - '0';
2264 else 2199 else if (c >= 'a' && c <= 'f')
2265 c1 = (c1 << 4) + c - 'A' + 10; 2200 c1 = (c1 << 4) + c - 'a' + 10;
2266
2267 if (state == st_x1)
2268 state = st_x2;
2269 else
2270 {
2271 *p++ = c1;
2272 state = st_ok;
2273 }
2274 }
2275 else 2201 else
2276 return S_F; 2202 return S_F;
2203
2204 if (state == st_x1)
2205 state = st_x2;
2206 else
2207 {
2208 *p++ = c1;
2209 state = st_ok;
2210 }
2277 2211
2278 break; 2212 break;
2279 2213
2280 case st_oct1: 2214 case st_oct1:
2281 case st_oct2: 2215 case st_oct2:
… …
2285 backchar (SCHEME_A_ c); 2219 backchar (SCHEME_A_ c);
2286 state = st_ok; 2220 state = st_ok;
2287 } 2221 }
2288 else 2222 else
2289 { 2223 {
2290 if (state == st_oct2 && c1 >= 32) 2224 if (state == st_oct2 && c1 >= ' ')
2291 return S_F; 2225 return S_F;
2292 2226
2293 c1 = (c1 << 3) + (c - '0'); 2227 c1 = (c1 << 3) + (c - '0');
2294 2228
2295 if (state == st_oct1) 2229 if (state == st_oct1)
… …
2300 state = st_ok; 2234 state = st_ok;
2301 } 2235 }
2302 } 2236 }
2303 2237
2304 break; 2238 break;
2305
2306 } 2239 }
2307 } 2240 }
2308} 2241}
2309 2242
2310/* check c is in chars */ 2243/* check c is in chars */
2311static INLINE int 2244ecb_cold int
2312is_one_of (char *s, int c) 2245is_one_of (const char *s, int c)
2313{ 2246{
2314 if (c == EOF)
2315 return 1;
2316
2317 return !!strchr (s, c); 2247 return c == EOF || !!strchr (s, c);
2318} 2248}
2319 2249
2320/* skip white characters */ 2250/* skip white characters */
2321static INLINE int 2251ecb_cold int
2322skipspace (SCHEME_P) 2252skipspace (SCHEME_P)
2323{ 2253{
2324 int c, curr_line = 0; 2254 int c, curr_line = 0;
2325 2255
2326 do 2256 do
2327 { 2257 {
2328 c = inchar (SCHEME_A); 2258 c = inchar (SCHEME_A);
2259
2329#if SHOW_ERROR_LINE 2260#if SHOW_ERROR_LINE
2330 if (c == '\n') 2261 if (ecb_expect_false (c == '\n'))
2331 curr_line++; 2262 curr_line++;
2332#endif 2263#endif
2264
2265 if (ecb_expect_false (c == EOF))
2266 return c;
2333 } 2267 }
2334 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2268 while (is_one_of (WHITESPACE, c));
2335 2269
2336 /* record it */ 2270 /* record it */
2337#if SHOW_ERROR_LINE 2271#if SHOW_ERROR_LINE
2338 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2272 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2339 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2273 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2340#endif 2274#endif
2341 2275
2342 if (c != EOF)
2343 {
2344 backchar (SCHEME_A_ c); 2276 backchar (SCHEME_A_ c);
2345 return 1; 2277 return 1;
2346 }
2347 else
2348 return EOF;
2349} 2278}
2350 2279
2351/* get token */ 2280/* get token */
2352static int 2281ecb_cold static int
2353token (SCHEME_P) 2282token (SCHEME_P)
2354{ 2283{
2355 int c = skipspace (SCHEME_A); 2284 int c = skipspace (SCHEME_A);
2356 2285
2357 if (c == EOF) 2286 if (c == EOF)
… …
2369 return TOK_RPAREN; 2298 return TOK_RPAREN;
2370 2299
2371 case '.': 2300 case '.':
2372 c = inchar (SCHEME_A); 2301 c = inchar (SCHEME_A);
2373 2302
2374 if (is_one_of (" \n\t", c)) 2303 if (is_one_of (WHITESPACE, c))
2375 return TOK_DOT; 2304 return TOK_DOT;
2376 else 2305 else
2377 { 2306 {
2378 //TODO: ungetc twice in a row is not supported in C
2379 backchar (SCHEME_A_ c); 2307 backchar (SCHEME_A_ c);
2380 backchar (SCHEME_A_ '.');
2381 return TOK_ATOM; 2308 return TOK_DOTATOM;
2382 } 2309 }
2310
2311 case '|':
2312 return TOK_STRATOM;
2383 2313
2384 case '\'': 2314 case '\'':
2385 return TOK_QUOTE; 2315 return TOK_QUOTE;
2386 2316
2387 case ';': 2317 case ';':
… …
2454} 2384}
2455 2385
2456/* ========== Routines for Printing ========== */ 2386/* ========== Routines for Printing ========== */
2457#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2387#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2458 2388
2459static void 2389ecb_cold static void
2460printslashstring (SCHEME_P_ char *p, int len) 2390printslashstring (SCHEME_P_ char *p, int len)
2461{ 2391{
2462 int i; 2392 int i;
2463 unsigned char *s = (unsigned char *) p; 2393 unsigned char *s = (unsigned char *) p;
2464 2394
… …
2519 } 2449 }
2520 2450
2521 putcharacter (SCHEME_A_ '"'); 2451 putcharacter (SCHEME_A_ '"');
2522} 2452}
2523 2453
2524
2525/* print atoms */ 2454/* print atoms */
2526static void 2455ecb_cold static void
2527printatom (SCHEME_P_ pointer l, int f) 2456printatom (SCHEME_P_ pointer l, int f)
2528{ 2457{
2529 char *p; 2458 char *p;
2530 int len; 2459 int len;
2531 2460
2532 atom2str (SCHEME_A_ l, f, &p, &len); 2461 atom2str (SCHEME_A_ l, f, &p, &len);
2533 putchars (SCHEME_A_ p, len); 2462 putchars (SCHEME_A_ p, len);
2534} 2463}
2535 2464
2536
2537/* Uses internal buffer unless string pointer is already available */ 2465/* Uses internal buffer unless string pointer is already available */
2538static void 2466ecb_cold static void
2539atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2467atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2540{ 2468{
2541 char *p; 2469 char *p;
2542 2470
2543 if (l == NIL) 2471 if (l == NIL)
… …
2554 { 2482 {
2555 p = SCHEME_V->strbuff; 2483 p = SCHEME_V->strbuff;
2556 2484
2557 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2485 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2558 { 2486 {
2559 if (num_is_integer (l)) 2487 if (is_integer (l))
2560 xnum (p, ivalue_unchecked (l)); 2488 xnum (p, ivalue_unchecked (l));
2561#if USE_FLOAT 2489#if USE_REAL
2562 else 2490 else
2563 { 2491 {
2564 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2492 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2565 /* r5rs says there must be a '.' (unless 'e'?) */ 2493 /* r5rs says there must be a '.' (unless 'e'?) */
2566 f = strcspn (p, ".e"); 2494 f = strcspn (p, ".e");
… …
2701#endif 2629#endif
2702 } 2630 }
2703 else if (is_continuation (l)) 2631 else if (is_continuation (l))
2704 p = "#<CONTINUATION>"; 2632 p = "#<CONTINUATION>";
2705 else 2633 else
2634 {
2635#if USE_PRINTF
2636 p = SCHEME_V->strbuff;
2637 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2638#else
2706 p = "#<ERROR>"; 2639 p = "#<ERROR>";
2640#endif
2641 }
2707 2642
2708 *pp = p; 2643 *pp = p;
2709 *plen = strlen (p); 2644 *plen = strlen (p);
2710} 2645}
2711 2646
… …
2743 return car (d); 2678 return car (d);
2744 2679
2745 p = cons (car (d), cdr (d)); 2680 p = cons (car (d), cdr (d));
2746 q = p; 2681 q = p;
2747 2682
2748 while (cdr (cdr (p)) != NIL) 2683 while (cddr (p) != NIL)
2749 { 2684 {
2750 d = cons (car (p), cdr (p)); 2685 d = cons (car (p), cdr (p));
2751 2686
2752 if (cdr (cdr (p)) != NIL) 2687 if (cddr (p) != NIL)
2753 p = cdr (d); 2688 p = cdr (d);
2754 } 2689 }
2755 2690
2756 set_cdr (p, car (cdr (p))); 2691 set_cdr (p, cadr (p));
2757 return q; 2692 return q;
2758} 2693}
2759 2694
2760/* reverse list -- produce new list */ 2695/* reverse list -- produce new list */
2761static pointer 2696ecb_hot static pointer
2762reverse (SCHEME_P_ pointer a) 2697reverse (SCHEME_P_ pointer a)
2763{ 2698{
2764 /* a must be checked by gc */ 2699 /* a must be checked by gc */
2765 pointer p = NIL; 2700 pointer p = NIL;
2766 2701
… …
2769 2704
2770 return p; 2705 return p;
2771} 2706}
2772 2707
2773/* reverse list --- in-place */ 2708/* reverse list --- in-place */
2774static pointer 2709ecb_hot static pointer
2775reverse_in_place (SCHEME_P_ pointer term, pointer list) 2710reverse_in_place (SCHEME_P_ pointer term, pointer list)
2776{ 2711{
2777 pointer result = term; 2712 pointer result = term;
2778 pointer p = list; 2713 pointer p = list;
2779 2714
… …
2787 2722
2788 return result; 2723 return result;
2789} 2724}
2790 2725
2791/* append list -- produce new list (in reverse order) */ 2726/* append list -- produce new list (in reverse order) */
2792static pointer 2727ecb_hot static pointer
2793revappend (SCHEME_P_ pointer a, pointer b) 2728revappend (SCHEME_P_ pointer a, pointer b)
2794{ 2729{
2795 pointer result = a; 2730 pointer result = a;
2796 pointer p = b; 2731 pointer p = b;
2797 2732
… …
2806 2741
2807 return S_F; /* signal an error */ 2742 return S_F; /* signal an error */
2808} 2743}
2809 2744
2810/* equivalence of atoms */ 2745/* equivalence of atoms */
2811int 2746ecb_hot int
2812eqv (pointer a, pointer b) 2747eqv (pointer a, pointer b)
2813{ 2748{
2814 if (is_string (a)) 2749 if (is_string (a))
2815 { 2750 {
2816 if (is_string (b)) 2751 if (is_string (b))
… …
2819 return 0; 2754 return 0;
2820 } 2755 }
2821 else if (is_number (a)) 2756 else if (is_number (a))
2822 { 2757 {
2823 if (is_number (b)) 2758 if (is_number (b))
2824 if (num_is_integer (a) == num_is_integer (b))
2825 return num_eq (nvalue (a), nvalue (b)); 2759 return num_cmp (nvalue (a), nvalue (b)) == 0;
2826 2760
2827 return 0; 2761 return 0;
2828 } 2762 }
2829 else if (is_character (a)) 2763 else if (is_character (a))
2830 { 2764 {
… …
2856/* () is #t in R5RS */ 2790/* () is #t in R5RS */
2857#define is_true(p) ((p) != S_F) 2791#define is_true(p) ((p) != S_F)
2858#define is_false(p) ((p) == S_F) 2792#define is_false(p) ((p) == S_F)
2859 2793
2860/* ========== Environment implementation ========== */ 2794/* ========== Environment implementation ========== */
2861
2862#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2863
2864static int
2865hash_fn (const char *key, int table_size)
2866{
2867 const unsigned char *p = key;
2868 uint32_t hash = 2166136261;
2869
2870 while (*p)
2871 hash = (hash ^ *p++) * 16777619;
2872
2873 return hash % table_size;
2874}
2875#endif
2876 2795
2877#ifndef USE_ALIST_ENV 2796#ifndef USE_ALIST_ENV
2878 2797
2879/* 2798/*
2880 * In this implementation, each frame of the environment may be 2799 * In this implementation, each frame of the environment may be
… …
2897 2816
2898 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2817 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2899 setenvironment (SCHEME_V->envir); 2818 setenvironment (SCHEME_V->envir);
2900} 2819}
2901 2820
2902static INLINE void 2821static uint32_t
2822sym_hash (pointer sym, uint32_t size)
2823{
2824 uintptr_t ptr = (uintptr_t)sym;
2825
2826#if 0
2827 /* table size is prime, so why mix */
2828 ptr += ptr >> 32;
2829 ptr += ptr >> 16;
2830 ptr += ptr >> 8;
2831#endif
2832
2833 return ptr % size;
2834}
2835
2836ecb_inline void
2903new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2837new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2904{ 2838{
2905 pointer slot = immutable_cons (variable, value); 2839 pointer slot = immutable_cons (variable, value);
2906 2840
2907 if (is_vector (car (env))) 2841 if (is_vector (car (env)))
2908 { 2842 {
2909 int location = hash_fn (symname (variable), vector_length (car (env))); 2843 int location = sym_hash (variable, veclength (car (env)));
2910
2911 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2844 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2912 } 2845 }
2913 else 2846 else
2914 set_car (env, immutable_cons (slot, car (env))); 2847 set_car (env, immutable_cons (slot, car (env)));
2915} 2848}
2916 2849
2917static pointer 2850ecb_hot static pointer
2918find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2851find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2919{ 2852{
2920 pointer x, y; 2853 pointer x, y;
2921 int location;
2922 2854
2923 for (x = env; x != NIL; x = cdr (x)) 2855 for (x = env; x != NIL; x = cdr (x))
2924 { 2856 {
2925 if (is_vector (car (x))) 2857 if (is_vector (car (x)))
2926 { 2858 {
2927 location = hash_fn (symname (hdl), vector_length (car (x))); 2859 int location = sym_hash (hdl, veclength (car (x)));
2928 y = vector_elem (car (x), location); 2860 y = vector_get (car (x), location);
2929 } 2861 }
2930 else 2862 else
2931 y = car (x); 2863 y = car (x);
2932 2864
2933 for (; y != NIL; y = cdr (y)) 2865 for (; y != NIL; y = cdr (y))
2934 if (caar (y) == hdl) 2866 if (caar (y) == hdl)
2935 break; 2867 break;
2936 2868
2937 if (y != NIL) 2869 if (y != NIL)
2870 return car (y);
2871
2872 if (!all)
2938 break; 2873 break;
2939
2940 if (!all)
2941 return NIL;
2942 } 2874 }
2943
2944 if (x != NIL)
2945 return car (y);
2946 2875
2947 return NIL; 2876 return NIL;
2948} 2877}
2949 2878
2950#else /* USE_ALIST_ENV */ 2879#else /* USE_ALIST_ENV */
2951 2880
2952static INLINE void 2881static void
2953new_frame_in_env (SCHEME_P_ pointer old_env) 2882new_frame_in_env (SCHEME_P_ pointer old_env)
2954{ 2883{
2955 SCHEME_V->envir = immutable_cons (NIL, old_env); 2884 SCHEME_V->envir = immutable_cons (NIL, old_env);
2956 setenvironment (SCHEME_V->envir); 2885 setenvironment (SCHEME_V->envir);
2957} 2886}
2958 2887
2959static INLINE void 2888static void
2960new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2889new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2961{ 2890{
2962 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2891 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2963} 2892}
2964 2893
2965static pointer 2894ecb_hot static pointer
2966find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2895find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2967{ 2896{
2968 pointer x, y; 2897 pointer x, y;
2969 2898
2970 for (x = env; x != NIL; x = cdr (x)) 2899 for (x = env; x != NIL; x = cdr (x))
… …
2972 for (y = car (x); y != NIL; y = cdr (y)) 2901 for (y = car (x); y != NIL; y = cdr (y))
2973 if (caar (y) == hdl) 2902 if (caar (y) == hdl)
2974 break; 2903 break;
2975 2904
2976 if (y != NIL) 2905 if (y != NIL)
2906 return car (y);
2977 break; 2907 break;
2978 2908
2979 if (!all) 2909 if (!all)
2980 return NIL; 2910 break;
2981 } 2911 }
2982
2983 if (x != NIL)
2984 return car (y);
2985 2912
2986 return NIL; 2913 return NIL;
2987} 2914}
2988 2915
2989#endif /* USE_ALIST_ENV else */ 2916#endif /* USE_ALIST_ENV else */
2990 2917
2991static INLINE void 2918static void
2992new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2919new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2993{ 2920{
2921 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2994 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2922 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2995} 2923}
2996 2924
2997static INLINE void 2925static void
2998set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2926set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2999{ 2927{
3000 set_cdr (slot, value); 2928 set_cdr (slot, value);
3001} 2929}
3002 2930
3003static INLINE pointer 2931static pointer
3004slot_value_in_env (pointer slot) 2932slot_value_in_env (pointer slot)
3005{ 2933{
3006 return cdr (slot); 2934 return cdr (slot);
3007} 2935}
3008 2936
3009/* ========== Evaluation Cycle ========== */ 2937/* ========== Evaluation Cycle ========== */
3010 2938
3011static pointer 2939ecb_cold static int
3012xError_1 (SCHEME_P_ const char *s, pointer a) 2940xError_1 (SCHEME_P_ const char *s, pointer a)
3013{ 2941{
3014#if USE_ERROR_HOOK 2942#if USE_ERROR_HOOK
3015 pointer x; 2943 pointer x;
3016 pointer hdl = SCHEME_V->ERROR_HOOK; 2944 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3042#if USE_ERROR_HOOK 2970#if USE_ERROR_HOOK
3043 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2971 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3044 2972
3045 if (x != NIL) 2973 if (x != NIL)
3046 { 2974 {
3047 if (a) 2975 pointer code = a
3048 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2976 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3049 else 2977 : NIL;
3050 SCHEME_V->code = NIL;
3051 2978
3052 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2979 code = cons (mk_string (SCHEME_A_ s), code);
3053 setimmutable (car (SCHEME_V->code)); 2980 setimmutable (car (code));
3054 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2981 SCHEME_V->code = cons (slot_value_in_env (x), code);
3055 SCHEME_V->op = OP_EVAL; 2982 SCHEME_V->op = OP_EVAL;
3056 2983
3057 return S_T; 2984 return 0;
3058 } 2985 }
3059#endif 2986#endif
3060 2987
3061 if (a) 2988 if (a)
3062 SCHEME_V->args = cons (a, NIL); 2989 SCHEME_V->args = cons (a, NIL);
… …
3064 SCHEME_V->args = NIL; 2991 SCHEME_V->args = NIL;
3065 2992
3066 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2993 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3067 setimmutable (car (SCHEME_V->args)); 2994 setimmutable (car (SCHEME_V->args));
3068 SCHEME_V->op = OP_ERR0; 2995 SCHEME_V->op = OP_ERR0;
2996
3069 return S_T; 2997 return 0;
3070} 2998}
3071 2999
3072#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3000#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3073#define Error_0(s) Error_1 (s, 0) 3001#define Error_0(s) Error_1 (s, 0)
3074 3002
3075/* Too small to turn into function */ 3003/* Too small to turn into function */
3076#define BEGIN do { 3004#define BEGIN do {
3077#define END } while (0) 3005#define END } while (0)
3078#define s_goto(a) BEGIN \ 3006#define s_goto(a) BEGIN \
3079 SCHEME_V->op = a; \ 3007 SCHEME_V->op = a; \
3080 return S_T; END 3008 return 0; END
3081 3009
3082#define s_return(a) return xs_return (SCHEME_A_ a) 3010#define s_return(a) return xs_return (SCHEME_A_ a)
3083 3011
3084#ifndef USE_SCHEME_STACK 3012#ifndef USE_SCHEME_STACK
3085 3013
… …
3092 pointer code; 3020 pointer code;
3093}; 3021};
3094 3022
3095# define STACK_GROWTH 3 3023# define STACK_GROWTH 3
3096 3024
3097static void 3025ecb_hot static void
3098s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3026s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3099{ 3027{
3100 int nframes = (uintptr_t)SCHEME_V->dump; 3028 int nframes = (uintptr_t)SCHEME_V->dump;
3101 struct dump_stack_frame *next_frame; 3029 struct dump_stack_frame *next_frame;
3102 3030
3103 /* enough room for the next frame? */ 3031 /* enough room for the next frame? */
3104 if (nframes >= SCHEME_V->dump_size) 3032 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3105 { 3033 {
3106 SCHEME_V->dump_size += STACK_GROWTH; 3034 SCHEME_V->dump_size += STACK_GROWTH;
3107 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3035 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3108 } 3036 }
3109 3037
3110 next_frame = SCHEME_V->dump_base + nframes; 3038 next_frame = SCHEME_V->dump_base + nframes;
3111 3039
3112 next_frame->op = op; 3040 next_frame->op = op;
3113 next_frame->args = args; 3041 next_frame->args = args;
3114 next_frame->envir = SCHEME_V->envir; 3042 next_frame->envir = SCHEME_V->envir;
3115 next_frame->code = code; 3043 next_frame->code = code;
3116 3044
3117 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3045 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3118} 3046}
3119 3047
3120static pointer 3048static ecb_hot int
3121xs_return (SCHEME_P_ pointer a) 3049xs_return (SCHEME_P_ pointer a)
3122{ 3050{
3123 int nframes = (uintptr_t)SCHEME_V->dump; 3051 int nframes = (uintptr_t)SCHEME_V->dump;
3124 struct dump_stack_frame *frame; 3052 struct dump_stack_frame *frame;
3125 3053
3126 SCHEME_V->value = a; 3054 SCHEME_V->value = a;
3127 3055
3128 if (nframes <= 0) 3056 if (nframes <= 0)
3129 return NIL; 3057 return -1;
3130 3058
3131 frame = &SCHEME_V->dump_base[--nframes]; 3059 frame = &SCHEME_V->dump_base[--nframes];
3132 SCHEME_V->op = frame->op; 3060 SCHEME_V->op = frame->op;
3133 SCHEME_V->args = frame->args; 3061 SCHEME_V->args = frame->args;
3134 SCHEME_V->envir = frame->envir; 3062 SCHEME_V->envir = frame->envir;
3135 SCHEME_V->code = frame->code; 3063 SCHEME_V->code = frame->code;
3136 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3064 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3137 3065
3138 return S_T; 3066 return 0;
3139} 3067}
3140 3068
3141static INLINE void 3069ecb_cold void
3142dump_stack_reset (SCHEME_P) 3070dump_stack_reset (SCHEME_P)
3143{ 3071{
3144 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3072 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3145 SCHEME_V->dump = (pointer)+0; 3073 SCHEME_V->dump = (pointer)+0;
3146} 3074}
3147 3075
3148static INLINE void 3076ecb_cold void
3149dump_stack_initialize (SCHEME_P) 3077dump_stack_initialize (SCHEME_P)
3150{ 3078{
3151 SCHEME_V->dump_size = 0; 3079 SCHEME_V->dump_size = 0;
3152 SCHEME_V->dump_base = 0; 3080 SCHEME_V->dump_base = 0;
3153 dump_stack_reset (SCHEME_A); 3081 dump_stack_reset (SCHEME_A);
3154} 3082}
3155 3083
3156static void 3084ecb_cold static void
3157dump_stack_free (SCHEME_P) 3085dump_stack_free (SCHEME_P)
3158{ 3086{
3159 free (SCHEME_V->dump_base); 3087 free (SCHEME_V->dump_base);
3160 SCHEME_V->dump_base = 0; 3088 SCHEME_V->dump_base = 0;
3161 SCHEME_V->dump = (pointer)0; 3089 SCHEME_V->dump = (pointer)0;
3162 SCHEME_V->dump_size = 0; 3090 SCHEME_V->dump_size = 0;
3163} 3091}
3164 3092
3165static void 3093ecb_cold static void
3166dump_stack_mark (SCHEME_P) 3094dump_stack_mark (SCHEME_P)
3167{ 3095{
3168 int nframes = (uintptr_t)SCHEME_V->dump; 3096 int nframes = (uintptr_t)SCHEME_V->dump;
3169 int i; 3097 int i;
3170 3098
… …
3176 mark (frame->envir); 3104 mark (frame->envir);
3177 mark (frame->code); 3105 mark (frame->code);
3178 } 3106 }
3179} 3107}
3180 3108
3181static pointer 3109ecb_cold static pointer
3182ss_get_cont (SCHEME_P) 3110ss_get_cont (SCHEME_P)
3183{ 3111{
3184 int nframes = (uintptr_t)SCHEME_V->dump; 3112 int nframes = (uintptr_t)SCHEME_V->dump;
3185 int i; 3113 int i;
3186 3114
… …
3198 } 3126 }
3199 3127
3200 return cont; 3128 return cont;
3201} 3129}
3202 3130
3203static void 3131ecb_cold static void
3204ss_set_cont (SCHEME_P_ pointer cont) 3132ss_set_cont (SCHEME_P_ pointer cont)
3205{ 3133{
3206 int i = 0; 3134 int i = 0;
3207 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3135 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3208 3136
3209 while (cont != NIL) 3137 while (cont != NIL)
3210 { 3138 {
3211 frame->op = ivalue (car (cont)); cont = cdr (cont); 3139 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3212 frame->args = car (cont) ; cont = cdr (cont); 3140 frame->args = car (cont) ; cont = cdr (cont);
3213 frame->envir = car (cont) ; cont = cdr (cont); 3141 frame->envir = car (cont) ; cont = cdr (cont);
3214 frame->code = car (cont) ; cont = cdr (cont); 3142 frame->code = car (cont) ; cont = cdr (cont);
3215 3143
3216 ++frame; 3144 ++frame;
3217 ++i; 3145 ++i;
3218 } 3146 }
3219 3147
3220 SCHEME_V->dump = (pointer)(uintptr_t)i; 3148 SCHEME_V->dump = (pointer)(uintptr_t)i;
3221} 3149}
3222 3150
3223#else 3151#else
3224 3152
3225static INLINE void 3153ecb_cold void
3226dump_stack_reset (SCHEME_P) 3154dump_stack_reset (SCHEME_P)
3227{ 3155{
3228 SCHEME_V->dump = NIL; 3156 SCHEME_V->dump = NIL;
3229} 3157}
3230 3158
3231static INLINE void 3159ecb_cold void
3232dump_stack_initialize (SCHEME_P) 3160dump_stack_initialize (SCHEME_P)
3233{ 3161{
3234 dump_stack_reset (SCHEME_A); 3162 dump_stack_reset (SCHEME_A);
3235} 3163}
3236 3164
3237static void 3165ecb_cold static void
3238dump_stack_free (SCHEME_P) 3166dump_stack_free (SCHEME_P)
3239{ 3167{
3240 SCHEME_V->dump = NIL; 3168 SCHEME_V->dump = NIL;
3241} 3169}
3242 3170
3243static pointer 3171ecb_hot static int
3244xs_return (SCHEME_P_ pointer a) 3172xs_return (SCHEME_P_ pointer a)
3245{ 3173{
3246 pointer dump = SCHEME_V->dump; 3174 pointer dump = SCHEME_V->dump;
3247 3175
3248 SCHEME_V->value = a; 3176 SCHEME_V->value = a;
3249 3177
3250 if (dump == NIL) 3178 if (dump == NIL)
3251 return NIL; 3179 return -1;
3252 3180
3253 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3181 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3254 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3255 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3183 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3256 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3184 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3257 3185
3258 SCHEME_V->dump = dump; 3186 SCHEME_V->dump = dump;
3259 3187
3260 return S_T; 3188 return 0;
3261} 3189}
3262 3190
3263static void 3191ecb_hot static void
3264s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3192s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3265{ 3193{
3266 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3194 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3267 cons (args, 3195 cons (args,
3268 cons (SCHEME_V->envir, 3196 cons (SCHEME_V->envir,
3269 cons (code, 3197 cons (code,
3270 SCHEME_V->dump)))); 3198 SCHEME_V->dump))));
3271} 3199}
3272 3200
3201ecb_cold static void
3202dump_stack_mark (SCHEME_P)
3203{
3204 mark (SCHEME_V->dump);
3205}
3206
3207ecb_cold static pointer
3208ss_get_cont (SCHEME_P)
3209{
3210 return SCHEME_V->dump;
3211}
3212
3213ecb_cold static void
3214ss_set_cont (SCHEME_P_ pointer cont)
3215{
3216 SCHEME_V->dump = cont;
3217}
3218
3219#endif
3220
3221#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3222
3223#if EXPERIMENT
3224
3225typedef void *stream[1];
3226
3227#define stream_init() { 0 }
3228
3229ecb_cold static void
3230stream_put (void **s, uint8_t byte)
3231{
3232 uint32_t *sp = *s;
3233 uint32_t size = sizeof (uint32_t) * 2;
3234 uint32_t offs = size;
3235
3236 if (ecb_expect_true (sp))
3237 {
3238 offs = sp[0];
3239 size = sp[1];
3240 }
3241
3242 if (ecb_expect_false (offs == size))
3243 {
3244 size *= 2;
3245 sp = realloc (sp, size);
3246 *s = sp;
3247 sp[1] = size;
3248
3249 }
3250
3251 ((uint8_t *)sp)[offs++] = byte;
3252 sp[0] = offs;
3253}
3254
3255#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3256#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3257#define stream_free(s) free (s[0])
3258
3259// calculates a (preferably small) integer that makes it possible to find
3260// the symbol again. if pointers were offsets into a memory area... until
3261// then, we return segment number in the low bits, and offset in the high
3262// bits
3263static uint32_t
3264symbol_id (SCHEME_P_ pointer sym)
3265{
3266 struct cell *p = CELL (sym);
3267 int i;
3268
3269 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3270 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3271 {
3272 printf ("seg %d ofs %d/%d\n",i,(p - SCHEME_V->cell_seg[i]),SCHEME_V->cell_segsize[i]);//D
3273 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3274 }
3275
3276 abort ();
3277}
3278
3273static void 3279static void
3274dump_stack_mark (SCHEME_P) 3280compile (SCHEME_P_ stream s, pointer x)
3275{ 3281{
3276 mark (SCHEME_V->dump); 3282 if (x == NIL)
3277} 3283 {
3284 stream_put (s, 0);
3285 return;
3286 }
3278 3287
3288 if (is_syntax (x))
3289 {
3290 stream_put (s, 1);
3291 stream_put (s, syntaxnum (x));
3292 return;
3293 }
3294
3295 switch (type (x))
3296 {
3297 case T_INTEGER:
3298 stream_put (s, 2);
3299 stream_put (s, 0);
3300 stream_put (s, 0);
3301 stream_put (s, 0);
3302 stream_put (s, 0);
3303 return;
3304
3305 case T_SYMBOL:
3306 {
3307 uint32_t sym = symbol_id (SCHEME_A_ x);
3308 printf ("sym %x\n", sym);//D
3309
3310 stream_put (s, 3);
3311
3312 while (sym > 0x7f)
3313 {
3314 stream_put (s, sym | 0x80);
3315 sym >>= 8;
3316 }
3317
3318 stream_put (s, sym);
3319 }
3320 return;
3321
3322 case T_PAIR:
3323 stream_put (s, 4);
3324 while (x != NIL)
3325 {
3326 compile (SCHEME_A_ s, car (x));
3327 x = cdr (x);
3328 }
3329 stream_put (s, 0xff);
3330 return;
3331
3332 default:
3333 stream_put (s, 5);
3334 stream_put (s, type (x));
3335 stream_put (s, 0);
3336 stream_put (s, 0);
3337 stream_put (s, 0);
3338 stream_put (s, 0);
3339 break;
3340 }
3341}
3342
3279static pointer 3343static int
3280ss_get_cont (SCHEME_P) 3344compile_closure (SCHEME_P_ pointer p)
3281{ 3345{
3282 return SCHEME_V->dump; 3346 stream s = stream_init ();
3283}
3284 3347
3285static void 3348 printatom (SCHEME_A_ p, 1);//D
3286ss_set_cont (SCHEME_P_ pointer cont) 3349 compile (SCHEME_A_ s, car (p));
3287{
3288 SCHEME_V->dump = cont;
3289}
3290 3350
3291#endif 3351 FILE *xxd = popen ("xxd", "we");
3352 fwrite (stream_data (s), 1, stream_size (s), xxd);
3353 fclose (xxd);
3292 3354
3293#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3355 return stream_size (s);
3356}
3294 3357
3295static pointer 3358static int
3359dtree (SCHEME_P_ int indent, pointer x)
3360{
3361 int c;
3362
3363 if (is_syntax (x))
3364 {
3365 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3366 return 8 + 8;
3367 }
3368
3369 if (x == NIL)
3370 {
3371 printf ("%*sNIL\n", indent, "");
3372 return 3;
3373 }
3374
3375 switch (type (x))
3376 {
3377 case T_INTEGER:
3378 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3379 return 32+8;
3380
3381 case T_SYMBOL:
3382 printf ("%*sS<%s>\n", indent, "", symname (x));
3383 return 24+8;
3384
3385 case T_CLOSURE:
3386 printf ("%*sS<%s>\n", indent, "", "closure");
3387 dtree (SCHEME_A_ indent + 3, cdr(x));
3388 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3389
3390 case T_PAIR:
3391 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3392 c = dtree (SCHEME_A_ indent + 3, car (x));
3393 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3394 return c + 1;
3395
3396 case T_PORT:
3397 printf ("%*sS<%s>\n", indent, "", "port");
3398 return 24+8;
3399
3400 case T_VECTOR:
3401 printf ("%*sS<%s>\n", indent, "", "vector");
3402 return 24+8;
3403
3404 case T_ENVIRONMENT:
3405 printf ("%*sS<%s>\n", indent, "", "environment");
3406 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3407
3408 default:
3409 printf ("unhandled type %d\n", type (x));
3410 break;
3411 }
3412}
3413#endif
3414
3415/* syntax, eval, core, ... */
3416ecb_hot static int
3296opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3417opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3297{ 3418{
3419 pointer args = SCHEME_V->args;
3298 pointer x, y; 3420 pointer x, y;
3299 3421
3300 switch (op) 3422 switch (op)
3301 { 3423 {
3424#if EXPERIMENT //D
3425 case OP_DEBUG:
3426 {
3427 uint32_t len = compile_closure (SCHEME_A_ car (args));
3428 printf ("len = %d\n", len);
3429 printf ("\n");
3430 s_return (S_T);
3431 }
3432#endif
3302 case OP_LOAD: /* load */ 3433 case OP_LOAD: /* load */
3303 if (file_interactive (SCHEME_A)) 3434 if (file_interactive (SCHEME_A))
3304 { 3435 {
3305 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3436 putstr (SCHEME_A_ "Loading ");
3306 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3437 putstr (SCHEME_A_ strvalue (car (args)));
3438 putcharacter (SCHEME_A_ '\n');
3307 } 3439 }
3308 3440
3309 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3441 if (!file_push (SCHEME_A_ strvalue (car (args))))
3310 Error_1 ("unable to open", car (SCHEME_V->args)); 3442 Error_1 ("unable to open", car (args));
3311 else 3443
3312 {
3313 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3444 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3314 s_goto (OP_T0LVL); 3445 s_goto (OP_T0LVL);
3315 }
3316 3446
3317 case OP_T0LVL: /* top level */ 3447 case OP_T0LVL: /* top level */
3318 3448
3319 /* If we reached the end of file, this loop is done. */ 3449 /* If we reached the end of file, this loop is done. */
3320 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3450 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3321 { 3451 {
3322 if (SCHEME_V->file_i == 0) 3452 if (SCHEME_V->file_i == 0)
3323 { 3453 {
3324 SCHEME_V->args = NIL; 3454 SCHEME_V->args = NIL;
3325 s_goto (OP_QUIT); 3455 s_goto (OP_QUIT);
… …
3336 /* If interactive, be nice to user. */ 3466 /* If interactive, be nice to user. */
3337 if (file_interactive (SCHEME_A)) 3467 if (file_interactive (SCHEME_A))
3338 { 3468 {
3339 SCHEME_V->envir = SCHEME_V->global_env; 3469 SCHEME_V->envir = SCHEME_V->global_env;
3340 dump_stack_reset (SCHEME_A); 3470 dump_stack_reset (SCHEME_A);
3341 putstr (SCHEME_A_ "\n"); 3471 putcharacter (SCHEME_A_ '\n');
3472#if EXPERIMENT
3473 system ("ps v $PPID");
3474#endif
3342 putstr (SCHEME_A_ prompt); 3475 putstr (SCHEME_A_ prompt);
3343 } 3476 }
3344 3477
3345 /* Set up another iteration of REPL */ 3478 /* Set up another iteration of REPL */
3346 SCHEME_V->nesting = 0; 3479 SCHEME_V->nesting = 0;
… …
3350 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3483 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3351 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3484 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3352 s_goto (OP_READ_INTERNAL); 3485 s_goto (OP_READ_INTERNAL);
3353 3486
3354 case OP_T1LVL: /* top level */ 3487 case OP_T1LVL: /* top level */
3355 SCHEME_V->code = SCHEME_V->value; 3488 SCHEME_V->code = SCHEME_V->value;
3356 SCHEME_V->inport = SCHEME_V->save_inport; 3489 SCHEME_V->inport = SCHEME_V->save_inport;
3357 s_goto (OP_EVAL); 3490 s_goto (OP_EVAL);
3358 3491
3359 case OP_READ_INTERNAL: /* internal read */ 3492 case OP_READ_INTERNAL: /* internal read */
3360 SCHEME_V->tok = token (SCHEME_A); 3493 SCHEME_V->tok = token (SCHEME_A);
… …
3381 { 3514 {
3382 SCHEME_V->print_flag = 1; 3515 SCHEME_V->print_flag = 1;
3383 SCHEME_V->args = SCHEME_V->value; 3516 SCHEME_V->args = SCHEME_V->value;
3384 s_goto (OP_P0LIST); 3517 s_goto (OP_P0LIST);
3385 } 3518 }
3386 else 3519
3387 s_return (SCHEME_V->value); 3520 s_return (SCHEME_V->value);
3388 3521
3389 case OP_EVAL: /* main part of evaluation */ 3522 case OP_EVAL: /* main part of evaluation */
3390#if USE_TRACING 3523#if USE_TRACING
3391 if (SCHEME_V->tracing) 3524 if (SCHEME_V->tracing)
3392 { 3525 {
3393 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3526 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3394 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3527 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3395 SCHEME_V->args = SCHEME_V->code; 3528 SCHEME_V->args = SCHEME_V->code;
3396 putstr (SCHEME_A_ "\nEval: "); 3529 putstr (SCHEME_A_ "\nEval: ");
3397 s_goto (OP_P0LIST); 3530 s_goto (OP_P0LIST);
3398 } 3531 }
3399 3532
… …
3403#endif 3536#endif
3404 if (is_symbol (SCHEME_V->code)) /* symbol */ 3537 if (is_symbol (SCHEME_V->code)) /* symbol */
3405 { 3538 {
3406 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3539 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3407 3540
3408 if (x != NIL) 3541 if (x == NIL)
3409 s_return (slot_value_in_env (x));
3410 else
3411 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3542 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3543
3544 s_return (slot_value_in_env (x));
3412 } 3545 }
3413 else if (is_pair (SCHEME_V->code)) 3546 else if (is_pair (SCHEME_V->code))
3414 { 3547 {
3548 x = car (SCHEME_V->code);
3549
3415 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3550 if (is_syntax (x)) /* SYNTAX */
3416 { 3551 {
3417 SCHEME_V->code = cdr (SCHEME_V->code); 3552 SCHEME_V->code = cdr (SCHEME_V->code);
3418 s_goto (syntaxnum (x)); 3553 s_goto (syntaxnum (x));
3419 } 3554 }
3420 else /* first, eval top element and eval arguments */ 3555 else /* first, eval top element and eval arguments */
3421 { 3556 {
3422 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3557 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3423 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3558 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3424 SCHEME_V->code = car (SCHEME_V->code); 3559 SCHEME_V->code = x;
3425 s_goto (OP_EVAL); 3560 s_goto (OP_EVAL);
3426 } 3561 }
3427 } 3562 }
3428 else 3563
3429 s_return (SCHEME_V->code); 3564 s_return (SCHEME_V->code);
3430 3565
3431 case OP_E0ARGS: /* eval arguments */ 3566 case OP_E0ARGS: /* eval arguments */
3432 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3567 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3433 { 3568 {
3434 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3569 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3435 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3570 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3436 SCHEME_V->code = SCHEME_V->value; 3571 SCHEME_V->code = SCHEME_V->value;
3437 s_goto (OP_APPLY); 3572 s_goto (OP_APPLY);
… …
3441 SCHEME_V->code = cdr (SCHEME_V->code); 3576 SCHEME_V->code = cdr (SCHEME_V->code);
3442 s_goto (OP_E1ARGS); 3577 s_goto (OP_E1ARGS);
3443 } 3578 }
3444 3579
3445 case OP_E1ARGS: /* eval arguments */ 3580 case OP_E1ARGS: /* eval arguments */
3446 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3581 args = cons (SCHEME_V->value, args);
3447 3582
3448 if (is_pair (SCHEME_V->code)) /* continue */ 3583 if (is_pair (SCHEME_V->code)) /* continue */
3449 { 3584 {
3450 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3585 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3451 SCHEME_V->code = car (SCHEME_V->code); 3586 SCHEME_V->code = car (SCHEME_V->code);
3452 SCHEME_V->args = NIL; 3587 SCHEME_V->args = NIL;
3453 s_goto (OP_EVAL); 3588 s_goto (OP_EVAL);
3454 } 3589 }
3455 else /* end */ 3590 else /* end */
3456 { 3591 {
3457 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3592 args = reverse_in_place (SCHEME_A_ NIL, args);
3458 SCHEME_V->code = car (SCHEME_V->args); 3593 SCHEME_V->code = car (args);
3459 SCHEME_V->args = cdr (SCHEME_V->args); 3594 SCHEME_V->args = cdr (args);
3460 s_goto (OP_APPLY); 3595 s_goto (OP_APPLY);
3461 } 3596 }
3462 3597
3463#if USE_TRACING 3598#if USE_TRACING
3464 3599
3465 case OP_TRACING: 3600 case OP_TRACING:
3466 { 3601 {
3467 int tr = SCHEME_V->tracing; 3602 int tr = SCHEME_V->tracing;
3468 3603
3469 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3604 SCHEME_V->tracing = ivalue_unchecked (car (args));
3470 s_return (mk_integer (SCHEME_A_ tr)); 3605 s_return (mk_integer (SCHEME_A_ tr));
3471 } 3606 }
3472 3607
3473#endif 3608#endif
3474 3609
3475 case OP_APPLY: /* apply 'code' to 'args' */ 3610 case OP_APPLY: /* apply 'code' to 'args' */
3476#if USE_TRACING 3611#if USE_TRACING
3477 if (SCHEME_V->tracing) 3612 if (SCHEME_V->tracing)
3478 { 3613 {
3479 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3614 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3480 SCHEME_V->print_flag = 1; 3615 SCHEME_V->print_flag = 1;
3481 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3616 /* args=cons(SCHEME_V->code,args); */
3482 putstr (SCHEME_A_ "\nApply to: "); 3617 putstr (SCHEME_A_ "\nApply to: ");
3483 s_goto (OP_P0LIST); 3618 s_goto (OP_P0LIST);
3484 } 3619 }
3485 3620
3486 /* fall through */ 3621 /* fall through */
3487 3622
3488 case OP_REAL_APPLY: 3623 case OP_REAL_APPLY:
3489#endif 3624#endif
3490 if (is_proc (SCHEME_V->code)) 3625 if (is_proc (SCHEME_V->code))
3491 {
3492 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3626 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3493 }
3494 else if (is_foreign (SCHEME_V->code)) 3627 else if (is_foreign (SCHEME_V->code))
3495 { 3628 {
3496 /* Keep nested calls from GC'ing the arglist */ 3629 /* Keep nested calls from GC'ing the arglist */
3497 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3630 push_recent_alloc (SCHEME_A_ args, NIL);
3498 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3631 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3499 3632
3500 s_return (x); 3633 s_return (x);
3501 } 3634 }
3502 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3635 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3503 { 3636 {
3504 /* Should not accept promise */ 3637 /* Should not accept promise */
3505 /* make environment */ 3638 /* make environment */
3506 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3639 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3507 3640
3508 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3641 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3509 { 3642 {
3510 if (y == NIL) 3643 if (y == NIL)
3511 Error_0 ("not enough arguments"); 3644 Error_0 ("not enough arguments");
3512 else 3645 else
3513 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3646 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3531 s_goto (OP_BEGIN); 3664 s_goto (OP_BEGIN);
3532 } 3665 }
3533 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3666 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3534 { 3667 {
3535 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3668 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3536 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3669 s_return (args != NIL ? car (args) : NIL);
3537 } 3670 }
3538 else 3671 else
3539 Error_0 ("illegal function"); 3672 Error_0 ("illegal function");
3540 3673
3541 case OP_DOMACRO: /* do macro */ 3674 case OP_DOMACRO: /* do macro */
3542 SCHEME_V->code = SCHEME_V->value; 3675 SCHEME_V->code = SCHEME_V->value;
3543 s_goto (OP_EVAL); 3676 s_goto (OP_EVAL);
3544
3545#if 1
3546 3677
3547 case OP_LAMBDA: /* lambda */ 3678 case OP_LAMBDA: /* lambda */
3548 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3679 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3549 set SCHEME_V->value fall thru */ 3680 set SCHEME_V->value fall thru */
3550 { 3681 {
3551 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3682 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3552 3683
3553 if (f != NIL) 3684 if (f != NIL)
3554 { 3685 {
3555 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3686 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3556 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3687 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3557 SCHEME_V->code = slot_value_in_env (f); 3688 SCHEME_V->code = slot_value_in_env (f);
3558 s_goto (OP_APPLY); 3689 s_goto (OP_APPLY);
3559 } 3690 }
3560 3691
3561 SCHEME_V->value = SCHEME_V->code; 3692 SCHEME_V->value = SCHEME_V->code;
3562 /* Fallthru */
3563 } 3693 }
3694 /* Fallthru */
3564 3695
3565 case OP_LAMBDA1: 3696 case OP_LAMBDA1:
3566 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3697 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3567 3698
3568#else
3569
3570 case OP_LAMBDA: /* lambda */
3571 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3572
3573#endif
3574
3575 case OP_MKCLOSURE: /* make-closure */ 3699 case OP_MKCLOSURE: /* make-closure */
3576 x = car (SCHEME_V->args); 3700 x = car (args);
3577 3701
3578 if (car (x) == SCHEME_V->LAMBDA) 3702 if (car (x) == SCHEME_V->LAMBDA)
3579 x = cdr (x); 3703 x = cdr (x);
3580 3704
3581 if (cdr (SCHEME_V->args) == NIL) 3705 if (cdr (args) == NIL)
3582 y = SCHEME_V->envir; 3706 y = SCHEME_V->envir;
3583 else 3707 else
3584 y = cadr (SCHEME_V->args); 3708 y = cadr (args);
3585 3709
3586 s_return (mk_closure (SCHEME_A_ x, y)); 3710 s_return (mk_closure (SCHEME_A_ x, y));
3587 3711
3588 case OP_QUOTE: /* quote */ 3712 case OP_QUOTE: /* quote */
3589 s_return (car (SCHEME_V->code)); 3713 s_return (car (SCHEME_V->code));
… …
3617 else 3741 else
3618 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3742 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3619 3743
3620 s_return (SCHEME_V->code); 3744 s_return (SCHEME_V->code);
3621 3745
3622
3623 case OP_DEFP: /* defined? */ 3746 case OP_DEFP: /* defined? */
3624 x = SCHEME_V->envir; 3747 x = SCHEME_V->envir;
3625 3748
3626 if (cdr (SCHEME_V->args) != NIL) 3749 if (cdr (args) != NIL)
3627 x = cadr (SCHEME_V->args); 3750 x = cadr (args);
3628 3751
3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3752 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3630 3753
3631 case OP_SET0: /* set! */ 3754 case OP_SET0: /* set! */
3632 if (is_immutable (car (SCHEME_V->code))) 3755 if (is_immutable (car (SCHEME_V->code)))
3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3756 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3634 3757
… …
3644 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3767 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3645 s_return (SCHEME_V->value); 3768 s_return (SCHEME_V->value);
3646 } 3769 }
3647 else 3770 else
3648 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3771 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3649
3650 3772
3651 case OP_BEGIN: /* begin */ 3773 case OP_BEGIN: /* begin */
3652 if (!is_pair (SCHEME_V->code)) 3774 if (!is_pair (SCHEME_V->code))
3653 s_return (SCHEME_V->code); 3775 s_return (SCHEME_V->code);
3654 3776
… …
3665 3787
3666 case OP_IF1: /* if */ 3788 case OP_IF1: /* if */
3667 if (is_true (SCHEME_V->value)) 3789 if (is_true (SCHEME_V->value))
3668 SCHEME_V->code = car (SCHEME_V->code); 3790 SCHEME_V->code = car (SCHEME_V->code);
3669 else 3791 else
3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3792 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3671 3793
3672 * car(NIL) = NIL */
3673 s_goto (OP_EVAL); 3794 s_goto (OP_EVAL);
3674 3795
3675 case OP_LET0: /* let */ 3796 case OP_LET0: /* let */
3676 SCHEME_V->args = NIL; 3797 SCHEME_V->args = NIL;
3677 SCHEME_V->value = SCHEME_V->code; 3798 SCHEME_V->value = SCHEME_V->code;
3678 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3799 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3679 s_goto (OP_LET1); 3800 s_goto (OP_LET1);
3680 3801
3681 case OP_LET1: /* let (calculate parameters) */ 3802 case OP_LET1: /* let (calculate parameters) */
3682 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3803 args = cons (SCHEME_V->value, args);
3683 3804
3684 if (is_pair (SCHEME_V->code)) /* continue */ 3805 if (is_pair (SCHEME_V->code)) /* continue */
3685 { 3806 {
3686 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3807 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3687 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3808 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3688 3809
3689 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3810 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3690 SCHEME_V->code = cadar (SCHEME_V->code); 3811 SCHEME_V->code = cadar (SCHEME_V->code);
3691 SCHEME_V->args = NIL; 3812 SCHEME_V->args = NIL;
3692 s_goto (OP_EVAL); 3813 s_goto (OP_EVAL);
3693 } 3814 }
3694 else /* end */ 3815 else /* end */
3695 { 3816 {
3696 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3817 args = reverse_in_place (SCHEME_A_ NIL, args);
3697 SCHEME_V->code = car (SCHEME_V->args); 3818 SCHEME_V->code = car (args);
3698 SCHEME_V->args = cdr (SCHEME_V->args); 3819 SCHEME_V->args = cdr (args);
3699 s_goto (OP_LET2); 3820 s_goto (OP_LET2);
3700 } 3821 }
3701 3822
3702 case OP_LET2: /* let */ 3823 case OP_LET2: /* let */
3703 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3824 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3704 3825
3705 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3826 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3706 y != NIL; x = cdr (x), y = cdr (y)) 3827 y != NIL; x = cdr (x), y = cdr (y))
3707 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3828 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3708 3829
3709 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3830 if (is_symbol (car (SCHEME_V->code))) /* named let */
3710 { 3831 {
3711 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3832 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3712 { 3833 {
3713 if (!is_pair (x)) 3834 if (!is_pair (x))
3714 Error_1 ("Bad syntax of binding in let :", x); 3835 Error_1 ("Bad syntax of binding in let :", x);
3715 3836
3716 if (!is_list (SCHEME_A_ car (x))) 3837 if (!is_list (SCHEME_A_ car (x)))
3717 Error_1 ("Bad syntax of binding in let :", car (x)); 3838 Error_1 ("Bad syntax of binding in let :", car (x));
3718 3839
3719 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3840 args = cons (caar (x), args);
3720 } 3841 }
3721 3842
3722 x =
3723 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3843 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3724 SCHEME_V->envir); 3844 SCHEME_V->envir);
3725 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3845 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3726 SCHEME_V->code = cddr (SCHEME_V->code); 3846 SCHEME_V->code = cddr (SCHEME_V->code);
3727 SCHEME_V->args = NIL;
3728 } 3847 }
3729 else 3848 else
3730 { 3849 {
3731 SCHEME_V->code = cdr (SCHEME_V->code); 3850 SCHEME_V->code = cdr (SCHEME_V->code);
3851 }
3852
3732 SCHEME_V->args = NIL; 3853 SCHEME_V->args = NIL;
3733 }
3734
3735 s_goto (OP_BEGIN); 3854 s_goto (OP_BEGIN);
3736 3855
3737 case OP_LET0AST: /* let* */ 3856 case OP_LET0AST: /* let* */
3738 if (car (SCHEME_V->code) == NIL) 3857 if (car (SCHEME_V->code) == NIL)
3739 { 3858 {
… …
3757 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3876 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3758 SCHEME_V->code = cdr (SCHEME_V->code); 3877 SCHEME_V->code = cdr (SCHEME_V->code);
3759 3878
3760 if (is_pair (SCHEME_V->code)) /* continue */ 3879 if (is_pair (SCHEME_V->code)) /* continue */
3761 { 3880 {
3762 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3881 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3763 SCHEME_V->code = cadar (SCHEME_V->code); 3882 SCHEME_V->code = cadar (SCHEME_V->code);
3764 SCHEME_V->args = NIL; 3883 SCHEME_V->args = NIL;
3765 s_goto (OP_EVAL); 3884 s_goto (OP_EVAL);
3766 } 3885 }
3767 else /* end */ 3886 else /* end */
3768 { 3887 {
3769 SCHEME_V->code = SCHEME_V->args; 3888 SCHEME_V->code = args;
3770 SCHEME_V->args = NIL; 3889 SCHEME_V->args = NIL;
3771 s_goto (OP_BEGIN); 3890 s_goto (OP_BEGIN);
3772 } 3891 }
3773 3892
3774 case OP_LET0REC: /* letrec */ 3893 case OP_LET0REC: /* letrec */
… …
3777 SCHEME_V->value = SCHEME_V->code; 3896 SCHEME_V->value = SCHEME_V->code;
3778 SCHEME_V->code = car (SCHEME_V->code); 3897 SCHEME_V->code = car (SCHEME_V->code);
3779 s_goto (OP_LET1REC); 3898 s_goto (OP_LET1REC);
3780 3899
3781 case OP_LET1REC: /* letrec (calculate parameters) */ 3900 case OP_LET1REC: /* letrec (calculate parameters) */
3782 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3901 args = cons (SCHEME_V->value, args);
3783 3902
3784 if (is_pair (SCHEME_V->code)) /* continue */ 3903 if (is_pair (SCHEME_V->code)) /* continue */
3785 { 3904 {
3786 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3905 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3787 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3906 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3788 3907
3789 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3908 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3790 SCHEME_V->code = cadar (SCHEME_V->code); 3909 SCHEME_V->code = cadar (SCHEME_V->code);
3791 SCHEME_V->args = NIL; 3910 SCHEME_V->args = NIL;
3792 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
3793 } 3912 }
3794 else /* end */ 3913 else /* end */
3795 { 3914 {
3796 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3915 args = reverse_in_place (SCHEME_A_ NIL, args);
3797 SCHEME_V->code = car (SCHEME_V->args); 3916 SCHEME_V->code = car (args);
3798 SCHEME_V->args = cdr (SCHEME_V->args); 3917 SCHEME_V->args = cdr (args);
3799 s_goto (OP_LET2REC); 3918 s_goto (OP_LET2REC);
3800 } 3919 }
3801 3920
3802 case OP_LET2REC: /* letrec */ 3921 case OP_LET2REC: /* letrec */
3803 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3922 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3804 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3923 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3805 3924
3806 SCHEME_V->code = cdr (SCHEME_V->code); 3925 SCHEME_V->code = cdr (SCHEME_V->code);
3807 SCHEME_V->args = NIL; 3926 SCHEME_V->args = NIL;
3808 s_goto (OP_BEGIN); 3927 s_goto (OP_BEGIN);
… …
3835 } 3954 }
3836 else 3955 else
3837 { 3956 {
3838 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3957 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3839 s_return (NIL); 3958 s_return (NIL);
3840 else 3959
3841 {
3842 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3960 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3843 SCHEME_V->code = caar (SCHEME_V->code); 3961 SCHEME_V->code = caar (SCHEME_V->code);
3844 s_goto (OP_EVAL); 3962 s_goto (OP_EVAL);
3845 }
3846 } 3963 }
3847 3964
3848 case OP_DELAY: /* delay */ 3965 case OP_DELAY: /* delay */
3849 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3966 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3850 set_typeflag (x, T_PROMISE); 3967 set_typeflag (x, T_PROMISE);
… …
3861 case OP_AND1: /* and */ 3978 case OP_AND1: /* and */
3862 if (is_false (SCHEME_V->value)) 3979 if (is_false (SCHEME_V->value))
3863 s_return (SCHEME_V->value); 3980 s_return (SCHEME_V->value);
3864 else if (SCHEME_V->code == NIL) 3981 else if (SCHEME_V->code == NIL)
3865 s_return (SCHEME_V->value); 3982 s_return (SCHEME_V->value);
3866 else 3983
3867 {
3868 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3984 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3869 SCHEME_V->code = car (SCHEME_V->code); 3985 SCHEME_V->code = car (SCHEME_V->code);
3870 s_goto (OP_EVAL); 3986 s_goto (OP_EVAL);
3871 }
3872 3987
3873 case OP_OR0: /* or */ 3988 case OP_OR0: /* or */
3874 if (SCHEME_V->code == NIL) 3989 if (SCHEME_V->code == NIL)
3875 s_return (S_F); 3990 s_return (S_F);
3876 3991
… …
3881 case OP_OR1: /* or */ 3996 case OP_OR1: /* or */
3882 if (is_true (SCHEME_V->value)) 3997 if (is_true (SCHEME_V->value))
3883 s_return (SCHEME_V->value); 3998 s_return (SCHEME_V->value);
3884 else if (SCHEME_V->code == NIL) 3999 else if (SCHEME_V->code == NIL)
3885 s_return (SCHEME_V->value); 4000 s_return (SCHEME_V->value);
3886 else 4001
3887 {
3888 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4002 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3889 SCHEME_V->code = car (SCHEME_V->code); 4003 SCHEME_V->code = car (SCHEME_V->code);
3890 s_goto (OP_EVAL); 4004 s_goto (OP_EVAL);
3891 }
3892 4005
3893 case OP_C0STREAM: /* cons-stream */ 4006 case OP_C0STREAM: /* cons-stream */
3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4007 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3895 SCHEME_V->code = car (SCHEME_V->code); 4008 SCHEME_V->code = car (SCHEME_V->code);
3896 s_goto (OP_EVAL); 4009 s_goto (OP_EVAL);
3897 4010
3898 case OP_C1STREAM: /* cons-stream */ 4011 case OP_C1STREAM: /* cons-stream */
3899 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 4012 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3900 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4013 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3901 set_typeflag (x, T_PROMISE); 4014 set_typeflag (x, T_PROMISE);
3902 s_return (cons (SCHEME_V->args, x)); 4015 s_return (cons (args, x));
3903 4016
3904 case OP_MACRO0: /* macro */ 4017 case OP_MACRO0: /* macro */
3905 if (is_pair (car (SCHEME_V->code))) 4018 if (is_pair (car (SCHEME_V->code)))
3906 { 4019 {
3907 x = caar (SCHEME_V->code); 4020 x = caar (SCHEME_V->code);
… …
3940 { 4053 {
3941 if (!is_pair (y = caar (x))) 4054 if (!is_pair (y = caar (x)))
3942 break; 4055 break;
3943 4056
3944 for (; y != NIL; y = cdr (y)) 4057 for (; y != NIL; y = cdr (y))
3945 {
3946 if (eqv (car (y), SCHEME_V->value)) 4058 if (eqv (car (y), SCHEME_V->value))
3947 break; 4059 break;
3948 }
3949 4060
3950 if (y != NIL) 4061 if (y != NIL)
3951 break; 4062 break;
3952 } 4063 }
3953 4064
… …
3963 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4074 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3964 SCHEME_V->code = caar (x); 4075 SCHEME_V->code = caar (x);
3965 s_goto (OP_EVAL); 4076 s_goto (OP_EVAL);
3966 } 4077 }
3967 } 4078 }
3968 else 4079
3969 s_return (NIL); 4080 s_return (NIL);
3970 4081
3971 case OP_CASE2: /* case */ 4082 case OP_CASE2: /* case */
3972 if (is_true (SCHEME_V->value)) 4083 if (is_true (SCHEME_V->value))
3973 s_goto (OP_BEGIN); 4084 s_goto (OP_BEGIN);
3974 else 4085
3975 s_return (NIL); 4086 s_return (NIL);
3976 4087
3977 case OP_PAPPLY: /* apply */ 4088 case OP_PAPPLY: /* apply */
3978 SCHEME_V->code = car (SCHEME_V->args); 4089 SCHEME_V->code = car (args);
3979 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4090 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3980 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4091 /*SCHEME_V->args = cadr(args); */
3981 s_goto (OP_APPLY); 4092 s_goto (OP_APPLY);
3982 4093
3983 case OP_PEVAL: /* eval */ 4094 case OP_PEVAL: /* eval */
3984 if (cdr (SCHEME_V->args) != NIL) 4095 if (cdr (args) != NIL)
3985 SCHEME_V->envir = cadr (SCHEME_V->args); 4096 SCHEME_V->envir = cadr (args);
3986 4097
3987 SCHEME_V->code = car (SCHEME_V->args); 4098 SCHEME_V->code = car (args);
3988 s_goto (OP_EVAL); 4099 s_goto (OP_EVAL);
3989 4100
3990 case OP_CONTINUATION: /* call-with-current-continuation */ 4101 case OP_CONTINUATION: /* call-with-current-continuation */
3991 SCHEME_V->code = car (SCHEME_V->args); 4102 SCHEME_V->code = car (args);
3992 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 4103 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3993 s_goto (OP_APPLY); 4104 s_goto (OP_APPLY);
3994 } 4105 }
3995 4106
3996 return S_T; 4107 if (USE_ERROR_CHECKING) abort ();
3997} 4108}
3998 4109
3999static pointer 4110/* math, cxr */
4111ecb_hot static int
4000opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4112opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4001{ 4113{
4002 pointer x; 4114 pointer args = SCHEME_V->args;
4115 pointer x = car (args);
4003 num v; 4116 num v;
4004 4117
4118 switch (op)
4119 {
4005#if USE_MATH 4120#if USE_MATH
4006 RVALUE dd;
4007#endif
4008
4009 switch (op)
4010 {
4011#if USE_MATH
4012
4013 case OP_INEX2EX: /* inexact->exact */ 4121 case OP_INEX2EX: /* inexact->exact */
4014 x = car (SCHEME_V->args);
4015
4016 if (num_is_integer (x)) 4122 if (!is_integer (x))
4017 s_return (x); 4123 {
4018 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4124 RVALUE r = rvalue_unchecked (x);
4019 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4125
4126 if (r == (RVALUE)(IVALUE)r)
4127 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4020 else 4128 else
4021 Error_1 ("inexact->exact: not integral:", x); 4129 Error_1 ("inexact->exact: not integral:", x);
4130 }
4022 4131
4023 case OP_EXP: 4132 s_return (x);
4024 x = car (SCHEME_V->args); 4133
4134 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4135 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4136 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4137 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4138
4139 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4025 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4140 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4026
4027 case OP_LOG:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4141 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4030 4142 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4031 case OP_SIN:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4143 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4034
4035 case OP_COS:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4144 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4038
4039 case OP_TAN:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4145 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4042
4043 case OP_ASIN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4146 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4046
4047 case OP_ACOS:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4147 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4050 4148
4051 case OP_ATAN: 4149 case OP_ATAN:
4052 x = car (SCHEME_V->args);
4053
4054 if (cdr (SCHEME_V->args) == NIL)
4055 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4056 else
4057 {
4058 pointer y = cadr (SCHEME_V->args);
4059
4060 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4061 }
4062
4063 case OP_SQRT:
4064 x = car (SCHEME_V->args);
4065 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4150 s_return (mk_real (SCHEME_A_
4151 cdr (args) == NIL
4152 ? atan (rvalue (x))
4153 : atan2 (rvalue (x), rvalue (cadr (args)))));
4066 4154
4067 case OP_EXPT: 4155 case OP_EXPT:
4068 { 4156 {
4069 RVALUE result; 4157 RVALUE result;
4070 int real_result = 1; 4158 int real_result = 1;
4071 pointer y = cadr (SCHEME_V->args); 4159 pointer y = cadr (args);
4072 4160
4073 x = car (SCHEME_V->args);
4074
4075 if (num_is_integer (x) && num_is_integer (y)) 4161 if (is_integer (x) && is_integer (y))
4076 real_result = 0; 4162 real_result = 0;
4077 4163
4078 /* This 'if' is an R5RS compatibility fix. */ 4164 /* This 'if' is an R5RS compatibility fix. */
4079 /* NOTE: Remove this 'if' fix for R6RS. */ 4165 /* NOTE: Remove this 'if' fix for R6RS. */
4080 if (rvalue (x) == 0 && rvalue (y) < 0) 4166 if (rvalue (x) == 0 && rvalue (y) < 0)
4081 result = 0.0; 4167 result = 0;
4082 else 4168 else
4083 result = pow (rvalue (x), rvalue (y)); 4169 result = pow (rvalue (x), rvalue (y));
4084 4170
4085 /* Before returning integer result make sure we can. */ 4171 /* Before returning integer result make sure we can. */
4086 /* If the test fails, result is too big for integer. */ 4172 /* If the test fails, result is too big for integer. */
4087 if (!real_result) 4173 if (!real_result)
4088 { 4174 {
4089 long result_as_long = (long) result; 4175 long result_as_long = result;
4090 4176
4091 if (result != (RVALUE) result_as_long) 4177 if (result != result_as_long)
4092 real_result = 1; 4178 real_result = 1;
4093 } 4179 }
4094 4180
4095 if (real_result) 4181 if (real_result)
4096 s_return (mk_real (SCHEME_A_ result)); 4182 s_return (mk_real (SCHEME_A_ result));
4097 else 4183 else
4098 s_return (mk_integer (SCHEME_A_ result)); 4184 s_return (mk_integer (SCHEME_A_ result));
4099 } 4185 }
4100
4101 case OP_FLOOR:
4102 x = car (SCHEME_V->args);
4103 s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4104
4105 case OP_CEILING:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4108
4109 case OP_TRUNCATE:
4110 {
4111 RVALUE rvalue_of_x;
4112
4113 x = car (SCHEME_V->args);
4114 rvalue_of_x = rvalue (x);
4115
4116 if (rvalue_of_x > 0)
4117 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4118 else
4119 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4120 }
4121
4122 case OP_ROUND:
4123 x = car (SCHEME_V->args);
4124
4125 if (num_is_integer (x))
4126 s_return (x);
4127
4128 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4129#endif 4186#endif
4130 4187
4131 case OP_ADD: /* + */ 4188 case OP_ADD: /* + */
4132 v = num_zero; 4189 v = num_zero;
4133 4190
4134 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4191 for (x = args; x != NIL; x = cdr (x))
4135 v = num_add (v, nvalue (car (x))); 4192 v = num_op (NUM_ADD, v, nvalue (car (x)));
4136 4193
4137 s_return (mk_number (SCHEME_A_ v)); 4194 s_return (mk_number (SCHEME_A_ v));
4138 4195
4139 case OP_MUL: /* * */ 4196 case OP_MUL: /* * */
4140 v = num_one; 4197 v = num_one;
4141 4198
4142 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4199 for (x = args; x != NIL; x = cdr (x))
4143 v = num_mul (v, nvalue (car (x))); 4200 v = num_op (NUM_MUL, v, nvalue (car (x)));
4144 4201
4145 s_return (mk_number (SCHEME_A_ v)); 4202 s_return (mk_number (SCHEME_A_ v));
4146 4203
4147 case OP_SUB: /* - */ 4204 case OP_SUB: /* - */
4148 if (cdr (SCHEME_V->args) == NIL) 4205 if (cdr (args) == NIL)
4149 { 4206 {
4150 x = SCHEME_V->args; 4207 x = args;
4151 v = num_zero; 4208 v = num_zero;
4152 } 4209 }
4153 else 4210 else
4154 { 4211 {
4155 x = cdr (SCHEME_V->args); 4212 x = cdr (args);
4156 v = nvalue (car (SCHEME_V->args)); 4213 v = nvalue (car (args));
4157 } 4214 }
4158 4215
4159 for (; x != NIL; x = cdr (x)) 4216 for (; x != NIL; x = cdr (x))
4160 v = num_sub (v, nvalue (car (x))); 4217 v = num_op (NUM_SUB, v, nvalue (car (x)));
4161 4218
4162 s_return (mk_number (SCHEME_A_ v)); 4219 s_return (mk_number (SCHEME_A_ v));
4163 4220
4164 case OP_DIV: /* / */ 4221 case OP_DIV: /* / */
4165 if (cdr (SCHEME_V->args) == NIL) 4222 if (cdr (args) == NIL)
4166 { 4223 {
4167 x = SCHEME_V->args; 4224 x = args;
4168 v = num_one; 4225 v = num_one;
4169 } 4226 }
4170 else 4227 else
4171 { 4228 {
4172 x = cdr (SCHEME_V->args); 4229 x = cdr (args);
4173 v = nvalue (car (SCHEME_V->args)); 4230 v = nvalue (car (args));
4174 } 4231 }
4175 4232
4176 for (; x != NIL; x = cdr (x)) 4233 for (; x != NIL; x = cdr (x))
4177 {
4178 if (!is_zero_rvalue (rvalue (car (x)))) 4234 if (!is_zero_rvalue (rvalue (car (x))))
4179 v = num_div (v, nvalue (car (x))); 4235 v = num_div (v, nvalue (car (x)));
4180 else 4236 else
4181 Error_0 ("/: division by zero"); 4237 Error_0 ("/: division by zero");
4182 }
4183 4238
4184 s_return (mk_number (SCHEME_A_ v)); 4239 s_return (mk_number (SCHEME_A_ v));
4185 4240
4186 case OP_INTDIV: /* quotient */ 4241 case OP_INTDIV: /* quotient */
4187 if (cdr (SCHEME_V->args) == NIL) 4242 if (cdr (args) == NIL)
4188 { 4243 {
4189 x = SCHEME_V->args; 4244 x = args;
4190 v = num_one; 4245 v = num_one;
4191 } 4246 }
4192 else 4247 else
4193 { 4248 {
4194 x = cdr (SCHEME_V->args); 4249 x = cdr (args);
4195 v = nvalue (car (SCHEME_V->args)); 4250 v = nvalue (car (args));
4196 } 4251 }
4197 4252
4198 for (; x != NIL; x = cdr (x)) 4253 for (; x != NIL; x = cdr (x))
4199 { 4254 {
4200 if (ivalue (car (x)) != 0) 4255 if (ivalue (car (x)) != 0)
4201 v = num_intdiv (v, nvalue (car (x))); 4256 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4202 else 4257 else
4203 Error_0 ("quotient: division by zero"); 4258 Error_0 ("quotient: division by zero");
4204 } 4259 }
4205 4260
4206 s_return (mk_number (SCHEME_A_ v)); 4261 s_return (mk_number (SCHEME_A_ v));
4207 4262
4208 case OP_REM: /* remainder */ 4263 case OP_REM: /* remainder */
4209 v = nvalue (car (SCHEME_V->args)); 4264 v = nvalue (x);
4210 4265
4211 if (ivalue (cadr (SCHEME_V->args)) != 0) 4266 if (ivalue (cadr (args)) != 0)
4212 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4267 v = num_rem (v, nvalue (cadr (args)));
4213 else 4268 else
4214 Error_0 ("remainder: division by zero"); 4269 Error_0 ("remainder: division by zero");
4215 4270
4216 s_return (mk_number (SCHEME_A_ v)); 4271 s_return (mk_number (SCHEME_A_ v));
4217 4272
4218 case OP_MOD: /* modulo */ 4273 case OP_MOD: /* modulo */
4219 v = nvalue (car (SCHEME_V->args)); 4274 v = nvalue (x);
4220 4275
4221 if (ivalue (cadr (SCHEME_V->args)) != 0) 4276 if (ivalue (cadr (args)) != 0)
4222 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4277 v = num_mod (v, nvalue (cadr (args)));
4223 else 4278 else
4224 Error_0 ("modulo: division by zero"); 4279 Error_0 ("modulo: division by zero");
4225 4280
4226 s_return (mk_number (SCHEME_A_ v)); 4281 s_return (mk_number (SCHEME_A_ v));
4227 4282
4228 case OP_CAR: /* car */ 4283 /* the compiler will optimize this mess... */
4229 s_return (caar (SCHEME_V->args)); 4284 case OP_CAR: op_car: s_return (car (x));
4230 4285 case OP_CDR: op_cdr: s_return (cdr (x));
4231 case OP_CDR: /* cdr */ 4286 case OP_CAAR: op_caar: x = car (x); goto op_car;
4232 s_return (cdar (SCHEME_V->args)); 4287 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4288 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4289 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4290 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4291 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4292 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4293 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4294 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4295 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4296 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4297 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4298 case OP_CAAAAR: x = car (x); goto op_caaar;
4299 case OP_CAAADR: x = cdr (x); goto op_caaar;
4300 case OP_CAADAR: x = car (x); goto op_caadr;
4301 case OP_CAADDR: x = cdr (x); goto op_caadr;
4302 case OP_CADAAR: x = car (x); goto op_cadar;
4303 case OP_CADADR: x = cdr (x); goto op_cadar;
4304 case OP_CADDAR: x = car (x); goto op_caddr;
4305 case OP_CADDDR: x = cdr (x); goto op_caddr;
4306 case OP_CDAAAR: x = car (x); goto op_cdaar;
4307 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4308 case OP_CDADAR: x = car (x); goto op_cdadr;
4309 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4310 case OP_CDDAAR: x = car (x); goto op_cddar;
4311 case OP_CDDADR: x = cdr (x); goto op_cddar;
4312 case OP_CDDDAR: x = car (x); goto op_cdddr;
4313 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4233 4314
4234 case OP_CONS: /* cons */ 4315 case OP_CONS: /* cons */
4235 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4316 set_cdr (args, cadr (args));
4236 s_return (SCHEME_V->args); 4317 s_return (args);
4237 4318
4238 case OP_SETCAR: /* set-car! */ 4319 case OP_SETCAR: /* set-car! */
4239 if (!is_immutable (car (SCHEME_V->args))) 4320 if (!is_immutable (x))
4240 { 4321 {
4241 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4322 set_car (x, cadr (args));
4242 s_return (car (SCHEME_V->args)); 4323 s_return (car (args));
4243 } 4324 }
4244 else 4325 else
4245 Error_0 ("set-car!: unable to alter immutable pair"); 4326 Error_0 ("set-car!: unable to alter immutable pair");
4246 4327
4247 case OP_SETCDR: /* set-cdr! */ 4328 case OP_SETCDR: /* set-cdr! */
4248 if (!is_immutable (car (SCHEME_V->args))) 4329 if (!is_immutable (x))
4249 { 4330 {
4250 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4331 set_cdr (x, cadr (args));
4251 s_return (car (SCHEME_V->args)); 4332 s_return (car (args));
4252 } 4333 }
4253 else 4334 else
4254 Error_0 ("set-cdr!: unable to alter immutable pair"); 4335 Error_0 ("set-cdr!: unable to alter immutable pair");
4255 4336
4256 case OP_CHAR2INT: /* char->integer */ 4337 case OP_CHAR2INT: /* char->integer */
4257 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4338 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4258 4339
4259 case OP_INT2CHAR: /* integer->char */ 4340 case OP_INT2CHAR: /* integer->char */
4260 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4341 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4261 4342
4262 case OP_CHARUPCASE: 4343 case OP_CHARUPCASE:
4263 { 4344 {
4264 unsigned char c = ivalue (car (SCHEME_V->args)); 4345 unsigned char c = ivalue_unchecked (x);
4265 c = toupper (c); 4346 c = toupper (c);
4266 s_return (mk_character (SCHEME_A_ c)); 4347 s_return (mk_character (SCHEME_A_ c));
4267 } 4348 }
4268 4349
4269 case OP_CHARDNCASE: 4350 case OP_CHARDNCASE:
4270 { 4351 {
4271 unsigned char c = ivalue (car (SCHEME_V->args)); 4352 unsigned char c = ivalue_unchecked (x);
4272 c = tolower (c); 4353 c = tolower (c);
4273 s_return (mk_character (SCHEME_A_ c)); 4354 s_return (mk_character (SCHEME_A_ c));
4274 } 4355 }
4275 4356
4276 case OP_STR2SYM: /* string->symbol */ 4357 case OP_STR2SYM: /* string->symbol */
4277 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4358 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4278 4359
4279 case OP_STR2ATOM: /* string->atom */ 4360 case OP_STR2ATOM: /* string->atom */
4280 { 4361 {
4281 char *s = strvalue (car (SCHEME_V->args)); 4362 char *s = strvalue (x);
4282 long pf = 0; 4363 long pf = 0;
4283 4364
4284 if (cdr (SCHEME_V->args) != NIL) 4365 if (cdr (args) != NIL)
4285 { 4366 {
4286 /* we know cadr(SCHEME_V->args) is a natural number */ 4367 /* we know cadr(args) is a natural number */
4287 /* see if it is 2, 8, 10, or 16, or error */ 4368 /* see if it is 2, 8, 10, or 16, or error */
4288 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4369 pf = ivalue_unchecked (cadr (args));
4289 4370
4290 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4371 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4291 { 4372 {
4292 /* base is OK */ 4373 /* base is OK */
4293 } 4374 }
4294 else 4375 else
4295 pf = -1; 4376 pf = -1;
4296 } 4377 }
4297 4378
4298 if (pf < 0) 4379 if (pf < 0)
4299 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4380 Error_1 ("string->atom: bad base:", cadr (args));
4300 else if (*s == '#') /* no use of base! */ 4381 else if (*s == '#') /* no use of base! */
4301 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4382 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4302 else 4383 else
4303 { 4384 {
4304 if (pf == 0 || pf == 10) 4385 if (pf == 0 || pf == 10)
… …
4315 } 4396 }
4316 } 4397 }
4317 } 4398 }
4318 4399
4319 case OP_SYM2STR: /* symbol->string */ 4400 case OP_SYM2STR: /* symbol->string */
4320 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4401 x = mk_string (SCHEME_A_ symname (x));
4321 setimmutable (x); 4402 setimmutable (x);
4322 s_return (x); 4403 s_return (x);
4323 4404
4324 case OP_ATOM2STR: /* atom->string */ 4405 case OP_ATOM2STR: /* atom->string */
4325 { 4406 {
4326 long pf = 0; 4407 long pf = 0;
4327 4408
4328 x = car (SCHEME_V->args);
4329
4330 if (cdr (SCHEME_V->args) != NIL) 4409 if (cdr (args) != NIL)
4331 { 4410 {
4332 /* we know cadr(SCHEME_V->args) is a natural number */ 4411 /* we know cadr(args) is a natural number */
4333 /* see if it is 2, 8, 10, or 16, or error */ 4412 /* see if it is 2, 8, 10, or 16, or error */
4334 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4413 pf = ivalue_unchecked (cadr (args));
4335 4414
4336 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4415 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4337 { 4416 {
4338 /* base is OK */ 4417 /* base is OK */
4339 } 4418 }
4340 else 4419 else
4341 pf = -1; 4420 pf = -1;
4342 } 4421 }
4343 4422
4344 if (pf < 0) 4423 if (pf < 0)
4345 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4424 Error_1 ("atom->string: bad base:", cadr (args));
4346 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4425 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4347 { 4426 {
4348 char *p; 4427 char *p;
4349 int len; 4428 int len;
4350 4429
… …
4355 Error_1 ("atom->string: not an atom:", x); 4434 Error_1 ("atom->string: not an atom:", x);
4356 } 4435 }
4357 4436
4358 case OP_MKSTRING: /* make-string */ 4437 case OP_MKSTRING: /* make-string */
4359 { 4438 {
4360 int fill = ' '; 4439 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4361 int len; 4440 int len = ivalue_unchecked (x);
4362 4441
4363 len = ivalue (car (SCHEME_V->args));
4364
4365 if (cdr (SCHEME_V->args) != NIL)
4366 fill = charvalue (cadr (SCHEME_V->args));
4367
4368 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4442 s_return (mk_empty_string (SCHEME_A_ len, fill));
4369 } 4443 }
4370 4444
4371 case OP_STRLEN: /* string-length */ 4445 case OP_STRLEN: /* string-length */
4372 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4446 s_return (mk_integer (SCHEME_A_ strlength (x)));
4373 4447
4374 case OP_STRREF: /* string-ref */ 4448 case OP_STRREF: /* string-ref */
4375 { 4449 {
4376 char *str; 4450 char *str = strvalue (x);
4377 int index;
4378
4379 str = strvalue (car (SCHEME_V->args));
4380
4381 index = ivalue (cadr (SCHEME_V->args)); 4451 int index = ivalue_unchecked (cadr (args));
4382 4452
4383 if (index >= strlength (car (SCHEME_V->args))) 4453 if (index >= strlength (x))
4384 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4454 Error_1 ("string-ref: out of bounds:", cadr (args));
4385 4455
4386 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4456 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4387 } 4457 }
4388 4458
4389 case OP_STRSET: /* string-set! */ 4459 case OP_STRSET: /* string-set! */
4390 { 4460 {
4391 char *str; 4461 char *str = strvalue (x);
4392 int index; 4462 int index = ivalue_unchecked (cadr (args));
4393 int c; 4463 int c;
4394 4464
4395 if (is_immutable (car (SCHEME_V->args))) 4465 if (is_immutable (x))
4396 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4466 Error_1 ("string-set!: unable to alter immutable string:", x);
4397 4467
4398 str = strvalue (car (SCHEME_V->args));
4399
4400 index = ivalue (cadr (SCHEME_V->args));
4401
4402 if (index >= strlength (car (SCHEME_V->args))) 4468 if (index >= strlength (x))
4403 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4469 Error_1 ("string-set!: out of bounds:", cadr (args));
4404 4470
4405 c = charvalue (caddr (SCHEME_V->args)); 4471 c = charvalue (caddr (args));
4406 4472
4407 str[index] = (char) c; 4473 str[index] = c;
4408 s_return (car (SCHEME_V->args)); 4474 s_return (car (args));
4409 } 4475 }
4410 4476
4411 case OP_STRAPPEND: /* string-append */ 4477 case OP_STRAPPEND: /* string-append */
4412 { 4478 {
4413 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4479 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4414 int len = 0; 4480 int len = 0;
4415 pointer newstr; 4481 pointer newstr;
4416 char *pos; 4482 char *pos;
4417 4483
4418 /* compute needed length for new string */ 4484 /* compute needed length for new string */
4419 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4485 for (x = args; x != NIL; x = cdr (x))
4420 len += strlength (car (x)); 4486 len += strlength (car (x));
4421 4487
4422 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4488 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4423 4489
4424 /* store the contents of the argument strings into the new string */ 4490 /* store the contents of the argument strings into the new string */
4425 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4491 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4426 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4492 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4427 4493
4428 s_return (newstr); 4494 s_return (newstr);
4429 } 4495 }
4430 4496
4431 case OP_SUBSTR: /* substring */ 4497 case OP_STRING_COPY: /* substring/string-copy */
4432 { 4498 {
4433 char *str; 4499 char *str = strvalue (x);
4434 int index0; 4500 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4435 int index1; 4501 int index1;
4436 int len; 4502 int len;
4437 4503
4438 str = strvalue (car (SCHEME_V->args));
4439
4440 index0 = ivalue (cadr (SCHEME_V->args));
4441
4442 if (index0 > strlength (car (SCHEME_V->args))) 4504 if (index0 > strlength (x))
4443 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4505 Error_1 ("string->copy: start out of bounds:", cadr (args));
4444 4506
4445 if (cddr (SCHEME_V->args) != NIL) 4507 if (cddr (args) != NIL)
4446 { 4508 {
4447 index1 = ivalue (caddr (SCHEME_V->args)); 4509 index1 = ivalue_unchecked (caddr (args));
4448 4510
4449 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4511 if (index1 > strlength (x) || index1 < index0)
4450 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4512 Error_1 ("string->copy: end out of bounds:", caddr (args));
4451 } 4513 }
4452 else 4514 else
4453 index1 = strlength (car (SCHEME_V->args)); 4515 index1 = strlength (x);
4454 4516
4455 len = index1 - index0; 4517 len = index1 - index0;
4456 x = mk_empty_string (SCHEME_A_ len, ' '); 4518 x = mk_counted_string (SCHEME_A_ str + index0, len);
4457 memcpy (strvalue (x), str + index0, len);
4458 strvalue (x)[len] = 0;
4459 4519
4460 s_return (x); 4520 s_return (x);
4461 } 4521 }
4462 4522
4463 case OP_VECTOR: /* vector */ 4523 case OP_VECTOR: /* vector */
4464 { 4524 {
4465 int i; 4525 int i;
4466 pointer vec; 4526 pointer vec;
4467 int len = list_length (SCHEME_A_ SCHEME_V->args); 4527 int len = list_length (SCHEME_A_ args);
4468 4528
4469 if (len < 0) 4529 if (len < 0)
4470 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4530 Error_1 ("vector: not a proper list:", args);
4471 4531
4472 vec = mk_vector (SCHEME_A_ len); 4532 vec = mk_vector (SCHEME_A_ len);
4473 4533
4474#if USE_ERROR_CHECKING 4534#if USE_ERROR_CHECKING
4475 if (SCHEME_V->no_memory) 4535 if (SCHEME_V->no_memory)
4476 s_return (S_SINK); 4536 s_return (S_SINK);
4477#endif 4537#endif
4478 4538
4479 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4539 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4480 set_vector_elem (vec, i, car (x)); 4540 vector_set (vec, i, car (x));
4481 4541
4482 s_return (vec); 4542 s_return (vec);
4483 } 4543 }
4484 4544
4485 case OP_MKVECTOR: /* make-vector */ 4545 case OP_MKVECTOR: /* make-vector */
4486 { 4546 {
4487 pointer fill = NIL; 4547 pointer fill = NIL;
4488 int len;
4489 pointer vec; 4548 pointer vec;
4549 int len = ivalue_unchecked (x);
4490 4550
4491 len = ivalue (car (SCHEME_V->args));
4492
4493 if (cdr (SCHEME_V->args) != NIL) 4551 if (cdr (args) != NIL)
4494 fill = cadr (SCHEME_V->args); 4552 fill = cadr (args);
4495 4553
4496 vec = mk_vector (SCHEME_A_ len); 4554 vec = mk_vector (SCHEME_A_ len);
4497 4555
4498#if USE_ERROR_CHECKING 4556#if USE_ERROR_CHECKING
4499 if (SCHEME_V->no_memory) 4557 if (SCHEME_V->no_memory)
4500 s_return (S_SINK); 4558 s_return (S_SINK);
4501#endif 4559#endif
4502 4560
4503 if (fill != NIL) 4561 if (fill != NIL)
4504 fill_vector (vec, fill); 4562 fill_vector (vec, 0, fill);
4505 4563
4506 s_return (vec); 4564 s_return (vec);
4507 } 4565 }
4508 4566
4509 case OP_VECLEN: /* vector-length */ 4567 case OP_VECLEN: /* vector-length */
4510 s_return (mk_integer (SCHEME_A_ vector_length (car (SCHEME_V->args)))); 4568 s_return (mk_integer (SCHEME_A_ veclength (x)));
4569
4570 case OP_VECRESIZE:
4571 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4572 s_return (x);
4511 4573
4512 case OP_VECREF: /* vector-ref */ 4574 case OP_VECREF: /* vector-ref */
4513 { 4575 {
4514 int index;
4515
4516 index = ivalue (cadr (SCHEME_V->args)); 4576 int index = ivalue_unchecked (cadr (args));
4517 4577
4518 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4578 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4519 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4579 Error_1 ("vector-ref: out of bounds:", cadr (args));
4520 4580
4521 s_return (vector_elem (car (SCHEME_V->args), index)); 4581 s_return (vector_get (x, index));
4522 } 4582 }
4523 4583
4524 case OP_VECSET: /* vector-set! */ 4584 case OP_VECSET: /* vector-set! */
4525 { 4585 {
4526 int index; 4586 int index = ivalue_unchecked (cadr (args));
4527 4587
4528 if (is_immutable (car (SCHEME_V->args))) 4588 if (is_immutable (x))
4529 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4589 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4530 4590
4531 index = ivalue (cadr (SCHEME_V->args));
4532
4533 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4591 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4534 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4592 Error_1 ("vector-set!: out of bounds:", cadr (args));
4535 4593
4536 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4594 vector_set (x, index, caddr (args));
4537 s_return (car (SCHEME_V->args)); 4595 s_return (x);
4538 } 4596 }
4539 } 4597 }
4540 4598
4541 return S_T; 4599 if (USE_ERROR_CHECKING) abort ();
4542} 4600}
4543 4601
4544INTERFACE int 4602/* relational ops */
4545is_list (SCHEME_P_ pointer a) 4603ecb_hot static int
4604opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4546{ 4605{
4547 return list_length (SCHEME_A_ a) >= 0; 4606 pointer x = SCHEME_V->args;
4548}
4549 4607
4550/* Result is: 4608 for (;;)
4551 proper list: length
4552 circular list: -1
4553 not even a pair: -2
4554 dotted list: -2 minus length before dot
4555*/
4556INTERFACE int
4557list_length (SCHEME_P_ pointer a)
4558{
4559 int i = 0;
4560 pointer slow, fast;
4561
4562 slow = fast = a;
4563
4564 while (1)
4565 { 4609 {
4610 num v = nvalue (car (x));
4611 x = cdr (x);
4612
4566 if (fast == NIL) 4613 if (x == NIL)
4567 return i; 4614 break;
4568 4615
4569 if (!is_pair (fast)) 4616 int r = num_cmp (v, nvalue (car (x)));
4570 return -2 - i;
4571 4617
4572 fast = cdr (fast); 4618 switch (op)
4573 ++i;
4574
4575 if (fast == NIL)
4576 return i;
4577
4578 if (!is_pair (fast))
4579 return -2 - i;
4580
4581 ++i;
4582 fast = cdr (fast);
4583
4584 /* Safe because we would have already returned if `fast'
4585 encountered a non-pair. */
4586 slow = cdr (slow);
4587
4588 if (fast == slow)
4589 { 4619 {
4590 /* the fast pointer has looped back around and caught up 4620 case OP_NUMEQ: r = r == 0; break;
4591 with the slow pointer, hence the structure is circular, 4621 case OP_LESS: r = r < 0; break;
4592 not of finite length, and therefore not a list */ 4622 case OP_GRE: r = r > 0; break;
4593 return -1; 4623 case OP_LEQ: r = r <= 0; break;
4624 case OP_GEQ: r = r >= 0; break;
4594 } 4625 }
4595 }
4596}
4597 4626
4598static pointer 4627 if (!r)
4628 s_return (S_F);
4629 }
4630
4631 s_return (S_T);
4632}
4633
4634/* predicates */
4635ecb_hot static int
4599opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4636opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4600{ 4637{
4601 pointer x; 4638 pointer args = SCHEME_V->args;
4602 num v; 4639 pointer a = car (args);
4603 int (*comp_func) (num, num); 4640 pointer d = cdr (args);
4641 int r;
4604 4642
4605 switch (op) 4643 switch (op)
4606 { 4644 {
4607 case OP_NOT: /* not */ 4645 case OP_NOT: /* not */ r = is_false (a) ; break;
4608 s_retbool (is_false (car (SCHEME_V->args))); 4646 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4647 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4648 case OP_NULLP: /* null? */ r = a == NIL ; break;
4649 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4650 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4651 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4652 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4653 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4654 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4655 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4609 4656
4610 case OP_BOOLP: /* boolean? */
4611 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4612
4613 case OP_EOFOBJP: /* boolean? */
4614 s_retbool (car (SCHEME_V->args) == S_EOF);
4615
4616 case OP_NULLP: /* null? */
4617 s_retbool (car (SCHEME_V->args) == NIL);
4618
4619 case OP_NUMEQ: /* = */
4620 case OP_LESS: /* < */
4621 case OP_GRE: /* > */
4622 case OP_LEQ: /* <= */
4623 case OP_GEQ: /* >= */
4624 switch (op)
4625 {
4626 case OP_NUMEQ:
4627 comp_func = num_eq;
4628 break;
4629
4630 case OP_LESS:
4631 comp_func = num_lt;
4632 break;
4633
4634 case OP_GRE:
4635 comp_func = num_gt;
4636 break;
4637
4638 case OP_LEQ:
4639 comp_func = num_le;
4640 break;
4641
4642 case OP_GEQ:
4643 comp_func = num_ge;
4644 break;
4645 }
4646
4647 x = SCHEME_V->args;
4648 v = nvalue (car (x));
4649 x = cdr (x);
4650
4651 for (; x != NIL; x = cdr (x))
4652 {
4653 if (!comp_func (v, nvalue (car (x))))
4654 s_retbool (0);
4655
4656 v = nvalue (car (x));
4657 }
4658
4659 s_retbool (1);
4660
4661 case OP_SYMBOLP: /* symbol? */
4662 s_retbool (is_symbol (car (SCHEME_V->args)));
4663
4664 case OP_NUMBERP: /* number? */
4665 s_retbool (is_number (car (SCHEME_V->args)));
4666
4667 case OP_STRINGP: /* string? */
4668 s_retbool (is_string (car (SCHEME_V->args)));
4669
4670 case OP_INTEGERP: /* integer? */
4671 s_retbool (is_integer (car (SCHEME_V->args)));
4672
4673 case OP_REALP: /* real? */
4674 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4675
4676 case OP_CHARP: /* char? */
4677 s_retbool (is_character (car (SCHEME_V->args)));
4678#if USE_CHAR_CLASSIFIERS 4657#if USE_CHAR_CLASSIFIERS
4679 4658 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4680 case OP_CHARAP: /* char-alphabetic? */ 4659 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4681 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4660 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4682 4661 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4683 case OP_CHARNP: /* char-numeric? */ 4662 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4684 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4685
4686 case OP_CHARWP: /* char-whitespace? */
4687 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4688
4689 case OP_CHARUP: /* char-upper-case? */
4690 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4691
4692 case OP_CHARLP: /* char-lower-case? */
4693 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4694#endif 4663#endif
4664
4695#if USE_PORTS 4665#if USE_PORTS
4696 4666 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4697 case OP_PORTP: /* port? */
4698 s_retbool (is_port (car (SCHEME_V->args)));
4699
4700 case OP_INPORTP: /* input-port? */ 4667 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4701 s_retbool (is_inport (car (SCHEME_V->args)));
4702
4703 case OP_OUTPORTP: /* output-port? */ 4668 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4704 s_retbool (is_outport (car (SCHEME_V->args)));
4705#endif 4669#endif
4706 4670
4707 case OP_PROCP: /* procedure? */ 4671 case OP_PROCP: /* procedure? */
4708 4672
4709 /*-- 4673 /*--
4710 * continuation should be procedure by the example 4674 * continuation should be procedure by the example
4711 * (call-with-current-continuation procedure?) ==> #t 4675 * (call-with-current-continuation procedure?) ==> #t
4712 * in R^3 report sec. 6.9 4676 * in R^3 report sec. 6.9
4713 */ 4677 */
4714 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4678 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4715 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4679 break;
4716 4680
4717 case OP_PAIRP: /* pair? */ 4681 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4718 s_retbool (is_pair (car (SCHEME_V->args))); 4682 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4719 4683 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4720 case OP_LISTP: /* list? */ 4684 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4721 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4685 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4722 4686 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4723 case OP_ENVP: /* environment? */
4724 s_retbool (is_environment (car (SCHEME_V->args)));
4725
4726 case OP_VECTORP: /* vector? */
4727 s_retbool (is_vector (car (SCHEME_V->args)));
4728
4729 case OP_EQ: /* eq? */
4730 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4731
4732 case OP_EQV: /* eqv? */
4733 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4734 } 4687 }
4735 4688
4736 return S_T; 4689 s_retbool (r);
4737} 4690}
4738 4691
4739static pointer 4692/* promises, list ops, ports */
4693ecb_hot static int
4740opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4694opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4741{ 4695{
4696 pointer args = SCHEME_V->args;
4697 pointer a = car (args);
4742 pointer x, y; 4698 pointer x, y;
4743 4699
4744 switch (op) 4700 switch (op)
4745 { 4701 {
4746 case OP_FORCE: /* force */ 4702 case OP_FORCE: /* force */
4747 SCHEME_V->code = car (SCHEME_V->args); 4703 SCHEME_V->code = a;
4748 4704
4749 if (is_promise (SCHEME_V->code)) 4705 if (is_promise (SCHEME_V->code))
4750 { 4706 {
4751 /* Should change type to closure here */ 4707 /* Should change type to closure here */
4752 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4708 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4755 } 4711 }
4756 else 4712 else
4757 s_return (SCHEME_V->code); 4713 s_return (SCHEME_V->code);
4758 4714
4759 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4715 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4760 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4716 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4761 s_return (SCHEME_V->value); 4717 s_return (SCHEME_V->value);
4762 4718
4763#if USE_PORTS 4719#if USE_PORTS
4720
4721 case OP_EOF_OBJECT: /* eof-object */
4722 s_return (S_EOF);
4764 4723
4765 case OP_WRITE: /* write */ 4724 case OP_WRITE: /* write */
4766 case OP_DISPLAY: /* display */ 4725 case OP_DISPLAY: /* display */
4767 case OP_WRITE_CHAR: /* write-char */ 4726 case OP_WRITE_CHAR: /* write-char */
4768 if (is_pair (cdr (SCHEME_V->args))) 4727 if (is_pair (cdr (SCHEME_V->args)))
… …
4773 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4732 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4774 SCHEME_V->outport = cadr (SCHEME_V->args); 4733 SCHEME_V->outport = cadr (SCHEME_V->args);
4775 } 4734 }
4776 } 4735 }
4777 4736
4778 SCHEME_V->args = car (SCHEME_V->args); 4737 SCHEME_V->args = a;
4779 4738
4780 if (op == OP_WRITE) 4739 if (op == OP_WRITE)
4781 SCHEME_V->print_flag = 1; 4740 SCHEME_V->print_flag = 1;
4782 else 4741 else
4783 SCHEME_V->print_flag = 0; 4742 SCHEME_V->print_flag = 0;
4784 4743
4785 s_goto (OP_P0LIST); 4744 s_goto (OP_P0LIST);
4786 4745
4746 //TODO: move to scheme
4787 case OP_NEWLINE: /* newline */ 4747 case OP_NEWLINE: /* newline */
4788 if (is_pair (SCHEME_V->args)) 4748 if (is_pair (args))
4789 { 4749 {
4790 if (car (SCHEME_V->args) != SCHEME_V->outport) 4750 if (a != SCHEME_V->outport)
4791 { 4751 {
4792 x = cons (SCHEME_V->outport, NIL); 4752 x = cons (SCHEME_V->outport, NIL);
4793 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4753 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4794 SCHEME_V->outport = car (SCHEME_V->args); 4754 SCHEME_V->outport = a;
4795 } 4755 }
4796 } 4756 }
4797 4757
4798 putstr (SCHEME_A_ "\n"); 4758 putcharacter (SCHEME_A_ '\n');
4799 s_return (S_T); 4759 s_return (S_T);
4800#endif 4760#endif
4801 4761
4802 case OP_ERR0: /* error */ 4762 case OP_ERR0: /* error */
4803 SCHEME_V->retcode = -1; 4763 SCHEME_V->retcode = -1;
4804 4764
4805 if (!is_string (car (SCHEME_V->args))) 4765 if (!is_string (a))
4806 { 4766 {
4807 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4767 args = cons (mk_string (SCHEME_A_ " -- "), args);
4808 setimmutable (car (SCHEME_V->args)); 4768 setimmutable (car (args));
4809 } 4769 }
4810 4770
4811 putstr (SCHEME_A_ "Error: "); 4771 putstr (SCHEME_A_ "Error: ");
4812 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4772 putstr (SCHEME_A_ strvalue (car (args)));
4813 SCHEME_V->args = cdr (SCHEME_V->args); 4773 SCHEME_V->args = cdr (args);
4814 s_goto (OP_ERR1); 4774 s_goto (OP_ERR1);
4815 4775
4816 case OP_ERR1: /* error */ 4776 case OP_ERR1: /* error */
4817 putstr (SCHEME_A_ " "); 4777 putcharacter (SCHEME_A_ ' ');
4818 4778
4819 if (SCHEME_V->args != NIL) 4779 if (args != NIL)
4820 { 4780 {
4821 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4781 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4822 SCHEME_V->args = car (SCHEME_V->args); 4782 SCHEME_V->args = a;
4823 SCHEME_V->print_flag = 1; 4783 SCHEME_V->print_flag = 1;
4824 s_goto (OP_P0LIST); 4784 s_goto (OP_P0LIST);
4825 } 4785 }
4826 else 4786 else
4827 { 4787 {
4828 putstr (SCHEME_A_ "\n"); 4788 putcharacter (SCHEME_A_ '\n');
4829 4789
4830 if (SCHEME_V->interactive_repl) 4790 if (SCHEME_V->interactive_repl)
4831 s_goto (OP_T0LVL); 4791 s_goto (OP_T0LVL);
4832 else 4792 else
4833 return NIL; 4793 return -1;
4834 } 4794 }
4835 4795
4836 case OP_REVERSE: /* reverse */ 4796 case OP_REVERSE: /* reverse */
4837 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4797 s_return (reverse (SCHEME_A_ a));
4838 4798
4839 case OP_LIST_STAR: /* list* */ 4799 case OP_LIST_STAR: /* list* */
4840 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4800 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4841 4801
4842 case OP_APPEND: /* append */ 4802 case OP_APPEND: /* append */
4843 x = NIL; 4803 x = NIL;
4844 y = SCHEME_V->args; 4804 y = args;
4845 4805
4846 if (y == x) 4806 if (y == x)
4847 s_return (x); 4807 s_return (x);
4848 4808
4849 /* cdr() in the while condition is not a typo. If car() */ 4809 /* cdr() in the while condition is not a typo. If car() */
… …
4860 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4820 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4861 4821
4862#if USE_PLIST 4822#if USE_PLIST
4863 4823
4864 case OP_PUT: /* put */ 4824 case OP_PUT: /* put */
4865 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4825 if (!hasprop (a) || !hasprop (cadr (args)))
4866 Error_0 ("illegal use of put"); 4826 Error_0 ("illegal use of put");
4867 4827
4868 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4828 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4869 { 4829 {
4870 if (caar (x) == y) 4830 if (caar (x) == y)
4871 break; 4831 break;
4872 } 4832 }
4873 4833
4874 if (x != NIL) 4834 if (x != NIL)
4875 cdar (x) = caddr (SCHEME_V->args); 4835 cdar (x) = caddr (args);
4876 else 4836 else
4877 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4837 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4878 4838
4879 s_return (S_T); 4839 s_return (S_T);
4880 4840
4881 case OP_GET: /* get */ 4841 case OP_GET: /* get */
4882 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4842 if (!hasprop (a) || !hasprop (cadr (args)))
4883 Error_0 ("illegal use of get"); 4843 Error_0 ("illegal use of get");
4884 4844
4885 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4845 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4886 if (caar (x) == y) 4846 if (caar (x) == y)
4887 break; 4847 break;
4888 4848
4889 if (x != NIL) 4849 if (x != NIL)
4890 s_return (cdar (x)); 4850 s_return (cdar (x));
… …
4892 s_return (NIL); 4852 s_return (NIL);
4893 4853
4894#endif /* USE_PLIST */ 4854#endif /* USE_PLIST */
4895 4855
4896 case OP_QUIT: /* quit */ 4856 case OP_QUIT: /* quit */
4897 if (is_pair (SCHEME_V->args)) 4857 if (is_pair (args))
4898 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4858 SCHEME_V->retcode = ivalue (a);
4899 4859
4900 return NIL; 4860 return -1;
4901 4861
4902 case OP_GC: /* gc */ 4862 case OP_GC: /* gc */
4903 gc (SCHEME_A_ NIL, NIL); 4863 gc (SCHEME_A_ NIL, NIL);
4904 s_return (S_T); 4864 s_return (S_T);
4905 4865
4906 case OP_GCVERB: /* gc-verbose */ 4866 case OP_GCVERB: /* gc-verbose */
4907 { 4867 {
4908 int was = SCHEME_V->gc_verbose; 4868 int was = SCHEME_V->gc_verbose;
4909 4869
4910 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4870 SCHEME_V->gc_verbose = (a != S_F);
4911 s_retbool (was); 4871 s_retbool (was);
4912 } 4872 }
4913 4873
4914 case OP_NEWSEGMENT: /* new-segment */ 4874 case OP_NEWSEGMENT: /* new-segment */
4875#if 0
4915 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4876 if (!is_pair (args) || !is_number (a))
4916 Error_0 ("new-segment: argument must be a number"); 4877 Error_0 ("new-segment: argument must be a number");
4917 4878#endif
4918 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4879 s_retbool (alloc_cellseg (SCHEME_A));
4919
4920 s_return (S_T);
4921 4880
4922 case OP_OBLIST: /* oblist */ 4881 case OP_OBLIST: /* oblist */
4923 s_return (oblist_all_symbols (SCHEME_A)); 4882 s_return (oblist_all_symbols (SCHEME_A));
4924 4883
4925#if USE_PORTS 4884#if USE_PORTS
… …
4950 case OP_OPEN_INOUTFILE: 4909 case OP_OPEN_INOUTFILE:
4951 prop = port_input | port_output; 4910 prop = port_input | port_output;
4952 break; 4911 break;
4953 } 4912 }
4954 4913
4955 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4914 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4956 4915
4957 if (p == NIL) 4916 s_return (p == NIL ? S_F : p);
4958 s_return (S_F);
4959
4960 s_return (p);
4961 } 4917 }
4962 4918
4963# if USE_STRING_PORTS 4919# if USE_STRING_PORTS
4964 4920
4965 case OP_OPEN_INSTRING: /* open-input-string */ 4921 case OP_OPEN_INSTRING: /* open-input-string */
… …
4977 case OP_OPEN_INOUTSTRING: 4933 case OP_OPEN_INOUTSTRING:
4978 prop = port_input | port_output; 4934 prop = port_input | port_output;
4979 break; 4935 break;
4980 } 4936 }
4981 4937
4982 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4938 p = port_from_string (SCHEME_A_ strvalue (a),
4983 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4939 strvalue (a) + strlength (a), prop);
4984 4940
4985 if (p == NIL) 4941 s_return (p == NIL ? S_F : p);
4986 s_return (S_F);
4987
4988 s_return (p);
4989 } 4942 }
4990 4943
4991 case OP_OPEN_OUTSTRING: /* open-output-string */ 4944 case OP_OPEN_OUTSTRING: /* open-output-string */
4992 { 4945 {
4993 pointer p; 4946 pointer p;
4994 4947
4995 if (car (SCHEME_V->args) == NIL) 4948 if (a == NIL)
4996 {
4997 p = port_from_scratch (SCHEME_A); 4949 p = port_from_scratch (SCHEME_A);
4998
4999 if (p == NIL)
5000 s_return (S_F);
5001 }
5002 else 4950 else
5003 {
5004 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4951 p = port_from_string (SCHEME_A_ strvalue (a),
5005 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4952 strvalue (a) + strlength (a), port_output);
5006 4953
5007 if (p == NIL) 4954 s_return (p == NIL ? S_F : p);
5008 s_return (S_F);
5009 }
5010
5011 s_return (p);
5012 } 4955 }
5013 4956
5014 case OP_GET_OUTSTRING: /* get-output-string */ 4957 case OP_GET_OUTSTRING: /* get-output-string */
5015 { 4958 {
5016 port *p; 4959 port *p = port (a);
5017 4960
5018 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4961 if (p->kind & port_string)
5019 { 4962 {
5020 off_t size; 4963 off_t size;
5021 char *str; 4964 char *str;
5022 4965
5023 size = p->rep.string.curr - p->rep.string.start + 1; 4966 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5039 } 4982 }
5040 4983
5041# endif 4984# endif
5042 4985
5043 case OP_CLOSE_INPORT: /* close-input-port */ 4986 case OP_CLOSE_INPORT: /* close-input-port */
5044 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4987 port_close (SCHEME_A_ a, port_input);
5045 s_return (S_T); 4988 s_return (S_T);
5046 4989
5047 case OP_CLOSE_OUTPORT: /* close-output-port */ 4990 case OP_CLOSE_OUTPORT: /* close-output-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4991 port_close (SCHEME_A_ a, port_output);
5049 s_return (S_T); 4992 s_return (S_T);
5050#endif 4993#endif
5051 4994
5052 case OP_INT_ENV: /* interaction-environment */ 4995 case OP_INT_ENV: /* interaction-environment */
5053 s_return (SCHEME_V->global_env); 4996 s_return (SCHEME_V->global_env);
… …
5055 case OP_CURR_ENV: /* current-environment */ 4998 case OP_CURR_ENV: /* current-environment */
5056 s_return (SCHEME_V->envir); 4999 s_return (SCHEME_V->envir);
5057 5000
5058 } 5001 }
5059 5002
5060 return S_T; 5003 if (USE_ERROR_CHECKING) abort ();
5061} 5004}
5062 5005
5063static pointer 5006/* reading */
5007ecb_cold static int
5064opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5008opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5065{ 5009{
5010 pointer args = SCHEME_V->args;
5066 pointer x; 5011 pointer x;
5067 5012
5068 if (SCHEME_V->nesting != 0) 5013 if (SCHEME_V->nesting != 0)
5069 { 5014 {
5070 int n = SCHEME_V->nesting; 5015 int n = SCHEME_V->nesting;
… …
5077 switch (op) 5022 switch (op)
5078 { 5023 {
5079 /* ========== reading part ========== */ 5024 /* ========== reading part ========== */
5080#if USE_PORTS 5025#if USE_PORTS
5081 case OP_READ: 5026 case OP_READ:
5082 if (!is_pair (SCHEME_V->args)) 5027 if (!is_pair (args))
5083 s_goto (OP_READ_INTERNAL); 5028 s_goto (OP_READ_INTERNAL);
5084 5029
5085 if (!is_inport (car (SCHEME_V->args))) 5030 if (!is_inport (car (args)))
5086 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 5031 Error_1 ("read: not an input port:", car (args));
5087 5032
5088 if (car (SCHEME_V->args) == SCHEME_V->inport) 5033 if (car (args) == SCHEME_V->inport)
5089 s_goto (OP_READ_INTERNAL); 5034 s_goto (OP_READ_INTERNAL);
5090 5035
5091 x = SCHEME_V->inport; 5036 x = SCHEME_V->inport;
5092 SCHEME_V->inport = car (SCHEME_V->args); 5037 SCHEME_V->inport = car (args);
5093 x = cons (x, NIL); 5038 x = cons (x, NIL);
5094 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 5039 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5095 s_goto (OP_READ_INTERNAL); 5040 s_goto (OP_READ_INTERNAL);
5096 5041
5097 case OP_READ_CHAR: /* read-char */ 5042 case OP_READ_CHAR: /* read-char */
5098 case OP_PEEK_CHAR: /* peek-char */ 5043 case OP_PEEK_CHAR: /* peek-char */
5099 { 5044 {
5100 int c; 5045 int c;
5101 5046
5102 if (is_pair (SCHEME_V->args)) 5047 if (is_pair (args))
5103 { 5048 {
5104 if (car (SCHEME_V->args) != SCHEME_V->inport) 5049 if (car (args) != SCHEME_V->inport)
5105 { 5050 {
5106 x = SCHEME_V->inport; 5051 x = SCHEME_V->inport;
5107 x = cons (x, NIL); 5052 x = cons (x, NIL);
5108 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 5053 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5109 SCHEME_V->inport = car (SCHEME_V->args); 5054 SCHEME_V->inport = car (args);
5110 } 5055 }
5111 } 5056 }
5112 5057
5113 c = inchar (SCHEME_A); 5058 c = inchar (SCHEME_A);
5114 5059
… …
5124 case OP_CHAR_READY: /* char-ready? */ 5069 case OP_CHAR_READY: /* char-ready? */
5125 { 5070 {
5126 pointer p = SCHEME_V->inport; 5071 pointer p = SCHEME_V->inport;
5127 int res; 5072 int res;
5128 5073
5129 if (is_pair (SCHEME_V->args)) 5074 if (is_pair (args))
5130 p = car (SCHEME_V->args); 5075 p = car (args);
5131 5076
5132 res = p->object.port->kind & port_string; 5077 res = port (p)->kind & port_string;
5133 5078
5134 s_retbool (res); 5079 s_retbool (res);
5135 } 5080 }
5136 5081
5137 case OP_SET_INPORT: /* set-input-port */ 5082 case OP_SET_INPORT: /* set-input-port */
5138 SCHEME_V->inport = car (SCHEME_V->args); 5083 SCHEME_V->inport = car (args);
5139 s_return (SCHEME_V->value); 5084 s_return (SCHEME_V->value);
5140 5085
5141 case OP_SET_OUTPORT: /* set-output-port */ 5086 case OP_SET_OUTPORT: /* set-output-port */
5142 SCHEME_V->outport = car (SCHEME_V->args); 5087 SCHEME_V->outport = car (args);
5143 s_return (SCHEME_V->value); 5088 s_return (SCHEME_V->value);
5144#endif 5089#endif
5145 5090
5146 case OP_RDSEXPR: 5091 case OP_RDSEXPR:
5147 switch (SCHEME_V->tok) 5092 switch (SCHEME_V->tok)
… …
5196 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5141 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5197 SCHEME_V->tok = token (SCHEME_A); 5142 SCHEME_V->tok = token (SCHEME_A);
5198 s_goto (OP_RDSEXPR); 5143 s_goto (OP_RDSEXPR);
5199 5144
5200 case TOK_ATOM: 5145 case TOK_ATOM:
5201 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5146 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5147
5148 case TOK_DOTATOM:
5149 SCHEME_V->strbuff[0] = '.';
5150 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5151
5152 case TOK_STRATOM:
5153 x = readstrexp (SCHEME_A_ '|');
5154 //TODO: haven't checked whether the garbage collector could interfere
5155 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5202 5156
5203 case TOK_DQUOTE: 5157 case TOK_DQUOTE:
5204 x = readstrexp (SCHEME_A); 5158 x = readstrexp (SCHEME_A_ '"');
5205 5159
5206 if (x == S_F) 5160 if (x == S_F)
5207 Error_0 ("Error reading string"); 5161 Error_0 ("Error reading string");
5208 5162
5209 setimmutable (x); 5163 setimmutable (x);
… …
5221 s_goto (OP_EVAL); 5175 s_goto (OP_EVAL);
5222 } 5176 }
5223 } 5177 }
5224 5178
5225 case TOK_SHARP_CONST: 5179 case TOK_SHARP_CONST:
5226 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5180 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5227 Error_0 ("undefined sharp expression"); 5181 Error_0 ("undefined sharp expression");
5228 else 5182 else
5229 s_return (x); 5183 s_return (x);
5230 5184
5231 default: 5185 default:
… …
5233 } 5187 }
5234 5188
5235 break; 5189 break;
5236 5190
5237 case OP_RDLIST: 5191 case OP_RDLIST:
5238 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5192 SCHEME_V->args = cons (SCHEME_V->value, args);
5239 SCHEME_V->tok = token (SCHEME_A); 5193 SCHEME_V->tok = token (SCHEME_A);
5240 5194
5241 switch (SCHEME_V->tok) 5195 switch (SCHEME_V->tok)
5242 { 5196 {
5243 case TOK_EOF: 5197 case TOK_EOF:
… …
5271 case OP_RDDOT: 5225 case OP_RDDOT:
5272 if (token (SCHEME_A) != TOK_RPAREN) 5226 if (token (SCHEME_A) != TOK_RPAREN)
5273 Error_0 ("syntax error: illegal dot expression"); 5227 Error_0 ("syntax error: illegal dot expression");
5274 5228
5275 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5229 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5276 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5230 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5277 5231
5278 case OP_RDQUOTE: 5232 case OP_RDQUOTE:
5279 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5233 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5280 5234
5281 case OP_RDQQUOTE: 5235 case OP_RDQQUOTE:
… …
5303 SCHEME_V->args = SCHEME_V->value; 5257 SCHEME_V->args = SCHEME_V->value;
5304 s_goto (OP_VECTOR); 5258 s_goto (OP_VECTOR);
5305 5259
5306 /* ========== printing part ========== */ 5260 /* ========== printing part ========== */
5307 case OP_P0LIST: 5261 case OP_P0LIST:
5308 if (is_vector (SCHEME_V->args)) 5262 if (is_vector (args))
5309 { 5263 {
5310 putstr (SCHEME_A_ "#("); 5264 putstr (SCHEME_A_ "#(");
5311 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5265 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5312 s_goto (OP_PVECFROM); 5266 s_goto (OP_PVECFROM);
5313 } 5267 }
5314 else if (is_environment (SCHEME_V->args)) 5268 else if (is_environment (args))
5315 { 5269 {
5316 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5270 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5317 s_return (S_T); 5271 s_return (S_T);
5318 } 5272 }
5319 else if (!is_pair (SCHEME_V->args)) 5273 else if (!is_pair (args))
5320 { 5274 {
5321 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5275 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5322 s_return (S_T); 5276 s_return (S_T);
5323 } 5277 }
5324 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5278 else
5325 { 5279 {
5280 pointer a = car (args);
5281 pointer b = cdr (args);
5282 int ok_abbr = ok_abbrev (b);
5283 SCHEME_V->args = car (b);
5284
5285 if (a == SCHEME_V->QUOTE && ok_abbr)
5286 putcharacter (SCHEME_A_ '\'');
5287 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5288 putcharacter (SCHEME_A_ '`');
5289 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5290 putcharacter (SCHEME_A_ ',');
5291 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5326 putstr (SCHEME_A_ "'"); 5292 putstr (SCHEME_A_ ",@");
5327 SCHEME_V->args = cadr (SCHEME_V->args); 5293 else
5294 {
5295 putcharacter (SCHEME_A_ '(');
5296 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5297 SCHEME_V->args = a;
5298 }
5299
5328 s_goto (OP_P0LIST); 5300 s_goto (OP_P0LIST);
5329 } 5301 }
5330 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5302
5303 case OP_P1LIST:
5304 if (is_pair (args))
5331 { 5305 {
5306 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5332 putstr (SCHEME_A_ "`"); 5307 putcharacter (SCHEME_A_ ' ');
5333 SCHEME_V->args = cadr (SCHEME_V->args); 5308 SCHEME_V->args = car (args);
5334 s_goto (OP_P0LIST); 5309 s_goto (OP_P0LIST);
5335 } 5310 }
5336 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5337 {
5338 putstr (SCHEME_A_ ",");
5339 SCHEME_V->args = cadr (SCHEME_V->args);
5340 s_goto (OP_P0LIST);
5341 }
5342 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5343 {
5344 putstr (SCHEME_A_ ",@");
5345 SCHEME_V->args = cadr (SCHEME_V->args);
5346 s_goto (OP_P0LIST);
5347 }
5348 else
5349 {
5350 putstr (SCHEME_A_ "(");
5351 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5352 SCHEME_V->args = car (SCHEME_V->args);
5353 s_goto (OP_P0LIST);
5354 }
5355
5356 case OP_P1LIST:
5357 if (is_pair (SCHEME_V->args))
5358 {
5359 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5360 putstr (SCHEME_A_ " ");
5361 SCHEME_V->args = car (SCHEME_V->args);
5362 s_goto (OP_P0LIST);
5363 }
5364 else if (is_vector (SCHEME_V->args)) 5311 else if (is_vector (args))
5365 { 5312 {
5366 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5313 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5367 putstr (SCHEME_A_ " . "); 5314 putstr (SCHEME_A_ " . ");
5368 s_goto (OP_P0LIST); 5315 s_goto (OP_P0LIST);
5369 } 5316 }
5370 else 5317 else
5371 { 5318 {
5372 if (SCHEME_V->args != NIL) 5319 if (args != NIL)
5373 { 5320 {
5374 putstr (SCHEME_A_ " . "); 5321 putstr (SCHEME_A_ " . ");
5375 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5322 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5376 } 5323 }
5377 5324
5378 putstr (SCHEME_A_ ")"); 5325 putcharacter (SCHEME_A_ ')');
5379 s_return (S_T); 5326 s_return (S_T);
5380 } 5327 }
5381 5328
5382 case OP_PVECFROM: 5329 case OP_PVECFROM:
5383 { 5330 {
5384 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5331 int i = ivalue_unchecked (cdr (args));
5385 pointer vec = car (SCHEME_V->args); 5332 pointer vec = car (args);
5386 int len = vector_length (vec); 5333 int len = veclength (vec);
5387 5334
5388 if (i == len) 5335 if (i == len)
5389 { 5336 {
5390 putstr (SCHEME_A_ ")"); 5337 putcharacter (SCHEME_A_ ')');
5391 s_return (S_T); 5338 s_return (S_T);
5392 } 5339 }
5393 else 5340 else
5394 { 5341 {
5395 pointer elem = vector_elem (vec, i); 5342 pointer elem = vector_get (vec, i);
5396 5343
5397 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5344 ivalue_unchecked (cdr (args)) = i + 1;
5398 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5345 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5399 SCHEME_V->args = elem; 5346 SCHEME_V->args = elem;
5400 5347
5401 if (i > 0) 5348 if (i > 0)
5402 putstr (SCHEME_A_ " "); 5349 putcharacter (SCHEME_A_ ' ');
5403 5350
5404 s_goto (OP_P0LIST); 5351 s_goto (OP_P0LIST);
5405 } 5352 }
5406 } 5353 }
5407 } 5354 }
5408 5355
5409 return S_T; 5356 if (USE_ERROR_CHECKING) abort ();
5410} 5357}
5411 5358
5412static pointer 5359/* list ops */
5360ecb_hot static int
5413opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5361opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5414{ 5362{
5363 pointer args = SCHEME_V->args;
5364 pointer a = car (args);
5415 pointer x, y; 5365 pointer x, y;
5416 5366
5417 switch (op) 5367 switch (op)
5418 { 5368 {
5419 case OP_LIST_LENGTH: /* length *//* a.k */ 5369 case OP_LIST_LENGTH: /* length *//* a.k */
5420 { 5370 {
5421 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5371 long v = list_length (SCHEME_A_ a);
5422 5372
5423 if (v < 0) 5373 if (v < 0)
5424 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5374 Error_1 ("length: not a list:", a);
5425 5375
5426 s_return (mk_integer (SCHEME_A_ v)); 5376 s_return (mk_integer (SCHEME_A_ v));
5427 } 5377 }
5428 5378
5429 case OP_ASSQ: /* assq *//* a.k */ 5379 case OP_ASSQ: /* assq *//* a.k */
5430 x = car (SCHEME_V->args); 5380 x = a;
5431 5381
5432 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5382 for (y = cadr (args); is_pair (y); y = cdr (y))
5433 { 5383 {
5434 if (!is_pair (car (y))) 5384 if (!is_pair (car (y)))
5435 Error_0 ("unable to handle non pair element"); 5385 Error_0 ("unable to handle non pair element");
5436 5386
5437 if (x == caar (y)) 5387 if (x == caar (y))
5438 break; 5388 break;
5439 } 5389 }
5440 5390
5441 if (is_pair (y)) 5391 if (is_pair (y))
5442 s_return (car (y)); 5392 s_return (car (y));
5443 else 5393
5444 s_return (S_F); 5394 s_return (S_F);
5445
5446 5395
5447 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5396 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5448 SCHEME_V->args = car (SCHEME_V->args); 5397 SCHEME_V->args = a;
5449 5398
5450 if (SCHEME_V->args == NIL) 5399 if (SCHEME_V->args == NIL)
5451 s_return (S_F); 5400 s_return (S_F);
5452 else if (is_closure (SCHEME_V->args)) 5401 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5453 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5402 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5454 else if (is_macro (SCHEME_V->args)) 5403
5455 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5456 else
5457 s_return (S_F); 5404 s_return (S_F);
5458 5405
5459 case OP_CLOSUREP: /* closure? */ 5406 case OP_CLOSUREP: /* closure? */
5460 /* 5407 /*
5461 * Note, macro object is also a closure. 5408 * Note, macro object is also a closure.
5462 * Therefore, (closure? <#MACRO>) ==> #t 5409 * Therefore, (closure? <#MACRO>) ==> #t
5410 * (schmorp) well, obviously not, fix? TODO
5463 */ 5411 */
5464 s_retbool (is_closure (car (SCHEME_V->args))); 5412 s_retbool (is_closure (a));
5465 5413
5466 case OP_MACROP: /* macro? */ 5414 case OP_MACROP: /* macro? */
5467 s_retbool (is_macro (car (SCHEME_V->args))); 5415 s_retbool (is_macro (a));
5468 } 5416 }
5469 5417
5470 return S_T; /* NOTREACHED */ 5418 if (USE_ERROR_CHECKING) abort ();
5471} 5419}
5472 5420
5421/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5473typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5422typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5474 5423
5475typedef int (*test_predicate) (pointer); 5424typedef int (*test_predicate)(pointer);
5476static int 5425
5426ecb_hot static int
5477is_any (pointer p) 5427tst_any (pointer p)
5478{ 5428{
5479 return 1; 5429 return 1;
5480} 5430}
5481 5431
5482static int 5432ecb_hot static int
5483is_nonneg (pointer p) 5433tst_inonneg (pointer p)
5484{ 5434{
5485 return ivalue (p) >= 0 && is_integer (p); 5435 return is_integer (p) && ivalue_unchecked (p) >= 0;
5436}
5437
5438ecb_hot static int
5439tst_is_list (SCHEME_P_ pointer p)
5440{
5441 return p == NIL || is_pair (p);
5486} 5442}
5487 5443
5488/* Correspond carefully with following defines! */ 5444/* Correspond carefully with following defines! */
5489static struct 5445static struct
5490{ 5446{
5491 test_predicate fct; 5447 test_predicate fct;
5492 const char *kind; 5448 const char *kind;
5493} tests[] = 5449} tests[] = {
5494{ 5450 { tst_any , 0 },
5495 { 0, 0}, /* unused */ 5451 { is_string , "string" },
5496 { is_any, 0}, 5452 { is_symbol , "symbol" },
5497 { is_string, "string" }, 5453 { is_port , "port" },
5498 { is_symbol, "symbol" },
5499 { is_port, "port" },
5500 { is_inport, "input port" }, 5454 { is_inport , "input port" },
5501 { is_outport, "output port" }, 5455 { is_outport , "output port" },
5502 { is_environment, "environment" }, 5456 { is_environment, "environment" },
5503 { is_pair, "pair" }, 5457 { is_pair , "pair" },
5504 { 0, "pair or '()" }, 5458 { 0 , "pair or '()" },
5505 { is_character, "character" }, 5459 { is_character , "character" },
5506 { is_vector, "vector" }, 5460 { is_vector , "vector" },
5507 { is_number, "number" }, 5461 { is_number , "number" },
5508 { is_integer, "integer" }, 5462 { is_integer , "integer" },
5509 { is_nonneg, "non-negative integer" } 5463 { tst_inonneg , "non-negative integer" }
5510}; 5464};
5511 5465
5512#define TST_NONE 0 5466#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5513#define TST_ANY "\001" 5467#define TST_ANY "\001"
5514#define TST_STRING "\002" 5468#define TST_STRING "\002"
5515#define TST_SYMBOL "\003" 5469#define TST_SYMBOL "\003"
5516#define TST_PORT "\004" 5470#define TST_PORT "\004"
5517#define TST_INPORT "\005" 5471#define TST_INPORT "\005"
5518#define TST_OUTPORT "\006" 5472#define TST_OUTPORT "\006"
5519#define TST_ENVIRONMENT "\007" 5473#define TST_ENVIRONMENT "\007"
5520#define TST_PAIR "\010" 5474#define TST_PAIR "\010"
5521#define TST_LIST "\011" 5475#define TST_LIST "\011"
5522#define TST_CHAR "\012" 5476#define TST_CHAR "\012"
5523#define TST_VECTOR "\013" 5477#define TST_VECTOR "\013"
5524#define TST_NUMBER "\014" 5478#define TST_NUMBER "\014"
5525#define TST_INTEGER "\015" 5479#define TST_INTEGER "\015"
5526#define TST_NATURAL "\016" 5480#define TST_NATURAL "\016"
5481
5482#define INF_ARG 0xff
5483#define UNNAMED_OP ""
5484
5485static const char opnames[] =
5486#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5487#include "opdefines.h"
5488#undef OP_DEF
5489;
5490
5491ecb_cold static const char *
5492opname (int idx)
5493{
5494 const char *name = opnames;
5495
5496 /* should do this at compile time, but would require external program, right? */
5497 while (idx--)
5498 name += strlen (name) + 1;
5499
5500 return *name ? name : "ILLEGAL";
5501}
5502
5503ecb_cold static const char *
5504procname (pointer x)
5505{
5506 return opname (procnum (x));
5507}
5527 5508
5528typedef struct 5509typedef struct
5529{ 5510{
5530 dispatch_func func; 5511 uint8_t func;
5531 char *name; 5512 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5513 uint8_t builtin;
5514#if USE_ERROR_CHECKING
5532 int min_arity; 5515 uint8_t min_arity;
5533 int max_arity; 5516 uint8_t max_arity;
5534 char *arg_tests_encoding; 5517 char arg_tests_encoding[3];
5518#endif
5535} op_code_info; 5519} op_code_info;
5536 5520
5537#define INF_ARG 0xffff
5538
5539static op_code_info dispatch_table[] = { 5521static const op_code_info dispatch_table[] = {
5540#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5522#if USE_ERROR_CHECKING
5523#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5524#else
5525#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5526#endif
5541#include "opdefines.h" 5527#include "opdefines.h"
5528#undef OP_DEF
5542 {0} 5529 {0}
5543}; 5530};
5544 5531
5545static const char *
5546procname (pointer x)
5547{
5548 int n = procnum (x);
5549 const char *name = dispatch_table[n].name;
5550
5551 if (name == 0)
5552 name = "ILLEGAL!";
5553
5554 return name;
5555}
5556
5557/* kernel of this interpreter */ 5532/* kernel of this interpreter */
5558static void 5533ecb_hot static void
5559Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5534Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5560{ 5535{
5561 SCHEME_V->op = op; 5536 SCHEME_V->op = op;
5562 5537
5563 for (;;) 5538 for (;;)
5564 { 5539 {
5565 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5540 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5566 5541
5567#if USE_ERROR_CHECKING 5542#if USE_ERROR_CHECKING
5568 if (pcd->name) /* if built-in function, check arguments */ 5543 if (pcd->builtin) /* if built-in function, check arguments */
5569 { 5544 {
5570 int ok = 1;
5571 char msg[STRBUFFSIZE]; 5545 char msg[STRBUFFSIZE];
5572 int n = list_length (SCHEME_A_ SCHEME_V->args); 5546 int n = list_length (SCHEME_A_ SCHEME_V->args);
5573 5547
5574 /* Check number of arguments */ 5548 /* Check number of arguments */
5575 if (n < pcd->min_arity) 5549 if (ecb_expect_false (n < pcd->min_arity))
5576 { 5550 {
5577 ok = 0;
5578 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5551 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5579 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5552 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5553 xError_1 (SCHEME_A_ msg, 0);
5554 continue;
5580 } 5555 }
5581 5556 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5582 if (ok && n > pcd->max_arity)
5583 { 5557 {
5584 ok = 0;
5585 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5558 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5586 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5559 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5560 xError_1 (SCHEME_A_ msg, 0);
5561 continue;
5587 } 5562 }
5588 5563 else
5589 if (ok)
5590 { 5564 {
5591 if (pcd->arg_tests_encoding) 5565 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5592 { 5566 {
5593 int i = 0; 5567 int i = 0;
5594 int j; 5568 int j;
5595 const char *t = pcd->arg_tests_encoding; 5569 const char *t = pcd->arg_tests_encoding;
5596 pointer arglist = SCHEME_V->args; 5570 pointer arglist = SCHEME_V->args;
5597 5571
5598 do 5572 do
5599 { 5573 {
5600 pointer arg = car (arglist); 5574 pointer arg = car (arglist);
5601 5575
5602 j = (int) t[0]; 5576 j = t[0];
5603 5577
5578 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5604 if (j == TST_LIST[0]) 5579 if (j == TST_LIST[0])
5605 { 5580 {
5606 if (arg != NIL && !is_pair (arg)) 5581 if (!tst_is_list (SCHEME_A_ arg))
5607 break; 5582 break;
5608 } 5583 }
5609 else 5584 else
5610 { 5585 {
5611 if (!tests[j].fct (arg)) 5586 if (!tests[j - 1].fct (arg))
5612 break; 5587 break;
5613 } 5588 }
5614 5589
5615 if (t[1] != 0) /* last test is replicated as necessary */ 5590 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5616 t++; 5591 t++;
5617 5592
5618 arglist = cdr (arglist); 5593 arglist = cdr (arglist);
5619 i++; 5594 i++;
5620 } 5595 }
5621 while (i < n); 5596 while (i < n);
5622 5597
5623 if (i < n) 5598 if (i < n)
5624 { 5599 {
5625 ok = 0;
5626 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5600 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5601 xError_1 (SCHEME_A_ msg, 0);
5602 continue;
5627 } 5603 }
5628 } 5604 }
5629 } 5605 }
5630
5631 if (!ok)
5632 {
5633 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5634 return;
5635
5636 pcd = dispatch_table + SCHEME_V->op;
5637 }
5638 } 5606 }
5639#endif 5607#endif
5640 5608
5641 ok_to_freely_gc (SCHEME_A); 5609 ok_to_freely_gc (SCHEME_A);
5642 5610
5643 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5611 static const dispatch_func dispatch_funcs[] = {
5612 opexe_0,
5613 opexe_1,
5614 opexe_2,
5615 opexe_3,
5616 opexe_4,
5617 opexe_5,
5618 opexe_6,
5619 };
5620
5621 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5644 return; 5622 return;
5645 5623
5646#if USE_ERROR_CHECKING 5624 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5647 if (SCHEME_V->no_memory)
5648 { 5625 {
5649 xwrstr ("No memory!\n"); 5626 putstr (SCHEME_A_ "No memory!\n");
5650 return; 5627 return;
5651 } 5628 }
5652#endif
5653 } 5629 }
5654} 5630}
5655 5631
5656/* ========== Initialization of internal keywords ========== */ 5632/* ========== Initialization of internal keywords ========== */
5657 5633
5658static void 5634ecb_cold static void
5659assign_syntax (SCHEME_P_ const char *name) 5635assign_syntax (SCHEME_P_ const char *name)
5660{ 5636{
5661 pointer x = oblist_add_by_name (SCHEME_A_ name); 5637 pointer x = oblist_add_by_name (SCHEME_A_ name);
5662 set_typeflag (x, typeflag (x) | T_SYNTAX); 5638 set_typeflag (x, typeflag (x) | T_SYNTAX);
5663} 5639}
5664 5640
5665static void 5641ecb_cold static void
5666assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5642assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5667{ 5643{
5668 pointer x = mk_symbol (SCHEME_A_ name); 5644 pointer x = mk_symbol (SCHEME_A_ name);
5669 pointer y = mk_proc (SCHEME_A_ op); 5645 pointer y = mk_proc (SCHEME_A_ op);
5670 new_slot_in_env (SCHEME_A_ x, y); 5646 new_slot_in_env (SCHEME_A_ x, y);
… …
5674mk_proc (SCHEME_P_ enum scheme_opcodes op) 5650mk_proc (SCHEME_P_ enum scheme_opcodes op)
5675{ 5651{
5676 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5652 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5677 set_typeflag (y, (T_PROC | T_ATOM)); 5653 set_typeflag (y, (T_PROC | T_ATOM));
5678 ivalue_unchecked (y) = op; 5654 ivalue_unchecked (y) = op;
5679 set_num_integer (y);
5680 return y; 5655 return y;
5681} 5656}
5682 5657
5683/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5658/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5684static int 5659ecb_hot static int
5685syntaxnum (pointer p) 5660syntaxnum (pointer p)
5686{ 5661{
5687 const char *s = strvalue (car (p)); 5662 const char *s = strvalue (p);
5688 5663
5689 switch (strlength (car (p))) 5664 switch (strlength (p))
5690 { 5665 {
5691 case 2: 5666 case 2:
5692 if (s[0] == 'i') 5667 if (s[0] == 'i')
5693 return OP_IF0; /* if */ 5668 return OP_IF0; /* if */
5694 else 5669 else
… …
5708 5683
5709 case 'd': 5684 case 'd':
5710 return OP_COND0; /* cond */ 5685 return OP_COND0; /* cond */
5711 5686
5712 case '*': 5687 case '*':
5713 return OP_LET0AST; /* let* */ 5688 return OP_LET0AST;/* let* */
5714 5689
5715 default: 5690 default:
5716 return OP_SET0; /* set! */ 5691 return OP_SET0; /* set! */
5717 } 5692 }
5718 5693
… …
5740 5715
5741 case 'f': 5716 case 'f':
5742 return OP_DEF0; /* define */ 5717 return OP_DEF0; /* define */
5743 5718
5744 default: 5719 default:
5745 return OP_LET0REC; /* letrec */ 5720 return OP_LET0REC;/* letrec */
5746 } 5721 }
5747 5722
5748 default: 5723 default:
5749 return OP_C0STREAM; /* cons-stream */ 5724 return OP_C0STREAM; /* cons-stream */
5750 } 5725 }
5751} 5726}
5752 5727
5753#if USE_MULTIPLICITY 5728#if USE_MULTIPLICITY
5754scheme * 5729ecb_cold scheme *
5755scheme_init_new () 5730scheme_init_new ()
5756{ 5731{
5757 scheme *sc = malloc (sizeof (scheme)); 5732 scheme *sc = malloc (sizeof (scheme));
5758 5733
5759 if (!scheme_init (SCHEME_A)) 5734 if (!scheme_init (SCHEME_A))
… …
5764 else 5739 else
5765 return sc; 5740 return sc;
5766} 5741}
5767#endif 5742#endif
5768 5743
5769int 5744ecb_cold int
5770scheme_init (SCHEME_P) 5745scheme_init (SCHEME_P)
5771{ 5746{
5772 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5747 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5773 pointer x; 5748 pointer x;
5749
5750 /* this memset is not strictly correct, as we assume (intcache)
5751 * that memset 0 will also set pointers to 0, but memset does
5752 * of course not guarantee that. screw such systems.
5753 */
5754 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5774 5755
5775 num_set_fixnum (num_zero, 1); 5756 num_set_fixnum (num_zero, 1);
5776 num_set_ivalue (num_zero, 0); 5757 num_set_ivalue (num_zero, 0);
5777 num_set_fixnum (num_one, 1); 5758 num_set_fixnum (num_one, 1);
5778 num_set_ivalue (num_one, 1); 5759 num_set_ivalue (num_one, 1);
… …
5790 SCHEME_V->save_inport = NIL; 5771 SCHEME_V->save_inport = NIL;
5791 SCHEME_V->loadport = NIL; 5772 SCHEME_V->loadport = NIL;
5792 SCHEME_V->nesting = 0; 5773 SCHEME_V->nesting = 0;
5793 SCHEME_V->interactive_repl = 0; 5774 SCHEME_V->interactive_repl = 0;
5794 5775
5795 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5776 if (!alloc_cellseg (SCHEME_A))
5796 { 5777 {
5797#if USE_ERROR_CHECKING 5778#if USE_ERROR_CHECKING
5798 SCHEME_V->no_memory = 1; 5779 SCHEME_V->no_memory = 1;
5799 return 0; 5780 return 0;
5800#endif 5781#endif
5801 } 5782 }
5802 5783
5803 SCHEME_V->gc_verbose = 0; 5784 SCHEME_V->gc_verbose = 0;
5804 dump_stack_initialize (SCHEME_A); 5785 dump_stack_initialize (SCHEME_A);
5805 SCHEME_V->code = NIL; 5786 SCHEME_V->code = NIL;
5806 SCHEME_V->args = NIL; 5787 SCHEME_V->args = NIL;
5807 SCHEME_V->envir = NIL; 5788 SCHEME_V->envir = NIL;
5789 SCHEME_V->value = NIL;
5808 SCHEME_V->tracing = 0; 5790 SCHEME_V->tracing = 0;
5809 5791
5810 /* init NIL */ 5792 /* init NIL */
5811 set_typeflag (NIL, T_ATOM | T_MARK); 5793 set_typeflag (NIL, T_ATOM | T_MARK);
5812 set_car (NIL, NIL); 5794 set_car (NIL, NIL);
… …
5817 set_cdr (S_T, S_T); 5799 set_cdr (S_T, S_T);
5818 /* init F */ 5800 /* init F */
5819 set_typeflag (S_F, T_ATOM | T_MARK); 5801 set_typeflag (S_F, T_ATOM | T_MARK);
5820 set_car (S_F, S_F); 5802 set_car (S_F, S_F);
5821 set_cdr (S_F, S_F); 5803 set_cdr (S_F, S_F);
5804 /* init EOF_OBJ */
5805 set_typeflag (S_EOF, T_ATOM | T_MARK);
5806 set_car (S_EOF, S_EOF);
5807 set_cdr (S_EOF, S_EOF);
5822 /* init sink */ 5808 /* init sink */
5823 set_typeflag (S_SINK, T_PAIR | T_MARK); 5809 set_typeflag (S_SINK, T_PAIR | T_MARK);
5824 set_car (S_SINK, NIL); 5810 set_car (S_SINK, NIL);
5811
5825 /* init c_nest */ 5812 /* init c_nest */
5826 SCHEME_V->c_nest = NIL; 5813 SCHEME_V->c_nest = NIL;
5827 5814
5828 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5815 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5829 /* init global_env */ 5816 /* init global_env */
… …
5842 5829
5843 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5830 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5844 assign_syntax (SCHEME_A_ syntax_names[i]); 5831 assign_syntax (SCHEME_A_ syntax_names[i]);
5845 } 5832 }
5846 5833
5834 // TODO: should iterate via strlen, to avoid n² complexity
5847 for (i = 0; i < n; i++) 5835 for (i = 0; i < n; i++)
5848 if (dispatch_table[i].name != 0) 5836 if (dispatch_table[i].builtin)
5849 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5837 assign_proc (SCHEME_A_ i, opname (i));
5850 5838
5851 /* initialization of global pointers to special symbols */ 5839 /* initialization of global pointers to special symbols */
5852 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5840 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5853 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5841 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5854 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5842 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5855 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5843 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5856 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5844 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5857 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5845 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5858 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5846 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5859 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5847 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5860 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5848 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5861 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5849 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5862 5850
5863 return !SCHEME_V->no_memory; 5851 return !SCHEME_V->no_memory;
5864} 5852}
5865 5853
5866#if USE_PORTS 5854#if USE_PORTS
5867void 5855ecb_cold void
5868scheme_set_input_port_file (SCHEME_P_ int fin) 5856scheme_set_input_port_file (SCHEME_P_ int fin)
5869{ 5857{
5870 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5858 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5871} 5859}
5872 5860
5873void 5861ecb_cold void
5874scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5862scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5875{ 5863{
5876 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5864 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5877} 5865}
5878 5866
5879void 5867ecb_cold void
5880scheme_set_output_port_file (SCHEME_P_ int fout) 5868scheme_set_output_port_file (SCHEME_P_ int fout)
5881{ 5869{
5882 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5870 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5883} 5871}
5884 5872
5885void 5873ecb_cold void
5886scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5874scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5887{ 5875{
5888 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5876 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5889} 5877}
5890#endif 5878#endif
5891 5879
5892void 5880ecb_cold void
5893scheme_set_external_data (SCHEME_P_ void *p) 5881scheme_set_external_data (SCHEME_P_ void *p)
5894{ 5882{
5895 SCHEME_V->ext_data = p; 5883 SCHEME_V->ext_data = p;
5896} 5884}
5897 5885
5898void 5886ecb_cold void
5899scheme_deinit (SCHEME_P) 5887scheme_deinit (SCHEME_P)
5900{ 5888{
5901 int i; 5889 int i;
5902 5890
5903#if SHOW_ERROR_LINE 5891#if SHOW_ERROR_LINE
… …
5929 SCHEME_V->loadport = NIL; 5917 SCHEME_V->loadport = NIL;
5930 SCHEME_V->gc_verbose = 0; 5918 SCHEME_V->gc_verbose = 0;
5931 gc (SCHEME_A_ NIL, NIL); 5919 gc (SCHEME_A_ NIL, NIL);
5932 5920
5933 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 5921 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5934 free (SCHEME_V->alloc_seg[i]); 5922 free (SCHEME_V->cell_seg[i]);
5935 5923
5936#if SHOW_ERROR_LINE 5924#if SHOW_ERROR_LINE
5937 for (i = 0; i <= SCHEME_V->file_i; i++) 5925 for (i = 0; i <= SCHEME_V->file_i; i++)
5938 {
5939 if (SCHEME_V->load_stack[i].kind & port_file) 5926 if (SCHEME_V->load_stack[i].kind & port_file)
5940 { 5927 {
5941 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 5928 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5942 5929
5943 if (fname) 5930 if (fname)
5944 free (fname); 5931 free (fname);
5945 } 5932 }
5946 }
5947#endif 5933#endif
5948} 5934}
5949 5935
5950void 5936ecb_cold void
5951scheme_load_file (SCHEME_P_ int fin) 5937scheme_load_file (SCHEME_P_ int fin)
5952{ 5938{
5953 scheme_load_named_file (SCHEME_A_ fin, 0); 5939 scheme_load_named_file (SCHEME_A_ fin, 0);
5954} 5940}
5955 5941
5956void 5942ecb_cold void
5957scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5943scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5958{ 5944{
5959 dump_stack_reset (SCHEME_A); 5945 dump_stack_reset (SCHEME_A);
5960 SCHEME_V->envir = SCHEME_V->global_env; 5946 SCHEME_V->envir = SCHEME_V->global_env;
5961 SCHEME_V->file_i = 0; 5947 SCHEME_V->file_i = 0;
5962 SCHEME_V->load_stack[0].unget = -1; 5948 SCHEME_V->load_stack[0].unget = -1;
5963 SCHEME_V->load_stack[0].kind = port_input | port_file; 5949 SCHEME_V->load_stack[0].kind = port_input | port_file;
5964 SCHEME_V->load_stack[0].rep.stdio.file = fin; 5950 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5965#if USE_PORTS
5966 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5951 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5967#endif
5968 SCHEME_V->retcode = 0; 5952 SCHEME_V->retcode = 0;
5969 5953
5970#if USE_PORTS
5971 if (fin == STDIN_FILENO) 5954 if (fin == STDIN_FILENO)
5972 SCHEME_V->interactive_repl = 1; 5955 SCHEME_V->interactive_repl = 1;
5973#endif
5974 5956
5975#if USE_PORTS 5957#if USE_PORTS
5976#if SHOW_ERROR_LINE 5958#if SHOW_ERROR_LINE
5977 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 5959 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5978 5960
… …
5982#endif 5964#endif
5983 5965
5984 SCHEME_V->inport = SCHEME_V->loadport; 5966 SCHEME_V->inport = SCHEME_V->loadport;
5985 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5967 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5986 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5968 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5969
5987 set_typeflag (SCHEME_V->loadport, T_ATOM); 5970 set_typeflag (SCHEME_V->loadport, T_ATOM);
5988 5971
5989 if (SCHEME_V->retcode == 0) 5972 if (SCHEME_V->retcode == 0)
5990 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5973 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5991} 5974}
5992 5975
5993void 5976ecb_cold void
5994scheme_load_string (SCHEME_P_ const char *cmd) 5977scheme_load_string (SCHEME_P_ const char *cmd)
5995{ 5978{
5979#if USE_PORTs
5996 dump_stack_reset (SCHEME_A); 5980 dump_stack_reset (SCHEME_A);
5997 SCHEME_V->envir = SCHEME_V->global_env; 5981 SCHEME_V->envir = SCHEME_V->global_env;
5998 SCHEME_V->file_i = 0; 5982 SCHEME_V->file_i = 0;
5999 SCHEME_V->load_stack[0].kind = port_input | port_string; 5983 SCHEME_V->load_stack[0].kind = port_input | port_string;
6000 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5984 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6001 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5985 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6002 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5986 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6003#if USE_PORTS
6004 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5987 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6005#endif
6006 SCHEME_V->retcode = 0; 5988 SCHEME_V->retcode = 0;
6007 SCHEME_V->interactive_repl = 0; 5989 SCHEME_V->interactive_repl = 0;
6008 SCHEME_V->inport = SCHEME_V->loadport; 5990 SCHEME_V->inport = SCHEME_V->loadport;
6009 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5991 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
6010 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5992 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6011 set_typeflag (SCHEME_V->loadport, T_ATOM); 5993 set_typeflag (SCHEME_V->loadport, T_ATOM);
6012 5994
6013 if (SCHEME_V->retcode == 0) 5995 if (SCHEME_V->retcode == 0)
6014 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5996 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5997#else
5998 abort ();
5999#endif
6015} 6000}
6016 6001
6017void 6002ecb_cold void
6018scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6003scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
6019{ 6004{
6020 pointer x; 6005 pointer x;
6021 6006
6022 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6007 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
6027 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6012 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6028} 6013}
6029 6014
6030#if !STANDALONE 6015#if !STANDALONE
6031 6016
6032void 6017ecb_cold void
6033scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6018scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6034{ 6019{
6035 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6020 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6036} 6021}
6037 6022
6038void 6023ecb_cold void
6039scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6024scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6040{ 6025{
6041 int i; 6026 int i;
6042 6027
6043 for (i = 0; i < count; i++) 6028 for (i = 0; i < count; i++)
6044 scheme_register_foreign_func (SCHEME_A_ list + i); 6029 scheme_register_foreign_func (SCHEME_A_ list + i);
6045} 6030}
6046 6031
6047pointer 6032ecb_cold pointer
6048scheme_apply0 (SCHEME_P_ const char *procname) 6033scheme_apply0 (SCHEME_P_ const char *procname)
6049{ 6034{
6050 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6035 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
6051} 6036}
6052 6037
6053void 6038ecb_cold void
6054save_from_C_call (SCHEME_P) 6039save_from_C_call (SCHEME_P)
6055{ 6040{
6056 pointer saved_data = cons (car (S_SINK), 6041 pointer saved_data = cons (car (S_SINK),
6057 cons (SCHEME_V->envir, 6042 cons (SCHEME_V->envir,
6058 SCHEME_V->dump)); 6043 SCHEME_V->dump));
… …
6062 /* Truncate the dump stack so TS will return here when done, not 6047 /* Truncate the dump stack so TS will return here when done, not
6063 directly resume pre-C-call operations. */ 6048 directly resume pre-C-call operations. */
6064 dump_stack_reset (SCHEME_A); 6049 dump_stack_reset (SCHEME_A);
6065} 6050}
6066 6051
6067void 6052ecb_cold void
6068restore_from_C_call (SCHEME_P) 6053restore_from_C_call (SCHEME_P)
6069{ 6054{
6070 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6055 set_car (S_SINK, caar (SCHEME_V->c_nest));
6071 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6056 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
6072 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6057 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
6073 /* Pop */ 6058 /* Pop */
6074 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6059 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
6075} 6060}
6076 6061
6077/* "func" and "args" are assumed to be already eval'ed. */ 6062/* "func" and "args" are assumed to be already eval'ed. */
6078pointer 6063ecb_cold pointer
6079scheme_call (SCHEME_P_ pointer func, pointer args) 6064scheme_call (SCHEME_P_ pointer func, pointer args)
6080{ 6065{
6081 int old_repl = SCHEME_V->interactive_repl; 6066 int old_repl = SCHEME_V->interactive_repl;
6082 6067
6083 SCHEME_V->interactive_repl = 0; 6068 SCHEME_V->interactive_repl = 0;
… …
6090 SCHEME_V->interactive_repl = old_repl; 6075 SCHEME_V->interactive_repl = old_repl;
6091 restore_from_C_call (SCHEME_A); 6076 restore_from_C_call (SCHEME_A);
6092 return SCHEME_V->value; 6077 return SCHEME_V->value;
6093} 6078}
6094 6079
6095pointer 6080ecb_cold pointer
6096scheme_eval (SCHEME_P_ pointer obj) 6081scheme_eval (SCHEME_P_ pointer obj)
6097{ 6082{
6098 int old_repl = SCHEME_V->interactive_repl; 6083 int old_repl = SCHEME_V->interactive_repl;
6099 6084
6100 SCHEME_V->interactive_repl = 0; 6085 SCHEME_V->interactive_repl = 0;
… …
6112 6097
6113/* ========== Main ========== */ 6098/* ========== Main ========== */
6114 6099
6115#if STANDALONE 6100#if STANDALONE
6116 6101
6117# if defined(__APPLE__) && !defined (OSX) 6102ecb_cold int
6118int
6119main ()
6120{
6121 extern MacTS_main (int argc, char **argv);
6122 char **argv;
6123 int argc = ccommand (&argv);
6124
6125 MacTS_main (argc, argv);
6126 return 0;
6127}
6128
6129int
6130MacTS_main (int argc, char **argv)
6131{
6132# else
6133int
6134main (int argc, char **argv) 6103main (int argc, char **argv)
6135{ 6104{
6136# endif
6137# if USE_MULTIPLICITY 6105# if USE_MULTIPLICITY
6138 scheme ssc; 6106 scheme ssc;
6139 scheme *const SCHEME_V = &ssc; 6107 scheme *const SCHEME_V = &ssc;
6140# else 6108# else
6141# endif 6109# endif
6142 int fin; 6110 int fin;
6143 char *file_name = InitFile; 6111 char *file_name = InitFile;
6144 int retcode; 6112 int retcode;
6145 int isfile = 1; 6113 int isfile = 1;
6114#if EXPERIMENT
6115 system ("ps v $PPID");
6116#endif
6146 6117
6147 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6118 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6148 { 6119 {
6149 xwrstr ("Usage: tinyscheme -?\n"); 6120 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6150 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6121 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6151 xwrstr ("followed by\n"); 6122 putstr (SCHEME_A_ "followed by\n");
6152 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6123 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6153 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6124 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6154 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6125 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6155 xwrstr ("Use - as filename for stdin.\n"); 6126 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6156 return 1; 6127 return 1;
6157 } 6128 }
6158 6129
6159 if (!scheme_init (SCHEME_A)) 6130 if (!scheme_init (SCHEME_A))
6160 { 6131 {
6161 xwrstr ("Could not initialize!\n"); 6132 putstr (SCHEME_A_ "Could not initialize!\n");
6162 return 2; 6133 return 2;
6163 } 6134 }
6164 6135
6165# if USE_PORTS 6136# if USE_PORTS
6166 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6137 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6179 } 6150 }
6180#endif 6151#endif
6181 6152
6182 do 6153 do
6183 { 6154 {
6184#if USE_PORTS
6185 if (strcmp (file_name, "-") == 0) 6155 if (strcmp (file_name, "-") == 0)
6186 fin = STDIN_FILENO; 6156 fin = STDIN_FILENO;
6187 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6157 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6188 { 6158 {
6189 pointer args = NIL; 6159 pointer args = NIL;
… …
6207 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6177 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6208 6178
6209 } 6179 }
6210 else 6180 else
6211 fin = open (file_name, O_RDONLY); 6181 fin = open (file_name, O_RDONLY);
6212#endif
6213 6182
6214 if (isfile && fin < 0) 6183 if (isfile && fin < 0)
6215 { 6184 {
6216 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6185 putstr (SCHEME_A_ "Could not open file ");
6186 putstr (SCHEME_A_ file_name);
6187 putcharacter (SCHEME_A_ '\n');
6217 } 6188 }
6218 else 6189 else
6219 { 6190 {
6220 if (isfile) 6191 if (isfile)
6221 scheme_load_named_file (SCHEME_A_ fin, file_name); 6192 scheme_load_named_file (SCHEME_A_ fin, file_name);
6222 else 6193 else
6223 scheme_load_string (SCHEME_A_ file_name); 6194 scheme_load_string (SCHEME_A_ file_name);
6224 6195
6225#if USE_PORTS
6226 if (!isfile || fin != STDIN_FILENO) 6196 if (!isfile || fin != STDIN_FILENO)
6227 { 6197 {
6228 if (SCHEME_V->retcode != 0) 6198 if (SCHEME_V->retcode != 0)
6229 { 6199 {
6230 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6200 putstr (SCHEME_A_ "Errors encountered reading ");
6201 putstr (SCHEME_A_ file_name);
6202 putcharacter (SCHEME_A_ '\n');
6231 } 6203 }
6232 6204
6233 if (isfile) 6205 if (isfile)
6234 close (fin); 6206 close (fin);
6235 } 6207 }
6236#endif
6237 } 6208 }
6238 6209
6239 file_name = *argv++; 6210 file_name = *argv++;
6240 } 6211 }
6241 while (file_name != 0); 6212 while (file_name != 0);

Diff Legend

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