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

Diff Legend

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