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.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.54 by root, Tue Dec 1 02:42:35 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69 91
70#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
71static scheme sc; 93static scheme sc;
72#endif 94#endif
73 95
… …
81 } 103 }
82 104
83 char *p = s; 105 char *p = s;
84 106
85 do { 107 do {
86 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
87 n /= base; 109 n /= base;
88 } while (n); 110 } while (n);
89 111
90 *p-- = 0; 112 *p-- = 0;
91 113
… …
101{ 123{
102 xbase (s, n, 10); 124 xbase (s, n, 10);
103} 125}
104 126
105static void 127static void
106xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
107{
108 write (1, s, strlen (s));
109}
110
111static void
112xwrnum (long n)
113{ 129{
114 char buf[64]; 130 char buf[64];
115 131
116 xnum (buf, n); 132 xnum (buf, n);
117 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
118} 134}
119 135
120static char 136static char
121xtoupper (char c) 137xtoupper (char c)
122{ 138{
… …
143 159
144#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
147 163
148#if USE_STRLWR 164#if USE_IGNORECASE
149static const char * 165static const char *
150strlwr (char *s) 166xstrlwr (char *s)
151{ 167{
152 const char *p = s; 168 const char *p = s;
153 169
154 while (*s) 170 while (*s)
155 { 171 {
… …
157 s++; 173 s++;
158 } 174 }
159 175
160 return p; 176 return p;
161} 177}
162#endif
163 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
164#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
166 186
167#ifndef prompt 187#ifndef prompt
168# define prompt "ts> " 188# define prompt "ts> "
169#endif 189#endif
170 190
171#ifndef InitFile 191#ifndef InitFile
172# define InitFile "init.scm" 192# define InitFile "init.scm"
173#endif 193#endif
174 194
175#ifndef FIRST_CELLSEGS
176# define FIRST_CELLSEGS 3
177#endif
178
179enum scheme_types 195enum scheme_types
180{ 196{
197 T_INTEGER,
181 T_FREE, 198 T_REAL,
182 T_STRING, 199 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 200 T_SYMBOL,
185 T_PROC, 201 T_PROC,
186 T_PAIR, 202 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 203 T_CLOSURE,
188 T_CONTINUATION, 204 T_CONTINUATION,
189 T_FOREIGN, 205 T_FOREIGN,
190 T_CHARACTER, 206 T_CHARACTER,
191 T_PORT, 207 T_PORT,
… …
201#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
205 221
206static num num_add (num a, num b); 222/* num, for generic arithmetic */
207static num num_mul (num a, num b); 223struct num
208static num num_div (num a, num b); 224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
249
250static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 252static num num_rem (num a, num b);
212static num num_mod (num a, num b); 253static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 254
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
223
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 256
230static num num_zero; 257static num num_zero;
231static num num_one; 258static num num_one;
232 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
233/* macros for cell operations */ 264/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
237 268
238INTERFACE INLINE int 269INTERFACE int
239is_string (pointer p) 270is_string (pointer p)
240{ 271{
241 return type (p) == T_STRING; 272 return type (p) == T_STRING;
242} 273}
243 274
244#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
246 277
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 278INTERFACE int
249is_vector (pointer p) 279is_vector (pointer p)
250{ 280{
251 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
252} 282}
253 283
254#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 289
261INTERFACE uint32_t 290INTERFACE int
262vector_length (pointer vec) 291is_integer (pointer p)
263{ 292{
264 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
265} 294}
266 295
296/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
301}
302
303INTERFACE int
268is_number (pointer p) 304is_number (pointer p)
269{ 305{
270 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
271} 307}
272 308
273INTERFACE INLINE int 309INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 310is_character (pointer p)
293{ 311{
294 return type (p) == T_CHARACTER; 312 return type (p) == T_CHARACTER;
295} 313}
296 314
297INTERFACE INLINE char * 315INTERFACE char *
298string_value (pointer p) 316string_value (pointer p)
299{ 317{
300 return strvalue (p); 318 return strvalue (p);
301} 319}
302 320
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
334#if USE_REAL 324#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 327#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
340# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 330#endif
331
343INTERFACE long 332INTERFACE long
344charvalue (pointer p) 333charvalue (pointer p)
345{ 334{
346 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
347} 336}
348 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
349INTERFACE INLINE int 340INTERFACE int
350is_port (pointer p) 341is_port (pointer p)
351{ 342{
352 return type (p) == T_PORT; 343 return type (p) == T_PORT;
353} 344}
354 345
355INTERFACE INLINE int 346INTERFACE int
356is_inport (pointer p) 347is_inport (pointer p)
357{ 348{
358 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
359} 350}
360 351
361INTERFACE INLINE int 352INTERFACE int
362is_outport (pointer p) 353is_outport (pointer p)
363{ 354{
364 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
365} 356}
366 357
367INTERFACE INLINE int 358INTERFACE int
368is_pair (pointer p) 359is_pair (pointer p)
369{ 360{
370 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
371} 362}
372 363
373#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
375 366
376#define caar(p) car (car (p)) 367static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 368static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 369static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 371
381#define cadar(p) car (cdr (car (p))) 372static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 373static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 375
385INTERFACE void 376INTERFACE void
386set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
387{ 378{
388 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
389} 380}
390 381
391INTERFACE void 382INTERFACE void
392set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
393{ 384{
394 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
395} 386}
396 387
397INTERFACE pointer 388INTERFACE pointer
398pair_car (pointer p) 389pair_car (pointer p)
399{ 390{
… …
404pair_cdr (pointer p) 395pair_cdr (pointer p)
405{ 396{
406 return cdr (p); 397 return cdr (p);
407} 398}
408 399
409INTERFACE INLINE int 400INTERFACE int
410is_symbol (pointer p) 401is_symbol (pointer p)
411{ 402{
412 return type (p) == T_SYMBOL; 403 return type (p) == T_SYMBOL;
413} 404}
414 405
415INTERFACE INLINE char * 406INTERFACE char *
416symname (pointer p) 407symname (pointer p)
417{ 408{
418 return strvalue (car (p)); 409 return strvalue (p);
419} 410}
420 411
421#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
423hasprop (pointer p) 416hasprop (pointer p)
424{ 417{
425 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
426} 419}
427
428# define symprop(p) cdr(p)
429#endif 420#endif
430 421
431INTERFACE INLINE int 422INTERFACE int
432is_syntax (pointer p) 423is_syntax (pointer p)
433{ 424{
434 return typeflag (p) & T_SYNTAX; 425 return typeflag (p) & T_SYNTAX;
435} 426}
436 427
437INTERFACE INLINE int 428INTERFACE int
438is_proc (pointer p) 429is_proc (pointer p)
439{ 430{
440 return type (p) == T_PROC; 431 return type (p) == T_PROC;
441} 432}
442 433
443INTERFACE INLINE int 434INTERFACE int
444is_foreign (pointer p) 435is_foreign (pointer p)
445{ 436{
446 return type (p) == T_FOREIGN; 437 return type (p) == T_FOREIGN;
447} 438}
448 439
449INTERFACE INLINE char * 440INTERFACE char *
450syntaxname (pointer p) 441syntaxname (pointer p)
451{ 442{
452 return strvalue (car (p)); 443 return strvalue (p);
453} 444}
454 445
455#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 447static const char *procname (pointer x);
457 448
458INTERFACE INLINE int 449INTERFACE int
459is_closure (pointer p) 450is_closure (pointer p)
460{ 451{
461 return type (p) == T_CLOSURE; 452 return type (p) == T_CLOSURE;
462} 453}
463 454
464INTERFACE INLINE int 455INTERFACE int
465is_macro (pointer p) 456is_macro (pointer p)
466{ 457{
467 return type (p) == T_MACRO; 458 return type (p) == T_MACRO;
468} 459}
469 460
470INTERFACE INLINE pointer 461INTERFACE pointer
471closure_code (pointer p) 462closure_code (pointer p)
472{ 463{
473 return car (p); 464 return car (p);
474} 465}
475 466
476INTERFACE INLINE pointer 467INTERFACE pointer
477closure_env (pointer p) 468closure_env (pointer p)
478{ 469{
479 return cdr (p); 470 return cdr (p);
480} 471}
481 472
482INTERFACE INLINE int 473INTERFACE int
483is_continuation (pointer p) 474is_continuation (pointer p)
484{ 475{
485 return type (p) == T_CONTINUATION; 476 return type (p) == T_CONTINUATION;
486} 477}
487 478
488#define cont_dump(p) cdr (p) 479#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 480#define set_cont_dump(p,v) set_cdr ((p), (v))
490 481
491/* To do: promise should be forced ONCE only */ 482/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 483INTERFACE int
493is_promise (pointer p) 484is_promise (pointer p)
494{ 485{
495 return type (p) == T_PROMISE; 486 return type (p) == T_PROMISE;
496} 487}
497 488
498INTERFACE INLINE int 489INTERFACE int
499is_environment (pointer p) 490is_environment (pointer p)
500{ 491{
501 return type (p) == T_ENVIRONMENT; 492 return type (p) == T_ENVIRONMENT;
502} 493}
503 494
… …
509 500
510#define is_mark(p) (typeflag (p) & T_MARK) 501#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 504
514INTERFACE INLINE int 505INTERFACE int
515is_immutable (pointer p) 506is_immutable (pointer p)
516{ 507{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 509}
519 510
520INTERFACE INLINE void 511INTERFACE void
521setimmutable (pointer p) 512setimmutable (pointer p)
522{ 513{
523#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 516#endif
526} 517}
527 518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
571}
572
528#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
529static INLINE int 574ecb_inline int
530Cisalpha (int c) 575Cisalpha (int c)
531{ 576{
532 return isascii (c) && isalpha (c); 577 return isascii (c) && isalpha (c);
533} 578}
534 579
535static INLINE int 580ecb_inline int
536Cisdigit (int c) 581Cisdigit (int c)
537{ 582{
538 return isascii (c) && isdigit (c); 583 return isascii (c) && isdigit (c);
539} 584}
540 585
541static INLINE int 586ecb_inline int
542Cisspace (int c) 587Cisspace (int c)
543{ 588{
544 return isascii (c) && isspace (c); 589 return isascii (c) && isspace (c);
545} 590}
546 591
547static INLINE int 592ecb_inline int
548Cisupper (int c) 593Cisupper (int c)
549{ 594{
550 return isascii (c) && isupper (c); 595 return isascii (c) && isupper (c);
551} 596}
552 597
553static INLINE int 598ecb_inline int
554Cislower (int c) 599Cislower (int c)
555{ 600{
556 return isascii (c) && islower (c); 601 return isascii (c) && islower (c);
557} 602}
558#endif 603#endif
… …
619#endif 664#endif
620 665
621static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
626static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
629static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
630static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
631static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
646static void mark (pointer a); 691static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 699static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
656static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
657static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
713static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
678static num 751static num
679num_add (num a, num b) 752num_op (enum num_op op, num a, num b)
680{ 753{
681 num ret; 754 num ret;
682 755
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 757
685 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 759 {
760 switch (op)
761 {
762 case NUM_ADD: a.ivalue += b.ivalue; break;
763 case NUM_SUB: a.ivalue -= b.ivalue; break;
764 case NUM_MUL: a.ivalue *= b.ivalue; break;
765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
766 }
767
768 num_set_ivalue (ret, a.ivalue);
769 }
770#if USE_REAL
687 else 771 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 772 {
773 switch (op)
774 {
775 case NUM_ADD: a.rvalue += b.rvalue; break;
776 case NUM_SUB: a.rvalue -= b.rvalue; break;
777 case NUM_MUL: a.rvalue *= b.rvalue; break;
778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
779 }
689 780
690 return ret; 781 num_set_rvalue (ret, a.rvalue);
691} 782 }
692 783#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 784
705 return ret; 785 return ret;
706} 786}
707 787
708static num 788static num
709num_div (num a, num b) 789num_div (num a, num b)
710{ 790{
711 num ret; 791 num ret;
712 792
713 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
714 794
715 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 797 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 799
750 return ret; 800 return ret;
751} 801}
752 802
753static num 803static num
… …
755{ 805{
756 num ret; 806 num ret;
757 long e1, e2, res; 807 long e1, e2, res;
758 808
759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
760 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
762 res = e1 % e2; 812 res = e1 % e2;
763 813
764 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
765 if (res > 0) 815 if (res > 0)
766 { 816 {
… …
782{ 832{
783 num ret; 833 num ret;
784 long e1, e2, res; 834 long e1, e2, res;
785 835
786 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
787 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
789 res = e1 % e2; 839 res = e1 % e2;
790 840
791 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 842 if (res * e2 < 0)
793 res += e2; 843 res += e2;
794 844
795 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
796 return ret; 846 return ret;
797} 847}
798 848
849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 850static int
800num_eq (num a, num b) 851num_cmp (num a, num b)
801{ 852{
853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 854 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 855
805 if (is_fixnum) 856 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 857 {
858 IVALUE av = num_ivalue (a);
859 IVALUE bv = num_ivalue (b);
860
861 ret = av == bv ? 0 : av < bv ? -1 : +1;
862 }
807 else 863 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 864 {
865 RVALUE av = num_rvalue (a);
866 RVALUE bv = num_rvalue (b);
867
868 ret = av == bv ? 0 : av < bv ? -1 : +1;
869 }
809 870
810 return ret; 871 return ret;
811} 872}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852}
853
854#if USE_MATH
855
856/* Round to nearest. Round to even if midway */
857static double
858round_per_R5RS (double x)
859{
860 double fl = floor (x);
861 double ce = ceil (x);
862 double dfl = x - fl;
863 double dce = ce - x;
864
865 if (dfl > dce)
866 return ce;
867 else if (dfl < dce)
868 return fl;
869 else
870 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
872 return fl;
873 else
874 return ce;
875 }
876}
877#endif
878 873
879static int 874static int
880is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
881{ 876{
877 return x == 0;
878#if 0
882#if USE_REAL 879#if USE_REAL
883 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 880 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
884#else 881#else
885 return x == 0; 882 return x == 0;
886#endif 883#endif
884#endif
887} 885}
888 886
889/* allocate new cell segment */ 887/* allocate new cell segment */
890static int 888static int
891alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
892{ 890{
893 pointer newp; 891 struct cell *newp;
894 pointer last; 892 struct cell *last;
895 pointer p; 893 struct cell *p;
896 char *cp; 894 char *cp;
897 long i; 895 long i;
898 int k; 896 int k;
899 897
900 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
901 segsize <<= 1; 899 segsize <<= 1;
902 900
903 for (k = 0; k < n; k++)
904 {
905 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
906 return k;
907
908 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
909 902
910 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
911 return k; 904 return k;
912 905
913 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
915 908
916 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
917 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 913 last = newp + segsize - 1;
937 914
938 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
939 { 916 {
917 pointer cp = POINTER (p);
940 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
941 set_car (p, NIL); 919 set_car (cp, NIL);
942 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
943 } 921 }
944 922
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954 925
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 }
962
963 return n; 926 return 1;
964} 927}
965 928
966/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 930ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 932{
970 if (SCHEME_V->free_cell == NIL) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 934 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 936 return S_SINK;
974 937
975 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
976 { 939 {
977 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
978 941
979 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
980 943
981 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
982 { 945 {
983 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
984 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
985 { 948 {
986#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
987 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
988 return S_SINK; 951 return S_SINK;
989#endif 952#endif
… …
1001 } 964 }
1002} 965}
1003 966
1004/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1005 Tehom */ 968 Tehom */
1006
1007static void 969static void
1008push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1009{ 971{
1010 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1011 973
… …
1033} 995}
1034 996
1035static pointer 997static pointer
1036get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1037{ 999{
1038 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1039 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1040 1002
1041 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1042 return S_SINK; 1004 return S_SINK;
1043 1005
1044 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1008
1047 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1049 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1013
1052 return v; 1014 return v;
1053} 1015}
1054 1016
1055static INLINE void 1017ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1057{ 1019{
1058 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1059} 1021}
1060 1022
… …
1062static void 1024static void
1063check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1064{ 1026{
1065 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1066 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1067 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1068 1030
1069 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1070 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1071} 1033}
1072 1034
1073static void 1035static void
1074check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1075{ 1037{
… …
1097 set_cdr (x, b); 1059 set_cdr (x, b);
1098 1060
1099 return x; 1061 return x;
1100} 1062}
1101 1063
1064static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1102/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1103 1074
1104#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1105 1076
1077static int
1106static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1107 1088
1108static pointer 1089static pointer
1109oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1110{ 1091{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1094
1114/* returns the new symbol */ 1095/* returns the new symbol */
1115static pointer 1096static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1098{
1118 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1119
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x));
1123
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1102 return x;
1127} 1103}
1128 1104
1129static INLINE pointer 1105ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1107{
1132 int location; 1108 int location;
1133 pointer x; 1109 pointer x;
1134 char *s; 1110 char *s;
1135 1111
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1113
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1115 {
1140 s = symname (car (x)); 1116 s = symname (car (x));
1141 1117
1142 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1153 int i; 1129 int i;
1154 pointer x; 1130 pointer x;
1155 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1156 1132
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1160 1136
1161 return ob_list; 1137 return ob_list;
1162} 1138}
1163 1139
… …
1167oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1168{ 1144{
1169 return NIL; 1145 return NIL;
1170} 1146}
1171 1147
1172static INLINE pointer 1148ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1150{
1175 pointer x; 1151 pointer x;
1176 char *s; 1152 char *s;
1177 1153
… …
1189 1165
1190/* returns the new symbol */ 1166/* returns the new symbol */
1191static pointer 1167static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1169{
1194 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x));
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1172 return x;
1201} 1173}
1202 1174
1203static pointer 1175static pointer
… …
1213mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1214{ 1186{
1215 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1216 1188
1217 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1218 x->object.port = p; 1190 set_port (x, p);
1219 1191
1220 return x; 1192 return x;
1221} 1193}
1222#endif 1194#endif
1223 1195
1224pointer 1196pointer
1225mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1226{ 1198{
1227 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1228 1200
1229 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1230 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1231 1203
1232 return x; 1204 return x;
1233} 1205}
1234 1206
1235INTERFACE pointer 1207INTERFACE pointer
1236mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1237{ 1209{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1211
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1241 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1214
1243 return x; 1215 return x;
1244} 1216}
1245 1217
1246/* get number atom (integer) */ 1218/* get number atom (integer) */
1247INTERFACE pointer 1219INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1249{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1233
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1253 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1254 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1255 return x; 1241 return *pp;
1256} 1242}
1257 1243
1258INTERFACE pointer 1244INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1260{ 1246{
1247#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1249
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1264 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1265 set_num_real (x); 1252
1266 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1267} 1257}
1268 1258
1269static pointer 1259static pointer
1270mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1271{ 1261{
1262#if USE_REAL
1272 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1268#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1269}
1277 1270
1278/* allocate name to string area */ 1271/* allocate name to string area */
1279static char * 1272static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1286 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1288 } 1281 }
1289 1282
1290 if (str) 1283 if (str)
1291 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1285 else
1301 {
1302 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1303 q[len_str] = 0; 1288 q[len_str] = 0;
1304 }
1305 1289
1306 return q; 1290 return q;
1307} 1291}
1308 1292
1309INTERFACE pointer 1293INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1308
1325 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1311 strlength (x) = len;
1312
1328 return x; 1313 return x;
1329} 1314}
1330 1315
1331INTERFACE pointer 1316INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1339{ 1324{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1326}
1342 1327
1343INTERFACE void 1328INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1330{
1346 int i; 1331 int i;
1347 1332
1348 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1350} 1335}
1351 1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1344}
1345
1352INTERFACE pointer 1346INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1354{ 1348{
1355 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1356} 1350}
1357 1351
1358INTERFACE void 1352INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1354{
1361 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1362} 1356}
1363 1357
1364/* get new symbol */ 1358/* get new symbol */
… …
1376 1370
1377INTERFACE pointer 1371INTERFACE pointer
1378gensym (SCHEME_P) 1372gensym (SCHEME_P)
1379{ 1373{
1380 pointer x; 1374 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1386 1377
1387 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1389 1380
1390 if (x == NIL) 1381static int
1391 { 1382is_gensym (SCHEME_P_ pointer x)
1392 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1393 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1385}
1399 1386
1400/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1401static pointer 1388static pointer
1402mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
… …
1456 } 1443 }
1457 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1458 { 1445 {
1459 if (!has_fp_exp) 1446 if (!has_fp_exp)
1460 { 1447 {
1461 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1449 p++;
1464 1450
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1452 continue;
1467 } 1453 }
… …
1481 1467
1482/* make constant */ 1468/* make constant */
1483static pointer 1469static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1485{ 1471{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1490 return S_T; 1473 return S_T;
1491 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1492 return S_F; 1475 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1494 { 1477 {
1495 int c = 0; 1478 int c;
1496 1479
1497 if (stricmp (name + 1, "space") == 0) 1480 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1481 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1482 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1483 c = '\n';
… …
1502 c = '\r'; 1485 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1486 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1487 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1488 else if (name[1] == 'x' && name[2] != 0)
1506 { 1489 {
1507 int c1 = strtol (name + 2, 0, 16); 1490 long c1 = strtol (name + 2, 0, 16);
1508 1491
1509 if (c1 <= UCHAR_MAX) 1492 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1493 c = c1;
1511 else 1494 else
1512 return NIL; 1495 return NIL;
1513 1496 }
1514#if USE_ASCII_NAMES 1497#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1498 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1499 /* nothing */;
1519#endif 1500#endif
1520 }
1521 else if (name[2] == 0) 1501 else if (name[2] == 0)
1522 c = name[1]; 1502 c = name[1];
1523 else 1503 else
1524 return NIL; 1504 return NIL;
1525 1505
… …
1542 1522
1543/*-- 1523/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1526 * for marking.
1527 *
1528 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector
1547 */ 1531 */
1548static void 1532static void
1549mark (pointer a) 1533mark (pointer a)
1550{ 1534{
1551 pointer t, q, p; 1535 pointer t, q, p;
… …
1553 t = 0; 1537 t = 0;
1554 p = a; 1538 p = a;
1555E2: 1539E2:
1556 setmark (p); 1540 setmark (p);
1557 1541
1558 if (is_vector (p)) 1542 if (ecb_expect_false (is_vector (p)))
1559 { 1543 {
1560 int i; 1544 int i;
1561 1545
1562 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1547 mark (vecvalue (p)[i]);
1564 } 1548 }
1565 1549
1566 if (is_atom (p)) 1550 if (is_atom (p))
1567 goto E6; 1551 goto E6;
… …
1614 1598
1615/* garbage collection. parameter a, b is marked. */ 1599/* garbage collection. parameter a, b is marked. */
1616static void 1600static void
1617gc (SCHEME_P_ pointer a, pointer b) 1601gc (SCHEME_P_ pointer a, pointer b)
1618{ 1602{
1619 pointer p;
1620 int i; 1603 int i;
1621 1604
1622 if (SCHEME_V->gc_verbose) 1605 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1606 putstr (SCHEME_A_ "gc...");
1624 1607
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1623 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1624 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1625 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1626 mark (SCHEME_V->c_nest);
1644 1627
1628#if USE_INTCACHE
1629 /* mark intcache */
1630 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1631 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1632 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1633#endif
1634
1645 /* mark variables a, b */ 1635 /* mark variables a, b */
1646 mark (a); 1636 mark (a);
1647 mark (b); 1637 mark (b);
1648 1638
1649 /* garbage collect */ 1639 /* garbage collect */
1650 clrmark (NIL); 1640 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1641 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1642 SCHEME_V->free_cell = NIL;
1653 1643
1654 /* free-list is kept sorted by address so as to maintain consecutive 1644 if (SCHEME_V->gc_verbose)
1655 ranges, if possible, for use with vectors. Here we scan the cells 1645 putstr (SCHEME_A_ "freeing...");
1656 (which are also kept sorted by address) downwards to build the 1646
1657 free-list in sorted order. 1647 uint32_t total = 0;
1658 */ 1648
1649 /* Here we scan the cells to build the free-list. */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 { 1651 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1652 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1653 struct cell *p;
1654 total += SCHEME_V->cell_segsize [i];
1662 1655
1663 while (--p >= SCHEME_V->cell_seg[i]) 1656 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 { 1657 {
1658 pointer c = POINTER (p);
1659
1665 if (is_mark (p)) 1660 if (is_mark (c))
1666 clrmark (p); 1661 clrmark (c);
1667 else 1662 else
1668 { 1663 {
1669 /* reclaim cell */ 1664 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1665 if (typeflag (c) != T_PAIR)
1671 { 1666 {
1672 finalize_cell (SCHEME_A_ p); 1667 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (p, T_FREE); 1668 set_typeflag (c, T_PAIR);
1674 set_car (p, NIL); 1669 set_car (c, NIL);
1675 } 1670 }
1676 1671
1677 ++SCHEME_V->fcells; 1672 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1673 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p; 1674 SCHEME_V->free_cell = c;
1680 } 1675 }
1681 } 1676 }
1682 } 1677 }
1683 1678
1684 if (SCHEME_V->gc_verbose) 1679 if (SCHEME_V->gc_verbose)
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1680 {
1681 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");
1682 }
1686} 1683}
1687 1684
1688static void 1685static void
1689finalize_cell (SCHEME_P_ pointer a) 1686finalize_cell (SCHEME_P_ pointer a)
1690{ 1687{
1691 if (is_string (a)) 1688 /* TODO, fast bitmap check? */
1689 if (is_string (a) || is_symbol (a))
1692 free (strvalue (a)); 1690 free (strvalue (a));
1693 else if (is_vector (a)) 1691 else if (is_vector (a))
1694 free (vecvalue (a)); 1692 free (vecvalue (a));
1695#if USE_PORTS 1693#if USE_PORTS
1696 else if (is_port (a)) 1694 else if (is_port (a))
1697 { 1695 {
1698 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1696 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1699 port_close (SCHEME_A_ a, port_input | port_output); 1697 port_close (SCHEME_A_ a, port_input | port_output);
1700 1698
1701 free (a->object.port); 1699 free (port (a));
1702 } 1700 }
1703#endif 1701#endif
1704} 1702}
1705 1703
1706/* ========== Routines for Reading ========== */ 1704/* ========== Routines for Reading ========== */
… …
1722 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1720 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1723 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1721 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1724 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1722 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1725 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1723 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1726 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1724 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1727 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1725 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1728 1726
1729#if SHOW_ERROR_LINE 1727#if SHOW_ERROR_LINE
1730 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1731 1729
1732 if (fname) 1730 if (fname)
… …
1749 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1747 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1750#if USE_PORTS 1748#if USE_PORTS
1751 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1749 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1752#endif 1750#endif
1753 SCHEME_V->file_i--; 1751 SCHEME_V->file_i--;
1754 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1752 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1755 } 1753 }
1756} 1754}
1757 1755
1758static int 1756static int
1759file_interactive (SCHEME_P) 1757file_interactive (SCHEME_P)
1760{ 1758{
1761#if USE_PORTS 1759#if USE_PORTS
1762 return SCHEME_V->file_i == 0 1760 return SCHEME_V->file_i == 0
1763 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1761 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1764 && (SCHEME_V->inport->object.port->kind & port_file); 1762 && (port (SCHEME_V->inport)->kind & port_file);
1765#else 1763#else
1766 return 0; 1764 return 0;
1767#endif 1765#endif
1768} 1766}
1769 1767
… …
1903} 1901}
1904 1902
1905static void 1903static void
1906port_close (SCHEME_P_ pointer p, int flag) 1904port_close (SCHEME_P_ pointer p, int flag)
1907{ 1905{
1908 port *pt = p->object.port; 1906 port *pt = port (p);
1909 1907
1910 pt->kind &= ~flag; 1908 pt->kind &= ~flag;
1911 1909
1912 if ((pt->kind & (port_input | port_output)) == 0) 1910 if ((pt->kind & (port_input | port_output)) == 0)
1913 { 1911 {
… …
1934/* get new character from input file */ 1932/* get new character from input file */
1935static int 1933static int
1936inchar (SCHEME_P) 1934inchar (SCHEME_P)
1937{ 1935{
1938 int c; 1936 int c;
1939 port *pt; 1937 port *pt = port (SCHEME_V->inport);
1940
1941 pt = SCHEME_V->inport->object.port;
1942 1938
1943 if (pt->kind & port_saw_EOF) 1939 if (pt->kind & port_saw_EOF)
1944 return EOF; 1940 return EOF;
1945 1941
1946 c = basic_inchar (pt); 1942 c = basic_inchar (pt);
… …
2013 port *pt; 2009 port *pt;
2014 2010
2015 if (c == EOF) 2011 if (c == EOF)
2016 return; 2012 return;
2017 2013
2018 pt = SCHEME_V->inport->object.port; 2014 pt = port (SCHEME_V->inport);
2019 pt->unget = c; 2015 pt->unget = c;
2020#else 2016#else
2021 if (c == EOF) 2017 if (c == EOF)
2022 return; 2018 return;
2023 2019
… …
2051 2047
2052INTERFACE void 2048INTERFACE void
2053putstr (SCHEME_P_ const char *s) 2049putstr (SCHEME_P_ const char *s)
2054{ 2050{
2055#if USE_PORTS 2051#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port; 2052 port *pt = port (SCHEME_V->outport);
2057 2053
2058 if (pt->kind & port_file) 2054 if (pt->kind & port_file)
2059 write (pt->rep.stdio.file, s, strlen (s)); 2055 write (pt->rep.stdio.file, s, strlen (s));
2060 else 2056 else
2061 for (; *s; s++) 2057 for (; *s; s++)
… …
2063 *pt->rep.string.curr++ = *s; 2059 *pt->rep.string.curr++ = *s;
2064 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2060 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2065 *pt->rep.string.curr++ = *s; 2061 *pt->rep.string.curr++ = *s;
2066 2062
2067#else 2063#else
2068 xwrstr (s); 2064 write (pt->rep.stdio.file, s, strlen (s));
2069#endif 2065#endif
2070} 2066}
2071 2067
2072static void 2068static void
2073putchars (SCHEME_P_ const char *s, int len) 2069putchars (SCHEME_P_ const char *s, int len)
2074{ 2070{
2075#if USE_PORTS 2071#if USE_PORTS
2076 port *pt = SCHEME_V->outport->object.port; 2072 port *pt = port (SCHEME_V->outport);
2077 2073
2078 if (pt->kind & port_file) 2074 if (pt->kind & port_file)
2079 write (pt->rep.stdio.file, s, len); 2075 write (pt->rep.stdio.file, s, len);
2080 else 2076 else
2081 { 2077 {
… …
2095 2091
2096INTERFACE void 2092INTERFACE void
2097putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2098{ 2094{
2099#if USE_PORTS 2095#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port; 2096 port *pt = port (SCHEME_V->outport);
2101 2097
2102 if (pt->kind & port_file) 2098 if (pt->kind & port_file)
2103 { 2099 {
2104 char cc = c; 2100 char cc = c;
2105 write (pt->rep.stdio.file, &cc, 1); 2101 write (pt->rep.stdio.file, &cc, 1);
… …
2118#endif 2114#endif
2119} 2115}
2120 2116
2121/* read characters up to delimiter, but cater to character constants */ 2117/* read characters up to delimiter, but cater to character constants */
2122static char * 2118static char *
2123readstr_upto (SCHEME_P_ char *delim) 2119readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2120{
2125 char *p = SCHEME_V->strbuff; 2121 char *p = SCHEME_V->strbuff + skip;
2126 2122
2127 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2123 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2128 2124
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2125 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2126 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2133 return SCHEME_V->strbuff;
2138} 2134}
2139 2135
2140/* read string expression "xxx...xxx" */ 2136/* read string expression "xxx...xxx" */
2141static pointer 2137static pointer
2142readstrexp (SCHEME_P) 2138readstrexp (SCHEME_P_ char delim)
2143{ 2139{
2144 char *p = SCHEME_V->strbuff; 2140 char *p = SCHEME_V->strbuff;
2145 int c; 2141 int c;
2146 int c1 = 0; 2142 int c1 = 0;
2147 enum
2148 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2143 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2149 2144
2150 for (;;) 2145 for (;;)
2151 { 2146 {
2152 c = inchar (SCHEME_A); 2147 c = inchar (SCHEME_A);
2153 2148
… …
2155 return S_F; 2150 return S_F;
2156 2151
2157 switch (state) 2152 switch (state)
2158 { 2153 {
2159 case st_ok: 2154 case st_ok:
2160 switch (c) 2155 if (ecb_expect_false (c == delim))
2161 {
2162 case '\\':
2163 state = st_bsl;
2164 break;
2165
2166 case '"':
2167 *p = 0;
2168 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2156 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2169 2157
2170 default: 2158 if (ecb_expect_false (c == '\\'))
2159 state = st_bsl;
2160 else
2171 *p++ = c; 2161 *p++ = c;
2172 break;
2173 }
2174 2162
2175 break; 2163 break;
2176 2164
2177 case st_bsl: 2165 case st_bsl:
2178 switch (c) 2166 switch (c)
… …
2208 case 'r': 2196 case 'r':
2209 *p++ = '\r'; 2197 *p++ = '\r';
2210 state = st_ok; 2198 state = st_ok;
2211 break; 2199 break;
2212 2200
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2201 default:
2219 *p++ = c; 2202 *p++ = c;
2220 state = st_ok; 2203 state = st_ok;
2221 break; 2204 break;
2222 } 2205 }
2223 2206
2224 break; 2207 break;
2225 2208
2226 case st_x1: 2209 case st_x1:
2227 case st_x2: 2210 case st_x2:
2228 c = toupper (c); 2211 c = tolower (c);
2229 2212
2230 if (c >= '0' && c <= 'F') 2213 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2214 c1 = (c1 << 4) + c - '0';
2234 else 2215 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2216 c1 = (c1 << 4) + c - 'a' + 10;
2236
2237 if (state == st_x1)
2238 state = st_x2;
2239 else
2240 {
2241 *p++ = c1;
2242 state = st_ok;
2243 }
2244 }
2245 else 2217 else
2246 return S_F; 2218 return S_F;
2219
2220 if (state == st_x1)
2221 state = st_x2;
2222 else
2223 {
2224 *p++ = c1;
2225 state = st_ok;
2226 }
2247 2227
2248 break; 2228 break;
2249 2229
2250 case st_oct1: 2230 case st_oct1:
2251 case st_oct2: 2231 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2235 backchar (SCHEME_A_ c);
2256 state = st_ok; 2236 state = st_ok;
2257 } 2237 }
2258 else 2238 else
2259 { 2239 {
2260 if (state == st_oct2 && c1 >= 32) 2240 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2241 return S_F;
2262 2242
2263 c1 = (c1 << 3) + (c - '0'); 2243 c1 = (c1 << 3) + (c - '0');
2264 2244
2265 if (state == st_oct1) 2245 if (state == st_oct1)
… …
2270 state = st_ok; 2250 state = st_ok;
2271 } 2251 }
2272 } 2252 }
2273 2253
2274 break; 2254 break;
2275
2276 } 2255 }
2277 } 2256 }
2278} 2257}
2279 2258
2280/* check c is in chars */ 2259/* check c is in chars */
2281static INLINE int 2260ecb_inline int
2282is_one_of (char *s, int c) 2261is_one_of (const char *s, int c)
2283{ 2262{
2284 if (c == EOF)
2285 return 1;
2286
2287 return !!strchr (s, c); 2263 return c == EOF || !!strchr (s, c);
2288} 2264}
2289 2265
2290/* skip white characters */ 2266/* skip white characters */
2291static INLINE int 2267ecb_inline int
2292skipspace (SCHEME_P) 2268skipspace (SCHEME_P)
2293{ 2269{
2294 int c, curr_line = 0; 2270 int c, curr_line = 0;
2295 2271
2296 do 2272 do
2297 { 2273 {
2298 c = inchar (SCHEME_A); 2274 c = inchar (SCHEME_A);
2275
2299#if SHOW_ERROR_LINE 2276#if SHOW_ERROR_LINE
2300 if (c == '\n') 2277 if (ecb_expect_false (c == '\n'))
2301 curr_line++; 2278 curr_line++;
2302#endif 2279#endif
2280
2281 if (ecb_expect_false (c == EOF))
2282 return c;
2303 } 2283 }
2304 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2284 while (is_one_of (WHITESPACE, c));
2305 2285
2306 /* record it */ 2286 /* record it */
2307#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2308 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2288 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2309 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2289 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2310#endif 2290#endif
2311 2291
2312 if (c != EOF)
2313 {
2314 backchar (SCHEME_A_ c); 2292 backchar (SCHEME_A_ c);
2315 return 1; 2293 return 1;
2316 }
2317 else
2318 return EOF;
2319} 2294}
2320 2295
2321/* get token */ 2296/* get token */
2322static int 2297static int
2323token (SCHEME_P) 2298token (SCHEME_P)
… …
2339 return TOK_RPAREN; 2314 return TOK_RPAREN;
2340 2315
2341 case '.': 2316 case '.':
2342 c = inchar (SCHEME_A); 2317 c = inchar (SCHEME_A);
2343 2318
2344 if (is_one_of (" \n\t", c)) 2319 if (is_one_of (WHITESPACE, c))
2345 return TOK_DOT; 2320 return TOK_DOT;
2346 else 2321 else
2347 { 2322 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2323 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2324 return TOK_DOTATOM;
2352 } 2325 }
2326
2327 case '|':
2328 return TOK_STRATOM;
2353 2329
2354 case '\'': 2330 case '\'':
2355 return TOK_QUOTE; 2331 return TOK_QUOTE;
2356 2332
2357 case ';': 2333 case ';':
… …
2489 } 2465 }
2490 2466
2491 putcharacter (SCHEME_A_ '"'); 2467 putcharacter (SCHEME_A_ '"');
2492} 2468}
2493 2469
2494
2495/* print atoms */ 2470/* print atoms */
2496static void 2471static void
2497printatom (SCHEME_P_ pointer l, int f) 2472printatom (SCHEME_P_ pointer l, int f)
2498{ 2473{
2499 char *p; 2474 char *p;
2500 int len; 2475 int len;
2501 2476
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2477 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2478 putchars (SCHEME_A_ p, len);
2504} 2479}
2505
2506 2480
2507/* Uses internal buffer unless string pointer is already available */ 2481/* Uses internal buffer unless string pointer is already available */
2508static void 2482static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2483atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2484{
… …
2524 { 2498 {
2525 p = SCHEME_V->strbuff; 2499 p = SCHEME_V->strbuff;
2526 2500
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2501 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2502 {
2529 if (num_is_integer (l)) 2503 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2504 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2505#if USE_REAL
2532 else 2506 else
2533 { 2507 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2508 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2671#endif 2645#endif
2672 } 2646 }
2673 else if (is_continuation (l)) 2647 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2648 p = "#<CONTINUATION>";
2675 else 2649 else
2650 {
2651#if USE_PRINTF
2652 p = SCHEME_V->strbuff;
2653 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2654#else
2676 p = "#<ERROR>"; 2655 p = "#<ERROR>";
2656#endif
2657 }
2677 2658
2678 *pp = p; 2659 *pp = p;
2679 *plen = strlen (p); 2660 *plen = strlen (p);
2680} 2661}
2681 2662
… …
2789 return 0; 2770 return 0;
2790 } 2771 }
2791 else if (is_number (a)) 2772 else if (is_number (a))
2792 { 2773 {
2793 if (is_number (b)) 2774 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2775 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2776
2797 return 0; 2777 return 0;
2798 } 2778 }
2799 else if (is_character (a)) 2779 else if (is_character (a))
2800 { 2780 {
… …
2826/* () is #t in R5RS */ 2806/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2807#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2808#define is_false(p) ((p) == S_F)
2829 2809
2830/* ========== Environment implementation ========== */ 2810/* ========== Environment implementation ========== */
2831
2832#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2833
2834static int
2835hash_fn (const char *key, int table_size)
2836{
2837 const unsigned char *p = key;
2838 uint32_t hash = 2166136261;
2839
2840 while (*p)
2841 hash = (hash ^ *p++) * 16777619;
2842
2843 return hash % table_size;
2844}
2845#endif
2846 2811
2847#ifndef USE_ALIST_ENV 2812#ifndef USE_ALIST_ENV
2848 2813
2849/* 2814/*
2850 * In this implementation, each frame of the environment may be 2815 * In this implementation, each frame of the environment may be
… …
2867 2832
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2833 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2834 setenvironment (SCHEME_V->envir);
2870} 2835}
2871 2836
2872static INLINE void 2837static uint32_t
2838sym_hash (pointer sym, uint32_t size)
2839{
2840 uintptr_t ptr = (uintptr_t)sym;
2841
2842#if 0
2843 /* table size is prime, so why mix */
2844 ptr += ptr >> 32;
2845 ptr += ptr >> 16;
2846 ptr += ptr >> 8;
2847#endif
2848
2849 return ptr % size;
2850}
2851
2852ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2853new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2854{
2875 pointer slot = immutable_cons (variable, value); 2855 pointer slot = immutable_cons (variable, value);
2876 2856
2877 if (is_vector (car (env))) 2857 if (is_vector (car (env)))
2878 { 2858 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2859 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2860 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2861 }
2883 else 2862 else
2884 set_car (env, immutable_cons (slot, car (env))); 2863 set_car (env, immutable_cons (slot, car (env)));
2885} 2864}
2886 2865
2887static pointer 2866static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2867find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2868{
2890 pointer x, y; 2869 pointer x, y;
2891 int location;
2892 2870
2893 for (x = env; x != NIL; x = cdr (x)) 2871 for (x = env; x != NIL; x = cdr (x))
2894 { 2872 {
2895 if (is_vector (car (x))) 2873 if (is_vector (car (x)))
2896 { 2874 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2875 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2876 y = vector_get (car (x), location);
2899 } 2877 }
2900 else 2878 else
2901 y = car (x); 2879 y = car (x);
2902 2880
2903 for (; y != NIL; y = cdr (y)) 2881 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2882 if (caar (y) == hdl)
2905 break; 2883 break;
2906 2884
2907 if (y != NIL) 2885 if (y != NIL)
2886 return car (y);
2887
2888 if (!all)
2908 break; 2889 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2890 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2891
2917 return NIL; 2892 return NIL;
2918} 2893}
2919 2894
2920#else /* USE_ALIST_ENV */ 2895#else /* USE_ALIST_ENV */
2921 2896
2922static INLINE void 2897ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2898new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2899{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2900 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2901 setenvironment (SCHEME_V->envir);
2927} 2902}
2928 2903
2929static INLINE void 2904ecb_inline void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2905new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2906{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2907 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2908}
2934 2909
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2917 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2918 if (caar (y) == hdl)
2944 break; 2919 break;
2945 2920
2946 if (y != NIL) 2921 if (y != NIL)
2922 return car (y);
2947 break; 2923 break;
2948 2924
2949 if (!all) 2925 if (!all)
2950 return NIL; 2926 break;
2951 } 2927 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2928
2956 return NIL; 2929 return NIL;
2957} 2930}
2958 2931
2959#endif /* USE_ALIST_ENV else */ 2932#endif /* USE_ALIST_ENV else */
2960 2933
2961static INLINE void 2934ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2935new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2936{
2937 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2938 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2939}
2966 2940
2967static INLINE void 2941ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2942set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2943{
2970 set_cdr (slot, value); 2944 set_cdr (slot, value);
2971} 2945}
2972 2946
2973static INLINE pointer 2947ecb_inline pointer
2974slot_value_in_env (pointer slot) 2948slot_value_in_env (pointer slot)
2975{ 2949{
2976 return cdr (slot); 2950 return cdr (slot);
2977} 2951}
2978 2952
2979/* ========== Evaluation Cycle ========== */ 2953/* ========== Evaluation Cycle ========== */
2980 2954
2981static pointer 2955static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2956xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2957{
2984#if USE_ERROR_HOOK 2958#if USE_ERROR_HOOK
2985 pointer x; 2959 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2960 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 2995 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 2996 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 2997 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 2998 SCHEME_V->op = OP_EVAL;
3025 2999
3026 return S_T; 3000 return 0;
3027 } 3001 }
3028#endif 3002#endif
3029 3003
3030 if (a) 3004 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3005 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3007 SCHEME_V->args = NIL;
3034 3008
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3009 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3010 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3011 SCHEME_V->op = OP_ERR0;
3012
3038 return S_T; 3013 return 0;
3039} 3014}
3040 3015
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3016#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3017#define Error_0(s) Error_1 (s, 0)
3043 3018
3044/* Too small to turn into function */ 3019/* Too small to turn into function */
3045#define BEGIN do { 3020#define BEGIN do {
3046#define END } while (0) 3021#define END } while (0)
3047#define s_goto(a) BEGIN \ 3022#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3023 SCHEME_V->op = a; \
3049 return S_T; END 3024 return 0; END
3050 3025
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3026#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3027
3053#ifndef USE_SCHEME_STACK 3028#ifndef USE_SCHEME_STACK
3054 3029
… …
3068{ 3043{
3069 int nframes = (uintptr_t)SCHEME_V->dump; 3044 int nframes = (uintptr_t)SCHEME_V->dump;
3070 struct dump_stack_frame *next_frame; 3045 struct dump_stack_frame *next_frame;
3071 3046
3072 /* enough room for the next frame? */ 3047 /* enough room for the next frame? */
3073 if (nframes >= SCHEME_V->dump_size) 3048 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3074 { 3049 {
3075 SCHEME_V->dump_size += STACK_GROWTH; 3050 SCHEME_V->dump_size += STACK_GROWTH;
3076 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3051 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3077 } 3052 }
3078 3053
3079 next_frame = SCHEME_V->dump_base + nframes; 3054 next_frame = SCHEME_V->dump_base + nframes;
3080 3055
3081 next_frame->op = op; 3056 next_frame->op = op;
3082 next_frame->args = args; 3057 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3058 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3059 next_frame->code = code;
3085 3060
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3061 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3062}
3088 3063
3089static pointer 3064static int
3090xs_return (SCHEME_P_ pointer a) 3065xs_return (SCHEME_P_ pointer a)
3091{ 3066{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3067 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3068 struct dump_stack_frame *frame;
3094 3069
3095 SCHEME_V->value = a; 3070 SCHEME_V->value = a;
3096 3071
3097 if (nframes <= 0) 3072 if (nframes <= 0)
3098 return NIL; 3073 return -1;
3099 3074
3100 frame = &SCHEME_V->dump_base[--nframes]; 3075 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3076 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3077 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3078 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3079 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3080 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3081
3107 return S_T; 3082 return 0;
3108} 3083}
3109 3084
3110static INLINE void 3085ecb_inline void
3111dump_stack_reset (SCHEME_P) 3086dump_stack_reset (SCHEME_P)
3112{ 3087{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3088 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3089 SCHEME_V->dump = (pointer)+0;
3115} 3090}
3116 3091
3117static INLINE void 3092ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3093dump_stack_initialize (SCHEME_P)
3119{ 3094{
3120 SCHEME_V->dump_size = 0; 3095 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3096 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3097 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3150 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3151 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3152
3178 while (cont != NIL) 3153 while (cont != NIL)
3179 { 3154 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3155 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3156 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3157 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3158 frame->code = car (cont) ; cont = cdr (cont);
3184 3159
3185 ++frame; 3160 ++frame;
3186 ++i; 3161 ++i;
3187 } 3162 }
3188 3163
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3164 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3165}
3191 3166
3192#else 3167#else
3193 3168
3194static INLINE void 3169ecb_inline void
3195dump_stack_reset (SCHEME_P) 3170dump_stack_reset (SCHEME_P)
3196{ 3171{
3197 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3198} 3173}
3199 3174
3200static INLINE void 3175ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3176dump_stack_initialize (SCHEME_P)
3202{ 3177{
3203 dump_stack_reset (SCHEME_A); 3178 dump_stack_reset (SCHEME_A);
3204} 3179}
3205 3180
… …
3207dump_stack_free (SCHEME_P) 3182dump_stack_free (SCHEME_P)
3208{ 3183{
3209 SCHEME_V->dump = NIL; 3184 SCHEME_V->dump = NIL;
3210} 3185}
3211 3186
3212static pointer 3187static int
3213xs_return (SCHEME_P_ pointer a) 3188xs_return (SCHEME_P_ pointer a)
3214{ 3189{
3215 pointer dump = SCHEME_V->dump; 3190 pointer dump = SCHEME_V->dump;
3216 3191
3217 SCHEME_V->value = a; 3192 SCHEME_V->value = a;
3218 3193
3219 if (dump == NIL) 3194 if (dump == NIL)
3220 return NIL; 3195 return -1;
3221 3196
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3197 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3198 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3199 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3200 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3201
3227 SCHEME_V->dump = dump; 3202 SCHEME_V->dump = dump;
3228 3203
3229 return S_T; 3204 return 0;
3230} 3205}
3231 3206
3232static void 3207static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3208s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3209{
… …
3259 3234
3260#endif 3235#endif
3261 3236
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3237#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3238
3239#if EXPERIMENT
3264static pointer 3240static int
3241debug (SCHEME_P_ int indent, pointer x)
3242{
3243 int c;
3244
3245 if (is_syntax (x))
3246 {
3247 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3248 return 8 + 8;
3249 }
3250
3251 if (x == NIL)
3252 {
3253 printf ("%*sNIL\n", indent, "");
3254 return 3;
3255 }
3256
3257 switch (type (x))
3258 {
3259 case T_INTEGER:
3260 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3261 return 32+8;
3262
3263 case T_SYMBOL:
3264 printf ("%*sS<%s>\n", indent, "", symname (x));
3265 return 24+8;
3266
3267 case T_CLOSURE:
3268 printf ("%*sS<%s>\n", indent, "", "closure");
3269 debug (SCHEME_A_ indent + 3, cdr(x));
3270 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3271
3272 case T_PAIR:
3273 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3274 c = debug (SCHEME_A_ indent + 3, car (x));
3275 c += debug (SCHEME_A_ indent + 3, cdr (x));
3276 return c + 1;
3277
3278 case T_PORT:
3279 printf ("%*sS<%s>\n", indent, "", "port");
3280 return 24+8;
3281
3282 case T_VECTOR:
3283 printf ("%*sS<%s>\n", indent, "", "vector");
3284 return 24+8;
3285
3286 case T_ENVIRONMENT:
3287 printf ("%*sS<%s>\n", indent, "", "environment");
3288 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3289
3290 default:
3291 printf ("unhandled type %d\n", type (x));
3292 break;
3293 }
3294}
3295#endif
3296
3297static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3298opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3299{
3300 pointer args = SCHEME_V->args;
3267 pointer x, y; 3301 pointer x, y;
3268 3302
3269 switch (op) 3303 switch (op)
3270 { 3304 {
3305#if EXPERIMENT //D
3306 case OP_DEBUG:
3307 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3308 printf ("\n");
3309 s_return (S_T);
3310#endif
3271 case OP_LOAD: /* load */ 3311 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3312 if (file_interactive (SCHEME_A))
3273 { 3313 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3314 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3275 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3315 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3316 }
3277 3317
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3318 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3319 Error_1 ("unable to open", car (args));
3280 else 3320 else
3281 { 3321 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3322 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3323 s_goto (OP_T0LVL);
3284 } 3324 }
3285 3325
3286 case OP_T0LVL: /* top level */ 3326 case OP_T0LVL: /* top level */
3287 3327
3288 /* If we reached the end of file, this loop is done. */ 3328 /* If we reached the end of file, this loop is done. */
3289 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3329 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3290 { 3330 {
3291 if (SCHEME_V->file_i == 0) 3331 if (SCHEME_V->file_i == 0)
3292 { 3332 {
3293 SCHEME_V->args = NIL; 3333 SCHEME_V->args = NIL;
3294 s_goto (OP_QUIT); 3334 s_goto (OP_QUIT);
… …
3358 case OP_EVAL: /* main part of evaluation */ 3398 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3399#if USE_TRACING
3360 if (SCHEME_V->tracing) 3400 if (SCHEME_V->tracing)
3361 { 3401 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3402 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3403 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3404 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3405 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3406 s_goto (OP_P0LIST);
3367 } 3407 }
3368 3408
… …
3372#endif 3412#endif
3373 if (is_symbol (SCHEME_V->code)) /* symbol */ 3413 if (is_symbol (SCHEME_V->code)) /* symbol */
3374 { 3414 {
3375 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3415 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3376 3416
3377 if (x != NIL) 3417 if (x == NIL)
3378 s_return (slot_value_in_env (x));
3379 else
3380 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3418 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3419
3420 s_return (slot_value_in_env (x));
3381 } 3421 }
3382 else if (is_pair (SCHEME_V->code)) 3422 else if (is_pair (SCHEME_V->code))
3383 { 3423 {
3384 x = car (SCHEME_V->code); 3424 x = car (SCHEME_V->code);
3385 3425
… …
3398 } 3438 }
3399 else 3439 else
3400 s_return (SCHEME_V->code); 3440 s_return (SCHEME_V->code);
3401 3441
3402 case OP_E0ARGS: /* eval arguments */ 3442 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3443 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3444 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3445 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3446 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3447 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3448 s_goto (OP_APPLY);
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3452 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3453 s_goto (OP_E1ARGS);
3414 } 3454 }
3415 3455
3416 case OP_E1ARGS: /* eval arguments */ 3456 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3457 args = cons (SCHEME_V->value, args);
3418 3458
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3459 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3460 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3461 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3462 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3463 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3464 s_goto (OP_EVAL);
3425 } 3465 }
3426 else /* end */ 3466 else /* end */
3427 { 3467 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3468 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3469 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3470 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3471 s_goto (OP_APPLY);
3432 } 3472 }
3433 3473
3434#if USE_TRACING 3474#if USE_TRACING
3435 3475
3436 case OP_TRACING: 3476 case OP_TRACING:
3437 { 3477 {
3438 int tr = SCHEME_V->tracing; 3478 int tr = SCHEME_V->tracing;
3439 3479
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3480 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3481 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3482 }
3443 3483
3444#endif 3484#endif
3445 3485
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3486 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3487#if USE_TRACING
3448 if (SCHEME_V->tracing) 3488 if (SCHEME_V->tracing)
3449 { 3489 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3490 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3491 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3492 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3493 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3494 s_goto (OP_P0LIST);
3455 } 3495 }
3456 3496
3457 /* fall through */ 3497 /* fall through */
3458 3498
3459 case OP_REAL_APPLY: 3499 case OP_REAL_APPLY:
3460#endif 3500#endif
3461 if (is_proc (SCHEME_V->code)) 3501 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3502 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3503 else if (is_foreign (SCHEME_V->code))
3466 { 3504 {
3467 /* Keep nested calls from GC'ing the arglist */ 3505 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3506 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3507 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3470 3508
3471 s_return (x); 3509 s_return (x);
3472 } 3510 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3511 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3512 {
3475 /* Should not accept promise */ 3513 /* Should not accept promise */
3476 /* make environment */ 3514 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3515 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3516
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3517 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3518 {
3481 if (y == NIL) 3519 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3520 Error_0 ("not enough arguments");
3483 else 3521 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3522 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3540 s_goto (OP_BEGIN);
3503 } 3541 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3542 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3543 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3544 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3545 s_return (args != NIL ? car (args) : NIL);
3508 } 3546 }
3509 else 3547 else
3510 Error_0 ("illegal function"); 3548 Error_0 ("illegal function");
3511 3549
3512 case OP_DOMACRO: /* do macro */ 3550 case OP_DOMACRO: /* do macro */
3513 SCHEME_V->code = SCHEME_V->value; 3551 SCHEME_V->code = SCHEME_V->value;
3514 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3515
3516#if 1
3517 3553
3518 case OP_LAMBDA: /* lambda */ 3554 case OP_LAMBDA: /* lambda */
3519 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3555 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3520 set SCHEME_V->value fall thru */ 3556 set SCHEME_V->value fall thru */
3521 { 3557 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3558 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3559
3524 if (f != NIL) 3560 if (f != NIL)
3525 { 3561 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3562 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3563 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3564 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3565 s_goto (OP_APPLY);
3530 } 3566 }
3531 3567
3532 SCHEME_V->value = SCHEME_V->code; 3568 SCHEME_V->value = SCHEME_V->code;
3533 /* Fallthru */
3534 } 3569 }
3570 /* Fallthru */
3535 3571
3536 case OP_LAMBDA1: 3572 case OP_LAMBDA1:
3537 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3573 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3538 3574
3539#else
3540
3541 case OP_LAMBDA: /* lambda */
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543
3544#endif
3545
3546 case OP_MKCLOSURE: /* make-closure */ 3575 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3576 x = car (args);
3548 3577
3549 if (car (x) == SCHEME_V->LAMBDA) 3578 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3579 x = cdr (x);
3551 3580
3552 if (cdr (SCHEME_V->args) == NIL) 3581 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3582 y = SCHEME_V->envir;
3554 else 3583 else
3555 y = cadr (SCHEME_V->args); 3584 y = cadr (args);
3556 3585
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3586 s_return (mk_closure (SCHEME_A_ x, y));
3558 3587
3559 case OP_QUOTE: /* quote */ 3588 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3589 s_return (car (SCHEME_V->code));
… …
3592 3621
3593 3622
3594 case OP_DEFP: /* defined? */ 3623 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3624 x = SCHEME_V->envir;
3596 3625
3597 if (cdr (SCHEME_V->args) != NIL) 3626 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3627 x = cadr (args);
3599 3628
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3630
3602 case OP_SET0: /* set! */ 3631 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3632 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3634
… …
3636 3665
3637 case OP_IF1: /* if */ 3666 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3667 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3668 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3669 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3671 s_goto (OP_EVAL);
3645 3672
3646 case OP_LET0: /* let */ 3673 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3675 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3676 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 3677 s_goto (OP_LET1);
3651 3678
3652 case OP_LET1: /* let (calculate parameters) */ 3679 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3680 args = cons (SCHEME_V->value, args);
3654 3681
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3682 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3683 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3684 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3658 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3685 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3659 3686
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3687 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3664 } 3691 }
3665 else /* end */ 3692 else /* end */
3666 { 3693 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3694 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3695 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3696 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3697 s_goto (OP_LET2);
3671 } 3698 }
3672 3699
3673 case OP_LET2: /* let */ 3700 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3701 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3702
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3703 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3704 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3705 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3706
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3707 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3708 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3709 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 3710 {
3684 if (!is_pair (x)) 3711 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3712 Error_1 ("Bad syntax of binding in let :", x);
3686 3713
3687 if (!is_list (SCHEME_A_ car (x))) 3714 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3715 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3716
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3717 args = cons (caar (x), args);
3691 } 3718 }
3692 3719
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3720 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 3721 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3722 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3723 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3724 }
3700 else 3725 else
3701 { 3726 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3727 SCHEME_V->code = cdr (SCHEME_V->code);
3728 }
3729
3703 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
3707 3732
3708 case OP_LET0AST: /* let* */ 3733 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3734 if (car (SCHEME_V->code) == NIL)
3710 { 3735 {
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3753 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3754 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3755
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3756 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3757 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3758 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3759 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3760 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3761 s_goto (OP_EVAL);
3737 } 3762 }
3738 else /* end */ 3763 else /* end */
3739 { 3764 {
3740 SCHEME_V->code = SCHEME_V->args; 3765 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3766 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3767 s_goto (OP_BEGIN);
3743 } 3768 }
3744 3769
3745 case OP_LET0REC: /* letrec */ 3770 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3773 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3774 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3775 s_goto (OP_LET1REC);
3751 3776
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3777 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3778 args = cons (SCHEME_V->value, args);
3754 3779
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3780 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3781 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3782 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3758 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3783 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759 3784
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3785 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3786 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3787 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3788 s_goto (OP_EVAL);
3764 } 3789 }
3765 else /* end */ 3790 else /* end */
3766 { 3791 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3792 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3793 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3794 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3795 s_goto (OP_LET2REC);
3771 } 3796 }
3772 3797
3773 case OP_LET2REC: /* letrec */ 3798 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3799 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3800 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3801
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3802 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3804 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3890 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3891 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3892 s_goto (OP_EVAL);
3868 3893
3869 case OP_C1STREAM: /* cons-stream */ 3894 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3895 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3871 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3896 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 3897 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3898 s_return (cons (args, x));
3874 3899
3875 case OP_MACRO0: /* macro */ 3900 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3901 if (is_pair (car (SCHEME_V->code)))
3877 { 3902 {
3878 x = caar (SCHEME_V->code); 3903 x = caar (SCHEME_V->code);
… …
3911 { 3936 {
3912 if (!is_pair (y = caar (x))) 3937 if (!is_pair (y = caar (x)))
3913 break; 3938 break;
3914 3939
3915 for (; y != NIL; y = cdr (y)) 3940 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3941 if (eqv (car (y), SCHEME_V->value))
3918 break; 3942 break;
3919 }
3920 3943
3921 if (y != NIL) 3944 if (y != NIL)
3922 break; 3945 break;
3923 } 3946 }
3924 3947
… …
3944 s_goto (OP_BEGIN); 3967 s_goto (OP_BEGIN);
3945 else 3968 else
3946 s_return (NIL); 3969 s_return (NIL);
3947 3970
3948 case OP_PAPPLY: /* apply */ 3971 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3972 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3973 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3974 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3975 s_goto (OP_APPLY);
3953 3976
3954 case OP_PEVAL: /* eval */ 3977 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3978 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3979 SCHEME_V->envir = cadr (args);
3957 3980
3958 SCHEME_V->code = car (SCHEME_V->args); 3981 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3982 s_goto (OP_EVAL);
3960 3983
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3984 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3985 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3986 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3965 } 3988 }
3966 3989
3967 return S_T; 3990 if (USE_ERROR_CHECKING) abort ();
3968} 3991}
3969 3992
3970static pointer 3993static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3994opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3995{
3973 pointer x; 3996 pointer args = SCHEME_V->args;
3997 pointer x = car (args);
3974 num v; 3998 num v;
3975 3999
4000 switch (op)
4001 {
3976#if USE_MATH 4002#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4003 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 4004 {
3986
3987 if (num_is_integer (x)) 4005 if (is_integer (x))
3988 s_return (x); 4006 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4007
4008 RVALUE r = rvalue_unchecked (x);
4009
4010 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4011 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 4012 else
3992 Error_1 ("inexact->exact: not integral:", x); 4013 Error_1 ("inexact->exact: not integral:", x);
4014 }
3993 4015
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4016 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4017 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4018 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4019 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4020 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4021 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4022 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4023
4022 case OP_ATAN: 4024 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 4025 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 4027 else
4028 { 4028 {
4029 pointer y = cadr (SCHEME_V->args); 4029 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4030 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 4031 }
4033 4032
4034 case OP_SQRT: 4033 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4034 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 4035
4038 case OP_EXPT: 4036 case OP_EXPT:
4039 { 4037 {
4040 RVALUE result; 4038 RVALUE result;
4041 int real_result = 1; 4039 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4040 pointer y = cadr (args);
4043 4041
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4042 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4043 real_result = 0;
4048 4044
4049 /* This 'if' is an R5RS compatibility fix. */ 4045 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4046 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4047 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4048 result = 0;
4053 else 4049 else
4054 result = pow (rvalue (x), rvalue (y)); 4050 result = pow (rvalue (x), rvalue (y));
4055 4051
4056 /* Before returning integer result make sure we can. */ 4052 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4053 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4054 if (!real_result)
4059 { 4055 {
4060 long result_as_long = (long) result; 4056 long result_as_long = result;
4061 4057
4062 if (result != (RVALUE) result_as_long) 4058 if (result != result_as_long)
4063 real_result = 1; 4059 real_result = 1;
4064 } 4060 }
4065 4061
4066 if (real_result) 4062 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4063 s_return (mk_real (SCHEME_A_ result));
4068 else 4064 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4065 s_return (mk_integer (SCHEME_A_ result));
4070 } 4066 }
4071 4067
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4068 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4069 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4070 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4080 case OP_TRUNCATE:
4081 {
4082 RVALUE rvalue_of_x;
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4071 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4091 }
4092
4093 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x))
4097 s_return (x);
4098
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4072#endif
4101 4073
4102 case OP_ADD: /* + */ 4074 case OP_ADD: /* + */
4103 v = num_zero; 4075 v = num_zero;
4104 4076
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4077 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4078 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4079
4108 s_return (mk_number (SCHEME_A_ v)); 4080 s_return (mk_number (SCHEME_A_ v));
4109 4081
4110 case OP_MUL: /* * */ 4082 case OP_MUL: /* * */
4111 v = num_one; 4083 v = num_one;
4112 4084
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4085 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4086 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4087
4116 s_return (mk_number (SCHEME_A_ v)); 4088 s_return (mk_number (SCHEME_A_ v));
4117 4089
4118 case OP_SUB: /* - */ 4090 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4091 if (cdr (args) == NIL)
4120 { 4092 {
4121 x = SCHEME_V->args; 4093 x = args;
4122 v = num_zero; 4094 v = num_zero;
4123 } 4095 }
4124 else 4096 else
4125 { 4097 {
4126 x = cdr (SCHEME_V->args); 4098 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4099 v = nvalue (car (args));
4128 } 4100 }
4129 4101
4130 for (; x != NIL; x = cdr (x)) 4102 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4103 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4104
4133 s_return (mk_number (SCHEME_A_ v)); 4105 s_return (mk_number (SCHEME_A_ v));
4134 4106
4135 case OP_DIV: /* / */ 4107 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4108 if (cdr (args) == NIL)
4137 { 4109 {
4138 x = SCHEME_V->args; 4110 x = args;
4139 v = num_one; 4111 v = num_one;
4140 } 4112 }
4141 else 4113 else
4142 { 4114 {
4143 x = cdr (SCHEME_V->args); 4115 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4116 v = nvalue (car (args));
4145 } 4117 }
4146 4118
4147 for (; x != NIL; x = cdr (x)) 4119 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4120 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4121 v = num_div (v, nvalue (car (x)));
4151 else 4122 else
4152 Error_0 ("/: division by zero"); 4123 Error_0 ("/: division by zero");
4153 }
4154 4124
4155 s_return (mk_number (SCHEME_A_ v)); 4125 s_return (mk_number (SCHEME_A_ v));
4156 4126
4157 case OP_INTDIV: /* quotient */ 4127 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4128 if (cdr (args) == NIL)
4159 { 4129 {
4160 x = SCHEME_V->args; 4130 x = args;
4161 v = num_one; 4131 v = num_one;
4162 } 4132 }
4163 else 4133 else
4164 { 4134 {
4165 x = cdr (SCHEME_V->args); 4135 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4136 v = nvalue (car (args));
4167 } 4137 }
4168 4138
4169 for (; x != NIL; x = cdr (x)) 4139 for (; x != NIL; x = cdr (x))
4170 { 4140 {
4171 if (ivalue (car (x)) != 0) 4141 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4142 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4143 else
4174 Error_0 ("quotient: division by zero"); 4144 Error_0 ("quotient: division by zero");
4175 } 4145 }
4176 4146
4177 s_return (mk_number (SCHEME_A_ v)); 4147 s_return (mk_number (SCHEME_A_ v));
4178 4148
4179 case OP_REM: /* remainder */ 4149 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4150 v = nvalue (x);
4181 4151
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4152 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4153 v = num_rem (v, nvalue (cadr (args)));
4184 else 4154 else
4185 Error_0 ("remainder: division by zero"); 4155 Error_0 ("remainder: division by zero");
4186 4156
4187 s_return (mk_number (SCHEME_A_ v)); 4157 s_return (mk_number (SCHEME_A_ v));
4188 4158
4189 case OP_MOD: /* modulo */ 4159 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4160 v = nvalue (x);
4191 4161
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4162 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4163 v = num_mod (v, nvalue (cadr (args)));
4194 else 4164 else
4195 Error_0 ("modulo: division by zero"); 4165 Error_0 ("modulo: division by zero");
4196 4166
4197 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4198 4168
4199 case OP_CAR: /* car */ 4169 /* the compiler will optimize this mess... */
4200 s_return (caar (SCHEME_V->args)); 4170 case OP_CAR: op_car: s_return (car (x));
4201 4171 case OP_CDR: op_cdr: s_return (cdr (x));
4202 case OP_CDR: /* cdr */ 4172 case OP_CAAR: op_caar: x = car (x); goto op_car;
4203 s_return (cdar (SCHEME_V->args)); 4173 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4174 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4175 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4176 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4177 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4178 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4179 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4180 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4181 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4182 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4183 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4184 case OP_CAAAAR: x = car (x); goto op_caaar;
4185 case OP_CAAADR: x = cdr (x); goto op_caaar;
4186 case OP_CAADAR: x = car (x); goto op_caadr;
4187 case OP_CAADDR: x = cdr (x); goto op_caadr;
4188 case OP_CADAAR: x = car (x); goto op_cadar;
4189 case OP_CADADR: x = cdr (x); goto op_cadar;
4190 case OP_CADDAR: x = car (x); goto op_caddr;
4191 case OP_CADDDR: x = cdr (x); goto op_caddr;
4192 case OP_CDAAAR: x = car (x); goto op_cdaar;
4193 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4194 case OP_CDADAR: x = car (x); goto op_cdadr;
4195 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4196 case OP_CDDAAR: x = car (x); goto op_cddar;
4197 case OP_CDDADR: x = cdr (x); goto op_cddar;
4198 case OP_CDDDAR: x = car (x); goto op_cdddr;
4199 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4204 4200
4205 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4202 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4203 s_return (args);
4208 4204
4209 case OP_SETCAR: /* set-car! */ 4205 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4206 if (!is_immutable (x))
4211 { 4207 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4208 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4209 s_return (car (args));
4214 } 4210 }
4215 else 4211 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4212 Error_0 ("set-car!: unable to alter immutable pair");
4217 4213
4218 case OP_SETCDR: /* set-cdr! */ 4214 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4215 if (!is_immutable (x))
4220 { 4216 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4217 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4218 s_return (car (args));
4223 } 4219 }
4224 else 4220 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4222
4227 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4225
4230 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4228
4233 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4234 { 4230 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4231 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4232 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4238 } 4234 }
4239 4235
4240 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4241 { 4237 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4238 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4239 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4245 } 4241 }
4246 4242
4247 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4244 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4245
4250 case OP_STR2ATOM: /* string->atom */ 4246 case OP_STR2ATOM: /* string->atom */
4251 { 4247 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4248 char *s = strvalue (x);
4253 long pf = 0; 4249 long pf = 0;
4254 4250
4255 if (cdr (SCHEME_V->args) != NIL) 4251 if (cdr (args) != NIL)
4256 { 4252 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4253 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4254 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4255 pf = ivalue_unchecked (cadr (args));
4260 4256
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4257 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4258 {
4263 /* base is OK */ 4259 /* base is OK */
4264 } 4260 }
4265 else 4261 else
4266 pf = -1; 4262 pf = -1;
4267 } 4263 }
4268 4264
4269 if (pf < 0) 4265 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4266 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4267 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4268 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4269 else
4274 { 4270 {
4275 if (pf == 0 || pf == 10) 4271 if (pf == 0 || pf == 10)
… …
4286 } 4282 }
4287 } 4283 }
4288 } 4284 }
4289 4285
4290 case OP_SYM2STR: /* symbol->string */ 4286 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4287 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4288 setimmutable (x);
4293 s_return (x); 4289 s_return (x);
4294 4290
4295 case OP_ATOM2STR: /* atom->string */ 4291 case OP_ATOM2STR: /* atom->string */
4296 { 4292 {
4297 long pf = 0; 4293 long pf = 0;
4298 4294
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4302 { 4296 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4306 4300
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4302 {
4309 /* base is OK */ 4303 /* base is OK */
4310 } 4304 }
4311 else 4305 else
4312 pf = -1; 4306 pf = -1;
4313 } 4307 }
4314 4308
4315 if (pf < 0) 4309 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4312 {
4319 char *p; 4313 char *p;
4320 int len; 4314 int len;
4321 4315
… …
4326 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4327 } 4321 }
4328 4322
4329 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4330 { 4324 {
4331 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4326 int len = ivalue_unchecked (x);
4333 4327
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4329 }
4341 4330
4342 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4333
4345 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4346 { 4335 {
4347 char *str; 4336 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4337 int index = ivalue_unchecked (cadr (args));
4353 4338
4354 if (index >= strlength (car (SCHEME_V->args))) 4339 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4341
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4343 }
4359 4344
4360 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4361 { 4346 {
4362 char *str; 4347 char *str = strvalue (x);
4363 int index; 4348 int index = ivalue_unchecked (cadr (args));
4364 int c; 4349 int c;
4365 4350
4366 if (is_immutable (car (SCHEME_V->args))) 4351 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4353
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4354 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4356
4376 c = charvalue (caddr (SCHEME_V->args)); 4357 c = charvalue (caddr (args));
4377 4358
4378 str[index] = (char) c; 4359 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4360 s_return (car (args));
4380 } 4361 }
4381 4362
4382 case OP_STRAPPEND: /* string-append */ 4363 case OP_STRAPPEND: /* string-append */
4383 { 4364 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4365 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4366 int len = 0;
4386 pointer newstr; 4367 pointer newstr;
4387 char *pos; 4368 char *pos;
4388 4369
4389 /* compute needed length for new string */ 4370 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4371 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4372 len += strlength (car (x));
4392 4373
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4374 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4375
4395 /* store the contents of the argument strings into the new string */ 4376 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4377 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4379
4399 s_return (newstr); 4380 s_return (newstr);
4400 } 4381 }
4401 4382
4402 case OP_SUBSTR: /* substring */ 4383 case OP_SUBSTR: /* substring */
4403 { 4384 {
4404 char *str; 4385 char *str = strvalue (x);
4405 int index0; 4386 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4387 int index1;
4407 int len; 4388 int len;
4408 4389
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4390 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4391 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4392
4416 if (cddr (SCHEME_V->args) != NIL) 4393 if (cddr (args) != NIL)
4417 { 4394 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4395 index1 = ivalue_unchecked (caddr (args));
4419 4396
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4398 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4399 }
4423 else 4400 else
4424 index1 = strlength (car (SCHEME_V->args)); 4401 index1 = strlength (x);
4425 4402
4426 len = index1 - index0; 4403 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4405 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4406 strvalue (x)[len] = 0;
… …
4433 4410
4434 case OP_VECTOR: /* vector */ 4411 case OP_VECTOR: /* vector */
4435 { 4412 {
4436 int i; 4413 int i;
4437 pointer vec; 4414 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4415 int len = list_length (SCHEME_A_ args);
4439 4416
4440 if (len < 0) 4417 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4418 Error_1 ("vector: not a proper list:", args);
4442 4419
4443 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4444 4421
4445#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4424 s_return (S_SINK);
4448#endif 4425#endif
4449 4426
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4427 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4428 vector_set (vec, i, car (x));
4452 4429
4453 s_return (vec); 4430 s_return (vec);
4454 } 4431 }
4455 4432
4456 case OP_MKVECTOR: /* make-vector */ 4433 case OP_MKVECTOR: /* make-vector */
4457 { 4434 {
4458 pointer fill = NIL; 4435 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4436 pointer vec;
4437 int len = ivalue_unchecked (x);
4461 4438
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4439 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4440 fill = cadr (args);
4466 4441
4467 vec = mk_vector (SCHEME_A_ len); 4442 vec = mk_vector (SCHEME_A_ len);
4468 4443
4469#if USE_ERROR_CHECKING 4444#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4445 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4446 s_return (S_SINK);
4472#endif 4447#endif
4473 4448
4474 if (fill != NIL) 4449 if (fill != NIL)
4475 fill_vector (vec, fill); 4450 fill_vector (vec, 0, fill);
4476 4451
4477 s_return (vec); 4452 s_return (vec);
4478 } 4453 }
4479 4454
4480 case OP_VECLEN: /* vector-length */ 4455 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4456 s_return (mk_integer (SCHEME_A_ veclength (x)));
4457
4458 case OP_VECRESIZE:
4459 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4460 s_return (x);
4482 4461
4483 case OP_VECREF: /* vector-ref */ 4462 case OP_VECREF: /* vector-ref */
4484 { 4463 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4464 int index = ivalue_unchecked (cadr (args));
4488 4465
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4466 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4467 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4468
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4469 s_return (vector_get (x, index));
4493 } 4470 }
4494 4471
4495 case OP_VECSET: /* vector-set! */ 4472 case OP_VECSET: /* vector-set! */
4496 { 4473 {
4497 int index; 4474 int index = ivalue_unchecked (cadr (args));
4498 4475
4499 if (is_immutable (car (SCHEME_V->args))) 4476 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4477 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4478
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4479 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4480 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4481
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4482 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4483 s_return (x);
4509 } 4484 }
4510 } 4485 }
4511 4486
4512 return S_T; 4487 if (USE_ERROR_CHECKING) abort ();
4513} 4488}
4514 4489
4515INTERFACE int 4490static int
4516is_list (SCHEME_P_ pointer a) 4491opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4492{
4518 return list_length (SCHEME_A_ a) >= 0; 4493 pointer x = SCHEME_V->args;
4519}
4520 4494
4521/* Result is: 4495 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4496 {
4497 num v = nvalue (car (x));
4498 x = cdr (x);
4499
4537 if (fast == NIL) 4500 if (x == NIL)
4538 return i; 4501 break;
4539 4502
4540 if (!is_pair (fast)) 4503 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4504
4543 fast = cdr (fast); 4505 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4506 {
4561 /* the fast pointer has looped back around and caught up 4507 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4508 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4509 case OP_GRE: r = r > 0; break;
4564 return -1; 4510 case OP_LEQ: r = r <= 0; break;
4511 case OP_GEQ: r = r >= 0; break;
4565 } 4512 }
4566 }
4567}
4568 4513
4514 if (!r)
4515 s_return (S_F);
4516 }
4517
4518 s_return (S_T);
4519}
4520
4569static pointer 4521static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4522opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4523{
4572 pointer x; 4524 pointer args = SCHEME_V->args;
4573 num v; 4525 pointer a = car (args);
4574 int (*comp_func) (num, num); 4526 pointer d = cdr (args);
4527 int r;
4575 4528
4576 switch (op) 4529 switch (op)
4577 { 4530 {
4578 case OP_NOT: /* not */ 4531 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4536 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4542
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4650 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4547 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4548 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4549#endif
4550
4666#if USE_PORTS 4551#if USE_PORTS
4667 4552 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4553 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4554 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4555#endif
4677 4556
4678 case OP_PROCP: /* procedure? */ 4557 case OP_PROCP: /* procedure? */
4679 4558
4680 /*-- 4559 /*--
4681 * continuation should be procedure by the example 4560 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4561 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4562 * in R^3 report sec. 6.9
4684 */ 4563 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4564 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4565 break;
4687 4566
4688 case OP_PAIRP: /* pair? */ 4567 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4568 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4569 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4570 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4571 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4572 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4573 }
4706 4574
4707 return S_T; 4575 s_retbool (r);
4708} 4576}
4709 4577
4710static pointer 4578static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4579opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4580{
4581 pointer args = SCHEME_V->args;
4582 pointer a = car (args);
4713 pointer x, y; 4583 pointer x, y;
4714 4584
4715 switch (op) 4585 switch (op)
4716 { 4586 {
4717 case OP_FORCE: /* force */ 4587 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4588 SCHEME_V->code = a;
4719 4589
4720 if (is_promise (SCHEME_V->code)) 4590 if (is_promise (SCHEME_V->code))
4721 { 4591 {
4722 /* Should change type to closure here */ 4592 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4593 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4726 } 4596 }
4727 else 4597 else
4728 s_return (SCHEME_V->code); 4598 s_return (SCHEME_V->code);
4729 4599
4730 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4731 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4601 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4732 s_return (SCHEME_V->value); 4602 s_return (SCHEME_V->value);
4733 4603
4734#if USE_PORTS 4604#if USE_PORTS
4735 4605
4736 case OP_WRITE: /* write */ 4606 case OP_WRITE: /* write */
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4614 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4615 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4616 }
4747 } 4617 }
4748 4618
4749 SCHEME_V->args = car (SCHEME_V->args); 4619 SCHEME_V->args = a;
4750 4620
4751 if (op == OP_WRITE) 4621 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4622 SCHEME_V->print_flag = 1;
4753 else 4623 else
4754 SCHEME_V->print_flag = 0; 4624 SCHEME_V->print_flag = 0;
4755 4625
4756 s_goto (OP_P0LIST); 4626 s_goto (OP_P0LIST);
4757 4627
4758 case OP_NEWLINE: /* newline */ 4628 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4629 if (is_pair (args))
4760 { 4630 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4631 if (a != SCHEME_V->outport)
4762 { 4632 {
4763 x = cons (SCHEME_V->outport, NIL); 4633 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4635 SCHEME_V->outport = a;
4766 } 4636 }
4767 } 4637 }
4768 4638
4769 putstr (SCHEME_A_ "\n"); 4639 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4640 s_return (S_T);
4771#endif 4641#endif
4772 4642
4773 case OP_ERR0: /* error */ 4643 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4644 SCHEME_V->retcode = -1;
4775 4645
4776 if (!is_string (car (SCHEME_V->args))) 4646 if (!is_string (a))
4777 { 4647 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4648 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4649 setimmutable (car (args));
4780 } 4650 }
4781 4651
4782 putstr (SCHEME_A_ "Error: "); 4652 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4653 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4654 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4655 s_goto (OP_ERR1);
4786 4656
4787 case OP_ERR1: /* error */ 4657 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4658 putstr (SCHEME_A_ " ");
4789 4659
4790 if (SCHEME_V->args != NIL) 4660 if (args != NIL)
4791 { 4661 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4664 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4665 s_goto (OP_P0LIST);
4796 } 4666 }
4797 else 4667 else
4798 { 4668 {
4799 putstr (SCHEME_A_ "\n"); 4669 putstr (SCHEME_A_ "\n");
4800 4670
4801 if (SCHEME_V->interactive_repl) 4671 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4672 s_goto (OP_T0LVL);
4803 else 4673 else
4804 return NIL; 4674 return -1;
4805 } 4675 }
4806 4676
4807 case OP_REVERSE: /* reverse */ 4677 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4678 s_return (reverse (SCHEME_A_ a));
4809 4679
4810 case OP_LIST_STAR: /* list* */ 4680 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4681 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4682
4813 case OP_APPEND: /* append */ 4683 case OP_APPEND: /* append */
4814 x = NIL; 4684 x = NIL;
4815 y = SCHEME_V->args; 4685 y = args;
4816 4686
4817 if (y == x) 4687 if (y == x)
4818 s_return (x); 4688 s_return (x);
4819 4689
4820 /* cdr() in the while condition is not a typo. If car() */ 4690 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4701 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4702
4833#if USE_PLIST 4703#if USE_PLIST
4834 4704
4835 case OP_PUT: /* put */ 4705 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4706 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4707 Error_0 ("illegal use of put");
4838 4708
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4709 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4710 {
4841 if (caar (x) == y) 4711 if (caar (x) == y)
4842 break; 4712 break;
4843 } 4713 }
4844 4714
4845 if (x != NIL) 4715 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4716 cdar (x) = caddr (args);
4847 else 4717 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4718 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4719
4850 s_return (S_T); 4720 s_return (S_T);
4851 4721
4852 case OP_GET: /* get */ 4722 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4723 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4724 Error_0 ("illegal use of get");
4855 4725
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4726 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4727 if (caar (x) == y)
4858 break; 4728 break;
4859 4729
4860 if (x != NIL) 4730 if (x != NIL)
4861 s_return (cdar (x)); 4731 s_return (cdar (x));
… …
4863 s_return (NIL); 4733 s_return (NIL);
4864 4734
4865#endif /* USE_PLIST */ 4735#endif /* USE_PLIST */
4866 4736
4867 case OP_QUIT: /* quit */ 4737 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4738 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4739 SCHEME_V->retcode = ivalue (a);
4870 4740
4871 return NIL; 4741 return -1;
4872 4742
4873 case OP_GC: /* gc */ 4743 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4744 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4745 s_return (S_T);
4876 4746
4877 case OP_GCVERB: /* gc-verbose */ 4747 case OP_GCVERB: /* gc-verbose */
4878 { 4748 {
4879 int was = SCHEME_V->gc_verbose; 4749 int was = SCHEME_V->gc_verbose;
4880 4750
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4751 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4752 s_retbool (was);
4883 } 4753 }
4884 4754
4885 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
4756#if 0
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4757 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4758 Error_0 ("new-segment: argument must be a number");
4888 4759#endif
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4760 s_retbool (alloc_cellseg (SCHEME_A));
4890
4891 s_return (S_T);
4892 4761
4893 case OP_OBLIST: /* oblist */ 4762 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4763 s_return (oblist_all_symbols (SCHEME_A));
4895 4764
4896#if USE_PORTS 4765#if USE_PORTS
… …
4921 case OP_OPEN_INOUTFILE: 4790 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4791 prop = port_input | port_output;
4923 break; 4792 break;
4924 } 4793 }
4925 4794
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4795 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4796
4928 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4798 }
4933 4799
4934# if USE_STRING_PORTS 4800# if USE_STRING_PORTS
4935 4801
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4802 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4814 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4815 prop = port_input | port_output;
4950 break; 4816 break;
4951 } 4817 }
4952 4818
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4819 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4820 strvalue (a) + strlength (a), prop);
4955 4821
4956 if (p == NIL) 4822 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4823 }
4961 4824
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4825 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4826 {
4964 pointer p; 4827 pointer p;
4965 4828
4966 if (car (SCHEME_V->args) == NIL) 4829 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4830 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4831 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4833 strvalue (a) + strlength (a), port_output);
4977 4834
4978 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4836 }
4984 4837
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4838 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4839 {
4987 port *p; 4840 port *p = port (a);
4988 4841
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4842 if (p->kind & port_string)
4990 { 4843 {
4991 off_t size; 4844 off_t size;
4992 char *str; 4845 char *str;
4993 4846
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4847 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4863 }
5011 4864
5012# endif 4865# endif
5013 4866
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4867 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4868 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4869 s_return (S_T);
5017 4870
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4871 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4872 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4873 s_return (S_T);
5021#endif 4874#endif
5022 4875
5023 case OP_INT_ENV: /* interaction-environment */ 4876 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4877 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4879 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4880 s_return (SCHEME_V->envir);
5028 4881
5029 } 4882 }
5030 4883
5031 return S_T; 4884 if (USE_ERROR_CHECKING) abort ();
5032} 4885}
5033 4886
5034static pointer 4887static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4888opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4889{
4890 pointer args = SCHEME_V->args;
5037 pointer x; 4891 pointer x;
5038 4892
5039 if (SCHEME_V->nesting != 0) 4893 if (SCHEME_V->nesting != 0)
5040 { 4894 {
5041 int n = SCHEME_V->nesting; 4895 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4902 switch (op)
5049 { 4903 {
5050 /* ========== reading part ========== */ 4904 /* ========== reading part ========== */
5051#if USE_PORTS 4905#if USE_PORTS
5052 case OP_READ: 4906 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4907 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4908 s_goto (OP_READ_INTERNAL);
5055 4909
5056 if (!is_inport (car (SCHEME_V->args))) 4910 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4911 Error_1 ("read: not an input port:", car (args));
5058 4912
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4913 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4914 s_goto (OP_READ_INTERNAL);
5061 4915
5062 x = SCHEME_V->inport; 4916 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4917 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4918 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4919 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4920 s_goto (OP_READ_INTERNAL);
5067 4921
5068 case OP_READ_CHAR: /* read-char */ 4922 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4923 case OP_PEEK_CHAR: /* peek-char */
5070 { 4924 {
5071 int c; 4925 int c;
5072 4926
5073 if (is_pair (SCHEME_V->args)) 4927 if (is_pair (args))
5074 { 4928 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4929 if (car (args) != SCHEME_V->inport)
5076 { 4930 {
5077 x = SCHEME_V->inport; 4931 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4932 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4933 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4934 SCHEME_V->inport = car (args);
5081 } 4935 }
5082 } 4936 }
5083 4937
5084 c = inchar (SCHEME_A); 4938 c = inchar (SCHEME_A);
5085 4939
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4949 case OP_CHAR_READY: /* char-ready? */
5096 { 4950 {
5097 pointer p = SCHEME_V->inport; 4951 pointer p = SCHEME_V->inport;
5098 int res; 4952 int res;
5099 4953
5100 if (is_pair (SCHEME_V->args)) 4954 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4955 p = car (args);
5102 4956
5103 res = p->object.port->kind & port_string; 4957 res = port (p)->kind & port_string;
5104 4958
5105 s_retbool (res); 4959 s_retbool (res);
5106 } 4960 }
5107 4961
5108 case OP_SET_INPORT: /* set-input-port */ 4962 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4963 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4964 s_return (SCHEME_V->value);
5111 4965
5112 case OP_SET_OUTPORT: /* set-output-port */ 4966 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4967 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4968 s_return (SCHEME_V->value);
5115#endif 4969#endif
5116 4970
5117 case OP_RDSEXPR: 4971 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4972 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5021 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5022 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5023 s_goto (OP_RDSEXPR);
5170 5024
5171 case TOK_ATOM: 5025 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5026 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5027
5028 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031
5032 case TOK_STRATOM:
5033 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5036
5174 case TOK_DQUOTE: 5037 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5038 x = readstrexp (SCHEME_A_ '"');
5176 5039
5177 if (x == S_F) 5040 if (x == S_F)
5178 Error_0 ("Error reading string"); 5041 Error_0 ("Error reading string");
5179 5042
5180 setimmutable (x); 5043 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 5055 s_goto (OP_EVAL);
5193 } 5056 }
5194 } 5057 }
5195 5058
5196 case TOK_SHARP_CONST: 5059 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5061 Error_0 ("undefined sharp expression");
5199 else 5062 else
5200 s_return (x); 5063 s_return (x);
5201 5064
5202 default: 5065 default:
… …
5204 } 5067 }
5205 5068
5206 break; 5069 break;
5207 5070
5208 case OP_RDLIST: 5071 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5072 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5073 SCHEME_V->tok = token (SCHEME_A);
5211 5074
5212 switch (SCHEME_V->tok) 5075 switch (SCHEME_V->tok)
5213 { 5076 {
5214 case TOK_EOF: 5077 case TOK_EOF:
… …
5242 case OP_RDDOT: 5105 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5106 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5107 Error_0 ("syntax error: illegal dot expression");
5245 5108
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5109 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5110 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5111
5249 case OP_RDQUOTE: 5112 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5113 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5114
5252 case OP_RDQQUOTE: 5115 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5137 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5138 s_goto (OP_VECTOR);
5276 5139
5277 /* ========== printing part ========== */ 5140 /* ========== printing part ========== */
5278 case OP_P0LIST: 5141 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5142 if (is_vector (args))
5280 { 5143 {
5281 putstr (SCHEME_A_ "#("); 5144 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5145 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5146 s_goto (OP_PVECFROM);
5284 } 5147 }
5285 else if (is_environment (SCHEME_V->args)) 5148 else if (is_environment (args))
5286 { 5149 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5150 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5151 s_return (S_T);
5289 } 5152 }
5290 else if (!is_pair (SCHEME_V->args)) 5153 else if (!is_pair (args))
5291 { 5154 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5155 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5156 s_return (S_T);
5294 } 5157 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5158 else
5296 { 5159 {
5160 pointer a = car (args);
5161 pointer b = cdr (args);
5162 int ok_abbr = ok_abbrev (b);
5163 SCHEME_V->args = car (b);
5164
5165 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5166 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5167 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ "`");
5169 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5170 putstr (SCHEME_A_ ",");
5171 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5172 putstr (SCHEME_A_ ",@");
5173 else
5174 {
5175 putstr (SCHEME_A_ "(");
5176 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5177 SCHEME_V->args = a;
5178 }
5179
5299 s_goto (OP_P0LIST); 5180 s_goto (OP_P0LIST);
5300 } 5181 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5182
5183 case OP_P1LIST:
5184 if (is_pair (args))
5302 { 5185 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5187 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5188 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5189 s_goto (OP_P0LIST);
5306 } 5190 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5191 else if (is_vector (args))
5336 { 5192 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5193 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5194 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5195 s_goto (OP_P0LIST);
5340 } 5196 }
5341 else 5197 else
5342 { 5198 {
5343 if (SCHEME_V->args != NIL) 5199 if (args != NIL)
5344 { 5200 {
5345 putstr (SCHEME_A_ " . "); 5201 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5203 }
5348 5204
5349 putstr (SCHEME_A_ ")"); 5205 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5206 s_return (S_T);
5351 } 5207 }
5352 5208
5353 case OP_PVECFROM: 5209 case OP_PVECFROM:
5354 { 5210 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5211 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5212 pointer vec = car (args);
5357 int len = veclength (vec); 5213 int len = veclength (vec);
5358 5214
5359 if (i == len) 5215 if (i == len)
5360 { 5216 {
5361 putstr (SCHEME_A_ ")"); 5217 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5218 s_return (S_T);
5363 } 5219 }
5364 else 5220 else
5365 { 5221 {
5366 pointer elem = vector_elem (vec, i); 5222 pointer elem = vector_get (vec, i);
5367 5223
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5224 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5226 SCHEME_V->args = elem;
5371 5227
5372 if (i > 0) 5228 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5229 putstr (SCHEME_A_ " ");
5374 5230
5375 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5376 } 5232 }
5377 } 5233 }
5378 } 5234 }
5379 5235
5380 return S_T; 5236 if (USE_ERROR_CHECKING) abort ();
5381} 5237}
5382 5238
5383static pointer 5239static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5240opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5241{
5242 pointer args = SCHEME_V->args;
5243 pointer a = car (args);
5386 pointer x, y; 5244 pointer x, y;
5387 5245
5388 switch (op) 5246 switch (op)
5389 { 5247 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5248 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5249 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5250 long v = list_length (SCHEME_A_ a);
5393 5251
5394 if (v < 0) 5252 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5253 Error_1 ("length: not a list:", a);
5396 5254
5397 s_return (mk_integer (SCHEME_A_ v)); 5255 s_return (mk_integer (SCHEME_A_ v));
5398 } 5256 }
5399 5257
5400 case OP_ASSQ: /* assq *//* a.k */ 5258 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5259 x = a;
5402 5260
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5261 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5262 {
5405 if (!is_pair (car (y))) 5263 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5264 Error_0 ("unable to handle non pair element");
5407 5265
5408 if (x == caar (y)) 5266 if (x == caar (y))
… …
5414 else 5272 else
5415 s_return (S_F); 5273 s_return (S_F);
5416 5274
5417 5275
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5277 SCHEME_V->args = a;
5420 5278
5421 if (SCHEME_V->args == NIL) 5279 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5280 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5281 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5429 5287
5430 case OP_CLOSUREP: /* closure? */ 5288 case OP_CLOSUREP: /* closure? */
5431 /* 5289 /*
5432 * Note, macro object is also a closure. 5290 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5291 * Therefore, (closure? <#MACRO>) ==> #t
5292 * (schmorp) well, obviously not, fix? TODO
5434 */ 5293 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5294 s_retbool (is_closure (a));
5436 5295
5437 case OP_MACROP: /* macro? */ 5296 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5297 s_retbool (is_macro (a));
5439 } 5298 }
5440 5299
5441 return S_T; /* NOTREACHED */ 5300 if (USE_ERROR_CHECKING) abort ();
5442} 5301}
5443 5302
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5305
5446typedef int (*test_predicate) (pointer); 5306typedef int (*test_predicate)(pointer);
5447static int 5307static int
5448is_any (pointer p) 5308tst_any (pointer p)
5449{ 5309{
5450 return 1; 5310 return 1;
5451} 5311}
5452 5312
5453static int 5313static int
5454is_nonneg (pointer p) 5314tst_inonneg (pointer p)
5455{ 5315{
5456 return ivalue (p) >= 0 && is_integer (p); 5316 return is_integer (p) && ivalue_unchecked (p) >= 0;
5317}
5318
5319static int
5320tst_is_list (SCHEME_P_ pointer p)
5321{
5322 return p == NIL || is_pair (p);
5457} 5323}
5458 5324
5459/* Correspond carefully with following defines! */ 5325/* Correspond carefully with following defines! */
5460static struct 5326static struct
5461{ 5327{
5462 test_predicate fct; 5328 test_predicate fct;
5463 const char *kind; 5329 const char *kind;
5464} tests[] = 5330} tests[] = {
5465{ 5331 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5332 { is_string , "string" },
5467 { is_any, 0}, 5333 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5334 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5335 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5336 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5337 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5338 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5339 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5340 { is_character , "character" },
5477 { is_vector, "vector" }, 5341 { is_vector , "vector" },
5478 { is_number, "number" }, 5342 { is_number , "number" },
5479 { is_integer, "integer" }, 5343 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5344 { tst_inonneg , "non-negative integer" }
5481}; 5345};
5482 5346
5483#define TST_NONE 0 5347#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5348#define TST_ANY "\001"
5485#define TST_STRING "\002" 5349#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5350#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5351#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5352#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5353#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5354#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5355#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5356#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5357#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5358#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5359#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5360#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5361#define TST_NATURAL "\016"
5362
5363#define INF_ARG 0xff
5364#define UNNAMED_OP ""
5365
5366static const char opnames[] =
5367#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5368#include "opdefines.h"
5369#undef OP_DEF
5370;
5371
5372static const char *
5373opname (int idx)
5374{
5375 const char *name = opnames;
5376
5377 /* should do this at compile time, but would require external program, right? */
5378 while (idx--)
5379 name += strlen (name) + 1;
5380
5381 return *name ? name : "ILLEGAL";
5382}
5383
5384static const char *
5385procname (pointer x)
5386{
5387 return opname (procnum (x));
5388}
5498 5389
5499typedef struct 5390typedef struct
5500{ 5391{
5501 dispatch_func func; 5392 uint8_t func;
5502 char *name; 5393 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5394 uint8_t builtin;
5395#if USE_ERROR_CHECKING
5503 int min_arity; 5396 uint8_t min_arity;
5504 int max_arity; 5397 uint8_t max_arity;
5505 char *arg_tests_encoding; 5398 char arg_tests_encoding[3];
5399#endif
5506} op_code_info; 5400} op_code_info;
5507 5401
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5402static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5403#if USE_ERROR_CHECKING
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5405#else
5406#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5407#endif
5512#include "opdefines.h" 5408#include "opdefines.h"
5409#undef OP_DEF
5513 {0} 5410 {0}
5514}; 5411};
5515 5412
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5413/* kernel of this interpreter */
5529static void 5414static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5416{
5532 SCHEME_V->op = op; 5417 SCHEME_V->op = op;
5533 5418
5534 for (;;) 5419 for (;;)
5535 { 5420 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5421 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5422
5538#if USE_ERROR_CHECKING 5423#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5424 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5425 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5426 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5427 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5428
5545 /* Check number of arguments */ 5429 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5430 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5431 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5432 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5433 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5434 xError_1 (SCHEME_A_ msg, 0);
5435 continue;
5551 } 5436 }
5552 5437 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5438 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5439 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5440 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5441 xError_1 (SCHEME_A_ msg, 0);
5442 continue;
5558 } 5443 }
5559 5444 else
5560 if (ok)
5561 { 5445 {
5562 if (pcd->arg_tests_encoding) 5446 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5447 {
5564 int i = 0; 5448 int i = 0;
5565 int j; 5449 int j;
5566 const char *t = pcd->arg_tests_encoding; 5450 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5451 pointer arglist = SCHEME_V->args;
5568 5452
5569 do 5453 do
5570 { 5454 {
5571 pointer arg = car (arglist); 5455 pointer arg = car (arglist);
5572 5456
5573 j = (int) t[0]; 5457 j = t[0];
5574 5458
5459 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5460 if (j == TST_LIST[0])
5576 { 5461 {
5577 if (arg != NIL && !is_pair (arg)) 5462 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5463 break;
5579 } 5464 }
5580 else 5465 else
5581 { 5466 {
5582 if (!tests[j].fct (arg)) 5467 if (!tests[j - 1].fct (arg))
5583 break; 5468 break;
5584 } 5469 }
5585 5470
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5471 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5472 t++;
5588 5473
5589 arglist = cdr (arglist); 5474 arglist = cdr (arglist);
5590 i++; 5475 i++;
5591 } 5476 }
5592 while (i < n); 5477 while (i < n);
5593 5478
5594 if (i < n) 5479 if (i < n)
5595 { 5480 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5481 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5482 xError_1 (SCHEME_A_ msg, 0);
5483 continue;
5598 } 5484 }
5599 } 5485 }
5600 } 5486 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5487 }
5610#endif 5488#endif
5611 5489
5612 ok_to_freely_gc (SCHEME_A); 5490 ok_to_freely_gc (SCHEME_A);
5613 5491
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5492 static const dispatch_func dispatch_funcs[] = {
5493 opexe_0,
5494 opexe_1,
5495 opexe_2,
5496 opexe_3,
5497 opexe_4,
5498 opexe_5,
5499 opexe_6,
5500 };
5501
5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5503 return;
5616 5504
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5506 {
5619 xwrstr ("No memory!\n"); 5507 putstr (SCHEME_A_ "No memory!\n");
5620 return; 5508 return;
5621 } 5509 }
5622 } 5510 }
5623} 5511}
5624 5512
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5531mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5532{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5533 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5534 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5535 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5536 return y;
5650} 5537}
5651 5538
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5540static int
5654syntaxnum (pointer p) 5541syntaxnum (pointer p)
5655{ 5542{
5656 const char *s = strvalue (car (p)); 5543 const char *s = strvalue (p);
5657 5544
5658 switch (strlength (car (p))) 5545 switch (strlength (p))
5659 { 5546 {
5660 case 2: 5547 case 2:
5661 if (s[0] == 'i') 5548 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5549 return OP_IF0; /* if */
5663 else 5550 else
… …
5677 5564
5678 case 'd': 5565 case 'd':
5679 return OP_COND0; /* cond */ 5566 return OP_COND0; /* cond */
5680 5567
5681 case '*': 5568 case '*':
5682 return OP_LET0AST; /* let* */ 5569 return OP_LET0AST;/* let* */
5683 5570
5684 default: 5571 default:
5685 return OP_SET0; /* set! */ 5572 return OP_SET0; /* set! */
5686 } 5573 }
5687 5574
… …
5709 5596
5710 case 'f': 5597 case 'f':
5711 return OP_DEF0; /* define */ 5598 return OP_DEF0; /* define */
5712 5599
5713 default: 5600 default:
5714 return OP_LET0REC; /* letrec */ 5601 return OP_LET0REC;/* letrec */
5715 } 5602 }
5716 5603
5717 default: 5604 default:
5718 return OP_C0STREAM; /* cons-stream */ 5605 return OP_C0STREAM; /* cons-stream */
5719 } 5606 }
5720} 5607}
5721 5608
5722#if USE_MULTIPLICITY 5609#if USE_MULTIPLICITY
5723scheme * 5610ecb_cold scheme *
5724scheme_init_new () 5611scheme_init_new ()
5725{ 5612{
5726 scheme *sc = malloc (sizeof (scheme)); 5613 scheme *sc = malloc (sizeof (scheme));
5727 5614
5728 if (!scheme_init (SCHEME_A)) 5615 if (!scheme_init (SCHEME_A))
… …
5733 else 5620 else
5734 return sc; 5621 return sc;
5735} 5622}
5736#endif 5623#endif
5737 5624
5738int 5625ecb_cold int
5739scheme_init (SCHEME_P) 5626scheme_init (SCHEME_P)
5740{ 5627{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5629 pointer x;
5630
5631 /* this memset is not strictly correct, as we assume (intcache)
5632 * that memset 0 will also set pointers to 0, but memset does
5633 * of course not guarantee that. screw such systems.
5634 */
5635 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5743 5636
5744 num_set_fixnum (num_zero, 1); 5637 num_set_fixnum (num_zero, 1);
5745 num_set_ivalue (num_zero, 0); 5638 num_set_ivalue (num_zero, 0);
5746 num_set_fixnum (num_one, 1); 5639 num_set_fixnum (num_one, 1);
5747 num_set_ivalue (num_one, 1); 5640 num_set_ivalue (num_one, 1);
… …
5759 SCHEME_V->save_inport = NIL; 5652 SCHEME_V->save_inport = NIL;
5760 SCHEME_V->loadport = NIL; 5653 SCHEME_V->loadport = NIL;
5761 SCHEME_V->nesting = 0; 5654 SCHEME_V->nesting = 0;
5762 SCHEME_V->interactive_repl = 0; 5655 SCHEME_V->interactive_repl = 0;
5763 5656
5764 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5657 if (!alloc_cellseg (SCHEME_A))
5765 { 5658 {
5766#if USE_ERROR_CHECKING 5659#if USE_ERROR_CHECKING
5767 SCHEME_V->no_memory = 1; 5660 SCHEME_V->no_memory = 1;
5768 return 0; 5661 return 0;
5769#endif 5662#endif
… …
5816 5709
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5710 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5711 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5712 }
5820 5713
5714 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5715 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5716 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5717 assign_proc (SCHEME_A_ i, opname (i));
5824 5718
5825 /* initialization of global pointers to special symbols */ 5719 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5720 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5721 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5722 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5761scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5762{
5869 SCHEME_V->ext_data = p; 5763 SCHEME_V->ext_data = p;
5870} 5764}
5871 5765
5872void 5766ecb_cold void
5873scheme_deinit (SCHEME_P) 5767scheme_deinit (SCHEME_P)
5874{ 5768{
5875 int i; 5769 int i;
5876 5770
5877#if SHOW_ERROR_LINE 5771#if SHOW_ERROR_LINE
… …
5969{ 5863{
5970 dump_stack_reset (SCHEME_A); 5864 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5865 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5866 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5867 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5868 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5869 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5870 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5871#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5872 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5873#endif
5980 SCHEME_V->retcode = 0; 5874 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5875 SCHEME_V->interactive_repl = 0;
… …
6098# endif 5992# endif
6099 int fin; 5993 int fin;
6100 char *file_name = InitFile; 5994 char *file_name = InitFile;
6101 int retcode; 5995 int retcode;
6102 int isfile = 1; 5996 int isfile = 1;
5997 system ("ps v $PPID");//D
6103 5998
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5999 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 6000 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 6001 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6002 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6108 xwrstr ("followed by\n"); 6003 putstr (SCHEME_A_ "followed by\n");
6109 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6004 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6110 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6005 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6111 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6006 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6112 xwrstr ("Use - as filename for stdin.\n"); 6007 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6113 return 1; 6008 return 1;
6114 } 6009 }
6115 6010
6116 if (!scheme_init (SCHEME_A)) 6011 if (!scheme_init (SCHEME_A))
6117 { 6012 {
6118 xwrstr ("Could not initialize!\n"); 6013 putstr (SCHEME_A_ "Could not initialize!\n");
6119 return 2; 6014 return 2;
6120 } 6015 }
6121 6016
6122# if USE_PORTS 6017# if USE_PORTS
6123 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6018 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6168 fin = open (file_name, O_RDONLY); 6063 fin = open (file_name, O_RDONLY);
6169#endif 6064#endif
6170 6065
6171 if (isfile && fin < 0) 6066 if (isfile && fin < 0)
6172 { 6067 {
6173 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6068 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6174 } 6069 }
6175 else 6070 else
6176 { 6071 {
6177 if (isfile) 6072 if (isfile)
6178 scheme_load_named_file (SCHEME_A_ fin, file_name); 6073 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6182#if USE_PORTS 6077#if USE_PORTS
6183 if (!isfile || fin != STDIN_FILENO) 6078 if (!isfile || fin != STDIN_FILENO)
6184 { 6079 {
6185 if (SCHEME_V->retcode != 0) 6080 if (SCHEME_V->retcode != 0)
6186 { 6081 {
6187 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6082 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6188 } 6083 }
6189 6084
6190 if (isfile) 6085 if (isfile)
6191 close (fin); 6086 close (fin);
6192 } 6087 }

Diff Legend

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