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.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.24 by root, Fri Nov 27 02:12:08 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>
… …
143 145
144#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
147 149
148#if USE_STRLWR 150#if USE_IGNORECASE
149static const char * 151static const char *
150strlwr (char *s) 152xstrlwr (char *s)
151{ 153{
152 const char *p = s; 154 const char *p = s;
153 155
154 while (*s) 156 while (*s)
155 { 157 {
… …
157 s++; 159 s++;
158 } 160 }
159 161
160 return p; 162 return p;
161} 163}
162#endif
163 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
164#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
166 172
167#ifndef prompt 173#ifndef prompt
168# define prompt "ts> " 174# define prompt "ts> "
169#endif 175#endif
170 176
… …
201#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
205 211
206static num num_add (num a, num b); 212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
207static num num_mul (num a, num b); 213
208static num num_div (num a, num b); 214static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 215static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 216static num num_rem (num a, num b);
212static num num_mod (num a, num b); 217static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 218
219#if USE_MATH 219#if USE_MATH
220static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
221#endif 221#endif
222static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
223 223
224static INLINE int 224ecb_inline int
225num_is_integer (pointer p) 225num_is_integer (pointer p)
226{ 226{
227 return num_is_fixnum (p->object.number); 227 return num_is_fixnum (p->object.number);
228} 228}
229 229
… …
233/* macros for cell operations */ 233/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 234#define typeflag(p) ((p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 235#define set_typeflag(p,v) ((p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 236#define type(p) (typeflag (p) & T_MASKTYPE)
237 237
238INTERFACE INLINE int 238INTERFACE int
239is_string (pointer p) 239is_string (pointer p)
240{ 240{
241 return type (p) == T_STRING; 241 return type (p) == T_STRING;
242} 242}
243 243
244#define strvalue(p) ((p)->object.string.svalue) 244#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 245#define strlength(p) ((p)->object.string.length)
246 246
247INTERFACE int is_list (SCHEME_P_ pointer p); 247INTERFACE int is_list (SCHEME_P_ pointer p);
248
248INTERFACE INLINE int 249INTERFACE int
249is_vector (pointer p) 250is_vector (pointer p)
250{ 251{
251 return type (p) == T_VECTOR; 252 return type (p) == T_VECTOR;
252} 253}
253 254
… …
262vector_length (pointer vec) 263vector_length (pointer vec)
263{ 264{
264 return vec->object.vector.length; 265 return vec->object.vector.length;
265} 266}
266 267
267INTERFACE INLINE int 268INTERFACE int
268is_number (pointer p) 269is_number (pointer p)
269{ 270{
270 return type (p) == T_NUMBER; 271 return type (p) == T_NUMBER;
271} 272}
272 273
273INTERFACE INLINE int 274INTERFACE int
274is_integer (pointer p) 275is_integer (pointer p)
275{ 276{
276 if (!is_number (p)) 277 if (!is_number (p))
277 return 0; 278 return 0;
278 279
… …
280 return 1; 281 return 1;
281 282
282 return 0; 283 return 0;
283} 284}
284 285
285INTERFACE INLINE int 286INTERFACE int
286is_real (pointer p) 287is_real (pointer p)
287{ 288{
288 return is_number (p) && !num_is_fixnum (p->object.number); 289 return is_number (p) && !num_is_fixnum (p->object.number);
289} 290}
290 291
291INTERFACE INLINE int 292INTERFACE int
292is_character (pointer p) 293is_character (pointer p)
293{ 294{
294 return type (p) == T_CHARACTER; 295 return type (p) == T_CHARACTER;
295} 296}
296 297
297INTERFACE INLINE char * 298INTERFACE char *
298string_value (pointer p) 299string_value (pointer p)
299{ 300{
300 return strvalue (p); 301 return strvalue (p);
301} 302}
302 303
303INLINE num 304ecb_inline num
304nvalue (pointer p) 305nvalue (pointer p)
305{ 306{
306 return (p)->object.number; 307 return (p)->object.number;
307} 308}
308 309
… …
338#else 339#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
340# define set_num_integer(p) 0 341# define set_num_integer(p) 0
341# define set_num_real(p) 0 342# define set_num_real(p) 0
342#endif 343#endif
344
343INTERFACE long 345INTERFACE long
344charvalue (pointer p) 346charvalue (pointer p)
345{ 347{
346 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
347} 349}
348 350
349INTERFACE INLINE int 351INTERFACE int
350is_port (pointer p) 352is_port (pointer p)
351{ 353{
352 return type (p) == T_PORT; 354 return type (p) == T_PORT;
353} 355}
354 356
355INTERFACE INLINE int 357INTERFACE int
356is_inport (pointer p) 358is_inport (pointer p)
357{ 359{
358 return is_port (p) && p->object.port->kind & port_input; 360 return is_port (p) && p->object.port->kind & port_input;
359} 361}
360 362
361INTERFACE INLINE int 363INTERFACE int
362is_outport (pointer p) 364is_outport (pointer p)
363{ 365{
364 return is_port (p) && p->object.port->kind & port_output; 366 return is_port (p) && p->object.port->kind & port_output;
365} 367}
366 368
367INTERFACE INLINE int 369INTERFACE int
368is_pair (pointer p) 370is_pair (pointer p)
369{ 371{
370 return type (p) == T_PAIR; 372 return type (p) == T_PAIR;
371} 373}
372 374
373#define car(p) ((p)->object.cons.car + 0) 375#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 376#define cdr(p) ((p)->object.cons.cdr + 0)
375 377
376#define caar(p) car (car (p)) 378static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 379static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 380static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 381static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 382
381#define cadar(p) car (cdr (car (p))) 383static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 384static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 385static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 386
385INTERFACE void 387INTERFACE void
386set_car (pointer p, pointer q) 388set_car (pointer p, pointer q)
387{ 389{
388 p->object.cons.car = q; 390 p->object.cons.car = q;
… …
404pair_cdr (pointer p) 406pair_cdr (pointer p)
405{ 407{
406 return cdr (p); 408 return cdr (p);
407} 409}
408 410
409INTERFACE INLINE int 411INTERFACE int
410is_symbol (pointer p) 412is_symbol (pointer p)
411{ 413{
412 return type (p) == T_SYMBOL; 414 return type (p) == T_SYMBOL;
413} 415}
414 416
415INTERFACE INLINE char * 417INTERFACE char *
416symname (pointer p) 418symname (pointer p)
417{ 419{
418 return strvalue (car (p)); 420 return strvalue (car (p));
419} 421}
420 422
421#if USE_PLIST 423#if USE_PLIST
422SCHEME_EXPORT INLINE int 424SCHEME_EXPORT int
423hasprop (pointer p) 425hasprop (pointer p)
424{ 426{
425 return typeflag (p) & T_SYMBOL; 427 return typeflag (p) & T_SYMBOL;
426} 428}
427 429
428# define symprop(p) cdr(p) 430# define symprop(p) cdr(p)
429#endif 431#endif
430 432
431INTERFACE INLINE int 433INTERFACE int
432is_syntax (pointer p) 434is_syntax (pointer p)
433{ 435{
434 return typeflag (p) & T_SYNTAX; 436 return typeflag (p) & T_SYNTAX;
435} 437}
436 438
437INTERFACE INLINE int 439INTERFACE int
438is_proc (pointer p) 440is_proc (pointer p)
439{ 441{
440 return type (p) == T_PROC; 442 return type (p) == T_PROC;
441} 443}
442 444
443INTERFACE INLINE int 445INTERFACE int
444is_foreign (pointer p) 446is_foreign (pointer p)
445{ 447{
446 return type (p) == T_FOREIGN; 448 return type (p) == T_FOREIGN;
447} 449}
448 450
449INTERFACE INLINE char * 451INTERFACE char *
450syntaxname (pointer p) 452syntaxname (pointer p)
451{ 453{
452 return strvalue (car (p)); 454 return strvalue (car (p));
453} 455}
454 456
455#define procnum(p) ivalue (p) 457#define procnum(p) ivalue (p)
456static const char *procname (pointer x); 458static const char *procname (pointer x);
457 459
458INTERFACE INLINE int 460INTERFACE int
459is_closure (pointer p) 461is_closure (pointer p)
460{ 462{
461 return type (p) == T_CLOSURE; 463 return type (p) == T_CLOSURE;
462} 464}
463 465
464INTERFACE INLINE int 466INTERFACE int
465is_macro (pointer p) 467is_macro (pointer p)
466{ 468{
467 return type (p) == T_MACRO; 469 return type (p) == T_MACRO;
468} 470}
469 471
470INTERFACE INLINE pointer 472INTERFACE pointer
471closure_code (pointer p) 473closure_code (pointer p)
472{ 474{
473 return car (p); 475 return car (p);
474} 476}
475 477
476INTERFACE INLINE pointer 478INTERFACE pointer
477closure_env (pointer p) 479closure_env (pointer p)
478{ 480{
479 return cdr (p); 481 return cdr (p);
480} 482}
481 483
482INTERFACE INLINE int 484INTERFACE int
483is_continuation (pointer p) 485is_continuation (pointer p)
484{ 486{
485 return type (p) == T_CONTINUATION; 487 return type (p) == T_CONTINUATION;
486} 488}
487 489
488#define cont_dump(p) cdr (p) 490#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 491#define set_cont_dump(p,v) set_cdr ((p), (v))
490 492
491/* To do: promise should be forced ONCE only */ 493/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 494INTERFACE int
493is_promise (pointer p) 495is_promise (pointer p)
494{ 496{
495 return type (p) == T_PROMISE; 497 return type (p) == T_PROMISE;
496} 498}
497 499
498INTERFACE INLINE int 500INTERFACE int
499is_environment (pointer p) 501is_environment (pointer p)
500{ 502{
501 return type (p) == T_ENVIRONMENT; 503 return type (p) == T_ENVIRONMENT;
502} 504}
503 505
… …
509 511
510#define is_mark(p) (typeflag (p) & T_MARK) 512#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 513#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 514#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 515
514INTERFACE INLINE int 516INTERFACE int
515is_immutable (pointer p) 517is_immutable (pointer p)
516{ 518{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 519 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 520}
519 521
520INTERFACE INLINE void 522INTERFACE void
521setimmutable (pointer p) 523setimmutable (pointer p)
522{ 524{
523#if USE_ERROR_CHECKING 525#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 526 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 527#endif
526} 528}
527 529
528#if USE_CHAR_CLASSIFIERS 530#if USE_CHAR_CLASSIFIERS
529static INLINE int 531ecb_inline int
530Cisalpha (int c) 532Cisalpha (int c)
531{ 533{
532 return isascii (c) && isalpha (c); 534 return isascii (c) && isalpha (c);
533} 535}
534 536
535static INLINE int 537ecb_inline int
536Cisdigit (int c) 538Cisdigit (int c)
537{ 539{
538 return isascii (c) && isdigit (c); 540 return isascii (c) && isdigit (c);
539} 541}
540 542
541static INLINE int 543ecb_inline int
542Cisspace (int c) 544Cisspace (int c)
543{ 545{
544 return isascii (c) && isspace (c); 546 return isascii (c) && isspace (c);
545} 547}
546 548
547static INLINE int 549ecb_inline int
548Cisupper (int c) 550Cisupper (int c)
549{ 551{
550 return isascii (c) && isupper (c); 552 return isascii (c) && isupper (c);
551} 553}
552 554
553static INLINE int 555ecb_inline int
554Cislower (int c) 556Cislower (int c)
555{ 557{
556 return isascii (c) && islower (c); 558 return isascii (c) && islower (c);
557} 559}
558#endif 560#endif
… …
619#endif 621#endif
620 622
621static int file_push (SCHEME_P_ const char *fname); 623static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 624static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 625static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 626ecb_inline int is_one_of (char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 627static int alloc_cellseg (SCHEME_P_ int n);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 628ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 629static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 630static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 631static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 632static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 633static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
649static int basic_inchar (port *pt); 650static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 651static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 652static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 653static char *readstr_upto (SCHEME_P_ char *delim);
653static pointer readstrexp (SCHEME_P); 654static pointer readstrexp (SCHEME_P);
654static INLINE int skipspace (SCHEME_P); 655ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 656static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 657static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 658static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 659static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 660static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 664static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 665static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 666static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 667static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 668static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 669static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
670static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 671static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 672static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 673static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 674static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 675static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 676static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 677static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 678static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 679static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 680
679static num 681static num
680num_add (num a, num b) 682num_op (enum num_op op, num a, num b)
681{ 683{
682 num ret; 684 num ret;
683 685
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 686 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 687
686 if (num_is_fixnum (ret)) 688 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 689 {
690 IVALUE av = num_get_ivalue (a);
691 IVALUE bv = num_get_ivalue (b);
692
693 switch (op)
694 {
695 case NUM_ADD: av += bv; break;
696 case NUM_SUB: av -= bv; break;
697 case NUM_MUL: av *= bv; break;
698 case NUM_INTDIV: av /= bv; break;
699 }
700
701 num_set_ivalue (ret, av);
702 }
688 else 703 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 704 {
705 RVALUE av = num_get_rvalue (a);
706 RVALUE bv = num_get_rvalue (b);
690 707
691 return ret; 708 switch (op)
692} 709 {
710 case NUM_ADD: av += bv; break;
711 case NUM_SUB: av -= bv; break;
712 case NUM_MUL: av *= bv; break;
713 case NUM_INTDIV: av /= bv; break;
714 }
693 715
694static num 716 num_set_rvalue (ret, av);
695num_mul (num a, num b) 717 }
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 718
706 return ret; 719 return ret;
707} 720}
708 721
709static num 722static num
… …
720 733
721 return ret; 734 return ret;
722} 735}
723 736
724static num 737static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750
751 return ret;
752}
753
754static num
755num_rem (num a, num b) 738num_rem (num a, num b)
756{ 739{
757 num ret; 740 num ret;
758 long e1, e2, res; 741 long e1, e2, res;
759 742
… …
795 778
796 num_set_ivalue (ret, res); 779 num_set_ivalue (ret, res);
797 return ret; 780 return ret;
798} 781}
799 782
783/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 784static int
801num_eq (num a, num b) 785num_cmp (num a, num b)
802{ 786{
787 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 788 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 789
806 if (is_fixnum) 790 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 791 {
792 IVALUE av = num_get_ivalue (a);
793 IVALUE bv = num_get_ivalue (b);
794
795 ret = av == bv ? 0 : av < bv ? -1 : +1;
796 }
808 else 797 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 798 {
799 RVALUE av = num_get_rvalue (a);
800 RVALUE bv = num_get_rvalue (b);
801
802 ret = av == bv ? 0 : av < bv ? -1 : +1;
803 }
810 804
811 return ret; 805 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 806}
854 807
855#if USE_MATH 808#if USE_MATH
856 809
857/* Round to nearest. Round to even if midway */ 810/* Round to nearest. Round to even if midway */
… …
867 return ce; 820 return ce;
868 else if (dfl < dce) 821 else if (dfl < dce)
869 return fl; 822 return fl;
870 else 823 else
871 { 824 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 825 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 826 return fl;
874 else 827 else
875 return ce; 828 return ce;
876 } 829 }
877} 830}
878#endif 831#endif
879 832
880static int 833static int
881is_zero_rvalue (RVALUE x) 834is_zero_rvalue (RVALUE x)
882{ 835{
836 return x == 0;
837#if 0
883#if USE_REAL 838#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 840#else
886 return x == 0; 841 return x == 0;
887#endif 842#endif
888} 843#endif
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 844}
904 845
905/* allocate new cell segment */ 846/* allocate new cell segment */
906static int 847static int
907alloc_cellseg (SCHEME_P_ int n) 848alloc_cellseg (SCHEME_P_ int n)
… …
978 919
979 return n; 920 return n;
980} 921}
981 922
982/* get new cell. parameter a, b is marked by gc. */ 923/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 924ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 925get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 926{
986 if (SCHEME_V->free_cell == NIL) 927 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 928 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 930 return S_SINK;
990 931
991 if (SCHEME_V->free_cell == NIL) 932 if (SCHEME_V->free_cell == NIL)
… …
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1007 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1008
1068 return v; 1009 return v;
1069} 1010}
1070 1011
1071static INLINE void 1012ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1013ok_to_freely_gc (SCHEME_P)
1073{ 1014{
1074 set_car (S_SINK, NIL); 1015 set_car (S_SINK, NIL);
1075} 1016}
1076 1017
… …
1140 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1081 location = hash_fn (name, veclength (SCHEME_V->oblist));
1141 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1082 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1142 return x; 1083 return x;
1143} 1084}
1144 1085
1145static INLINE pointer 1086ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1087oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1088{
1148 int location; 1089 int location;
1149 pointer x; 1090 pointer x;
1150 char *s; 1091 char *s;
… …
1183oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1184{ 1125{
1185 return NIL; 1126 return NIL;
1186} 1127}
1187 1128
1188static INLINE pointer 1129ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1130oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1131{
1191 pointer x; 1132 pointer x;
1192 char *s; 1133 char *s;
1193 1134
… …
1320 } 1261 }
1321 1262
1322 return q; 1263 return q;
1323} 1264}
1324 1265
1325/* get new string */
1326INTERFACE pointer 1266INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str) 1267mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1328{ 1268{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270
1271 set_typeflag (x, T_STRING | T_ATOM);
1272 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1273 strlength (x) = len;
1274 return x;
1330} 1275}
1331 1276
1332INTERFACE pointer 1277INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len) 1278mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{ 1279{
… …
1339 strlength (x) = len; 1284 strlength (x) = len;
1340 return x; 1285 return x;
1341} 1286}
1342 1287
1343INTERFACE pointer 1288INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1289mk_string (SCHEME_P_ const char *str)
1345{ 1290{
1346 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1291 return mk_counted_string (SCHEME_A_ str, strlen (str));
1347
1348 set_typeflag (x, T_STRING | T_ATOM);
1349 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1350 strlength (x) = len;
1351 return x;
1352} 1292}
1353 1293
1354INTERFACE pointer 1294INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1295mk_vector (SCHEME_P_ uint32_t len)
1356{ 1296{
… …
1393 1333
1394INTERFACE pointer 1334INTERFACE pointer
1395gensym (SCHEME_P) 1335gensym (SCHEME_P)
1396{ 1336{
1397 pointer x; 1337 pointer x;
1398 char name[40];
1399 1338
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 { 1340 {
1402 strcpy (name, "gensym-"); 1341 char name[40] = "gensym-";
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1342 xnum (name + 7, SCHEME_V->gensym_cnt);
1404 1343
1405 /* first check oblist */ 1344 /* first check oblist */
1406 x = oblist_find_by_name (SCHEME_A_ name); 1345 x = oblist_find_by_name (SCHEME_A_ name);
1407 1346
1408 if (x != NIL) 1347 if (x == NIL)
1409 continue;
1410 else
1411 { 1348 {
1412 x = oblist_add_by_name (SCHEME_A_ name); 1349 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x; 1350 return x;
1414 } 1351 }
1415 } 1352 }
… …
1424 char c, *p; 1361 char c, *p;
1425 int has_dec_point = 0; 1362 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1363 int has_fp_exp = 0;
1427 1364
1428#if USE_COLON_HOOK 1365#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1366 if ((p = strstr (q, "::")) != 0)
1431 { 1367 {
1432 *p = 0; 1368 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1369 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1370 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1371 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1372 }
1437
1438#endif 1373#endif
1439 1374
1440 p = q; 1375 p = q;
1441 c = *p++; 1376 c = *p++;
1442 1377
… …
1503 1438
1504/* make constant */ 1439/* make constant */
1505static pointer 1440static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1441mk_sharp_const (SCHEME_P_ char *name)
1507{ 1442{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1443 if (!strcmp (name, "t"))
1512 return S_T; 1444 return S_T;
1513 else if (!strcmp (name, "f")) 1445 else if (!strcmp (name, "f"))
1514 return S_F; 1446 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1447 else if (*name == '\\') /* #\w (character) */
1536 { 1448 {
1537 int c = 0; 1449 int c;
1538 1450
1539 if (stricmp (name + 1, "space") == 0) 1451 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1452 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1453 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1454 c = '\n';
… …
1544 c = '\r'; 1456 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1457 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1458 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1459 else if (name[1] == 'x' && name[2] != 0)
1548 { 1460 {
1549 int c1 = strtol (name + 2, 0, 16); 1461 long c1 = strtol (name + 2, 0, 16);
1550 1462
1551 if (c1 <= UCHAR_MAX) 1463 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1464 c = c1;
1553 else 1465 else
1554 return NIL; 1466 return NIL;
1555 1467 }
1556#if USE_ASCII_NAMES 1468#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1469 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1470 /* nothing */;
1561#endif 1471#endif
1562 }
1563 else if (name[2] == 0) 1472 else if (name[2] == 0)
1564 c = name[1]; 1473 c = name[1];
1565 else 1474 else
1566 return NIL; 1475 return NIL;
1567 1476
1568 return mk_character (SCHEME_A_ c); 1477 return mk_character (SCHEME_A_ c);
1569 } 1478 }
1570 else 1479 else
1480 {
1481 /* identify base by string index */
1482 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1483 char *base = strchr (baseidx, *name);
1484
1485 if (base)
1486 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1487
1571 return NIL; 1488 return NIL;
1489 }
1572} 1490}
1573 1491
1574/* ========== garbage collector ========== */ 1492/* ========== garbage collector ========== */
1575 1493
1576/*-- 1494/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1495 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1497 * for marking.
1498 *
1499 * The exception is vectors - vectors are currently marked recursively,
1500 * which is inherited form tinyscheme and could be fixed by having another
1501 * word of context in the vector
1580 */ 1502 */
1581static void 1503static void
1582mark (pointer a) 1504mark (pointer a)
1583{ 1505{
1584 pointer t, q, p; 1506 pointer t, q, p;
… …
1586 t = 0; 1508 t = 0;
1587 p = a; 1509 p = a;
1588E2: 1510E2:
1589 setmark (p); 1511 setmark (p);
1590 1512
1591 if (is_vector (p)) 1513 if (ecb_expect_false (is_vector (p)))
1592 { 1514 {
1593 int i; 1515 int i;
1594 1516
1595 for (i = 0; i < p->object.vector.length; i++) 1517 for (i = 0; i < p->object.vector.length; i++)
1596 mark (vecvalue (p)[i]); 1518 mark (vecvalue (p)[i]);
… …
1719} 1641}
1720 1642
1721static void 1643static void
1722finalize_cell (SCHEME_P_ pointer a) 1644finalize_cell (SCHEME_P_ pointer a)
1723{ 1645{
1646 /* TODO, fast bitmap check? */
1724 if (is_string (a)) 1647 if (is_string (a))
1725 free (strvalue (a)); 1648 free (strvalue (a));
1726 else if (is_vector (a)) 1649 else if (is_vector (a))
1727 free (vecvalue (a)); 1650 free (vecvalue (a));
1728#if USE_PORTS 1651#if USE_PORTS
… …
2309 } 2232 }
2310 } 2233 }
2311} 2234}
2312 2235
2313/* check c is in chars */ 2236/* check c is in chars */
2314static INLINE int 2237ecb_inline int
2315is_one_of (char *s, int c) 2238is_one_of (char *s, int c)
2316{ 2239{
2317 if (c == EOF) 2240 if (c == EOF)
2318 return 1; 2241 return 1;
2319 2242
2320 return !!strchr (s, c); 2243 return !!strchr (s, c);
2321} 2244}
2322 2245
2323/* skip white characters */ 2246/* skip white characters */
2324static INLINE int 2247ecb_inline int
2325skipspace (SCHEME_P) 2248skipspace (SCHEME_P)
2326{ 2249{
2327 int c, curr_line = 0; 2250 int c, curr_line = 0;
2328 2251
2329 do 2252 do
… …
2823 } 2746 }
2824 else if (is_number (a)) 2747 else if (is_number (a))
2825 { 2748 {
2826 if (is_number (b)) 2749 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b)) 2750 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2751 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2752
2830 return 0; 2753 return 0;
2831 } 2754 }
2832 else if (is_character (a)) 2755 else if (is_character (a))
2833 { 2756 {
… …
2900 2823
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2824 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2825 setenvironment (SCHEME_V->envir);
2903} 2826}
2904 2827
2905static INLINE void 2828ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2829new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2830{
2908 pointer slot = immutable_cons (variable, value); 2831 pointer slot = immutable_cons (variable, value);
2909 2832
2910 if (is_vector (car (env))) 2833 if (is_vector (car (env)))
… …
2950 return NIL; 2873 return NIL;
2951} 2874}
2952 2875
2953#else /* USE_ALIST_ENV */ 2876#else /* USE_ALIST_ENV */
2954 2877
2955static INLINE void 2878ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2879new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2880{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2881 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2882 setenvironment (SCHEME_V->envir);
2960} 2883}
2961 2884
2962static INLINE void 2885ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2886new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2887{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2889}
2967 2890
… …
2989 return NIL; 2912 return NIL;
2990} 2913}
2991 2914
2992#endif /* USE_ALIST_ENV else */ 2915#endif /* USE_ALIST_ENV else */
2993 2916
2994static INLINE void 2917ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2919{
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2920 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2921}
2999 2922
3000static INLINE void 2923ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2925{
3003 set_cdr (slot, value); 2926 set_cdr (slot, value);
3004} 2927}
3005 2928
3006static INLINE pointer 2929ecb_inline pointer
3007slot_value_in_env (pointer slot) 2930slot_value_in_env (pointer slot)
3008{ 2931{
3009 return cdr (slot); 2932 return cdr (slot);
3010} 2933}
3011 2934
3012/* ========== Evaluation Cycle ========== */ 2935/* ========== Evaluation Cycle ========== */
3013 2936
3014static pointer 2937static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2938xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2939{
3017#if USE_ERROR_HOOK 2940#if USE_ERROR_HOOK
3018 pointer x; 2941 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2942 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 2977 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 2978 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 2979 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 2980 SCHEME_V->op = OP_EVAL;
3058 2981
3059 return S_T; 2982 return 0;
3060 } 2983 }
3061#endif 2984#endif
3062 2985
3063 if (a) 2986 if (a)
3064 SCHEME_V->args = cons (a, NIL); 2987 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 2989 SCHEME_V->args = NIL;
3067 2990
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2991 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 2992 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 2993 SCHEME_V->op = OP_ERR0;
2994
3071 return S_T; 2995 return 0;
3072} 2996}
3073 2997
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 2998#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 2999#define Error_0(s) Error_1 (s, 0)
3076 3000
3077/* Too small to turn into function */ 3001/* Too small to turn into function */
3078#define BEGIN do { 3002#define BEGIN do {
3079#define END } while (0) 3003#define END } while (0)
3080#define s_goto(a) BEGIN \ 3004#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3005 SCHEME_V->op = a; \
3082 return S_T; END 3006 return 0; END
3083 3007
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3008#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3009
3086#ifndef USE_SCHEME_STACK 3010#ifndef USE_SCHEME_STACK
3087 3011
… …
3112 next_frame = SCHEME_V->dump_base + nframes; 3036 next_frame = SCHEME_V->dump_base + nframes;
3113 3037
3114 next_frame->op = op; 3038 next_frame->op = op;
3115 next_frame->args = args; 3039 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3040 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3041 next_frame->code = code;
3118 3042
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3044}
3121 3045
3122static pointer 3046static int
3123xs_return (SCHEME_P_ pointer a) 3047xs_return (SCHEME_P_ pointer a)
3124{ 3048{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3049 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3050 struct dump_stack_frame *frame;
3127 3051
3128 SCHEME_V->value = a; 3052 SCHEME_V->value = a;
3129 3053
3130 if (nframes <= 0) 3054 if (nframes <= 0)
3131 return NIL; 3055 return -1;
3132 3056
3133 frame = &SCHEME_V->dump_base[--nframes]; 3057 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3058 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3059 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3060 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3061 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3063
3140 return S_T; 3064 return 0;
3141} 3065}
3142 3066
3143static INLINE void 3067ecb_inline void
3144dump_stack_reset (SCHEME_P) 3068dump_stack_reset (SCHEME_P)
3145{ 3069{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3070 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3071 SCHEME_V->dump = (pointer)+0;
3148} 3072}
3149 3073
3150static INLINE void 3074ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3075dump_stack_initialize (SCHEME_P)
3152{ 3076{
3153 SCHEME_V->dump_size = 0; 3077 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3078 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3079 dump_stack_reset (SCHEME_A);
… …
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3146 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3147}
3224 3148
3225#else 3149#else
3226 3150
3227static INLINE void 3151ecb_inline void
3228dump_stack_reset (SCHEME_P) 3152dump_stack_reset (SCHEME_P)
3229{ 3153{
3230 SCHEME_V->dump = NIL; 3154 SCHEME_V->dump = NIL;
3231} 3155}
3232 3156
3233static INLINE void 3157ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3158dump_stack_initialize (SCHEME_P)
3235{ 3159{
3236 dump_stack_reset (SCHEME_A); 3160 dump_stack_reset (SCHEME_A);
3237} 3161}
3238 3162
… …
3240dump_stack_free (SCHEME_P) 3164dump_stack_free (SCHEME_P)
3241{ 3165{
3242 SCHEME_V->dump = NIL; 3166 SCHEME_V->dump = NIL;
3243} 3167}
3244 3168
3245static pointer 3169static int
3246xs_return (SCHEME_P_ pointer a) 3170xs_return (SCHEME_P_ pointer a)
3247{ 3171{
3248 pointer dump = SCHEME_V->dump; 3172 pointer dump = SCHEME_V->dump;
3249 3173
3250 SCHEME_V->value = a; 3174 SCHEME_V->value = a;
3251 3175
3252 if (dump == NIL) 3176 if (dump == NIL)
3253 return NIL; 3177 return -1;
3254 3178
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3183
3260 SCHEME_V->dump = dump; 3184 SCHEME_V->dump = dump;
3261 3185
3262 return S_T; 3186 return 0;
3263} 3187}
3264 3188
3265static void 3189static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3191{
… …
3292 3216
3293#endif 3217#endif
3294 3218
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3220
3297static pointer 3221static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3222opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3223{
3224 pointer args = SCHEME_V->args;
3300 pointer x, y; 3225 pointer x, y;
3301 3226
3302 switch (op) 3227 switch (op)
3303 { 3228 {
3304 case OP_LOAD: /* load */ 3229 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3230 if (file_interactive (SCHEME_A))
3306 { 3231 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3233 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3234 }
3310 3235
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3236 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3237 Error_1 ("unable to open", car (args));
3313 else 3238 else
3314 { 3239 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3241 s_goto (OP_T0LVL);
3317 } 3242 }
… …
3391 case OP_EVAL: /* main part of evaluation */ 3316 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3317#if USE_TRACING
3393 if (SCHEME_V->tracing) 3318 if (SCHEME_V->tracing)
3394 { 3319 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3320 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3321 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3322 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3323 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3324 s_goto (OP_P0LIST);
3400 } 3325 }
3401 3326
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3370 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3371 s_goto (OP_E1ARGS);
3447 } 3372 }
3448 3373
3449 case OP_E1ARGS: /* eval arguments */ 3374 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3375 args = cons (SCHEME_V->value, args);
3451 3376
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3377 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3378 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3379 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3380 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3381 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3382 s_goto (OP_EVAL);
3458 } 3383 }
3459 else /* end */ 3384 else /* end */
3460 { 3385 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3386 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3387 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3388 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3389 s_goto (OP_APPLY);
3465 } 3390 }
3466 3391
3467#if USE_TRACING 3392#if USE_TRACING
3468 3393
3469 case OP_TRACING: 3394 case OP_TRACING:
3470 { 3395 {
3471 int tr = SCHEME_V->tracing; 3396 int tr = SCHEME_V->tracing;
3472 3397
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3398 SCHEME_V->tracing = ivalue (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3399 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3400 }
3476 3401
3477#endif 3402#endif
3478 3403
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3404 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3405#if USE_TRACING
3481 if (SCHEME_V->tracing) 3406 if (SCHEME_V->tracing)
3482 { 3407 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3408 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3409 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3410 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3411 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3412 s_goto (OP_P0LIST);
3488 } 3413 }
3489 3414
3490 /* fall through */ 3415 /* fall through */
3491 3416
3492 case OP_REAL_APPLY: 3417 case OP_REAL_APPLY:
3493#endif 3418#endif
3494 if (is_proc (SCHEME_V->code)) 3419 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3499 { 3422 {
3500 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3503 3426
3504 s_return (x); 3427 s_return (x);
3505 } 3428 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3430 {
3508 /* Should not accept promise */ 3431 /* Should not accept promise */
3509 /* make environment */ 3432 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3434
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3435 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3436 {
3514 if (y == NIL) 3437 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3516 else 3439 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3536 } 3459 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3461 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3541 } 3464 }
3542 else 3465 else
3543 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3544 3467
3545 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3554 { 3477 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3479
3557 if (f != NIL) 3480 if (f != NIL)
3558 { 3481 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3563 } 3486 }
3564 3487
… …
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576 3499
3577#endif 3500#endif
3578 3501
3579 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3503 x = car (args);
3581 3504
3582 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3506 x = cdr (x);
3584 3507
3585 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3587 else 3510 else
3588 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3589 3512
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3591 3514
3592 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3625 3548
3626 3549
3627 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3629 3552
3630 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3632 3555
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3556 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3557
3635 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3560 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3561
… …
3669 3592
3670 case OP_IF1: /* if */ 3593 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3594 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3595 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3596 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3598 s_goto (OP_EVAL);
3678 3599
3679 case OP_LET0: /* let */ 3600 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3601 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3603 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3604 s_goto (OP_LET1);
3684 3605
3685 case OP_LET1: /* let (calculate parameters) */ 3606 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3607 args = cons (SCHEME_V->value, args);
3687 3608
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3609 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3610 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3611 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3612 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3613
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3614 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3615 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3616 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3617 s_goto (OP_EVAL);
3697 } 3618 }
3698 else /* end */ 3619 else /* end */
3699 { 3620 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3621 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3622 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3623 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3624 s_goto (OP_LET2);
3704 } 3625 }
3705 3626
3706 case OP_LET2: /* let */ 3627 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3628 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3629
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3630 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3631 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3632 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3633
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3634 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3635 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3636 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3637 {
3717 if (!is_pair (x)) 3638 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3639 Error_1 ("Bad syntax of binding in let :", x);
3719 3640
3720 if (!is_list (SCHEME_A_ car (x))) 3641 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3642 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3643
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3644 args = cons (caar (x), args);
3724 } 3645 }
3725 3646
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3647 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3648 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3649 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3650 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3651 }
3733 else 3652 else
3734 { 3653 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3654 SCHEME_V->code = cdr (SCHEME_V->code);
3655 }
3656
3736 SCHEME_V->args = NIL; 3657 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3658 s_goto (OP_BEGIN);
3740 3659
3741 case OP_LET0AST: /* let* */ 3660 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3661 if (car (SCHEME_V->code) == NIL)
3743 { 3662 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3680 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3682
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3683 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3684 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3685 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3686 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3687 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3770 } 3689 }
3771 else /* end */ 3690 else /* end */
3772 { 3691 {
3773 SCHEME_V->code = SCHEME_V->args; 3692 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3694 s_goto (OP_BEGIN);
3776 } 3695 }
3777 3696
3778 case OP_LET0REC: /* letrec */ 3697 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3700 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3701 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3702 s_goto (OP_LET1REC);
3784 3703
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3704 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3705 args = cons (SCHEME_V->value, args);
3787 3706
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3707 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3708 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3710 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3711
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3712 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3797 } 3716 }
3798 else /* end */ 3717 else /* end */
3799 { 3718 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3719 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3720 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3721 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3722 s_goto (OP_LET2REC);
3804 } 3723 }
3805 3724
3806 case OP_LET2REC: /* letrec */ 3725 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3726 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3727 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3728
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3729 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3818 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3819 s_goto (OP_EVAL);
3901 3820
3902 case OP_C1STREAM: /* cons-stream */ 3821 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3822 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3823 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3824 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3825 s_return (cons (args, x));
3907 3826
3908 case OP_MACRO0: /* macro */ 3827 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3828 if (is_pair (car (SCHEME_V->code)))
3910 { 3829 {
3911 x = caar (SCHEME_V->code); 3830 x = caar (SCHEME_V->code);
… …
3944 { 3863 {
3945 if (!is_pair (y = caar (x))) 3864 if (!is_pair (y = caar (x)))
3946 break; 3865 break;
3947 3866
3948 for (; y != NIL; y = cdr (y)) 3867 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3868 if (eqv (car (y), SCHEME_V->value))
3951 break; 3869 break;
3952 }
3953 3870
3954 if (y != NIL) 3871 if (y != NIL)
3955 break; 3872 break;
3956 } 3873 }
3957 3874
… …
3977 s_goto (OP_BEGIN); 3894 s_goto (OP_BEGIN);
3978 else 3895 else
3979 s_return (NIL); 3896 s_return (NIL);
3980 3897
3981 case OP_PAPPLY: /* apply */ 3898 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3901 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 3902 s_goto (OP_APPLY);
3986 3903
3987 case OP_PEVAL: /* eval */ 3904 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 3905 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 3906 SCHEME_V->envir = cadr (args);
3990 3907
3991 SCHEME_V->code = car (SCHEME_V->args); 3908 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
3993 3910
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 3911 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 3912 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3913 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 3914 s_goto (OP_APPLY);
3998 } 3915 }
3999 3916
4000 return S_T; 3917 if (USE_ERROR_CHECKING) abort ();
4001} 3918}
4002 3919
4003static pointer 3920static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3921opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 3922{
4006 pointer x; 3923 pointer args = SCHEME_V->args;
3924 pointer x = car (args);
4007 num v; 3925 num v;
4008 3926
4009#if USE_MATH 3927#if USE_MATH
4010 RVALUE dd; 3928 RVALUE dd;
4011#endif 3929#endif
4012 3930
4013 switch (op) 3931 switch (op)
4014 { 3932 {
4015#if USE_MATH 3933#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 3934 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args);
4019
4020 if (num_is_integer (x)) 3935 if (num_is_integer (x))
4021 s_return (x); 3936 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3937 else if (modf (rvalue_unchecked (x), &dd) == 0)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3938 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4024 else 3939 else
4025 Error_1 ("inexact->exact: not integral:", x); 3940 Error_1 ("inexact->exact: not integral:", x);
4026 3941
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 3949
4055 case OP_ATAN: 3950 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 3951 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 3953 else
4061 { 3954 {
4062 pointer y = cadr (SCHEME_V->args); 3955 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 3957 }
4066 3958
4067 case OP_SQRT: 3959 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 3961
4071 case OP_EXPT: 3962 case OP_EXPT:
4072 { 3963 {
4073 RVALUE result; 3964 RVALUE result;
4074 int real_result = 1; 3965 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 3966 pointer y = cadr (args);
4076
4077 x = car (SCHEME_V->args);
4078 3967
4079 if (num_is_integer (x) && num_is_integer (y)) 3968 if (num_is_integer (x) && num_is_integer (y))
4080 real_result = 0; 3969 real_result = 0;
4081 3970
4082 /* This 'if' is an R5RS compatibility fix. */ 3971 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 3972 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 3973 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 3974 result = 0;
4086 else 3975 else
4087 result = pow (rvalue (x), rvalue (y)); 3976 result = pow (rvalue (x), rvalue (y));
4088 3977
4089 /* Before returning integer result make sure we can. */ 3978 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 3979 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 3980 if (!real_result)
4092 { 3981 {
4093 long result_as_long = (long) result; 3982 long result_as_long = result;
4094 3983
4095 if (result != (RVALUE) result_as_long) 3984 if (result != (RVALUE) result_as_long)
4096 real_result = 1; 3985 real_result = 1;
4097 } 3986 }
4098 3987
… …
4100 s_return (mk_real (SCHEME_A_ result)); 3989 s_return (mk_real (SCHEME_A_ result));
4101 else 3990 else
4102 s_return (mk_integer (SCHEME_A_ result)); 3991 s_return (mk_integer (SCHEME_A_ result));
4103 } 3992 }
4104 3993
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 3996
4113 case OP_TRUNCATE: 3997 case OP_TRUNCATE:
4114 { 3998 {
4115 RVALUE rvalue_of_x; 3999 RVALUE rvalue_of_x;
4116 4000
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x); 4001 rvalue_of_x = rvalue (x);
4119 4002
4120 if (rvalue_of_x > 0) 4003 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4122 else 4005 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4007 }
4125 4008
4126 case OP_ROUND: 4009 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4010 if (num_is_integer (x))
4130 s_return (x); 4011 s_return (x);
4131 4012
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4014#endif
4134 4015
4135 case OP_ADD: /* + */ 4016 case OP_ADD: /* + */
4136 v = num_zero; 4017 v = num_zero;
4137 4018
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4019 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4020 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4021
4141 s_return (mk_number (SCHEME_A_ v)); 4022 s_return (mk_number (SCHEME_A_ v));
4142 4023
4143 case OP_MUL: /* * */ 4024 case OP_MUL: /* * */
4144 v = num_one; 4025 v = num_one;
4145 4026
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4027 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4028 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4029
4149 s_return (mk_number (SCHEME_A_ v)); 4030 s_return (mk_number (SCHEME_A_ v));
4150 4031
4151 case OP_SUB: /* - */ 4032 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4033 if (cdr (args) == NIL)
4153 { 4034 {
4154 x = SCHEME_V->args; 4035 x = args;
4155 v = num_zero; 4036 v = num_zero;
4156 } 4037 }
4157 else 4038 else
4158 { 4039 {
4159 x = cdr (SCHEME_V->args); 4040 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4041 v = nvalue (car (args));
4161 } 4042 }
4162 4043
4163 for (; x != NIL; x = cdr (x)) 4044 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4045 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4046
4166 s_return (mk_number (SCHEME_A_ v)); 4047 s_return (mk_number (SCHEME_A_ v));
4167 4048
4168 case OP_DIV: /* / */ 4049 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4050 if (cdr (args) == NIL)
4170 { 4051 {
4171 x = SCHEME_V->args; 4052 x = args;
4172 v = num_one; 4053 v = num_one;
4173 } 4054 }
4174 else 4055 else
4175 { 4056 {
4176 x = cdr (SCHEME_V->args); 4057 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4058 v = nvalue (car (args));
4178 } 4059 }
4179 4060
4180 for (; x != NIL; x = cdr (x)) 4061 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4062 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4063 v = num_div (v, nvalue (car (x)));
4184 else 4064 else
4185 Error_0 ("/: division by zero"); 4065 Error_0 ("/: division by zero");
4186 }
4187 4066
4188 s_return (mk_number (SCHEME_A_ v)); 4067 s_return (mk_number (SCHEME_A_ v));
4189 4068
4190 case OP_INTDIV: /* quotient */ 4069 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4070 if (cdr (args) == NIL)
4192 { 4071 {
4193 x = SCHEME_V->args; 4072 x = args;
4194 v = num_one; 4073 v = num_one;
4195 } 4074 }
4196 else 4075 else
4197 { 4076 {
4198 x = cdr (SCHEME_V->args); 4077 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4078 v = nvalue (car (args));
4200 } 4079 }
4201 4080
4202 for (; x != NIL; x = cdr (x)) 4081 for (; x != NIL; x = cdr (x))
4203 { 4082 {
4204 if (ivalue (car (x)) != 0) 4083 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4084 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4085 else
4207 Error_0 ("quotient: division by zero"); 4086 Error_0 ("quotient: division by zero");
4208 } 4087 }
4209 4088
4210 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4211 4090
4212 case OP_REM: /* remainder */ 4091 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4092 v = nvalue (x);
4214 4093
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4094 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4095 v = num_rem (v, nvalue (cadr (args)));
4217 else 4096 else
4218 Error_0 ("remainder: division by zero"); 4097 Error_0 ("remainder: division by zero");
4219 4098
4220 s_return (mk_number (SCHEME_A_ v)); 4099 s_return (mk_number (SCHEME_A_ v));
4221 4100
4222 case OP_MOD: /* modulo */ 4101 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4102 v = nvalue (x);
4224 4103
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4104 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4105 v = num_mod (v, nvalue (cadr (args)));
4227 else 4106 else
4228 Error_0 ("modulo: division by zero"); 4107 Error_0 ("modulo: division by zero");
4229 4108
4230 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4231 4110
4232 case OP_CAR: /* car */ 4111 case OP_CAR: /* car */
4233 s_return (caar (SCHEME_V->args)); 4112 s_return (caar (args));
4234 4113
4235 case OP_CDR: /* cdr */ 4114 case OP_CDR: /* cdr */
4236 s_return (cdar (SCHEME_V->args)); 4115 s_return (cdar (args));
4237 4116
4238 case OP_CONS: /* cons */ 4117 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4118 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4119 s_return (args);
4241 4120
4242 case OP_SETCAR: /* set-car! */ 4121 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4122 if (!is_immutable (x))
4244 { 4123 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4124 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4125 s_return (car (args));
4247 } 4126 }
4248 else 4127 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4128 Error_0 ("set-car!: unable to alter immutable pair");
4250 4129
4251 case OP_SETCDR: /* set-cdr! */ 4130 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4253 { 4132 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4256 } 4135 }
4257 else 4136 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4137 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4138
4260 case OP_CHAR2INT: /* char->integer */ 4139 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4140 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4262 4141
4263 case OP_INT2CHAR: /* integer->char */ 4142 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4143 s_return (mk_character (SCHEME_A_ ivalue (x)));
4265 4144
4266 case OP_CHARUPCASE: 4145 case OP_CHARUPCASE:
4267 { 4146 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4147 unsigned char c = ivalue (x);
4269 c = toupper (c); 4148 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4149 s_return (mk_character (SCHEME_A_ c));
4271 } 4150 }
4272 4151
4273 case OP_CHARDNCASE: 4152 case OP_CHARDNCASE:
4274 { 4153 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4154 unsigned char c = ivalue (x);
4276 c = tolower (c); 4155 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4156 s_return (mk_character (SCHEME_A_ c));
4278 } 4157 }
4279 4158
4280 case OP_STR2SYM: /* string->symbol */ 4159 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4160 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4161
4283 case OP_STR2ATOM: /* string->atom */ 4162 case OP_STR2ATOM: /* string->atom */
4284 { 4163 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4164 char *s = strvalue (x);
4286 long pf = 0; 4165 long pf = 0;
4287 4166
4288 if (cdr (SCHEME_V->args) != NIL) 4167 if (cdr (args) != NIL)
4289 { 4168 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4169 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4170 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4171 pf = ivalue_unchecked (cadr (args));
4293 4172
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4173 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4174 {
4296 /* base is OK */ 4175 /* base is OK */
4297 } 4176 }
4298 else 4177 else
4299 pf = -1; 4178 pf = -1;
4300 } 4179 }
4301 4180
4302 if (pf < 0) 4181 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4182 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4183 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4184 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4185 else
4307 { 4186 {
4308 if (pf == 0 || pf == 10) 4187 if (pf == 0 || pf == 10)
… …
4319 } 4198 }
4320 } 4199 }
4321 } 4200 }
4322 4201
4323 case OP_SYM2STR: /* symbol->string */ 4202 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4203 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4204 setimmutable (x);
4326 s_return (x); 4205 s_return (x);
4327 4206
4328 case OP_ATOM2STR: /* atom->string */ 4207 case OP_ATOM2STR: /* atom->string */
4329 { 4208 {
4330 long pf = 0; 4209 long pf = 0;
4331 4210
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4211 if (cdr (args) != NIL)
4335 { 4212 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4213 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4214 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4215 pf = ivalue_unchecked (cadr (args));
4339 4216
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4217 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4218 {
4342 /* base is OK */ 4219 /* base is OK */
4343 } 4220 }
4344 else 4221 else
4345 pf = -1; 4222 pf = -1;
4346 } 4223 }
4347 4224
4348 if (pf < 0) 4225 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4226 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4227 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4228 {
4352 char *p; 4229 char *p;
4353 int len; 4230 int len;
4354 4231
… …
4362 case OP_MKSTRING: /* make-string */ 4239 case OP_MKSTRING: /* make-string */
4363 { 4240 {
4364 int fill = ' '; 4241 int fill = ' ';
4365 int len; 4242 int len;
4366 4243
4367 len = ivalue (car (SCHEME_V->args)); 4244 len = ivalue (x);
4368 4245
4369 if (cdr (SCHEME_V->args) != NIL) 4246 if (cdr (args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args)); 4247 fill = charvalue (cadr (args));
4371 4248
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4249 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4250 }
4374 4251
4375 case OP_STRLEN: /* string-length */ 4252 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4253 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4254
4378 case OP_STRREF: /* string-ref */ 4255 case OP_STRREF: /* string-ref */
4379 { 4256 {
4380 char *str; 4257 char *str;
4381 int index; 4258 int index;
4382 4259
4383 str = strvalue (car (SCHEME_V->args)); 4260 str = strvalue (x);
4384 4261
4385 index = ivalue (cadr (SCHEME_V->args)); 4262 index = ivalue (cadr (args));
4386 4263
4387 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4266
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4268 }
4392 4269
4393 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4394 { 4271 {
4395 char *str; 4272 char *str;
4396 int index; 4273 int index;
4397 int c; 4274 int c;
4398 4275
4399 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4278
4402 str = strvalue (car (SCHEME_V->args)); 4279 str = strvalue (x);
4403 4280
4404 index = ivalue (cadr (SCHEME_V->args)); 4281 index = ivalue (cadr (args));
4405 4282
4406 if (index >= strlength (car (SCHEME_V->args))) 4283 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4284 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4285
4409 c = charvalue (caddr (SCHEME_V->args)); 4286 c = charvalue (caddr (args));
4410 4287
4411 str[index] = (char) c; 4288 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4289 s_return (car (args));
4413 } 4290 }
4414 4291
4415 case OP_STRAPPEND: /* string-append */ 4292 case OP_STRAPPEND: /* string-append */
4416 { 4293 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4294 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4295 int len = 0;
4419 pointer newstr; 4296 pointer newstr;
4420 char *pos; 4297 char *pos;
4421 4298
4422 /* compute needed length for new string */ 4299 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4300 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4301 len += strlength (car (x));
4425 4302
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4303 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4304
4428 /* store the contents of the argument strings into the new string */ 4305 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4306 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4307 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4308
4432 s_return (newstr); 4309 s_return (newstr);
4433 } 4310 }
4434 4311
… …
4437 char *str; 4314 char *str;
4438 int index0; 4315 int index0;
4439 int index1; 4316 int index1;
4440 int len; 4317 int len;
4441 4318
4442 str = strvalue (car (SCHEME_V->args)); 4319 str = strvalue (x);
4443 4320
4444 index0 = ivalue (cadr (SCHEME_V->args)); 4321 index0 = ivalue (cadr (args));
4445 4322
4446 if (index0 > strlength (car (SCHEME_V->args))) 4323 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4324 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4325
4449 if (cddr (SCHEME_V->args) != NIL) 4326 if (cddr (args) != NIL)
4450 { 4327 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4328 index1 = ivalue (caddr (args));
4452 4329
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4330 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4331 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4332 }
4456 else 4333 else
4457 index1 = strlength (car (SCHEME_V->args)); 4334 index1 = strlength (x);
4458 4335
4459 len = index1 - index0; 4336 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4337 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4338 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4339 strvalue (x)[len] = 0;
… …
4466 4343
4467 case OP_VECTOR: /* vector */ 4344 case OP_VECTOR: /* vector */
4468 { 4345 {
4469 int i; 4346 int i;
4470 pointer vec; 4347 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4348 int len = list_length (SCHEME_A_ args);
4472 4349
4473 if (len < 0) 4350 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4351 Error_1 ("vector: not a proper list:", args);
4475 4352
4476 vec = mk_vector (SCHEME_A_ len); 4353 vec = mk_vector (SCHEME_A_ len);
4477 4354
4478#if USE_ERROR_CHECKING 4355#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4356 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4357 s_return (S_SINK);
4481#endif 4358#endif
4482 4359
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4361 set_vector_elem (vec, i, car (x));
4485 4362
4486 s_return (vec); 4363 s_return (vec);
4487 } 4364 }
4488 4365
… …
4490 { 4367 {
4491 pointer fill = NIL; 4368 pointer fill = NIL;
4492 int len; 4369 int len;
4493 pointer vec; 4370 pointer vec;
4494 4371
4495 len = ivalue (car (SCHEME_V->args)); 4372 len = ivalue (x);
4496 4373
4497 if (cdr (SCHEME_V->args) != NIL) 4374 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4375 fill = cadr (args);
4499 4376
4500 vec = mk_vector (SCHEME_A_ len); 4377 vec = mk_vector (SCHEME_A_ len);
4501 4378
4502#if USE_ERROR_CHECKING 4379#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4380 if (SCHEME_V->no_memory)
… …
4509 4386
4510 s_return (vec); 4387 s_return (vec);
4511 } 4388 }
4512 4389
4513 case OP_VECLEN: /* vector-length */ 4390 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4391 s_return (mk_integer (SCHEME_A_ veclength (x)));
4515 4392
4516 case OP_VECREF: /* vector-ref */ 4393 case OP_VECREF: /* vector-ref */
4517 { 4394 {
4518 int index; 4395 int index;
4519 4396
4520 index = ivalue (cadr (SCHEME_V->args)); 4397 index = ivalue (cadr (args));
4521 4398
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4400 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4401
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4402 s_return (vector_elem (x, index));
4526 } 4403 }
4527 4404
4528 case OP_VECSET: /* vector-set! */ 4405 case OP_VECSET: /* vector-set! */
4529 { 4406 {
4530 int index; 4407 int index;
4531 4408
4532 if (is_immutable (car (SCHEME_V->args))) 4409 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4410 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4411
4535 index = ivalue (cadr (SCHEME_V->args)); 4412 index = ivalue (cadr (args));
4536 4413
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4415 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4416
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4417 set_vector_elem (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4418 s_return (x);
4542 } 4419 }
4543 } 4420 }
4544 4421
4545 return S_T; 4422 if (USE_ERROR_CHECKING) abort ();
4546} 4423}
4547 4424
4548INTERFACE int 4425INTERFACE int
4549is_list (SCHEME_P_ pointer a) 4426is_list (SCHEME_P_ pointer a)
4550{ 4427{
… …
4597 return -1; 4474 return -1;
4598 } 4475 }
4599 } 4476 }
4600} 4477}
4601 4478
4602static pointer 4479static int
4480opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{
4482 pointer x = SCHEME_V->args;
4483
4484 for (;;)
4485 {
4486 num v = nvalue (car (x));
4487 x = cdr (x);
4488
4489 if (x == NIL)
4490 break;
4491
4492 int r = num_cmp (v, nvalue (car (x)));
4493
4494 switch (op)
4495 {
4496 case OP_NUMEQ: r = r == 0; break;
4497 case OP_LESS: r = r < 0; break;
4498 case OP_GRE: r = r > 0; break;
4499 case OP_LEQ: r = r <= 0; break;
4500 case OP_GEQ: r = r >= 0; break;
4501 }
4502
4503 if (!r)
4504 s_return (S_F);
4505 }
4506
4507 s_return (S_T);
4508}
4509
4510static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4511opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4512{
4605 pointer x; 4513 pointer args = SCHEME_V->args;
4606 num v; 4514 pointer a = car (args);
4607 int (*comp_func) (num, num); 4515 pointer d = cdr (args);
4516 int r;
4608 4517
4609 switch (op) 4518 switch (op)
4610 { 4519 {
4611 case OP_NOT: /* not */ 4520 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4530
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4531#if USE_CHAR_CLASSIFIERS
4683
4684 case OP_CHARAP: /* char-alphabetic? */ 4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4686
4687 case OP_CHARNP: /* char-numeric? */
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */ 4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */ 4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */ 4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4537#endif
4538
4699#if USE_PORTS 4539#if USE_PORTS
4700 4540 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4542 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4543#endif
4710 4544
4711 case OP_PROCP: /* procedure? */ 4545 case OP_PROCP: /* procedure? */
4712 4546
4713 /*-- 4547 /*--
4714 * continuation should be procedure by the example 4548 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4549 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4550 * in R^3 report sec. 6.9
4717 */ 4551 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4552 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4553 break;
4720 4554
4721 case OP_PAIRP: /* pair? */ 4555 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4556 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4557 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4558 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4559 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4560 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4561 }
4739 4562
4740 return S_T; 4563 s_retbool (r);
4741} 4564}
4742 4565
4743static pointer 4566static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4567opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4568{
4569 pointer args = SCHEME_V->args;
4570 pointer a = car (args);
4746 pointer x, y; 4571 pointer x, y;
4747 4572
4748 switch (op) 4573 switch (op)
4749 { 4574 {
4750 case OP_FORCE: /* force */ 4575 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4576 SCHEME_V->code = a;
4752 4577
4753 if (is_promise (SCHEME_V->code)) 4578 if (is_promise (SCHEME_V->code))
4754 { 4579 {
4755 /* Should change type to closure here */ 4580 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4581 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4602 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4603 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4604 }
4780 } 4605 }
4781 4606
4782 SCHEME_V->args = car (SCHEME_V->args); 4607 SCHEME_V->args = a;
4783 4608
4784 if (op == OP_WRITE) 4609 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4610 SCHEME_V->print_flag = 1;
4786 else 4611 else
4787 SCHEME_V->print_flag = 0; 4612 SCHEME_V->print_flag = 0;
4788 4613
4789 s_goto (OP_P0LIST); 4614 s_goto (OP_P0LIST);
4790 4615
4791 case OP_NEWLINE: /* newline */ 4616 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4617 if (is_pair (args))
4793 { 4618 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4619 if (a != SCHEME_V->outport)
4795 { 4620 {
4796 x = cons (SCHEME_V->outport, NIL); 4621 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4622 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4623 SCHEME_V->outport = a;
4799 } 4624 }
4800 } 4625 }
4801 4626
4802 putstr (SCHEME_A_ "\n"); 4627 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4628 s_return (S_T);
4804#endif 4629#endif
4805 4630
4806 case OP_ERR0: /* error */ 4631 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4632 SCHEME_V->retcode = -1;
4808 4633
4809 if (!is_string (car (SCHEME_V->args))) 4634 if (!is_string (a))
4810 { 4635 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4636 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4637 setimmutable (car (args));
4813 } 4638 }
4814 4639
4815 putstr (SCHEME_A_ "Error: "); 4640 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4641 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4642 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4643 s_goto (OP_ERR1);
4819 4644
4820 case OP_ERR1: /* error */ 4645 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4646 putstr (SCHEME_A_ " ");
4822 4647
4823 if (SCHEME_V->args != NIL) 4648 if (args != NIL)
4824 { 4649 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4650 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4651 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4652 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4653 s_goto (OP_P0LIST);
4829 } 4654 }
4830 else 4655 else
4831 { 4656 {
4832 putstr (SCHEME_A_ "\n"); 4657 putstr (SCHEME_A_ "\n");
4833 4658
4834 if (SCHEME_V->interactive_repl) 4659 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4660 s_goto (OP_T0LVL);
4836 else 4661 else
4837 return NIL; 4662 return -1;
4838 } 4663 }
4839 4664
4840 case OP_REVERSE: /* reverse */ 4665 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4666 s_return (reverse (SCHEME_A_ a));
4842 4667
4843 case OP_LIST_STAR: /* list* */ 4668 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4669 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4670
4846 case OP_APPEND: /* append */ 4671 case OP_APPEND: /* append */
4847 x = NIL; 4672 x = NIL;
4848 y = SCHEME_V->args; 4673 y = args;
4849 4674
4850 if (y == x) 4675 if (y == x)
4851 s_return (x); 4676 s_return (x);
4852 4677
4853 /* cdr() in the while condition is not a typo. If car() */ 4678 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4689 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4690
4866#if USE_PLIST 4691#if USE_PLIST
4867 4692
4868 case OP_PUT: /* put */ 4693 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4694 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4695 Error_0 ("illegal use of put");
4871 4696
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4697 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4698 {
4874 if (caar (x) == y) 4699 if (caar (x) == y)
4875 break; 4700 break;
4876 } 4701 }
4877 4702
4878 if (x != NIL) 4703 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4704 cdar (x) = caddr (args);
4880 else 4705 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4706 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4707
4883 s_return (S_T); 4708 s_return (S_T);
4884 4709
4885 case OP_GET: /* get */ 4710 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4711 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4712 Error_0 ("illegal use of get");
4888 4713
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4714 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4715 if (caar (x) == y)
4891 break; 4716 break;
4892 4717
4893 if (x != NIL) 4718 if (x != NIL)
4894 s_return (cdar (x)); 4719 s_return (cdar (x));
… …
4896 s_return (NIL); 4721 s_return (NIL);
4897 4722
4898#endif /* USE_PLIST */ 4723#endif /* USE_PLIST */
4899 4724
4900 case OP_QUIT: /* quit */ 4725 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4726 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4727 SCHEME_V->retcode = ivalue (a);
4903 4728
4904 return NIL; 4729 return -1;
4905 4730
4906 case OP_GC: /* gc */ 4731 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4732 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4733 s_return (S_T);
4909 4734
4910 case OP_GCVERB: /* gc-verbose */ 4735 case OP_GCVERB: /* gc-verbose */
4911 { 4736 {
4912 int was = SCHEME_V->gc_verbose; 4737 int was = SCHEME_V->gc_verbose;
4913 4738
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4739 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4740 s_retbool (was);
4916 } 4741 }
4917 4742
4918 case OP_NEWSEGMENT: /* new-segment */ 4743 case OP_NEWSEGMENT: /* new-segment */
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4744 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4745 Error_0 ("new-segment: argument must be a number");
4921 4746
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
4923 4748
4924 s_return (S_T); 4749 s_return (S_T);
4925 4750
4926 case OP_OBLIST: /* oblist */ 4751 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4752 s_return (oblist_all_symbols (SCHEME_A));
… …
4954 case OP_OPEN_INOUTFILE: 4779 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4780 prop = port_input | port_output;
4956 break; 4781 break;
4957 } 4782 }
4958 4783
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4784 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4785
4961 if (p == NIL) 4786 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4787 }
4966 4788
4967# if USE_STRING_PORTS 4789# if USE_STRING_PORTS
4968 4790
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4791 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4803 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4804 prop = port_input | port_output;
4983 break; 4805 break;
4984 } 4806 }
4985 4807
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4809 strvalue (a) + strlength (a), prop);
4988 4810
4989 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4812 }
4994 4813
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4814 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4815 {
4997 pointer p; 4816 pointer p;
4998 4817
4999 if (car (SCHEME_V->args) == NIL) 4818 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4819 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4820 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4821 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4822 strvalue (a) + strlength (a), port_output);
5010 4823
5011 if (p == NIL) 4824 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4825 }
5017 4826
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4827 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4828 {
5020 port *p; 4829 port *p;
5021 4830
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4831 if ((p = a->object.port)->kind & port_string)
5023 { 4832 {
5024 off_t size; 4833 off_t size;
5025 char *str; 4834 char *str;
5026 4835
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4836 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4852 }
5044 4853
5045# endif 4854# endif
5046 4855
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4856 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4857 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4858 s_return (S_T);
5050 4859
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4860 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4861 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4862 s_return (S_T);
5054#endif 4863#endif
5055 4864
5056 case OP_INT_ENV: /* interaction-environment */ 4865 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4866 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4868 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4869 s_return (SCHEME_V->envir);
5061 4870
5062 } 4871 }
5063 4872
5064 return S_T; 4873 if (USE_ERROR_CHECKING) abort ();
5065} 4874}
5066 4875
5067static pointer 4876static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4877opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4878{
4879 pointer args = SCHEME_V->args;
5070 pointer x; 4880 pointer x;
5071 4881
5072 if (SCHEME_V->nesting != 0) 4882 if (SCHEME_V->nesting != 0)
5073 { 4883 {
5074 int n = SCHEME_V->nesting; 4884 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4891 switch (op)
5082 { 4892 {
5083 /* ========== reading part ========== */ 4893 /* ========== reading part ========== */
5084#if USE_PORTS 4894#if USE_PORTS
5085 case OP_READ: 4895 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4896 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4897 s_goto (OP_READ_INTERNAL);
5088 4898
5089 if (!is_inport (car (SCHEME_V->args))) 4899 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4900 Error_1 ("read: not an input port:", car (args));
5091 4901
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4902 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4903 s_goto (OP_READ_INTERNAL);
5094 4904
5095 x = SCHEME_V->inport; 4905 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4906 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4907 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4908 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4909 s_goto (OP_READ_INTERNAL);
5100 4910
5101 case OP_READ_CHAR: /* read-char */ 4911 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4912 case OP_PEEK_CHAR: /* peek-char */
5103 { 4913 {
5104 int c; 4914 int c;
5105 4915
5106 if (is_pair (SCHEME_V->args)) 4916 if (is_pair (args))
5107 { 4917 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4918 if (car (args) != SCHEME_V->inport)
5109 { 4919 {
5110 x = SCHEME_V->inport; 4920 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4921 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4922 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4923 SCHEME_V->inport = car (args);
5114 } 4924 }
5115 } 4925 }
5116 4926
5117 c = inchar (SCHEME_A); 4927 c = inchar (SCHEME_A);
5118 4928
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4938 case OP_CHAR_READY: /* char-ready? */
5129 { 4939 {
5130 pointer p = SCHEME_V->inport; 4940 pointer p = SCHEME_V->inport;
5131 int res; 4941 int res;
5132 4942
5133 if (is_pair (SCHEME_V->args)) 4943 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4944 p = car (args);
5135 4945
5136 res = p->object.port->kind & port_string; 4946 res = p->object.port->kind & port_string;
5137 4947
5138 s_retbool (res); 4948 s_retbool (res);
5139 } 4949 }
5140 4950
5141 case OP_SET_INPORT: /* set-input-port */ 4951 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 4952 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 4953 s_return (SCHEME_V->value);
5144 4954
5145 case OP_SET_OUTPORT: /* set-output-port */ 4955 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 4956 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 4957 s_return (SCHEME_V->value);
5148#endif 4958#endif
5149 4959
5150 case OP_RDSEXPR: 4960 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 4961 switch (SCHEME_V->tok)
… …
5237 } 5047 }
5238 5048
5239 break; 5049 break;
5240 5050
5241 case OP_RDLIST: 5051 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5052 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5053 SCHEME_V->tok = token (SCHEME_A);
5244 5054
5245 switch (SCHEME_V->tok) 5055 switch (SCHEME_V->tok)
5246 { 5056 {
5247 case TOK_EOF: 5057 case TOK_EOF:
… …
5275 case OP_RDDOT: 5085 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5086 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5087 Error_0 ("syntax error: illegal dot expression");
5278 5088
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5089 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5090 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5091
5282 case OP_RDQUOTE: 5092 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5093 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5094
5285 case OP_RDQQUOTE: 5095 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5117 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5118 s_goto (OP_VECTOR);
5309 5119
5310 /* ========== printing part ========== */ 5120 /* ========== printing part ========== */
5311 case OP_P0LIST: 5121 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5122 if (is_vector (args))
5313 { 5123 {
5314 putstr (SCHEME_A_ "#("); 5124 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5125 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5126 s_goto (OP_PVECFROM);
5317 } 5127 }
5318 else if (is_environment (SCHEME_V->args)) 5128 else if (is_environment (args))
5319 { 5129 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5130 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5131 s_return (S_T);
5322 } 5132 }
5323 else if (!is_pair (SCHEME_V->args)) 5133 else if (!is_pair (args))
5324 { 5134 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5135 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5136 s_return (S_T);
5327 } 5137 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5138 else
5329 { 5139 {
5140 pointer a = car (args);
5141 pointer b = cdr (args);
5142 int ok_abbr = ok_abbrev (b);
5143 SCHEME_V->args = car (b);
5144
5145 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5146 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5147 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5148 putstr (SCHEME_A_ "`");
5149 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5150 putstr (SCHEME_A_ ",");
5151 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5152 putstr (SCHEME_A_ ",@");
5153 else
5154 {
5155 putstr (SCHEME_A_ "(");
5156 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5157 SCHEME_V->args = a;
5158 }
5159
5332 s_goto (OP_P0LIST); 5160 s_goto (OP_P0LIST);
5333 } 5161 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5162
5163 case OP_P1LIST:
5164 if (is_pair (args))
5335 { 5165 {
5166 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5167 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5168 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5169 s_goto (OP_P0LIST);
5339 } 5170 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5171 else if (is_vector (args))
5369 { 5172 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5173 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5174 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5175 s_goto (OP_P0LIST);
5373 } 5176 }
5374 else 5177 else
5375 { 5178 {
5376 if (SCHEME_V->args != NIL) 5179 if (args != NIL)
5377 { 5180 {
5378 putstr (SCHEME_A_ " . "); 5181 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5182 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5183 }
5381 5184
5382 putstr (SCHEME_A_ ")"); 5185 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5186 s_return (S_T);
5384 } 5187 }
5385 5188
5386 case OP_PVECFROM: 5189 case OP_PVECFROM:
5387 { 5190 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5191 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5192 pointer vec = car (args);
5390 int len = veclength (vec); 5193 int len = veclength (vec);
5391 5194
5392 if (i == len) 5195 if (i == len)
5393 { 5196 {
5394 putstr (SCHEME_A_ ")"); 5197 putstr (SCHEME_A_ ")");
… …
5396 } 5199 }
5397 else 5200 else
5398 { 5201 {
5399 pointer elem = vector_elem (vec, i); 5202 pointer elem = vector_elem (vec, i);
5400 5203
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5204 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5205 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5206 SCHEME_V->args = elem;
5404 5207
5405 if (i > 0) 5208 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5209 putstr (SCHEME_A_ " ");
5407 5210
5408 s_goto (OP_P0LIST); 5211 s_goto (OP_P0LIST);
5409 } 5212 }
5410 } 5213 }
5411 } 5214 }
5412 5215
5413 return S_T; 5216 if (USE_ERROR_CHECKING) abort ();
5414} 5217}
5415 5218
5416static pointer 5219static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5220opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5221{
5222 pointer args = SCHEME_V->args;
5223 pointer a = car (args);
5419 pointer x, y; 5224 pointer x, y;
5420 5225
5421 switch (op) 5226 switch (op)
5422 { 5227 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5228 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5229 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5230 long v = list_length (SCHEME_A_ a);
5426 5231
5427 if (v < 0) 5232 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5233 Error_1 ("length: not a list:", a);
5429 5234
5430 s_return (mk_integer (SCHEME_A_ v)); 5235 s_return (mk_integer (SCHEME_A_ v));
5431 } 5236 }
5432 5237
5433 case OP_ASSQ: /* assq *//* a.k */ 5238 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5239 x = a;
5435 5240
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5241 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5242 {
5438 if (!is_pair (car (y))) 5243 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5244 Error_0 ("unable to handle non pair element");
5440 5245
5441 if (x == caar (y)) 5246 if (x == caar (y))
… …
5447 else 5252 else
5448 s_return (S_F); 5253 s_return (S_F);
5449 5254
5450 5255
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5256 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5257 SCHEME_V->args = a;
5453 5258
5454 if (SCHEME_V->args == NIL) 5259 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5260 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5261 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5262 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5463 case OP_CLOSUREP: /* closure? */ 5268 case OP_CLOSUREP: /* closure? */
5464 /* 5269 /*
5465 * Note, macro object is also a closure. 5270 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5271 * Therefore, (closure? <#MACRO>) ==> #t
5467 */ 5272 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5273 s_retbool (is_closure (a));
5469 5274
5470 case OP_MACROP: /* macro? */ 5275 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5276 s_retbool (is_macro (a));
5472 } 5277 }
5473 5278
5474 return S_T; /* NOTREACHED */ 5279 if (USE_ERROR_CHECKING) abort ();
5475} 5280}
5476 5281
5282/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5283typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5284
5479typedef int (*test_predicate) (pointer); 5285typedef int (*test_predicate)(pointer);
5480static int 5286static int
5481is_any (pointer p) 5287is_any (pointer p)
5482{ 5288{
5483 return 1; 5289 return 1;
5484} 5290}
5485 5291
5486static int 5292static int
5487is_nonneg (pointer p) 5293is_nonneg (pointer p)
5488{ 5294{
5489 return ivalue (p) >= 0 && is_integer (p); 5295 return ivalue (p) >= 0 && is_integer (p);
5296}
5297
5298static int
5299tst_is_list (pointer p)
5300{
5301 return p == NIL || is_pair (p);
5490} 5302}
5491 5303
5492/* Correspond carefully with following defines! */ 5304/* Correspond carefully with following defines! */
5493static struct 5305static struct
5494{ 5306{
5495 test_predicate fct; 5307 test_predicate fct;
5496 const char *kind; 5308 const char *kind;
5497} tests[] = 5309} tests[] =
5498{ 5310{
5499 { 0, 0}, /* unused */ 5311 { is_any, 0 },
5500 { is_any, 0}, 5312 { is_string, "string" },
5501 { is_string, "string" }, 5313 { is_symbol, "symbol" },
5502 { is_symbol, "symbol" }, 5314 { is_port, "port" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5315 { is_inport, "input port" },
5505 { is_outport, "output port" }, 5316 { is_outport, "output port" },
5506 { is_environment, "environment" }, 5317 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5318 { is_pair, "pair" },
5508 { 0, "pair or '()" }, 5319 { tst_is_list, "pair or '()" },
5509 { is_character, "character" }, 5320 { is_character, "character" },
5510 { is_vector, "vector" }, 5321 { is_vector, "vector" },
5511 { is_number, "number" }, 5322 { is_number, "number" },
5512 { is_integer, "integer" }, 5323 { is_integer, "integer" },
5513 { is_nonneg, "non-negative integer" } 5324 { is_nonneg, "non-negative integer" }
5514}; 5325};
5515 5326
5516#define TST_NONE 0 5327#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5328#define TST_ANY "\001"
5518#define TST_STRING "\002" 5329#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5330#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5331#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5332#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5333#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5334#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5335#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5336#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5337#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5338#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5339#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5340#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5341#define TST_NATURAL "\016"
5342
5343#define INF_ARG 0xff
5344#define UNNAMED_OP ""
5345
5346static const char opnames[] =
5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5348#include "opdefines.h"
5349#undef OP_DEF
5350;
5351
5352static const char *
5353opname (int idx)
5354{
5355 const char *name = opnames;
5356
5357 /* should do this at compile time, but would require external program, right? */
5358 while (idx--)
5359 name += strlen (name) + 1;
5360
5361 return *name ? name : "ILLEGAL";
5362}
5363
5364static const char *
5365procname (pointer x)
5366{
5367 return opname (procnum (x));
5368}
5531 5369
5532typedef struct 5370typedef struct
5533{ 5371{
5534 dispatch_func func; 5372 uint8_t func;
5535 char *name; 5373 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374 uint8_t builtin;
5536 int min_arity; 5375 uint8_t min_arity;
5537 int max_arity; 5376 uint8_t max_arity;
5538 char *arg_tests_encoding; 5377 char arg_tests_encoding[3];
5539} op_code_info; 5378} op_code_info;
5540 5379
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5380static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5381#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5545#include "opdefines.h" 5382#include "opdefines.h"
5383#undef OP_DEF
5546 {0} 5384 {0}
5547}; 5385};
5548 5386
5549static const char *
5550procname (pointer x)
5551{
5552 int n = procnum (x);
5553 const char *name = dispatch_table[n].name;
5554
5555 if (name == 0)
5556 name = "ILLEGAL!";
5557
5558 return name;
5559}
5560
5561/* kernel of this interpreter */ 5387/* kernel of this interpreter */
5562static void 5388static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5389Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5390{
5565 SCHEME_V->op = op; 5391 SCHEME_V->op = op;
5566 5392
5567 for (;;) 5393 for (;;)
5568 { 5394 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5395 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5396
5571#if USE_ERROR_CHECKING 5397#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5398 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5399 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5400 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5401 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5402
5578 /* Check number of arguments */ 5403 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5404 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5405 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5406 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5407 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5408 xError_1 (SCHEME_A_ msg, 0);
5409 continue;
5584 } 5410 }
5585 5411 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5412 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5413 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5414 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5415 xError_1 (SCHEME_A_ msg, 0);
5416 continue;
5591 } 5417 }
5592 5418 else
5593 if (ok)
5594 { 5419 {
5595 if (pcd->arg_tests_encoding) 5420 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5421 {
5597 int i = 0; 5422 int i = 0;
5598 int j; 5423 int j;
5599 const char *t = pcd->arg_tests_encoding; 5424 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5425 pointer arglist = SCHEME_V->args;
5601 5426
5602 do 5427 do
5603 { 5428 {
5604 pointer arg = car (arglist); 5429 pointer arg = car (arglist);
5605 5430
5606 j = (int) t[0]; 5431 j = t[0];
5607 5432
5608 if (j == TST_LIST[0]) 5433 if (!tests[j - 1].fct (arg))
5609 {
5610 if (arg != NIL && !is_pair (arg))
5611 break; 5434 break;
5612 }
5613 else
5614 {
5615 if (!tests[j].fct (arg))
5616 break;
5617 }
5618 5435
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5436 if (t[1]) /* last test is replicated as necessary */
5620 t++; 5437 t++;
5621 5438
5622 arglist = cdr (arglist); 5439 arglist = cdr (arglist);
5623 i++; 5440 i++;
5624 } 5441 }
5625 while (i < n); 5442 while (i < n);
5626 5443
5627 if (i < n) 5444 if (i < n)
5628 { 5445 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5446 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5447 xError_1 (SCHEME_A_ msg, 0);
5448 continue;
5631 } 5449 }
5632 } 5450 }
5633 } 5451 }
5634
5635 if (!ok)
5636 {
5637 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5638 return;
5639
5640 pcd = dispatch_table + SCHEME_V->op;
5641 }
5642 } 5452 }
5643#endif 5453#endif
5644 5454
5645 ok_to_freely_gc (SCHEME_A); 5455 ok_to_freely_gc (SCHEME_A);
5646 5456
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5457 static const dispatch_func dispatch_funcs[] = {
5458 opexe_0,
5459 opexe_1,
5460 opexe_2,
5461 opexe_3,
5462 opexe_4,
5463 opexe_5,
5464 opexe_6,
5465 };
5466
5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5468 return;
5649 5469
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5471 {
5652 xwrstr ("No memory!\n"); 5472 xwrstr ("No memory!\n");
… …
5710 5530
5711 case 'd': 5531 case 'd':
5712 return OP_COND0; /* cond */ 5532 return OP_COND0; /* cond */
5713 5533
5714 case '*': 5534 case '*':
5715 return OP_LET0AST; /* let* */ 5535 return OP_LET0AST;/* let* */
5716 5536
5717 default: 5537 default:
5718 return OP_SET0; /* set! */ 5538 return OP_SET0; /* set! */
5719 } 5539 }
5720 5540
… …
5742 5562
5743 case 'f': 5563 case 'f':
5744 return OP_DEF0; /* define */ 5564 return OP_DEF0; /* define */
5745 5565
5746 default: 5566 default:
5747 return OP_LET0REC; /* letrec */ 5567 return OP_LET0REC;/* letrec */
5748 } 5568 }
5749 5569
5750 default: 5570 default:
5751 return OP_C0STREAM; /* cons-stream */ 5571 return OP_C0STREAM; /* cons-stream */
5752 } 5572 }
5753} 5573}
5754 5574
5755#if USE_MULTIPLICITY 5575#if USE_MULTIPLICITY
5756scheme * 5576ecb_cold scheme *
5757scheme_init_new () 5577scheme_init_new ()
5758{ 5578{
5759 scheme *sc = malloc (sizeof (scheme)); 5579 scheme *sc = malloc (sizeof (scheme));
5760 5580
5761 if (!scheme_init (SCHEME_A)) 5581 if (!scheme_init (SCHEME_A))
… …
5766 else 5586 else
5767 return sc; 5587 return sc;
5768} 5588}
5769#endif 5589#endif
5770 5590
5771int 5591ecb_cold int
5772scheme_init (SCHEME_P) 5592scheme_init (SCHEME_P)
5773{ 5593{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5594 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5595 pointer x;
5776 5596
… …
5849 5669
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5670 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5671 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5672 }
5853 5673
5674 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5675 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5676 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5677 assign_proc (SCHEME_A_ i, opname (i));
5857 5678
5858 /* initialization of global pointers to special symbols */ 5679 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5680 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5681 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5682 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5721scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5722{
5902 SCHEME_V->ext_data = p; 5723 SCHEME_V->ext_data = p;
5903} 5724}
5904 5725
5905void 5726ecb_cold void
5906scheme_deinit (SCHEME_P) 5727scheme_deinit (SCHEME_P)
5907{ 5728{
5908 int i; 5729 int i;
5909 5730
5910#if SHOW_ERROR_LINE 5731#if SHOW_ERROR_LINE
… …
6002{ 5823{
6003 dump_stack_reset (SCHEME_A); 5824 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5825 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5826 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5827 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5828 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5829 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5830 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5831#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5832 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5833#endif
6013 SCHEME_V->retcode = 0; 5834 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5835 SCHEME_V->interactive_repl = 0;

Diff Legend

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