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.42 by root, Mon Nov 30 06:19:18 2015 UTC

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

Diff Legend

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