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.30 by root, Sat Nov 28 10:31:40 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
37#include <string.h> 39#include <string.h>
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 69#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 70#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 71
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 72#if !USE_MULTIPLICITY
78static scheme sc; 73static scheme sc;
79#endif 74#endif
80 75
81static void 76static void
… …
150 145
151#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
154 149
155#if USE_STRLWR 150#if USE_IGNORECASE
156static const char * 151static const char *
157strlwr (char *s) 152xstrlwr (char *s)
158{ 153{
159 const char *p = s; 154 const char *p = s;
160 155
161 while (*s) 156 while (*s)
162 { 157 {
… …
164 s++; 159 s++;
165 } 160 }
166 161
167 return p; 162 return p;
168} 163}
169#endif
170 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
171#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
173 172
174#ifndef prompt 173#ifndef prompt
175# define prompt "ts> " 174# define prompt "ts> "
176#endif 175#endif
177 176
… …
183# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
184#endif 183#endif
185 184
186enum scheme_types 185enum scheme_types
187{ 186{
187 T_INTEGER,
188 T_FREE, 188 T_REAL,
189 T_STRING, 189 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 190 T_SYMBOL,
192 T_PROC, 191 T_PROC,
193 T_PAIR, 192 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 193 T_CLOSURE,
195 T_CONTINUATION, 194 T_CONTINUATION,
196 T_FOREIGN, 195 T_FOREIGN,
197 T_CHARACTER, 196 T_CHARACTER,
198 T_PORT, 197 T_PORT,
… …
208#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
212 211
213static num num_add (num a, num b); 212/* num, for generic arithmetic */
214static num num_mul (num a, num b); 213struct num
215static num num_div (num a, num b); 214{
215 IVALUE ivalue;
216#if USE_REAL
217 RVALUE rvalue;
218 char is_fixnum;
219#endif
220};
221
222#if USE_REAL
223# define num_is_fixnum(n) (n).is_fixnum
224# define num_set_fixnum(n,f) (n).is_fixnum = (f)
225# define num_ivalue(n) (n).ivalue
226# define num_rvalue(n) (n).rvalue
227# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
228# define num_set_rvalue(n,r) (n).rvalue = (r)
229#else
230# define num_is_fixnum(n) 1
231# define num_set_fixnum(n,f) 0
232# define num_ivalue(n) (n).ivalue
233# define num_rvalue(n) (n).ivalue
234# define num_set_ivalue(n,i) (n).ivalue = (i)
235# define num_set_rvalue(n,r) (n).ivalue = (r)
236#endif
237
238enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
239
240static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 242static num num_rem (num a, num b);
219static num num_mod (num a, num b); 243static 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 244
226#if USE_MATH 245#if USE_MATH
227static double round_per_R5RS (double x); 246static double round_per_R5RS (double x);
228#endif 247#endif
229static int is_zero_rvalue (RVALUE x); 248static 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 249
237static num num_zero; 250static num num_zero;
238static num num_one; 251static num num_one;
239 252
240/* macros for cell operations */ 253/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 254#define typeflag(p) ((p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 255#define set_typeflag(p,v) ((p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 256#define type(p) (typeflag (p) & T_MASKTYPE)
244 257
245INTERFACE INLINE int 258INTERFACE int
246is_string (pointer p) 259is_string (pointer p)
247{ 260{
248 return type (p) == T_STRING; 261 return type (p) == T_STRING;
249} 262}
250 263
251#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
253 266
254INTERFACE int is_list (SCHEME_P_ pointer p);
255INTERFACE INLINE int 267INTERFACE int
256is_vector (pointer p) 268is_vector (pointer p)
257{ 269{
258 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
259} 271}
260 272
261#define vecvalue(p) ((p)->object.vector.vvalue) 273#define vecvalue(p) ((p)->object.vector.vvalue)
262#define veclength(p) ((p)->object.vector.length) 274#define veclength(p) ((p)->object.vector.length)
263INTERFACE void fill_vector (pointer vec, pointer obj); 275INTERFACE 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); 276INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
266INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
267 278
268INTERFACE uint32_t 279INTERFACE int
269vector_length (pointer vec) 280is_integer (pointer p)
270{ 281{
271 return vec->object.vector.length; 282 return type (p) == T_INTEGER;
272} 283}
273 284
285/* not the same as in scheme, where integers are (correctly :) reals */
274INTERFACE INLINE int 286INTERFACE int
287is_real (pointer p)
288{
289 return type (p) == T_REAL;
290}
291
292INTERFACE int
275is_number (pointer p) 293is_number (pointer p)
276{ 294{
277 return type (p) == T_NUMBER; 295 return is_integer (p) || is_real (p);
278} 296}
279 297
280INTERFACE INLINE int 298INTERFACE 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) 299is_character (pointer p)
300{ 300{
301 return type (p) == T_CHARACTER; 301 return type (p) == T_CHARACTER;
302} 302}
303 303
304INTERFACE INLINE char * 304INTERFACE char *
305string_value (pointer p) 305string_value (pointer p)
306{ 306{
307 return strvalue (p); 307 return strvalue (p);
308} 308}
309 309
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) 310#define ivalue_unchecked(p) (p)->object.ivalue
311#define set_ivalue(p,v) (p)->object.ivalue = (v)
312
341#if USE_REAL 313#if USE_REAL
342# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 314#define rvalue_unchecked(p) (p)->object.rvalue
343# define set_num_integer(p) (p)->object.number.is_fixnum=1; 315#define set_rvalue(p,v) (p)->object.rvalue = (v)
344# define set_num_real(p) (p)->object.number.is_fixnum=0;
345#else 316#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 317#define rvalue_unchecked(p) (p)->object.ivalue
347# define set_num_integer(p) 0 318#define set_rvalue(p,v) (p)->object.ivalue = (v)
348# define set_num_real(p) 0
349#endif 319#endif
320
350INTERFACE long 321INTERFACE long
351charvalue (pointer p) 322charvalue (pointer p)
352{ 323{
353 return ivalue_unchecked (p); 324 return ivalue_unchecked (p);
354} 325}
355 326
356INTERFACE INLINE int 327INTERFACE int
357is_port (pointer p) 328is_port (pointer p)
358{ 329{
359 return type (p) == T_PORT; 330 return type (p) == T_PORT;
360} 331}
361 332
362INTERFACE INLINE int 333INTERFACE int
363is_inport (pointer p) 334is_inport (pointer p)
364{ 335{
365 return is_port (p) && p->object.port->kind & port_input; 336 return is_port (p) && p->object.port->kind & port_input;
366} 337}
367 338
368INTERFACE INLINE int 339INTERFACE int
369is_outport (pointer p) 340is_outport (pointer p)
370{ 341{
371 return is_port (p) && p->object.port->kind & port_output; 342 return is_port (p) && p->object.port->kind & port_output;
372} 343}
373 344
374INTERFACE INLINE int 345INTERFACE int
375is_pair (pointer p) 346is_pair (pointer p)
376{ 347{
377 return type (p) == T_PAIR; 348 return type (p) == T_PAIR;
378} 349}
379 350
380#define car(p) ((p)->object.cons.car + 0) 351#define car(p) ((p)->object.cons.car + 0)
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 352#define cdr(p) ((p)->object.cons.cdr + 0)
382 353
383#define caar(p) car (car (p)) 354static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 355static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 356static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 357static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 358
388#define cadar(p) car (cdr (car (p))) 359static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 360static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 361static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 362
392INTERFACE void 363INTERFACE void
393set_car (pointer p, pointer q) 364set_car (pointer p, pointer q)
394{ 365{
395 p->object.cons.car = q; 366 p->object.cons.car = q;
… …
411pair_cdr (pointer p) 382pair_cdr (pointer p)
412{ 383{
413 return cdr (p); 384 return cdr (p);
414} 385}
415 386
416INTERFACE INLINE int 387INTERFACE int
417is_symbol (pointer p) 388is_symbol (pointer p)
418{ 389{
419 return type (p) == T_SYMBOL; 390 return type (p) == T_SYMBOL;
420} 391}
421 392
422INTERFACE INLINE char * 393INTERFACE char *
423symname (pointer p) 394symname (pointer p)
424{ 395{
396 return strvalue (p);
397}
398
399#if USE_PLIST
400SCHEME_EXPORT int
401hasprop (pointer p)
402{
403 return typeflag (p) & T_SYMBOL;
404}
405
406# define symprop(p) cdr(p)
407#endif
408
409INTERFACE int
410is_syntax (pointer p)
411{
412 return typeflag (p) & T_SYNTAX;
413}
414
415INTERFACE int
416is_proc (pointer p)
417{
418 return type (p) == T_PROC;
419}
420
421INTERFACE int
422is_foreign (pointer p)
423{
424 return type (p) == T_FOREIGN;
425}
426
427INTERFACE char *
428syntaxname (pointer p)
429{
425 return strvalue (car (p)); 430 return strvalue (car (p));
426} 431}
427 432
428#if USE_PLIST
429SCHEME_EXPORT INLINE int
430hasprop (pointer p)
431{
432 return typeflag (p) & T_SYMBOL;
433}
434
435# define symprop(p) cdr(p)
436#endif
437
438INTERFACE INLINE int
439is_syntax (pointer p)
440{
441 return typeflag (p) & T_SYNTAX;
442}
443
444INTERFACE INLINE int
445is_proc (pointer p)
446{
447 return type (p) == T_PROC;
448}
449
450INTERFACE INLINE int
451is_foreign (pointer p)
452{
453 return type (p) == T_FOREIGN;
454}
455
456INTERFACE INLINE char *
457syntaxname (pointer p)
458{
459 return strvalue (car (p));
460}
461
462#define procnum(p) ivalue (p) 433#define procnum(p) ivalue_unchecked (p)
463static const char *procname (pointer x); 434static const char *procname (pointer x);
464 435
465INTERFACE INLINE int 436INTERFACE int
466is_closure (pointer p) 437is_closure (pointer p)
467{ 438{
468 return type (p) == T_CLOSURE; 439 return type (p) == T_CLOSURE;
469} 440}
470 441
471INTERFACE INLINE int 442INTERFACE int
472is_macro (pointer p) 443is_macro (pointer p)
473{ 444{
474 return type (p) == T_MACRO; 445 return type (p) == T_MACRO;
475} 446}
476 447
477INTERFACE INLINE pointer 448INTERFACE pointer
478closure_code (pointer p) 449closure_code (pointer p)
479{ 450{
480 return car (p); 451 return car (p);
481} 452}
482 453
483INTERFACE INLINE pointer 454INTERFACE pointer
484closure_env (pointer p) 455closure_env (pointer p)
485{ 456{
486 return cdr (p); 457 return cdr (p);
487} 458}
488 459
489INTERFACE INLINE int 460INTERFACE int
490is_continuation (pointer p) 461is_continuation (pointer p)
491{ 462{
492 return type (p) == T_CONTINUATION; 463 return type (p) == T_CONTINUATION;
493} 464}
494 465
495#define cont_dump(p) cdr (p) 466#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 467#define set_cont_dump(p,v) set_cdr ((p), (v))
497 468
498/* To do: promise should be forced ONCE only */ 469/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 470INTERFACE int
500is_promise (pointer p) 471is_promise (pointer p)
501{ 472{
502 return type (p) == T_PROMISE; 473 return type (p) == T_PROMISE;
503} 474}
504 475
505INTERFACE INLINE int 476INTERFACE int
506is_environment (pointer p) 477is_environment (pointer p)
507{ 478{
508 return type (p) == T_ENVIRONMENT; 479 return type (p) == T_ENVIRONMENT;
509} 480}
510 481
… …
516 487
517#define is_mark(p) (typeflag (p) & T_MARK) 488#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 489#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 490#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 491
521INTERFACE INLINE int 492INTERFACE int
522is_immutable (pointer p) 493is_immutable (pointer p)
523{ 494{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 495 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 496}
526 497
527INTERFACE INLINE void 498INTERFACE void
528setimmutable (pointer p) 499setimmutable (pointer p)
529{ 500{
530#if USE_ERROR_CHECKING 501#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 502 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 503#endif
533} 504}
534 505
506/* Result is:
507 proper list: length
508 circular list: -1
509 not even a pair: -2
510 dotted list: -2 minus length before dot
511*/
512INTERFACE int
513list_length (SCHEME_P_ pointer a)
514{
515 int i = 0;
516 pointer slow, fast;
517
518 slow = fast = a;
519
520 while (1)
521 {
522 if (fast == NIL)
523 return i;
524
525 if (!is_pair (fast))
526 return -2 - i;
527
528 fast = cdr (fast);
529 ++i;
530
531 if (fast == NIL)
532 return i;
533
534 if (!is_pair (fast))
535 return -2 - i;
536
537 ++i;
538 fast = cdr (fast);
539
540 /* Safe because we would have already returned if `fast'
541 encountered a non-pair. */
542 slow = cdr (slow);
543
544 if (fast == slow)
545 {
546 /* the fast pointer has looped back around and caught up
547 with the slow pointer, hence the structure is circular,
548 not of finite length, and therefore not a list */
549 return -1;
550 }
551 }
552}
553
554INTERFACE int
555is_list (SCHEME_P_ pointer a)
556{
557 return list_length (SCHEME_A_ a) >= 0;
558}
559
535#if USE_CHAR_CLASSIFIERS 560#if USE_CHAR_CLASSIFIERS
536static INLINE int 561ecb_inline int
537Cisalpha (int c) 562Cisalpha (int c)
538{ 563{
539 return isascii (c) && isalpha (c); 564 return isascii (c) && isalpha (c);
540} 565}
541 566
542static INLINE int 567ecb_inline int
543Cisdigit (int c) 568Cisdigit (int c)
544{ 569{
545 return isascii (c) && isdigit (c); 570 return isascii (c) && isdigit (c);
546} 571}
547 572
548static INLINE int 573ecb_inline int
549Cisspace (int c) 574Cisspace (int c)
550{ 575{
551 return isascii (c) && isspace (c); 576 return isascii (c) && isspace (c);
552} 577}
553 578
554static INLINE int 579ecb_inline int
555Cisupper (int c) 580Cisupper (int c)
556{ 581{
557 return isascii (c) && isupper (c); 582 return isascii (c) && isupper (c);
558} 583}
559 584
560static INLINE int 585ecb_inline int
561Cislower (int c) 586Cislower (int c)
562{ 587{
563 return isascii (c) && islower (c); 588 return isascii (c) && islower (c);
564} 589}
565#endif 590#endif
… …
626#endif 651#endif
627 652
628static int file_push (SCHEME_P_ const char *fname); 653static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 654static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 655static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 656ecb_inline int is_one_of (char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 657static int alloc_cellseg (SCHEME_P_ int n);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 659static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 660static int count_consecutive_cells (pointer x, int needed);
636static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
637static pointer mk_number (SCHEME_P_ const num n); 662static pointer mk_number (SCHEME_P_ const num n);
638static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
655static int basic_inchar (port *pt); 680static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 681static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 682static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 683static char *readstr_upto (SCHEME_P_ char *delim);
659static pointer readstrexp (SCHEME_P); 684static pointer readstrexp (SCHEME_P);
660static INLINE int skipspace (SCHEME_P); 685ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 686static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 687static void printslashstring (SCHEME_P_ char *s, int len);
663static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
664static void printatom (SCHEME_P_ pointer l, int f); 689static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 694static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 695static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 696static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 697static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 698static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 699static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
700static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 701static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 702static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 703static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 704static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 705static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 706static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 707static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 708static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 709static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 710
711static IVALUE
712ivalue (pointer x)
713{
714 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
715}
716
717static RVALUE
718rvalue (pointer x)
719{
720 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
721}
722
723INTERFACE num
724nvalue (pointer x)
725{
726 num n;
727
728 num_set_fixnum (n, is_integer (x));
729
730 if (num_is_fixnum (n))
731 num_set_ivalue (n, ivalue_unchecked (x));
732 else
733 num_set_rvalue (n, rvalue_unchecked (x));
734
735 return n;
736}
737
685static num 738static num
686num_add (num a, num b) 739num_op (enum num_op op, num a, num b)
687{ 740{
688 num ret; 741 num ret;
689 742
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
691 744
692 if (num_is_fixnum (ret)) 745 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 746 {
747 switch (op)
748 {
749 case NUM_ADD: a.ivalue += b.ivalue; break;
750 case NUM_SUB: a.ivalue -= b.ivalue; break;
751 case NUM_MUL: a.ivalue *= b.ivalue; break;
752 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
753 }
754
755 num_set_ivalue (ret, a.ivalue);
756 }
757#if USE_REAL
694 else 758 else
695 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 759 {
760 switch (op)
761 {
762 case NUM_ADD: a.rvalue += b.rvalue; break;
763 case NUM_SUB: a.rvalue -= b.rvalue; break;
764 case NUM_MUL: a.rvalue *= b.rvalue; break;
765 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
766 }
696 767
697 return ret; 768 num_set_rvalue (ret, a.rvalue);
698} 769 }
699 770#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 771
712 return ret; 772 return ret;
713} 773}
714 774
715static num 775static num
716num_div (num a, num b) 776num_div (num a, num b)
717{ 777{
718 num ret; 778 num ret;
719 779
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
721 781
722 if (num_is_fixnum (ret)) 782 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 783 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
724 else 784 else
725 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 785 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 786
757 return ret; 787 return ret;
758} 788}
759 789
760static num 790static num
… …
762{ 792{
763 num ret; 793 num ret;
764 long e1, e2, res; 794 long e1, e2, res;
765 795
766 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
767 e1 = num_get_ivalue (a); 797 e1 = num_ivalue (a);
768 e2 = num_get_ivalue (b); 798 e2 = num_ivalue (b);
769 res = e1 % e2; 799 res = e1 % e2;
770 800
771 /* remainder should have same sign as second operand */ 801 /* remainder should have same sign as second operand */
772 if (res > 0) 802 if (res > 0)
773 { 803 {
… …
789{ 819{
790 num ret; 820 num ret;
791 long e1, e2, res; 821 long e1, e2, res;
792 822
793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 823 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
794 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
795 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
796 res = e1 % e2; 826 res = e1 % e2;
797 827
798 /* modulo should have same sign as second operand */ 828 /* modulo should have same sign as second operand */
799 if (res * e2 < 0) 829 if (res * e2 < 0)
800 res += e2; 830 res += e2;
801 831
802 num_set_ivalue (ret, res); 832 num_set_ivalue (ret, res);
803 return ret; 833 return ret;
804} 834}
805 835
836/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 837static int
807num_eq (num a, num b) 838num_cmp (num a, num b)
808{ 839{
840 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 841 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 842
812 if (is_fixnum) 843 if (is_fixnum)
813 ret = num_get_ivalue (a) == num_get_ivalue (b); 844 {
845 IVALUE av = num_ivalue (a);
846 IVALUE bv = num_ivalue (b);
847
848 ret = av == bv ? 0 : av < bv ? -1 : +1;
849 }
814 else 850 else
815 ret = num_get_rvalue (a) == num_get_rvalue (b); 851 {
852 RVALUE av = num_rvalue (a);
853 RVALUE bv = num_rvalue (b);
854
855 ret = av == bv ? 0 : av < bv ? -1 : +1;
856 }
816 857
817 return ret; 858 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} 859}
860 860
861#if USE_MATH 861#if USE_MATH
862 862
863/* Round to nearest. Round to even if midway */ 863/* Round to nearest. Round to even if midway */
… …
873 return ce; 873 return ce;
874 else if (dfl < dce) 874 else if (dfl < dce)
875 return fl; 875 return fl;
876 else 876 else
877 { 877 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 878 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 879 return fl;
880 else 880 else
881 return ce; 881 return ce;
882 } 882 }
883} 883}
884#endif 884#endif
885 885
886static int 886static int
887is_zero_rvalue (RVALUE x) 887is_zero_rvalue (RVALUE x)
888{ 888{
889 return x == 0;
890#if 0
889#if USE_REAL 891#if USE_REAL
890 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 892 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
891#else 893#else
892 return x == 0; 894 return x == 0;
895#endif
893#endif 896#endif
894} 897}
895 898
896/* allocate new cell segment */ 899/* allocate new cell segment */
897static int 900static int
… …
918 return k; 921 return k;
919 922
920 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
921 SCHEME_V->alloc_seg[i] = cp; 924 SCHEME_V->alloc_seg[i] = cp;
922 925
923 /* insert new segment in address order */
924 newp = (pointer)cp; 926 newp = (pointer)cp;
925 SCHEME_V->cell_seg[i] = newp; 927 SCHEME_V->cell_seg[i] = newp;
926 SCHEME_V->cell_segsize[i] = segsize; 928 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; 929 SCHEME_V->fcells += segsize;
943 last = newp + segsize - 1; 930 last = newp + segsize - 1;
944 931
945 for (p = newp; p <= last; p++) 932 for (p = newp; p <= last; p++)
946 { 933 {
947 set_typeflag (p, T_FREE); 934 set_typeflag (p, T_PAIR);
948 set_car (p, NIL); 935 set_car (p, NIL);
949 set_cdr (p, p + 1); 936 set_cdr (p, p + 1);
950 } 937 }
951 938
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); 939 set_cdr (last, SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 940 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 } 941 }
969 942
970 return n; 943 return n;
971} 944}
972 945
973/* get new cell. parameter a, b is marked by gc. */ 946/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 947ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 948get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 949{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 950 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 951 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1051 /* Record it as a vector so that gc understands it. */ 1024 /* Record it as a vector so that gc understands it. */
1052 set_typeflag (v, T_VECTOR | T_ATOM); 1025 set_typeflag (v, T_VECTOR | T_ATOM);
1053 1026
1054 v->object.vector.vvalue = e; 1027 v->object.vector.vvalue = e;
1055 v->object.vector.length = len; 1028 v->object.vector.length = len;
1056 fill_vector (v, init); 1029 fill_vector (v, 0, init);
1057 push_recent_alloc (SCHEME_A_ v, NIL); 1030 push_recent_alloc (SCHEME_A_ v, NIL);
1058 1031
1059 return v; 1032 return v;
1060} 1033}
1061 1034
1062static INLINE void 1035ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1036ok_to_freely_gc (SCHEME_P)
1064{ 1037{
1065 set_car (S_SINK, NIL); 1038 set_car (S_SINK, NIL);
1066} 1039}
1067 1040
… …
1122static pointer 1095static pointer
1123oblist_add_by_name (SCHEME_P_ const char *name) 1096oblist_add_by_name (SCHEME_P_ const char *name)
1124{ 1097{
1125 int location; 1098 int location;
1126 1099
1127 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = mk_string (SCHEME_A_ name);
1128 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1129 setimmutable (car (x)); 1102 setimmutable (car (x));
1130 1103
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1104 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))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1133 return x; 1106 return x;
1134} 1107}
1135 1108
1136static INLINE pointer 1109ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1111{
1139 int location; 1112 int location;
1140 pointer x; 1113 pointer x;
1141 char *s; 1114 char *s;
1142 1115
1143 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1144 1117
1145 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1118 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1146 { 1119 {
1147 s = symname (car (x)); 1120 s = symname (car (x));
1148 1121
1149 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1150 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1160 int i; 1133 int i;
1161 pointer x; 1134 pointer x;
1162 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1163 1136
1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1165 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1166 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1167 1140
1168 return ob_list; 1141 return ob_list;
1169} 1142}
1170 1143
… …
1174oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1175{ 1148{
1176 return NIL; 1149 return NIL;
1177} 1150}
1178 1151
1179static INLINE pointer 1152ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1154{
1182 pointer x; 1155 pointer x;
1183 char *s; 1156 char *s;
1184 1157
… …
1243mk_character (SCHEME_P_ int c) 1216mk_character (SCHEME_P_ int c)
1244{ 1217{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1219
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1220 set_typeflag (x, (T_CHARACTER | T_ATOM));
1248 ivalue_unchecked (x) = c & 0xff; 1221 set_ivalue (x, c & 0xff);
1249 set_num_integer (x); 1222
1250 return x; 1223 return x;
1251} 1224}
1252 1225
1253/* get number atom (integer) */ 1226/* get number atom (integer) */
1254INTERFACE pointer 1227INTERFACE pointer
1255mk_integer (SCHEME_P_ long num) 1228mk_integer (SCHEME_P_ long n)
1256{ 1229{
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1231
1259 set_typeflag (x, (T_NUMBER | T_ATOM)); 1232 set_typeflag (x, (T_INTEGER | T_ATOM));
1260 ivalue_unchecked (x) = num; 1233 set_ivalue (x, n);
1261 set_num_integer (x); 1234
1262 return x; 1235 return x;
1263} 1236}
1264 1237
1265INTERFACE pointer 1238INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1239mk_real (SCHEME_P_ RVALUE n)
1267{ 1240{
1241#if USE_REAL
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1243
1270 set_typeflag (x, (T_NUMBER | T_ATOM)); 1244 set_typeflag (x, (T_REAL | T_ATOM));
1271 rvalue_unchecked (x) = n; 1245 set_rvalue (x, n);
1272 set_num_real (x); 1246
1273 return x; 1247 return x;
1248#else
1249 return mk_integer (SCHEME_A_ n);
1250#endif
1274} 1251}
1275 1252
1276static pointer 1253static pointer
1277mk_number (SCHEME_P_ const num n) 1254mk_number (SCHEME_P_ const num n)
1278{ 1255{
1256#if USE_REAL
1279 if (num_is_fixnum (n)) 1257 return num_is_fixnum (n)
1258 ? mk_integer (SCHEME_A_ num_ivalue (n))
1259 : mk_real (SCHEME_A_ num_rvalue (n));
1260#else
1280 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1261 return mk_integer (SCHEME_A_ num_ivalue (n));
1281 else 1262#endif
1282 return mk_real (SCHEME_A_ num_get_rvalue (n));
1283} 1263}
1284 1264
1285/* allocate name to string area */ 1265/* allocate name to string area */
1286static char * 1266static char *
1287store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1267store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1346{ 1326{
1347 return get_vector_object (SCHEME_A_ len, NIL); 1327 return get_vector_object (SCHEME_A_ len, NIL);
1348} 1328}
1349 1329
1350INTERFACE void 1330INTERFACE void
1351fill_vector (pointer vec, pointer obj) 1331fill_vector (pointer vec, uint32_t start, pointer obj)
1352{ 1332{
1353 int i; 1333 int i;
1354 1334
1355 for (i = 0; i < vec->object.vector.length; i++) 1335 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1336 vecvalue (vec)[i] = obj;
1357} 1337}
1358 1338
1359INTERFACE pointer 1339INTERFACE pointer
1360vector_elem (pointer vec, uint32_t ielem) 1340vector_get (pointer vec, uint32_t ielem)
1361{ 1341{
1362 return vecvalue(vec)[ielem]; 1342 return vecvalue(vec)[ielem];
1363} 1343}
1364 1344
1365INTERFACE void 1345INTERFACE void
1366set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1346vector_set (pointer vec, uint32_t ielem, pointer a)
1367{ 1347{
1368 vecvalue(vec)[ielem] = a; 1348 vecvalue(vec)[ielem] = a;
1369} 1349}
1370 1350
1371/* get new symbol */ 1351/* get new symbol */
… …
1463 } 1443 }
1464 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1465 { 1445 {
1466 if (!has_fp_exp) 1446 if (!has_fp_exp)
1467 { 1447 {
1468 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1469 from now on */
1470 p++; 1449 p++;
1471 1450
1472 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1473 continue; 1452 continue;
1474 } 1453 }
… …
1562 1541
1563 if (ecb_expect_false (is_vector (p))) 1542 if (ecb_expect_false (is_vector (p)))
1564 { 1543 {
1565 int i; 1544 int i;
1566 1545
1567 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1568 mark (vecvalue (p)[i]); 1547 mark (vecvalue (p)[i]);
1569 } 1548 }
1570 1549
1571 if (is_atom (p)) 1550 if (is_atom (p))
1572 goto E6; 1551 goto E6;
… …
1670 if (is_mark (p)) 1649 if (is_mark (p))
1671 clrmark (p); 1650 clrmark (p);
1672 else 1651 else
1673 { 1652 {
1674 /* reclaim cell */ 1653 /* reclaim cell */
1675 if (typeflag (p) != T_FREE) 1654 if (typeflag (p) != T_PAIR)
1676 { 1655 {
1677 finalize_cell (SCHEME_A_ p); 1656 finalize_cell (SCHEME_A_ p);
1678 set_typeflag (p, T_FREE); 1657 set_typeflag (p, T_PAIR);
1679 set_car (p, NIL); 1658 set_car (p, NIL);
1680 } 1659 }
1681 1660
1682 ++SCHEME_V->fcells; 1661 ++SCHEME_V->fcells;
1683 set_cdr (p, SCHEME_V->free_cell); 1662 set_cdr (p, SCHEME_V->free_cell);
… …
1685 } 1664 }
1686 } 1665 }
1687 } 1666 }
1688 1667
1689 if (SCHEME_V->gc_verbose) 1668 if (SCHEME_V->gc_verbose)
1669 {
1690 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1691} 1672}
1692 1673
1693static void 1674static void
1694finalize_cell (SCHEME_P_ pointer a) 1675finalize_cell (SCHEME_P_ pointer a)
1695{ 1676{
… …
2282 } 2263 }
2283 } 2264 }
2284} 2265}
2285 2266
2286/* check c is in chars */ 2267/* check c is in chars */
2287static INLINE int 2268ecb_inline int
2288is_one_of (char *s, int c) 2269is_one_of (char *s, int c)
2289{ 2270{
2290 if (c == EOF) 2271 if (c == EOF)
2291 return 1; 2272 return 1;
2292 2273
2293 return !!strchr (s, c); 2274 return !!strchr (s, c);
2294} 2275}
2295 2276
2296/* skip white characters */ 2277/* skip white characters */
2297static INLINE int 2278ecb_inline int
2298skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2299{ 2280{
2300 int c, curr_line = 0; 2281 int c, curr_line = 0;
2301 2282
2302 do 2283 do
… …
2530 { 2511 {
2531 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2532 2513
2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2534 { 2515 {
2535 if (num_is_integer (l)) 2516 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2518#if USE_REAL
2538 else 2519 else
2539 { 2520 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2795 return 0; 2776 return 0;
2796 } 2777 }
2797 else if (is_number (a)) 2778 else if (is_number (a))
2798 { 2779 {
2799 if (is_number (b)) 2780 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2782
2803 return 0; 2783 return 0;
2804 } 2784 }
2805 else if (is_character (a)) 2785 else if (is_character (a))
2806 { 2786 {
… …
2873 2853
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2854 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2855 setenvironment (SCHEME_V->envir);
2876} 2856}
2877 2857
2878static INLINE void 2858ecb_inline void
2879new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2880{ 2860{
2881 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
2882 2862
2883 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
2884 { 2864 {
2885 int location = hash_fn (symname (variable), veclength (car (env))); 2865 int location = hash_fn (symname (variable), veclength (car (env)));
2886 2866
2887 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2888 } 2868 }
2889 else 2869 else
2890 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
2891} 2871}
2892 2872
… …
2899 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
2900 { 2880 {
2901 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
2902 { 2882 {
2903 location = hash_fn (symname (hdl), veclength (car (x))); 2883 location = hash_fn (symname (hdl), veclength (car (x)));
2904 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
2905 } 2885 }
2906 else 2886 else
2907 y = car (x); 2887 y = car (x);
2908 2888
2909 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
2910 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
2911 break; 2891 break;
2912 2892
2913 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
2914 break; 2897 break;
2915
2916 if (!all)
2917 return NIL;
2918 } 2898 }
2919
2920 if (x != NIL)
2921 return car (y);
2922 2899
2923 return NIL; 2900 return NIL;
2924} 2901}
2925 2902
2926#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
2927 2904
2928static INLINE void 2905ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2907{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
2933} 2910}
2934 2911
2935static INLINE void 2912ecb_inline void
2936new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2937{ 2914{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2916}
2940 2917
… …
2962 return NIL; 2939 return NIL;
2963} 2940}
2964 2941
2965#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
2966 2943
2967static INLINE void 2944ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2946{
2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2971} 2948}
2972 2949
2973static INLINE void 2950ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2952{
2976 set_cdr (slot, value); 2953 set_cdr (slot, value);
2977} 2954}
2978 2955
2979static INLINE pointer 2956ecb_inline pointer
2980slot_value_in_env (pointer slot) 2957slot_value_in_env (pointer slot)
2981{ 2958{
2982 return cdr (slot); 2959 return cdr (slot);
2983} 2960}
2984 2961
2985/* ========== Evaluation Cycle ========== */ 2962/* ========== Evaluation Cycle ========== */
2986 2963
2987static pointer 2964static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 2965xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 2966{
2990#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
2991 pointer x; 2968 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 2969 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 3004 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 3005 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 3006 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 3007 SCHEME_V->op = OP_EVAL;
3031 3008
3032 return S_T; 3009 return 0;
3033 } 3010 }
3034#endif 3011#endif
3035 3012
3036 if (a) 3013 if (a)
3037 SCHEME_V->args = cons (a, NIL); 3014 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 3016 SCHEME_V->args = NIL;
3040 3017
3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3018 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3042 setimmutable (car (SCHEME_V->args)); 3019 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 3020 SCHEME_V->op = OP_ERR0;
3021
3044 return S_T; 3022 return 0;
3045} 3023}
3046 3024
3047#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3025#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3048#define Error_0(s) Error_1 (s, 0) 3026#define Error_0(s) Error_1 (s, 0)
3049 3027
3050/* Too small to turn into function */ 3028/* Too small to turn into function */
3051#define BEGIN do { 3029#define BEGIN do {
3052#define END } while (0) 3030#define END } while (0)
3053#define s_goto(a) BEGIN \ 3031#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 3032 SCHEME_V->op = a; \
3055 return S_T; END 3033 return 0; END
3056 3034
3057#define s_return(a) return xs_return (SCHEME_A_ a) 3035#define s_return(a) return xs_return (SCHEME_A_ a)
3058 3036
3059#ifndef USE_SCHEME_STACK 3037#ifndef USE_SCHEME_STACK
3060 3038
… …
3085 next_frame = SCHEME_V->dump_base + nframes; 3063 next_frame = SCHEME_V->dump_base + nframes;
3086 3064
3087 next_frame->op = op; 3065 next_frame->op = op;
3088 next_frame->args = args; 3066 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3067 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3068 next_frame->code = code;
3091 3069
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3071}
3094 3072
3095static pointer 3073static int
3096xs_return (SCHEME_P_ pointer a) 3074xs_return (SCHEME_P_ pointer a)
3097{ 3075{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3077 struct dump_stack_frame *frame;
3100 3078
3101 SCHEME_V->value = a; 3079 SCHEME_V->value = a;
3102 3080
3103 if (nframes <= 0) 3081 if (nframes <= 0)
3104 return NIL; 3082 return -1;
3105 3083
3106 frame = &SCHEME_V->dump_base[--nframes]; 3084 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3085 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3086 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3087 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3088 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3090
3113 return S_T; 3091 return 0;
3114} 3092}
3115 3093
3116static INLINE void 3094ecb_inline void
3117dump_stack_reset (SCHEME_P) 3095dump_stack_reset (SCHEME_P)
3118{ 3096{
3119 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3120 SCHEME_V->dump = (pointer)+0; 3098 SCHEME_V->dump = (pointer)+0;
3121} 3099}
3122 3100
3123static INLINE void 3101ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3102dump_stack_initialize (SCHEME_P)
3125{ 3103{
3126 SCHEME_V->dump_size = 0; 3104 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3105 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3106 dump_stack_reset (SCHEME_A);
… …
3181 int i = 0; 3159 int i = 0;
3182 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3160 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3183 3161
3184 while (cont != NIL) 3162 while (cont != NIL)
3185 { 3163 {
3186 frame->op = ivalue (car (cont)); cont = cdr (cont); 3164 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3187 frame->args = car (cont) ; cont = cdr (cont); 3165 frame->args = car (cont) ; cont = cdr (cont);
3188 frame->envir = car (cont) ; cont = cdr (cont); 3166 frame->envir = car (cont) ; cont = cdr (cont);
3189 frame->code = car (cont) ; cont = cdr (cont); 3167 frame->code = car (cont) ; cont = cdr (cont);
3190 3168
3191 ++frame; 3169 ++frame;
3192 ++i; 3170 ++i;
3193 } 3171 }
3194 3172
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3173 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3174}
3197 3175
3198#else 3176#else
3199 3177
3200static INLINE void 3178ecb_inline void
3201dump_stack_reset (SCHEME_P) 3179dump_stack_reset (SCHEME_P)
3202{ 3180{
3203 SCHEME_V->dump = NIL; 3181 SCHEME_V->dump = NIL;
3204} 3182}
3205 3183
3206static INLINE void 3184ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3185dump_stack_initialize (SCHEME_P)
3208{ 3186{
3209 dump_stack_reset (SCHEME_A); 3187 dump_stack_reset (SCHEME_A);
3210} 3188}
3211 3189
… …
3213dump_stack_free (SCHEME_P) 3191dump_stack_free (SCHEME_P)
3214{ 3192{
3215 SCHEME_V->dump = NIL; 3193 SCHEME_V->dump = NIL;
3216} 3194}
3217 3195
3218static pointer 3196static int
3219xs_return (SCHEME_P_ pointer a) 3197xs_return (SCHEME_P_ pointer a)
3220{ 3198{
3221 pointer dump = SCHEME_V->dump; 3199 pointer dump = SCHEME_V->dump;
3222 3200
3223 SCHEME_V->value = a; 3201 SCHEME_V->value = a;
3224 3202
3225 if (dump == NIL) 3203 if (dump == NIL)
3226 return NIL; 3204 return -1;
3227 3205
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3206 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3210
3233 SCHEME_V->dump = dump; 3211 SCHEME_V->dump = dump;
3234 3212
3235 return S_T; 3213 return 0;
3236} 3214}
3237 3215
3238static void 3216static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3218{
… …
3265 3243
3266#endif 3244#endif
3267 3245
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3247
3270static pointer 3248static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3249opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3250{
3251 pointer args = SCHEME_V->args;
3273 pointer x, y; 3252 pointer x, y;
3274 3253
3275 switch (op) 3254 switch (op)
3276 { 3255 {
3277 case OP_LOAD: /* load */ 3256 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3257 if (file_interactive (SCHEME_A))
3279 { 3258 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3259 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))); 3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3261 }
3283 3262
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3263 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3264 Error_1 ("unable to open", car (args));
3286 else 3265 else
3287 { 3266 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3268 s_goto (OP_T0LVL);
3290 } 3269 }
… …
3364 case OP_EVAL: /* main part of evaluation */ 3343 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3344#if USE_TRACING
3366 if (SCHEME_V->tracing) 3345 if (SCHEME_V->tracing)
3367 { 3346 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3347 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3348 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3349 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3350 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3351 s_goto (OP_P0LIST);
3373 } 3352 }
3374 3353
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3397 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3398 s_goto (OP_E1ARGS);
3420 } 3399 }
3421 3400
3422 case OP_E1ARGS: /* eval arguments */ 3401 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3402 args = cons (SCHEME_V->value, args);
3424 3403
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3404 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3405 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3406 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3407 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3408 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3409 s_goto (OP_EVAL);
3431 } 3410 }
3432 else /* end */ 3411 else /* end */
3433 { 3412 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3413 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3414 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3415 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3416 s_goto (OP_APPLY);
3438 } 3417 }
3439 3418
3440#if USE_TRACING 3419#if USE_TRACING
3441 3420
3442 case OP_TRACING: 3421 case OP_TRACING:
3443 { 3422 {
3444 int tr = SCHEME_V->tracing; 3423 int tr = SCHEME_V->tracing;
3445 3424
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3425 SCHEME_V->tracing = ivalue_unchecked (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3426 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3427 }
3449 3428
3450#endif 3429#endif
3451 3430
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3431 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3432#if USE_TRACING
3454 if (SCHEME_V->tracing) 3433 if (SCHEME_V->tracing)
3455 { 3434 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3435 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3436 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3437 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3438 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3439 s_goto (OP_P0LIST);
3461 } 3440 }
3462 3441
3463 /* fall through */ 3442 /* fall through */
3464 3443
3465 case OP_REAL_APPLY: 3444 case OP_REAL_APPLY:
3466#endif 3445#endif
3467 if (is_proc (SCHEME_V->code)) 3446 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3448 else if (is_foreign (SCHEME_V->code))
3472 { 3449 {
3473 /* Keep nested calls from GC'ing the arglist */ 3450 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3451 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3453
3477 s_return (x); 3454 s_return (x);
3478 } 3455 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3457 {
3481 /* Should not accept promise */ 3458 /* Should not accept promise */
3482 /* make environment */ 3459 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3460 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3461
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3462 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3463 {
3487 if (y == NIL) 3464 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3465 Error_0 ("not enough arguments");
3489 else 3466 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3467 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3485 s_goto (OP_BEGIN);
3509 } 3486 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3487 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3488 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3489 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3490 s_return (args != NIL ? car (args) : NIL);
3514 } 3491 }
3515 else 3492 else
3516 Error_0 ("illegal function"); 3493 Error_0 ("illegal function");
3517 3494
3518 case OP_DOMACRO: /* do macro */ 3495 case OP_DOMACRO: /* do macro */
… …
3527 { 3504 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3506
3530 if (f != NIL) 3507 if (f != NIL)
3531 { 3508 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3509 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3510 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3511 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3512 s_goto (OP_APPLY);
3536 } 3513 }
3537 3514
… …
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549 3526
3550#endif 3527#endif
3551 3528
3552 case OP_MKCLOSURE: /* make-closure */ 3529 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3530 x = car (args);
3554 3531
3555 if (car (x) == SCHEME_V->LAMBDA) 3532 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3533 x = cdr (x);
3557 3534
3558 if (cdr (SCHEME_V->args) == NIL) 3535 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3536 y = SCHEME_V->envir;
3560 else 3537 else
3561 y = cadr (SCHEME_V->args); 3538 y = cadr (args);
3562 3539
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3540 s_return (mk_closure (SCHEME_A_ x, y));
3564 3541
3565 case OP_QUOTE: /* quote */ 3542 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3543 s_return (car (SCHEME_V->code));
… …
3598 3575
3599 3576
3600 case OP_DEFP: /* defined? */ 3577 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3578 x = SCHEME_V->envir;
3602 3579
3603 if (cdr (SCHEME_V->args) != NIL) 3580 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3581 x = cadr (args);
3605 3582
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3583 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3584
3608 case OP_SET0: /* set! */ 3585 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3586 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3587 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3588
… …
3642 3619
3643 case OP_IF1: /* if */ 3620 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3621 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3622 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3623 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3624 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3625 s_goto (OP_EVAL);
3651 3626
3652 case OP_LET0: /* let */ 3627 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3628 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3629 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3630 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3631 s_goto (OP_LET1);
3657 3632
3658 case OP_LET1: /* let (calculate parameters) */ 3633 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3634 args = cons (SCHEME_V->value, args);
3660 3635
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3636 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3637 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3638 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)); 3639 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3640
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3641 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3642 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3643 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3644 s_goto (OP_EVAL);
3670 } 3645 }
3671 else /* end */ 3646 else /* end */
3672 { 3647 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3648 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3649 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3650 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3651 s_goto (OP_LET2);
3677 } 3652 }
3678 3653
3679 case OP_LET2: /* let */ 3654 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3656
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3657 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)) 3658 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3659 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3660
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3661 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3662 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3663 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3664 {
3690 if (!is_pair (x)) 3665 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3666 Error_1 ("Bad syntax of binding in let :", x);
3692 3667
3693 if (!is_list (SCHEME_A_ car (x))) 3668 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3669 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3670
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3671 args = cons (caar (x), args);
3697 } 3672 }
3698 3673
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3674 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3675 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3676 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3677 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3678 }
3706 else 3679 else
3707 { 3680 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3682 }
3683
3709 SCHEME_V->args = NIL; 3684 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3685 s_goto (OP_BEGIN);
3713 3686
3714 case OP_LET0AST: /* let* */ 3687 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3688 if (car (SCHEME_V->code) == NIL)
3716 { 3689 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3707 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3708 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3709
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3711 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3712 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3743 } 3716 }
3744 else /* end */ 3717 else /* end */
3745 { 3718 {
3746 SCHEME_V->code = SCHEME_V->args; 3719 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3720 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3721 s_goto (OP_BEGIN);
3749 } 3722 }
3750 3723
3751 case OP_LET0REC: /* letrec */ 3724 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3727 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3728 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3729 s_goto (OP_LET1REC);
3757 3730
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3731 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3732 args = cons (SCHEME_V->value, args);
3760 3733
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3734 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3735 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3736 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)); 3737 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3738
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3739 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3740 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3741 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3742 s_goto (OP_EVAL);
3770 } 3743 }
3771 else /* end */ 3744 else /* end */
3772 { 3745 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3746 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3747 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3748 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3749 s_goto (OP_LET2REC);
3777 } 3750 }
3778 3751
3779 case OP_LET2REC: /* letrec */ 3752 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3753 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)); 3754 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3755
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3756 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3757 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3758 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3845 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3846 s_goto (OP_EVAL);
3874 3847
3875 case OP_C1STREAM: /* cons-stream */ 3848 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3849 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); 3850 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3851 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3852 s_return (cons (args, x));
3880 3853
3881 case OP_MACRO0: /* macro */ 3854 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3855 if (is_pair (car (SCHEME_V->code)))
3883 { 3856 {
3884 x = caar (SCHEME_V->code); 3857 x = caar (SCHEME_V->code);
… …
3917 { 3890 {
3918 if (!is_pair (y = caar (x))) 3891 if (!is_pair (y = caar (x)))
3919 break; 3892 break;
3920 3893
3921 for (; y != NIL; y = cdr (y)) 3894 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3895 if (eqv (car (y), SCHEME_V->value))
3924 break; 3896 break;
3925 }
3926 3897
3927 if (y != NIL) 3898 if (y != NIL)
3928 break; 3899 break;
3929 } 3900 }
3930 3901
… …
3950 s_goto (OP_BEGIN); 3921 s_goto (OP_BEGIN);
3951 else 3922 else
3952 s_return (NIL); 3923 s_return (NIL);
3953 3924
3954 case OP_PAPPLY: /* apply */ 3925 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3928 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3929 s_goto (OP_APPLY);
3959 3930
3960 case OP_PEVAL: /* eval */ 3931 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3932 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3933 SCHEME_V->envir = cadr (args);
3963 3934
3964 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3936 s_goto (OP_EVAL);
3966 3937
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3938 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3939 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3940 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 3941 s_goto (OP_APPLY);
3971 } 3942 }
3972 3943
3973 return S_T; 3944 if (USE_ERROR_CHECKING) abort ();
3974} 3945}
3975 3946
3976static pointer 3947static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3948opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3949{
3979 pointer x; 3950 pointer args = SCHEME_V->args;
3951 pointer x = car (args);
3980 num v; 3952 num v;
3981 3953
3954 switch (op)
3955 {
3982#if USE_MATH 3956#if USE_MATH
3983 RVALUE dd;
3984#endif
3985
3986 switch (op)
3987 {
3988#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3957 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args); 3958 {
3992
3993 if (num_is_integer (x)) 3959 if (is_integer (x))
3994 s_return (x); 3960 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3961
3962 RVALUE r = rvalue_unchecked (x);
3963
3964 if (r == (RVALUE)(IVALUE)r)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3997 else 3966 else
3998 Error_1 ("inexact->exact: not integral:", x); 3967 Error_1 ("inexact->exact: not integral:", x);
3968 }
3999 3969
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3970 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)))); 3971 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)))); 3972 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)))); 3973 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)))); 3974 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)))); 3975 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)))); 3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 3977
4028 case OP_ATAN: 3978 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 3979 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 3981 else
4034 { 3982 {
4035 pointer y = cadr (SCHEME_V->args); 3983 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 3985 }
4039 3986
4040 case OP_SQRT: 3987 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 3989
4044 case OP_EXPT: 3990 case OP_EXPT:
4045 { 3991 {
4046 RVALUE result; 3992 RVALUE result;
4047 int real_result = 1; 3993 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4049 3995
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 3996 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 3997 real_result = 0;
4054 3998
4055 /* This 'if' is an R5RS compatibility fix. */ 3999 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 4000 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 4001 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 4002 result = 0;
4059 else 4003 else
4060 result = pow (rvalue (x), rvalue (y)); 4004 result = pow (rvalue (x), rvalue (y));
4061 4005
4062 /* Before returning integer result make sure we can. */ 4006 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 4007 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 4008 if (!real_result)
4065 { 4009 {
4066 long result_as_long = (long) result; 4010 long result_as_long = result;
4067 4011
4068 if (result != (RVALUE) result_as_long) 4012 if (result != result_as_long)
4069 real_result = 1; 4013 real_result = 1;
4070 } 4014 }
4071 4015
4072 if (real_result) 4016 if (real_result)
4073 s_return (mk_real (SCHEME_A_ result)); 4017 s_return (mk_real (SCHEME_A_ result));
4074 else 4018 else
4075 s_return (mk_integer (SCHEME_A_ result)); 4019 s_return (mk_integer (SCHEME_A_ result));
4076 } 4020 }
4077 4021
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4022 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)))); 4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 4024
4086 case OP_TRUNCATE: 4025 case OP_TRUNCATE:
4087 { 4026 {
4088 RVALUE rvalue_of_x; 4027 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))); 4028 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 } 4029 }
4098 4030
4099 case OP_ROUND: 4031 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4032 if (is_integer (x))
4103 s_return (x); 4033 s_return (x);
4104 4034
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4036#endif
4107 4037
4108 case OP_ADD: /* + */ 4038 case OP_ADD: /* + */
4109 v = num_zero; 4039 v = num_zero;
4110 4040
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4041 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4042 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4043
4114 s_return (mk_number (SCHEME_A_ v)); 4044 s_return (mk_number (SCHEME_A_ v));
4115 4045
4116 case OP_MUL: /* * */ 4046 case OP_MUL: /* * */
4117 v = num_one; 4047 v = num_one;
4118 4048
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4049 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4050 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4051
4122 s_return (mk_number (SCHEME_A_ v)); 4052 s_return (mk_number (SCHEME_A_ v));
4123 4053
4124 case OP_SUB: /* - */ 4054 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4055 if (cdr (args) == NIL)
4126 { 4056 {
4127 x = SCHEME_V->args; 4057 x = args;
4128 v = num_zero; 4058 v = num_zero;
4129 } 4059 }
4130 else 4060 else
4131 { 4061 {
4132 x = cdr (SCHEME_V->args); 4062 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4063 v = nvalue (car (args));
4134 } 4064 }
4135 4065
4136 for (; x != NIL; x = cdr (x)) 4066 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4067 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4068
4139 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4140 4070
4141 case OP_DIV: /* / */ 4071 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4143 { 4073 {
4144 x = SCHEME_V->args; 4074 x = args;
4145 v = num_one; 4075 v = num_one;
4146 } 4076 }
4147 else 4077 else
4148 { 4078 {
4149 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4151 } 4081 }
4152 4082
4153 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4084 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4085 v = num_div (v, nvalue (car (x)));
4157 else 4086 else
4158 Error_0 ("/: division by zero"); 4087 Error_0 ("/: division by zero");
4159 }
4160 4088
4161 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4162 4090
4163 case OP_INTDIV: /* quotient */ 4091 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4092 if (cdr (args) == NIL)
4165 { 4093 {
4166 x = SCHEME_V->args; 4094 x = args;
4167 v = num_one; 4095 v = num_one;
4168 } 4096 }
4169 else 4097 else
4170 { 4098 {
4171 x = cdr (SCHEME_V->args); 4099 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4100 v = nvalue (car (args));
4173 } 4101 }
4174 4102
4175 for (; x != NIL; x = cdr (x)) 4103 for (; x != NIL; x = cdr (x))
4176 { 4104 {
4177 if (ivalue (car (x)) != 0) 4105 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4106 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4107 else
4180 Error_0 ("quotient: division by zero"); 4108 Error_0 ("quotient: division by zero");
4181 } 4109 }
4182 4110
4183 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4184 4112
4185 case OP_REM: /* remainder */ 4113 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4114 v = nvalue (x);
4187 4115
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4116 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4117 v = num_rem (v, nvalue (cadr (args)));
4190 else 4118 else
4191 Error_0 ("remainder: division by zero"); 4119 Error_0 ("remainder: division by zero");
4192 4120
4193 s_return (mk_number (SCHEME_A_ v)); 4121 s_return (mk_number (SCHEME_A_ v));
4194 4122
4195 case OP_MOD: /* modulo */ 4123 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4124 v = nvalue (x);
4197 4125
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4126 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4127 v = num_mod (v, nvalue (cadr (args)));
4200 else 4128 else
4201 Error_0 ("modulo: division by zero"); 4129 Error_0 ("modulo: division by zero");
4202 4130
4203 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4204 4132
4205 case OP_CAR: /* car */ 4133 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4134 s_return (caar (args));
4207 4135
4208 case OP_CDR: /* cdr */ 4136 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4137 s_return (cdar (args));
4210 4138
4211 case OP_CONS: /* cons */ 4139 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4140 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4141 s_return (args);
4214 4142
4215 case OP_SETCAR: /* set-car! */ 4143 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4144 if (!is_immutable (x))
4217 { 4145 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4146 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4147 s_return (car (args));
4220 } 4148 }
4221 else 4149 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4150 Error_0 ("set-car!: unable to alter immutable pair");
4223 4151
4224 case OP_SETCDR: /* set-cdr! */ 4152 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4153 if (!is_immutable (x))
4226 { 4154 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4155 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4156 s_return (car (args));
4229 } 4157 }
4230 else 4158 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4159 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4160
4233 case OP_CHAR2INT: /* char->integer */ 4161 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4162 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4235 4163
4236 case OP_INT2CHAR: /* integer->char */ 4164 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4165 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4238 4166
4239 case OP_CHARUPCASE: 4167 case OP_CHARUPCASE:
4240 { 4168 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4169 unsigned char c = ivalue_unchecked (x);
4242 c = toupper (c); 4170 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4171 s_return (mk_character (SCHEME_A_ c));
4244 } 4172 }
4245 4173
4246 case OP_CHARDNCASE: 4174 case OP_CHARDNCASE:
4247 { 4175 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4176 unsigned char c = ivalue_unchecked (x);
4249 c = tolower (c); 4177 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4178 s_return (mk_character (SCHEME_A_ c));
4251 } 4179 }
4252 4180
4253 case OP_STR2SYM: /* string->symbol */ 4181 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4182 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4183
4256 case OP_STR2ATOM: /* string->atom */ 4184 case OP_STR2ATOM: /* string->atom */
4257 { 4185 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4186 char *s = strvalue (x);
4259 long pf = 0; 4187 long pf = 0;
4260 4188
4261 if (cdr (SCHEME_V->args) != NIL) 4189 if (cdr (args) != NIL)
4262 { 4190 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4191 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4192 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4193 pf = ivalue_unchecked (cadr (args));
4266 4194
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4195 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4196 {
4269 /* base is OK */ 4197 /* base is OK */
4270 } 4198 }
4271 else 4199 else
4272 pf = -1; 4200 pf = -1;
4273 } 4201 }
4274 4202
4275 if (pf < 0) 4203 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4204 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4205 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4206 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4207 else
4280 { 4208 {
4281 if (pf == 0 || pf == 10) 4209 if (pf == 0 || pf == 10)
… …
4292 } 4220 }
4293 } 4221 }
4294 } 4222 }
4295 4223
4296 case OP_SYM2STR: /* symbol->string */ 4224 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4225 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4226 setimmutable (x);
4299 s_return (x); 4227 s_return (x);
4300 4228
4301 case OP_ATOM2STR: /* atom->string */ 4229 case OP_ATOM2STR: /* atom->string */
4302 { 4230 {
4303 long pf = 0; 4231 long pf = 0;
4304 4232
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4308 { 4234 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4235 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4236 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4237 pf = ivalue_unchecked (cadr (args));
4312 4238
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4239 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4240 {
4315 /* base is OK */ 4241 /* base is OK */
4316 } 4242 }
4317 else 4243 else
4318 pf = -1; 4244 pf = -1;
4319 } 4245 }
4320 4246
4321 if (pf < 0) 4247 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4248 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4249 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4250 {
4325 char *p; 4251 char *p;
4326 int len; 4252 int len;
4327 4253
… …
4332 Error_1 ("atom->string: not an atom:", x); 4258 Error_1 ("atom->string: not an atom:", x);
4333 } 4259 }
4334 4260
4335 case OP_MKSTRING: /* make-string */ 4261 case OP_MKSTRING: /* make-string */
4336 { 4262 {
4337 int fill = ' '; 4263 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4338 int len; 4264 int len = ivalue_unchecked (x);
4339 4265
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)); 4266 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4267 }
4347 4268
4348 case OP_STRLEN: /* string-length */ 4269 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4270 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4271
4351 case OP_STRREF: /* string-ref */ 4272 case OP_STRREF: /* string-ref */
4352 { 4273 {
4353 char *str; 4274 char *str = strvalue (x);
4354 int index;
4355
4356 str = strvalue (car (SCHEME_V->args));
4357
4358 index = ivalue (cadr (SCHEME_V->args)); 4275 int index = ivalue_unchecked (cadr (args));
4359 4276
4360 if (index >= strlength (car (SCHEME_V->args))) 4277 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4278 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4279
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4280 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4281 }
4365 4282
4366 case OP_STRSET: /* string-set! */ 4283 case OP_STRSET: /* string-set! */
4367 { 4284 {
4368 char *str; 4285 char *str = strvalue (x);
4369 int index; 4286 int index = ivalue_unchecked (cadr (args));
4370 int c; 4287 int c;
4371 4288
4372 if (is_immutable (car (SCHEME_V->args))) 4289 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4290 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4291
4375 str = strvalue (car (SCHEME_V->args));
4376
4377 index = ivalue (cadr (SCHEME_V->args));
4378
4379 if (index >= strlength (car (SCHEME_V->args))) 4292 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4293 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4294
4382 c = charvalue (caddr (SCHEME_V->args)); 4295 c = charvalue (caddr (args));
4383 4296
4384 str[index] = (char) c; 4297 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4298 s_return (car (args));
4386 } 4299 }
4387 4300
4388 case OP_STRAPPEND: /* string-append */ 4301 case OP_STRAPPEND: /* string-append */
4389 { 4302 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4303 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4304 int len = 0;
4392 pointer newstr; 4305 pointer newstr;
4393 char *pos; 4306 char *pos;
4394 4307
4395 /* compute needed length for new string */ 4308 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4309 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4310 len += strlength (car (x));
4398 4311
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4312 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4313
4401 /* store the contents of the argument strings into the new string */ 4314 /* 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)) 4315 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4316 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4317
4405 s_return (newstr); 4318 s_return (newstr);
4406 } 4319 }
4407 4320
4408 case OP_SUBSTR: /* substring */ 4321 case OP_SUBSTR: /* substring */
4409 { 4322 {
4410 char *str; 4323 char *str = strvalue (x);
4411 int index0; 4324 int index0 = ivalue_unchecked (cadr (args));
4412 int index1; 4325 int index1;
4413 int len; 4326 int len;
4414 4327
4415 str = strvalue (car (SCHEME_V->args));
4416
4417 index0 = ivalue (cadr (SCHEME_V->args));
4418
4419 if (index0 > strlength (car (SCHEME_V->args))) 4328 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4329 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4330
4422 if (cddr (SCHEME_V->args) != NIL) 4331 if (cddr (args) != NIL)
4423 { 4332 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4333 index1 = ivalue_unchecked (caddr (args));
4425 4334
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4335 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4336 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4337 }
4429 else 4338 else
4430 index1 = strlength (car (SCHEME_V->args)); 4339 index1 = strlength (x);
4431 4340
4432 len = index1 - index0; 4341 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4342 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4343 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4344 strvalue (x)[len] = 0;
… …
4439 4348
4440 case OP_VECTOR: /* vector */ 4349 case OP_VECTOR: /* vector */
4441 { 4350 {
4442 int i; 4351 int i;
4443 pointer vec; 4352 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4353 int len = list_length (SCHEME_A_ args);
4445 4354
4446 if (len < 0) 4355 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4356 Error_1 ("vector: not a proper list:", args);
4448 4357
4449 vec = mk_vector (SCHEME_A_ len); 4358 vec = mk_vector (SCHEME_A_ len);
4450 4359
4451#if USE_ERROR_CHECKING 4360#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4361 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4362 s_return (S_SINK);
4454#endif 4363#endif
4455 4364
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4365 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4366 vector_set (vec, i, car (x));
4458 4367
4459 s_return (vec); 4368 s_return (vec);
4460 } 4369 }
4461 4370
4462 case OP_MKVECTOR: /* make-vector */ 4371 case OP_MKVECTOR: /* make-vector */
4463 { 4372 {
4464 pointer fill = NIL; 4373 pointer fill = NIL;
4465 int len;
4466 pointer vec; 4374 pointer vec;
4375 int len = ivalue_unchecked (x);
4467 4376
4468 len = ivalue (car (SCHEME_V->args));
4469
4470 if (cdr (SCHEME_V->args) != NIL) 4377 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4378 fill = cadr (args);
4472 4379
4473 vec = mk_vector (SCHEME_A_ len); 4380 vec = mk_vector (SCHEME_A_ len);
4474 4381
4475#if USE_ERROR_CHECKING 4382#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4383 if (SCHEME_V->no_memory)
4477 s_return (S_SINK); 4384 s_return (S_SINK);
4478#endif 4385#endif
4479 4386
4480 if (fill != NIL) 4387 if (fill != NIL)
4481 fill_vector (vec, fill); 4388 fill_vector (vec, 0, fill);
4482 4389
4483 s_return (vec); 4390 s_return (vec);
4484 } 4391 }
4485 4392
4486 case OP_VECLEN: /* vector-length */ 4393 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4394 s_return (mk_integer (SCHEME_A_ veclength (x)));
4488 4395
4489 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4490 { 4397 {
4491 int index;
4492
4493 index = ivalue (cadr (SCHEME_V->args)); 4398 int index = ivalue_unchecked (cadr (args));
4494 4399
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4402
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_get (x, index));
4499 } 4404 }
4500 4405
4501 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4502 { 4407 {
4503 int index; 4408 int index = ivalue_unchecked (cadr (args));
4504 4409
4505 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4412
4508 index = ivalue (cadr (SCHEME_V->args));
4509
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4415
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4416 vector_set (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4417 s_return (x);
4515 } 4418 }
4516 } 4419 }
4517 4420
4518 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4519} 4422}
4520 4423
4521INTERFACE int 4424static int
4522is_list (SCHEME_P_ pointer a) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4426{
4524 return list_length (SCHEME_A_ a) >= 0; 4427 pointer x = SCHEME_V->args;
4525}
4526 4428
4527/* Result is: 4429 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 { 4430 {
4431 num v = nvalue (car (x));
4432 x = cdr (x);
4433
4543 if (fast == NIL) 4434 if (x == NIL)
4544 return i; 4435 break;
4545 4436
4546 if (!is_pair (fast)) 4437 int r = num_cmp (v, nvalue (car (x)));
4547 return -2 - i;
4548 4438
4549 fast = cdr (fast); 4439 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 { 4440 {
4567 /* the fast pointer has looped back around and caught up 4441 case OP_NUMEQ: r = r == 0; break;
4568 with the slow pointer, hence the structure is circular, 4442 case OP_LESS: r = r < 0; break;
4569 not of finite length, and therefore not a list */ 4443 case OP_GRE: r = r > 0; break;
4570 return -1; 4444 case OP_LEQ: r = r <= 0; break;
4445 case OP_GEQ: r = r >= 0; break;
4571 } 4446 }
4572 }
4573}
4574 4447
4448 if (!r)
4449 s_return (S_F);
4450 }
4451
4452 s_return (S_T);
4453}
4454
4575static pointer 4455static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4457{
4578 pointer x; 4458 pointer args = SCHEME_V->args;
4579 num v; 4459 pointer a = car (args);
4580 int (*comp_func) (num, num); 4460 pointer d = cdr (args);
4461 int r;
4581 4462
4582 switch (op) 4463 switch (op)
4583 { 4464 {
4584 case OP_NOT: /* not */ 4465 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4475
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 4476#if USE_CHAR_CLASSIFIERS
4656 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4657 case OP_CHARAP: /* char-alphabetic? */ 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4659 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4660 case OP_CHARNP: /* char-numeric? */ 4481 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 4482#endif
4483
4672#if USE_PORTS 4484#if USE_PORTS
4673 4485 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? */ 4486 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? */ 4487 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4488#endif
4683 4489
4684 case OP_PROCP: /* procedure? */ 4490 case OP_PROCP: /* procedure? */
4685 4491
4686 /*-- 4492 /*--
4687 * continuation should be procedure by the example 4493 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4494 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4495 * in R^3 report sec. 6.9
4690 */ 4496 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4497 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))); 4498 break;
4693 4499
4694 case OP_PAIRP: /* pair? */ 4500 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4501 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4502 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4503 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4504 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4505 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 } 4506 }
4712 4507
4713 return S_T; 4508 s_retbool (r);
4714} 4509}
4715 4510
4716static pointer 4511static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4513{
4514 pointer args = SCHEME_V->args;
4515 pointer a = car (args);
4719 pointer x, y; 4516 pointer x, y;
4720 4517
4721 switch (op) 4518 switch (op)
4722 { 4519 {
4723 case OP_FORCE: /* force */ 4520 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4521 SCHEME_V->code = a;
4725 4522
4726 if (is_promise (SCHEME_V->code)) 4523 if (is_promise (SCHEME_V->code))
4727 { 4524 {
4728 /* Should change type to closure here */ 4525 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4526 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4547 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4548 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4549 }
4753 } 4550 }
4754 4551
4755 SCHEME_V->args = car (SCHEME_V->args); 4552 SCHEME_V->args = a;
4756 4553
4757 if (op == OP_WRITE) 4554 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4555 SCHEME_V->print_flag = 1;
4759 else 4556 else
4760 SCHEME_V->print_flag = 0; 4557 SCHEME_V->print_flag = 0;
4761 4558
4762 s_goto (OP_P0LIST); 4559 s_goto (OP_P0LIST);
4763 4560
4764 case OP_NEWLINE: /* newline */ 4561 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4562 if (is_pair (args))
4766 { 4563 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4564 if (a != SCHEME_V->outport)
4768 { 4565 {
4769 x = cons (SCHEME_V->outport, NIL); 4566 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4568 SCHEME_V->outport = a;
4772 } 4569 }
4773 } 4570 }
4774 4571
4775 putstr (SCHEME_A_ "\n"); 4572 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4573 s_return (S_T);
4777#endif 4574#endif
4778 4575
4779 case OP_ERR0: /* error */ 4576 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4577 SCHEME_V->retcode = -1;
4781 4578
4782 if (!is_string (car (SCHEME_V->args))) 4579 if (!is_string (a))
4783 { 4580 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4581 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4582 setimmutable (car (args));
4786 } 4583 }
4787 4584
4788 putstr (SCHEME_A_ "Error: "); 4585 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4586 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4587 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4588 s_goto (OP_ERR1);
4792 4589
4793 case OP_ERR1: /* error */ 4590 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4591 putstr (SCHEME_A_ " ");
4795 4592
4796 if (SCHEME_V->args != NIL) 4593 if (args != NIL)
4797 { 4594 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4596 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4598 s_goto (OP_P0LIST);
4802 } 4599 }
4803 else 4600 else
4804 { 4601 {
4805 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4806 4603
4807 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4809 else 4606 else
4810 return NIL; 4607 return -1;
4811 } 4608 }
4812 4609
4813 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4611 s_return (reverse (SCHEME_A_ a));
4815 4612
4816 case OP_LIST_STAR: /* list* */ 4613 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4614 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4615
4819 case OP_APPEND: /* append */ 4616 case OP_APPEND: /* append */
4820 x = NIL; 4617 x = NIL;
4821 y = SCHEME_V->args; 4618 y = args;
4822 4619
4823 if (y == x) 4620 if (y == x)
4824 s_return (x); 4621 s_return (x);
4825 4622
4826 /* cdr() in the while condition is not a typo. If car() */ 4623 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4634 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4635
4839#if USE_PLIST 4636#if USE_PLIST
4840 4637
4841 case OP_PUT: /* put */ 4638 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4639 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4640 Error_0 ("illegal use of put");
4844 4641
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4642 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4643 {
4847 if (caar (x) == y) 4644 if (caar (x) == y)
4848 break; 4645 break;
4849 } 4646 }
4850 4647
4851 if (x != NIL) 4648 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4649 cdar (x) = caddr (args);
4853 else 4650 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4651 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4652
4856 s_return (S_T); 4653 s_return (S_T);
4857 4654
4858 case OP_GET: /* get */ 4655 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4656 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4657 Error_0 ("illegal use of get");
4861 4658
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4659 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4660 if (caar (x) == y)
4864 break; 4661 break;
4865 4662
4866 if (x != NIL) 4663 if (x != NIL)
4867 s_return (cdar (x)); 4664 s_return (cdar (x));
… …
4869 s_return (NIL); 4666 s_return (NIL);
4870 4667
4871#endif /* USE_PLIST */ 4668#endif /* USE_PLIST */
4872 4669
4873 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4672 SCHEME_V->retcode = ivalue (a);
4876 4673
4877 return NIL; 4674 return -1;
4878 4675
4879 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4678 s_return (S_T);
4882 4679
4883 case OP_GCVERB: /* gc-verbose */ 4680 case OP_GCVERB: /* gc-verbose */
4884 { 4681 {
4885 int was = SCHEME_V->gc_verbose; 4682 int was = SCHEME_V->gc_verbose;
4886 4683
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4684 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4685 s_retbool (was);
4889 } 4686 }
4890 4687
4891 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4689 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
4894 4691
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
4896 4693
4897 s_return (S_T); 4694 s_return (S_T);
4898 4695
4899 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4724 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4725 prop = port_input | port_output;
4929 break; 4726 break;
4930 } 4727 }
4931 4728
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4730
4934 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4732 }
4939 4733
4940# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
4941 4735
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4748 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4749 prop = port_input | port_output;
4956 break; 4750 break;
4957 } 4751 }
4958 4752
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4754 strvalue (a) + strlength (a), prop);
4961 4755
4962 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4757 }
4967 4758
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4760 {
4970 pointer p; 4761 pointer p;
4971 4762
4972 if (car (SCHEME_V->args) == NIL) 4763 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4765 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4767 strvalue (a) + strlength (a), port_output);
4983 4768
4984 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4770 }
4990 4771
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4773 {
4993 port *p; 4774 port *p;
4994 4775
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4776 if ((p = a->object.port)->kind & port_string)
4996 { 4777 {
4997 off_t size; 4778 off_t size;
4998 char *str; 4779 char *str;
4999 4780
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4781 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4797 }
5017 4798
5018# endif 4799# endif
5019 4800
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4801 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4802 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4803 s_return (S_T);
5023 4804
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4805 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4806 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4807 s_return (S_T);
5027#endif 4808#endif
5028 4809
5029 case OP_INT_ENV: /* interaction-environment */ 4810 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4811 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
5034 4815
5035 } 4816 }
5036 4817
5037 return S_T; 4818 if (USE_ERROR_CHECKING) abort ();
5038} 4819}
5039 4820
5040static pointer 4821static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4823{
4824 pointer args = SCHEME_V->args;
5043 pointer x; 4825 pointer x;
5044 4826
5045 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
5046 { 4828 {
5047 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4836 switch (op)
5055 { 4837 {
5056 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
5057#if USE_PORTS 4839#if USE_PORTS
5058 case OP_READ: 4840 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
5061 4843
5062 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
5064 4846
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
5067 4849
5068 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4852 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
5073 4855
5074 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
5076 { 4858 {
5077 int c; 4859 int c;
5078 4860
5079 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
5080 { 4862 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
5082 { 4864 {
5083 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4866 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
5087 } 4869 }
5088 } 4870 }
5089 4871
5090 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
5091 4873
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
5102 { 4884 {
5103 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
5104 int res; 4886 int res;
5105 4887
5106 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4889 p = car (args);
5108 4890
5109 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
5110 4892
5111 s_retbool (res); 4893 s_retbool (res);
5112 } 4894 }
5113 4895
5114 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
5117 4899
5118 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
5121#endif 4903#endif
5122 4904
5123 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5210 } 4992 }
5211 4993
5212 break; 4994 break;
5213 4995
5214 case OP_RDLIST: 4996 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4997 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 4998 SCHEME_V->tok = token (SCHEME_A);
5217 4999
5218 switch (SCHEME_V->tok) 5000 switch (SCHEME_V->tok)
5219 { 5001 {
5220 case TOK_EOF: 5002 case TOK_EOF:
… …
5248 case OP_RDDOT: 5030 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5031 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5032 Error_0 ("syntax error: illegal dot expression");
5251 5033
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5034 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5035 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5036
5255 case OP_RDQUOTE: 5037 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5038 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5039
5258 case OP_RDQQUOTE: 5040 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5062 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5063 s_goto (OP_VECTOR);
5282 5064
5283 /* ========== printing part ========== */ 5065 /* ========== printing part ========== */
5284 case OP_P0LIST: 5066 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5067 if (is_vector (args))
5286 { 5068 {
5287 putstr (SCHEME_A_ "#("); 5069 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5070 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5071 s_goto (OP_PVECFROM);
5290 } 5072 }
5291 else if (is_environment (SCHEME_V->args)) 5073 else if (is_environment (args))
5292 { 5074 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5075 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5076 s_return (S_T);
5295 } 5077 }
5296 else if (!is_pair (SCHEME_V->args)) 5078 else if (!is_pair (args))
5297 { 5079 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5080 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5081 s_return (S_T);
5300 } 5082 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5083 else
5302 { 5084 {
5085 pointer a = car (args);
5086 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b);
5089
5090 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5091 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5092 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`");
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ",");
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@");
5098 else
5099 {
5100 putstr (SCHEME_A_ "(");
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a;
5103 }
5104
5305 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5306 } 5106 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5107
5108 case OP_P1LIST:
5109 if (is_pair (args))
5308 { 5110 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5112 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5113 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5312 } 5115 }
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)) 5116 else if (is_vector (args))
5342 { 5117 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5118 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5119 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5120 s_goto (OP_P0LIST);
5346 } 5121 }
5347 else 5122 else
5348 { 5123 {
5349 if (SCHEME_V->args != NIL) 5124 if (args != NIL)
5350 { 5125 {
5351 putstr (SCHEME_A_ " . "); 5126 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5128 }
5354 5129
5355 putstr (SCHEME_A_ ")"); 5130 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5131 s_return (S_T);
5357 } 5132 }
5358 5133
5359 case OP_PVECFROM: 5134 case OP_PVECFROM:
5360 { 5135 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5136 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5137 pointer vec = car (args);
5363 int len = veclength (vec); 5138 int len = veclength (vec);
5364 5139
5365 if (i == len) 5140 if (i == len)
5366 { 5141 {
5367 putstr (SCHEME_A_ ")"); 5142 putstr (SCHEME_A_ ")");
5368 s_return (S_T); 5143 s_return (S_T);
5369 } 5144 }
5370 else 5145 else
5371 { 5146 {
5372 pointer elem = vector_elem (vec, i); 5147 pointer elem = vector_get (vec, i);
5373 5148
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5149 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5151 SCHEME_V->args = elem;
5377 5152
5378 if (i > 0) 5153 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5154 putstr (SCHEME_A_ " ");
5380 5155
5381 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5382 } 5157 }
5383 } 5158 }
5384 } 5159 }
5385 5160
5386 return S_T; 5161 if (USE_ERROR_CHECKING) abort ();
5387} 5162}
5388 5163
5389static pointer 5164static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5165opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5166{
5167 pointer args = SCHEME_V->args;
5168 pointer a = car (args);
5392 pointer x, y; 5169 pointer x, y;
5393 5170
5394 switch (op) 5171 switch (op)
5395 { 5172 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5173 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5174 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5175 long v = list_length (SCHEME_A_ a);
5399 5176
5400 if (v < 0) 5177 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5178 Error_1 ("length: not a list:", a);
5402 5179
5403 s_return (mk_integer (SCHEME_A_ v)); 5180 s_return (mk_integer (SCHEME_A_ v));
5404 } 5181 }
5405 5182
5406 case OP_ASSQ: /* assq *//* a.k */ 5183 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5184 x = a;
5408 5185
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5186 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5187 {
5411 if (!is_pair (car (y))) 5188 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5189 Error_0 ("unable to handle non pair element");
5413 5190
5414 if (x == caar (y)) 5191 if (x == caar (y))
… …
5420 else 5197 else
5421 s_return (S_F); 5198 s_return (S_F);
5422 5199
5423 5200
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5201 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5202 SCHEME_V->args = a;
5426 5203
5427 if (SCHEME_V->args == NIL) 5204 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5205 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5206 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5207 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5436 case OP_CLOSUREP: /* closure? */ 5213 case OP_CLOSUREP: /* closure? */
5437 /* 5214 /*
5438 * Note, macro object is also a closure. 5215 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5216 * Therefore, (closure? <#MACRO>) ==> #t
5440 */ 5217 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5218 s_retbool (is_closure (a));
5442 5219
5443 case OP_MACROP: /* macro? */ 5220 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5221 s_retbool (is_macro (a));
5445 } 5222 }
5446 5223
5447 return S_T; /* NOTREACHED */ 5224 if (USE_ERROR_CHECKING) abort ();
5448} 5225}
5449 5226
5227/* 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); 5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5229
5452typedef int (*test_predicate) (pointer); 5230typedef int (*test_predicate)(pointer);
5453static int 5231static int
5454is_any (pointer p) 5232tst_any (pointer p)
5455{ 5233{
5456 return 1; 5234 return 1;
5457} 5235}
5458 5236
5459static int 5237static int
5460is_nonneg (pointer p) 5238tst_inonneg (pointer p)
5461{ 5239{
5462 return ivalue (p) >= 0 && is_integer (p); 5240 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241}
5242
5243static int
5244tst_is_list (SCHEME_P_ pointer p)
5245{
5246 return p == NIL || is_pair (p);
5463} 5247}
5464 5248
5465/* Correspond carefully with following defines! */ 5249/* Correspond carefully with following defines! */
5466static struct 5250static struct
5467{ 5251{
5468 test_predicate fct; 5252 test_predicate fct;
5469 const char *kind; 5253 const char *kind;
5470} tests[] = 5254} tests[] = {
5471{ 5255 { tst_any , 0 },
5472 { 0, 0}, /* unused */ 5256 { is_string , "string" },
5473 { is_any, 0}, 5257 { is_symbol , "symbol" },
5474 { is_string, "string" }, 5258 { is_port , "port" },
5475 { is_symbol, "symbol" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5259 { is_inport , "input port" },
5478 { is_outport, "output port" }, 5260 { is_outport , "output port" },
5479 { is_environment, "environment" }, 5261 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5262 { is_pair , "pair" },
5481 { 0, "pair or '()" }, 5263 { 0 , "pair or '()" },
5482 { is_character, "character" }, 5264 { is_character , "character" },
5483 { is_vector, "vector" }, 5265 { is_vector , "vector" },
5484 { is_number, "number" }, 5266 { is_number , "number" },
5485 { is_integer, "integer" }, 5267 { is_integer , "integer" },
5486 { is_nonneg, "non-negative integer" } 5268 { tst_inonneg , "non-negative integer" }
5487}; 5269};
5488 5270
5489#define TST_NONE 0 5271#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5272#define TST_ANY "\001"
5491#define TST_STRING "\002" 5273#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5274#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5275#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5276#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5277#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5278#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5279#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5280#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5281#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5282#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5283#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5284#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5285#define TST_NATURAL "\016"
5286
5287#define INF_ARG 0xff
5288#define UNNAMED_OP ""
5289
5290static const char opnames[] =
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h"
5293#undef OP_DEF
5294;
5295
5296static const char *
5297opname (int idx)
5298{
5299 const char *name = opnames;
5300
5301 /* should do this at compile time, but would require external program, right? */
5302 while (idx--)
5303 name += strlen (name) + 1;
5304
5305 return *name ? name : "ILLEGAL";
5306}
5307
5308static const char *
5309procname (pointer x)
5310{
5311 return opname (procnum (x));
5312}
5504 5313
5505typedef struct 5314typedef struct
5506{ 5315{
5507 dispatch_func func; 5316 uint8_t func;
5508 char *name; 5317 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5318 uint8_t builtin;
5319#if USE_ERROR_CHECKING
5509 int min_arity; 5320 uint8_t min_arity;
5510 int max_arity; 5321 uint8_t max_arity;
5511 char *arg_tests_encoding; 5322 char arg_tests_encoding[3];
5323#endif
5512} op_code_info; 5324} op_code_info;
5513 5325
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5326static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5327#if USE_ERROR_CHECKING
5328#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5329#else
5330#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5331#endif
5518#include "opdefines.h" 5332#include "opdefines.h"
5333#undef OP_DEF
5519 {0} 5334 {0}
5520}; 5335};
5521 5336
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 */ 5337/* kernel of this interpreter */
5535static void 5338static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5340{
5538 SCHEME_V->op = op; 5341 SCHEME_V->op = op;
5539 5342
5540 for (;;) 5343 for (;;)
5541 { 5344 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5345 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5346
5544#if USE_ERROR_CHECKING 5347#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5348 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5349 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5350 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5351 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5352
5551 /* Check number of arguments */ 5353 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5354 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5355 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5356 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5357 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5358 xError_1 (SCHEME_A_ msg, 0);
5359 continue;
5557 } 5360 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5361 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5362 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5363 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5364 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5365 xError_1 (SCHEME_A_ msg, 0);
5366 continue;
5563 } 5367 }
5564 5368 else
5565 if (ecb_expect_false (ok))
5566 { 5369 {
5567 if (pcd->arg_tests_encoding) 5370 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5371 {
5569 int i = 0; 5372 int i = 0;
5570 int j; 5373 int j;
5571 const char *t = pcd->arg_tests_encoding; 5374 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5375 pointer arglist = SCHEME_V->args;
5573 5376
5574 do 5377 do
5575 { 5378 {
5576 pointer arg = car (arglist); 5379 pointer arg = car (arglist);
5577 5380
5578 j = (int) t[0]; 5381 j = t[0];
5579 5382
5383 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5580 if (j == TST_LIST[0]) 5384 if (j == TST_LIST[0])
5581 { 5385 {
5582 if (arg != NIL && !is_pair (arg)) 5386 if (!tst_is_list (SCHEME_A_ arg))
5583 break; 5387 break;
5584 } 5388 }
5585 else 5389 else
5586 { 5390 {
5587 if (!tests[j].fct (arg)) 5391 if (!tests[j - 1].fct (arg))
5588 break; 5392 break;
5589 } 5393 }
5590 5394
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5395 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5592 t++; 5396 t++;
5593 5397
5594 arglist = cdr (arglist); 5398 arglist = cdr (arglist);
5595 i++; 5399 i++;
5596 } 5400 }
5597 while (i < n); 5401 while (i < n);
5598 5402
5599 if (i < n) 5403 if (i < n)
5600 { 5404 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5405 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5406 xError_1 (SCHEME_A_ msg, 0);
5407 continue;
5603 } 5408 }
5604 } 5409 }
5605 } 5410 }
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 } 5411 }
5615#endif 5412#endif
5616 5413
5617 ok_to_freely_gc (SCHEME_A); 5414 ok_to_freely_gc (SCHEME_A);
5618 5415
5416 static const dispatch_func dispatch_funcs[] = {
5417 opexe_0,
5418 opexe_1,
5419 opexe_2,
5420 opexe_3,
5421 opexe_4,
5422 opexe_5,
5423 opexe_6,
5424 };
5425
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5427 return;
5621 5428
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5430 {
5624 xwrstr ("No memory!\n"); 5431 xwrstr ("No memory!\n");
… …
5648mk_proc (SCHEME_P_ enum scheme_opcodes op) 5455mk_proc (SCHEME_P_ enum scheme_opcodes op)
5649{ 5456{
5650 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5457 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5651 set_typeflag (y, (T_PROC | T_ATOM)); 5458 set_typeflag (y, (T_PROC | T_ATOM));
5652 ivalue_unchecked (y) = op; 5459 ivalue_unchecked (y) = op;
5653 set_num_integer (y);
5654 return y; 5460 return y;
5655} 5461}
5656 5462
5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5658static int 5464static int
… …
5723 return OP_C0STREAM; /* cons-stream */ 5529 return OP_C0STREAM; /* cons-stream */
5724 } 5530 }
5725} 5531}
5726 5532
5727#if USE_MULTIPLICITY 5533#if USE_MULTIPLICITY
5728scheme * 5534ecb_cold scheme *
5729scheme_init_new () 5535scheme_init_new ()
5730{ 5536{
5731 scheme *sc = malloc (sizeof (scheme)); 5537 scheme *sc = malloc (sizeof (scheme));
5732 5538
5733 if (!scheme_init (SCHEME_A)) 5539 if (!scheme_init (SCHEME_A))
… …
5738 else 5544 else
5739 return sc; 5545 return sc;
5740} 5546}
5741#endif 5547#endif
5742 5548
5743int 5549ecb_cold int
5744scheme_init (SCHEME_P) 5550scheme_init (SCHEME_P)
5745{ 5551{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5553 pointer x;
5748 5554
… …
5821 5627
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5628 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5629 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5630 }
5825 5631
5632 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5633 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5634 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5635 assign_proc (SCHEME_A_ i, opname (i));
5829 5636
5830 /* initialization of global pointers to special symbols */ 5637 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5638 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5639 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5640 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5679scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5680{
5874 SCHEME_V->ext_data = p; 5681 SCHEME_V->ext_data = p;
5875} 5682}
5876 5683
5877void 5684ecb_cold void
5878scheme_deinit (SCHEME_P) 5685scheme_deinit (SCHEME_P)
5879{ 5686{
5880 int i; 5687 int i;
5881 5688
5882#if SHOW_ERROR_LINE 5689#if SHOW_ERROR_LINE
… …
5974{ 5781{
5975 dump_stack_reset (SCHEME_A); 5782 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5783 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5784 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5785 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 */ 5786 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); 5787 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; 5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5789#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5791#endif
5985 SCHEME_V->retcode = 0; 5792 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5793 SCHEME_V->interactive_repl = 0;

Diff Legend

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