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.45 by root, Mon Nov 30 07:44:23 2015 UTC

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

Diff Legend

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