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.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.51 by root, Tue Dec 1 01:54:27 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
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 24#include "malloc.c"
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
… …
28#endif 30#endif
29#if USE_MATH 31#if USE_MATH
30# include <math.h> 32# include <math.h>
31#endif 33#endif
32 34
35#include "ecb.h"
36
33#include <sys/types.h> 37#include <sys/types.h>
34#include <sys/stat.h> 38#include <sys/stat.h>
35#include <fcntl.h> 39#include <fcntl.h>
36 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
37#include <string.h> 47#include <string.h>
38#include <stdlib.h>
39 48
40#include <limits.h> 49#include <limits.h>
41#include <inttypes.h> 50#include <inttypes.h>
42#include <float.h> 51#include <float.h>
43//#include <ctype.h> 52//#include <ctype.h>
53
54#if '1' != '0' + 1 \
55 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
56 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
57 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
58 || 'f' != 'a' + 5
59# error "execution character set digits not consecutive"
60#endif
44 61
45enum { 62enum {
46 TOK_EOF, 63 TOK_EOF,
47 TOK_LPAREN, 64 TOK_LPAREN,
48 TOK_RPAREN, 65 TOK_RPAREN,
49 TOK_DOT, 66 TOK_DOT,
50 TOK_ATOM, 67 TOK_ATOM,
68 TOK_DOTATOM, /* atom name starting with '.' */
69 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 70 TOK_QUOTE,
52 TOK_DQUOTE, 71 TOK_DQUOTE,
53 TOK_BQUOTE, 72 TOK_BQUOTE,
54 TOK_COMMA, 73 TOK_COMMA,
55 TOK_ATMARK, 74 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 76 TOK_SHARP_CONST,
58 TOK_VEC 77 TOK_VEC
59}; 78};
60 79
61#define BACKQUOTE '`' 80#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 81#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE
63 83
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 88#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 89
77#if !USE_MULTIPLICITY 90#if !USE_MULTIPLICITY
78static scheme sc; 91static scheme sc;
79#endif 92#endif
80 93
… …
150 163
151#define toupper(c) xtoupper (c) 164#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 165#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 166#define isdigit(c) xisdigit (c)
154 167
155#if USE_STRLWR 168#if USE_IGNORECASE
156static const char * 169static const char *
157strlwr (char *s) 170xstrlwr (char *s)
158{ 171{
159 const char *p = s; 172 const char *p = s;
160 173
161 while (*s) 174 while (*s)
162 { 175 {
… …
164 s++; 177 s++;
165 } 178 }
166 179
167 return p; 180 return p;
168} 181}
169#endif
170 182
183#define stricmp(a,b) strcasecmp (a, b)
184#define strlwr(s) xstrlwr (s)
185
186#else
171#define stricmp(a,b) strcmp (a, b) 187# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 188# define strlwr(s) (s)
189#endif
173 190
174#ifndef prompt 191#ifndef prompt
175# define prompt "ts> " 192# define prompt "ts> "
176#endif 193#endif
177 194
178#ifndef InitFile 195#ifndef InitFile
179# define InitFile "init.scm" 196# define InitFile "init.scm"
180#endif 197#endif
181 198
182#ifndef FIRST_CELLSEGS
183# define FIRST_CELLSEGS 3
184#endif
185
186enum scheme_types 199enum scheme_types
187{ 200{
201 T_INTEGER,
188 T_FREE, 202 T_REAL,
189 T_STRING, 203 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 204 T_SYMBOL,
192 T_PROC, 205 T_PROC,
193 T_PAIR, 206 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 207 T_CLOSURE,
195 T_CONTINUATION, 208 T_CONTINUATION,
196 T_FOREIGN, 209 T_FOREIGN,
197 T_CHARACTER, 210 T_CHARACTER,
198 T_PORT, 211 T_PORT,
… …
208#define T_SYNTAX 0x0010 221#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 222#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 223#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 224#define T_MARK 0x0080 /* only for gc */
212 225
213static num num_add (num a, num b); 226/* num, for generic arithmetic */
214static num num_mul (num a, num b); 227struct num
215static num num_div (num a, num b); 228{
229 IVALUE ivalue;
230#if USE_REAL
231 RVALUE rvalue;
232 char is_fixnum;
233#endif
234};
235
236#if USE_REAL
237# define num_is_fixnum(n) (n).is_fixnum
238# define num_set_fixnum(n,f) (n).is_fixnum = (f)
239# define num_ivalue(n) (n).ivalue
240# define num_rvalue(n) (n).rvalue
241# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
242# define num_set_rvalue(n,r) (n).rvalue = (r)
243#else
244# define num_is_fixnum(n) 1
245# define num_set_fixnum(n,f) 0
246# define num_ivalue(n) (n).ivalue
247# define num_rvalue(n) (n).ivalue
248# define num_set_ivalue(n,i) (n).ivalue = (i)
249# define num_set_rvalue(n,r) (n).ivalue = (r)
250#endif
251
252enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
253
254static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 255static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 256static num num_rem (num a, num b);
219static num num_mod (num a, num b); 257static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 258
226#if USE_MATH 259#if USE_MATH
227static double round_per_R5RS (double x); 260static double round_per_R5RS (double x);
228#endif 261#endif
229static int is_zero_rvalue (RVALUE x); 262static int is_zero_rvalue (RVALUE x);
230 263
231static INLINE int
232num_is_integer (pointer p)
233{
234 return num_is_fixnum (p->object.number);
235}
236
237static num num_zero; 264static num num_zero;
238static num num_one; 265static num num_one;
239 266
267/* convert "pointer" to cell* / cell* to pointer */
268#define CELL(p) ((struct cell *)(p) + 0)
269#define POINTER(c) ((void *)((c) - 0))
270
240/* macros for cell operations */ 271/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 272#define typeflag(p) (CELL(p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 273#define set_typeflag(p,v) (CELL(p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 274#define type(p) (typeflag (p) & T_MASKTYPE)
244 275
245INTERFACE INLINE int 276INTERFACE int
246is_string (pointer p) 277is_string (pointer p)
247{ 278{
248 return type (p) == T_STRING; 279 return type (p) == T_STRING;
249} 280}
250 281
251#define strvalue(p) ((p)->object.string.svalue) 282#define strvalue(p) (CELL(p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 283#define strlength(p) (CELL(p)->object.string.length)
253 284
254INTERFACE int is_list (SCHEME_P_ pointer p);
255INTERFACE INLINE int 285INTERFACE int
256is_vector (pointer p) 286is_vector (pointer p)
257{ 287{
258 return type (p) == T_VECTOR; 288 return type (p) == T_VECTOR;
259} 289}
260 290
261#define vecvalue(p) ((p)->object.vector.vvalue) 291#define vecvalue(p) (CELL(p)->object.vector.vvalue)
262#define veclength(p) ((p)->object.vector.length) 292#define veclength(p) (CELL(p)->object.vector.length)
263INTERFACE void fill_vector (pointer vec, pointer obj); 293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
264INTERFACE uint32_t vector_length (pointer vec);
265INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 294INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
266INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
267 296
268INTERFACE uint32_t 297INTERFACE int
269vector_length (pointer vec) 298is_integer (pointer p)
270{ 299{
271 return vec->object.vector.length; 300 return type (p) == T_INTEGER;
272} 301}
273 302
303/* not the same as in scheme, where integers are (correctly :) reals */
274INTERFACE INLINE int 304INTERFACE int
305is_real (pointer p)
306{
307 return type (p) == T_REAL;
308}
309
310INTERFACE int
275is_number (pointer p) 311is_number (pointer p)
276{ 312{
277 return type (p) == T_NUMBER; 313 return is_integer (p) || is_real (p);
278} 314}
279 315
280INTERFACE INLINE int 316INTERFACE int
281is_integer (pointer p)
282{
283 if (!is_number (p))
284 return 0;
285
286 if (num_is_integer (p) || ivalue (p) == rvalue (p))
287 return 1;
288
289 return 0;
290}
291
292INTERFACE INLINE int
293is_real (pointer p)
294{
295 return is_number (p) && !num_is_fixnum (p->object.number);
296}
297
298INTERFACE INLINE int
299is_character (pointer p) 317is_character (pointer p)
300{ 318{
301 return type (p) == T_CHARACTER; 319 return type (p) == T_CHARACTER;
302} 320}
303 321
304INTERFACE INLINE char * 322INTERFACE char *
305string_value (pointer p) 323string_value (pointer p)
306{ 324{
307 return strvalue (p); 325 return strvalue (p);
308} 326}
309 327
310INLINE num
311nvalue (pointer p)
312{
313 return (p)->object.number;
314}
315
316static IVALUE
317num_get_ivalue (const num n)
318{
319 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
320}
321
322static RVALUE
323num_get_rvalue (const num n)
324{
325 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
326}
327
328INTERFACE IVALUE
329ivalue (pointer p)
330{
331 return num_get_ivalue (p->object.number);
332}
333
334INTERFACE RVALUE
335rvalue (pointer p)
336{
337 return num_get_rvalue (p->object.number);
338}
339
340#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define ivalue_unchecked(p) CELL(p)->object.ivalue
329#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
330
341#if USE_REAL 331#if USE_REAL
342# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 332#define rvalue_unchecked(p) CELL(p)->object.rvalue
343# define set_num_integer(p) (p)->object.number.is_fixnum=1; 333#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
344# define set_num_real(p) (p)->object.number.is_fixnum=0;
345#else 334#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 335#define rvalue_unchecked(p) CELL(p)->object.ivalue
347# define set_num_integer(p) 0 336#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
348# define set_num_real(p) 0
349#endif 337#endif
338
350INTERFACE long 339INTERFACE long
351charvalue (pointer p) 340charvalue (pointer p)
352{ 341{
353 return ivalue_unchecked (p); 342 return ivalue_unchecked (p);
354} 343}
355 344
345#define port(p) CELL(p)->object.port
346#define set_port(p,v) port(p) = (v)
356INTERFACE INLINE int 347INTERFACE int
357is_port (pointer p) 348is_port (pointer p)
358{ 349{
359 return type (p) == T_PORT; 350 return type (p) == T_PORT;
360} 351}
361 352
362INTERFACE INLINE int 353INTERFACE int
363is_inport (pointer p) 354is_inport (pointer p)
364{ 355{
365 return is_port (p) && p->object.port->kind & port_input; 356 return is_port (p) && port (p)->kind & port_input;
366} 357}
367 358
368INTERFACE INLINE int 359INTERFACE int
369is_outport (pointer p) 360is_outport (pointer p)
370{ 361{
371 return is_port (p) && p->object.port->kind & port_output; 362 return is_port (p) && port (p)->kind & port_output;
372} 363}
373 364
374INTERFACE INLINE int 365INTERFACE int
375is_pair (pointer p) 366is_pair (pointer p)
376{ 367{
377 return type (p) == T_PAIR; 368 return type (p) == T_PAIR;
378} 369}
379 370
380#define car(p) ((p)->object.cons.car + 0) 371#define car(p) (POINTER (CELL(p)->object.cons.car))
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 372#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
382 373
383#define caar(p) car (car (p)) 374static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 375static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 376static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 377static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 378
388#define cadar(p) car (cdr (car (p))) 379static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 380static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 381static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 382
392INTERFACE void 383INTERFACE void
393set_car (pointer p, pointer q) 384set_car (pointer p, pointer q)
394{ 385{
395 p->object.cons.car = q; 386 CELL(p)->object.cons.car = CELL (q);
396} 387}
397 388
398INTERFACE void 389INTERFACE void
399set_cdr (pointer p, pointer q) 390set_cdr (pointer p, pointer q)
400{ 391{
401 p->object.cons.cdr = q; 392 CELL(p)->object.cons.cdr = CELL (q);
402} 393}
403 394
404INTERFACE pointer 395INTERFACE pointer
405pair_car (pointer p) 396pair_car (pointer p)
406{ 397{
… …
411pair_cdr (pointer p) 402pair_cdr (pointer p)
412{ 403{
413 return cdr (p); 404 return cdr (p);
414} 405}
415 406
416INTERFACE INLINE int 407INTERFACE int
417is_symbol (pointer p) 408is_symbol (pointer p)
418{ 409{
419 return type (p) == T_SYMBOL; 410 return type (p) == T_SYMBOL;
420} 411}
421 412
422INTERFACE INLINE char * 413INTERFACE char *
423symname (pointer p) 414symname (pointer p)
424{ 415{
425 return strvalue (car (p)); 416 return strvalue (p);
426} 417}
427 418
428#if USE_PLIST 419#if USE_PLIST
420#error plists are broken because symbols are no longer pairs
421#define symprop(p) cdr(p)
429SCHEME_EXPORT INLINE int 422SCHEME_EXPORT int
430hasprop (pointer p) 423hasprop (pointer p)
431{ 424{
432 return typeflag (p) & T_SYMBOL; 425 return typeflag (p) & T_SYMBOL;
433} 426}
434
435# define symprop(p) cdr(p)
436#endif 427#endif
437 428
438INTERFACE INLINE int 429INTERFACE int
439is_syntax (pointer p) 430is_syntax (pointer p)
440{ 431{
441 return typeflag (p) & T_SYNTAX; 432 return typeflag (p) & T_SYNTAX;
442} 433}
443 434
444INTERFACE INLINE int 435INTERFACE int
445is_proc (pointer p) 436is_proc (pointer p)
446{ 437{
447 return type (p) == T_PROC; 438 return type (p) == T_PROC;
448} 439}
449 440
450INTERFACE INLINE int 441INTERFACE int
451is_foreign (pointer p) 442is_foreign (pointer p)
452{ 443{
453 return type (p) == T_FOREIGN; 444 return type (p) == T_FOREIGN;
454} 445}
455 446
456INTERFACE INLINE char * 447INTERFACE char *
457syntaxname (pointer p) 448syntaxname (pointer p)
458{ 449{
459 return strvalue (car (p)); 450 return strvalue (p);
460} 451}
461 452
462#define procnum(p) ivalue (p) 453#define procnum(p) ivalue_unchecked (p)
463static const char *procname (pointer x); 454static const char *procname (pointer x);
464 455
465INTERFACE INLINE int 456INTERFACE int
466is_closure (pointer p) 457is_closure (pointer p)
467{ 458{
468 return type (p) == T_CLOSURE; 459 return type (p) == T_CLOSURE;
469} 460}
470 461
471INTERFACE INLINE int 462INTERFACE int
472is_macro (pointer p) 463is_macro (pointer p)
473{ 464{
474 return type (p) == T_MACRO; 465 return type (p) == T_MACRO;
475} 466}
476 467
477INTERFACE INLINE pointer 468INTERFACE pointer
478closure_code (pointer p) 469closure_code (pointer p)
479{ 470{
480 return car (p); 471 return car (p);
481} 472}
482 473
483INTERFACE INLINE pointer 474INTERFACE pointer
484closure_env (pointer p) 475closure_env (pointer p)
485{ 476{
486 return cdr (p); 477 return cdr (p);
487} 478}
488 479
489INTERFACE INLINE int 480INTERFACE int
490is_continuation (pointer p) 481is_continuation (pointer p)
491{ 482{
492 return type (p) == T_CONTINUATION; 483 return type (p) == T_CONTINUATION;
493} 484}
494 485
495#define cont_dump(p) cdr (p) 486#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 487#define set_cont_dump(p,v) set_cdr ((p), (v))
497 488
498/* To do: promise should be forced ONCE only */ 489/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 490INTERFACE int
500is_promise (pointer p) 491is_promise (pointer p)
501{ 492{
502 return type (p) == T_PROMISE; 493 return type (p) == T_PROMISE;
503} 494}
504 495
505INTERFACE INLINE int 496INTERFACE int
506is_environment (pointer p) 497is_environment (pointer p)
507{ 498{
508 return type (p) == T_ENVIRONMENT; 499 return type (p) == T_ENVIRONMENT;
509} 500}
510 501
… …
516 507
517#define is_mark(p) (typeflag (p) & T_MARK) 508#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 509#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 510#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 511
521INTERFACE INLINE int 512INTERFACE int
522is_immutable (pointer p) 513is_immutable (pointer p)
523{ 514{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 515 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 516}
526 517
527INTERFACE INLINE void 518INTERFACE void
528setimmutable (pointer p) 519setimmutable (pointer p)
529{ 520{
530#if USE_ERROR_CHECKING 521#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 522 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 523#endif
533} 524}
534 525
526/* Result is:
527 proper list: length
528 circular list: -1
529 not even a pair: -2
530 dotted list: -2 minus length before dot
531*/
532INTERFACE int
533list_length (SCHEME_P_ pointer a)
534{
535 int i = 0;
536 pointer slow, fast;
537
538 slow = fast = a;
539
540 while (1)
541 {
542 if (fast == NIL)
543 return i;
544
545 if (!is_pair (fast))
546 return -2 - i;
547
548 fast = cdr (fast);
549 ++i;
550
551 if (fast == NIL)
552 return i;
553
554 if (!is_pair (fast))
555 return -2 - i;
556
557 ++i;
558 fast = cdr (fast);
559
560 /* Safe because we would have already returned if `fast'
561 encountered a non-pair. */
562 slow = cdr (slow);
563
564 if (fast == slow)
565 {
566 /* the fast pointer has looped back around and caught up
567 with the slow pointer, hence the structure is circular,
568 not of finite length, and therefore not a list */
569 return -1;
570 }
571 }
572}
573
574INTERFACE int
575is_list (SCHEME_P_ pointer a)
576{
577 return list_length (SCHEME_A_ a) >= 0;
578}
579
535#if USE_CHAR_CLASSIFIERS 580#if USE_CHAR_CLASSIFIERS
536static INLINE int 581ecb_inline int
537Cisalpha (int c) 582Cisalpha (int c)
538{ 583{
539 return isascii (c) && isalpha (c); 584 return isascii (c) && isalpha (c);
540} 585}
541 586
542static INLINE int 587ecb_inline int
543Cisdigit (int c) 588Cisdigit (int c)
544{ 589{
545 return isascii (c) && isdigit (c); 590 return isascii (c) && isdigit (c);
546} 591}
547 592
548static INLINE int 593ecb_inline int
549Cisspace (int c) 594Cisspace (int c)
550{ 595{
551 return isascii (c) && isspace (c); 596 return isascii (c) && isspace (c);
552} 597}
553 598
554static INLINE int 599ecb_inline int
555Cisupper (int c) 600Cisupper (int c)
556{ 601{
557 return isascii (c) && isupper (c); 602 return isascii (c) && isupper (c);
558} 603}
559 604
560static INLINE int 605ecb_inline int
561Cislower (int c) 606Cislower (int c)
562{ 607{
563 return isascii (c) && islower (c); 608 return isascii (c) && islower (c);
564} 609}
565#endif 610#endif
… …
626#endif 671#endif
627 672
628static int file_push (SCHEME_P_ const char *fname); 673static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 674static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 675static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 676ecb_inline int is_one_of (const char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 677static int alloc_cellseg (SCHEME_P);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 678ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 679static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 680static int count_consecutive_cells (pointer x, int needed);
636static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 681static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
637static pointer mk_number (SCHEME_P_ const num n); 682static pointer mk_number (SCHEME_P_ const num n);
638static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 683static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
653static void mark (pointer a); 698static void mark (pointer a);
654static void gc (SCHEME_P_ pointer a, pointer b); 699static void gc (SCHEME_P_ pointer a, pointer b);
655static int basic_inchar (port *pt); 700static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 701static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 702static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 703static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
659static pointer readstrexp (SCHEME_P); 704static pointer readstrexp (SCHEME_P_ char delim);
660static INLINE int skipspace (SCHEME_P); 705ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 706static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 707static void printslashstring (SCHEME_P_ char *s, int len);
663static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 708static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
664static void printatom (SCHEME_P_ pointer l, int f); 709static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 710static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 714static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 715static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 716static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 717static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 718static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
720static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 722static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 724static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 725static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 726static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 727static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 728static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 729static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 730
731static IVALUE
732ivalue (pointer x)
733{
734 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
735}
736
737static RVALUE
738rvalue (pointer x)
739{
740 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
741}
742
743INTERFACE num
744nvalue (pointer x)
745{
746 num n;
747
748 num_set_fixnum (n, is_integer (x));
749
750 if (num_is_fixnum (n))
751 num_set_ivalue (n, ivalue_unchecked (x));
752 else
753 num_set_rvalue (n, rvalue_unchecked (x));
754
755 return n;
756}
757
685static num 758static num
686num_add (num a, num b) 759num_op (enum num_op op, num a, num b)
687{ 760{
688 num ret; 761 num ret;
689 762
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 763 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
691 764
692 if (num_is_fixnum (ret)) 765 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 766 {
767 switch (op)
768 {
769 case NUM_ADD: a.ivalue += b.ivalue; break;
770 case NUM_SUB: a.ivalue -= b.ivalue; break;
771 case NUM_MUL: a.ivalue *= b.ivalue; break;
772 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
773 }
774
775 num_set_ivalue (ret, a.ivalue);
776 }
777#if USE_REAL
694 else 778 else
695 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 779 {
780 switch (op)
781 {
782 case NUM_ADD: a.rvalue += b.rvalue; break;
783 case NUM_SUB: a.rvalue -= b.rvalue; break;
784 case NUM_MUL: a.rvalue *= b.rvalue; break;
785 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
786 }
696 787
697 return ret; 788 num_set_rvalue (ret, a.rvalue);
698} 789 }
699 790#endif
700static num
701num_mul (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 791
712 return ret; 792 return ret;
713} 793}
714 794
715static num 795static num
716num_div (num a, num b) 796num_div (num a, num b)
717{ 797{
718 num ret; 798 num ret;
719 799
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 800 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
721 801
722 if (num_is_fixnum (ret)) 802 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 803 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
724 else 804 else
725 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 805 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
726
727 return ret;
728}
729
730static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756 806
757 return ret; 807 return ret;
758} 808}
759 809
760static num 810static num
… …
762{ 812{
763 num ret; 813 num ret;
764 long e1, e2, res; 814 long e1, e2, res;
765 815
766 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 816 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
767 e1 = num_get_ivalue (a); 817 e1 = num_ivalue (a);
768 e2 = num_get_ivalue (b); 818 e2 = num_ivalue (b);
769 res = e1 % e2; 819 res = e1 % e2;
770 820
771 /* remainder should have same sign as second operand */ 821 /* remainder should have same sign as second operand */
772 if (res > 0) 822 if (res > 0)
773 { 823 {
… …
789{ 839{
790 num ret; 840 num ret;
791 long e1, e2, res; 841 long e1, e2, res;
792 842
793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 843 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
794 e1 = num_get_ivalue (a); 844 e1 = num_ivalue (a);
795 e2 = num_get_ivalue (b); 845 e2 = num_ivalue (b);
796 res = e1 % e2; 846 res = e1 % e2;
797 847
798 /* modulo should have same sign as second operand */ 848 /* modulo should have same sign as second operand */
799 if (res * e2 < 0) 849 if (res * e2 < 0)
800 res += e2; 850 res += e2;
801 851
802 num_set_ivalue (ret, res); 852 num_set_ivalue (ret, res);
803 return ret; 853 return ret;
804} 854}
805 855
856/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 857static int
807num_eq (num a, num b) 858num_cmp (num a, num b)
808{ 859{
860 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 861 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 862
812 if (is_fixnum) 863 if (is_fixnum)
813 ret = num_get_ivalue (a) == num_get_ivalue (b); 864 {
865 IVALUE av = num_ivalue (a);
866 IVALUE bv = num_ivalue (b);
867
868 ret = av == bv ? 0 : av < bv ? -1 : +1;
869 }
814 else 870 else
815 ret = num_get_rvalue (a) == num_get_rvalue (b); 871 {
872 RVALUE av = num_rvalue (a);
873 RVALUE bv = num_rvalue (b);
874
875 ret = av == bv ? 0 : av < bv ? -1 : +1;
876 }
816 877
817 return ret; 878 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 879}
860 880
861#if USE_MATH 881#if USE_MATH
862 882
863/* Round to nearest. Round to even if midway */ 883/* Round to nearest. Round to even if midway */
… …
873 return ce; 893 return ce;
874 else if (dfl < dce) 894 else if (dfl < dce)
875 return fl; 895 return fl;
876 else 896 else
877 { 897 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 898 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 899 return fl;
880 else 900 else
881 return ce; 901 return ce;
882 } 902 }
883} 903}
884#endif 904#endif
885 905
886static int 906static int
887is_zero_rvalue (RVALUE x) 907is_zero_rvalue (RVALUE x)
888{ 908{
909 return x == 0;
910#if 0
889#if USE_REAL 911#if USE_REAL
890 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 912 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
891#else 913#else
892 return x == 0; 914 return x == 0;
893#endif 915#endif
916#endif
894} 917}
895 918
896/* allocate new cell segment */ 919/* allocate new cell segment */
897static int 920static int
898alloc_cellseg (SCHEME_P_ int n) 921alloc_cellseg (SCHEME_P)
899{ 922{
900 pointer newp; 923 struct cell *newp;
901 pointer last; 924 struct cell *last;
902 pointer p; 925 struct cell *p;
903 char *cp; 926 char *cp;
904 long i; 927 long i;
905 int k; 928 int k;
906 929
907 static int segsize = CELL_SEGSIZE >> 1; 930 static int segsize = CELL_SEGSIZE >> 1;
908 segsize <<= 1; 931 segsize <<= 1;
909 932
910 for (k = 0; k < n; k++)
911 {
912 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
913 return k;
914
915 cp = malloc (segsize * sizeof (struct cell)); 933 cp = malloc (segsize * sizeof (struct cell));
916 934
917 if (!cp && USE_ERROR_CHECKING) 935 if (!cp && USE_ERROR_CHECKING)
918 return k; 936 return k;
919 937
920 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
921 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
922 940
923 /* insert new segment in address order */ 941 newp = (struct cell *)cp;
924 newp = (pointer)cp;
925 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
926 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
927
928 //TODO: insert, not swap
929 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
930 {
931 p = SCHEME_V->cell_seg[i];
932 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
933 SCHEME_V->cell_seg[i - 1] = p;
934
935 k = SCHEME_V->cell_segsize[i];
936 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
937 SCHEME_V->cell_segsize[i - 1] = k;
938
939 --i;
940 }
941
942 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
943 last = newp + segsize - 1; 945 last = newp + segsize - 1;
944 946
945 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
946 { 948 {
949 pointer cp = POINTER (p);
947 set_typeflag (p, T_FREE); 950 set_typeflag (cp, T_PAIR);
948 set_car (p, NIL); 951 set_car (cp, NIL);
949 set_cdr (p, p + 1); 952 set_cdr (cp, POINTER (p + 1));
950 } 953 }
951 954
952 /* insert new cells in address order on free list */
953 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
954 {
955 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = POINTER (newp);
957 }
958 else
959 {
960 p = SCHEME_V->free_cell;
961 957
962 while (cdr (p) != NIL && newp > cdr (p))
963 p = cdr (p);
964
965 set_cdr (last, cdr (p));
966 set_cdr (p, newp);
967 }
968 }
969
970 return n; 958 return 1;
971} 959}
972 960
973/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 962ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 964{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 966 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
980 return S_SINK; 968 return S_SINK;
981 969
982 if (SCHEME_V->free_cell == NIL) 970 if (SCHEME_V->free_cell == NIL)
983 { 971 {
984 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 972 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
985 973
986 gc (SCHEME_A_ a, b); 974 gc (SCHEME_A_ a, b);
987 975
988 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
989 { 977 {
990 /* if only a few recovered, get more to avoid fruitless gc's */ 978 /* if only a few recovered, get more to avoid fruitless gc's */
991 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 979 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
992 { 980 {
993#if USE_ERROR_CHECKING 981#if USE_ERROR_CHECKING
994 SCHEME_V->no_memory = 1; 982 SCHEME_V->no_memory = 1;
995 return S_SINK; 983 return S_SINK;
996#endif 984#endif
… …
1008 } 996 }
1009} 997}
1010 998
1011/* To retain recent allocs before interpreter knows about them - 999/* To retain recent allocs before interpreter knows about them -
1012 Tehom */ 1000 Tehom */
1013
1014static void 1001static void
1015push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1002push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1016{ 1003{
1017 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1004 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1018 1005
… …
1040} 1027}
1041 1028
1042static pointer 1029static pointer
1043get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1030get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1044{ 1031{
1045 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1032 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1046 pointer *e = malloc (len * sizeof (pointer)); 1033 pointer *e = malloc (len * sizeof (pointer));
1047 1034
1048 if (!e && USE_ERROR_CHECKING) 1035 if (!e && USE_ERROR_CHECKING)
1049 return S_SINK; 1036 return S_SINK;
1050 1037
1051 /* Record it as a vector so that gc understands it. */ 1038 /* Record it as a vector so that gc understands it. */
1052 set_typeflag (v, T_VECTOR | T_ATOM); 1039 set_typeflag (v, T_VECTOR | T_ATOM);
1053 1040
1054 v->object.vector.vvalue = e; 1041 CELL(v)->object.vector.vvalue = e;
1055 v->object.vector.length = len; 1042 CELL(v)->object.vector.length = len;
1056 fill_vector (v, init); 1043 fill_vector (v, 0, init);
1057 push_recent_alloc (SCHEME_A_ v, NIL); 1044 push_recent_alloc (SCHEME_A_ v, NIL);
1058 1045
1059 return v; 1046 return v;
1060} 1047}
1061 1048
1062static INLINE void 1049ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1050ok_to_freely_gc (SCHEME_P)
1064{ 1051{
1065 set_car (S_SINK, NIL); 1052 set_car (S_SINK, NIL);
1066} 1053}
1067 1054
… …
1104 set_cdr (x, b); 1091 set_cdr (x, b);
1105 1092
1106 return x; 1093 return x;
1107} 1094}
1108 1095
1096static pointer
1097generate_symbol (SCHEME_P_ const char *name)
1098{
1099 pointer x = mk_string (SCHEME_A_ name);
1100 setimmutable (x);
1101 set_typeflag (x, T_SYMBOL | T_ATOM);
1102 return x;
1103}
1104
1109/* ========== oblist implementation ========== */ 1105/* ========== oblist implementation ========== */
1110 1106
1111#ifndef USE_OBJECT_LIST 1107#ifndef USE_OBJECT_LIST
1112 1108
1109static int
1113static int hash_fn (const char *key, int table_size); 1110hash_fn (const char *key, int table_size)
1111{
1112 const unsigned char *p = key;
1113 uint32_t hash = 2166136261;
1114
1115 while (*p)
1116 hash = (hash ^ *p++) * 16777619;
1117
1118 return hash % table_size;
1119}
1114 1120
1115static pointer 1121static pointer
1116oblist_initial_value (SCHEME_P) 1122oblist_initial_value (SCHEME_P)
1117{ 1123{
1118 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1124 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1120 1126
1121/* returns the new symbol */ 1127/* returns the new symbol */
1122static pointer 1128static pointer
1123oblist_add_by_name (SCHEME_P_ const char *name) 1129oblist_add_by_name (SCHEME_P_ const char *name)
1124{ 1130{
1125 int location; 1131 pointer x = generate_symbol (SCHEME_A_ name);
1126
1127 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1128 set_typeflag (x, T_SYMBOL);
1129 setimmutable (car (x));
1130
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1132 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1132 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1133 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1133 return x; 1134 return x;
1134} 1135}
1135 1136
1136static INLINE pointer 1137ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1138oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1139{
1139 int location; 1140 int location;
1140 pointer x; 1141 pointer x;
1141 char *s; 1142 char *s;
1142 1143
1143 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1144 location = hash_fn (name, veclength (SCHEME_V->oblist));
1144 1145
1145 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1146 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1146 { 1147 {
1147 s = symname (car (x)); 1148 s = symname (car (x));
1148 1149
1149 /* case-insensitive, per R5RS section 2 */ 1150 /* case-insensitive, per R5RS section 2 */
1150 if (stricmp (name, s) == 0) 1151 if (stricmp (name, s) == 0)
… …
1160 int i; 1161 int i;
1161 pointer x; 1162 pointer x;
1162 pointer ob_list = NIL; 1163 pointer ob_list = NIL;
1163 1164
1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1165 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1165 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1166 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1166 ob_list = cons (x, ob_list); 1167 ob_list = cons (x, ob_list);
1167 1168
1168 return ob_list; 1169 return ob_list;
1169} 1170}
1170 1171
… …
1174oblist_initial_value (SCHEME_P) 1175oblist_initial_value (SCHEME_P)
1175{ 1176{
1176 return NIL; 1177 return NIL;
1177} 1178}
1178 1179
1179static INLINE pointer 1180ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1181oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1182{
1182 pointer x; 1183 pointer x;
1183 char *s; 1184 char *s;
1184 1185
… …
1196 1197
1197/* returns the new symbol */ 1198/* returns the new symbol */
1198static pointer 1199static pointer
1199oblist_add_by_name (SCHEME_P_ const char *name) 1200oblist_add_by_name (SCHEME_P_ const char *name)
1200{ 1201{
1201 pointer x; 1202 pointer x = generate_symbol (SCHEME_A_ name);
1202
1203 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1204 set_typeflag (x, T_SYMBOL);
1205 setimmutable (car (x));
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1203 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1204 return x;
1208} 1205}
1209 1206
1210static pointer 1207static pointer
… …
1220mk_port (SCHEME_P_ port *p) 1217mk_port (SCHEME_P_ port *p)
1221{ 1218{
1222 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1219 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223 1220
1224 set_typeflag (x, T_PORT | T_ATOM); 1221 set_typeflag (x, T_PORT | T_ATOM);
1225 x->object.port = p; 1222 set_port (x, p);
1226 1223
1227 return x; 1224 return x;
1228} 1225}
1229#endif 1226#endif
1230 1227
1231pointer 1228pointer
1232mk_foreign_func (SCHEME_P_ foreign_func f) 1229mk_foreign_func (SCHEME_P_ foreign_func f)
1233{ 1230{
1234 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235 1232
1236 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1233 set_typeflag (x, T_FOREIGN | T_ATOM);
1237 x->object.ff = f; 1234 CELL(x)->object.ff = f;
1238 1235
1239 return x; 1236 return x;
1240} 1237}
1241 1238
1242INTERFACE pointer 1239INTERFACE pointer
1243mk_character (SCHEME_P_ int c) 1240mk_character (SCHEME_P_ int c)
1244{ 1241{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1243
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1244 set_typeflag (x, T_CHARACTER | T_ATOM);
1248 ivalue_unchecked (x) = c & 0xff; 1245 set_ivalue (x, c & 0xff);
1249 set_num_integer (x); 1246
1250 return x; 1247 return x;
1251} 1248}
1252 1249
1253/* get number atom (integer) */ 1250/* get number atom (integer) */
1254INTERFACE pointer 1251INTERFACE pointer
1255mk_integer (SCHEME_P_ long num) 1252mk_integer (SCHEME_P_ long n)
1256{ 1253{
1254 pointer p = 0;
1255 pointer *pp = &p;
1256
1257#if USE_INTCACHE
1258 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1259 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1260#endif
1261
1262 if (!*pp)
1263 {
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1264 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1265
1259 set_typeflag (x, (T_NUMBER | T_ATOM)); 1266 set_typeflag (x, T_INTEGER | T_ATOM);
1260 ivalue_unchecked (x) = num; 1267 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_num_integer (x); 1268 set_ivalue (x, n);
1269
1270 *pp = x;
1271 }
1272
1262 return x; 1273 return *pp;
1263} 1274}
1264 1275
1265INTERFACE pointer 1276INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1277mk_real (SCHEME_P_ RVALUE n)
1267{ 1278{
1279#if USE_REAL
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1280 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1281
1270 set_typeflag (x, (T_NUMBER | T_ATOM)); 1282 set_typeflag (x, T_REAL | T_ATOM);
1271 rvalue_unchecked (x) = n; 1283 set_rvalue (x, n);
1272 set_num_real (x); 1284
1273 return x; 1285 return x;
1286#else
1287 return mk_integer (SCHEME_A_ n);
1288#endif
1274} 1289}
1275 1290
1276static pointer 1291static pointer
1277mk_number (SCHEME_P_ const num n) 1292mk_number (SCHEME_P_ const num n)
1278{ 1293{
1294#if USE_REAL
1279 if (num_is_fixnum (n)) 1295 return num_is_fixnum (n)
1296 ? mk_integer (SCHEME_A_ num_ivalue (n))
1297 : mk_real (SCHEME_A_ num_rvalue (n));
1298#else
1280 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1299 return mk_integer (SCHEME_A_ num_ivalue (n));
1281 else 1300#endif
1282 return mk_real (SCHEME_A_ num_get_rvalue (n));
1283} 1301}
1284 1302
1285/* allocate name to string area */ 1303/* allocate name to string area */
1286static char * 1304static char *
1287store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1305store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1293 SCHEME_V->no_memory = 1; 1311 SCHEME_V->no_memory = 1;
1294 return SCHEME_V->strbuff; 1312 return SCHEME_V->strbuff;
1295 } 1313 }
1296 1314
1297 if (str) 1315 if (str)
1298 { 1316 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1299 int l = strlen (str);
1300
1301 if (l > len_str)
1302 l = len_str;
1303
1304 memcpy (q, str, l);
1305 q[l] = 0;
1306 }
1307 else 1317 else
1308 {
1309 memset (q, fill, len_str); 1318 memset (q, fill, len_str);
1319
1310 q[len_str] = 0; 1320 q[len_str] = 0;
1311 }
1312 1321
1313 return q; 1322 return q;
1314} 1323}
1315 1324
1316INTERFACE pointer 1325INTERFACE pointer
… …
1330 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1339 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1331 1340
1332 set_typeflag (x, T_STRING | T_ATOM); 1341 set_typeflag (x, T_STRING | T_ATOM);
1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1342 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1334 strlength (x) = len; 1343 strlength (x) = len;
1344
1335 return x; 1345 return x;
1336} 1346}
1337 1347
1338INTERFACE pointer 1348INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str) 1349mk_string (SCHEME_P_ const char *str)
… …
1346{ 1356{
1347 return get_vector_object (SCHEME_A_ len, NIL); 1357 return get_vector_object (SCHEME_A_ len, NIL);
1348} 1358}
1349 1359
1350INTERFACE void 1360INTERFACE void
1351fill_vector (pointer vec, pointer obj) 1361fill_vector (pointer vec, uint32_t start, pointer obj)
1352{ 1362{
1353 int i; 1363 int i;
1354 1364
1355 for (i = 0; i < vec->object.vector.length; i++) 1365 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1366 vecvalue (vec)[i] = obj;
1357} 1367}
1358 1368
1369INTERFACE void
1370vector_resize (pointer vec, uint32_t newsize, pointer fill)
1371{
1372 uint32_t oldsize = veclength (vec);
1373 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1374 veclength (vec) = newsize;
1375 fill_vector (vec, oldsize, fill);
1376}
1377
1359INTERFACE pointer 1378INTERFACE pointer
1360vector_elem (pointer vec, uint32_t ielem) 1379vector_get (pointer vec, uint32_t ielem)
1361{ 1380{
1362 return vecvalue(vec)[ielem]; 1381 return vecvalue(vec)[ielem];
1363} 1382}
1364 1383
1365INTERFACE void 1384INTERFACE void
1366set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1385vector_set (pointer vec, uint32_t ielem, pointer a)
1367{ 1386{
1368 vecvalue(vec)[ielem] = a; 1387 vecvalue(vec)[ielem] = a;
1369} 1388}
1370 1389
1371/* get new symbol */ 1390/* get new symbol */
… …
1383 1402
1384INTERFACE pointer 1403INTERFACE pointer
1385gensym (SCHEME_P) 1404gensym (SCHEME_P)
1386{ 1405{
1387 pointer x; 1406 pointer x;
1388
1389 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1390 {
1391 char name[40] = "gensym-"; 1407 char name[40] = "gensym-";
1392 xnum (name + 7, SCHEME_V->gensym_cnt); 1408 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1393 1409
1394 /* first check oblist */ 1410 return generate_symbol (SCHEME_A_ name);
1395 x = oblist_find_by_name (SCHEME_A_ name); 1411}
1396 1412
1397 if (x == NIL) 1413static int
1398 { 1414is_gensym (SCHEME_P_ pointer x)
1399 x = oblist_add_by_name (SCHEME_A_ name); 1415{
1400 return x; 1416 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1401 }
1402 }
1403
1404 return NIL;
1405} 1417}
1406 1418
1407/* make symbol or number atom from string */ 1419/* make symbol or number atom from string */
1408static pointer 1420static pointer
1409mk_atom (SCHEME_P_ char *q) 1421mk_atom (SCHEME_P_ char *q)
… …
1463 } 1475 }
1464 else if ((c == 'e') || (c == 'E')) 1476 else if ((c == 'e') || (c == 'E'))
1465 { 1477 {
1466 if (!has_fp_exp) 1478 if (!has_fp_exp)
1467 { 1479 {
1468 has_dec_point = 1; /* decimal point illegal 1480 has_dec_point = 1; /* decimal point illegal from now on */
1469 from now on */
1470 p++; 1481 p++;
1471 1482
1472 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1483 if ((*p == '-') || (*p == '+') || isdigit (*p))
1473 continue; 1484 continue;
1474 } 1485 }
… …
1562 1573
1563 if (ecb_expect_false (is_vector (p))) 1574 if (ecb_expect_false (is_vector (p)))
1564 { 1575 {
1565 int i; 1576 int i;
1566 1577
1567 for (i = 0; i < p->object.vector.length; i++) 1578 for (i = 0; i < veclength (p); i++)
1568 mark (vecvalue (p)[i]); 1579 mark (vecvalue (p)[i]);
1569 } 1580 }
1570 1581
1571 if (is_atom (p)) 1582 if (is_atom (p))
1572 goto E6; 1583 goto E6;
… …
1619 1630
1620/* garbage collection. parameter a, b is marked. */ 1631/* garbage collection. parameter a, b is marked. */
1621static void 1632static void
1622gc (SCHEME_P_ pointer a, pointer b) 1633gc (SCHEME_P_ pointer a, pointer b)
1623{ 1634{
1624 pointer p;
1625 int i; 1635 int i;
1626 1636
1627 if (SCHEME_V->gc_verbose) 1637 if (SCHEME_V->gc_verbose)
1628 putstr (SCHEME_A_ "gc..."); 1638 putstr (SCHEME_A_ "gc...");
1629 1639
… …
1645 /* Mark recent objects the interpreter doesn't know about yet. */ 1655 /* Mark recent objects the interpreter doesn't know about yet. */
1646 mark (car (S_SINK)); 1656 mark (car (S_SINK));
1647 /* Mark any older stuff above nested C calls */ 1657 /* Mark any older stuff above nested C calls */
1648 mark (SCHEME_V->c_nest); 1658 mark (SCHEME_V->c_nest);
1649 1659
1660#if USE_INTCACHE
1661 /* mark intcache */
1662 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1663 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1664 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1665#endif
1666
1650 /* mark variables a, b */ 1667 /* mark variables a, b */
1651 mark (a); 1668 mark (a);
1652 mark (b); 1669 mark (b);
1653 1670
1654 /* garbage collect */ 1671 /* garbage collect */
1655 clrmark (NIL); 1672 clrmark (NIL);
1656 SCHEME_V->fcells = 0; 1673 SCHEME_V->fcells = 0;
1657 SCHEME_V->free_cell = NIL; 1674 SCHEME_V->free_cell = NIL;
1658 1675
1659 /* free-list is kept sorted by address so as to maintain consecutive 1676 if (SCHEME_V->gc_verbose)
1660 ranges, if possible, for use with vectors. Here we scan the cells 1677 xwrstr ("freeing...");
1661 (which are also kept sorted by address) downwards to build the 1678
1662 free-list in sorted order. 1679 uint32_t total = 0;
1663 */ 1680
1681 /* Here we scan the cells to build the free-list. */
1664 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1682 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1665 { 1683 {
1666 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1684 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1685 struct cell *p;
1686 total += SCHEME_V->cell_segsize [i];
1667 1687
1668 while (--p >= SCHEME_V->cell_seg[i]) 1688 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1669 { 1689 {
1690 pointer c = POINTER (p);
1691
1670 if (is_mark (p)) 1692 if (is_mark (c))
1671 clrmark (p); 1693 clrmark (c);
1672 else 1694 else
1673 { 1695 {
1674 /* reclaim cell */ 1696 /* reclaim cell */
1675 if (typeflag (p) != T_FREE) 1697 if (typeflag (c) != T_PAIR)
1676 { 1698 {
1677 finalize_cell (SCHEME_A_ p); 1699 finalize_cell (SCHEME_A_ c);
1678 set_typeflag (p, T_FREE); 1700 set_typeflag (c, T_PAIR);
1679 set_car (p, NIL); 1701 set_car (c, NIL);
1680 } 1702 }
1681 1703
1682 ++SCHEME_V->fcells; 1704 ++SCHEME_V->fcells;
1683 set_cdr (p, SCHEME_V->free_cell); 1705 set_cdr (c, SCHEME_V->free_cell);
1684 SCHEME_V->free_cell = p; 1706 SCHEME_V->free_cell = c;
1685 } 1707 }
1686 } 1708 }
1687 } 1709 }
1688 1710
1689 if (SCHEME_V->gc_verbose) 1711 if (SCHEME_V->gc_verbose)
1712 {
1690 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1713 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1714 }
1691} 1715}
1692 1716
1693static void 1717static void
1694finalize_cell (SCHEME_P_ pointer a) 1718finalize_cell (SCHEME_P_ pointer a)
1695{ 1719{
1696 /* TODO, fast bitmap check? */ 1720 /* TODO, fast bitmap check? */
1697 if (is_string (a)) 1721 if (is_string (a) || is_symbol (a))
1698 free (strvalue (a)); 1722 free (strvalue (a));
1699 else if (is_vector (a)) 1723 else if (is_vector (a))
1700 free (vecvalue (a)); 1724 free (vecvalue (a));
1701#if USE_PORTS 1725#if USE_PORTS
1702 else if (is_port (a)) 1726 else if (is_port (a))
1703 { 1727 {
1704 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1728 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1705 port_close (SCHEME_A_ a, port_input | port_output); 1729 port_close (SCHEME_A_ a, port_input | port_output);
1706 1730
1707 free (a->object.port); 1731 free (port (a));
1708 } 1732 }
1709#endif 1733#endif
1710} 1734}
1711 1735
1712/* ========== Routines for Reading ========== */ 1736/* ========== Routines for Reading ========== */
… …
1728 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1752 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1729 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1753 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1730 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1754 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1731 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1755 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1732 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1756 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1733 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1757 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1734 1758
1735#if SHOW_ERROR_LINE 1759#if SHOW_ERROR_LINE
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1737 1761
1738 if (fname) 1762 if (fname)
… …
1755 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1756#if USE_PORTS 1780#if USE_PORTS
1757 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1758#endif 1782#endif
1759 SCHEME_V->file_i--; 1783 SCHEME_V->file_i--;
1760 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1784 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1761 } 1785 }
1762} 1786}
1763 1787
1764static int 1788static int
1765file_interactive (SCHEME_P) 1789file_interactive (SCHEME_P)
1766{ 1790{
1767#if USE_PORTS 1791#if USE_PORTS
1768 return SCHEME_V->file_i == 0 1792 return SCHEME_V->file_i == 0
1769 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1770 && (SCHEME_V->inport->object.port->kind & port_file); 1794 && (port (SCHEME_V->inport)->kind & port_file);
1771#else 1795#else
1772 return 0; 1796 return 0;
1773#endif 1797#endif
1774} 1798}
1775 1799
… …
1909} 1933}
1910 1934
1911static void 1935static void
1912port_close (SCHEME_P_ pointer p, int flag) 1936port_close (SCHEME_P_ pointer p, int flag)
1913{ 1937{
1914 port *pt = p->object.port; 1938 port *pt = port (p);
1915 1939
1916 pt->kind &= ~flag; 1940 pt->kind &= ~flag;
1917 1941
1918 if ((pt->kind & (port_input | port_output)) == 0) 1942 if ((pt->kind & (port_input | port_output)) == 0)
1919 { 1943 {
… …
1940/* get new character from input file */ 1964/* get new character from input file */
1941static int 1965static int
1942inchar (SCHEME_P) 1966inchar (SCHEME_P)
1943{ 1967{
1944 int c; 1968 int c;
1945 port *pt; 1969 port *pt = port (SCHEME_V->inport);
1946
1947 pt = SCHEME_V->inport->object.port;
1948 1970
1949 if (pt->kind & port_saw_EOF) 1971 if (pt->kind & port_saw_EOF)
1950 return EOF; 1972 return EOF;
1951 1973
1952 c = basic_inchar (pt); 1974 c = basic_inchar (pt);
… …
2019 port *pt; 2041 port *pt;
2020 2042
2021 if (c == EOF) 2043 if (c == EOF)
2022 return; 2044 return;
2023 2045
2024 pt = SCHEME_V->inport->object.port; 2046 pt = port (SCHEME_V->inport);
2025 pt->unget = c; 2047 pt->unget = c;
2026#else 2048#else
2027 if (c == EOF) 2049 if (c == EOF)
2028 return; 2050 return;
2029 2051
… …
2057 2079
2058INTERFACE void 2080INTERFACE void
2059putstr (SCHEME_P_ const char *s) 2081putstr (SCHEME_P_ const char *s)
2060{ 2082{
2061#if USE_PORTS 2083#if USE_PORTS
2062 port *pt = SCHEME_V->outport->object.port; 2084 port *pt = port (SCHEME_V->outport);
2063 2085
2064 if (pt->kind & port_file) 2086 if (pt->kind & port_file)
2065 write (pt->rep.stdio.file, s, strlen (s)); 2087 write (pt->rep.stdio.file, s, strlen (s));
2066 else 2088 else
2067 for (; *s; s++) 2089 for (; *s; s++)
… …
2077 2099
2078static void 2100static void
2079putchars (SCHEME_P_ const char *s, int len) 2101putchars (SCHEME_P_ const char *s, int len)
2080{ 2102{
2081#if USE_PORTS 2103#if USE_PORTS
2082 port *pt = SCHEME_V->outport->object.port; 2104 port *pt = port (SCHEME_V->outport);
2083 2105
2084 if (pt->kind & port_file) 2106 if (pt->kind & port_file)
2085 write (pt->rep.stdio.file, s, len); 2107 write (pt->rep.stdio.file, s, len);
2086 else 2108 else
2087 { 2109 {
… …
2101 2123
2102INTERFACE void 2124INTERFACE void
2103putcharacter (SCHEME_P_ int c) 2125putcharacter (SCHEME_P_ int c)
2104{ 2126{
2105#if USE_PORTS 2127#if USE_PORTS
2106 port *pt = SCHEME_V->outport->object.port; 2128 port *pt = port (SCHEME_V->outport);
2107 2129
2108 if (pt->kind & port_file) 2130 if (pt->kind & port_file)
2109 { 2131 {
2110 char cc = c; 2132 char cc = c;
2111 write (pt->rep.stdio.file, &cc, 1); 2133 write (pt->rep.stdio.file, &cc, 1);
… …
2124#endif 2146#endif
2125} 2147}
2126 2148
2127/* read characters up to delimiter, but cater to character constants */ 2149/* read characters up to delimiter, but cater to character constants */
2128static char * 2150static char *
2129readstr_upto (SCHEME_P_ char *delim) 2151readstr_upto (SCHEME_P_ int skip, const char *delim)
2130{ 2152{
2131 char *p = SCHEME_V->strbuff; 2153 char *p = SCHEME_V->strbuff + skip;
2132 2154
2133 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2155 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2134 2156
2135 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2157 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2136 *p = 0; 2158 *p = 0;
… …
2143 return SCHEME_V->strbuff; 2165 return SCHEME_V->strbuff;
2144} 2166}
2145 2167
2146/* read string expression "xxx...xxx" */ 2168/* read string expression "xxx...xxx" */
2147static pointer 2169static pointer
2148readstrexp (SCHEME_P) 2170readstrexp (SCHEME_P_ char delim)
2149{ 2171{
2150 char *p = SCHEME_V->strbuff; 2172 char *p = SCHEME_V->strbuff;
2151 int c; 2173 int c;
2152 int c1 = 0; 2174 int c1 = 0;
2153 enum
2154 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2175 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2155 2176
2156 for (;;) 2177 for (;;)
2157 { 2178 {
2158 c = inchar (SCHEME_A); 2179 c = inchar (SCHEME_A);
2159 2180
… …
2161 return S_F; 2182 return S_F;
2162 2183
2163 switch (state) 2184 switch (state)
2164 { 2185 {
2165 case st_ok: 2186 case st_ok:
2166 switch (c) 2187 if (ecb_expect_false (c == delim))
2167 {
2168 case '\\':
2169 state = st_bsl;
2170 break;
2171
2172 case '"':
2173 *p = 0;
2174 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2188 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2175 2189
2176 default: 2190 if (ecb_expect_false (c == '\\'))
2191 state = st_bsl;
2192 else
2177 *p++ = c; 2193 *p++ = c;
2178 break;
2179 }
2180 2194
2181 break; 2195 break;
2182 2196
2183 case st_bsl: 2197 case st_bsl:
2184 switch (c) 2198 switch (c)
… …
2214 case 'r': 2228 case 'r':
2215 *p++ = '\r'; 2229 *p++ = '\r';
2216 state = st_ok; 2230 state = st_ok;
2217 break; 2231 break;
2218 2232
2219 case '"':
2220 *p++ = '"';
2221 state = st_ok;
2222 break;
2223
2224 default: 2233 default:
2225 *p++ = c; 2234 *p++ = c;
2226 state = st_ok; 2235 state = st_ok;
2227 break; 2236 break;
2228 } 2237 }
2229 2238
2230 break; 2239 break;
2231 2240
2232 case st_x1: 2241 case st_x1:
2233 case st_x2: 2242 case st_x2:
2234 c = toupper (c); 2243 c = tolower (c);
2235 2244
2236 if (c >= '0' && c <= 'F') 2245 if (c >= '0' && c <= '9')
2237 {
2238 if (c <= '9')
2239 c1 = (c1 << 4) + c - '0'; 2246 c1 = (c1 << 4) + c - '0';
2240 else 2247 else if (c >= 'a' && c <= 'f')
2241 c1 = (c1 << 4) + c - 'A' + 10; 2248 c1 = (c1 << 4) + c - 'a' + 10;
2242
2243 if (state == st_x1)
2244 state = st_x2;
2245 else
2246 {
2247 *p++ = c1;
2248 state = st_ok;
2249 }
2250 }
2251 else 2249 else
2252 return S_F; 2250 return S_F;
2251
2252 if (state == st_x1)
2253 state = st_x2;
2254 else
2255 {
2256 *p++ = c1;
2257 state = st_ok;
2258 }
2253 2259
2254 break; 2260 break;
2255 2261
2256 case st_oct1: 2262 case st_oct1:
2257 case st_oct2: 2263 case st_oct2:
… …
2261 backchar (SCHEME_A_ c); 2267 backchar (SCHEME_A_ c);
2262 state = st_ok; 2268 state = st_ok;
2263 } 2269 }
2264 else 2270 else
2265 { 2271 {
2266 if (state == st_oct2 && c1 >= 32) 2272 if (state == st_oct2 && c1 >= ' ')
2267 return S_F; 2273 return S_F;
2268 2274
2269 c1 = (c1 << 3) + (c - '0'); 2275 c1 = (c1 << 3) + (c - '0');
2270 2276
2271 if (state == st_oct1) 2277 if (state == st_oct1)
… …
2276 state = st_ok; 2282 state = st_ok;
2277 } 2283 }
2278 } 2284 }
2279 2285
2280 break; 2286 break;
2281
2282 } 2287 }
2283 } 2288 }
2284} 2289}
2285 2290
2286/* check c is in chars */ 2291/* check c is in chars */
2287static INLINE int 2292ecb_inline int
2288is_one_of (char *s, int c) 2293is_one_of (const char *s, int c)
2289{ 2294{
2290 if (c == EOF)
2291 return 1;
2292
2293 return !!strchr (s, c); 2295 return c == EOF || !!strchr (s, c);
2294} 2296}
2295 2297
2296/* skip white characters */ 2298/* skip white characters */
2297static INLINE int 2299ecb_inline int
2298skipspace (SCHEME_P) 2300skipspace (SCHEME_P)
2299{ 2301{
2300 int c, curr_line = 0; 2302 int c, curr_line = 0;
2301 2303
2302 do 2304 do
2303 { 2305 {
2304 c = inchar (SCHEME_A); 2306 c = inchar (SCHEME_A);
2307
2305#if SHOW_ERROR_LINE 2308#if SHOW_ERROR_LINE
2306 if (c == '\n') 2309 if (ecb_expect_false (c == '\n'))
2307 curr_line++; 2310 curr_line++;
2308#endif 2311#endif
2312
2313 if (ecb_expect_false (c == EOF))
2314 return c;
2309 } 2315 }
2310 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2316 while (is_one_of (WHITESPACE, c));
2311 2317
2312 /* record it */ 2318 /* record it */
2313#if SHOW_ERROR_LINE 2319#if SHOW_ERROR_LINE
2314 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2320 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2315 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2321 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2316#endif 2322#endif
2317 2323
2318 if (c != EOF)
2319 {
2320 backchar (SCHEME_A_ c); 2324 backchar (SCHEME_A_ c);
2321 return 1; 2325 return 1;
2322 }
2323 else
2324 return EOF;
2325} 2326}
2326 2327
2327/* get token */ 2328/* get token */
2328static int 2329static int
2329token (SCHEME_P) 2330token (SCHEME_P)
… …
2345 return TOK_RPAREN; 2346 return TOK_RPAREN;
2346 2347
2347 case '.': 2348 case '.':
2348 c = inchar (SCHEME_A); 2349 c = inchar (SCHEME_A);
2349 2350
2350 if (is_one_of (" \n\t", c)) 2351 if (is_one_of (WHITESPACE, c))
2351 return TOK_DOT; 2352 return TOK_DOT;
2352 else 2353 else
2353 { 2354 {
2354 //TODO: ungetc twice in a row is not supported in C
2355 backchar (SCHEME_A_ c); 2355 backchar (SCHEME_A_ c);
2356 backchar (SCHEME_A_ '.');
2357 return TOK_ATOM; 2356 return TOK_DOTATOM;
2358 } 2357 }
2358
2359 case '|':
2360 return TOK_STRATOM;
2359 2361
2360 case '\'': 2362 case '\'':
2361 return TOK_QUOTE; 2363 return TOK_QUOTE;
2362 2364
2363 case ';': 2365 case ';':
… …
2495 } 2497 }
2496 2498
2497 putcharacter (SCHEME_A_ '"'); 2499 putcharacter (SCHEME_A_ '"');
2498} 2500}
2499 2501
2500
2501/* print atoms */ 2502/* print atoms */
2502static void 2503static void
2503printatom (SCHEME_P_ pointer l, int f) 2504printatom (SCHEME_P_ pointer l, int f)
2504{ 2505{
2505 char *p; 2506 char *p;
2506 int len; 2507 int len;
2507 2508
2508 atom2str (SCHEME_A_ l, f, &p, &len); 2509 atom2str (SCHEME_A_ l, f, &p, &len);
2509 putchars (SCHEME_A_ p, len); 2510 putchars (SCHEME_A_ p, len);
2510} 2511}
2511
2512 2512
2513/* Uses internal buffer unless string pointer is already available */ 2513/* Uses internal buffer unless string pointer is already available */
2514static void 2514static void
2515atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2515atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2516{ 2516{
… …
2530 { 2530 {
2531 p = SCHEME_V->strbuff; 2531 p = SCHEME_V->strbuff;
2532 2532
2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2534 { 2534 {
2535 if (num_is_integer (l)) 2535 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2536 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2537#if USE_REAL
2538 else 2538 else
2539 { 2539 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2677#endif 2677#endif
2678 } 2678 }
2679 else if (is_continuation (l)) 2679 else if (is_continuation (l))
2680 p = "#<CONTINUATION>"; 2680 p = "#<CONTINUATION>";
2681 else 2681 else
2682 {
2683#if USE_PRINTF
2684 p = SCHEME_V->strbuff;
2685 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2686#else
2682 p = "#<ERROR>"; 2687 p = "#<ERROR>";
2688#endif
2689 }
2683 2690
2684 *pp = p; 2691 *pp = p;
2685 *plen = strlen (p); 2692 *plen = strlen (p);
2686} 2693}
2687 2694
… …
2795 return 0; 2802 return 0;
2796 } 2803 }
2797 else if (is_number (a)) 2804 else if (is_number (a))
2798 { 2805 {
2799 if (is_number (b)) 2806 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2807 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2808
2803 return 0; 2809 return 0;
2804 } 2810 }
2805 else if (is_character (a)) 2811 else if (is_character (a))
2806 { 2812 {
… …
2832/* () is #t in R5RS */ 2838/* () is #t in R5RS */
2833#define is_true(p) ((p) != S_F) 2839#define is_true(p) ((p) != S_F)
2834#define is_false(p) ((p) == S_F) 2840#define is_false(p) ((p) == S_F)
2835 2841
2836/* ========== Environment implementation ========== */ 2842/* ========== Environment implementation ========== */
2837
2838#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2839
2840static int
2841hash_fn (const char *key, int table_size)
2842{
2843 const unsigned char *p = key;
2844 uint32_t hash = 2166136261;
2845
2846 while (*p)
2847 hash = (hash ^ *p++) * 16777619;
2848
2849 return hash % table_size;
2850}
2851#endif
2852 2843
2853#ifndef USE_ALIST_ENV 2844#ifndef USE_ALIST_ENV
2854 2845
2855/* 2846/*
2856 * In this implementation, each frame of the environment may be 2847 * In this implementation, each frame of the environment may be
… …
2873 2864
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2865 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2866 setenvironment (SCHEME_V->envir);
2876} 2867}
2877 2868
2878static INLINE void 2869static uint32_t
2870sym_hash (pointer sym, uint32_t size)
2871{
2872 uintptr_t ptr = (uintptr_t)sym;
2873
2874#if 0
2875 /* table size is prime, so why mix */
2876 ptr += ptr >> 32;
2877 ptr += ptr >> 16;
2878 ptr += ptr >> 8;
2879#endif
2880
2881 return ptr % size;
2882}
2883
2884ecb_inline void
2879new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2885new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2880{ 2886{
2881 pointer slot = immutable_cons (variable, value); 2887 pointer slot = immutable_cons (variable, value);
2882 2888
2883 if (is_vector (car (env))) 2889 if (is_vector (car (env)))
2884 { 2890 {
2885 int location = hash_fn (symname (variable), veclength (car (env))); 2891 int location = sym_hash (variable, veclength (car (env)));
2886
2887 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2892 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2888 } 2893 }
2889 else 2894 else
2890 set_car (env, immutable_cons (slot, car (env))); 2895 set_car (env, immutable_cons (slot, car (env)));
2891} 2896}
2892 2897
2893static pointer 2898static pointer
2894find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2899find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2895{ 2900{
2896 pointer x, y; 2901 pointer x, y;
2897 int location;
2898 2902
2899 for (x = env; x != NIL; x = cdr (x)) 2903 for (x = env; x != NIL; x = cdr (x))
2900 { 2904 {
2901 if (is_vector (car (x))) 2905 if (is_vector (car (x)))
2902 { 2906 {
2903 location = hash_fn (symname (hdl), veclength (car (x))); 2907 int location = sym_hash (hdl, veclength (car (x)));
2904 y = vector_elem (car (x), location); 2908 y = vector_get (car (x), location);
2905 } 2909 }
2906 else 2910 else
2907 y = car (x); 2911 y = car (x);
2908 2912
2909 for (; y != NIL; y = cdr (y)) 2913 for (; y != NIL; y = cdr (y))
2910 if (caar (y) == hdl) 2914 if (caar (y) == hdl)
2911 break; 2915 break;
2912 2916
2913 if (y != NIL) 2917 if (y != NIL)
2918 return car (y);
2919
2920 if (!all)
2914 break; 2921 break;
2915
2916 if (!all)
2917 return NIL;
2918 } 2922 }
2919
2920 if (x != NIL)
2921 return car (y);
2922 2923
2923 return NIL; 2924 return NIL;
2924} 2925}
2925 2926
2926#else /* USE_ALIST_ENV */ 2927#else /* USE_ALIST_ENV */
2927 2928
2928static INLINE void 2929ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2930new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2931{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2932 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2933 setenvironment (SCHEME_V->envir);
2933} 2934}
2934 2935
2935static INLINE void 2936ecb_inline void
2936new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2937new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2937{ 2938{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2939 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2940}
2940 2941
… …
2948 for (y = car (x); y != NIL; y = cdr (y)) 2949 for (y = car (x); y != NIL; y = cdr (y))
2949 if (caar (y) == hdl) 2950 if (caar (y) == hdl)
2950 break; 2951 break;
2951 2952
2952 if (y != NIL) 2953 if (y != NIL)
2954 return car (y);
2953 break; 2955 break;
2954 2956
2955 if (!all) 2957 if (!all)
2956 return NIL; 2958 break;
2957 } 2959 }
2958
2959 if (x != NIL)
2960 return car (y);
2961 2960
2962 return NIL; 2961 return NIL;
2963} 2962}
2964 2963
2965#endif /* USE_ALIST_ENV else */ 2964#endif /* USE_ALIST_ENV else */
2966 2965
2967static INLINE void 2966ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2967new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2968{
2969 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2971} 2971}
2972 2972
2973static INLINE void 2973ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2975{
2976 set_cdr (slot, value); 2976 set_cdr (slot, value);
2977} 2977}
2978 2978
2979static INLINE pointer 2979ecb_inline pointer
2980slot_value_in_env (pointer slot) 2980slot_value_in_env (pointer slot)
2981{ 2981{
2982 return cdr (slot); 2982 return cdr (slot);
2983} 2983}
2984 2984
2985/* ========== Evaluation Cycle ========== */ 2985/* ========== Evaluation Cycle ========== */
2986 2986
2987static pointer 2987static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 2988xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 2989{
2990#if USE_ERROR_HOOK 2990#if USE_ERROR_HOOK
2991 pointer x; 2991 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 2992 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 3027 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 3028 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 3029 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 3030 SCHEME_V->op = OP_EVAL;
3031 3031
3032 return S_T; 3032 return 0;
3033 } 3033 }
3034#endif 3034#endif
3035 3035
3036 if (a) 3036 if (a)
3037 SCHEME_V->args = cons (a, NIL); 3037 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 3039 SCHEME_V->args = NIL;
3040 3040
3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3042 setimmutable (car (SCHEME_V->args)); 3042 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 3043 SCHEME_V->op = OP_ERR0;
3044
3044 return S_T; 3045 return 0;
3045} 3046}
3046 3047
3047#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3048#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3048#define Error_0(s) Error_1 (s, 0) 3049#define Error_0(s) Error_1 (s, 0)
3049 3050
3050/* Too small to turn into function */ 3051/* Too small to turn into function */
3051#define BEGIN do { 3052#define BEGIN do {
3052#define END } while (0) 3053#define END } while (0)
3053#define s_goto(a) BEGIN \ 3054#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 3055 SCHEME_V->op = a; \
3055 return S_T; END 3056 return 0; END
3056 3057
3057#define s_return(a) return xs_return (SCHEME_A_ a) 3058#define s_return(a) return xs_return (SCHEME_A_ a)
3058 3059
3059#ifndef USE_SCHEME_STACK 3060#ifndef USE_SCHEME_STACK
3060 3061
… …
3074{ 3075{
3075 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3076 struct dump_stack_frame *next_frame; 3077 struct dump_stack_frame *next_frame;
3077 3078
3078 /* enough room for the next frame? */ 3079 /* enough room for the next frame? */
3079 if (nframes >= SCHEME_V->dump_size) 3080 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3080 { 3081 {
3081 SCHEME_V->dump_size += STACK_GROWTH; 3082 SCHEME_V->dump_size += STACK_GROWTH;
3082 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3083 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3083 } 3084 }
3084 3085
3085 next_frame = SCHEME_V->dump_base + nframes; 3086 next_frame = SCHEME_V->dump_base + nframes;
3086 3087
3087 next_frame->op = op; 3088 next_frame->op = op;
3088 next_frame->args = args; 3089 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3090 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3091 next_frame->code = code;
3091 3092
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3093 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3094}
3094 3095
3095static pointer 3096static int
3096xs_return (SCHEME_P_ pointer a) 3097xs_return (SCHEME_P_ pointer a)
3097{ 3098{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3099 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3100 struct dump_stack_frame *frame;
3100 3101
3101 SCHEME_V->value = a; 3102 SCHEME_V->value = a;
3102 3103
3103 if (nframes <= 0) 3104 if (nframes <= 0)
3104 return NIL; 3105 return -1;
3105 3106
3106 frame = &SCHEME_V->dump_base[--nframes]; 3107 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3108 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3109 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3110 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3111 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3112 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3113
3113 return S_T; 3114 return 0;
3114} 3115}
3115 3116
3116static INLINE void 3117ecb_inline void
3117dump_stack_reset (SCHEME_P) 3118dump_stack_reset (SCHEME_P)
3118{ 3119{
3119 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3120 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3120 SCHEME_V->dump = (pointer)+0; 3121 SCHEME_V->dump = (pointer)+0;
3121} 3122}
3122 3123
3123static INLINE void 3124ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3125dump_stack_initialize (SCHEME_P)
3125{ 3126{
3126 SCHEME_V->dump_size = 0; 3127 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3128 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3129 dump_stack_reset (SCHEME_A);
… …
3181 int i = 0; 3182 int i = 0;
3182 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3183 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3183 3184
3184 while (cont != NIL) 3185 while (cont != NIL)
3185 { 3186 {
3186 frame->op = ivalue (car (cont)); cont = cdr (cont); 3187 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3187 frame->args = car (cont) ; cont = cdr (cont); 3188 frame->args = car (cont) ; cont = cdr (cont);
3188 frame->envir = car (cont) ; cont = cdr (cont); 3189 frame->envir = car (cont) ; cont = cdr (cont);
3189 frame->code = car (cont) ; cont = cdr (cont); 3190 frame->code = car (cont) ; cont = cdr (cont);
3190 3191
3191 ++frame; 3192 ++frame;
3192 ++i; 3193 ++i;
3193 } 3194 }
3194 3195
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3196 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3197}
3197 3198
3198#else 3199#else
3199 3200
3200static INLINE void 3201ecb_inline void
3201dump_stack_reset (SCHEME_P) 3202dump_stack_reset (SCHEME_P)
3202{ 3203{
3203 SCHEME_V->dump = NIL; 3204 SCHEME_V->dump = NIL;
3204} 3205}
3205 3206
3206static INLINE void 3207ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3208dump_stack_initialize (SCHEME_P)
3208{ 3209{
3209 dump_stack_reset (SCHEME_A); 3210 dump_stack_reset (SCHEME_A);
3210} 3211}
3211 3212
… …
3213dump_stack_free (SCHEME_P) 3214dump_stack_free (SCHEME_P)
3214{ 3215{
3215 SCHEME_V->dump = NIL; 3216 SCHEME_V->dump = NIL;
3216} 3217}
3217 3218
3218static pointer 3219static int
3219xs_return (SCHEME_P_ pointer a) 3220xs_return (SCHEME_P_ pointer a)
3220{ 3221{
3221 pointer dump = SCHEME_V->dump; 3222 pointer dump = SCHEME_V->dump;
3222 3223
3223 SCHEME_V->value = a; 3224 SCHEME_V->value = a;
3224 3225
3225 if (dump == NIL) 3226 if (dump == NIL)
3226 return NIL; 3227 return -1;
3227 3228
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3229 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3230 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3231 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3232 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3233
3233 SCHEME_V->dump = dump; 3234 SCHEME_V->dump = dump;
3234 3235
3235 return S_T; 3236 return 0;
3236} 3237}
3237 3238
3238static void 3239static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3240s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3241{
… …
3265 3266
3266#endif 3267#endif
3267 3268
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3269#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3270
3271#if EXPERIMENT
3270static pointer 3272static int
3273debug (SCHEME_P_ int indent, pointer x)
3274{
3275 int c;
3276
3277 if (is_syntax (x))
3278 {
3279 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3280 return 8 + 8;
3281 }
3282
3283 if (x == NIL)
3284 {
3285 printf ("%*sNIL\n", indent, "");
3286 return 3;
3287 }
3288
3289 switch (type (x))
3290 {
3291 case T_INTEGER:
3292 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3293 return 32+8;
3294
3295 case T_SYMBOL:
3296 printf ("%*sS<%s>\n", indent, "", symname (x));
3297 return 24+8;
3298
3299 case T_CLOSURE:
3300 printf ("%*sS<%s>\n", indent, "", "closure");
3301 debug (SCHEME_A_ indent + 3, cdr(x));
3302 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3303
3304 case T_PAIR:
3305 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3306 c = debug (SCHEME_A_ indent + 3, car (x));
3307 c += debug (SCHEME_A_ indent + 3, cdr (x));
3308 return c + 1;
3309
3310 case T_PORT:
3311 printf ("%*sS<%s>\n", indent, "", "port");
3312 return 24+8;
3313
3314 case T_VECTOR:
3315 printf ("%*sS<%s>\n", indent, "", "vector");
3316 return 24+8;
3317
3318 case T_ENVIRONMENT:
3319 printf ("%*sS<%s>\n", indent, "", "environment");
3320 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3321
3322 default:
3323 printf ("unhandled type %d\n", type (x));
3324 break;
3325 }
3326}
3327#endif
3328
3329static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3330opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3331{
3332 pointer args = SCHEME_V->args;
3273 pointer x, y; 3333 pointer x, y;
3274 3334
3275 switch (op) 3335 switch (op)
3276 { 3336 {
3337#if EXPERIMENT //D
3338 case OP_DEBUG:
3339 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3340 printf ("\n");
3341 s_return (S_T);
3342#endif
3277 case OP_LOAD: /* load */ 3343 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3344 if (file_interactive (SCHEME_A))
3279 { 3345 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3346 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3347 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3348 }
3283 3349
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3350 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3351 Error_1 ("unable to open", car (args));
3286 else 3352 else
3287 { 3353 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3354 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3355 s_goto (OP_T0LVL);
3290 } 3356 }
3291 3357
3292 case OP_T0LVL: /* top level */ 3358 case OP_T0LVL: /* top level */
3293 3359
3294 /* If we reached the end of file, this loop is done. */ 3360 /* If we reached the end of file, this loop is done. */
3295 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3361 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3296 { 3362 {
3297 if (SCHEME_V->file_i == 0) 3363 if (SCHEME_V->file_i == 0)
3298 { 3364 {
3299 SCHEME_V->args = NIL; 3365 SCHEME_V->args = NIL;
3300 s_goto (OP_QUIT); 3366 s_goto (OP_QUIT);
… …
3364 case OP_EVAL: /* main part of evaluation */ 3430 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3431#if USE_TRACING
3366 if (SCHEME_V->tracing) 3432 if (SCHEME_V->tracing)
3367 { 3433 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3434 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3435 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3436 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3437 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3438 s_goto (OP_P0LIST);
3373 } 3439 }
3374 3440
… …
3378#endif 3444#endif
3379 if (is_symbol (SCHEME_V->code)) /* symbol */ 3445 if (is_symbol (SCHEME_V->code)) /* symbol */
3380 { 3446 {
3381 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3447 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3382 3448
3383 if (x != NIL) 3449 if (x == NIL)
3384 s_return (slot_value_in_env (x));
3385 else
3386 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3450 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3451
3452 s_return (slot_value_in_env (x));
3387 } 3453 }
3388 else if (is_pair (SCHEME_V->code)) 3454 else if (is_pair (SCHEME_V->code))
3389 { 3455 {
3390 x = car (SCHEME_V->code); 3456 x = car (SCHEME_V->code);
3391 3457
… …
3404 } 3470 }
3405 else 3471 else
3406 s_return (SCHEME_V->code); 3472 s_return (SCHEME_V->code);
3407 3473
3408 case OP_E0ARGS: /* eval arguments */ 3474 case OP_E0ARGS: /* eval arguments */
3409 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3475 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3410 { 3476 {
3411 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3477 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3412 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3478 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3413 SCHEME_V->code = SCHEME_V->value; 3479 SCHEME_V->code = SCHEME_V->value;
3414 s_goto (OP_APPLY); 3480 s_goto (OP_APPLY);
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3484 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3485 s_goto (OP_E1ARGS);
3420 } 3486 }
3421 3487
3422 case OP_E1ARGS: /* eval arguments */ 3488 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3489 args = cons (SCHEME_V->value, args);
3424 3490
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3491 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3492 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3493 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3494 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3495 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3496 s_goto (OP_EVAL);
3431 } 3497 }
3432 else /* end */ 3498 else /* end */
3433 { 3499 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3500 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3501 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3502 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3503 s_goto (OP_APPLY);
3438 } 3504 }
3439 3505
3440#if USE_TRACING 3506#if USE_TRACING
3441 3507
3442 case OP_TRACING: 3508 case OP_TRACING:
3443 { 3509 {
3444 int tr = SCHEME_V->tracing; 3510 int tr = SCHEME_V->tracing;
3445 3511
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3512 SCHEME_V->tracing = ivalue_unchecked (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3513 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3514 }
3449 3515
3450#endif 3516#endif
3451 3517
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3518 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3519#if USE_TRACING
3454 if (SCHEME_V->tracing) 3520 if (SCHEME_V->tracing)
3455 { 3521 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3522 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3523 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3524 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3525 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3526 s_goto (OP_P0LIST);
3461 } 3527 }
3462 3528
3463 /* fall through */ 3529 /* fall through */
3464 3530
3465 case OP_REAL_APPLY: 3531 case OP_REAL_APPLY:
3466#endif 3532#endif
3467 if (is_proc (SCHEME_V->code)) 3533 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3534 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3535 else if (is_foreign (SCHEME_V->code))
3472 { 3536 {
3473 /* Keep nested calls from GC'ing the arglist */ 3537 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3538 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3539 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3476 3540
3477 s_return (x); 3541 s_return (x);
3478 } 3542 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3543 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3544 {
3481 /* Should not accept promise */ 3545 /* Should not accept promise */
3482 /* make environment */ 3546 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3547 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3548
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3549 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3550 {
3487 if (y == NIL) 3551 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3552 Error_0 ("not enough arguments");
3489 else 3553 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3554 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3572 s_goto (OP_BEGIN);
3509 } 3573 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3574 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3575 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3576 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3577 s_return (args != NIL ? car (args) : NIL);
3514 } 3578 }
3515 else 3579 else
3516 Error_0 ("illegal function"); 3580 Error_0 ("illegal function");
3517 3581
3518 case OP_DOMACRO: /* do macro */ 3582 case OP_DOMACRO: /* do macro */
3519 SCHEME_V->code = SCHEME_V->value; 3583 SCHEME_V->code = SCHEME_V->value;
3520 s_goto (OP_EVAL); 3584 s_goto (OP_EVAL);
3521
3522#if 1
3523 3585
3524 case OP_LAMBDA: /* lambda */ 3586 case OP_LAMBDA: /* lambda */
3525 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3587 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3526 set SCHEME_V->value fall thru */ 3588 set SCHEME_V->value fall thru */
3527 { 3589 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3590 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3591
3530 if (f != NIL) 3592 if (f != NIL)
3531 { 3593 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3594 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3595 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3596 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3597 s_goto (OP_APPLY);
3536 } 3598 }
3537 3599
3538 SCHEME_V->value = SCHEME_V->code; 3600 SCHEME_V->value = SCHEME_V->code;
3539 /* Fallthru */
3540 } 3601 }
3602 /* Fallthru */
3541 3603
3542 case OP_LAMBDA1: 3604 case OP_LAMBDA1:
3543 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3605 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3544 3606
3545#else
3546
3547 case OP_LAMBDA: /* lambda */
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549
3550#endif
3551
3552 case OP_MKCLOSURE: /* make-closure */ 3607 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3608 x = car (args);
3554 3609
3555 if (car (x) == SCHEME_V->LAMBDA) 3610 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3611 x = cdr (x);
3557 3612
3558 if (cdr (SCHEME_V->args) == NIL) 3613 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3614 y = SCHEME_V->envir;
3560 else 3615 else
3561 y = cadr (SCHEME_V->args); 3616 y = cadr (args);
3562 3617
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3618 s_return (mk_closure (SCHEME_A_ x, y));
3564 3619
3565 case OP_QUOTE: /* quote */ 3620 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3621 s_return (car (SCHEME_V->code));
… …
3598 3653
3599 3654
3600 case OP_DEFP: /* defined? */ 3655 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3656 x = SCHEME_V->envir;
3602 3657
3603 if (cdr (SCHEME_V->args) != NIL) 3658 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3659 x = cadr (args);
3605 3660
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3661 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3662
3608 case OP_SET0: /* set! */ 3663 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3664 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3665 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3666
… …
3642 3697
3643 case OP_IF1: /* if */ 3698 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3699 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3700 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3701 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3702 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3703 s_goto (OP_EVAL);
3651 3704
3652 case OP_LET0: /* let */ 3705 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3706 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3707 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3708 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3709 s_goto (OP_LET1);
3657 3710
3658 case OP_LET1: /* let (calculate parameters) */ 3711 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3712 args = cons (SCHEME_V->value, args);
3660 3713
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3714 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3715 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3716 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3664 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3717 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3718
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3719 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3720 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3721 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3722 s_goto (OP_EVAL);
3670 } 3723 }
3671 else /* end */ 3724 else /* end */
3672 { 3725 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3726 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3727 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3728 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3729 s_goto (OP_LET2);
3677 } 3730 }
3678 3731
3679 case OP_LET2: /* let */ 3732 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3733 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3734
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3735 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3736 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3737 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3738
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3739 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3740 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3741 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3742 {
3690 if (!is_pair (x)) 3743 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3744 Error_1 ("Bad syntax of binding in let :", x);
3692 3745
3693 if (!is_list (SCHEME_A_ car (x))) 3746 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3747 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3748
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3749 args = cons (caar (x), args);
3697 } 3750 }
3698 3751
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3752 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3753 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3754 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3755 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3756 }
3706 else 3757 else
3707 { 3758 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3759 SCHEME_V->code = cdr (SCHEME_V->code);
3760 }
3761
3709 SCHEME_V->args = NIL; 3762 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3763 s_goto (OP_BEGIN);
3713 3764
3714 case OP_LET0AST: /* let* */ 3765 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3766 if (car (SCHEME_V->code) == NIL)
3716 { 3767 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3785 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3786 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3787
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3788 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3789 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3790 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3791 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3792 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3793 s_goto (OP_EVAL);
3743 } 3794 }
3744 else /* end */ 3795 else /* end */
3745 { 3796 {
3746 SCHEME_V->code = SCHEME_V->args; 3797 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3798 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3799 s_goto (OP_BEGIN);
3749 } 3800 }
3750 3801
3751 case OP_LET0REC: /* letrec */ 3802 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3805 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3806 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3807 s_goto (OP_LET1REC);
3757 3808
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3809 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3810 args = cons (SCHEME_V->value, args);
3760 3811
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3812 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3813 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3814 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3764 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3815 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3816
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3817 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3818 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3819 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3820 s_goto (OP_EVAL);
3770 } 3821 }
3771 else /* end */ 3822 else /* end */
3772 { 3823 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3824 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3825 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3826 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3827 s_goto (OP_LET2REC);
3777 } 3828 }
3778 3829
3779 case OP_LET2REC: /* letrec */ 3830 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3831 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3832 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3833
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3834 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3835 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3836 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3922 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3923 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3924 s_goto (OP_EVAL);
3874 3925
3875 case OP_C1STREAM: /* cons-stream */ 3926 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3927 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3877 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3928 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3929 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3930 s_return (cons (args, x));
3880 3931
3881 case OP_MACRO0: /* macro */ 3932 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3933 if (is_pair (car (SCHEME_V->code)))
3883 { 3934 {
3884 x = caar (SCHEME_V->code); 3935 x = caar (SCHEME_V->code);
… …
3917 { 3968 {
3918 if (!is_pair (y = caar (x))) 3969 if (!is_pair (y = caar (x)))
3919 break; 3970 break;
3920 3971
3921 for (; y != NIL; y = cdr (y)) 3972 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3973 if (eqv (car (y), SCHEME_V->value))
3924 break; 3974 break;
3925 }
3926 3975
3927 if (y != NIL) 3976 if (y != NIL)
3928 break; 3977 break;
3929 } 3978 }
3930 3979
… …
3950 s_goto (OP_BEGIN); 3999 s_goto (OP_BEGIN);
3951 else 4000 else
3952 s_return (NIL); 4001 s_return (NIL);
3953 4002
3954 case OP_PAPPLY: /* apply */ 4003 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 4004 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4005 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4006 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 4007 s_goto (OP_APPLY);
3959 4008
3960 case OP_PEVAL: /* eval */ 4009 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 4010 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 4011 SCHEME_V->envir = cadr (args);
3963 4012
3964 SCHEME_V->code = car (SCHEME_V->args); 4013 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 4014 s_goto (OP_EVAL);
3966 4015
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 4016 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 4017 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4018 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 4019 s_goto (OP_APPLY);
3971 } 4020 }
3972 4021
3973 return S_T; 4022 if (USE_ERROR_CHECKING) abort ();
3974} 4023}
3975 4024
3976static pointer 4025static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4026opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 4027{
3979 pointer x; 4028 pointer args = SCHEME_V->args;
4029 pointer x = car (args);
3980 num v; 4030 num v;
3981 4031
4032 switch (op)
4033 {
3982#if USE_MATH 4034#if USE_MATH
3983 RVALUE dd;
3984#endif
3985
3986 switch (op)
3987 {
3988#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 4035 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args); 4036 {
3992
3993 if (num_is_integer (x)) 4037 if (is_integer (x))
3994 s_return (x); 4038 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4039
4040 RVALUE r = rvalue_unchecked (x);
4041
4042 if (r == (RVALUE)(IVALUE)r)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4043 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3997 else 4044 else
3998 Error_1 ("inexact->exact: not integral:", x); 4045 Error_1 ("inexact->exact: not integral:", x);
4046 }
3999 4047
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4048 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4049 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4050 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4051 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4052 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4053 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4054 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 4055
4028 case OP_ATAN: 4056 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 4057 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4058 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 4059 else
4034 { 4060 {
4035 pointer y = cadr (SCHEME_V->args); 4061 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4062 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 4063 }
4039 4064
4040 case OP_SQRT: 4065 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4066 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 4067
4044 case OP_EXPT: 4068 case OP_EXPT:
4045 { 4069 {
4046 RVALUE result; 4070 RVALUE result;
4047 int real_result = 1; 4071 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 4072 pointer y = cadr (args);
4049 4073
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 4074 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 4075 real_result = 0;
4054 4076
4055 /* This 'if' is an R5RS compatibility fix. */ 4077 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 4078 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 4079 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 4080 result = 0;
4059 else 4081 else
4060 result = pow (rvalue (x), rvalue (y)); 4082 result = pow (rvalue (x), rvalue (y));
4061 4083
4062 /* Before returning integer result make sure we can. */ 4084 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 4085 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 4086 if (!real_result)
4065 { 4087 {
4066 long result_as_long = (long) result; 4088 long result_as_long = result;
4067 4089
4068 if (result != (RVALUE) result_as_long) 4090 if (result != result_as_long)
4069 real_result = 1; 4091 real_result = 1;
4070 } 4092 }
4071 4093
4072 if (real_result) 4094 if (real_result)
4073 s_return (mk_real (SCHEME_A_ result)); 4095 s_return (mk_real (SCHEME_A_ result));
4074 else 4096 else
4075 s_return (mk_integer (SCHEME_A_ result)); 4097 s_return (mk_integer (SCHEME_A_ result));
4076 } 4098 }
4077 4099
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4100 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4101 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 4102
4086 case OP_TRUNCATE: 4103 case OP_TRUNCATE:
4087 { 4104 {
4088 RVALUE rvalue_of_x; 4105 RVALUE n = rvalue (x);
4089
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x);
4092
4093 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4106 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4095 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4107 }
4098 4108
4099 case OP_ROUND: 4109 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4110 if (is_integer (x))
4103 s_return (x); 4111 s_return (x);
4104 4112
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4113 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4114#endif
4107 4115
4108 case OP_ADD: /* + */ 4116 case OP_ADD: /* + */
4109 v = num_zero; 4117 v = num_zero;
4110 4118
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4119 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4120 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4121
4114 s_return (mk_number (SCHEME_A_ v)); 4122 s_return (mk_number (SCHEME_A_ v));
4115 4123
4116 case OP_MUL: /* * */ 4124 case OP_MUL: /* * */
4117 v = num_one; 4125 v = num_one;
4118 4126
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4127 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4128 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4129
4122 s_return (mk_number (SCHEME_A_ v)); 4130 s_return (mk_number (SCHEME_A_ v));
4123 4131
4124 case OP_SUB: /* - */ 4132 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4133 if (cdr (args) == NIL)
4126 { 4134 {
4127 x = SCHEME_V->args; 4135 x = args;
4128 v = num_zero; 4136 v = num_zero;
4129 } 4137 }
4130 else 4138 else
4131 { 4139 {
4132 x = cdr (SCHEME_V->args); 4140 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4141 v = nvalue (car (args));
4134 } 4142 }
4135 4143
4136 for (; x != NIL; x = cdr (x)) 4144 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4145 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4146
4139 s_return (mk_number (SCHEME_A_ v)); 4147 s_return (mk_number (SCHEME_A_ v));
4140 4148
4141 case OP_DIV: /* / */ 4149 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4150 if (cdr (args) == NIL)
4143 { 4151 {
4144 x = SCHEME_V->args; 4152 x = args;
4145 v = num_one; 4153 v = num_one;
4146 } 4154 }
4147 else 4155 else
4148 { 4156 {
4149 x = cdr (SCHEME_V->args); 4157 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4158 v = nvalue (car (args));
4151 } 4159 }
4152 4160
4153 for (; x != NIL; x = cdr (x)) 4161 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4162 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4163 v = num_div (v, nvalue (car (x)));
4157 else 4164 else
4158 Error_0 ("/: division by zero"); 4165 Error_0 ("/: division by zero");
4159 }
4160 4166
4161 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4162 4168
4163 case OP_INTDIV: /* quotient */ 4169 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4170 if (cdr (args) == NIL)
4165 { 4171 {
4166 x = SCHEME_V->args; 4172 x = args;
4167 v = num_one; 4173 v = num_one;
4168 } 4174 }
4169 else 4175 else
4170 { 4176 {
4171 x = cdr (SCHEME_V->args); 4177 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4178 v = nvalue (car (args));
4173 } 4179 }
4174 4180
4175 for (; x != NIL; x = cdr (x)) 4181 for (; x != NIL; x = cdr (x))
4176 { 4182 {
4177 if (ivalue (car (x)) != 0) 4183 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4184 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4185 else
4180 Error_0 ("quotient: division by zero"); 4186 Error_0 ("quotient: division by zero");
4181 } 4187 }
4182 4188
4183 s_return (mk_number (SCHEME_A_ v)); 4189 s_return (mk_number (SCHEME_A_ v));
4184 4190
4185 case OP_REM: /* remainder */ 4191 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4192 v = nvalue (x);
4187 4193
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4194 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4195 v = num_rem (v, nvalue (cadr (args)));
4190 else 4196 else
4191 Error_0 ("remainder: division by zero"); 4197 Error_0 ("remainder: division by zero");
4192 4198
4193 s_return (mk_number (SCHEME_A_ v)); 4199 s_return (mk_number (SCHEME_A_ v));
4194 4200
4195 case OP_MOD: /* modulo */ 4201 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4202 v = nvalue (x);
4197 4203
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4204 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4205 v = num_mod (v, nvalue (cadr (args)));
4200 else 4206 else
4201 Error_0 ("modulo: division by zero"); 4207 Error_0 ("modulo: division by zero");
4202 4208
4203 s_return (mk_number (SCHEME_A_ v)); 4209 s_return (mk_number (SCHEME_A_ v));
4204 4210
4205 case OP_CAR: /* car */ 4211 /* the compiler will optimize this mess... */
4206 s_return (caar (SCHEME_V->args)); 4212 case OP_CAR: op_car: s_return (car (x));
4207 4213 case OP_CDR: op_cdr: s_return (cdr (x));
4208 case OP_CDR: /* cdr */ 4214 case OP_CAAR: op_caar: x = car (x); goto op_car;
4209 s_return (cdar (SCHEME_V->args)); 4215 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4216 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4217 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4218 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4219 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4220 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4221 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4222 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4223 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4224 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4225 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4226 case OP_CAAAAR: x = car (x); goto op_caaar;
4227 case OP_CAAADR: x = cdr (x); goto op_caaar;
4228 case OP_CAADAR: x = car (x); goto op_caadr;
4229 case OP_CAADDR: x = cdr (x); goto op_caadr;
4230 case OP_CADAAR: x = car (x); goto op_cadar;
4231 case OP_CADADR: x = cdr (x); goto op_cadar;
4232 case OP_CADDAR: x = car (x); goto op_caddr;
4233 case OP_CADDDR: x = cdr (x); goto op_caddr;
4234 case OP_CDAAAR: x = car (x); goto op_cdaar;
4235 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4236 case OP_CDADAR: x = car (x); goto op_cdadr;
4237 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4238 case OP_CDDAAR: x = car (x); goto op_cddar;
4239 case OP_CDDADR: x = cdr (x); goto op_cddar;
4240 case OP_CDDDAR: x = car (x); goto op_cdddr;
4241 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4210 4242
4211 case OP_CONS: /* cons */ 4243 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4244 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4245 s_return (args);
4214 4246
4215 case OP_SETCAR: /* set-car! */ 4247 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4248 if (!is_immutable (x))
4217 { 4249 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4250 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4251 s_return (car (args));
4220 } 4252 }
4221 else 4253 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4254 Error_0 ("set-car!: unable to alter immutable pair");
4223 4255
4224 case OP_SETCDR: /* set-cdr! */ 4256 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4257 if (!is_immutable (x))
4226 { 4258 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4259 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4260 s_return (car (args));
4229 } 4261 }
4230 else 4262 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4263 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4264
4233 case OP_CHAR2INT: /* char->integer */ 4265 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4266 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4235 4267
4236 case OP_INT2CHAR: /* integer->char */ 4268 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4269 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4238 4270
4239 case OP_CHARUPCASE: 4271 case OP_CHARUPCASE:
4240 { 4272 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4273 unsigned char c = ivalue_unchecked (x);
4242 c = toupper (c); 4274 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4275 s_return (mk_character (SCHEME_A_ c));
4244 } 4276 }
4245 4277
4246 case OP_CHARDNCASE: 4278 case OP_CHARDNCASE:
4247 { 4279 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4280 unsigned char c = ivalue_unchecked (x);
4249 c = tolower (c); 4281 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4282 s_return (mk_character (SCHEME_A_ c));
4251 } 4283 }
4252 4284
4253 case OP_STR2SYM: /* string->symbol */ 4285 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4286 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4287
4256 case OP_STR2ATOM: /* string->atom */ 4288 case OP_STR2ATOM: /* string->atom */
4257 { 4289 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4290 char *s = strvalue (x);
4259 long pf = 0; 4291 long pf = 0;
4260 4292
4261 if (cdr (SCHEME_V->args) != NIL) 4293 if (cdr (args) != NIL)
4262 { 4294 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4295 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4296 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4297 pf = ivalue_unchecked (cadr (args));
4266 4298
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4299 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4300 {
4269 /* base is OK */ 4301 /* base is OK */
4270 } 4302 }
4271 else 4303 else
4272 pf = -1; 4304 pf = -1;
4273 } 4305 }
4274 4306
4275 if (pf < 0) 4307 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4308 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4309 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4310 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4311 else
4280 { 4312 {
4281 if (pf == 0 || pf == 10) 4313 if (pf == 0 || pf == 10)
… …
4292 } 4324 }
4293 } 4325 }
4294 } 4326 }
4295 4327
4296 case OP_SYM2STR: /* symbol->string */ 4328 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4329 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4330 setimmutable (x);
4299 s_return (x); 4331 s_return (x);
4300 4332
4301 case OP_ATOM2STR: /* atom->string */ 4333 case OP_ATOM2STR: /* atom->string */
4302 { 4334 {
4303 long pf = 0; 4335 long pf = 0;
4304 4336
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4337 if (cdr (args) != NIL)
4308 { 4338 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4339 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4340 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4341 pf = ivalue_unchecked (cadr (args));
4312 4342
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4343 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4344 {
4315 /* base is OK */ 4345 /* base is OK */
4316 } 4346 }
4317 else 4347 else
4318 pf = -1; 4348 pf = -1;
4319 } 4349 }
4320 4350
4321 if (pf < 0) 4351 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4352 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4353 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4354 {
4325 char *p; 4355 char *p;
4326 int len; 4356 int len;
4327 4357
… …
4332 Error_1 ("atom->string: not an atom:", x); 4362 Error_1 ("atom->string: not an atom:", x);
4333 } 4363 }
4334 4364
4335 case OP_MKSTRING: /* make-string */ 4365 case OP_MKSTRING: /* make-string */
4336 { 4366 {
4337 int fill = ' '; 4367 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4338 int len; 4368 int len = ivalue_unchecked (x);
4339 4369
4340 len = ivalue (car (SCHEME_V->args));
4341
4342 if (cdr (SCHEME_V->args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args));
4344
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4370 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4371 }
4347 4372
4348 case OP_STRLEN: /* string-length */ 4373 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4374 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4375
4351 case OP_STRREF: /* string-ref */ 4376 case OP_STRREF: /* string-ref */
4352 { 4377 {
4353 char *str; 4378 char *str = strvalue (x);
4354 int index;
4355
4356 str = strvalue (car (SCHEME_V->args));
4357
4358 index = ivalue (cadr (SCHEME_V->args)); 4379 int index = ivalue_unchecked (cadr (args));
4359 4380
4360 if (index >= strlength (car (SCHEME_V->args))) 4381 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4382 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4383
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4384 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4385 }
4365 4386
4366 case OP_STRSET: /* string-set! */ 4387 case OP_STRSET: /* string-set! */
4367 { 4388 {
4368 char *str; 4389 char *str = strvalue (x);
4369 int index; 4390 int index = ivalue_unchecked (cadr (args));
4370 int c; 4391 int c;
4371 4392
4372 if (is_immutable (car (SCHEME_V->args))) 4393 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4394 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4395
4375 str = strvalue (car (SCHEME_V->args));
4376
4377 index = ivalue (cadr (SCHEME_V->args));
4378
4379 if (index >= strlength (car (SCHEME_V->args))) 4396 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4397 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4398
4382 c = charvalue (caddr (SCHEME_V->args)); 4399 c = charvalue (caddr (args));
4383 4400
4384 str[index] = (char) c; 4401 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4402 s_return (car (args));
4386 } 4403 }
4387 4404
4388 case OP_STRAPPEND: /* string-append */ 4405 case OP_STRAPPEND: /* string-append */
4389 { 4406 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4407 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4408 int len = 0;
4392 pointer newstr; 4409 pointer newstr;
4393 char *pos; 4410 char *pos;
4394 4411
4395 /* compute needed length for new string */ 4412 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4413 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4414 len += strlength (car (x));
4398 4415
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4416 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4417
4401 /* store the contents of the argument strings into the new string */ 4418 /* store the contents of the argument strings into the new string */
4402 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4419 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4420 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4421
4405 s_return (newstr); 4422 s_return (newstr);
4406 } 4423 }
4407 4424
4408 case OP_SUBSTR: /* substring */ 4425 case OP_SUBSTR: /* substring */
4409 { 4426 {
4410 char *str; 4427 char *str = strvalue (x);
4411 int index0; 4428 int index0 = ivalue_unchecked (cadr (args));
4412 int index1; 4429 int index1;
4413 int len; 4430 int len;
4414 4431
4415 str = strvalue (car (SCHEME_V->args));
4416
4417 index0 = ivalue (cadr (SCHEME_V->args));
4418
4419 if (index0 > strlength (car (SCHEME_V->args))) 4432 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4433 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4434
4422 if (cddr (SCHEME_V->args) != NIL) 4435 if (cddr (args) != NIL)
4423 { 4436 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4437 index1 = ivalue_unchecked (caddr (args));
4425 4438
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4439 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4440 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4441 }
4429 else 4442 else
4430 index1 = strlength (car (SCHEME_V->args)); 4443 index1 = strlength (x);
4431 4444
4432 len = index1 - index0; 4445 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4446 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4447 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4448 strvalue (x)[len] = 0;
… …
4439 4452
4440 case OP_VECTOR: /* vector */ 4453 case OP_VECTOR: /* vector */
4441 { 4454 {
4442 int i; 4455 int i;
4443 pointer vec; 4456 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4457 int len = list_length (SCHEME_A_ args);
4445 4458
4446 if (len < 0) 4459 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4460 Error_1 ("vector: not a proper list:", args);
4448 4461
4449 vec = mk_vector (SCHEME_A_ len); 4462 vec = mk_vector (SCHEME_A_ len);
4450 4463
4451#if USE_ERROR_CHECKING 4464#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4465 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4466 s_return (S_SINK);
4454#endif 4467#endif
4455 4468
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4469 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4470 vector_set (vec, i, car (x));
4458 4471
4459 s_return (vec); 4472 s_return (vec);
4460 } 4473 }
4461 4474
4462 case OP_MKVECTOR: /* make-vector */ 4475 case OP_MKVECTOR: /* make-vector */
4463 { 4476 {
4464 pointer fill = NIL; 4477 pointer fill = NIL;
4465 int len;
4466 pointer vec; 4478 pointer vec;
4479 int len = ivalue_unchecked (x);
4467 4480
4468 len = ivalue (car (SCHEME_V->args));
4469
4470 if (cdr (SCHEME_V->args) != NIL) 4481 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4482 fill = cadr (args);
4472 4483
4473 vec = mk_vector (SCHEME_A_ len); 4484 vec = mk_vector (SCHEME_A_ len);
4474 4485
4475#if USE_ERROR_CHECKING 4486#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4487 if (SCHEME_V->no_memory)
4477 s_return (S_SINK); 4488 s_return (S_SINK);
4478#endif 4489#endif
4479 4490
4480 if (fill != NIL) 4491 if (fill != NIL)
4481 fill_vector (vec, fill); 4492 fill_vector (vec, 0, fill);
4482 4493
4483 s_return (vec); 4494 s_return (vec);
4484 } 4495 }
4485 4496
4486 case OP_VECLEN: /* vector-length */ 4497 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4498 s_return (mk_integer (SCHEME_A_ veclength (x)));
4499
4500 case OP_VECRESIZE:
4501 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4502 s_return (x);
4488 4503
4489 case OP_VECREF: /* vector-ref */ 4504 case OP_VECREF: /* vector-ref */
4490 { 4505 {
4491 int index;
4492
4493 index = ivalue (cadr (SCHEME_V->args)); 4506 int index = ivalue_unchecked (cadr (args));
4494 4507
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4508 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4509 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4510
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4511 s_return (vector_get (x, index));
4499 } 4512 }
4500 4513
4501 case OP_VECSET: /* vector-set! */ 4514 case OP_VECSET: /* vector-set! */
4502 { 4515 {
4503 int index; 4516 int index = ivalue_unchecked (cadr (args));
4504 4517
4505 if (is_immutable (car (SCHEME_V->args))) 4518 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4519 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4520
4508 index = ivalue (cadr (SCHEME_V->args));
4509
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4521 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4522 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4523
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4524 vector_set (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4525 s_return (x);
4515 } 4526 }
4516 } 4527 }
4517 4528
4518 return S_T; 4529 if (USE_ERROR_CHECKING) abort ();
4519} 4530}
4520 4531
4521INTERFACE int 4532static int
4522is_list (SCHEME_P_ pointer a) 4533opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4534{
4524 return list_length (SCHEME_A_ a) >= 0; 4535 pointer x = SCHEME_V->args;
4525}
4526 4536
4527/* Result is: 4537 for (;;)
4528 proper list: length
4529 circular list: -1
4530 not even a pair: -2
4531 dotted list: -2 minus length before dot
4532*/
4533INTERFACE int
4534list_length (SCHEME_P_ pointer a)
4535{
4536 int i = 0;
4537 pointer slow, fast;
4538
4539 slow = fast = a;
4540
4541 while (1)
4542 { 4538 {
4539 num v = nvalue (car (x));
4540 x = cdr (x);
4541
4543 if (fast == NIL) 4542 if (x == NIL)
4544 return i; 4543 break;
4545 4544
4546 if (!is_pair (fast)) 4545 int r = num_cmp (v, nvalue (car (x)));
4547 return -2 - i;
4548 4546
4549 fast = cdr (fast); 4547 switch (op)
4550 ++i;
4551
4552 if (fast == NIL)
4553 return i;
4554
4555 if (!is_pair (fast))
4556 return -2 - i;
4557
4558 ++i;
4559 fast = cdr (fast);
4560
4561 /* Safe because we would have already returned if `fast'
4562 encountered a non-pair. */
4563 slow = cdr (slow);
4564
4565 if (fast == slow)
4566 { 4548 {
4567 /* the fast pointer has looped back around and caught up 4549 case OP_NUMEQ: r = r == 0; break;
4568 with the slow pointer, hence the structure is circular, 4550 case OP_LESS: r = r < 0; break;
4569 not of finite length, and therefore not a list */ 4551 case OP_GRE: r = r > 0; break;
4570 return -1; 4552 case OP_LEQ: r = r <= 0; break;
4553 case OP_GEQ: r = r >= 0; break;
4571 } 4554 }
4572 }
4573}
4574 4555
4556 if (!r)
4557 s_return (S_F);
4558 }
4559
4560 s_return (S_T);
4561}
4562
4575static pointer 4563static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4564opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4565{
4578 pointer x; 4566 pointer args = SCHEME_V->args;
4579 num v; 4567 pointer a = car (args);
4580 int (*comp_func) (num, num); 4568 pointer d = cdr (args);
4569 int r;
4581 4570
4582 switch (op) 4571 switch (op)
4583 { 4572 {
4584 case OP_NOT: /* not */ 4573 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4574 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4575 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4576 case OP_NULLP: /* null? */ r = a == NIL ; break;
4577 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4578 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4579 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4580 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4581 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4582 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4583 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4584
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4585#if USE_CHAR_CLASSIFIERS
4656 4586 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4657 case OP_CHARAP: /* char-alphabetic? */ 4587 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4588 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4659 4589 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4660 case OP_CHARNP: /* char-numeric? */ 4590 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4591#endif
4592
4672#if USE_PORTS 4593#if USE_PORTS
4673 4594 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4595 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4596 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4597#endif
4683 4598
4684 case OP_PROCP: /* procedure? */ 4599 case OP_PROCP: /* procedure? */
4685 4600
4686 /*-- 4601 /*--
4687 * continuation should be procedure by the example 4602 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4603 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4604 * in R^3 report sec. 6.9
4690 */ 4605 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4606 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4607 break;
4693 4608
4694 case OP_PAIRP: /* pair? */ 4609 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4610 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4611 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4612 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4613 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4614 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4615 }
4712 4616
4713 return S_T; 4617 s_retbool (r);
4714} 4618}
4715 4619
4716static pointer 4620static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4621opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4622{
4623 pointer args = SCHEME_V->args;
4624 pointer a = car (args);
4719 pointer x, y; 4625 pointer x, y;
4720 4626
4721 switch (op) 4627 switch (op)
4722 { 4628 {
4723 case OP_FORCE: /* force */ 4629 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4630 SCHEME_V->code = a;
4725 4631
4726 if (is_promise (SCHEME_V->code)) 4632 if (is_promise (SCHEME_V->code))
4727 { 4633 {
4728 /* Should change type to closure here */ 4634 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4635 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4732 } 4638 }
4733 else 4639 else
4734 s_return (SCHEME_V->code); 4640 s_return (SCHEME_V->code);
4735 4641
4736 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4642 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4737 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4643 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4738 s_return (SCHEME_V->value); 4644 s_return (SCHEME_V->value);
4739 4645
4740#if USE_PORTS 4646#if USE_PORTS
4741 4647
4742 case OP_WRITE: /* write */ 4648 case OP_WRITE: /* write */
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4656 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4657 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4658 }
4753 } 4659 }
4754 4660
4755 SCHEME_V->args = car (SCHEME_V->args); 4661 SCHEME_V->args = a;
4756 4662
4757 if (op == OP_WRITE) 4663 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4664 SCHEME_V->print_flag = 1;
4759 else 4665 else
4760 SCHEME_V->print_flag = 0; 4666 SCHEME_V->print_flag = 0;
4761 4667
4762 s_goto (OP_P0LIST); 4668 s_goto (OP_P0LIST);
4763 4669
4764 case OP_NEWLINE: /* newline */ 4670 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
4766 { 4672 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4673 if (a != SCHEME_V->outport)
4768 { 4674 {
4769 x = cons (SCHEME_V->outport, NIL); 4675 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4676 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4677 SCHEME_V->outport = a;
4772 } 4678 }
4773 } 4679 }
4774 4680
4775 putstr (SCHEME_A_ "\n"); 4681 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4682 s_return (S_T);
4777#endif 4683#endif
4778 4684
4779 case OP_ERR0: /* error */ 4685 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4686 SCHEME_V->retcode = -1;
4781 4687
4782 if (!is_string (car (SCHEME_V->args))) 4688 if (!is_string (a))
4783 { 4689 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4690 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4691 setimmutable (car (args));
4786 } 4692 }
4787 4693
4788 putstr (SCHEME_A_ "Error: "); 4694 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4695 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4696 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4697 s_goto (OP_ERR1);
4792 4698
4793 case OP_ERR1: /* error */ 4699 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4700 putstr (SCHEME_A_ " ");
4795 4701
4796 if (SCHEME_V->args != NIL) 4702 if (args != NIL)
4797 { 4703 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4704 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4705 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4706 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4707 s_goto (OP_P0LIST);
4802 } 4708 }
4803 else 4709 else
4804 { 4710 {
4805 putstr (SCHEME_A_ "\n"); 4711 putstr (SCHEME_A_ "\n");
4806 4712
4807 if (SCHEME_V->interactive_repl) 4713 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4714 s_goto (OP_T0LVL);
4809 else 4715 else
4810 return NIL; 4716 return -1;
4811 } 4717 }
4812 4718
4813 case OP_REVERSE: /* reverse */ 4719 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4720 s_return (reverse (SCHEME_A_ a));
4815 4721
4816 case OP_LIST_STAR: /* list* */ 4722 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4723 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4724
4819 case OP_APPEND: /* append */ 4725 case OP_APPEND: /* append */
4820 x = NIL; 4726 x = NIL;
4821 y = SCHEME_V->args; 4727 y = args;
4822 4728
4823 if (y == x) 4729 if (y == x)
4824 s_return (x); 4730 s_return (x);
4825 4731
4826 /* cdr() in the while condition is not a typo. If car() */ 4732 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4743 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4744
4839#if USE_PLIST 4745#if USE_PLIST
4840 4746
4841 case OP_PUT: /* put */ 4747 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4748 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4749 Error_0 ("illegal use of put");
4844 4750
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4751 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4752 {
4847 if (caar (x) == y) 4753 if (caar (x) == y)
4848 break; 4754 break;
4849 } 4755 }
4850 4756
4851 if (x != NIL) 4757 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4758 cdar (x) = caddr (args);
4853 else 4759 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4760 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4761
4856 s_return (S_T); 4762 s_return (S_T);
4857 4763
4858 case OP_GET: /* get */ 4764 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4765 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4766 Error_0 ("illegal use of get");
4861 4767
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4768 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4769 if (caar (x) == y)
4864 break; 4770 break;
4865 4771
4866 if (x != NIL) 4772 if (x != NIL)
4867 s_return (cdar (x)); 4773 s_return (cdar (x));
… …
4869 s_return (NIL); 4775 s_return (NIL);
4870 4776
4871#endif /* USE_PLIST */ 4777#endif /* USE_PLIST */
4872 4778
4873 case OP_QUIT: /* quit */ 4779 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4780 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4781 SCHEME_V->retcode = ivalue (a);
4876 4782
4877 return NIL; 4783 return -1;
4878 4784
4879 case OP_GC: /* gc */ 4785 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4786 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4787 s_return (S_T);
4882 4788
4883 case OP_GCVERB: /* gc-verbose */ 4789 case OP_GCVERB: /* gc-verbose */
4884 { 4790 {
4885 int was = SCHEME_V->gc_verbose; 4791 int was = SCHEME_V->gc_verbose;
4886 4792
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4793 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4794 s_retbool (was);
4889 } 4795 }
4890 4796
4891 case OP_NEWSEGMENT: /* new-segment */ 4797 case OP_NEWSEGMENT: /* new-segment */
4798#if 0
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4799 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4800 Error_0 ("new-segment: argument must be a number");
4894 4801#endif
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4802 s_retbool (alloc_cellseg (SCHEME_A));
4896
4897 s_return (S_T);
4898 4803
4899 case OP_OBLIST: /* oblist */ 4804 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4805 s_return (oblist_all_symbols (SCHEME_A));
4901 4806
4902#if USE_PORTS 4807#if USE_PORTS
… …
4927 case OP_OPEN_INOUTFILE: 4832 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4833 prop = port_input | port_output;
4929 break; 4834 break;
4930 } 4835 }
4931 4836
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4837 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4838
4934 if (p == NIL) 4839 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4840 }
4939 4841
4940# if USE_STRING_PORTS 4842# if USE_STRING_PORTS
4941 4843
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4844 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4856 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4857 prop = port_input | port_output;
4956 break; 4858 break;
4957 } 4859 }
4958 4860
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4861 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4862 strvalue (a) + strlength (a), prop);
4961 4863
4962 if (p == NIL) 4864 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4865 }
4967 4866
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4867 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4868 {
4970 pointer p; 4869 pointer p;
4971 4870
4972 if (car (SCHEME_V->args) == NIL) 4871 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4872 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4873 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4874 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4875 strvalue (a) + strlength (a), port_output);
4983 4876
4984 if (p == NIL) 4877 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4878 }
4990 4879
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4880 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4881 {
4993 port *p; 4882 port *p = port (a);
4994 4883
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4884 if (p->kind & port_string)
4996 { 4885 {
4997 off_t size; 4886 off_t size;
4998 char *str; 4887 char *str;
4999 4888
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4889 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4905 }
5017 4906
5018# endif 4907# endif
5019 4908
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4909 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4910 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4911 s_return (S_T);
5023 4912
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4913 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4914 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4915 s_return (S_T);
5027#endif 4916#endif
5028 4917
5029 case OP_INT_ENV: /* interaction-environment */ 4918 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4919 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4921 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4922 s_return (SCHEME_V->envir);
5034 4923
5035 } 4924 }
5036 4925
5037 return S_T; 4926 if (USE_ERROR_CHECKING) abort ();
5038} 4927}
5039 4928
5040static pointer 4929static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4930opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4931{
4932 pointer args = SCHEME_V->args;
5043 pointer x; 4933 pointer x;
5044 4934
5045 if (SCHEME_V->nesting != 0) 4935 if (SCHEME_V->nesting != 0)
5046 { 4936 {
5047 int n = SCHEME_V->nesting; 4937 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4944 switch (op)
5055 { 4945 {
5056 /* ========== reading part ========== */ 4946 /* ========== reading part ========== */
5057#if USE_PORTS 4947#if USE_PORTS
5058 case OP_READ: 4948 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4949 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4950 s_goto (OP_READ_INTERNAL);
5061 4951
5062 if (!is_inport (car (SCHEME_V->args))) 4952 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4953 Error_1 ("read: not an input port:", car (args));
5064 4954
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4955 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4956 s_goto (OP_READ_INTERNAL);
5067 4957
5068 x = SCHEME_V->inport; 4958 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4959 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4960 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4961 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4962 s_goto (OP_READ_INTERNAL);
5073 4963
5074 case OP_READ_CHAR: /* read-char */ 4964 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4965 case OP_PEEK_CHAR: /* peek-char */
5076 { 4966 {
5077 int c; 4967 int c;
5078 4968
5079 if (is_pair (SCHEME_V->args)) 4969 if (is_pair (args))
5080 { 4970 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4971 if (car (args) != SCHEME_V->inport)
5082 { 4972 {
5083 x = SCHEME_V->inport; 4973 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4974 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4975 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4976 SCHEME_V->inport = car (args);
5087 } 4977 }
5088 } 4978 }
5089 4979
5090 c = inchar (SCHEME_A); 4980 c = inchar (SCHEME_A);
5091 4981
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4991 case OP_CHAR_READY: /* char-ready? */
5102 { 4992 {
5103 pointer p = SCHEME_V->inport; 4993 pointer p = SCHEME_V->inport;
5104 int res; 4994 int res;
5105 4995
5106 if (is_pair (SCHEME_V->args)) 4996 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4997 p = car (args);
5108 4998
5109 res = p->object.port->kind & port_string; 4999 res = port (p)->kind & port_string;
5110 5000
5111 s_retbool (res); 5001 s_retbool (res);
5112 } 5002 }
5113 5003
5114 case OP_SET_INPORT: /* set-input-port */ 5004 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 5005 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 5006 s_return (SCHEME_V->value);
5117 5007
5118 case OP_SET_OUTPORT: /* set-output-port */ 5008 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 5009 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 5010 s_return (SCHEME_V->value);
5121#endif 5011#endif
5122 5012
5123 case OP_RDSEXPR: 5013 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 5014 switch (SCHEME_V->tok)
… …
5173 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5063 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5174 SCHEME_V->tok = token (SCHEME_A); 5064 SCHEME_V->tok = token (SCHEME_A);
5175 s_goto (OP_RDSEXPR); 5065 s_goto (OP_RDSEXPR);
5176 5066
5177 case TOK_ATOM: 5067 case TOK_ATOM:
5178 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5068 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5069
5070 case TOK_DOTATOM:
5071 SCHEME_V->strbuff[0] = '.';
5072 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5073
5074 case TOK_STRATOM:
5075 x = readstrexp (SCHEME_A_ '|');
5076 //TODO: haven't checked whether the garbage collector could interfere
5077 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5179 5078
5180 case TOK_DQUOTE: 5079 case TOK_DQUOTE:
5181 x = readstrexp (SCHEME_A); 5080 x = readstrexp (SCHEME_A_ '"');
5182 5081
5183 if (x == S_F) 5082 if (x == S_F)
5184 Error_0 ("Error reading string"); 5083 Error_0 ("Error reading string");
5185 5084
5186 setimmutable (x); 5085 setimmutable (x);
… …
5198 s_goto (OP_EVAL); 5097 s_goto (OP_EVAL);
5199 } 5098 }
5200 } 5099 }
5201 5100
5202 case TOK_SHARP_CONST: 5101 case TOK_SHARP_CONST:
5203 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5102 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5204 Error_0 ("undefined sharp expression"); 5103 Error_0 ("undefined sharp expression");
5205 else 5104 else
5206 s_return (x); 5105 s_return (x);
5207 5106
5208 default: 5107 default:
… …
5210 } 5109 }
5211 5110
5212 break; 5111 break;
5213 5112
5214 case OP_RDLIST: 5113 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5114 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5115 SCHEME_V->tok = token (SCHEME_A);
5217 5116
5218 switch (SCHEME_V->tok) 5117 switch (SCHEME_V->tok)
5219 { 5118 {
5220 case TOK_EOF: 5119 case TOK_EOF:
… …
5248 case OP_RDDOT: 5147 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5148 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5149 Error_0 ("syntax error: illegal dot expression");
5251 5150
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5151 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5152 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5153
5255 case OP_RDQUOTE: 5154 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5155 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5156
5258 case OP_RDQQUOTE: 5157 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5179 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5180 s_goto (OP_VECTOR);
5282 5181
5283 /* ========== printing part ========== */ 5182 /* ========== printing part ========== */
5284 case OP_P0LIST: 5183 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5184 if (is_vector (args))
5286 { 5185 {
5287 putstr (SCHEME_A_ "#("); 5186 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5187 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5188 s_goto (OP_PVECFROM);
5290 } 5189 }
5291 else if (is_environment (SCHEME_V->args)) 5190 else if (is_environment (args))
5292 { 5191 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5192 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5193 s_return (S_T);
5295 } 5194 }
5296 else if (!is_pair (SCHEME_V->args)) 5195 else if (!is_pair (args))
5297 { 5196 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5197 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5198 s_return (S_T);
5300 } 5199 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5200 else
5302 { 5201 {
5202 pointer a = car (args);
5203 pointer b = cdr (args);
5204 int ok_abbr = ok_abbrev (b);
5205 SCHEME_V->args = car (b);
5206
5207 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5208 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5209 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5210 putstr (SCHEME_A_ "`");
5211 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5212 putstr (SCHEME_A_ ",");
5213 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5214 putstr (SCHEME_A_ ",@");
5215 else
5216 {
5217 putstr (SCHEME_A_ "(");
5218 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5219 SCHEME_V->args = a;
5220 }
5221
5305 s_goto (OP_P0LIST); 5222 s_goto (OP_P0LIST);
5306 } 5223 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5224
5225 case OP_P1LIST:
5226 if (is_pair (args))
5308 { 5227 {
5228 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5229 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5230 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5231 s_goto (OP_P0LIST);
5312 } 5232 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5233 else if (is_vector (args))
5342 { 5234 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5235 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5236 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5237 s_goto (OP_P0LIST);
5346 } 5238 }
5347 else 5239 else
5348 { 5240 {
5349 if (SCHEME_V->args != NIL) 5241 if (args != NIL)
5350 { 5242 {
5351 putstr (SCHEME_A_ " . "); 5243 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5244 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5245 }
5354 5246
5355 putstr (SCHEME_A_ ")"); 5247 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5248 s_return (S_T);
5357 } 5249 }
5358 5250
5359 case OP_PVECFROM: 5251 case OP_PVECFROM:
5360 { 5252 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5253 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5254 pointer vec = car (args);
5363 int len = veclength (vec); 5255 int len = veclength (vec);
5364 5256
5365 if (i == len) 5257 if (i == len)
5366 { 5258 {
5367 putstr (SCHEME_A_ ")"); 5259 putstr (SCHEME_A_ ")");
5368 s_return (S_T); 5260 s_return (S_T);
5369 } 5261 }
5370 else 5262 else
5371 { 5263 {
5372 pointer elem = vector_elem (vec, i); 5264 pointer elem = vector_get (vec, i);
5373 5265
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5266 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5267 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5268 SCHEME_V->args = elem;
5377 5269
5378 if (i > 0) 5270 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5271 putstr (SCHEME_A_ " ");
5380 5272
5381 s_goto (OP_P0LIST); 5273 s_goto (OP_P0LIST);
5382 } 5274 }
5383 } 5275 }
5384 } 5276 }
5385 5277
5386 return S_T; 5278 if (USE_ERROR_CHECKING) abort ();
5387} 5279}
5388 5280
5389static pointer 5281static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5282opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5283{
5284 pointer args = SCHEME_V->args;
5285 pointer a = car (args);
5392 pointer x, y; 5286 pointer x, y;
5393 5287
5394 switch (op) 5288 switch (op)
5395 { 5289 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5290 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5291 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5292 long v = list_length (SCHEME_A_ a);
5399 5293
5400 if (v < 0) 5294 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5295 Error_1 ("length: not a list:", a);
5402 5296
5403 s_return (mk_integer (SCHEME_A_ v)); 5297 s_return (mk_integer (SCHEME_A_ v));
5404 } 5298 }
5405 5299
5406 case OP_ASSQ: /* assq *//* a.k */ 5300 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5301 x = a;
5408 5302
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5303 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5304 {
5411 if (!is_pair (car (y))) 5305 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5306 Error_0 ("unable to handle non pair element");
5413 5307
5414 if (x == caar (y)) 5308 if (x == caar (y))
… …
5420 else 5314 else
5421 s_return (S_F); 5315 s_return (S_F);
5422 5316
5423 5317
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5318 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5319 SCHEME_V->args = a;
5426 5320
5427 if (SCHEME_V->args == NIL) 5321 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5322 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5323 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5324 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5435 5329
5436 case OP_CLOSUREP: /* closure? */ 5330 case OP_CLOSUREP: /* closure? */
5437 /* 5331 /*
5438 * Note, macro object is also a closure. 5332 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5333 * Therefore, (closure? <#MACRO>) ==> #t
5334 * (schmorp) well, obviously not, fix? TODO
5440 */ 5335 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5336 s_retbool (is_closure (a));
5442 5337
5443 case OP_MACROP: /* macro? */ 5338 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5339 s_retbool (is_macro (a));
5445 } 5340 }
5446 5341
5447 return S_T; /* NOTREACHED */ 5342 if (USE_ERROR_CHECKING) abort ();
5448} 5343}
5449 5344
5345/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5346typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5347
5452typedef int (*test_predicate) (pointer); 5348typedef int (*test_predicate)(pointer);
5453static int 5349static int
5454is_any (pointer p) 5350tst_any (pointer p)
5455{ 5351{
5456 return 1; 5352 return 1;
5457} 5353}
5458 5354
5459static int 5355static int
5460is_nonneg (pointer p) 5356tst_inonneg (pointer p)
5461{ 5357{
5462 return ivalue (p) >= 0 && is_integer (p); 5358 return is_integer (p) && ivalue_unchecked (p) >= 0;
5359}
5360
5361static int
5362tst_is_list (SCHEME_P_ pointer p)
5363{
5364 return p == NIL || is_pair (p);
5463} 5365}
5464 5366
5465/* Correspond carefully with following defines! */ 5367/* Correspond carefully with following defines! */
5466static struct 5368static struct
5467{ 5369{
5468 test_predicate fct; 5370 test_predicate fct;
5469 const char *kind; 5371 const char *kind;
5470} tests[] = 5372} tests[] = {
5471{ 5373 { tst_any , 0 },
5472 { 0, 0}, /* unused */ 5374 { is_string , "string" },
5473 { is_any, 0}, 5375 { is_symbol , "symbol" },
5474 { is_string, "string" }, 5376 { is_port , "port" },
5475 { is_symbol, "symbol" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5377 { is_inport , "input port" },
5478 { is_outport, "output port" }, 5378 { is_outport , "output port" },
5479 { is_environment, "environment" }, 5379 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5380 { is_pair , "pair" },
5481 { 0, "pair or '()" }, 5381 { 0 , "pair or '()" },
5482 { is_character, "character" }, 5382 { is_character , "character" },
5483 { is_vector, "vector" }, 5383 { is_vector , "vector" },
5484 { is_number, "number" }, 5384 { is_number , "number" },
5485 { is_integer, "integer" }, 5385 { is_integer , "integer" },
5486 { is_nonneg, "non-negative integer" } 5386 { tst_inonneg , "non-negative integer" }
5487}; 5387};
5488 5388
5489#define TST_NONE 0 5389#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5390#define TST_ANY "\001"
5491#define TST_STRING "\002" 5391#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5392#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5393#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5394#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5395#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5396#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5397#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5398#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5399#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5400#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5401#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5402#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5403#define TST_NATURAL "\016"
5404
5405#define INF_ARG 0xff
5406#define UNNAMED_OP ""
5407
5408static const char opnames[] =
5409#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5410#include "opdefines.h"
5411#undef OP_DEF
5412;
5413
5414static const char *
5415opname (int idx)
5416{
5417 const char *name = opnames;
5418
5419 /* should do this at compile time, but would require external program, right? */
5420 while (idx--)
5421 name += strlen (name) + 1;
5422
5423 return *name ? name : "ILLEGAL";
5424}
5425
5426static const char *
5427procname (pointer x)
5428{
5429 return opname (procnum (x));
5430}
5504 5431
5505typedef struct 5432typedef struct
5506{ 5433{
5507 dispatch_func func; 5434 uint8_t func;
5508 char *name; 5435 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5436 uint8_t builtin;
5437#if USE_ERROR_CHECKING
5509 int min_arity; 5438 uint8_t min_arity;
5510 int max_arity; 5439 uint8_t max_arity;
5511 char *arg_tests_encoding; 5440 char arg_tests_encoding[3];
5441#endif
5512} op_code_info; 5442} op_code_info;
5513 5443
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5444static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5445#if USE_ERROR_CHECKING
5446#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5447#else
5448#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5449#endif
5518#include "opdefines.h" 5450#include "opdefines.h"
5451#undef OP_DEF
5519 {0} 5452 {0}
5520}; 5453};
5521 5454
5522static const char *
5523procname (pointer x)
5524{
5525 int n = procnum (x);
5526 const char *name = dispatch_table[n].name;
5527
5528 if (name == 0)
5529 name = "ILLEGAL!";
5530
5531 return name;
5532}
5533
5534/* kernel of this interpreter */ 5455/* kernel of this interpreter */
5535static void 5456static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5457Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5458{
5538 SCHEME_V->op = op; 5459 SCHEME_V->op = op;
5539 5460
5540 for (;;) 5461 for (;;)
5541 { 5462 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5463 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5464
5544#if USE_ERROR_CHECKING 5465#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5466 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5467 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5468 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5469 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5470
5551 /* Check number of arguments */ 5471 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5472 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5473 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5474 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5475 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5476 xError_1 (SCHEME_A_ msg, 0);
5477 continue;
5557 } 5478 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5479 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5480 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5481 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5482 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5483 xError_1 (SCHEME_A_ msg, 0);
5484 continue;
5563 } 5485 }
5564 5486 else
5565 if (ecb_expect_false (ok))
5566 { 5487 {
5567 if (pcd->arg_tests_encoding) 5488 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5489 {
5569 int i = 0; 5490 int i = 0;
5570 int j; 5491 int j;
5571 const char *t = pcd->arg_tests_encoding; 5492 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5493 pointer arglist = SCHEME_V->args;
5573 5494
5574 do 5495 do
5575 { 5496 {
5576 pointer arg = car (arglist); 5497 pointer arg = car (arglist);
5577 5498
5578 j = (int) t[0]; 5499 j = t[0];
5579 5500
5501 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5580 if (j == TST_LIST[0]) 5502 if (j == TST_LIST[0])
5581 { 5503 {
5582 if (arg != NIL && !is_pair (arg)) 5504 if (!tst_is_list (SCHEME_A_ arg))
5583 break; 5505 break;
5584 } 5506 }
5585 else 5507 else
5586 { 5508 {
5587 if (!tests[j].fct (arg)) 5509 if (!tests[j - 1].fct (arg))
5588 break; 5510 break;
5589 } 5511 }
5590 5512
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5513 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5592 t++; 5514 t++;
5593 5515
5594 arglist = cdr (arglist); 5516 arglist = cdr (arglist);
5595 i++; 5517 i++;
5596 } 5518 }
5597 while (i < n); 5519 while (i < n);
5598 5520
5599 if (i < n) 5521 if (i < n)
5600 { 5522 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5523 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5524 xError_1 (SCHEME_A_ msg, 0);
5525 continue;
5603 } 5526 }
5604 } 5527 }
5605 } 5528 }
5606
5607 if (!ok)
5608 {
5609 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5610 return;
5611
5612 pcd = dispatch_table + SCHEME_V->op;
5613 }
5614 } 5529 }
5615#endif 5530#endif
5616 5531
5617 ok_to_freely_gc (SCHEME_A); 5532 ok_to_freely_gc (SCHEME_A);
5618 5533
5534 static const dispatch_func dispatch_funcs[] = {
5535 opexe_0,
5536 opexe_1,
5537 opexe_2,
5538 opexe_3,
5539 opexe_4,
5540 opexe_5,
5541 opexe_6,
5542 };
5543
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5544 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5545 return;
5621 5546
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5547 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5548 {
5624 xwrstr ("No memory!\n"); 5549 xwrstr ("No memory!\n");
… …
5648mk_proc (SCHEME_P_ enum scheme_opcodes op) 5573mk_proc (SCHEME_P_ enum scheme_opcodes op)
5649{ 5574{
5650 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5575 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5651 set_typeflag (y, (T_PROC | T_ATOM)); 5576 set_typeflag (y, (T_PROC | T_ATOM));
5652 ivalue_unchecked (y) = op; 5577 ivalue_unchecked (y) = op;
5653 set_num_integer (y);
5654 return y; 5578 return y;
5655} 5579}
5656 5580
5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5581/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5658static int 5582static int
5659syntaxnum (pointer p) 5583syntaxnum (pointer p)
5660{ 5584{
5661 const char *s = strvalue (car (p)); 5585 const char *s = strvalue (p);
5662 5586
5663 switch (strlength (car (p))) 5587 switch (strlength (p))
5664 { 5588 {
5665 case 2: 5589 case 2:
5666 if (s[0] == 'i') 5590 if (s[0] == 'i')
5667 return OP_IF0; /* if */ 5591 return OP_IF0; /* if */
5668 else 5592 else
… …
5723 return OP_C0STREAM; /* cons-stream */ 5647 return OP_C0STREAM; /* cons-stream */
5724 } 5648 }
5725} 5649}
5726 5650
5727#if USE_MULTIPLICITY 5651#if USE_MULTIPLICITY
5728scheme * 5652ecb_cold scheme *
5729scheme_init_new () 5653scheme_init_new ()
5730{ 5654{
5731 scheme *sc = malloc (sizeof (scheme)); 5655 scheme *sc = malloc (sizeof (scheme));
5732 5656
5733 if (!scheme_init (SCHEME_A)) 5657 if (!scheme_init (SCHEME_A))
… …
5738 else 5662 else
5739 return sc; 5663 return sc;
5740} 5664}
5741#endif 5665#endif
5742 5666
5743int 5667ecb_cold int
5744scheme_init (SCHEME_P) 5668scheme_init (SCHEME_P)
5745{ 5669{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5670 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5671 pointer x;
5672
5673 /* this memset is not strictly correct, as we assume (intcache)
5674 * that memset 0 will also set pointers to 0, but memset does
5675 * of course not guarantee that. screw such systems.
5676 */
5677 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5748 5678
5749 num_set_fixnum (num_zero, 1); 5679 num_set_fixnum (num_zero, 1);
5750 num_set_ivalue (num_zero, 0); 5680 num_set_ivalue (num_zero, 0);
5751 num_set_fixnum (num_one, 1); 5681 num_set_fixnum (num_one, 1);
5752 num_set_ivalue (num_one, 1); 5682 num_set_ivalue (num_one, 1);
… …
5764 SCHEME_V->save_inport = NIL; 5694 SCHEME_V->save_inport = NIL;
5765 SCHEME_V->loadport = NIL; 5695 SCHEME_V->loadport = NIL;
5766 SCHEME_V->nesting = 0; 5696 SCHEME_V->nesting = 0;
5767 SCHEME_V->interactive_repl = 0; 5697 SCHEME_V->interactive_repl = 0;
5768 5698
5769 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5699 if (!alloc_cellseg (SCHEME_A))
5770 { 5700 {
5771#if USE_ERROR_CHECKING 5701#if USE_ERROR_CHECKING
5772 SCHEME_V->no_memory = 1; 5702 SCHEME_V->no_memory = 1;
5773 return 0; 5703 return 0;
5774#endif 5704#endif
… …
5821 5751
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5752 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5753 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5754 }
5825 5755
5756 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5757 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5758 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5759 assign_proc (SCHEME_A_ i, opname (i));
5829 5760
5830 /* initialization of global pointers to special symbols */ 5761 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5762 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5763 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5764 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5803scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5804{
5874 SCHEME_V->ext_data = p; 5805 SCHEME_V->ext_data = p;
5875} 5806}
5876 5807
5877void 5808ecb_cold void
5878scheme_deinit (SCHEME_P) 5809scheme_deinit (SCHEME_P)
5879{ 5810{
5880 int i; 5811 int i;
5881 5812
5882#if SHOW_ERROR_LINE 5813#if SHOW_ERROR_LINE
… …
5974{ 5905{
5975 dump_stack_reset (SCHEME_A); 5906 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5907 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5908 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5909 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5910 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5911 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5912 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5913#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5914 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5915#endif
5985 SCHEME_V->retcode = 0; 5916 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5917 SCHEME_V->interactive_repl = 0;
… …
6103# endif 6034# endif
6104 int fin; 6035 int fin;
6105 char *file_name = InitFile; 6036 char *file_name = InitFile;
6106 int retcode; 6037 int retcode;
6107 int isfile = 1; 6038 int isfile = 1;
6039 system ("ps v $PPID");//D
6108 6040
6109 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6041 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6110 { 6042 {
6111 xwrstr ("Usage: tinyscheme -?\n"); 6043 xwrstr ("Usage: tinyscheme -?\n");
6112 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6044 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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