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

Diff Legend

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